Repository: ember-cli/ember-cli
Pull request #9739 (2021-12-20 20:26:59)

Change blueprint to generate apps using 'history' location
as 'auto' location has been deprecated

- Update some test blueprints that do not care about location type


Patch:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0f3e27d57..022f6391a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,19 +1,20 @@
 # ember-cli Changelog
 
-## v4.1.0
+## v4.1.0-beta.1
 
 #### Blueprint Changes
 
-- [`ember new` diff](https://github.com/ember-cli/ember-new-output/compare/v4.0.1...v4.1.0)
-- [`ember addon` diff](https://github.com/ember-cli/ember-addon-output/compare/v4.0.1...v4.1.0)
+- [`ember new` diff](https://github.com/ember-cli/ember-new-output/compare/v4.0.0...v4.1.0-beta.1)
+- [`ember addon` diff](https://github.com/ember-cli/ember-addon-output/compare/v4.0.0...v4.1.0-beta.1)
 
 #### Changelog
 
+- [#9431](https://github.com/ember-cli/ember-cli/pull/9431) replace fixtures with jest-like snapshots [@lifeart](https://github.com/lifeart)
+- [#9607](https://github.com/ember-cli/ember-cli/pull/9607) Add online editor files to update-output-repos script [@NullVoxPopuli](https://github.com/NullVoxPopuli)
 - [#9700](https://github.com/ember-cli/ember-cli/pull/9700) [Chore] Update  .npmignore to ignore .github and docs folders [@SergeAstapov](https://github.com/SergeAstapov)
+- [#9728](https://github.com/ember-cli/ember-cli/pull/9728) eslint-plugin-mocha@^9.0.0 [@kellyselden](https://github.com/kellyselden)
 - [#9729](https://github.com/ember-cli/ember-cli/pull/9729) is-language-code@^3.1.0 [@kellyselden](https://github.com/kellyselden)
 
-Thank you to all who took the time to contribute!
-
 ## v4.0.1
 
 #### Blueprint Changes
diff --git a/blueprints/addon/additional-dev-dependencies.json b/blueprints/addon/additional-dev-dependencies.json
index d8294936b..52fd74c97 100644
--- a/blueprints/addon/additional-dev-dependencies.json
+++ b/blueprints/addon/additional-dev-dependencies.json
@@ -1,6 +1,6 @@
 {
   "devDependencies": {
-    "@embroider/test-setup": "^0.49.0",
+    "@embroider/test-setup": "^0.48.1",
     "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/config/environment.js b/blueprints/app/files/config/environment.js
index 25cbe0b0f..467d91f23 100644
--- a/blueprints/app/files/config/environment.js
+++ b/blueprints/app/files/config/environment.js
@@ -5,7 +5,7 @@ module.exports = function (environment) {
     modulePrefix: '<%= modulePrefix %>',
     environment,
     rootURL: '/',
-    locationType: 'auto',
+    locationType: 'history',
     EmberENV: {
       FEATURES: {
         // Here you can enable experimental features on an ember canary build
diff --git a/blueprints/app/files/package.json b/blueprints/app/files/package.json
index 4e33a3605..ea5031b66 100644
--- a/blueprints/app/files/package.json
+++ b/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.48.1",
+    "@embroider/core": "^0.48.1",
+    "@embroider/webpack": "^0.48.1<% } %>",
     "@glimmer/component": "^1.0.4",
     "@glimmer/tracking": "^1.0.4",
     "babel-eslint": "^10.1.0",
@@ -35,20 +35,20 @@
     "ember-auto-import": "^2.2.4",
     "ember-cli": "~<%= emberCLIVersion %>",
     "ember-cli-app-version": "^5.0.0",
-    "ember-cli-babel": "^7.26.11",
+    "ember-cli-babel": "^7.26.8",
     "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-htmlbars": "^6.0.1",
     "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.1.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-source": "~4.1.0-beta.1",
     "ember-template-lint": "^3.15.0<% if (welcome) { %>",
     "ember-welcome-page": "^6.0.0<% } %>",
     "eslint": "^7.32.0",
diff --git a/package.json b/package.json
index 275526847..933bf2274 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-cli",
-  "version": "4.1.0",
+  "version": "4.1.0-beta.1",
   "description": "Command line tool for developing ambitious ember.js apps",
   "keywords": [
     "app",


Test patch:
diff --git a/tests/fixtures/addon/defaults/package.json b/tests/fixtures/addon/defaults/package.json
index 4e9284f43..5dcd613bf 100644
--- a/tests/fixtures/addon/defaults/package.json
+++ b/tests/fixtures/addon/defaults/package.json
@@ -26,13 +26,13 @@
     "test:ember-compatibility": "ember try:each"
   },
   "dependencies": {
-    "ember-cli-babel": "^7.26.11",
+    "ember-cli-babel": "^7.26.8",
     "ember-cli-htmlbars": "^6.0.1"
   },
   "devDependencies": {
     "@ember/optional-features": "^2.0.0",
     "@ember/test-helpers": "^2.6.0",
-    "@embroider/test-setup": "^0.49.0",
+    "@embroider/test-setup": "^0.48.1",
     "@glimmer/component": "^1.0.4",
     "@glimmer/tracking": "^1.0.4",
     "babel-eslint": "^10.1.0",
@@ -49,7 +49,7 @@
     "ember-page-title": "^7.0.0",
     "ember-qunit": "^5.1.5",
     "ember-resolver": "^8.0.3",
-    "ember-source": "~4.1.0",
+    "ember-source": "~4.1.0-beta.1",
     "ember-source-channel-url": "^3.0.0",
     "ember-template-lint": "^3.15.0",
     "ember-try": "^2.0.0",
diff --git a/tests/fixtures/addon/yarn/package.json b/tests/fixtures/addon/yarn/package.json
index e9caedf1a..82219f81a 100644
--- a/tests/fixtures/addon/yarn/package.json
+++ b/tests/fixtures/addon/yarn/package.json
@@ -26,13 +26,13 @@
     "test:ember-compatibility": "ember try:each"
   },
   "dependencies": {
-    "ember-cli-babel": "^7.26.11",
+    "ember-cli-babel": "^7.26.8",
     "ember-cli-htmlbars": "^6.0.1"
   },
   "devDependencies": {
     "@ember/optional-features": "^2.0.0",
     "@ember/test-helpers": "^2.6.0",
-    "@embroider/test-setup": "^0.49.0",
+    "@embroider/test-setup": "^0.48.1",
     "@glimmer/component": "^1.0.4",
     "@glimmer/tracking": "^1.0.4",
     "babel-eslint": "^10.1.0",
@@ -49,7 +49,7 @@
     "ember-page-title": "^7.0.0",
     "ember-qunit": "^5.1.5",
     "ember-resolver": "^8.0.3",
-    "ember-source": "~4.1.0",
+    "ember-source": "~4.1.0-beta.1",
     "ember-source-channel-url": "^3.0.0",
     "ember-template-lint": "^3.15.0",
     "ember-try": "^2.0.0",
diff --git a/tests/fixtures/app/defaults/package.json b/tests/fixtures/app/defaults/package.json
index 64a7a8912..e18665562 100644
--- a/tests/fixtures/app/defaults/package.json
+++ b/tests/fixtures/app/defaults/package.json
@@ -32,20 +32,20 @@
     "ember-auto-import": "^2.2.4",
     "ember-cli": "~<%= emberCLIVersion %>",
     "ember-cli-app-version": "^5.0.0",
-    "ember-cli-babel": "^7.26.11",
+    "ember-cli-babel": "^7.26.8",
     "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-htmlbars": "^6.0.1",
     "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.1.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-source": "~4.1.0-beta.1",
     "ember-template-lint": "^3.15.0",
     "ember-welcome-page": "^6.0.0",
     "eslint": "^7.32.0",
diff --git a/tests/fixtures/app/embroider-no-welcome/package.json b/tests/fixtures/app/embroider-no-welcome/package.json
index 05e8e5c64..369d08ebd 100644
--- a/tests/fixtures/app/embroider-no-welcome/package.json
+++ b/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.48.1",
+    "@embroider/core": "^0.48.1",
+    "@embroider/webpack": "^0.48.1",
     "@glimmer/component": "^1.0.4",
     "@glimmer/tracking": "^1.0.4",
     "babel-eslint": "^10.1.0",
@@ -35,20 +35,20 @@
     "ember-auto-import": "^2.2.4",
     "ember-cli": "~<%= emberCLIVersion %>",
     "ember-cli-app-version": "^5.0.0",
-    "ember-cli-babel": "^7.26.11",
+    "ember-cli-babel": "^7.26.8",
     "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-htmlbars": "^6.0.1",
     "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.1.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-source": "~4.1.0-beta.1",
     "ember-template-lint": "^3.15.0",
     "eslint": "^7.32.0",
     "eslint-config-prettier": "^8.3.0",
diff --git a/tests/fixtures/app/embroider-yarn/package.json b/tests/fixtures/app/embroider-yarn/package.json
index fd675b46f..709b37e0c 100644
--- a/tests/fixtures/app/embroider-yarn/package.json
+++ b/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.48.1",
+    "@embroider/core": "^0.48.1",
+    "@embroider/webpack": "^0.48.1",
     "@glimmer/component": "^1.0.4",
     "@glimmer/tracking": "^1.0.4",
     "babel-eslint": "^10.1.0",
@@ -35,20 +35,20 @@
     "ember-auto-import": "^2.2.4",
     "ember-cli": "~<%= emberCLIVersion %>",
     "ember-cli-app-version": "^5.0.0",
-    "ember-cli-babel": "^7.26.11",
+    "ember-cli-babel": "^7.26.8",
     "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-htmlbars": "^6.0.1",
     "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.1.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-source": "~4.1.0-beta.1",
     "ember-template-lint": "^3.15.0",
     "ember-welcome-page": "^6.0.0",
     "eslint": "^7.32.0",
diff --git a/tests/fixtures/app/embroider/package.json b/tests/fixtures/app/embroider/package.json
index fd675b46f..709b37e0c 100644
--- a/tests/fixtures/app/embroider/package.json
+++ b/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.48.1",
+    "@embroider/core": "^0.48.1",
+    "@embroider/webpack": "^0.48.1",
     "@glimmer/component": "^1.0.4",
     "@glimmer/tracking": "^1.0.4",
     "babel-eslint": "^10.1.0",
@@ -35,20 +35,20 @@
     "ember-auto-import": "^2.2.4",
     "ember-cli": "~<%= emberCLIVersion %>",
     "ember-cli-app-version": "^5.0.0",
-    "ember-cli-babel": "^7.26.11",
+    "ember-cli-babel": "^7.26.8",
     "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-htmlbars": "^6.0.1",
     "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.1.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-source": "~4.1.0-beta.1",
     "ember-template-lint": "^3.15.0",
     "ember-welcome-page": "^6.0.0",
     "eslint": "^7.32.0",
diff --git a/tests/fixtures/app/npm/package.json b/tests/fixtures/app/npm/package.json
index 68da40b38..fdeca37e7 100644
--- a/tests/fixtures/app/npm/package.json
+++ b/tests/fixtures/app/npm/package.json
@@ -32,20 +32,20 @@
     "ember-auto-import": "^2.2.4",
     "ember-cli": "~<%= emberCLIVersion %>",
     "ember-cli-app-version": "^5.0.0",
-    "ember-cli-babel": "^7.26.11",
+    "ember-cli-babel": "^7.26.8",
     "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-htmlbars": "^6.0.1",
     "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.1.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-source": "~4.1.0-beta.1",
     "ember-template-lint": "^3.15.0",
     "eslint": "^7.32.0",
     "eslint-config-prettier": "^8.3.0",
diff --git a/tests/fixtures/app/yarn/package.json b/tests/fixtures/app/yarn/package.json
index 64a7a8912..e18665562 100644
--- a/tests/fixtures/app/yarn/package.json
+++ b/tests/fixtures/app/yarn/package.json
@@ -32,20 +32,20 @@
     "ember-auto-import": "^2.2.4",
     "ember-cli": "~<%= emberCLIVersion %>",
     "ember-cli-app-version": "^5.0.0",
-    "ember-cli-babel": "^7.26.11",
+    "ember-cli-babel": "^7.26.8",
     "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-htmlbars": "^6.0.1",
     "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.1.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-source": "~4.1.0-beta.1",
     "ember-template-lint": "^3.15.0",
     "ember-welcome-page": "^6.0.0",
     "eslint": "^7.32.0",
diff --git a/tests/fixtures/brocfile-tests/custom-environment-config/config/environment.js b/tests/fixtures/brocfile-tests/custom-environment-config/config/environment.js
index 2eefbf4ee..3060e3010 100644
--- a/tests/fixtures/brocfile-tests/custom-environment-config/config/environment.js
+++ b/tests/fixtures/brocfile-tests/custom-environment-config/config/environment.js
@@ -3,6 +3,6 @@ module.exports = function() {
     modulePrefix: 'some-cool-app',
     fileUsed: 'config/environment.js',
     rootURL: '/',
-    locationType: 'auto',
+    locationType: 'history',
   };
 };
diff --git a/tests/fixtures/brocfile-tests/custom-environment-config/config/something-else.js b/tests/fixtures/brocfile-tests/custom-environment-config/config/something-else.js
index 5b444a917..ccce2eac7 100644
--- a/tests/fixtures/brocfile-tests/custom-environment-config/config/something-else.js
+++ b/tests/fixtures/brocfile-tests/custom-environment-config/config/something-else.js
@@ -3,7 +3,7 @@ module.exports = function() {
     modulePrefix: 'some-cool-app',
     fileUsed: 'config/something-else.js',
     rootURL: '/',
-    locationType: 'auto',
+    locationType: 'history',
     APP: {
       autoboot: false
     }
diff --git a/tests/helpers/mock-project.js b/tests/helpers/mock-project.js
index 97655e1aa..2eb042073 100644
--- a/tests/helpers/mock-project.js
+++ b/tests/helpers/mock-project.js
@@ -41,7 +41,7 @@ class MockProject extends Project {
     return (
       this._config || {
         baseURL: '/',
-        locationType: 'auto',
+        locationType: 'history',
       }
     );
   }