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 Mar 1, 2022
2 parents 4527939 + 94f63ac commit 0a5a31e
Show file tree
Hide file tree
Showing 12 changed files with 89 additions and 89 deletions.
6 changes: 3 additions & 3 deletions CHANGELOG.md
View file
@@ -1,11 +1,11 @@
# ember-cli Changelog

## v4.2.0-beta.1
## v4.2.0

#### Blueprint Changes

- [`ember new` diff](https://github.com/ember-cli/ember-new-output/compare/v4.1.0...v4.2.0-beta.1)
- [`ember addon` diff](https://github.com/ember-cli/ember-addon-output/compare/v4.1.0...v4.2.0-beta.1)
- [`ember new` diff](https://github.com/ember-cli/ember-new-output/compare/v4.1.1...v4.2.0)
- [`ember addon` diff](https://github.com/ember-cli/ember-addon-output/compare/v4.1.1...v4.2.0)

#### Changelog

Expand Down
2 changes: 1 addition & 1 deletion blueprints/addon/additional-dev-dependencies.json
View file
@@ -1,6 +1,6 @@
{
"devDependencies": {
"@embroider/test-setup": "^1.0.0",
"@embroider/test-setup": "^1.2.0",
"ember-disable-prototype-extensions": "^1.1.3",
"ember-try": "^2.0.0",
"ember-source-channel-url": "^3.0.0"
Expand Down
22 changes: 11 additions & 11 deletions blueprints/app/files/package.json
View file
Expand Up @@ -25,14 +25,14 @@
"devDependencies": {
"@ember/optional-features": "^2.0.0",
"@ember/test-helpers": "^2.6.0<% if (embroider) { %>",
"@embroider/compat": "^1.0.0",
"@embroider/core": "^1.0.0",
"@embroider/webpack": "^1.0.0<% } %>",
"@embroider/compat": "^1.2.0",
"@embroider/core": "^1.2.0",
"@embroider/webpack": "^1.2.0<% } %>",
"@glimmer/component": "^1.0.4",
"@glimmer/tracking": "^1.0.4",
"babel-eslint": "^10.1.0",
"broccoli-asset-rev": "^3.0.0",
"ember-auto-import": "^2.2.4",
"ember-auto-import": "^2.4.0",
"ember-cli": "~<%= emberCLIVersion %>",
"ember-cli-app-version": "^5.0.0",
"ember-cli-babel": "^7.26.11",
Expand All @@ -41,28 +41,28 @@
"ember-cli-inject-live-reload": "^2.1.0",
"ember-cli-sri": "^2.1.1",
"ember-cli-terser": "^4.0.2",
"ember-data": "~4.2.0-beta.0",
"ember-data": "~4.2.0",
"ember-export-application-global": "^2.0.1",
"ember-fetch": "^8.1.1",
"ember-load-initializers": "^2.1.2",
"ember-page-title": "^7.0.0",
"ember-qunit": "^5.1.5",
"ember-resolver": "^8.0.3",
"ember-source": "~4.2.0-beta.1",
"ember-template-lint": "^4.0.0<% if (welcome) { %>",
"ember-source": "~4.2.0",
"ember-template-lint": "^4.2.0<% if (welcome) { %>",
"ember-welcome-page": "^6.1.0<% } %>",
"eslint": "^7.32.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-ember": "^10.5.8",
"eslint-config-prettier": "^8.4.0",
"eslint-plugin-ember": "^10.5.9",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-prettier": "^4.0.0",
"eslint-plugin-qunit": "^7.2.0",
"loader.js": "^4.7.0",
"npm-run-all": "^4.1.5",
"prettier": "^2.5.1",
"qunit": "^2.17.2",
"qunit": "^2.18.0",
"qunit-dom": "^2.0.0",
"webpack": "^5.65.0"
"webpack": "^5.69.1"
},
"engines": {
"node": "12.* || 14.* || >= 16"
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
@@ -1,6 +1,6 @@
{
"name": "ember-cli",
"version": "4.2.0-beta.1",
"version": "4.2.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
View file
Expand Up @@ -32,12 +32,12 @@
"devDependencies": {
"@ember/optional-features": "^2.0.0",
"@ember/test-helpers": "^2.6.0",
"@embroider/test-setup": "^1.0.0",
"@embroider/test-setup": "^1.2.0",
"@glimmer/component": "^1.0.4",
"@glimmer/tracking": "^1.0.4",
"babel-eslint": "^10.1.0",
"broccoli-asset-rev": "^3.0.0",
"ember-auto-import": "^2.2.4",
"ember-auto-import": "^2.4.0",
"ember-cli": "~<%= emberCLIVersion %>",
"ember-cli-dependency-checker": "^3.2.0",
"ember-cli-inject-live-reload": "^2.1.0",
Expand All @@ -49,22 +49,22 @@
"ember-page-title": "^7.0.0",
"ember-qunit": "^5.1.5",
"ember-resolver": "^8.0.3",
"ember-source": "~4.2.0-beta.1",
"ember-source": "~4.2.0",
"ember-source-channel-url": "^3.0.0",
"ember-template-lint": "^4.0.0",
"ember-template-lint": "^4.2.0",
"ember-try": "^2.0.0",
"eslint": "^7.32.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-ember": "^10.5.8",
"eslint-config-prettier": "^8.4.0",
"eslint-plugin-ember": "^10.5.9",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-prettier": "^4.0.0",
"eslint-plugin-qunit": "^7.2.0",
"loader.js": "^4.7.0",
"npm-run-all": "^4.1.5",
"prettier": "^2.5.1",
"qunit": "^2.17.2",
"qunit": "^2.18.0",
"qunit-dom": "^2.0.0",
"webpack": "^5.65.0"
"webpack": "^5.69.1"
},
"engines": {
"node": "12.* || 14.* || >= 16"
Expand Down
16 changes: 8 additions & 8 deletions tests/fixtures/addon/yarn/package.json
View file
Expand Up @@ -32,12 +32,12 @@
"devDependencies": {
"@ember/optional-features": "^2.0.0",
"@ember/test-helpers": "^2.6.0",
"@embroider/test-setup": "^1.0.0",
"@embroider/test-setup": "^1.2.0",
"@glimmer/component": "^1.0.4",
"@glimmer/tracking": "^1.0.4",
"babel-eslint": "^10.1.0",
"broccoli-asset-rev": "^3.0.0",
"ember-auto-import": "^2.2.4",
"ember-auto-import": "^2.4.0",
"ember-cli": "~<%= emberCLIVersion %>",
"ember-cli-dependency-checker": "^3.2.0",
"ember-cli-inject-live-reload": "^2.1.0",
Expand All @@ -49,23 +49,23 @@
"ember-page-title": "^7.0.0",
"ember-qunit": "^5.1.5",
"ember-resolver": "^8.0.3",
"ember-source": "~4.2.0-beta.1",
"ember-source": "~4.2.0",
"ember-source-channel-url": "^3.0.0",
"ember-template-lint": "^4.0.0",
"ember-template-lint": "^4.2.0",
"ember-try": "^2.0.0",
"ember-welcome-page": "^6.1.0",
"eslint": "^7.32.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-ember": "^10.5.8",
"eslint-config-prettier": "^8.4.0",
"eslint-plugin-ember": "^10.5.9",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-prettier": "^4.0.0",
"eslint-plugin-qunit": "^7.2.0",
"loader.js": "^4.7.0",
"npm-run-all": "^4.1.5",
"prettier": "^2.5.1",
"qunit": "^2.17.2",
"qunit": "^2.18.0",
"qunit-dom": "^2.0.0",
"webpack": "^5.65.0"
"webpack": "^5.69.1"
},
"engines": {
"node": "12.* || 14.* || >= 16"
Expand Down
16 changes: 8 additions & 8 deletions tests/fixtures/app/defaults/package.json
View file
Expand Up @@ -29,7 +29,7 @@
"@glimmer/tracking": "^1.0.4",
"babel-eslint": "^10.1.0",
"broccoli-asset-rev": "^3.0.0",
"ember-auto-import": "^2.2.4",
"ember-auto-import": "^2.4.0",
"ember-cli": "~<%= emberCLIVersion %>",
"ember-cli-app-version": "^5.0.0",
"ember-cli-babel": "^7.26.11",
Expand All @@ -38,28 +38,28 @@
"ember-cli-inject-live-reload": "^2.1.0",
"ember-cli-sri": "^2.1.1",
"ember-cli-terser": "^4.0.2",
"ember-data": "~4.2.0-beta.0",
"ember-data": "~4.2.0",
"ember-export-application-global": "^2.0.1",
"ember-fetch": "^8.1.1",
"ember-load-initializers": "^2.1.2",
"ember-page-title": "^7.0.0",
"ember-qunit": "^5.1.5",
"ember-resolver": "^8.0.3",
"ember-source": "~4.2.0-beta.1",
"ember-template-lint": "^4.0.0",
"ember-source": "~4.2.0",
"ember-template-lint": "^4.2.0",
"ember-welcome-page": "^6.1.0",
"eslint": "^7.32.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-ember": "^10.5.8",
"eslint-config-prettier": "^8.4.0",
"eslint-plugin-ember": "^10.5.9",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-prettier": "^4.0.0",
"eslint-plugin-qunit": "^7.2.0",
"loader.js": "^4.7.0",
"npm-run-all": "^4.1.5",
"prettier": "^2.5.1",
"qunit": "^2.17.2",
"qunit": "^2.18.0",
"qunit-dom": "^2.0.0",
"webpack": "^5.65.0"
"webpack": "^5.69.1"
},
"engines": {
"node": "12.* || 14.* || >= 16"
Expand Down
22 changes: 11 additions & 11 deletions tests/fixtures/app/embroider-no-welcome/package.json
View file
Expand Up @@ -25,14 +25,14 @@
"devDependencies": {
"@ember/optional-features": "^2.0.0",
"@ember/test-helpers": "^2.6.0",
"@embroider/compat": "^1.0.0",
"@embroider/core": "^1.0.0",
"@embroider/webpack": "^1.0.0",
"@embroider/compat": "^1.2.0",
"@embroider/core": "^1.2.0",
"@embroider/webpack": "^1.2.0",
"@glimmer/component": "^1.0.4",
"@glimmer/tracking": "^1.0.4",
"babel-eslint": "^10.1.0",
"broccoli-asset-rev": "^3.0.0",
"ember-auto-import": "^2.2.4",
"ember-auto-import": "^2.4.0",
"ember-cli": "~<%= emberCLIVersion %>",
"ember-cli-app-version": "^5.0.0",
"ember-cli-babel": "^7.26.11",
Expand All @@ -41,27 +41,27 @@
"ember-cli-inject-live-reload": "^2.1.0",
"ember-cli-sri": "^2.1.1",
"ember-cli-terser": "^4.0.2",
"ember-data": "~4.2.0-beta.0",
"ember-data": "~4.2.0",
"ember-export-application-global": "^2.0.1",
"ember-fetch": "^8.1.1",
"ember-load-initializers": "^2.1.2",
"ember-page-title": "^7.0.0",
"ember-qunit": "^5.1.5",
"ember-resolver": "^8.0.3",
"ember-source": "~4.2.0-beta.1",
"ember-template-lint": "^4.0.0",
"ember-source": "~4.2.0",
"ember-template-lint": "^4.2.0",
"eslint": "^7.32.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-ember": "^10.5.8",
"eslint-config-prettier": "^8.4.0",
"eslint-plugin-ember": "^10.5.9",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-prettier": "^4.0.0",
"eslint-plugin-qunit": "^7.2.0",
"loader.js": "^4.7.0",
"npm-run-all": "^4.1.5",
"prettier": "^2.5.1",
"qunit": "^2.17.2",
"qunit": "^2.18.0",
"qunit-dom": "^2.0.0",
"webpack": "^5.65.0"
"webpack": "^5.69.1"
},
"engines": {
"node": "12.* || 14.* || >= 16"
Expand Down
22 changes: 11 additions & 11 deletions tests/fixtures/app/embroider-yarn/package.json
View file
Expand Up @@ -25,14 +25,14 @@
"devDependencies": {
"@ember/optional-features": "^2.0.0",
"@ember/test-helpers": "^2.6.0",
"@embroider/compat": "^1.0.0",
"@embroider/core": "^1.0.0",
"@embroider/webpack": "^1.0.0",
"@embroider/compat": "^1.2.0",
"@embroider/core": "^1.2.0",
"@embroider/webpack": "^1.2.0",
"@glimmer/component": "^1.0.4",
"@glimmer/tracking": "^1.0.4",
"babel-eslint": "^10.1.0",
"broccoli-asset-rev": "^3.0.0",
"ember-auto-import": "^2.2.4",
"ember-auto-import": "^2.4.0",
"ember-cli": "~<%= emberCLIVersion %>",
"ember-cli-app-version": "^5.0.0",
"ember-cli-babel": "^7.26.11",
Expand All @@ -41,28 +41,28 @@
"ember-cli-inject-live-reload": "^2.1.0",
"ember-cli-sri": "^2.1.1",
"ember-cli-terser": "^4.0.2",
"ember-data": "~4.2.0-beta.0",
"ember-data": "~4.2.0",
"ember-export-application-global": "^2.0.1",
"ember-fetch": "^8.1.1",
"ember-load-initializers": "^2.1.2",
"ember-page-title": "^7.0.0",
"ember-qunit": "^5.1.5",
"ember-resolver": "^8.0.3",
"ember-source": "~4.2.0-beta.1",
"ember-template-lint": "^4.0.0",
"ember-source": "~4.2.0",
"ember-template-lint": "^4.2.0",
"ember-welcome-page": "^6.1.0",
"eslint": "^7.32.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-ember": "^10.5.8",
"eslint-config-prettier": "^8.4.0",
"eslint-plugin-ember": "^10.5.9",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-prettier": "^4.0.0",
"eslint-plugin-qunit": "^7.2.0",
"loader.js": "^4.7.0",
"npm-run-all": "^4.1.5",
"prettier": "^2.5.1",
"qunit": "^2.17.2",
"qunit": "^2.18.0",
"qunit-dom": "^2.0.0",
"webpack": "^5.65.0"
"webpack": "^5.69.1"
},
"engines": {
"node": "12.* || 14.* || >= 16"
Expand Down
22 changes: 11 additions & 11 deletions tests/fixtures/app/embroider/package.json
View file
Expand Up @@ -25,14 +25,14 @@
"devDependencies": {
"@ember/optional-features": "^2.0.0",
"@ember/test-helpers": "^2.6.0",
"@embroider/compat": "^1.0.0",
"@embroider/core": "^1.0.0",
"@embroider/webpack": "^1.0.0",
"@embroider/compat": "^1.2.0",
"@embroider/core": "^1.2.0",
"@embroider/webpack": "^1.2.0",
"@glimmer/component": "^1.0.4",
"@glimmer/tracking": "^1.0.4",
"babel-eslint": "^10.1.0",
"broccoli-asset-rev": "^3.0.0",
"ember-auto-import": "^2.2.4",
"ember-auto-import": "^2.4.0",
"ember-cli": "~<%= emberCLIVersion %>",
"ember-cli-app-version": "^5.0.0",
"ember-cli-babel": "^7.26.11",
Expand All @@ -41,28 +41,28 @@
"ember-cli-inject-live-reload": "^2.1.0",
"ember-cli-sri": "^2.1.1",
"ember-cli-terser": "^4.0.2",
"ember-data": "~4.2.0-beta.0",
"ember-data": "~4.2.0",
"ember-export-application-global": "^2.0.1",
"ember-fetch": "^8.1.1",
"ember-load-initializers": "^2.1.2",
"ember-page-title": "^7.0.0",
"ember-qunit": "^5.1.5",
"ember-resolver": "^8.0.3",
"ember-source": "~4.2.0-beta.1",
"ember-template-lint": "^4.0.0",
"ember-source": "~4.2.0",
"ember-template-lint": "^4.2.0",
"ember-welcome-page": "^6.1.0",
"eslint": "^7.32.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-ember": "^10.5.8",
"eslint-config-prettier": "^8.4.0",
"eslint-plugin-ember": "^10.5.9",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-prettier": "^4.0.0",
"eslint-plugin-qunit": "^7.2.0",
"loader.js": "^4.7.0",
"npm-run-all": "^4.1.5",
"prettier": "^2.5.1",
"qunit": "^2.17.2",
"qunit": "^2.18.0",
"qunit-dom": "^2.0.0",
"webpack": "^5.65.0"
"webpack": "^5.69.1"
},
"engines": {
"node": "12.* || 14.* || >= 16"
Expand Down

0 comments on commit 0a5a31e

Please sign in to comment.