Repository: ember-cli/ember-cli
Pull request #9410 (2020-12-10 16:03:34)

gitignore .eslintcache
#9391 added the `-cache` flag to the eslint script, so we should ignore the cache file.


Patch:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ea5ec4462..db33252ce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,35 +1,32 @@
 # ember-cli Changelog
 
 
-## v3.24.0-beta.1
+## v3.23.0-beta.2
 
 #### Blueprint Changes
 
-- [`ember new` diff](https://github.com/ember-cli/ember-new-output/compare/v3.23.0...v3.24.0-beta.1)
-- [`ember addon` diff](https://github.com/ember-cli/ember-addon-output/compare/v3.23.0...v3.24.0-beta.1)
+- [`ember new` diff](https://github.com/ember-cli/ember-new-output/compare/v3.23.0-beta.1...v3.23.0-beta.2)
+- [`ember addon` diff](https://github.com/ember-cli/ember-addon-output/compare/v3.23.0-beta.1...v3.23.0-beta.2)
 
 #### Changelog
 
-- [#9372](https://github.com/ember-cli/ember-cli/pull/9372) / [#9382](https://github.com/ember-cli/ember-cli/pull/9382) Add `ember-page-title` to app blueprint [@raido](https://github.com/raido)
-- [#9391](https://github.com/ember-cli/ember-cli/pull/9391) / [#9407](https://github.com/ember-cli/ember-cli/pull/9407) Add `prettier` to blueprint [@bmish](https://github.com/bmish)
-- [#9402](https://github.com/ember-cli/ember-cli/pull/9402) Prevent build cycles when app is within a watched dir [@ef4](https://github.com/ef4)
-- [#9403](https://github.com/ember-cli/ember-cli/pull/9403) Update blueprint to eslint-plugin-ember v10 [@bmish](https://github.com/bmish)
-- [#9340](https://github.com/ember-cli/ember-cli/pull/9340) / [#9371](https://github.com/ember-cli/ember-cli/pull/9371) Update blueprints with new testing configuration [@scalvert](https://github.com/scalvert)
-
+- [#9371](https://github.com/ember-cli/ember-cli/pull/9371) Adds missing `qunit-dom` setup invocation [@scalvert](https://github.com/scalvert)
 
 Thank you to all who took the time to contribute!
 
-## v3.23.0
+## v3.23.0-beta.1
 
 #### Blueprint Changes
 
-- [`ember new` diff](https://github.com/ember-cli/ember-new-output/compare/v3.22.0...v3.23.0)
-- [`ember addon` diff](https://github.com/ember-cli/ember-addon-output/compare/v3.22.0...v3.23.0)
+- [`ember new` diff](https://github.com/ember-cli/ember-new-output/compare/v3.22.0...v3.23.0-beta.1)
+- [`ember addon` diff](https://github.com/ember-cli/ember-addon-output/compare/v3.22.0...v3.23.0-beta.1)
 
 #### Changelog
 
-- [#9369](https://github.com/ember-cli/ember-cli/pull/9369) / [#9406](https://github.com/ember-cli/ember-cli/pull/9406) Update blueprint dependencies to latest. [@rwjblue](https://github.com/rwjblue)
-- [#9361](https://github.com/ember-cli/ember-cli/pull/9361) / [#9364](https://github.com/ember-cli/ember-cli/pull/9364) / [#9365](https://github.com/ember-cli/ember-cli/pull/9365) / [#9368](https://github.com/ember-cli/ember-cli/pull/9368) Update dependencies to latest. [@rwjblue](https://github.com/rwjblue)
+- [#9340](https://github.com/ember-cli/ember-cli/pull/9340) Update blueprints with new testing configuration [@scalvert](https://github.com/scalvert)
+- [#9361](https://github.com/ember-cli/ember-cli/pull/9361) / [#9364](https://github.com/ember-cli/ember-cli/pull/9364) / [#9365](https://github.com/ember-cli/ember-cli/pull/9365) Update dependencies to latest. [@rwjblue](https://github.com/rwjblue)
+- [#9368](https://github.com/ember-cli/ember-cli/pull/9368) Update `markdown-it` to latest. [@rwjblue](https://github.com/rwjblue)
+- [#9369](https://github.com/ember-cli/ember-cli/pull/9369) Update `ember-source` and `ember-data` for 3.23.0-beta's. [@rwjblue](https://github.com/rwjblue)
 
 Thank you to all who took the time to contribute!
 
diff --git a/blueprints/addon/files/npmignore b/blueprints/addon/files/npmignore
index bd09adff9..88818f2c8 100644
--- a/blueprints/addon/files/npmignore
+++ b/blueprints/addon/files/npmignore
@@ -10,6 +10,7 @@
 /.editorconfig
 /.ember-cli
 /.env*
+/.eslintcache
 /.eslintignore
 /.eslintrc.js
 /.git/
diff --git a/blueprints/app/files/gitignore b/blueprints/app/files/gitignore
index c40a1b2ab..7e0f7ddce 100644
--- a/blueprints/app/files/gitignore
+++ b/blueprints/app/files/gitignore
@@ -12,6 +12,7 @@
 /.env*
 /.pnp*
 /.sass-cache
+/.eslintcache
 /connect.lock
 /coverage/
 /libpeerconnection.log
diff --git a/blueprints/app/files/package.json b/blueprints/app/files/package.json
index 893a06cb5..07e045cfe 100644
--- a/blueprints/app/files/package.json
+++ b/blueprints/app/files/package.json
@@ -24,15 +24,15 @@
   },
   "devDependencies": {
     "@ember/optional-features": "^2.0.0",
-    "@ember/test-helpers": "^2.1.1<% if (embroider) { %>",
-    "@embroider/compat": "^0.33.0",
-    "@embroider/core": "^0.33.0",
-    "@embroider/webpack": "^0.33.0<% } %>",
+    "@ember/test-helpers": "^2.0.0<% if (embroider) { %>",
+    "@embroider/compat": "^0.27.0",
+    "@embroider/core": "^0.27.0",
+    "@embroider/webpack": "^0.27.0<% } %>",
     "@glimmer/component": "^1.0.2",
     "@glimmer/tracking": "^1.0.2",
     "babel-eslint": "^10.1.0",
     "broccoli-asset-rev": "^3.0.0",
-    "ember-auto-import": "^1.8.0",
+    "ember-auto-import": "^1.6.0",
     "ember-cli": "~<%= emberCLIVersion %>",
     "ember-cli-app-version": "^4.0.0",
     "ember-cli-babel": "^7.23.0",
@@ -40,28 +40,28 @@
     "ember-cli-htmlbars": "^5.3.1",
     "ember-cli-inject-live-reload": "^2.0.2",
     "ember-cli-sri": "^2.1.1",
-    "ember-cli-terser": "^4.0.1",
-    "ember-data": "~3.24.0-beta.0",
+    "ember-cli-terser": "^4.0.0",
+    "ember-data": "~3.23.0-beta.0",
     "ember-export-application-global": "^2.0.1",
     "ember-fetch": "^8.0.2",
-    "ember-load-initializers": "^2.1.2",
+    "ember-load-initializers": "^2.1.1",
     "ember-maybe-import-regenerator": "^0.1.6",
+    "ember-qunit": "^5.0.0-beta.4",
     "ember-page-title": "^6.0.3",
-    "ember-qunit": "^5.1.0",
     "ember-resolver": "^8.0.2",
-    "ember-source": "~3.24.0-beta.2",
+    "ember-source": "~3.23.0-beta.1",
     "ember-template-lint": "^2.14.0<% if (welcome) { %>",
     "ember-welcome-page": "^4.0.0<% } %>",
-    "eslint": "^7.15.0",
+    "eslint": "^7.11.0",
     "eslint-config-prettier": "^6.15.0",
-    "eslint-plugin-ember": "^10.0.2",
+    "eslint-plugin-ember": "^10.0.1",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^3.1.4",
     "loader.js": "^4.7.0",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.2.1",
-    "qunit": "^2.13.0",
-    "qunit-dom": "^1.6.0"
+    "qunit": "^2.11.0",
+    "qunit-dom": "^1.6.0-beta.1"
   },
   "engines": {
     "node": "10.* || >= 12"
diff --git a/dev/update-blueprint-dependencies.js b/dev/update-blueprint-dependencies.js
index fff9cd986..2c47c7ea5 100644
--- a/dev/update-blueprint-dependencies.js
+++ b/dev/update-blueprint-dependencies.js
@@ -18,7 +18,6 @@ node dev/update-blueprint-dependencies.js --filter eslint
 }
 
 const fs = require('fs');
-const path = require('path');
 const util = require('util');
 const nopt = require('nopt');
 const _latestVersion = require('latest-version');
@@ -39,15 +38,15 @@ const OPTIONS = nopt({
 });
 
 const PACKAGE_FILES = [
-  '../blueprints/app/files/package.json',
-  '../blueprints/addon/additional-dev-dependencies.json',
-  '../tests/fixtures/app/defaults/package.json',
-  '../tests/fixtures/app/npm/package.json',
-  '../tests/fixtures/app/yarn/package.json',
-  '../tests/fixtures/app/embroider/package.json',
-  '../tests/fixtures/app/embroider-no-welcome/package.json',
-  '../tests/fixtures/addon/defaults/package.json',
-  '../tests/fixtures/addon/yarn/package.json',
+  'blueprints/app/files/package.json',
+  'blueprints/addon/additional-dev-dependencies.json',
+  'tests/fixtures/app/defaults/package.json',
+  'tests/fixtures/app/npm/package.json',
+  'tests/fixtures/app/yarn/package.json',
+  'tests/fixtures/app/embroider/package.json',
+  'tests/fixtures/app/embroider-no-welcome/package.json',
+  'tests/fixtures/addon/defaults/package.json',
+  'tests/fixtures/addon/yarn/package.json',
 ];
 
 function shouldCheckDependency(dependency) {
@@ -104,15 +103,14 @@ async function updateDependencies(dependencies) {
 
 async function main() {
   for (let packageFile of PACKAGE_FILES) {
-    let filePath = path.join(__dirname, packageFile);
-    let pkg = JSON.parse(fs.readFileSync(filePath, { encoding: 'utf8' }));
+    let pkg = JSON.parse(fs.readFileSync(packageFile, { encoding: 'utf8' }));
 
     await updateDependencies(pkg.dependencies);
     await updateDependencies(pkg.devDependencies);
 
     let output = `${JSON.stringify(pkg, null, 2)}\n`;
 
-    fs.writeFileSync(filePath, output, { encoding: 'utf8' });
+    fs.writeFileSync(packageFile, output, { encoding: 'utf8' });
   }
 }
 
diff --git a/lib/broccoli/default-packager.js b/lib/broccoli/default-packager.js
index 3d38e26d5..fe72e9ec1 100644
--- a/lib/broccoli/default-packager.js
+++ b/lib/broccoli/default-packager.js
@@ -443,7 +443,6 @@ module.exports = class DefaultPackager {
         'template',
         preprocessTemplates(preprocessedTemplatesFromAddons, {
           registry: this.registry,
-          treeType: 'templates',
         })
       );
     }
@@ -503,7 +502,6 @@ module.exports = class DefaultPackager {
 
       let preprocessedApp = preprocessJs(app, '/', this.name, {
         registry: this.registry,
-        treeType: 'app',
       });
 
       this._cachedProcessedJavascript = callAddonsPostprocessTreeHook(this.project, 'js', preprocessedApp);
@@ -552,7 +550,6 @@ module.exports = class DefaultPackager {
         outputPaths: this.distPaths.appCssFile,
         registry: this.registry,
         minifyCSS: this.minifyCSS.options,
-        treeType: 'styles',
       };
 
       let stylesAndVendor = callAddonsPreprocessTreeHook(this.project, 'css', tree);
@@ -740,7 +737,6 @@ module.exports = class DefaultPackager {
       const inputPath = '/tests';
       let preprocessedTests = preprocessJs(treeToCompile, inputPath, this.name, {
         registry: this.registry,
-        treeType: 'test',
       });
 
       let mergedTestTrees = mergeTrees([addonTestSupportTree, preprocessedTests], {
diff --git a/lib/broccoli/ember-app.js b/lib/broccoli/ember-app.js
index 833473738..983112d6a 100644
--- a/lib/broccoli/ember-app.js
+++ b/lib/broccoli/ember-app.js
@@ -796,7 +796,6 @@ class EmberApp {
     tree = preprocessJs(tree, '/', '/', {
       annotation: `_precompileAppJsTree`,
       registry: this.registry,
-      treeType: 'app',
     });
 
     // return the original params because there are multiple
diff --git a/lib/models/addon.js b/lib/models/addon.js
index c9bdb08ed..1a8ca0ef3 100644
--- a/lib/models/addon.js
+++ b/lib/models/addon.js
@@ -944,7 +944,6 @@ let addonProto = {
     if (registryHasPreprocessor(this.registry, 'js')) {
       return this.preprocessJs(namespacedTree, '/', this.name, {
         registry: this.registry,
-        treeType: 'addon-test-support',
       });
     } else {
       this._warn(
@@ -973,7 +972,6 @@ let addonProto = {
       let processedStylesTree = preprocessCss(preprocessedStylesTree, '/', '/', {
         outputPaths: { addon: `${this.name}.css` },
         registry: this.registry,
-        treeType: 'addon-styles',
       });
       processedStylesTree = new Funnel(processedStylesTree, {
         destDir: `${this.name}/__COMPILED_STYLES__`,
@@ -1138,7 +1136,6 @@ let addonProto = {
       let processedTemplateTree = preprocessTemplates(preprocessedTemplateTree, {
         annotation: `compileTemplates(${this.name})`,
         registry: this.registry,
-        treeType: 'addon-templates',
       });
 
       let postprocessedTemplateTree = this._addonPostprocessTree('template', processedTemplateTree);
@@ -1311,7 +1308,6 @@ let addonProto = {
     let processedAddonJS = this.preprocessJs(preprocessedAddonJS, '/', this.name, {
       annotation: `processedAddonJsFiles(${this.name})`,
       registry: this.registry,
-      treeType: 'addon',
     });
 
     let postprocessedAddonJs = this._addonPostprocessTree('js', processedAddonJS);
diff --git a/package.json b/package.json
index a3780c33d..edd69cf85 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-cli",
-  "version": "3.24.0-beta.1",
+  "version": "3.23.0-beta.2",
   "description": "Command line tool for developing ambitious ember.js apps",
   "keywords": [
     "app",


Test patch:
diff --git a/blueprints/app/files/tests/index.html b/blueprints/app/files/tests/index.html
index 75e308e74..0f191fece 100644
--- a/blueprints/app/files/tests/index.html
+++ b/blueprints/app/files/tests/index.html
@@ -20,7 +20,7 @@
   <body>
     {{content-for "body"}}
     {{content-for "test-body"}}
-
+    
     <div id="qunit"></div>
     <div id="qunit-fixture">
       <div id="ember-testing-container">
diff --git a/tests/fixtures/addon/defaults/package.json b/tests/fixtures/addon/defaults/package.json
index adfb01418..2b1c2957e 100644
--- a/tests/fixtures/addon/defaults/package.json
+++ b/tests/fixtures/addon/defaults/package.json
@@ -31,38 +31,38 @@
   },
   "devDependencies": {
     "@ember/optional-features": "^2.0.0",
-    "@ember/test-helpers": "^2.1.1",
+    "@ember/test-helpers": "^2.0.0",
     "@glimmer/component": "^1.0.2",
     "@glimmer/tracking": "^1.0.2",
     "babel-eslint": "^10.1.0",
     "broccoli-asset-rev": "^3.0.0",
-    "ember-auto-import": "^1.8.0",
+    "ember-auto-import": "^1.6.0",
     "ember-cli": "~<%= emberCLIVersion %>",
     "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-inject-live-reload": "^2.0.2",
     "ember-cli-sri": "^2.1.1",
-    "ember-cli-terser": "^4.0.1",
+    "ember-cli-terser": "^4.0.0",
     "ember-disable-prototype-extensions": "^1.1.3",
     "ember-export-application-global": "^2.0.1",
-    "ember-load-initializers": "^2.1.2",
+    "ember-load-initializers": "^2.1.1",
     "ember-maybe-import-regenerator": "^0.1.6",
     "ember-page-title": "^6.0.3",
-    "ember-qunit": "^5.1.0",
+    "ember-qunit": "^5.0.0-beta.4",
     "ember-resolver": "^8.0.2",
-    "ember-source": "~3.24.0-beta.2",
+    "ember-source": "~3.23.0-beta.1",
     "ember-source-channel-url": "^3.0.0",
     "ember-template-lint": "^2.14.0",
     "ember-try": "^1.4.0",
-    "eslint": "^7.15.0",
+    "eslint": "^7.11.0",
     "eslint-config-prettier": "^6.15.0",
-    "eslint-plugin-ember": "^10.0.2",
+    "eslint-plugin-ember": "^10.0.1",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^3.1.4",
     "loader.js": "^4.7.0",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.2.1",
-    "qunit": "^2.13.0",
-    "qunit-dom": "^1.6.0"
+    "qunit": "^2.11.0",
+    "qunit-dom": "^1.6.0-beta.1"
   },
   "engines": {
     "node": "10.* || >= 12"
diff --git a/tests/fixtures/addon/yarn/package.json b/tests/fixtures/addon/yarn/package.json
index 4a6f1ba68..8a52b2bca 100644
--- a/tests/fixtures/addon/yarn/package.json
+++ b/tests/fixtures/addon/yarn/package.json
@@ -31,39 +31,39 @@
   },
   "devDependencies": {
     "@ember/optional-features": "^2.0.0",
-    "@ember/test-helpers": "^2.1.1",
+    "@ember/test-helpers": "^2.0.0",
     "@glimmer/component": "^1.0.2",
     "@glimmer/tracking": "^1.0.2",
     "babel-eslint": "^10.1.0",
     "broccoli-asset-rev": "^3.0.0",
-    "ember-auto-import": "^1.8.0",
+    "ember-auto-import": "^1.6.0",
     "ember-cli": "~<%= emberCLIVersion %>",
     "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-inject-live-reload": "^2.0.2",
     "ember-cli-sri": "^2.1.1",
-    "ember-cli-terser": "^4.0.1",
+    "ember-cli-terser": "^4.0.0",
     "ember-disable-prototype-extensions": "^1.1.3",
     "ember-export-application-global": "^2.0.1",
-    "ember-load-initializers": "^2.1.2",
+    "ember-load-initializers": "^2.1.1",
     "ember-maybe-import-regenerator": "^0.1.6",
     "ember-page-title": "^6.0.3",
-    "ember-qunit": "^5.1.0",
+    "ember-qunit": "^5.0.0-beta.4",
     "ember-resolver": "^8.0.2",
-    "ember-source": "~3.24.0-beta.2",
+    "ember-source": "~3.23.0-beta.1",
     "ember-source-channel-url": "^3.0.0",
     "ember-template-lint": "^2.14.0",
     "ember-try": "^1.4.0",
     "ember-welcome-page": "^4.0.0",
-    "eslint": "^7.15.0",
+    "eslint": "^7.11.0",
     "eslint-config-prettier": "^6.15.0",
-    "eslint-plugin-ember": "^10.0.2",
+    "eslint-plugin-ember": "^10.0.1",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^3.1.4",
     "loader.js": "^4.7.0",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.2.1",
-    "qunit": "^2.13.0",
-    "qunit-dom": "^1.6.0"
+    "qunit": "^2.11.0",
+    "qunit-dom": "^1.6.0-beta.1"
   },
   "engines": {
     "node": "10.* || >= 12"
diff --git a/tests/fixtures/app/defaults/package.json b/tests/fixtures/app/defaults/package.json
index 2311e41ef..ec309caef 100644
--- a/tests/fixtures/app/defaults/package.json
+++ b/tests/fixtures/app/defaults/package.json
@@ -24,12 +24,12 @@
   },
   "devDependencies": {
     "@ember/optional-features": "^2.0.0",
-    "@ember/test-helpers": "^2.1.1",
+    "@ember/test-helpers": "^2.0.0",
     "@glimmer/component": "^1.0.2",
     "@glimmer/tracking": "^1.0.2",
     "babel-eslint": "^10.1.0",
     "broccoli-asset-rev": "^3.0.0",
-    "ember-auto-import": "^1.8.0",
+    "ember-auto-import": "^1.6.0",
     "ember-cli": "~<%= emberCLIVersion %>",
     "ember-cli-app-version": "^4.0.0",
     "ember-cli-babel": "^7.23.0",
@@ -37,28 +37,28 @@
     "ember-cli-htmlbars": "^5.3.1",
     "ember-cli-inject-live-reload": "^2.0.2",
     "ember-cli-sri": "^2.1.1",
-    "ember-cli-terser": "^4.0.1",
-    "ember-data": "~3.24.0-beta.0",
+    "ember-cli-terser": "^4.0.0",
+    "ember-data": "~3.23.0-beta.0",
     "ember-export-application-global": "^2.0.1",
     "ember-fetch": "^8.0.2",
-    "ember-load-initializers": "^2.1.2",
+    "ember-load-initializers": "^2.1.1",
     "ember-maybe-import-regenerator": "^0.1.6",
+    "ember-qunit": "^5.0.0-beta.4",
     "ember-page-title": "^6.0.3",
-    "ember-qunit": "^5.1.0",
     "ember-resolver": "^8.0.2",
-    "ember-source": "~3.24.0-beta.2",
+    "ember-source": "~3.23.0-beta.1",
     "ember-template-lint": "^2.14.0",
     "ember-welcome-page": "^4.0.0",
-    "eslint": "^7.15.0",
+    "eslint": "^7.11.0",
     "eslint-config-prettier": "^6.15.0",
-    "eslint-plugin-ember": "^10.0.2",
+    "eslint-plugin-ember": "^10.0.1",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^3.1.4",
     "loader.js": "^4.7.0",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.2.1",
-    "qunit": "^2.13.0",
-    "qunit-dom": "^1.6.0"
+    "qunit": "^2.11.0",
+    "qunit-dom": "^1.6.0-beta.1"
   },
   "engines": {
     "node": "10.* || >= 12"
diff --git a/tests/fixtures/app/embroider-no-welcome/package.json b/tests/fixtures/app/embroider-no-welcome/package.json
index eafb61b9f..7609f38e7 100644
--- a/tests/fixtures/app/embroider-no-welcome/package.json
+++ b/tests/fixtures/app/embroider-no-welcome/package.json
@@ -24,15 +24,15 @@
   },
   "devDependencies": {
     "@ember/optional-features": "^2.0.0",
-    "@ember/test-helpers": "^2.1.1",
-    "@embroider/compat": "^0.33.0",
-    "@embroider/core": "^0.33.0",
-    "@embroider/webpack": "^0.33.0",
+    "@ember/test-helpers": "^2.0.0",
+    "@embroider/compat": "^0.27.0",
+    "@embroider/core": "^0.27.0",
+    "@embroider/webpack": "^0.27.0",
     "@glimmer/component": "^1.0.2",
     "@glimmer/tracking": "^1.0.2",
     "babel-eslint": "^10.1.0",
     "broccoli-asset-rev": "^3.0.0",
-    "ember-auto-import": "^1.8.0",
+    "ember-auto-import": "^1.6.0",
     "ember-cli": "~<%= emberCLIVersion %>",
     "ember-cli-app-version": "^4.0.0",
     "ember-cli-babel": "^7.23.0",
@@ -40,27 +40,27 @@
     "ember-cli-htmlbars": "^5.3.1",
     "ember-cli-inject-live-reload": "^2.0.2",
     "ember-cli-sri": "^2.1.1",
-    "ember-cli-terser": "^4.0.1",
-    "ember-data": "~3.24.0-beta.0",
+    "ember-cli-terser": "^4.0.0",
+    "ember-data": "~3.23.0-beta.0",
     "ember-export-application-global": "^2.0.1",
     "ember-fetch": "^8.0.2",
-    "ember-load-initializers": "^2.1.2",
+    "ember-load-initializers": "^2.1.1",
     "ember-maybe-import-regenerator": "^0.1.6",
+    "ember-qunit": "^5.0.0-beta.4",
     "ember-page-title": "^6.0.3",
-    "ember-qunit": "^5.1.0",
     "ember-resolver": "^8.0.2",
-    "ember-source": "~3.24.0-beta.2",
+    "ember-source": "~3.23.0-beta.1",
     "ember-template-lint": "^2.14.0",
-    "eslint": "^7.15.0",
+    "eslint": "^7.11.0",
     "eslint-config-prettier": "^6.15.0",
-    "eslint-plugin-ember": "^10.0.2",
+    "eslint-plugin-ember": "^10.0.1",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^3.1.4",
     "loader.js": "^4.7.0",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.2.1",
-    "qunit": "^2.13.0",
-    "qunit-dom": "^1.6.0"
+    "qunit": "^2.11.0",
+    "qunit-dom": "^1.6.0-beta.1"
   },
   "engines": {
     "node": "10.* || >= 12"
diff --git a/tests/fixtures/app/embroider/package.json b/tests/fixtures/app/embroider/package.json
index 5ae74c049..fea0baa8e 100644
--- a/tests/fixtures/app/embroider/package.json
+++ b/tests/fixtures/app/embroider/package.json
@@ -24,15 +24,15 @@
   },
   "devDependencies": {
     "@ember/optional-features": "^2.0.0",
-    "@ember/test-helpers": "^2.1.1",
-    "@embroider/compat": "^0.33.0",
-    "@embroider/core": "^0.33.0",
-    "@embroider/webpack": "^0.33.0",
+    "@ember/test-helpers": "^2.0.0",
+    "@embroider/compat": "^0.27.0",
+    "@embroider/core": "^0.27.0",
+    "@embroider/webpack": "^0.27.0",
     "@glimmer/component": "^1.0.2",
     "@glimmer/tracking": "^1.0.2",
     "babel-eslint": "^10.1.0",
     "broccoli-asset-rev": "^3.0.0",
-    "ember-auto-import": "^1.8.0",
+    "ember-auto-import": "^1.6.0",
     "ember-cli": "~<%= emberCLIVersion %>",
     "ember-cli-app-version": "^4.0.0",
     "ember-cli-babel": "^7.23.0",
@@ -40,28 +40,28 @@
     "ember-cli-htmlbars": "^5.3.1",
     "ember-cli-inject-live-reload": "^2.0.2",
     "ember-cli-sri": "^2.1.1",
-    "ember-cli-terser": "^4.0.1",
-    "ember-data": "~3.24.0-beta.0",
+    "ember-cli-terser": "^4.0.0",
+    "ember-data": "~3.23.0-beta.0",
     "ember-export-application-global": "^2.0.1",
     "ember-fetch": "^8.0.2",
-    "ember-load-initializers": "^2.1.2",
+    "ember-load-initializers": "^2.1.1",
     "ember-maybe-import-regenerator": "^0.1.6",
+    "ember-qunit": "^5.0.0-beta.4",
     "ember-page-title": "^6.0.3",
-    "ember-qunit": "^5.1.0",
     "ember-resolver": "^8.0.2",
-    "ember-source": "~3.24.0-beta.2",
+    "ember-source": "~3.23.0-beta.1",
     "ember-template-lint": "^2.14.0",
     "ember-welcome-page": "^4.0.0",
-    "eslint": "^7.15.0",
+    "eslint": "^7.11.0",
     "eslint-config-prettier": "^6.15.0",
-    "eslint-plugin-ember": "^10.0.2",
+    "eslint-plugin-ember": "^10.0.1",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^3.1.4",
     "loader.js": "^4.7.0",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.2.1",
-    "qunit": "^2.13.0",
-    "qunit-dom": "^1.6.0"
+    "qunit": "^2.11.0",
+    "qunit-dom": "^1.6.0-beta.1"
   },
   "engines": {
     "node": "10.* || >= 12"
diff --git a/tests/fixtures/app/npm/package.json b/tests/fixtures/app/npm/package.json
index e29cf6854..ed73d7e14 100644
--- a/tests/fixtures/app/npm/package.json
+++ b/tests/fixtures/app/npm/package.json
@@ -24,12 +24,12 @@
   },
   "devDependencies": {
     "@ember/optional-features": "^2.0.0",
-    "@ember/test-helpers": "^2.1.1",
+    "@ember/test-helpers": "^2.0.0",
     "@glimmer/component": "^1.0.2",
     "@glimmer/tracking": "^1.0.2",
     "babel-eslint": "^10.1.0",
     "broccoli-asset-rev": "^3.0.0",
-    "ember-auto-import": "^1.8.0",
+    "ember-auto-import": "^1.6.0",
     "ember-cli": "~<%= emberCLIVersion %>",
     "ember-cli-app-version": "^4.0.0",
     "ember-cli-babel": "^7.23.0",
@@ -37,27 +37,27 @@
     "ember-cli-htmlbars": "^5.3.1",
     "ember-cli-inject-live-reload": "^2.0.2",
     "ember-cli-sri": "^2.1.1",
-    "ember-cli-terser": "^4.0.1",
-    "ember-data": "~3.24.0-beta.0",
+    "ember-cli-terser": "^4.0.0",
+    "ember-data": "~3.23.0-beta.0",
     "ember-export-application-global": "^2.0.1",
     "ember-fetch": "^8.0.2",
-    "ember-load-initializers": "^2.1.2",
+    "ember-load-initializers": "^2.1.1",
     "ember-maybe-import-regenerator": "^0.1.6",
+    "ember-qunit": "^5.0.0-beta.4",
     "ember-page-title": "^6.0.3",
-    "ember-qunit": "^5.1.0",
     "ember-resolver": "^8.0.2",
-    "ember-source": "~3.24.0-beta.2",
+    "ember-source": "~3.23.0-beta.1",
     "ember-template-lint": "^2.14.0",
-    "eslint": "^7.15.0",
+    "eslint": "^7.11.0",
     "eslint-config-prettier": "^6.15.0",
-    "eslint-plugin-ember": "^10.0.2",
+    "eslint-plugin-ember": "^10.0.1",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^3.1.4",
     "loader.js": "^4.7.0",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.2.1",
-    "qunit": "^2.13.0",
-    "qunit-dom": "^1.6.0"
+    "qunit": "^2.11.0",
+    "qunit-dom": "^1.6.0-beta.1"
   },
   "engines": {
     "node": "10.* || >= 12"
diff --git a/tests/fixtures/app/yarn/package.json b/tests/fixtures/app/yarn/package.json
index 2311e41ef..ec309caef 100644
--- a/tests/fixtures/app/yarn/package.json
+++ b/tests/fixtures/app/yarn/package.json
@@ -24,12 +24,12 @@
   },
   "devDependencies": {
     "@ember/optional-features": "^2.0.0",
-    "@ember/test-helpers": "^2.1.1",
+    "@ember/test-helpers": "^2.0.0",
     "@glimmer/component": "^1.0.2",
     "@glimmer/tracking": "^1.0.2",
     "babel-eslint": "^10.1.0",
     "broccoli-asset-rev": "^3.0.0",
-    "ember-auto-import": "^1.8.0",
+    "ember-auto-import": "^1.6.0",
     "ember-cli": "~<%= emberCLIVersion %>",
     "ember-cli-app-version": "^4.0.0",
     "ember-cli-babel": "^7.23.0",
@@ -37,28 +37,28 @@
     "ember-cli-htmlbars": "^5.3.1",
     "ember-cli-inject-live-reload": "^2.0.2",
     "ember-cli-sri": "^2.1.1",
-    "ember-cli-terser": "^4.0.1",
-    "ember-data": "~3.24.0-beta.0",
+    "ember-cli-terser": "^4.0.0",
+    "ember-data": "~3.23.0-beta.0",
     "ember-export-application-global": "^2.0.1",
     "ember-fetch": "^8.0.2",
-    "ember-load-initializers": "^2.1.2",
+    "ember-load-initializers": "^2.1.1",
     "ember-maybe-import-regenerator": "^0.1.6",
+    "ember-qunit": "^5.0.0-beta.4",
     "ember-page-title": "^6.0.3",
-    "ember-qunit": "^5.1.0",
     "ember-resolver": "^8.0.2",
-    "ember-source": "~3.24.0-beta.2",
+    "ember-source": "~3.23.0-beta.1",
     "ember-template-lint": "^2.14.0",
     "ember-welcome-page": "^4.0.0",
-    "eslint": "^7.15.0",
+    "eslint": "^7.11.0",
     "eslint-config-prettier": "^6.15.0",
-    "eslint-plugin-ember": "^10.0.2",
+    "eslint-plugin-ember": "^10.0.1",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^3.1.4",
     "loader.js": "^4.7.0",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.2.1",
-    "qunit": "^2.13.0",
-    "qunit-dom": "^1.6.0"
+    "qunit": "^2.11.0",
+    "qunit-dom": "^1.6.0-beta.1"
   },
   "engines": {
     "node": "10.* || >= 12"