Repository: ember-cli/ember-cli
Pull request #10297 (2023-06-19 21:06:45)

Update pnpm fixtures
Looks we had a merge-order mishap. 

Maybe dependency updates were merged before the pnpm PR? idk.


Patch:
diff --git a/blueprints/app/files/package.json b/blueprints/app/files/package.json
index 929fa9bd0..7122cc3a5 100644
--- a/blueprints/app/files/package.json
+++ b/blueprints/app/files/package.json
@@ -58,7 +58,7 @@
     "ember-qunit": "^7.0.0",
     "ember-resolver": "^10.1.0",
     "ember-source": "~5.0.0",
-    "ember-template-lint": "^5.10.1<% if (welcome) { %>",
+    "ember-template-lint": "^5.10.3<% if (welcome) { %>",
     "ember-welcome-page": "^7.0.2<% } %>",
     "eslint": "^8.42.0",
     "eslint-config-prettier": "^8.8.0",


Test patch:
diff --git a/tests/fixtures/addon/defaults/package.json b/tests/fixtures/addon/defaults/package.json
index 01b4aa9f3..91866c361 100644
--- a/tests/fixtures/addon/defaults/package.json
+++ b/tests/fixtures/addon/defaults/package.json
@@ -55,7 +55,7 @@
     "ember-resolver": "^10.1.0",
     "ember-source": "~5.0.0",
     "ember-source-channel-url": "^3.0.0",
-    "ember-template-lint": "^5.10.1",
+    "ember-template-lint": "^5.10.3",
     "ember-try": "^2.0.0",
     "eslint": "^8.42.0",
     "eslint-config-prettier": "^8.8.0",
diff --git a/tests/fixtures/addon/pnpm/package.json b/tests/fixtures/addon/pnpm/package.json
index 9377de2e0..912151c50 100644
--- a/tests/fixtures/addon/pnpm/package.json
+++ b/tests/fixtures/addon/pnpm/package.json
@@ -32,45 +32,46 @@
     "ember-cli-htmlbars": "^6.2.0"
   },
   "devDependencies": {
-    "@babel/eslint-parser": "^7.21.3",
-    "@babel/plugin-proposal-decorators": "^7.21.0",
+    "@babel/eslint-parser": "^7.22.5",
+    "@babel/plugin-proposal-decorators": "^7.22.5",
     "@ember/optional-features": "^2.0.0",
-    "@ember/string": "^3.0.1",
-    "@ember/test-helpers": "^2.9.3",
-    "@embroider/test-setup": "^2.1.1",
+    "@ember/string": "^3.1.1",
+    "@ember/test-helpers": "^3.0.3",
+    "@embroider/test-setup": "^3.0.1",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
     "broccoli-asset-rev": "^3.0.0",
-    "concurrently": "^8.0.1",
+    "concurrently": "^8.2.0",
     "ember-auto-import": "^2.6.3",
     "ember-cli": "~<%= emberCLIVersion %>",
+    "ember-cli-clean-css": "^2.0.0",
     "ember-cli-dependency-checker": "^3.3.1",
     "ember-cli-inject-live-reload": "^2.1.0",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "^4.0.2",
     "ember-load-initializers": "^2.1.2",
     "ember-page-title": "^7.0.0",
-    "ember-qunit": "^6.2.0",
-    "ember-resolver": "^10.0.0",
-    "ember-source": "~4.12.0",
+    "ember-qunit": "^7.0.0",
+    "ember-resolver": "^10.1.0",
+    "ember-source": "~5.0.0",
     "ember-source-channel-url": "^3.0.0",
-    "ember-template-lint": "^5.7.2",
+    "ember-template-lint": "^5.10.3",
     "ember-try": "^2.0.0",
     "ember-welcome-page": "^7.0.2",
-    "eslint": "^8.37.0",
+    "eslint": "^8.42.0",
     "eslint-config-prettier": "^8.8.0",
-    "eslint-plugin-ember": "^11.5.0",
-    "eslint-plugin-n": "^15.7.0",
+    "eslint-plugin-ember": "^11.8.0",
+    "eslint-plugin-n": "^16.0.0",
     "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-qunit": "^7.3.4",
     "loader.js": "^4.7.0",
-    "prettier": "^2.8.7",
+    "prettier": "^2.8.8",
     "qunit": "^2.19.4",
     "qunit-dom": "^2.0.0",
-    "stylelint": "^15.4.0",
-    "stylelint-config-standard": "^32.0.0",
+    "stylelint": "^15.7.0",
+    "stylelint-config-standard": "^33.0.0",
     "stylelint-prettier": "^3.0.0",
-    "webpack": "^5.78.0"
+    "webpack": "^5.86.0"
   },
   "peerDependencies": {
     "ember-source": ">= 4.0.0"
diff --git a/tests/fixtures/addon/yarn/package.json b/tests/fixtures/addon/yarn/package.json
index 00ba64e7c..912151c50 100644
--- a/tests/fixtures/addon/yarn/package.json
+++ b/tests/fixtures/addon/yarn/package.json
@@ -55,7 +55,7 @@
     "ember-resolver": "^10.1.0",
     "ember-source": "~5.0.0",
     "ember-source-channel-url": "^3.0.0",
-    "ember-template-lint": "^5.10.1",
+    "ember-template-lint": "^5.10.3",
     "ember-try": "^2.0.0",
     "ember-welcome-page": "^7.0.2",
     "eslint": "^8.42.0",
diff --git a/tests/fixtures/app/defaults/package.json b/tests/fixtures/app/defaults/package.json
index accd78de8..535c976fd 100644
--- a/tests/fixtures/app/defaults/package.json
+++ b/tests/fixtures/app/defaults/package.json
@@ -52,7 +52,7 @@
     "ember-qunit": "^7.0.0",
     "ember-resolver": "^10.1.0",
     "ember-source": "~5.0.0",
-    "ember-template-lint": "^5.10.1",
+    "ember-template-lint": "^5.10.3",
     "ember-welcome-page": "^7.0.2",
     "eslint": "^8.42.0",
     "eslint-config-prettier": "^8.8.0",
diff --git a/tests/fixtures/app/embroider-no-welcome/package.json b/tests/fixtures/app/embroider-no-welcome/package.json
index 96a1492c4..eabc7aed4 100644
--- a/tests/fixtures/app/embroider-no-welcome/package.json
+++ b/tests/fixtures/app/embroider-no-welcome/package.json
@@ -53,7 +53,7 @@
     "ember-qunit": "^7.0.0",
     "ember-resolver": "^10.1.0",
     "ember-source": "~5.0.0",
-    "ember-template-lint": "^5.10.1",
+    "ember-template-lint": "^5.10.3",
     "eslint": "^8.42.0",
     "eslint-config-prettier": "^8.8.0",
     "eslint-plugin-ember": "^11.8.0",
diff --git a/tests/fixtures/app/embroider-pnpm/package.json b/tests/fixtures/app/embroider-pnpm/package.json
index 47a8e2b93..86495b095 100644
--- a/tests/fixtures/app/embroider-pnpm/package.json
+++ b/tests/fixtures/app/embroider-pnpm/package.json
@@ -25,50 +25,51 @@
     "test:ember": "ember test"
   },
   "devDependencies": {
-    "@babel/eslint-parser": "^7.21.3",
-    "@babel/plugin-proposal-decorators": "^7.21.0",
+    "@babel/eslint-parser": "^7.22.5",
+    "@babel/plugin-proposal-decorators": "^7.22.5",
     "@ember/optional-features": "^2.0.0",
-    "@ember/string": "^3.0.1",
-    "@ember/test-helpers": "^2.9.3",
-    "@embroider/compat": "^2.1.1",
-    "@embroider/core": "^2.1.1",
-    "@embroider/webpack": "^2.1.1",
+    "@ember/string": "^3.1.1",
+    "@ember/test-helpers": "^3.0.3",
+    "@embroider/compat": "^3.0.1",
+    "@embroider/core": "^3.0.1",
+    "@embroider/webpack": "^3.0.0",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
     "broccoli-asset-rev": "^3.0.0",
-    "concurrently": "^8.0.1",
+    "concurrently": "^8.2.0",
     "ember-auto-import": "^2.6.3",
     "ember-cli": "~<%= emberCLIVersion %>",
     "ember-cli-app-version": "^6.0.0",
     "ember-cli-babel": "^7.26.11",
+    "ember-cli-clean-css": "^2.0.0",
     "ember-cli-dependency-checker": "^3.3.1",
     "ember-cli-htmlbars": "^6.2.0",
     "ember-cli-inject-live-reload": "^2.1.0",
-    "ember-data": "~4.11.3",
+    "ember-data": "~5.0.0",
     "ember-fetch": "^8.1.2",
     "ember-load-initializers": "^2.1.2",
     "ember-modifier": "^4.1.0",
     "ember-page-title": "^7.0.0",
-    "ember-qunit": "^6.2.0",
-    "ember-resolver": "^10.0.0",
-    "ember-source": "~4.12.0",
-    "ember-template-lint": "^5.7.2",
+    "ember-qunit": "^7.0.0",
+    "ember-resolver": "^10.1.0",
+    "ember-source": "~5.0.0",
+    "ember-template-lint": "^5.10.3",
     "ember-welcome-page": "^7.0.2",
-    "eslint": "^8.37.0",
+    "eslint": "^8.42.0",
     "eslint-config-prettier": "^8.8.0",
-    "eslint-plugin-ember": "^11.5.0",
-    "eslint-plugin-n": "^15.7.0",
+    "eslint-plugin-ember": "^11.8.0",
+    "eslint-plugin-n": "^16.0.0",
     "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-qunit": "^7.3.4",
     "loader.js": "^4.7.0",
-    "prettier": "^2.8.7",
+    "prettier": "^2.8.8",
     "qunit": "^2.19.4",
     "qunit-dom": "^2.0.0",
-    "stylelint": "^15.4.0",
-    "stylelint-config-standard": "^32.0.0",
+    "stylelint": "^15.7.0",
+    "stylelint-config-standard": "^33.0.0",
     "stylelint-prettier": "^3.0.0",
     "tracked-built-ins": "^3.1.1",
-    "webpack": "^5.78.0"
+    "webpack": "^5.86.0"
   },
   "engines": {
     "node": "16.* || >= 18"
diff --git a/tests/fixtures/app/embroider-yarn/package.json b/tests/fixtures/app/embroider-yarn/package.json
index 83feae18a..86495b095 100644
--- a/tests/fixtures/app/embroider-yarn/package.json
+++ b/tests/fixtures/app/embroider-yarn/package.json
@@ -53,7 +53,7 @@
     "ember-qunit": "^7.0.0",
     "ember-resolver": "^10.1.0",
     "ember-source": "~5.0.0",
-    "ember-template-lint": "^5.10.1",
+    "ember-template-lint": "^5.10.3",
     "ember-welcome-page": "^7.0.2",
     "eslint": "^8.42.0",
     "eslint-config-prettier": "^8.8.0",
diff --git a/tests/fixtures/app/embroider/package.json b/tests/fixtures/app/embroider/package.json
index 83feae18a..86495b095 100644
--- a/tests/fixtures/app/embroider/package.json
+++ b/tests/fixtures/app/embroider/package.json
@@ -53,7 +53,7 @@
     "ember-qunit": "^7.0.0",
     "ember-resolver": "^10.1.0",
     "ember-source": "~5.0.0",
-    "ember-template-lint": "^5.10.1",
+    "ember-template-lint": "^5.10.3",
     "ember-welcome-page": "^7.0.2",
     "eslint": "^8.42.0",
     "eslint-config-prettier": "^8.8.0",
diff --git a/tests/fixtures/app/npm/package.json b/tests/fixtures/app/npm/package.json
index 3d7cb33eb..66d94f588 100644
--- a/tests/fixtures/app/npm/package.json
+++ b/tests/fixtures/app/npm/package.json
@@ -52,7 +52,7 @@
     "ember-qunit": "^7.0.0",
     "ember-resolver": "^10.1.0",
     "ember-source": "~5.0.0",
-    "ember-template-lint": "^5.10.1",
+    "ember-template-lint": "^5.10.3",
     "eslint": "^8.42.0",
     "eslint-config-prettier": "^8.8.0",
     "eslint-plugin-ember": "^11.8.0",
diff --git a/tests/fixtures/app/pnpm/package.json b/tests/fixtures/app/pnpm/package.json
index ee2b4ddc0..535c976fd 100644
--- a/tests/fixtures/app/pnpm/package.json
+++ b/tests/fixtures/app/pnpm/package.json
@@ -25,49 +25,50 @@
     "test:ember": "ember test"
   },
   "devDependencies": {
-    "@babel/eslint-parser": "^7.21.3",
-    "@babel/plugin-proposal-decorators": "^7.21.0",
+    "@babel/eslint-parser": "^7.22.5",
+    "@babel/plugin-proposal-decorators": "^7.22.5",
     "@ember/optional-features": "^2.0.0",
-    "@ember/string": "^3.0.1",
-    "@ember/test-helpers": "^2.9.3",
+    "@ember/string": "^3.1.1",
+    "@ember/test-helpers": "^3.0.3",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
     "broccoli-asset-rev": "^3.0.0",
-    "concurrently": "^8.0.1",
+    "concurrently": "^8.2.0",
     "ember-auto-import": "^2.6.3",
     "ember-cli": "~<%= emberCLIVersion %>",
     "ember-cli-app-version": "^6.0.0",
     "ember-cli-babel": "^7.26.11",
+    "ember-cli-clean-css": "^2.0.0",
     "ember-cli-dependency-checker": "^3.3.1",
     "ember-cli-htmlbars": "^6.2.0",
     "ember-cli-inject-live-reload": "^2.1.0",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "^4.0.2",
-    "ember-data": "~4.11.3",
+    "ember-data": "~5.0.0",
     "ember-fetch": "^8.1.2",
     "ember-load-initializers": "^2.1.2",
     "ember-modifier": "^4.1.0",
     "ember-page-title": "^7.0.0",
-    "ember-qunit": "^6.2.0",
-    "ember-resolver": "^10.0.0",
-    "ember-source": "~4.12.0",
-    "ember-template-lint": "^5.7.2",
+    "ember-qunit": "^7.0.0",
+    "ember-resolver": "^10.1.0",
+    "ember-source": "~5.0.0",
+    "ember-template-lint": "^5.10.3",
     "ember-welcome-page": "^7.0.2",
-    "eslint": "^8.37.0",
+    "eslint": "^8.42.0",
     "eslint-config-prettier": "^8.8.0",
-    "eslint-plugin-ember": "^11.5.0",
-    "eslint-plugin-n": "^15.7.0",
+    "eslint-plugin-ember": "^11.8.0",
+    "eslint-plugin-n": "^16.0.0",
     "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-qunit": "^7.3.4",
     "loader.js": "^4.7.0",
-    "prettier": "^2.8.7",
+    "prettier": "^2.8.8",
     "qunit": "^2.19.4",
     "qunit-dom": "^2.0.0",
-    "stylelint": "^15.4.0",
-    "stylelint-config-standard": "^32.0.0",
+    "stylelint": "^15.7.0",
+    "stylelint-config-standard": "^33.0.0",
     "stylelint-prettier": "^3.0.0",
     "tracked-built-ins": "^3.1.1",
-    "webpack": "^5.78.0"
+    "webpack": "^5.86.0"
   },
   "engines": {
     "node": "16.* || >= 18"
diff --git a/tests/fixtures/app/yarn/package.json b/tests/fixtures/app/yarn/package.json
index accd78de8..535c976fd 100644
--- a/tests/fixtures/app/yarn/package.json
+++ b/tests/fixtures/app/yarn/package.json
@@ -52,7 +52,7 @@
     "ember-qunit": "^7.0.0",
     "ember-resolver": "^10.1.0",
     "ember-source": "~5.0.0",
-    "ember-template-lint": "^5.10.1",
+    "ember-template-lint": "^5.10.3",
     "ember-welcome-page": "^7.0.2",
     "eslint": "^8.42.0",
     "eslint-config-prettier": "^8.8.0",