Skip to content

Commit

Permalink
Merge branch 'beta'
Browse files Browse the repository at this point in the history
  • Loading branch information
Kelly Selden committed Jun 5, 2024
2 parents 6c75483 + d2fcd35 commit cef83ac
Show file tree
Hide file tree
Showing 17 changed files with 130 additions and 143 deletions.
19 changes: 3 additions & 16 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,24 +1,11 @@
# ember-cli Changelog

## v5.9.0-beta.1
## v5.9.0

#### Blueprint Changes

- [`ember new` diff](https://github.com/ember-cli/ember-new-output/compare/v5.9.0-beta.0...v5.9.0-beta.1)
- [`ember addon` diff](https://github.com/ember-cli/ember-addon-output/compare/v5.9.0-beta.0...v5.9.0-beta.1)

#### Changelog

- [#10458](https://github.com/ember-cli/ember-cli/pull/10458) Use Lodash's `_.template` instead of `lodash.template` package [@gorner](https://github.com/gorner)

Thank you to all who took the time to contribute!

## v5.9.0-beta.0

#### Blueprint Changes

- [`ember new` diff](https://github.com/ember-cli/ember-new-output/compare/v5.8.0...v5.9.0-beta.0)
- [`ember addon` diff](https://github.com/ember-cli/ember-addon-output/compare/v5.8.0...v5.9.0-beta.0)
- [`ember new` diff](https://github.com/ember-cli/ember-new-output/compare/v5.8.1...v5.9.0)
- [`ember addon` diff](https://github.com/ember-cli/ember-addon-output/compare/v5.8.1...v5.9.0)

#### Changelog

Expand Down
22 changes: 11 additions & 11 deletions blueprints/app/files/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,20 +26,20 @@
"test:ember": "ember test"
},
"devDependencies": {
"@babel/core": "^7.24.4",
"<% if (!typescript) { %>@babel/eslint-parser": "^7.24.1",
"@babel/plugin-proposal-decorators": "^7.24.1",
"@babel/core": "^7.24.7",
"<% if (!typescript) { %>@babel/eslint-parser": "^7.24.7",
"@babel/plugin-proposal-decorators": "^7.24.7",
"<% } %>@ember/optional-features": "^2.1.0",
"@ember/string": "^3.1.1",
"@ember/test-helpers": "^3.3.0<% if (embroider) { %>",
"@embroider/compat": "^3.4.7",
"@embroider/core": "^3.4.7",
"@embroider/compat": "^3.5.1",
"@embroider/core": "^3.4.10",
"@embroider/webpack": "^3.2.3<% } %>",
"@glimmer/component": "^1.1.2",
"@glimmer/tracking": "^1.1.2<% if (typescript) { %>",
"@glint/environment-ember-loose": "^1.4.0",
"@glint/template": "^1.4.0",
"@tsconfig/ember": "^3.0.6",
"@tsconfig/ember": "^3.0.8",
"@types/ember": "^4.0.11",
"@types/ember-data": "^4.4.16",
"@types/ember-data__adapter": "^4.0.6",
Expand Down Expand Up @@ -72,7 +72,7 @@
"@typescript-eslint/parser": "^6.21.0<% } %>",
"broccoli-asset-rev": "^3.0.0",
"concurrently": "^8.2.2",
"ember-auto-import": "^2.7.2",
"ember-auto-import": "^2.7.3",
"ember-cli": "~<%= emberCLIVersion %>",
"ember-cli-app-version": "^6.0.1",
"ember-cli-babel": "^8.2.0",
Expand All @@ -82,14 +82,14 @@
"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.4",
"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.3",
"ember-qunit": "^8.0.2",
"ember-resolver": "^11.0.1",
"ember-source": "~5.9.0-beta.1",
"ember-source": "~5.9.0",
"ember-template-lint": "^5.13.0<% if (welcome) { %>",
"ember-welcome-page": "^7.0.2<% } %>",
"eslint": "^8.57.0",
Expand All @@ -99,8 +99,8 @@
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-qunit": "^8.1.1",
"loader.js": "^4.7.0",
"prettier": "^3.2.5",
"qunit": "^2.20.1",
"prettier": "^3.3.1",
"qunit": "^2.21.0",
"qunit-dom": "^2.0.0",
"stylelint": "^15.11.0",
"stylelint-config-standard": "^34.0.0",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ember-cli",
"version": "5.9.0-beta.1",
"version": "5.9.0",
"description": "Command line tool for developing ambitious ember.js apps",
"keywords": [
"app",
Expand Down
14 changes: 7 additions & 7 deletions tests/fixtures/addon/defaults/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,21 +28,21 @@
"test:ember-compatibility": "ember try:each"
},
"dependencies": {
"@babel/core": "^7.24.4",
"@babel/core": "^7.24.7",
"ember-cli-babel": "^8.2.0",
"ember-cli-htmlbars": "^6.3.0"
},
"devDependencies": {
"@babel/eslint-parser": "^7.24.1",
"@babel/plugin-proposal-decorators": "^7.24.1",
"@babel/eslint-parser": "^7.24.7",
"@babel/plugin-proposal-decorators": "^7.24.7",
"@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",
"broccoli-asset-rev": "^3.0.0",
"concurrently": "^8.2.2",
"ember-auto-import": "^2.7.2",
"ember-auto-import": "^2.7.3",
"ember-cli": "~<%= emberCLIVersion %>",
"ember-cli-clean-css": "^3.0.0",
"ember-cli-dependency-checker": "^3.3.2",
Expand All @@ -53,7 +53,7 @@
"ember-page-title": "^8.2.3",
"ember-qunit": "^8.0.2",
"ember-resolver": "^11.0.1",
"ember-source": "~5.9.0-beta.1",
"ember-source": "~5.9.0",
"ember-source-channel-url": "^3.0.0",
"ember-template-lint": "^5.13.0",
"ember-try": "^3.0.0",
Expand All @@ -64,8 +64,8 @@
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-qunit": "^8.1.1",
"loader.js": "^4.7.0",
"prettier": "^3.2.5",
"qunit": "^2.20.1",
"prettier": "^3.3.1",
"qunit": "^2.21.0",
"qunit-dom": "^2.0.0",
"stylelint": "^15.11.0",
"stylelint-config-standard": "^34.0.0",
Expand Down
14 changes: 7 additions & 7 deletions tests/fixtures/addon/pnpm/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,21 +28,21 @@
"test:ember-compatibility": "ember try:each"
},
"dependencies": {
"@babel/core": "^7.24.4",
"@babel/core": "^7.24.7",
"ember-cli-babel": "^8.2.0",
"ember-cli-htmlbars": "^6.3.0"
},
"devDependencies": {
"@babel/eslint-parser": "^7.24.1",
"@babel/plugin-proposal-decorators": "^7.24.1",
"@babel/eslint-parser": "^7.24.7",
"@babel/plugin-proposal-decorators": "^7.24.7",
"@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",
"broccoli-asset-rev": "^3.0.0",
"concurrently": "^8.2.2",
"ember-auto-import": "^2.7.2",
"ember-auto-import": "^2.7.3",
"ember-cli": "~<%= emberCLIVersion %>",
"ember-cli-clean-css": "^3.0.0",
"ember-cli-dependency-checker": "^3.3.2",
Expand All @@ -53,7 +53,7 @@
"ember-page-title": "^8.2.3",
"ember-qunit": "^8.0.2",
"ember-resolver": "^11.0.1",
"ember-source": "~5.9.0-beta.1",
"ember-source": "~5.9.0",
"ember-source-channel-url": "^3.0.0",
"ember-template-lint": "^5.13.0",
"ember-try": "^3.0.0",
Expand All @@ -65,8 +65,8 @@
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-qunit": "^8.1.1",
"loader.js": "^4.7.0",
"prettier": "^3.2.5",
"qunit": "^2.20.1",
"prettier": "^3.3.1",
"qunit": "^2.21.0",
"qunit-dom": "^2.0.0",
"stylelint": "^15.11.0",
"stylelint-config-standard": "^34.0.0",
Expand Down
12 changes: 6 additions & 6 deletions tests/fixtures/addon/typescript/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"test:ember-compatibility": "ember try:each"
},
"dependencies": {
"@babel/core": "^7.24.4",
"@babel/core": "^7.24.7",
"ember-cli-babel": "^8.2.0",
"ember-cli-htmlbars": "^6.3.0"
},
Expand All @@ -58,7 +58,7 @@
"@glimmer/tracking": "^1.1.2",
"@glint/environment-ember-loose": "^1.4.0",
"@glint/template": "^1.4.0",
"@tsconfig/ember": "^3.0.6",
"@tsconfig/ember": "^3.0.8",
"@types/ember": "^4.0.11",
"@types/ember__application": "^4.0.11",
"@types/ember__array": "^4.0.10",
Expand Down Expand Up @@ -86,7 +86,7 @@
"@typescript-eslint/parser": "^6.21.0",
"broccoli-asset-rev": "^3.0.0",
"concurrently": "^8.2.2",
"ember-auto-import": "^2.7.2",
"ember-auto-import": "^2.7.3",
"ember-cli": "~<%= emberCLIVersion %>",
"ember-cli-clean-css": "^3.0.0",
"ember-cli-dependency-checker": "^3.3.2",
Expand All @@ -97,7 +97,7 @@
"ember-page-title": "^8.2.3",
"ember-qunit": "^8.0.2",
"ember-resolver": "^11.0.1",
"ember-source": "~5.9.0-beta.1",
"ember-source": "~5.9.0",
"ember-source-channel-url": "^3.0.0",
"ember-template-lint": "^5.13.0",
"ember-try": "^3.0.0",
Expand All @@ -108,8 +108,8 @@
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-qunit": "^8.1.1",
"loader.js": "^4.7.0",
"prettier": "^3.2.5",
"qunit": "^2.20.1",
"prettier": "^3.3.1",
"qunit": "^2.21.0",
"qunit-dom": "^2.0.0",
"rimraf": "^5.0.1",
"stylelint": "^15.11.0",
Expand Down
14 changes: 7 additions & 7 deletions tests/fixtures/addon/yarn/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,21 +28,21 @@
"test:ember-compatibility": "ember try:each"
},
"dependencies": {
"@babel/core": "^7.24.4",
"@babel/core": "^7.24.7",
"ember-cli-babel": "^8.2.0",
"ember-cli-htmlbars": "^6.3.0"
},
"devDependencies": {
"@babel/eslint-parser": "^7.24.1",
"@babel/plugin-proposal-decorators": "^7.24.1",
"@babel/eslint-parser": "^7.24.7",
"@babel/plugin-proposal-decorators": "^7.24.7",
"@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",
"broccoli-asset-rev": "^3.0.0",
"concurrently": "^8.2.2",
"ember-auto-import": "^2.7.2",
"ember-auto-import": "^2.7.3",
"ember-cli": "~<%= emberCLIVersion %>",
"ember-cli-clean-css": "^3.0.0",
"ember-cli-dependency-checker": "^3.3.2",
Expand All @@ -53,7 +53,7 @@
"ember-page-title": "^8.2.3",
"ember-qunit": "^8.0.2",
"ember-resolver": "^11.0.1",
"ember-source": "~5.9.0-beta.1",
"ember-source": "~5.9.0",
"ember-source-channel-url": "^3.0.0",
"ember-template-lint": "^5.13.0",
"ember-try": "^3.0.0",
Expand All @@ -65,8 +65,8 @@
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-qunit": "^8.1.1",
"loader.js": "^4.7.0",
"prettier": "^3.2.5",
"qunit": "^2.20.1",
"prettier": "^3.3.1",
"qunit": "^2.21.0",
"qunit-dom": "^2.0.0",
"stylelint": "^15.11.0",
"stylelint-config-standard": "^34.0.0",
Expand Down
16 changes: 8 additions & 8 deletions tests/fixtures/app/defaults/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,17 @@
"test:ember": "ember test"
},
"devDependencies": {
"@babel/core": "^7.24.4",
"@babel/eslint-parser": "^7.24.1",
"@babel/plugin-proposal-decorators": "^7.24.1",
"@babel/core": "^7.24.7",
"@babel/eslint-parser": "^7.24.7",
"@babel/plugin-proposal-decorators": "^7.24.7",
"@ember/optional-features": "^2.1.0",
"@ember/string": "^3.1.1",
"@ember/test-helpers": "^3.3.0",
"@glimmer/component": "^1.1.2",
"@glimmer/tracking": "^1.1.2",
"broccoli-asset-rev": "^3.0.0",
"concurrently": "^8.2.2",
"ember-auto-import": "^2.7.2",
"ember-auto-import": "^2.7.3",
"ember-cli": "~<%= emberCLIVersion %>",
"ember-cli-app-version": "^6.0.1",
"ember-cli-babel": "^8.2.0",
Expand All @@ -45,14 +45,14 @@
"ember-cli-inject-live-reload": "^2.1.0",
"ember-cli-sri": "^2.1.1",
"ember-cli-terser": "^4.0.2",
"ember-data": "~5.4.0-beta.4",
"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.3",
"ember-qunit": "^8.0.2",
"ember-resolver": "^11.0.1",
"ember-source": "~5.9.0-beta.1",
"ember-source": "~5.9.0",
"ember-template-lint": "^5.13.0",
"ember-welcome-page": "^7.0.2",
"eslint": "^8.57.0",
Expand All @@ -62,8 +62,8 @@
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-qunit": "^8.1.1",
"loader.js": "^4.7.0",
"prettier": "^3.2.5",
"qunit": "^2.20.1",
"prettier": "^3.3.1",
"qunit": "^2.21.0",
"qunit-dom": "^2.0.0",
"stylelint": "^15.11.0",
"stylelint-config-standard": "^34.0.0",
Expand Down
20 changes: 10 additions & 10 deletions tests/fixtures/app/embroider-no-welcome/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,35 +25,35 @@
"test:ember": "ember test"
},
"devDependencies": {
"@babel/core": "^7.24.4",
"@babel/eslint-parser": "^7.24.1",
"@babel/plugin-proposal-decorators": "^7.24.1",
"@babel/core": "^7.24.7",
"@babel/eslint-parser": "^7.24.7",
"@babel/plugin-proposal-decorators": "^7.24.7",
"@ember/optional-features": "^2.1.0",
"@ember/string": "^3.1.1",
"@ember/test-helpers": "^3.3.0",
"@embroider/compat": "^3.4.7",
"@embroider/core": "^3.4.7",
"@embroider/compat": "^3.5.1",
"@embroider/core": "^3.4.10",
"@embroider/webpack": "^3.2.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.7.2",
"ember-auto-import": "^2.7.3",
"ember-cli": "~<%= emberCLIVersion %>",
"ember-cli-app-version": "^6.0.1",
"ember-cli-babel": "^8.2.0",
"ember-cli-clean-css": "^3.0.0",
"ember-cli-dependency-checker": "^3.3.2",
"ember-cli-htmlbars": "^6.3.0",
"ember-cli-inject-live-reload": "^2.1.0",
"ember-data": "~5.4.0-beta.4",
"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.3",
"ember-qunit": "^8.0.2",
"ember-resolver": "^11.0.1",
"ember-source": "~5.9.0-beta.1",
"ember-source": "~5.9.0",
"ember-template-lint": "^5.13.0",
"eslint": "^8.57.0",
"eslint-config-prettier": "^9.1.0",
Expand All @@ -62,8 +62,8 @@
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-qunit": "^8.1.1",
"loader.js": "^4.7.0",
"prettier": "^3.2.5",
"qunit": "^2.20.1",
"prettier": "^3.3.1",
"qunit": "^2.21.0",
"qunit-dom": "^2.0.0",
"stylelint": "^15.11.0",
"stylelint-config-standard": "^34.0.0",
Expand Down
Loading

0 comments on commit cef83ac

Please sign in to comment.