Merge branch 'beta'

ember-cli · Dec 11, 2023 · df04ddb · df04ddb
2 parents d3b19b5 + a70f492
commit df04ddb
Show file tree

Hide file tree

Showing 18 changed files with 366 additions and 366 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,33 +1,33 @@
 # ember-cli Changelog
 
-## v5.5.0-beta.1
+## v5.5.0
 
 #### Blueprint Changes
 
-- [`ember new` diff](https://github.com/ember-cli/ember-new-output/compare/v5.5.0-beta.0...v5.5.0-beta.1)
-- [`ember addon` diff](https://github.com/ember-cli/ember-addon-output/compare/v5.5.0-beta.0...v5.5.0-beta.1)
+- [`ember new` diff](https://github.com/ember-cli/ember-new-output/compare/v5.4.1...v5.5.0)
+- [`ember addon` diff](https://github.com/ember-cli/ember-addon-output/compare/v5.4.1...v5.5.0)
 
 #### Changelog
 
+- [#10332](https://github.com/ember-cli/ember-cli/pull/10332) [ENHANCEMENT] Support converting gts files in blueprint [@IgnaceMaes](https://github.com/IgnaceMaes)
+- [#10350](https://github.com/ember-cli/ember-cli/pull/10350) [ENHANCEMENT] Deprecate Travis CI support [@bertdeblock](https://github.com/bertdeblock)
+- [#10370](https://github.com/ember-cli/ember-cli/pull/10370) When generating a new app with --embroider use all optimisation flags [@mansona](https://github.com/mansona)
+- [#10393](https://github.com/ember-cli/ember-cli/pull/10393) [ENHANCEMENT] feat: add skip-install alias to skip-npm [@IgnaceMaes](https://github.com/IgnaceMaes)
 - [#10403](https://github.com/ember-cli/ember-cli/pull/10403) Fix some docs that were showing up weirdly in generated api docs [@kategengler](https://github.com/kategengler)
-- [#10406](https://github.com/ember-cli/ember-cli/pull/10406) [BUGFIX beta] use import type in helpers/index.ts :: typechecking in new apps otherwise fails [@NullVoxPopuli](https://github.com/NullVoxPopuli)
+- [#9514](https://github.com/ember-cli/ember-cli/pull/9514) [ENHANCEMENT] Use packager commands in `CONTRIBUTING.md` and `README.md` files in `app` and `addon` blueprints [@elwayman02](https://github.com/elwayman02)
 
 Thank you to all who took the time to contribute!
 
-## v5.5.0-beta.0
+## v5.4.1
 
 #### Blueprint Changes
 
-- [`ember new` diff](https://github.com/ember-cli/ember-new-output/compare/v5.4.0...v5.5.0-beta.0)
-- [`ember addon` diff](https://github.com/ember-cli/ember-addon-output/compare/v5.4.0...v5.5.0-beta.0)
+- [`ember new` diff](https://github.com/ember-cli/ember-new-output/compare/v5.4.0...v5.4.1)
+- [`ember addon` diff](https://github.com/ember-cli/ember-addon-output/compare/v5.4.0...v5.4.1)
 
 #### Changelog
 
-- [#10332](https://github.com/ember-cli/ember-cli/pull/10332) [ENHANCEMENT] Support converting gts files in blueprint [@IgnaceMaes](https://github.com/IgnaceMaes)
-- [#10350](https://github.com/ember-cli/ember-cli/pull/10350) [ENHANCEMENT] Deprecate Travis CI support [@bertdeblock](https://github.com/bertdeblock)
-- [#10370](https://github.com/ember-cli/ember-cli/pull/10370) When generating a new app with --embroider use all optimisation flags [@mansona](https://github.com/mansona)
-- [#10393](https://github.com/ember-cli/ember-cli/pull/10393) [ENHANCEMENT] feat: add skip-install alias to skip-npm [@IgnaceMaes](https://github.com/IgnaceMaes)
-- [#9514](https://github.com/ember-cli/ember-cli/pull/9514) [ENHANCEMENT] Use packager commands in `CONTRIBUTING.md` and `README.md` files in `app` and `addon` blueprints [@elwayman02](https://github.com/elwayman02)
+- [#10402](https://github.com/ember-cli/ember-cli/pull/10402) [BUGFIX release] use import type in helpers/index.ts :: typechecking in new apps otherwise fails [@NullVoxPopuli](https://github.com/NullVoxPopuli)
 
 Thank you to all who took the time to contribute!
 

diff --git a/blueprints/addon/additional-package.json b/blueprints/addon/additional-package.json
@@ -6,7 +6,7 @@
     "test:ember-compatibility": "ember try:each"
   },
   "devDependencies": {
-    "@embroider/test-setup": "^3.0.2",
+    "@embroider/test-setup": "^3.0.3",
     "ember-source-channel-url": "^3.0.0",
     "ember-try": "^3.0.0"
   },

diff --git a/blueprints/app/files/package.json b/blueprints/app/files/package.json
@@ -26,53 +26,53 @@
     "test:ember": "ember test"
   },
   "devDependencies": {
-    "@babel/core": "^7.23.2",
-    "<% if (!typescript) { %>@babel/eslint-parser": "^7.22.15",
-    "@babel/plugin-proposal-decorators": "^7.23.2",
+    "@babel/core": "^7.23.6",
+    "<% if (!typescript) { %>@babel/eslint-parser": "^7.23.3",
+    "@babel/plugin-proposal-decorators": "^7.23.6",
     "<% } %>@ember/optional-features": "^2.0.0",
     "@ember/string": "^3.1.1",
-    "@ember/test-helpers": "^3.2.0<% if (embroider) { %>",
-    "@embroider/compat": "^3.2.3",
-    "@embroider/core": "^3.3.0",
-    "@embroider/webpack": "^3.2.0<% } %>",
+    "@ember/test-helpers": "^3.2.1<% if (embroider) { %>",
+    "@embroider/compat": "^3.4.0",
+    "@embroider/core": "^3.4.2",
+    "@embroider/webpack": "^3.2.1<% } %>",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2<% if (typescript) { %>",
     "@glint/environment-ember-loose": "^1.2.1",
     "@glint/template": "^1.2.1",
     "@tsconfig/ember": "^3.0.2",
-    "@types/ember": "^4.0.8",
-    "@types/ember-data": "^4.4.13",
-    "@types/ember-data__adapter": "^4.0.4",
-    "@types/ember-data__model": "^4.0.3",
-    "@types/ember-data__serializer": "^4.0.4",
-    "@types/ember-data__store": "^4.0.5",
-    "@types/ember__application": "^4.0.9",
-    "@types/ember__array": "^4.0.7",
-    "@types/ember__component": "^4.0.19",
-    "@types/ember__controller": "^4.0.9",
-    "@types/ember__debug": "^4.0.6",
-    "@types/ember__destroyable": "^4.0.3",
-    "@types/ember__engine": "^4.0.8",
-    "@types/ember__error": "^4.0.4",
-    "@types/ember__helper": "^4.0.4",
-    "@types/ember__modifier": "^4.0.7",
-    "@types/ember__object": "^4.0.9",
-    "@types/ember__owner": "^4.0.7",
-    "@types/ember__polyfills": "^4.0.4",
-    "@types/ember__routing": "^4.0.17",
-    "@types/ember__runloop": "^4.0.7",
-    "@types/ember__service": "^4.0.6",
+    "@types/ember": "^4.0.10",
+    "@types/ember-data": "^4.4.15",
+    "@types/ember-data__adapter": "^4.0.5",
+    "@types/ember-data__model": "^4.0.4",
+    "@types/ember-data__serializer": "^4.0.5",
+    "@types/ember-data__store": "^4.0.6",
+    "@types/ember__application": "^4.0.10",
+    "@types/ember__array": "^4.0.9",
+    "@types/ember__component": "^4.0.21",
+    "@types/ember__controller": "^4.0.11",
+    "@types/ember__debug": "^4.0.7",
+    "@types/ember__destroyable": "^4.0.4",
+    "@types/ember__engine": "^4.0.10",
+    "@types/ember__error": "^4.0.5",
+    "@types/ember__helper": "^4.0.5",
+    "@types/ember__modifier": "^4.0.8",
+    "@types/ember__object": "^4.0.11",
+    "@types/ember__owner": "^4.0.8",
+    "@types/ember__polyfills": "^4.0.5",
+    "@types/ember__routing": "^4.0.19",
+    "@types/ember__runloop": "^4.0.8",
+    "@types/ember__service": "^4.0.8",
     "@types/ember__string": "^3.16.3",
-    "@types/ember__template": "^4.0.4",
-    "@types/ember__test": "^4.0.4",
-    "@types/ember__utils": "^4.0.5",
-    "@types/qunit": "^2.19.7",
-    "@types/rsvp": "^4.0.6",
-    "@typescript-eslint/eslint-plugin": "^6.9.1",
-    "@typescript-eslint/parser": "^6.9.1<% } %>",
+    "@types/ember__template": "^4.0.5",
+    "@types/ember__test": "^4.0.5",
+    "@types/ember__utils": "^4.0.6",
+    "@types/qunit": "^2.19.9",
+    "@types/rsvp": "^4.0.8",
+    "@typescript-eslint/eslint-plugin": "^6.14.0",
+    "@typescript-eslint/parser": "^6.14.0<% } %>",
     "broccoli-asset-rev": "^3.0.0",
     "concurrently": "^8.2.2",
-    "ember-auto-import": "^2.6.3",
+    "ember-auto-import": "^2.7.0",
     "ember-cli": "~<%= emberCLIVersion %>",
     "ember-cli-app-version": "^6.0.1",
     "ember-cli-babel": "^8.2.0",
@@ -82,31 +82,31 @@
     "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.0",
     "ember-fetch": "^8.1.2",
     "ember-load-initializers": "^2.1.2",
     "ember-modifier": "^4.1.0",
-    "ember-page-title": "^8.0.0",
-    "ember-qunit": "^8.0.1",
+    "ember-page-title": "^8.1.0",
+    "ember-qunit": "^8.0.2",
     "ember-resolver": "^11.0.1",
-    "ember-source": "~5.5.0-beta.1",
-    "ember-template-lint": "^5.11.2<% if (welcome) { %>",
+    "ember-source": "~5.5.0",
+    "ember-template-lint": "^5.13.0<% if (welcome) { %>",
     "ember-welcome-page": "^7.0.2<% } %>",
-    "eslint": "^8.52.0",
-    "eslint-config-prettier": "^9.0.0",
+    "eslint": "^8.55.0",
+    "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-ember": "^11.11.1",
-    "eslint-plugin-n": "^16.2.0",
+    "eslint-plugin-n": "^16.4.0",
     "eslint-plugin-prettier": "^5.0.1",
     "eslint-plugin-qunit": "^8.0.1",
     "loader.js": "^4.7.0",
-    "prettier": "^3.0.3",
+    "prettier": "^3.1.1",
     "qunit": "^2.20.0",
     "qunit-dom": "^2.0.0",
     "stylelint": "^15.11.0",
     "stylelint-config-standard": "^34.0.0",
-    "stylelint-prettier": "^4.0.2",
+    "stylelint-prettier": "^4.1.0",
     "tracked-built-ins": "^3.3.0<% if (typescript) { %>",
-    "typescript": "^5.2.2<% } %>",
+    "typescript": "^5.3.3<% } %>",
     "webpack": "^5.89.0"
   },
   "engines": {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-cli",
-  "version": "5.5.0-beta.1",
+  "version": "5.5.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,48 +28,48 @@
     "test:ember-compatibility": "ember try:each"
   },
   "dependencies": {
-    "@babel/core": "^7.23.2",
+    "@babel/core": "^7.23.6",
     "ember-cli-babel": "^8.2.0",
     "ember-cli-htmlbars": "^6.3.0"
   },
   "devDependencies": {
-    "@babel/eslint-parser": "^7.22.15",
-    "@babel/plugin-proposal-decorators": "^7.23.2",
+    "@babel/eslint-parser": "^7.23.3",
+    "@babel/plugin-proposal-decorators": "^7.23.6",
     "@ember/optional-features": "^2.0.0",
-    "@ember/test-helpers": "^3.2.0",
-    "@embroider/test-setup": "^3.0.2",
+    "@ember/test-helpers": "^3.2.1",
+    "@embroider/test-setup": "^3.0.3",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
     "broccoli-asset-rev": "^3.0.0",
     "concurrently": "^8.2.2",
-    "ember-auto-import": "^2.6.3",
+    "ember-auto-import": "^2.7.0",
     "ember-cli": "~<%= emberCLIVersion %>",
     "ember-cli-clean-css": "^3.0.0",
     "ember-cli-dependency-checker": "^3.3.2",
     "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": "^8.0.0",
-    "ember-qunit": "^8.0.1",
+    "ember-page-title": "^8.1.0",
+    "ember-qunit": "^8.0.2",
     "ember-resolver": "^11.0.1",
-    "ember-source": "~5.5.0-beta.1",
+    "ember-source": "~5.5.0",
     "ember-source-channel-url": "^3.0.0",
-    "ember-template-lint": "^5.11.2",
+    "ember-template-lint": "^5.13.0",
     "ember-try": "^3.0.0",
-    "eslint": "^8.52.0",
-    "eslint-config-prettier": "^9.0.0",
+    "eslint": "^8.55.0",
+    "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-ember": "^11.11.1",
-    "eslint-plugin-n": "^16.2.0",
+    "eslint-plugin-n": "^16.4.0",
     "eslint-plugin-prettier": "^5.0.1",
     "eslint-plugin-qunit": "^8.0.1",
     "loader.js": "^4.7.0",
-    "prettier": "^3.0.3",
+    "prettier": "^3.1.1",
     "qunit": "^2.20.0",
     "qunit-dom": "^2.0.0",
     "stylelint": "^15.11.0",
     "stylelint-config-standard": "^34.0.0",
-    "stylelint-prettier": "^4.0.2",
+    "stylelint-prettier": "^4.1.0",
     "webpack": "^5.89.0"
   },
   "peerDependencies": {

diff --git a/tests/fixtures/addon/pnpm/package.json b/tests/fixtures/addon/pnpm/package.json
@@ -28,49 +28,49 @@
     "test:ember-compatibility": "ember try:each"
   },
   "dependencies": {
-    "@babel/core": "^7.23.2",
+    "@babel/core": "^7.23.6",
     "ember-cli-babel": "^8.2.0",
     "ember-cli-htmlbars": "^6.3.0"
   },
   "devDependencies": {
-    "@babel/eslint-parser": "^7.22.15",
-    "@babel/plugin-proposal-decorators": "^7.23.2",
+    "@babel/eslint-parser": "^7.23.3",
+    "@babel/plugin-proposal-decorators": "^7.23.6",
     "@ember/optional-features": "^2.0.0",
-    "@ember/test-helpers": "^3.2.0",
-    "@embroider/test-setup": "^3.0.2",
+    "@ember/test-helpers": "^3.2.1",
+    "@embroider/test-setup": "^3.0.3",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
     "broccoli-asset-rev": "^3.0.0",
     "concurrently": "^8.2.2",
-    "ember-auto-import": "^2.6.3",
+    "ember-auto-import": "^2.7.0",
     "ember-cli": "~<%= emberCLIVersion %>",
     "ember-cli-clean-css": "^3.0.0",
     "ember-cli-dependency-checker": "^3.3.2",
     "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": "^8.0.0",
-    "ember-qunit": "^8.0.1",
+    "ember-page-title": "^8.1.0",
+    "ember-qunit": "^8.0.2",
     "ember-resolver": "^11.0.1",
-    "ember-source": "~5.5.0-beta.1",
+    "ember-source": "~5.5.0",
     "ember-source-channel-url": "^3.0.0",
-    "ember-template-lint": "^5.11.2",
+    "ember-template-lint": "^5.13.0",
     "ember-try": "^3.0.0",
     "ember-welcome-page": "^7.0.2",
-    "eslint": "^8.52.0",
-    "eslint-config-prettier": "^9.0.0",
+    "eslint": "^8.55.0",
+    "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-ember": "^11.11.1",
-    "eslint-plugin-n": "^16.2.0",
+    "eslint-plugin-n": "^16.4.0",
     "eslint-plugin-prettier": "^5.0.1",
     "eslint-plugin-qunit": "^8.0.1",
     "loader.js": "^4.7.0",
-    "prettier": "^3.0.3",
+    "prettier": "^3.1.1",
     "qunit": "^2.20.0",
     "qunit-dom": "^2.0.0",
     "stylelint": "^15.11.0",
     "stylelint-config-standard": "^34.0.0",
-    "stylelint-prettier": "^4.0.2",
+    "stylelint-prettier": "^4.1.0",
     "webpack": "^5.89.0"
   },
   "peerDependencies": {