Merge branch 'master' into rfc-772-deprecate-bower-support

CHANGELOG.md

@@ -1,5 +1,21 @@
 # ember-cli Changelog
 
+## v4.2.0-beta.1
+
+#### 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)
+
+#### Changelog
+
+- [#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)
+- [#9753](https://github.com/ember-cli/ember-cli/pull/9753) Upgrade to `ember-template-lint` v4 in blueprint [@bmish](https://github.com/bmish)
+
+Thank you to all who took the time to contribute!
+
 ## v4.1.0
 
 #### Blueprint Changes

README.md

@@ -65,7 +65,7 @@ Community
 
 - Discord: [Get your invite](https://discord.gg/emberjs)
 - Issues: [ember-cli/issues](https://github.com/ember-cli/ember-cli/issues)
-- Documentation: [ember-cli.com](https://cli.emberjs.com/release/)
+- Documentation: [cli.emberjs.com](https://cli.emberjs.com/release/)
 
 
 

blueprints/addon/additional-dev-dependencies.json

@@ -1,6 +1,6 @@
 {
   "devDependencies": {
-    "@embroider/test-setup": "^0.49.0",
+    "@embroider/test-setup": "^0.50.0",
     "ember-disable-prototype-extensions": "^1.1.3",
     "ember-try": "^2.0.0",
     "ember-source-channel-url": "^3.0.0"

blueprints/addon/files/CONTRIBUTING.md

@@ -22,4 +22,4 @@
 * `ember serve`
 * Visit the dummy application at [http://localhost:4200](http://localhost:4200).
 
-For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).
+For more information on using ember-cli, visit [https://cli.emberjs.com/release/](https://cli.emberjs.com/release/).

blueprints/app/files/README.md

@@ -10,7 +10,7 @@ You will need the following things properly installed on your computer.
 * [Git](https://git-scm.com/)
 * [Node.js](https://nodejs.org/)<% if (yarn) { %>
 * [Yarn](https://yarnpkg.com/)<% } else { %> (with npm)<% } %>
-* [Ember CLI](https://ember-cli.com/)
+* [Ember CLI](https://cli.emberjs.com/release/)
 * [Google Chrome](https://google.com/chrome/)
 
 ## Installation
@@ -51,7 +51,7 @@ Specify what it takes to deploy your app.
 ## Further Reading / Useful Links
 
 * [ember.js](https://emberjs.com/)
-* [ember-cli](https://ember-cli.com/)
+* [ember-cli](https://cli.emberjs.com/release/)
 * Development Browser Extensions
   * [ember inspector for chrome](https://chrome.google.com/webstore/detail/ember-inspector/bmdblncegkenkacieihfhpjfppoconhi)
   * [ember inspector for firefox](https://addons.mozilla.org/en-US/firefox/addon/ember-inspector/)

blueprints/app/files/package.json

@@ -25,9 +25,9 @@
   "devDependencies": {
     "@ember/optional-features": "^2.0.0",
     "@ember/test-helpers": "^2.6.0<% if (embroider) { %>",
-    "@embroider/compat": "^0.49.0",
-    "@embroider/core": "^0.49.0",
-    "@embroider/webpack": "^0.49.0<% } %>",
+    "@embroider/compat": "^0.50.0",
+    "@embroider/core": "^0.50.0",
+    "@embroider/webpack": "^0.50.0<% } %>",
     "@glimmer/component": "^1.0.4",
     "@glimmer/tracking": "^1.0.4",
     "babel-eslint": "^10.1.0",
@@ -41,16 +41,16 @@
     "ember-cli-inject-live-reload": "^2.1.0",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "^4.0.2",
-    "ember-data": "~4.1.0",
+    "ember-data": "~4.2.0-beta.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.1.0",
-    "ember-template-lint": "^3.15.0<% if (welcome) { %>",
-    "ember-welcome-page": "^6.0.0<% } %>",
+    "ember-source": "~4.2.0-beta.1",
+    "ember-template-lint": "^4.0.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",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-cli",
-  "version": "4.1.0",
+  "version": "4.2.0-beta.1",
   "description": "Command line tool for developing ambitious ember.js apps",
   "keywords": [
     "app",
@@ -12,7 +12,7 @@
     "ember.js",
     "kit"
   ],
-  "homepage": "https://ember-cli.com/",
+  "homepage": "https://cli.emberjs.com/release/",
   "bugs": {
     "url": "https://github.com/ember-cli/ember-cli/issues"
   },
@@ -140,7 +140,7 @@
     "chai-jest-snapshot": "^2.0.0",
     "ember-cli-blueprint-test-helpers": "^0.19.2",
     "ember-cli-internal-test-helpers": "^0.9.1",
-    "eslint": "^7.11.0",
+    "eslint": "^8.6.0",
     "eslint-config-prettier": "^7.2.0",
     "eslint-plugin-chai-expect": "^3.0.0",
     "eslint-plugin-mocha": "^9.0.0",

tests/fixtures/addon/defaults-travis/CONTRIBUTING.md

@@ -22,4 +22,4 @@
 * `ember serve`
 * Visit the dummy application at [http://localhost:4200](http://localhost:4200).
 
-For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).
+For more information on using ember-cli, visit [https://cli.emberjs.com/release/](https://cli.emberjs.com/release/).

tests/fixtures/addon/defaults-travis/package.json

@@ -52,7 +52,7 @@
     "ember-resolver": "^8.0.2",
     "ember-source": "~3.27.2",
     "ember-source-channel-url": "^3.0.0",
-    "ember-template-lint": "^3.4.2",
+    "ember-template-lint": "^4.0.0",
     "ember-try": "^1.4.0",
     "eslint": "^7.27.0",
     "eslint-config-prettier": "^8.3.0",

tests/fixtures/addon/defaults/CONTRIBUTING.md

@@ -22,4 +22,4 @@
 * `ember serve`
 * Visit the dummy application at [http://localhost:4200](http://localhost:4200).
 
-For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).
+For more information on using ember-cli, visit [https://cli.emberjs.com/release/](https://cli.emberjs.com/release/).

tests/fixtures/addon/defaults/package.json

@@ -32,7 +32,7 @@
   "devDependencies": {
     "@ember/optional-features": "^2.0.0",
     "@ember/test-helpers": "^2.6.0",
-    "@embroider/test-setup": "^0.49.0",
+    "@embroider/test-setup": "^0.50.0",
     "@glimmer/component": "^1.0.4",
     "@glimmer/tracking": "^1.0.4",
     "babel-eslint": "^10.1.0",
@@ -49,9 +49,9 @@
     "ember-page-title": "^7.0.0",
     "ember-qunit": "^5.1.5",
     "ember-resolver": "^8.0.3",
-    "ember-source": "~4.1.0",
+    "ember-source": "~4.2.0-beta.1",
     "ember-source-channel-url": "^3.0.0",
-    "ember-template-lint": "^3.15.0",
+    "ember-template-lint": "^4.0.0",
     "ember-try": "^2.0.0",
     "eslint": "^7.32.0",
     "eslint-config-prettier": "^8.3.0",

tests/fixtures/addon/yarn/CONTRIBUTING.md

@@ -22,4 +22,4 @@
 * `ember serve`
 * Visit the dummy application at [http://localhost:4200](http://localhost:4200).
 
-For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).
+For more information on using ember-cli, visit [https://cli.emberjs.com/release/](https://cli.emberjs.com/release/).

tests/fixtures/addon/yarn/package.json

@@ -32,7 +32,7 @@
   "devDependencies": {
     "@ember/optional-features": "^2.0.0",
     "@ember/test-helpers": "^2.6.0",
-    "@embroider/test-setup": "^0.49.0",
+    "@embroider/test-setup": "^0.50.0",
     "@glimmer/component": "^1.0.4",
     "@glimmer/tracking": "^1.0.4",
     "babel-eslint": "^10.1.0",
@@ -49,11 +49,11 @@
     "ember-page-title": "^7.0.0",
     "ember-qunit": "^5.1.5",
     "ember-resolver": "^8.0.3",
-    "ember-source": "~4.1.0",
+    "ember-source": "~4.2.0-beta.1",
     "ember-source-channel-url": "^3.0.0",
-    "ember-template-lint": "^3.15.0",
+    "ember-template-lint": "^4.0.0",
     "ember-try": "^2.0.0",
-    "ember-welcome-page": "^6.0.0",
+    "ember-welcome-page": "^6.1.0",
     "eslint": "^7.32.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-ember": "^10.5.8",

tests/fixtures/app/defaults/README.md

@@ -9,7 +9,7 @@ You will need the following things properly installed on your computer.
 
 * [Git](https://git-scm.com/)
 * [Node.js](https://nodejs.org/) (with npm)
-* [Ember CLI](https://ember-cli.com/)
+* [Ember CLI](https://cli.emberjs.com/release/)
 * [Google Chrome](https://google.com/chrome/)
 
 ## Installation
@@ -50,7 +50,7 @@ Specify what it takes to deploy your app.
 ## Further Reading / Useful Links
 
 * [ember.js](https://emberjs.com/)
-* [ember-cli](https://ember-cli.com/)
+* [ember-cli](https://cli.emberjs.com/release/)
 * Development Browser Extensions
   * [ember inspector for chrome](https://chrome.google.com/webstore/detail/ember-inspector/bmdblncegkenkacieihfhpjfppoconhi)
   * [ember inspector for firefox](https://addons.mozilla.org/en-US/firefox/addon/ember-inspector/)

tests/fixtures/app/defaults/package.json

@@ -38,16 +38,16 @@
     "ember-cli-inject-live-reload": "^2.1.0",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "^4.0.2",
-    "ember-data": "~4.1.0",
+    "ember-data": "~4.2.0-beta.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.1.0",
-    "ember-template-lint": "^3.15.0",
-    "ember-welcome-page": "^6.0.0",
+    "ember-source": "~4.2.0-beta.1",
+    "ember-template-lint": "^4.0.0",
+    "ember-welcome-page": "^6.1.0",
     "eslint": "^7.32.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-ember": "^10.5.8",

tests/fixtures/app/embroider-no-welcome/package.json

@@ -25,9 +25,9 @@
   "devDependencies": {
     "@ember/optional-features": "^2.0.0",
     "@ember/test-helpers": "^2.6.0",
-    "@embroider/compat": "^0.49.0",
-    "@embroider/core": "^0.49.0",
-    "@embroider/webpack": "^0.49.0",
+    "@embroider/compat": "^0.50.0",
+    "@embroider/core": "^0.50.0",
+    "@embroider/webpack": "^0.50.0",
     "@glimmer/component": "^1.0.4",
     "@glimmer/tracking": "^1.0.4",
     "babel-eslint": "^10.1.0",
@@ -41,15 +41,15 @@
     "ember-cli-inject-live-reload": "^2.1.0",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "^4.0.2",
-    "ember-data": "~4.1.0",
+    "ember-data": "~4.2.0-beta.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.1.0",
-    "ember-template-lint": "^3.15.0",
+    "ember-source": "~4.2.0-beta.1",
+    "ember-template-lint": "^4.0.0",
     "eslint": "^7.32.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-ember": "^10.5.8",

tests/fixtures/app/embroider-yarn/package.json

@@ -25,9 +25,9 @@
   "devDependencies": {
     "@ember/optional-features": "^2.0.0",
     "@ember/test-helpers": "^2.6.0",
-    "@embroider/compat": "^0.49.0",
-    "@embroider/core": "^0.49.0",
-    "@embroider/webpack": "^0.49.0",
+    "@embroider/compat": "^0.50.0",
+    "@embroider/core": "^0.50.0",
+    "@embroider/webpack": "^0.50.0",
     "@glimmer/component": "^1.0.4",
     "@glimmer/tracking": "^1.0.4",
     "babel-eslint": "^10.1.0",
@@ -41,16 +41,16 @@
     "ember-cli-inject-live-reload": "^2.1.0",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "^4.0.2",
-    "ember-data": "~4.1.0",
+    "ember-data": "~4.2.0-beta.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.1.0",
-    "ember-template-lint": "^3.15.0",
-    "ember-welcome-page": "^6.0.0",
+    "ember-source": "~4.2.0-beta.1",
+    "ember-template-lint": "^4.0.0",
+    "ember-welcome-page": "^6.1.0",
     "eslint": "^7.32.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-ember": "^10.5.8",

tests/fixtures/app/embroider/package.json

@@ -25,9 +25,9 @@
   "devDependencies": {
     "@ember/optional-features": "^2.0.0",
     "@ember/test-helpers": "^2.6.0",
-    "@embroider/compat": "^0.49.0",
-    "@embroider/core": "^0.49.0",
-    "@embroider/webpack": "^0.49.0",
+    "@embroider/compat": "^0.50.0",
+    "@embroider/core": "^0.50.0",
+    "@embroider/webpack": "^0.50.0",
     "@glimmer/component": "^1.0.4",
     "@glimmer/tracking": "^1.0.4",
     "babel-eslint": "^10.1.0",
@@ -41,16 +41,16 @@
     "ember-cli-inject-live-reload": "^2.1.0",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "^4.0.2",
-    "ember-data": "~4.1.0",
+    "ember-data": "~4.2.0-beta.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.1.0",
-    "ember-template-lint": "^3.15.0",
-    "ember-welcome-page": "^6.0.0",
+    "ember-source": "~4.2.0-beta.1",
+    "ember-template-lint": "^4.0.0",
+    "ember-welcome-page": "^6.1.0",
     "eslint": "^7.32.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-ember": "^10.5.8",

tests/fixtures/app/nested-project/actual-project/package.json

@@ -46,7 +46,7 @@
     "ember-qunit": "^5.1.4",
     "ember-resolver": "^8.0.2",
     "ember-source": "~3.27.0-beta.3",
-    "ember-template-lint": "^3.2.0",
+    "ember-template-lint": "^4.0.0",
     "ember-welcome-page": "^5.0.0",
     "eslint": "^7.24.0",
     "eslint-config-prettier": "^8.1.0",

tests/fixtures/app/npm-travis/README.md

@@ -9,7 +9,7 @@ You will need the following things properly installed on your computer.
 
 * [Git](https://git-scm.com/)
 * [Node.js](https://nodejs.org/) (with npm)
-* [Ember CLI](https://ember-cli.com/)
+* [Ember CLI](https://cli.emberjs.com/release/)
 * [Google Chrome](https://google.com/chrome/)
 
 ## Installation
@@ -50,7 +50,7 @@ Specify what it takes to deploy your app.
 ## Further Reading / Useful Links
 
 * [ember.js](https://emberjs.com/)
-* [ember-cli](https://ember-cli.com/)
+* [ember-cli](https://cli.emberjs.com/release/)
 * Development Browser Extensions
   * [ember inspector for chrome](https://chrome.google.com/webstore/detail/ember-inspector/bmdblncegkenkacieihfhpjfppoconhi)
   * [ember inspector for firefox](https://addons.mozilla.org/en-US/firefox/addon/ember-inspector/)

tests/fixtures/app/npm-travis/package.json

@@ -47,7 +47,7 @@
     "ember-qunit": "^5.1.4",
     "ember-resolver": "^8.0.2",
     "ember-source": "~3.27.2",
-    "ember-template-lint": "^3.4.2",
+    "ember-template-lint": "^4.0.0",
     "eslint": "^7.27.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-ember": "^10.4.2",

tests/fixtures/app/npm/README.md

@@ -9,7 +9,7 @@ You will need the following things properly installed on your computer.
 
 * [Git](https://git-scm.com/)
 * [Node.js](https://nodejs.org/) (with npm)
-* [Ember CLI](https://ember-cli.com/)
+* [Ember CLI](https://cli.emberjs.com/release/)
 * [Google Chrome](https://google.com/chrome/)
 
 ## Installation
@@ -50,7 +50,7 @@ Specify what it takes to deploy your app.
 ## Further Reading / Useful Links
 
 * [ember.js](https://emberjs.com/)
-* [ember-cli](https://ember-cli.com/)
+* [ember-cli](https://cli.emberjs.com/release/)
 * Development Browser Extensions
   * [ember inspector for chrome](https://chrome.google.com/webstore/detail/ember-inspector/bmdblncegkenkacieihfhpjfppoconhi)
   * [ember inspector for firefox](https://addons.mozilla.org/en-US/firefox/addon/ember-inspector/)