From 7074175f54792b2f63244a93a8487b863228b4eb Mon Sep 17 00:00:00 2001 From: Kelly Selden Date: Mon, 28 Feb 2022 16:14:58 -0800 Subject: [PATCH 1/4] update beta deps before release --- .../addon/additional-dev-dependencies.json | 2 +- blueprints/app/files/package.json | 22 +++++++++---------- tests/fixtures/addon/defaults/package.json | 16 +++++++------- tests/fixtures/addon/yarn/package.json | 16 +++++++------- tests/fixtures/app/defaults/package.json | 16 +++++++------- .../app/embroider-no-welcome/package.json | 22 +++++++++---------- .../fixtures/app/embroider-yarn/package.json | 22 +++++++++---------- tests/fixtures/app/embroider/package.json | 22 +++++++++---------- tests/fixtures/app/npm/package.json | 16 +++++++------- tests/fixtures/app/yarn/package.json | 16 +++++++------- 10 files changed, 85 insertions(+), 85 deletions(-) diff --git a/blueprints/addon/additional-dev-dependencies.json b/blueprints/addon/additional-dev-dependencies.json index 51307c0bfa..d4f7cfd2a0 100644 --- a/blueprints/addon/additional-dev-dependencies.json +++ b/blueprints/addon/additional-dev-dependencies.json @@ -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" diff --git a/blueprints/app/files/package.json b/blueprints/app/files/package.json index 0a2b49b6c3..39a4344c81 100644 --- a/blueprints/app/files/package.json +++ b/blueprints/app/files/package.json @@ -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", @@ -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" diff --git a/tests/fixtures/addon/defaults/package.json b/tests/fixtures/addon/defaults/package.json index ca8bba3033..9714bb6d55 100644 --- a/tests/fixtures/addon/defaults/package.json +++ b/tests/fixtures/addon/defaults/package.json @@ -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", @@ -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" diff --git a/tests/fixtures/addon/yarn/package.json b/tests/fixtures/addon/yarn/package.json index a4d533d14c..677aeb20e4 100644 --- a/tests/fixtures/addon/yarn/package.json +++ b/tests/fixtures/addon/yarn/package.json @@ -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", @@ -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" diff --git a/tests/fixtures/app/defaults/package.json b/tests/fixtures/app/defaults/package.json index cd2ab19b05..810507ff75 100644 --- a/tests/fixtures/app/defaults/package.json +++ b/tests/fixtures/app/defaults/package.json @@ -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", @@ -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" diff --git a/tests/fixtures/app/embroider-no-welcome/package.json b/tests/fixtures/app/embroider-no-welcome/package.json index 7c827fbc7e..fb557edf63 100644 --- a/tests/fixtures/app/embroider-no-welcome/package.json +++ b/tests/fixtures/app/embroider-no-welcome/package.json @@ -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", @@ -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" diff --git a/tests/fixtures/app/embroider-yarn/package.json b/tests/fixtures/app/embroider-yarn/package.json index a29c0030b4..19d4b6b780 100644 --- a/tests/fixtures/app/embroider-yarn/package.json +++ b/tests/fixtures/app/embroider-yarn/package.json @@ -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", @@ -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" diff --git a/tests/fixtures/app/embroider/package.json b/tests/fixtures/app/embroider/package.json index a29c0030b4..19d4b6b780 100644 --- a/tests/fixtures/app/embroider/package.json +++ b/tests/fixtures/app/embroider/package.json @@ -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", @@ -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" diff --git a/tests/fixtures/app/npm/package.json b/tests/fixtures/app/npm/package.json index 1dd1036423..9bffe3af78 100644 --- a/tests/fixtures/app/npm/package.json +++ b/tests/fixtures/app/npm/package.json @@ -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", @@ -38,27 +38,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" diff --git a/tests/fixtures/app/yarn/package.json b/tests/fixtures/app/yarn/package.json index cd2ab19b05..810507ff75 100644 --- a/tests/fixtures/app/yarn/package.json +++ b/tests/fixtures/app/yarn/package.json @@ -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", @@ -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" From 3bfa655fa506fd520deabfea3a3e42eb4c9b3d10 Mon Sep 17 00:00:00 2001 From: Kelly Selden Date: Tue, 1 Mar 2022 08:46:49 -0800 Subject: [PATCH 2/4] update changelog --- CHANGELOG.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ddb74a4556..1130ec9626 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,14 +1,17 @@ # 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.0...v4.2.0) +- [`ember addon` diff](https://github.com/ember-cli/ember-addon-output/compare/v4.1.0...v4.2.0) #### Changelog +- [#9737](https://github.com/ember-cli/ember-cli/pull/9737) Remove jQuery integration scenario from ember-try [@NullVoxPopuli](https://github.com/NullVoxPopuli) +- [#9739](https://github.com/ember-cli/ember-cli/pull/9739) Change blueprint to generate apps using 'history' location [@kategengler](https://github.com/kategengler) +- [#9762](https://github.com/ember-cli/ember-cli/pull/9762) Update @embroider/* packages to 1.0.0. [@rwjblue](https://github.com/rwjblue) - [#9681](https://github.com/ember-cli/ember-cli/pull/9681) Update URL to Ember CLI website everywhere [@bertdeblock](https://github.com/bertdeblock) - [#9726](https://github.com/ember-cli/ember-cli/pull/9726) Cancel stale workflows when starting a new one. [@rwjblue](https://github.com/rwjblue) - [#9731](https://github.com/ember-cli/ember-cli/pull/9731) Add an `assert` and a `deprecate` utility [@bertdeblock](https://github.com/bertdeblock) From 599cdc4041cae3147cf8b7b8615ba4f269343d51 Mon Sep 17 00:00:00 2001 From: Kelly Selden Date: Tue, 1 Mar 2022 08:47:21 -0800 Subject: [PATCH 3/4] Release 4.2.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8bc5e44f5e..16326dda6e 100644 --- a/package.json +++ b/package.json @@ -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", From f3395fd683d22dd81c2ced8cf26aa0d3483e72c0 Mon Sep 17 00:00:00 2001 From: Kelly Selden Date: Tue, 1 Mar 2022 08:50:34 -0800 Subject: [PATCH 4/4] fix changelog --- CHANGELOG.md | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1130ec9626..2c05a9ead0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,14 +4,11 @@ #### Blueprint Changes -- [`ember new` diff](https://github.com/ember-cli/ember-new-output/compare/v4.1.0...v4.2.0) -- [`ember addon` diff](https://github.com/ember-cli/ember-addon-output/compare/v4.1.0...v4.2.0) +- [`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 -- [#9737](https://github.com/ember-cli/ember-cli/pull/9737) Remove jQuery integration scenario from ember-try [@NullVoxPopuli](https://github.com/NullVoxPopuli) -- [#9739](https://github.com/ember-cli/ember-cli/pull/9739) Change blueprint to generate apps using 'history' location [@kategengler](https://github.com/kategengler) -- [#9762](https://github.com/ember-cli/ember-cli/pull/9762) Update @embroider/* packages to 1.0.0. [@rwjblue](https://github.com/rwjblue) - [#9681](https://github.com/ember-cli/ember-cli/pull/9681) Update URL to Ember CLI website everywhere [@bertdeblock](https://github.com/bertdeblock) - [#9726](https://github.com/ember-cli/ember-cli/pull/9726) Cancel stale workflows when starting a new one. [@rwjblue](https://github.com/rwjblue) - [#9731](https://github.com/ember-cli/ember-cli/pull/9731) Add an `assert` and a `deprecate` utility [@bertdeblock](https://github.com/bertdeblock)