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 Apr 15, 2024
2 parents a2c4c0d + 05beb95 commit ecc70c7
Show file tree
Hide file tree
Showing 17 changed files with 133 additions and 133 deletions.
6 changes: 3 additions & 3 deletions CHANGELOG.md
View file
@@ -1,11 +1,11 @@
# ember-cli Changelog

## v5.8.0-beta.0
## v5.8.0

#### Blueprint Changes

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

#### Changelog

Expand Down
28 changes: 14 additions & 14 deletions blueprints/app/files/package.json
View file
Expand Up @@ -26,20 +26,20 @@
"test:ember": "ember test"
},
"devDependencies": {
"@babel/core": "^7.24.0",
"<% if (!typescript) { %>@babel/eslint-parser": "^7.23.10",
"@babel/plugin-proposal-decorators": "^7.24.0",
"@babel/core": "^7.24.4",
"<% if (!typescript) { %>@babel/eslint-parser": "^7.24.1",
"@babel/plugin-proposal-decorators": "^7.24.1",
"<% } %>@ember/optional-features": "^2.1.0",
"@ember/string": "^3.1.1",
"@ember/test-helpers": "^3.3.0<% if (embroider) { %>",
"@embroider/compat": "^3.4.5",
"@embroider/core": "^3.4.5",
"@embroider/webpack": "^3.2.2<% } %>",
"@embroider/compat": "^3.4.7",
"@embroider/core": "^3.4.7",
"@embroider/webpack": "^3.2.3<% } %>",
"@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.4",
"@glint/environment-ember-loose": "^1.4.0",
"@glint/template": "^1.4.0",
"@tsconfig/ember": "^3.0.6",
"@types/ember": "^4.0.11",
"@types/ember-data": "^4.4.16",
"@types/ember-data__adapter": "^4.0.6",
Expand Down Expand Up @@ -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.2",
"ember-page-title": "^8.2.3",
"ember-qunit": "^8.0.2",
"ember-resolver": "^11.0.1",
"ember-source": "~5.8.0-beta.1",
"ember-source": "~5.8.0",
"ember-template-lint": "^5.13.0<% if (welcome) { %>",
"ember-welcome-page": "^7.0.2<% } %>",
"eslint": "^8.57.0",
Expand All @@ -106,8 +106,8 @@
"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.90.3"
"typescript": "^5.4.5<% } %>",
"webpack": "^5.91.0"
},
"engines": {
"node": ">= 18"
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
@@ -1,6 +1,6 @@
{
"name": "ember-cli",
"version": "5.8.0-beta.0",
"version": "5.8.0",
"description": "Command line tool for developing ambitious ember.js apps",
"keywords": [
"app",
Expand Down
12 changes: 6 additions & 6 deletions tests/fixtures/addon/defaults/package.json
View file
Expand Up @@ -28,13 +28,13 @@
"test:ember-compatibility": "ember try:each"
},
"dependencies": {
"@babel/core": "^7.24.0",
"@babel/core": "^7.24.4",
"ember-cli-babel": "^8.2.0",
"ember-cli-htmlbars": "^6.3.0"
},
"devDependencies": {
"@babel/eslint-parser": "^7.23.10",
"@babel/plugin-proposal-decorators": "^7.24.0",
"@babel/eslint-parser": "^7.24.1",
"@babel/plugin-proposal-decorators": "^7.24.1",
"@ember/optional-features": "^2.1.0",
"@ember/test-helpers": "^3.3.0",
"@embroider/test-setup": "^3.0.3",
Expand All @@ -50,10 +50,10 @@
"ember-cli-sri": "^2.1.1",
"ember-cli-terser": "^4.0.2",
"ember-load-initializers": "^2.1.2",
"ember-page-title": "^8.2.2",
"ember-page-title": "^8.2.3",
"ember-qunit": "^8.0.2",
"ember-resolver": "^11.0.1",
"ember-source": "~5.8.0-beta.1",
"ember-source": "~5.8.0",
"ember-source-channel-url": "^3.0.0",
"ember-template-lint": "^5.13.0",
"ember-try": "^3.0.0",
Expand All @@ -70,7 +70,7 @@
"stylelint": "^15.11.0",
"stylelint-config-standard": "^34.0.0",
"stylelint-prettier": "^4.1.0",
"webpack": "^5.90.3"
"webpack": "^5.91.0"
},
"peerDependencies": {
"ember-source": ">= 4.0.0"
Expand Down
12 changes: 6 additions & 6 deletions tests/fixtures/addon/pnpm/package.json
View file
Expand Up @@ -28,13 +28,13 @@
"test:ember-compatibility": "ember try:each"
},
"dependencies": {
"@babel/core": "^7.24.0",
"@babel/core": "^7.24.4",
"ember-cli-babel": "^8.2.0",
"ember-cli-htmlbars": "^6.3.0"
},
"devDependencies": {
"@babel/eslint-parser": "^7.23.10",
"@babel/plugin-proposal-decorators": "^7.24.0",
"@babel/eslint-parser": "^7.24.1",
"@babel/plugin-proposal-decorators": "^7.24.1",
"@ember/optional-features": "^2.1.0",
"@ember/test-helpers": "^3.3.0",
"@embroider/test-setup": "^3.0.3",
Expand All @@ -50,10 +50,10 @@
"ember-cli-sri": "^2.1.1",
"ember-cli-terser": "^4.0.2",
"ember-load-initializers": "^2.1.2",
"ember-page-title": "^8.2.2",
"ember-page-title": "^8.2.3",
"ember-qunit": "^8.0.2",
"ember-resolver": "^11.0.1",
"ember-source": "~5.8.0-beta.1",
"ember-source": "~5.8.0",
"ember-source-channel-url": "^3.0.0",
"ember-template-lint": "^5.13.0",
"ember-try": "^3.0.0",
Expand All @@ -71,7 +71,7 @@
"stylelint": "^15.11.0",
"stylelint-config-standard": "^34.0.0",
"stylelint-prettier": "^4.1.0",
"webpack": "^5.90.3"
"webpack": "^5.91.0"
},
"peerDependencies": {
"ember-source": ">= 4.0.0"
Expand Down
16 changes: 8 additions & 8 deletions tests/fixtures/addon/typescript/package.json
View file
Expand Up @@ -46,7 +46,7 @@
"test:ember-compatibility": "ember try:each"
},
"dependencies": {
"@babel/core": "^7.24.0",
"@babel/core": "^7.24.4",
"ember-cli-babel": "^8.2.0",
"ember-cli-htmlbars": "^6.3.0"
},
Expand All @@ -56,9 +56,9 @@
"@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.4",
"@glint/environment-ember-loose": "^1.4.0",
"@glint/template": "^1.4.0",
"@tsconfig/ember": "^3.0.6",
"@types/ember": "^4.0.11",
"@types/ember__application": "^4.0.11",
"@types/ember__array": "^4.0.10",
Expand Down Expand Up @@ -94,10 +94,10 @@
"ember-cli-sri": "^2.1.1",
"ember-cli-terser": "^4.0.2",
"ember-load-initializers": "^2.1.2",
"ember-page-title": "^8.2.2",
"ember-page-title": "^8.2.3",
"ember-qunit": "^8.0.2",
"ember-resolver": "^11.0.1",
"ember-source": "~5.8.0-beta.1",
"ember-source": "~5.8.0",
"ember-source-channel-url": "^3.0.0",
"ember-template-lint": "^5.13.0",
"ember-try": "^3.0.0",
Expand All @@ -115,8 +115,8 @@
"stylelint": "^15.11.0",
"stylelint-config-standard": "^34.0.0",
"stylelint-prettier": "^4.1.0",
"typescript": "^5.3.3",
"webpack": "^5.90.3"
"typescript": "^5.4.5",
"webpack": "^5.91.0"
},
"peerDependencies": {
"ember-source": ">= 4.0.0"
Expand Down
12 changes: 6 additions & 6 deletions tests/fixtures/addon/yarn/package.json
View file
Expand Up @@ -28,13 +28,13 @@
"test:ember-compatibility": "ember try:each"
},
"dependencies": {
"@babel/core": "^7.24.0",
"@babel/core": "^7.24.4",
"ember-cli-babel": "^8.2.0",
"ember-cli-htmlbars": "^6.3.0"
},
"devDependencies": {
"@babel/eslint-parser": "^7.23.10",
"@babel/plugin-proposal-decorators": "^7.24.0",
"@babel/eslint-parser": "^7.24.1",
"@babel/plugin-proposal-decorators": "^7.24.1",
"@ember/optional-features": "^2.1.0",
"@ember/test-helpers": "^3.3.0",
"@embroider/test-setup": "^3.0.3",
Expand All @@ -50,10 +50,10 @@
"ember-cli-sri": "^2.1.1",
"ember-cli-terser": "^4.0.2",
"ember-load-initializers": "^2.1.2",
"ember-page-title": "^8.2.2",
"ember-page-title": "^8.2.3",
"ember-qunit": "^8.0.2",
"ember-resolver": "^11.0.1",
"ember-source": "~5.8.0-beta.1",
"ember-source": "~5.8.0",
"ember-source-channel-url": "^3.0.0",
"ember-template-lint": "^5.13.0",
"ember-try": "^3.0.0",
Expand All @@ -71,7 +71,7 @@
"stylelint": "^15.11.0",
"stylelint-config-standard": "^34.0.0",
"stylelint-prettier": "^4.1.0",
"webpack": "^5.90.3"
"webpack": "^5.91.0"
},
"peerDependencies": {
"ember-source": ">= 4.0.0"
Expand Down
14 changes: 7 additions & 7 deletions tests/fixtures/app/defaults/package.json
View file
Expand Up @@ -25,9 +25,9 @@
"test:ember": "ember test"
},
"devDependencies": {
"@babel/core": "^7.24.0",
"@babel/eslint-parser": "^7.23.10",
"@babel/plugin-proposal-decorators": "^7.24.0",
"@babel/core": "^7.24.4",
"@babel/eslint-parser": "^7.24.1",
"@babel/plugin-proposal-decorators": "^7.24.1",
"@ember/optional-features": "^2.1.0",
"@ember/string": "^3.1.1",
"@ember/test-helpers": "^3.3.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.2",
"ember-page-title": "^8.2.3",
"ember-qunit": "^8.0.2",
"ember-resolver": "^11.0.1",
"ember-source": "~5.8.0-beta.1",
"ember-source": "~5.8.0",
"ember-template-lint": "^5.13.0",
"ember-welcome-page": "^7.0.2",
"eslint": "^8.57.0",
Expand All @@ -69,7 +69,7 @@
"stylelint-config-standard": "^34.0.0",
"stylelint-prettier": "^4.1.0",
"tracked-built-ins": "^3.3.0",
"webpack": "^5.90.3"
"webpack": "^5.91.0"
},
"engines": {
"node": ">= 18"
Expand Down
20 changes: 10 additions & 10 deletions tests/fixtures/app/embroider-no-welcome/package.json
View file
Expand Up @@ -25,15 +25,15 @@
"test:ember": "ember test"
},
"devDependencies": {
"@babel/core": "^7.24.0",
"@babel/eslint-parser": "^7.23.10",
"@babel/plugin-proposal-decorators": "^7.24.0",
"@babel/core": "^7.24.4",
"@babel/eslint-parser": "^7.24.1",
"@babel/plugin-proposal-decorators": "^7.24.1",
"@ember/optional-features": "^2.1.0",
"@ember/string": "^3.1.1",
"@ember/test-helpers": "^3.3.0",
"@embroider/compat": "^3.4.5",
"@embroider/core": "^3.4.5",
"@embroider/webpack": "^3.2.2",
"@embroider/compat": "^3.4.7",
"@embroider/core": "^3.4.7",
"@embroider/webpack": "^3.2.3",
"@glimmer/component": "^1.1.2",
"@glimmer/tracking": "^1.1.2",
"broccoli-asset-rev": "^3.0.0",
Expand All @@ -46,14 +46,14 @@
"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.2",
"ember-page-title": "^8.2.3",
"ember-qunit": "^8.0.2",
"ember-resolver": "^11.0.1",
"ember-source": "~5.8.0-beta.1",
"ember-source": "~5.8.0",
"ember-template-lint": "^5.13.0",
"eslint": "^8.57.0",
"eslint-config-prettier": "^9.1.0",
Expand All @@ -69,7 +69,7 @@
"stylelint-config-standard": "^34.0.0",
"stylelint-prettier": "^4.1.0",
"tracked-built-ins": "^3.3.0",
"webpack": "^5.90.3"
"webpack": "^5.91.0"
},
"engines": {
"node": ">= 18"
Expand Down
20 changes: 10 additions & 10 deletions tests/fixtures/app/embroider-pnpm/package.json
View file
Expand Up @@ -25,15 +25,15 @@
"test:ember": "ember test"
},
"devDependencies": {
"@babel/core": "^7.24.0",
"@babel/eslint-parser": "^7.23.10",
"@babel/plugin-proposal-decorators": "^7.24.0",
"@babel/core": "^7.24.4",
"@babel/eslint-parser": "^7.24.1",
"@babel/plugin-proposal-decorators": "^7.24.1",
"@ember/optional-features": "^2.1.0",
"@ember/string": "^3.1.1",
"@ember/test-helpers": "^3.3.0",
"@embroider/compat": "^3.4.5",
"@embroider/core": "^3.4.5",
"@embroider/webpack": "^3.2.2",
"@embroider/compat": "^3.4.7",
"@embroider/core": "^3.4.7",
"@embroider/webpack": "^3.2.3",
"@glimmer/component": "^1.1.2",
"@glimmer/tracking": "^1.1.2",
"broccoli-asset-rev": "^3.0.0",
Expand All @@ -46,14 +46,14 @@
"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.2",
"ember-page-title": "^8.2.3",
"ember-qunit": "^8.0.2",
"ember-resolver": "^11.0.1",
"ember-source": "~5.8.0-beta.1",
"ember-source": "~5.8.0",
"ember-template-lint": "^5.13.0",
"ember-welcome-page": "^7.0.2",
"eslint": "^8.57.0",
Expand All @@ -70,7 +70,7 @@
"stylelint-config-standard": "^34.0.0",
"stylelint-prettier": "^4.1.0",
"tracked-built-ins": "^3.3.0",
"webpack": "^5.90.3"
"webpack": "^5.91.0"
},
"engines": {
"node": ">= 18"
Expand Down

0 comments on commit ecc70c7

Please sign in to comment.