Merge branch 'beta'

ember-cli · Mar 5, 2024 · 4d043c6 · 4d043c6
2 parents fa85990 + bfe0fb1
commit 4d043c6
Show file tree

Hide file tree

Showing 19 changed files with 236 additions and 233 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -93,7 +93,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: 18.17
+          node-version: 18
           cache: 'yarn'
 
       - run: yarn install --frozen-lockfile --non-interactive

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,14 +1,16 @@
 # ember-cli Changelog
 
-## v5.7.0-beta.0
+## v5.7.0
 
 #### Blueprint Changes
 
-- [`ember new` diff](https://github.com/ember-cli/ember-new-output/compare/v5.6.0...v5.7.0-beta.0)
-- [`ember addon` diff](https://github.com/ember-cli/ember-addon-output/compare/v5.6.0...v5.7.0-beta.0)
+- [`ember new` diff](https://github.com/ember-cli/ember-new-output/compare/v5.6.0...v5.7.0)
+- [`ember addon` diff](https://github.com/ember-cli/ember-addon-output/compare/v5.6.0...v5.7.0)
 
 #### Changelog
 
+- [#10440](https://github.com/ember-cli/ember-cli/pull/10440) Update optional-features.json [@achambers](https://github.com/achambers)
+- [#10445](https://github.com/ember-cli/ember-cli/pull/10445) Unpin Node 18 for ci [@kategengler](https://github.com/kategengler)
 - [#10425](https://github.com/ember-cli/ember-cli/pull/10425) fix GitHub Action floating deps scenario for PNPM [@jelhan](https://github.com/jelhan)
 
 Thank you to all who took the time to contribute!

diff --git a/blueprints/app/files/config/optional-features.json b/blueprints/app/files/config/optional-features.json
@@ -2,5 +2,6 @@
   "application-template-wrapper": false,
   "default-async-observers": true,
   "jquery-integration": false,
-  "template-only-glimmer-components": true
+  "template-only-glimmer-components": true,
+  "no-implicit-route-model": true
 }
diff --git a/blueprints/app/files/package.json b/blueprints/app/files/package.json
@@ -26,20 +26,20 @@
     "test:ember": "ember test"
   },
   "devDependencies": {
-    "@babel/core": "^7.23.7",
-    "<% if (!typescript) { %>@babel/eslint-parser": "^7.23.3",
-    "@babel/plugin-proposal-decorators": "^7.23.7",
-    "<% } %>@ember/optional-features": "^2.0.0",
+    "@babel/core": "^7.24.0",
+    "<% if (!typescript) { %>@babel/eslint-parser": "^7.23.10",
+    "@babel/plugin-proposal-decorators": "^7.24.0",
+    "<% } %>@ember/optional-features": "^2.1.0",
     "@ember/string": "^3.1.1",
-    "@ember/test-helpers": "^3.2.1<% if (embroider) { %>",
-    "@embroider/compat": "^3.4.3",
-    "@embroider/core": "^3.4.3",
-    "@embroider/webpack": "^3.2.1<% } %>",
+    "@ember/test-helpers": "^3.3.0<% if (embroider) { %>",
+    "@embroider/compat": "^3.4.5",
+    "@embroider/core": "^3.4.5",
+    "@embroider/webpack": "^3.2.2<% } %>",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2<% if (typescript) { %>",
     "@glint/environment-ember-loose": "^1.3.0",
     "@glint/template": "^1.3.0",
-    "@tsconfig/ember": "^3.0.3",
+    "@tsconfig/ember": "^3.0.4",
     "@types/ember": "^4.0.11",
     "@types/ember-data": "^4.4.16",
     "@types/ember-data__adapter": "^4.0.6",
@@ -59,17 +59,17 @@
     "@types/ember__object": "^4.0.12",
     "@types/ember__owner": "^4.0.9",
     "@types/ember__polyfills": "^4.0.6",
-    "@types/ember__routing": "^4.0.21",
-    "@types/ember__runloop": "^4.0.9",
+    "@types/ember__routing": "^4.0.22",
+    "@types/ember__runloop": "^4.0.10",
     "@types/ember__service": "^4.0.9",
     "@types/ember__string": "^3.16.3",
-    "@types/ember__template": "^4.0.6",
+    "@types/ember__template": "^4.0.7",
     "@types/ember__test": "^4.0.6",
     "@types/ember__utils": "^4.0.7",
     "@types/qunit": "^2.19.10",
     "@types/rsvp": "^4.0.9",
-    "@typescript-eslint/eslint-plugin": "^6.19.1",
-    "@typescript-eslint/parser": "^6.19.1<% } %>",
+    "@typescript-eslint/eslint-plugin": "^6.21.0",
+    "@typescript-eslint/parser": "^6.21.0<% } %>",
     "broccoli-asset-rev": "^3.0.0",
     "concurrently": "^8.2.2",
     "ember-auto-import": "^2.7.2",
@@ -82,32 +82,32 @@
     "ember-cli-inject-live-reload": "^2.1.0<% if (!embroider) { %>",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "^4.0.2<% } %>",
-    "ember-data": "~5.4.0-beta.1",
+    "ember-data": "~5.3.3",
     "ember-fetch": "^8.1.2",
     "ember-load-initializers": "^2.1.2",
     "ember-modifier": "^4.1.0",
-    "ember-page-title": "^8.2.0",
+    "ember-page-title": "^8.2.2",
     "ember-qunit": "^8.0.2",
     "ember-resolver": "^11.0.1",
-    "ember-source": "~5.7.0-beta.1",
+    "ember-source": "~5.7.0",
     "ember-template-lint": "^5.13.0<% if (welcome) { %>",
     "ember-welcome-page": "^7.0.2<% } %>",
-    "eslint": "^8.56.0",
+    "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-ember": "^11.12.0",
     "eslint-plugin-n": "^16.6.2",
     "eslint-plugin-prettier": "^5.1.3",
-    "eslint-plugin-qunit": "^8.0.1",
+    "eslint-plugin-qunit": "^8.1.1",
     "loader.js": "^4.7.0",
-    "prettier": "^3.2.4",
-    "qunit": "^2.20.0",
+    "prettier": "^3.2.5",
+    "qunit": "^2.20.1",
     "qunit-dom": "^2.0.0",
     "stylelint": "^15.11.0",
     "stylelint-config-standard": "^34.0.0",
     "stylelint-prettier": "^4.1.0",
     "tracked-built-ins": "^3.3.0<% if (typescript) { %>",
     "typescript": "^5.3.3<% } %>",
-    "webpack": "^5.89.0"
+    "webpack": "^5.90.3"
   },
   "engines": {
     "node": ">= 18"

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-cli",
-  "version": "5.7.0-beta.0",
+  "version": "5.7.0",
   "description": "Command line tool for developing ambitious ember.js apps",
   "keywords": [
     "app",

diff --git a/tests/fixtures/addon/defaults/package.json b/tests/fixtures/addon/defaults/package.json
@@ -28,15 +28,15 @@
     "test:ember-compatibility": "ember try:each"
   },
   "dependencies": {
-    "@babel/core": "^7.23.7",
+    "@babel/core": "^7.24.0",
     "ember-cli-babel": "^8.2.0",
     "ember-cli-htmlbars": "^6.3.0"
   },
   "devDependencies": {
-    "@babel/eslint-parser": "^7.23.3",
-    "@babel/plugin-proposal-decorators": "^7.23.7",
-    "@ember/optional-features": "^2.0.0",
-    "@ember/test-helpers": "^3.2.1",
+    "@babel/eslint-parser": "^7.23.10",
+    "@babel/plugin-proposal-decorators": "^7.24.0",
+    "@ember/optional-features": "^2.1.0",
+    "@ember/test-helpers": "^3.3.0",
     "@embroider/test-setup": "^3.0.3",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
@@ -50,27 +50,27 @@
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "^4.0.2",
     "ember-load-initializers": "^2.1.2",
-    "ember-page-title": "^8.2.0",
+    "ember-page-title": "^8.2.2",
     "ember-qunit": "^8.0.2",
     "ember-resolver": "^11.0.1",
-    "ember-source": "~5.7.0-beta.1",
+    "ember-source": "~5.7.0",
     "ember-source-channel-url": "^3.0.0",
     "ember-template-lint": "^5.13.0",
     "ember-try": "^3.0.0",
-    "eslint": "^8.56.0",
+    "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-ember": "^11.12.0",
     "eslint-plugin-n": "^16.6.2",
     "eslint-plugin-prettier": "^5.1.3",
-    "eslint-plugin-qunit": "^8.0.1",
+    "eslint-plugin-qunit": "^8.1.1",
     "loader.js": "^4.7.0",
-    "prettier": "^3.2.4",
-    "qunit": "^2.20.0",
+    "prettier": "^3.2.5",
+    "qunit": "^2.20.1",
     "qunit-dom": "^2.0.0",
     "stylelint": "^15.11.0",
     "stylelint-config-standard": "^34.0.0",
     "stylelint-prettier": "^4.1.0",
-    "webpack": "^5.89.0"
+    "webpack": "^5.90.3"
   },
   "peerDependencies": {
     "ember-source": ">= 4.0.0"

diff --git a/tests/fixtures/addon/pnpm/package.json b/tests/fixtures/addon/pnpm/package.json
@@ -28,15 +28,15 @@
     "test:ember-compatibility": "ember try:each"
   },
   "dependencies": {
-    "@babel/core": "^7.23.7",
+    "@babel/core": "^7.24.0",
     "ember-cli-babel": "^8.2.0",
     "ember-cli-htmlbars": "^6.3.0"
   },
   "devDependencies": {
-    "@babel/eslint-parser": "^7.23.3",
-    "@babel/plugin-proposal-decorators": "^7.23.7",
-    "@ember/optional-features": "^2.0.0",
-    "@ember/test-helpers": "^3.2.1",
+    "@babel/eslint-parser": "^7.23.10",
+    "@babel/plugin-proposal-decorators": "^7.24.0",
+    "@ember/optional-features": "^2.1.0",
+    "@ember/test-helpers": "^3.3.0",
     "@embroider/test-setup": "^3.0.3",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
@@ -50,28 +50,28 @@
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "^4.0.2",
     "ember-load-initializers": "^2.1.2",
-    "ember-page-title": "^8.2.0",
+    "ember-page-title": "^8.2.2",
     "ember-qunit": "^8.0.2",
     "ember-resolver": "^11.0.1",
-    "ember-source": "~5.7.0-beta.1",
+    "ember-source": "~5.7.0",
     "ember-source-channel-url": "^3.0.0",
     "ember-template-lint": "^5.13.0",
     "ember-try": "^3.0.0",
     "ember-welcome-page": "^7.0.2",
-    "eslint": "^8.56.0",
+    "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-ember": "^11.12.0",
     "eslint-plugin-n": "^16.6.2",
     "eslint-plugin-prettier": "^5.1.3",
-    "eslint-plugin-qunit": "^8.0.1",
+    "eslint-plugin-qunit": "^8.1.1",
     "loader.js": "^4.7.0",
-    "prettier": "^3.2.4",
-    "qunit": "^2.20.0",
+    "prettier": "^3.2.5",
+    "qunit": "^2.20.1",
     "qunit-dom": "^2.0.0",
     "stylelint": "^15.11.0",
     "stylelint-config-standard": "^34.0.0",
     "stylelint-prettier": "^4.1.0",
-    "webpack": "^5.89.0"
+    "webpack": "^5.90.3"
   },
   "peerDependencies": {
     "ember-source": ">= 4.0.0"

diff --git a/tests/fixtures/addon/typescript/package.json b/tests/fixtures/addon/typescript/package.json
@@ -46,19 +46,19 @@
     "test:ember-compatibility": "ember try:each"
   },
   "dependencies": {
-    "@babel/core": "^7.23.7",
+    "@babel/core": "^7.24.0",
     "ember-cli-babel": "^8.2.0",
     "ember-cli-htmlbars": "^6.3.0"
   },
   "devDependencies": {
-    "@ember/optional-features": "^2.0.0",
-    "@ember/test-helpers": "^3.2.1",
+    "@ember/optional-features": "^2.1.0",
+    "@ember/test-helpers": "^3.3.0",
     "@embroider/test-setup": "^3.0.3",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
     "@glint/environment-ember-loose": "^1.3.0",
     "@glint/template": "^1.3.0",
-    "@tsconfig/ember": "^3.0.3",
+    "@tsconfig/ember": "^3.0.4",
     "@types/ember": "^4.0.11",
     "@types/ember__application": "^4.0.11",
     "@types/ember__array": "^4.0.10",
@@ -73,17 +73,17 @@
     "@types/ember__object": "^4.0.12",
     "@types/ember__owner": "^4.0.9",
     "@types/ember__polyfills": "^4.0.6",
-    "@types/ember__routing": "^4.0.21",
-    "@types/ember__runloop": "^4.0.9",
+    "@types/ember__routing": "^4.0.22",
+    "@types/ember__runloop": "^4.0.10",
     "@types/ember__service": "^4.0.9",
     "@types/ember__string": "^3.16.3",
-    "@types/ember__template": "^4.0.6",
+    "@types/ember__template": "^4.0.7",
     "@types/ember__test": "^4.0.6",
     "@types/ember__utils": "^4.0.7",
     "@types/qunit": "^2.19.10",
     "@types/rsvp": "^4.0.9",
-    "@typescript-eslint/eslint-plugin": "^6.19.1",
-    "@typescript-eslint/parser": "^6.19.1",
+    "@typescript-eslint/eslint-plugin": "^6.21.0",
+    "@typescript-eslint/parser": "^6.21.0",
     "broccoli-asset-rev": "^3.0.0",
     "concurrently": "^8.2.2",
     "ember-auto-import": "^2.7.2",
@@ -94,29 +94,29 @@
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "^4.0.2",
     "ember-load-initializers": "^2.1.2",
-    "ember-page-title": "^8.2.0",
+    "ember-page-title": "^8.2.2",
     "ember-qunit": "^8.0.2",
     "ember-resolver": "^11.0.1",
-    "ember-source": "~5.7.0-beta.1",
+    "ember-source": "~5.7.0",
     "ember-source-channel-url": "^3.0.0",
     "ember-template-lint": "^5.13.0",
     "ember-try": "^3.0.0",
-    "eslint": "^8.56.0",
+    "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-ember": "^11.12.0",
     "eslint-plugin-n": "^16.6.2",
     "eslint-plugin-prettier": "^5.1.3",
-    "eslint-plugin-qunit": "^8.0.1",
+    "eslint-plugin-qunit": "^8.1.1",
     "loader.js": "^4.7.0",
-    "prettier": "^3.2.4",
-    "qunit": "^2.20.0",
+    "prettier": "^3.2.5",
+    "qunit": "^2.20.1",
     "qunit-dom": "^2.0.0",
     "rimraf": "^5.0.1",
     "stylelint": "^15.11.0",
     "stylelint-config-standard": "^34.0.0",
     "stylelint-prettier": "^4.1.0",
     "typescript": "^5.3.3",
-    "webpack": "^5.89.0"
+    "webpack": "^5.90.3"
   },
   "peerDependencies": {
     "ember-source": ">= 4.0.0"

diff --git a/tests/fixtures/addon/yarn/package.json b/tests/fixtures/addon/yarn/package.json
@@ -28,15 +28,15 @@
     "test:ember-compatibility": "ember try:each"
   },
   "dependencies": {
-    "@babel/core": "^7.23.7",
+    "@babel/core": "^7.24.0",
     "ember-cli-babel": "^8.2.0",
     "ember-cli-htmlbars": "^6.3.0"
   },
   "devDependencies": {
-    "@babel/eslint-parser": "^7.23.3",
-    "@babel/plugin-proposal-decorators": "^7.23.7",
-    "@ember/optional-features": "^2.0.0",
-    "@ember/test-helpers": "^3.2.1",
+    "@babel/eslint-parser": "^7.23.10",
+    "@babel/plugin-proposal-decorators": "^7.24.0",
+    "@ember/optional-features": "^2.1.0",
+    "@ember/test-helpers": "^3.3.0",
     "@embroider/test-setup": "^3.0.3",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
@@ -50,28 +50,28 @@
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "^4.0.2",
     "ember-load-initializers": "^2.1.2",
-    "ember-page-title": "^8.2.0",
+    "ember-page-title": "^8.2.2",
     "ember-qunit": "^8.0.2",
     "ember-resolver": "^11.0.1",
-    "ember-source": "~5.7.0-beta.1",
+    "ember-source": "~5.7.0",
     "ember-source-channel-url": "^3.0.0",
     "ember-template-lint": "^5.13.0",
     "ember-try": "^3.0.0",
     "ember-welcome-page": "^7.0.2",
-    "eslint": "^8.56.0",
+    "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-ember": "^11.12.0",
     "eslint-plugin-n": "^16.6.2",
     "eslint-plugin-prettier": "^5.1.3",
-    "eslint-plugin-qunit": "^8.0.1",
+    "eslint-plugin-qunit": "^8.1.1",
     "loader.js": "^4.7.0",
-    "prettier": "^3.2.4",
-    "qunit": "^2.20.0",
+    "prettier": "^3.2.5",
+    "qunit": "^2.20.1",
     "qunit-dom": "^2.0.0",
     "stylelint": "^15.11.0",
     "stylelint-config-standard": "^34.0.0",
     "stylelint-prettier": "^4.1.0",
-    "webpack": "^5.89.0"
+    "webpack": "^5.90.3"
   },
   "peerDependencies": {
     "ember-source": ">= 4.0.0"