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 Jan 23, 2024
2 parents f824a6a + 7fb6f19 commit 40fb61d
Show file tree
Hide file tree
Showing 17 changed files with 257 additions and 257 deletions.
6 changes: 3 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# ember-cli Changelog

## v5.6.0-beta.0
## v5.6.0

#### Blueprint Changes

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

#### Changelog

Expand Down
82 changes: 41 additions & 41 deletions blueprints/app/files/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,53 +26,53 @@
"test:ember": "ember test"
},
"devDependencies": {
"@babel/core": "^7.23.6",
"@babel/core": "^7.23.7",
"<% if (!typescript) { %>@babel/eslint-parser": "^7.23.3",
"@babel/plugin-proposal-decorators": "^7.23.6",
"@babel/plugin-proposal-decorators": "^7.23.7",
"<% } %>@ember/optional-features": "^2.0.0",
"@ember/string": "^3.1.1",
"@ember/test-helpers": "^3.2.1<% if (embroider) { %>",
"@embroider/compat": "^3.4.2",
"@embroider/compat": "^3.4.3",
"@embroider/core": "^3.4.3",
"@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",
"@glint/environment-ember-loose": "^1.3.0",
"@glint/template": "^1.3.0",
"@tsconfig/ember": "^3.0.3",
"@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": "^4.0.11",
"@types/ember-data": "^4.4.16",
"@types/ember-data__adapter": "^4.0.6",
"@types/ember-data__model": "^4.0.5",
"@types/ember-data__serializer": "^4.0.6",
"@types/ember-data__store": "^4.0.7",
"@types/ember__application": "^4.0.11",
"@types/ember__array": "^4.0.10",
"@types/ember__component": "^4.0.22",
"@types/ember__controller": "^4.0.12",
"@types/ember__debug": "^4.0.8",
"@types/ember__destroyable": "^4.0.5",
"@types/ember__engine": "^4.0.11",
"@types/ember__error": "^4.0.6",
"@types/ember__helper": "^4.0.7",
"@types/ember__modifier": "^4.0.9",
"@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__service": "^4.0.9",
"@types/ember__string": "^3.16.3",
"@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.15.0",
"@typescript-eslint/parser": "^6.15.0<% } %>",
"@types/ember__template": "^4.0.6",
"@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<% } %>",
"broccoli-asset-rev": "^3.0.0",
"concurrently": "^8.2.2",
"ember-auto-import": "^2.7.1",
"ember-auto-import": "^2.7.2",
"ember-cli": "~<%= emberCLIVersion %>",
"ember-cli-app-version": "^6.0.1",
"ember-cli-babel": "^8.2.0",
Expand All @@ -82,24 +82,24 @@
"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.1.0",
"ember-page-title": "^8.2.0",
"ember-qunit": "^8.0.2",
"ember-resolver": "^11.0.1",
"ember-source": "~5.6.0-beta.2",
"ember-source": "~5.6.0",
"ember-template-lint": "^5.13.0<% if (welcome) { %>",
"ember-welcome-page": "^7.0.2<% } %>",
"eslint": "^8.56.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-ember": "^11.12.0",
"eslint-plugin-n": "^16.5.0",
"eslint-plugin-prettier": "^5.1.0",
"eslint-plugin-n": "^16.6.2",
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-qunit": "^8.0.1",
"loader.js": "^4.7.0",
"prettier": "^3.1.1",
"prettier": "^3.2.4",
"qunit": "^2.20.0",
"qunit-dom": "^2.0.0",
"stylelint": "^15.11.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.6.0-beta.0",
"version": "5.6.0",
"description": "Command line tool for developing ambitious ember.js apps",
"keywords": [
"app",
Expand Down
16 changes: 8 additions & 8 deletions tests/fixtures/addon/defaults/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,43 +28,43 @@
"test:ember-compatibility": "ember try:each"
},
"dependencies": {
"@babel/core": "^7.23.6",
"@babel/core": "^7.23.7",
"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.6",
"@babel/plugin-proposal-decorators": "^7.23.7",
"@ember/optional-features": "^2.0.0",
"@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.7.1",
"ember-auto-import": "^2.7.2",
"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.1.0",
"ember-page-title": "^8.2.0",
"ember-qunit": "^8.0.2",
"ember-resolver": "^11.0.1",
"ember-source": "~5.6.0-beta.2",
"ember-source": "~5.6.0",
"ember-source-channel-url": "^3.0.0",
"ember-template-lint": "^5.13.0",
"ember-try": "^3.0.0",
"eslint": "^8.56.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-ember": "^11.12.0",
"eslint-plugin-n": "^16.5.0",
"eslint-plugin-prettier": "^5.1.0",
"eslint-plugin-n": "^16.6.2",
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-qunit": "^8.0.1",
"loader.js": "^4.7.0",
"prettier": "^3.1.1",
"prettier": "^3.2.4",
"qunit": "^2.20.0",
"qunit-dom": "^2.0.0",
"stylelint": "^15.11.0",
Expand Down
16 changes: 8 additions & 8 deletions tests/fixtures/addon/pnpm/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,44 +28,44 @@
"test:ember-compatibility": "ember try:each"
},
"dependencies": {
"@babel/core": "^7.23.6",
"@babel/core": "^7.23.7",
"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.6",
"@babel/plugin-proposal-decorators": "^7.23.7",
"@ember/optional-features": "^2.0.0",
"@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.7.1",
"ember-auto-import": "^2.7.2",
"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.1.0",
"ember-page-title": "^8.2.0",
"ember-qunit": "^8.0.2",
"ember-resolver": "^11.0.1",
"ember-source": "~5.6.0-beta.2",
"ember-source": "~5.6.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-config-prettier": "^9.1.0",
"eslint-plugin-ember": "^11.12.0",
"eslint-plugin-n": "^16.5.0",
"eslint-plugin-prettier": "^5.1.0",
"eslint-plugin-n": "^16.6.2",
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-qunit": "^8.0.1",
"loader.js": "^4.7.0",
"prettier": "^3.1.1",
"prettier": "^3.2.4",
"qunit": "^2.20.0",
"qunit-dom": "^2.0.0",
"stylelint": "^15.11.0",
Expand Down
66 changes: 33 additions & 33 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.23.6",
"@babel/core": "^7.23.7",
"ember-cli-babel": "^8.2.0",
"ember-cli-htmlbars": "^6.3.0"
},
Expand All @@ -56,59 +56,59 @@
"@embroider/test-setup": "^3.0.3",
"@glimmer/component": "^1.1.2",
"@glimmer/tracking": "^1.1.2",
"@glint/environment-ember-loose": "^1.2.1",
"@glint/template": "^1.2.1",
"@glint/environment-ember-loose": "^1.3.0",
"@glint/template": "^1.3.0",
"@tsconfig/ember": "^3.0.3",
"@types/ember": "^4.0.10",
"@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": "^4.0.11",
"@types/ember__application": "^4.0.11",
"@types/ember__array": "^4.0.10",
"@types/ember__component": "^4.0.22",
"@types/ember__controller": "^4.0.12",
"@types/ember__debug": "^4.0.8",
"@types/ember__destroyable": "^4.0.5",
"@types/ember__engine": "^4.0.11",
"@types/ember__error": "^4.0.6",
"@types/ember__helper": "^4.0.7",
"@types/ember__modifier": "^4.0.9",
"@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__service": "^4.0.9",
"@types/ember__string": "^3.16.3",
"@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.15.0",
"@typescript-eslint/parser": "^6.15.0",
"@types/ember__template": "^4.0.6",
"@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",
"broccoli-asset-rev": "^3.0.0",
"concurrently": "^8.2.2",
"ember-auto-import": "^2.7.1",
"ember-auto-import": "^2.7.2",
"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.1.0",
"ember-page-title": "^8.2.0",
"ember-qunit": "^8.0.2",
"ember-resolver": "^11.0.1",
"ember-source": "~5.6.0-beta.2",
"ember-source": "~5.6.0",
"ember-source-channel-url": "^3.0.0",
"ember-template-lint": "^5.13.0",
"ember-try": "^3.0.0",
"eslint": "^8.56.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-ember": "^11.12.0",
"eslint-plugin-n": "^16.5.0",
"eslint-plugin-prettier": "^5.1.0",
"eslint-plugin-n": "^16.6.2",
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-qunit": "^8.0.1",
"loader.js": "^4.7.0",
"prettier": "^3.1.1",
"prettier": "^3.2.4",
"qunit": "^2.20.0",
"qunit-dom": "^2.0.0",
"rimraf": "^5.0.1",
Expand Down

0 comments on commit 40fb61d

Please sign in to comment.