diff --git a/packages/compat/package.json b/packages/compat/package.json
index a1aac4605..651e02767 100644
--- a/packages/compat/package.json
+++ b/packages/compat/package.json
@@ -82,7 +82,7 @@
     "ember-cli-htmlbars-inline-precompile": "^2.1.0",
     "ember-cli-htmlbars-3": "npm:ember-cli-htmlbars@3",
     "@glimmer/syntax": "0.80.0",
-    "ember-engines": "^0.8.15",
+    "ember-engines": "^0.8.19",
     "typescript": "*"
   },
   "peerDependencies": {
diff --git a/packages/compat/src/get-real-addon.ts b/packages/compat/src/get-real-addon.ts
index 55080b35d..50dcd7e9c 100644
--- a/packages/compat/src/get-real-addon.ts
+++ b/packages/compat/src/get-real-addon.ts
@@ -7,7 +7,7 @@
 let TARGET_INSTANCE_SYMBOL: any;
 
 try {
-  // eslint-disable-next-line @typescript-eslint/no-require-imports
+  // eslint-disable-next-line @typescript-eslint/no-require-imports, import/no-extraneous-dependencies
   const targetInstanceModule = require('ember-cli/lib/models/per-bundle-addon-cache/target-instance');
 
   if (targetInstanceModule) {
diff --git a/packages/router/package.json b/packages/router/package.json
index e0168b0ce..830a8748c 100644
--- a/packages/router/package.json
+++ b/packages/router/package.json
@@ -45,7 +45,7 @@
     "broccoli-asset-rev": "^3.0.0",
     "cross-env": "^7.0.3",
     "ember-auto-import": "^1.11.2",
-    "ember-cli": "~3.27.0",
+    "ember-cli": "~3.28.0",
     "ember-cli-dependency-checker": "^3.1.0",
     "ember-cli-htmlbars": "^4.3.1",
     "ember-cli-inject-live-reload": "^1.8.2",
diff --git a/packages/util/config/ember-try.js b/packages/util/config/ember-try.js
index 47180c7fa..b4d3235ff 100644
--- a/packages/util/config/ember-try.js
+++ b/packages/util/config/ember-try.js
@@ -72,7 +72,7 @@ module.exports = async function () {
         },
         npm: {
           devDependencies: {
-            '@ember/jquery': '^1.1.0',
+            '@ember/jquery': '^2.0.0',
           },
         },
       },
diff --git a/packages/util/package.json b/packages/util/package.json
index 220b637c9..ba2168a40 100644
--- a/packages/util/package.json
+++ b/packages/util/package.json
@@ -33,6 +33,7 @@
     "ember-cli-babel": "^7.23.1"
   },
   "devDependencies": {
+    "@ember/jquery": "^2.0.0",
     "@ember/optional-features": "^2.0.0",
     "@ember/test-helpers": "^2.4.2",
     "@embroider/compat": "0.44.1",
@@ -48,7 +49,7 @@
     "broccoli-asset-rev": "^3.0.0",
     "cross-env": "^7.0.3",
     "ember-auto-import": "^2.2.0",
-    "ember-cli": "~3.27.0",
+    "ember-cli": "~3.28.0",
     "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-htmlbars": "^5.3.2",
     "ember-cli-inject-live-reload": "^2.0.2",
diff --git a/test-packages/fastboot-addon/config/ember-try.js b/test-packages/fastboot-addon/config/ember-try.js
index 91935e105..9703565a3 100644
--- a/test-packages/fastboot-addon/config/ember-try.js
+++ b/test-packages/fastboot-addon/config/ember-try.js
@@ -64,7 +64,7 @@ module.exports = async function() {
         },
         npm: {
           devDependencies: {
-            '@ember/jquery': '^0.5.1'
+            '@ember/jquery': '^2.0.0'
           }
         }
       },
diff --git a/test-packages/fastboot-addon/package.json b/test-packages/fastboot-addon/package.json
index 7cec48f82..a5d8da86b 100644
--- a/test-packages/fastboot-addon/package.json
+++ b/test-packages/fastboot-addon/package.json
@@ -33,7 +33,7 @@
     "babel-eslint": "^10.1.0",
     "broccoli-asset-rev": "^3.0.0",
     "ember-auto-import": "^2.2.0",
-    "ember-cli": "~3.27.0",
+    "ember-cli": "~3.28.0",
     "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-inject-live-reload": "^2.0.2",
     "ember-cli-sri": "^2.1.1",
diff --git a/test-packages/sample-transforms/config/ember-try.js b/test-packages/sample-transforms/config/ember-try.js
index 534df49fd..ff9546792 100644
--- a/test-packages/sample-transforms/config/ember-try.js
+++ b/test-packages/sample-transforms/config/ember-try.js
@@ -18,7 +18,7 @@ module.exports = function() {
           },
           npm: {
             devDependencies: {
-              '@ember/jquery': '^0.5.1',
+              '@ember/jquery': '^2.0.0',
               'ember-source': '~2.18.0'
             }
           }
@@ -74,7 +74,7 @@ module.exports = function() {
           },
           npm: {
             devDependencies: {
-              '@ember/jquery': '^0.5.1'
+              '@ember/jquery': '^2.0.0'
             }
           }
         }
diff --git a/test-packages/sample-transforms/package.json b/test-packages/sample-transforms/package.json
index 6345224b2..38059c92a 100644
--- a/test-packages/sample-transforms/package.json
+++ b/test-packages/sample-transforms/package.json
@@ -28,7 +28,7 @@
     "@embroider/test-support": "0.36.0",
     "broccoli-asset-rev": "^3.0.0",
     "ember-auto-import": "^2.2.0",
-    "ember-cli": "~3.27.0",
+    "ember-cli": "~3.28.0",
     "ember-cli-dependency-checker": "^3.1.0",
     "ember-cli-eslint": "^5.1.0",
     "ember-cli-htmlbars": "^4.3.1",
diff --git a/test-packages/support/package.json b/test-packages/support/package.json
index ba991a80d..06851e2fc 100644
--- a/test-packages/support/package.json
+++ b/test-packages/support/package.json
@@ -14,7 +14,7 @@
     "broccoli": "^3.4.2",
     "console-ui": "^3.0.0",
     "ember-auto-import": "^2.2.0",
-    "ember-cli": "~3.27.0",
+    "ember-cli": "~3.28.0",
     "ember-cli-babel": "^7.20.5",
     "ember-cli-htmlbars": "^4.2.0",
     "ember-resolver": "^7.0.0",
diff --git a/tests/addon-template/package.json b/tests/addon-template/package.json
index cc30d16ae..17cfb48e5 100644
--- a/tests/addon-template/package.json
+++ b/tests/addon-template/package.json
@@ -38,7 +38,7 @@
     "babel-eslint": "^10.1.0",
     "broccoli-asset-rev": "^3.0.0",
     "ember-auto-import": "^2.2.0",
-    "ember-cli": "~3.27.0",
+    "ember-cli": "~3.28.0",
     "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-inject-live-reload": "^2.0.2",
     "ember-cli-sri": "^2.1.1",
diff --git a/tests/app-template/package.json b/tests/app-template/package.json
index f107e06fd..c1a22197d 100644
--- a/tests/app-template/package.json
+++ b/tests/app-template/package.json
@@ -35,7 +35,7 @@
     "babel-eslint": "^10.1.0",
     "broccoli-asset-rev": "^3.0.0",
     "ember-auto-import": "^2.2.0",
-    "ember-cli": "~3.27.0",
+    "ember-cli": "~3.28.0",
     "ember-cli-app-version": "^5.0.0",
     "ember-cli-babel": "^7.26.3",
     "ember-cli-dependency-checker": "^3.2.0",
diff --git a/tests/scenarios/engines-test.ts b/tests/scenarios/engines-test.ts
index a6213312c..2ad5d3132 100644
--- a/tests/scenarios/engines-test.ts
+++ b/tests/scenarios/engines-test.ts
@@ -1,4 +1,4 @@
-import { appScenarios } from './scenarios';
+import { appScenarios, baseAddon } from './scenarios';
 import { PreparedApp, Project } from 'scenario-tester';
 import QUnit from 'qunit';
 import merge from 'lodash/merge';
@@ -6,13 +6,35 @@ import { setupFastboot, loadFromFixtureData } from './helpers';
 import { dirname } from 'path';
 const { module: Qmodule, test } = QUnit;
 
+// Both ember-engines and its dependency ember-asset-loader have undeclared
+// peerDependencies on ember-cli.
+function emberEngines(): Project {
+  let enginesPath = dirname(require.resolve('ember-engines/package.json'));
+  let engines = Project.fromDir(enginesPath, { linkDeps: true });
+  engines.pkg.peerDependencies = Object.assign(
+    {
+      'ember-cli': '*',
+    },
+    engines.pkg.peerDependencies
+  );
+  let assetLoader = Project.fromDir(dirname(require.resolve('ember-asset-loader', { paths: [enginesPath] })), {
+    linkDeps: true,
+  });
+  assetLoader.pkg.peerDependencies = Object.assign(
+    {
+      'ember-cli': '*',
+    },
+    assetLoader.pkg.peerDependencies
+  );
+  engines.addDependency(assetLoader);
+  return engines;
+}
+
 appScenarios
   .map('engines', project => {
-    let eagerEngine = Project.fromDir(dirname(require.resolve('../addon-template/package.json')), { linkDeps: true });
-    let lazyEngine = Project.fromDir(dirname(require.resolve('../addon-template/package.json')), { linkDeps: true });
-    let macroSampleAddon = Project.fromDir(dirname(require.resolve('../addon-template/package.json')), {
-      linkDeps: true,
-    });
+    let eagerEngine = baseAddon();
+    let lazyEngine = baseAddon();
+    let macroSampleAddon = baseAddon();
 
     merge(eagerEngine.files, loadFromFixtureData('eager-engine'));
     merge(lazyEngine.files, loadFromFixtureData('lazy-engine'));
@@ -43,11 +65,11 @@ appScenarios
     project.linkDependency('ember-cli-fastboot', { baseDir: __dirname });
     project.linkDependency('fastboot', { baseDir: __dirname });
     project.linkDependency('ember-truth-helpers', { baseDir: __dirname });
-    project.linkDependency('ember-engines', { baseDir: __dirname });
+    project.addDependency(emberEngines());
     eagerEngine.linkDependency('ember-truth-helpers', { baseDir: __dirname });
-    eagerEngine.linkDependency('ember-engines', { baseDir: __dirname });
+    eagerEngine.addDependency(emberEngines());
     lazyEngine.linkDependency('ember-truth-helpers', { baseDir: __dirname });
-    lazyEngine.linkDependency('ember-engines', { baseDir: __dirname });
+    lazyEngine.addDependency(emberEngines());
     macroSampleAddon.linkDependency('@embroider/macros', { baseDir: __dirname });
 
     let engineTestFiles = loadFromFixtureData('engines-host-app');
diff --git a/tests/scenarios/macro-test.ts b/tests/scenarios/macro-test.ts
index 0ddd3864e..5c8b0071e 100644
--- a/tests/scenarios/macro-test.ts
+++ b/tests/scenarios/macro-test.ts
@@ -1,8 +1,8 @@
-import { appScenarios, appReleaseScenario, addonScenarios } from './scenarios';
+import { appScenarios, appReleaseScenario, dummyAppScenarios, baseAddon } from './scenarios';
 import { PreparedApp, Project } from 'scenario-tester';
 import QUnit from 'qunit';
 import merge from 'lodash/merge';
-import { dirname, join } from 'path';
+import { join } from 'path';
 import { loadFromFixtureData } from './helpers';
 import fs from 'fs-extra';
 const { module: Qmodule, test } = QUnit;
@@ -19,12 +19,8 @@ function updateLodashVersion(app: PreparedApp, version: string) {
 }
 
 function scenarioSetup(project: Project) {
-  let macroSampleAddon = Project.fromDir(dirname(require.resolve('../addon-template/package.json')), {
-    linkDeps: true,
-  });
-  let funkySampleAddon = Project.fromDir(dirname(require.resolve('../addon-template/package.json')), {
-    linkDeps: true,
-  });
+  let macroSampleAddon = baseAddon();
+  let funkySampleAddon = baseAddon();
 
   macroSampleAddon.pkg.name = 'macro-sample-addon';
   funkySampleAddon.pkg.name = '@embroider/funky-sample-addon';
@@ -113,7 +109,7 @@ appReleaseScenario
     });
   });
 
-addonScenarios
+dummyAppScenarios
   .map('macro-sample-addon', project => {
     let addonFiles = loadFromFixtureData('macro-sample-addon');
     project.name = 'macro-sample-addon';
diff --git a/tests/scenarios/package.json b/tests/scenarios/package.json
index c212365cf..96e10c0c7 100644
--- a/tests/scenarios/package.json
+++ b/tests/scenarios/package.json
@@ -9,7 +9,7 @@
     "jsdom": "^16.2.2",
     "lodash": "^4.17.20",
     "qunit": "^2.16.0",
-    "scenario-tester": "^1.0.2",
+    "scenario-tester": "^2.0.1",
     "ts-node": "^9.1.1"
   },
   "scripts": {
@@ -37,7 +37,7 @@
     "ember-data-3.20": "npm:ember-data@~3.20.0",
     "ember-data-3.24": "npm:ember-data@~3.24.0",
     "ember-data-latest": "npm:ember-data@latest",
-    "ember-engines": "^0.8.16",
+    "ember-engines": "^0.8.17",
     "ember-inline-svg": "^0.2.1",
     "ember-source-latest": "npm:ember-source@latest",
     "ember-source-beta": "npm:ember-source@beta",
diff --git a/tests/scenarios/preprocess-test.ts b/tests/scenarios/preprocess-test.ts
index 824f498bb..3bee14888 100644
--- a/tests/scenarios/preprocess-test.ts
+++ b/tests/scenarios/preprocess-test.ts
@@ -1,17 +1,15 @@
-import { appScenarios } from './scenarios';
-import { PreparedApp, Project } from 'scenario-tester';
+import { appScenarios, baseAddon } from './scenarios';
+import { PreparedApp } from 'scenario-tester';
 import QUnit from 'qunit';
 import merge from 'lodash/merge';
 import { loadFromFixtureData } from './helpers';
-import { dirname, join } from 'path';
+import { join } from 'path';
 import fs from 'fs';
 const { module: Qmodule, test } = QUnit;
 
 appScenarios
   .map('preprocess', project => {
-    let preprocessAddon = Project.fromDir(dirname(require.resolve('../addon-template/package.json')), {
-      linkDeps: true,
-    });
+    let preprocessAddon = baseAddon();
 
     merge(preprocessAddon.files, loadFromFixtureData('preprocess-addon'));
     preprocessAddon.linkDependency('broccoli-funnel', { baseDir: __dirname });
diff --git a/tests/scenarios/scenarios.ts b/tests/scenarios/scenarios.ts
index a9526dbda..ce803985e 100644
--- a/tests/scenarios/scenarios.ts
+++ b/tests/scenarios/scenarios.ts
@@ -61,10 +61,17 @@ export function onlyRunRelease(scenarios: Scenarios) {
   return scenarios.expand({ release });
 }
 
-export const appScenarios = supportMatrix(Scenarios.fromDir(dirname(require.resolve('../app-template/package.json'))));
-export const addonScenarios = supportMatrix(
-  Scenarios.fromDir(dirname(require.resolve('../addon-template/package.json')))
-);
-export const appReleaseScenario = onlyRunRelease(
-  Scenarios.fromDir(dirname(require.resolve('../app-template/package.json')))
-);
+export function baseAddon(as: 'dummy-app' | 'dependency' = 'dependency') {
+  return Project.fromDir(
+    dirname(require.resolve('../addon-template/package.json')),
+    as === 'dummy-app' ? { linkDevDeps: true } : { linkDeps: true }
+  );
+}
+
+export function baseApp() {
+  return Project.fromDir(dirname(require.resolve('../app-template/package.json')), { linkDevDeps: true });
+}
+
+export const appScenarios = supportMatrix(Scenarios.fromProject(baseApp));
+export const dummyAppScenarios = supportMatrix(Scenarios.fromProject(() => baseAddon('dummy-app')));
+export const appReleaseScenario = onlyRunRelease(Scenarios.fromProject(baseApp));
diff --git a/yarn.lock b/yarn.lock
index 092c61d99..9c8596284 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1621,6 +1621,17 @@
   resolved "https://registry.yarnpkg.com/@ember/edition-utils/-/edition-utils-1.2.0.tgz#a039f542dc14c8e8299c81cd5abba95e2459cfa6"
   integrity sha512-VmVq/8saCaPdesQmftPqbFtxJWrzxNGSQ+e8x8LLe3Hjm36pJ04Q8LeORGZkAeOhldoUX9seLGmSaHeXkIqoog==
 
+"@ember/jquery@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@ember/jquery/-/jquery-2.0.0.tgz#083a1de32333b3fc938fad246a6f3ea7eefe5b10"
+  integrity sha512-f8+WNqzXBNxl96jo0IwJBO5QCi0bnUlba9I7WbZcGhgnzszC76INJkw6l8UepZ1PMGG1H1wYpoIGoBBp5ZVmFA==
+  dependencies:
+    broccoli-funnel "^3.0.6"
+    broccoli-merge-trees "^4.2.0"
+    ember-cli-babel "^7.26.6"
+    jquery "^3.5.0"
+    resolve "^1.15.1"
+
 "@ember/optional-features@^0.7.0":
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/@ember/optional-features/-/optional-features-0.7.0.tgz#f65a858007020ddfb8342f586112750c32abd2d9"
@@ -1779,6 +1790,19 @@
     resolve "^1.8.1"
     semver "^7.3.2"
 
+"@embroider/macros@^0.43.5":
+  version "0.43.5"
+  resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-0.43.5.tgz#f846bb883482436611a58a3512c687d4f9fddfad"
+  integrity sha512-WmLa0T3dyG2XyN5Gr7k1RINDirFzAzh6CRvykRMcuahq1rCrav8ADrWgQzKpPWxdR6DgQCuoyimopJhLbYOpgQ==
+  dependencies:
+    "@embroider/shared-internals" "0.43.5"
+    assert-never "^1.2.1"
+    ember-cli-babel "^7.26.6"
+    find-up "^5.0.0"
+    lodash "^4.17.21"
+    resolve "^1.20.0"
+    semver "^7.3.2"
+
 "@embroider/shared-internals@0.41.0":
   version "0.41.0"
   resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-0.41.0.tgz#2553f026d4f48ea1fd11235501feb63bf49fa306"
@@ -1792,6 +1816,18 @@
     semver "^7.3.2"
     typescript-memoize "^1.0.0-alpha.3"
 
+"@embroider/shared-internals@0.43.5":
+  version "0.43.5"
+  resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-0.43.5.tgz#4269208095452c23bfa4f08554fd8f7ed7b83a83"
+  integrity sha512-vydU3kRS5hH/hWOBHiHP06427d0C5t2p+UTPtbH09+Jlyj0WvvtgUfiNltEneY6jjpLXlqOfgs4LjsRdmBFksw==
+  dependencies:
+    ember-rfc176-data "^0.3.17"
+    fs-extra "^9.1.0"
+    lodash "^4.17.21"
+    resolve-package-path "^4.0.1"
+    semver "^7.3.5"
+    typescript-memoize "^1.0.1"
+
 "@embroider/shared-internals@^0.40.0":
   version "0.40.0"
   resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-0.40.0.tgz#2f768c60f4f35ba5f9228f046f70324851e8bfe2"
@@ -2654,7 +2690,7 @@
   dependencies:
     "@types/node" "*"
 
-"@types/fs-extra@^9.0.11", "@types/fs-extra@^9.0.7":
+"@types/fs-extra@^9.0.11":
   version "9.0.11"
   resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.11.tgz#8cc99e103499eab9f347dbc6ca4e99fb8d2c2b87"
   integrity sha512-mZsifGG4QeQ7hlkhO56u7zt/ycBgGxSVsFI/6lGTU34VtwkiqrrSDgw0+ygs8kFGWcXnFQWMrzF2h7TtDFNixA==
@@ -2827,7 +2863,15 @@
   dependencies:
     "@types/node" "*"
 
-"@types/rimraf@^2.0.2", "@types/rimraf@^2.0.3":
+"@types/rimraf@^2.0.2":
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/@types/rimraf/-/rimraf-2.0.5.tgz#368fb04d59630b727fc05a74d2ca557f64a8ef98"
+  integrity sha512-YyP+VfeaqAyFmXoTh3HChxOQMyjByRMsHU7kc5KOJkSlXudhMhQIALbYV7rHh/l8d2lX3VUQzprrcAgWdRuU8g==
+  dependencies:
+    "@types/glob" "*"
+    "@types/node" "*"
+
+"@types/rimraf@^2.0.3":
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/@types/rimraf/-/rimraf-2.0.4.tgz#403887b0b53c6100a6c35d2ab24f6ccc042fec46"
   integrity sha512-8gBudvllD2A/c0CcEX/BivIDorHFt5UI5m46TsNj8DjWCCTTZT74kEe4g+QsY7P/B9WdO98d82zZgXO/RQzu2Q==
@@ -2897,11 +2941,6 @@
   resolved "https://registry.yarnpkg.com/@types/tmp/-/tmp-0.1.0.tgz#19cf73a7bcf641965485119726397a096f0049bd"
   integrity sha512-6IwZ9HzWbCq6XoQWhxLpDjuADodH/MKXRUIDFudvgjcVdjFknvmR+DNsoUeer4XPrEnrZs04Jj+kfV9pFsrhmA==
 
-"@types/tmp@^0.2.0":
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/@types/tmp/-/tmp-0.2.0.tgz#e3f52b4d7397eaa9193592ef3fdd44dc0af4298c"
-  integrity sha512-flgpHJjntpBAdJD43ShRosQvNC0ME97DCfGvZEDlAThQmnerRXrLbX6YgzRBQCZTthET9eAWFAMaYP0m0Y4HzQ==
-
 "@types/tough-cookie@*":
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-4.0.0.tgz#fef1904e4668b6e5ecee60c52cc6a078ffa6697d"
@@ -2924,13 +2963,6 @@
   dependencies:
     "@types/yargs-parser" "*"
 
-"@types/yargs@^16.0.0":
-  version "16.0.3"
-  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-16.0.3.tgz#4b6d35bb8e680510a7dc2308518a80ee1ef27e01"
-  integrity sha512-YlFfTGS+zqCgXuXNV26rOIeETOkXnGQXP/pjjL9P0gO/EP9jTmc7pUBhx+jVEIxpq41RX33GQ7N3DzOSfZoglQ==
-  dependencies:
-    "@types/yargs-parser" "*"
-
 "@types/yargs@^17.0.0":
   version "17.0.0"
   resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.0.tgz#32f740934eedf0a5cd19470249f317755c91f1ae"
@@ -5063,7 +5095,7 @@ broccoli-funnel@^3.0.2, broccoli-funnel@^3.0.3, broccoli-funnel@^3.0.5, broccoli
     minimatch "^3.0.0"
     walk-sync "^2.0.2"
 
-broccoli-funnel@^3.0.8:
+broccoli-funnel@^3.0.6, broccoli-funnel@^3.0.8:
   version "3.0.8"
   resolved "https://registry.yarnpkg.com/broccoli-funnel/-/broccoli-funnel-3.0.8.tgz#f5b62e2763c3918026a15a3c833edc889971279b"
   integrity sha512-ng4eIhPYiXqMw6SyGoxPHR3YAwEd2lr9FgBI1CyTbspl4txZovOsmzFkMkGAlu88xyvYXJqHiM2crfLa65T1BQ==
@@ -8137,10 +8169,10 @@ ember-cli-version-checker@^5.1.1, ember-cli-version-checker@^5.1.2:
     semver "^7.3.4"
     silent-error "^1.1.1"
 
-ember-cli@~3.27.0:
-  version "3.27.0"
-  resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-3.27.0.tgz#8ccf9db51d7b462f86210b853d086a4543605c34"
-  integrity sha512-vFLPFkplXn5v005fattHdOcs5AbSp7RG4w1wpHDWHzOSYpl2Dr+5zzZtqLS7V5IVaLf3XK4l24XwhSW9HpMfsQ==
+ember-cli@~3.28.0:
+  version "3.28.0"
+  resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-3.28.0.tgz#0a0374c9a1d08386ddf56e8098a38b71dd4453bc"
+  integrity sha512-CrMs5edFQ2ingO2xfT33T4nUEl8SlvBQ7q+XO9L/GFTvFU07slHxYSvGur0cwgQfOiLnkSTnIaVF1oqBnEmfPQ==
   dependencies:
     "@babel/core" "^7.13.8"
     "@babel/plugin-transform-modules-amd" "^7.12.1"
@@ -8156,7 +8188,7 @@ ember-cli@~3.27.0:
     broccoli-config-loader "^1.0.1"
     broccoli-config-replace "^1.1.2"
     broccoli-debug "^0.6.5"
-    broccoli-funnel "^2.0.2"
+    broccoli-funnel "^3.0.5"
     broccoli-funnel-reducer "^1.0.0"
     broccoli-merge-trees "^3.0.2"
     broccoli-middleware "^2.1.1"
@@ -8222,7 +8254,7 @@ ember-cli@~3.27.0:
     sane "^4.1.0"
     semver "^7.3.4"
     silent-error "^1.1.1"
-    sort-package-json "^1.48.0"
+    sort-package-json "^1.49.0"
     symlink-or-copy "^1.3.1"
     temp "0.9.4"
     testem "^3.2.0"
@@ -8231,10 +8263,10 @@ ember-cli@~3.27.0:
     uuid "^8.3.2"
     walk-sync "^2.2.0"
     watch-detector "^1.0.0"
-    workerpool "^6.0.3"
+    workerpool "^6.1.4"
     yam "^1.0.0"
 
-ember-compatibility-helpers@^1.1.1, ember-compatibility-helpers@^1.1.2, ember-compatibility-helpers@^1.2.0, ember-compatibility-helpers@^1.2.1, ember-compatibility-helpers@^1.2.2, ember-compatibility-helpers@^1.2.4:
+ember-compatibility-helpers@^1.1.1, ember-compatibility-helpers@^1.1.2, ember-compatibility-helpers@^1.2.0, ember-compatibility-helpers@^1.2.1, ember-compatibility-helpers@^1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/ember-compatibility-helpers/-/ember-compatibility-helpers-1.2.4.tgz#70e0fef7048969141626eed6006f3880df612cd1"
   integrity sha512-qjzQVtogyYJrSs6I4DuyCDwDCaj5JWBVNPoZDZBk8pt7caNoN0eBYRYJdin95QKaNMQODxTLPWaI4UUDQ1YWhg==
@@ -8399,36 +8431,12 @@ ember-element-helper@^0.5.0:
     ember-cli-babel "^7.17.2"
     ember-cli-htmlbars "^5.1.0"
 
-ember-engines@^0.8.15:
-  version "0.8.15"
-  resolved "https://registry.yarnpkg.com/ember-engines/-/ember-engines-0.8.15.tgz#091cae2c1be8d871b0b037df2fd188f17e853194"
-  integrity sha512-X16c1w3fgFV5cBWDnaT4OQ/10usCN+peC1BxBE29/MYouKiFre70GrHvJYMbYYURVGhqRLRAdXkROhqUikGSXw==
-  dependencies:
-    amd-name-resolver "1.3.1"
-    babel-plugin-compact-reexports "^1.1.0"
-    broccoli-babel-transpiler "^7.2.0"
-    broccoli-concat "^4.2.5"
-    broccoli-debug "^0.6.5"
-    broccoli-dependency-funnel "^2.1.2"
-    broccoli-file-creator "^2.1.1"
-    broccoli-funnel "^2.0.2"
-    broccoli-merge-trees "^3.0.2"
-    broccoli-test-helper "^2.0.0"
-    calculate-cache-key-for-tree "^2.0.0"
-    ember-asset-loader "^0.6.1"
-    ember-cli-babel "^7.18.0"
-    ember-cli-htmlbars "^5.3.1"
-    ember-cli-preprocess-registry "^3.3.0"
-    ember-cli-string-utils "^1.1.0"
-    ember-cli-version-checker "^5.1.2"
-    ember-compatibility-helpers "^1.2.2"
-    lodash "^4.17.11"
-
-ember-engines@^0.8.16:
-  version "0.8.16"
-  resolved "https://registry.yarnpkg.com/ember-engines/-/ember-engines-0.8.16.tgz#1aaf97c5999881942c035a363ddc8c5adf9420ea"
-  integrity sha512-81ZEmBPAmop1yNIHtOtALAWkjSHuGMgc4i3nRhkB/da4d6b6nXXkZOOXVXyyTF6Ui3W9fwqLiM7XeB3gWv7C0A==
+ember-engines@^0.8.17, ember-engines@^0.8.19:
+  version "0.8.19"
+  resolved "https://registry.yarnpkg.com/ember-engines/-/ember-engines-0.8.19.tgz#b5c4d3a0f332172e279f7f68bab357a88ce09497"
+  integrity sha512-8IYHbW2z1zNCM2biREf2mHuXNpQoKc5P3yilXvGDLb5V1hujftXo5Bem038YKufp3DxRRNOHIomFKxHvDduNGQ==
   dependencies:
+    "@embroider/macros" "^0.43.5"
     amd-name-resolver "1.3.1"
     babel-plugin-compact-reexports "^1.1.0"
     broccoli-babel-transpiler "^7.2.0"
@@ -8442,11 +8450,9 @@ ember-engines@^0.8.16:
     calculate-cache-key-for-tree "^2.0.0"
     ember-asset-loader "^0.6.1"
     ember-cli-babel "^7.18.0"
-    ember-cli-htmlbars "^5.3.1"
     ember-cli-preprocess-registry "^3.3.0"
     ember-cli-string-utils "^1.1.0"
     ember-cli-version-checker "^5.1.2"
-    ember-compatibility-helpers "^1.2.2"
     lodash "^4.17.11"
 
 ember-export-application-global@^2.0.0, ember-export-application-global@^2.0.1:
@@ -10237,15 +10243,16 @@ fixturify-project@^2.1.0, fixturify-project@^2.1.1:
     tmp "^0.0.33"
     type-fest "^0.11.0"
 
-fixturify-project@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/fixturify-project/-/fixturify-project-3.0.2.tgz#c7374dbb286fbca4136d402d41da13b345add708"
-  integrity sha512-YQz3XOfQuwQ+lFVmqM9GFsnqgDBMA7eB4+NwRwXlgD0radi5FYEygKrkAUhBbFIpXGOZViF+7q35+k72I0VIKg==
+fixturify-project@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/fixturify-project/-/fixturify-project-4.0.1.tgz#9c9a29690b0b6f87654a67f9f56972cf97dd6b9a"
+  integrity sha512-WSWVgJl2bjrxj68HBo35fE/DXwVtVef5J07O/v22J0HbZNb72QVPeyaLyK4vw9M6SNIwkOxg/YAdBQSIETLCUA==
   dependencies:
     fixturify "^2.1.1"
     resolve-package-path "^3.1.0"
     tmp "^0.0.33"
-    type-fest "^0.11.0"
+    type-fest "^2.3.2"
+    walk-sync "^3.0.0"
 
 fixturify@^0.3.2:
   version "0.3.4"
@@ -15679,7 +15686,7 @@ resolve@1.1.7:
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
   integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=
 
-resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.10.1, resolve@^1.11.1, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.14.0, resolve@^1.14.2, resolve@^1.15.0, resolve@^1.17.0, resolve@^1.18.1, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.3.3, resolve@^1.4.0, resolve@^1.5.0, resolve@^1.8.1:
+resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.10.1, resolve@^1.11.1, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.14.0, resolve@^1.14.2, resolve@^1.15.0, resolve@^1.15.1, resolve@^1.17.0, resolve@^1.18.1, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.3.3, resolve@^1.4.0, resolve@^1.5.0, resolve@^1.8.1:
   version "1.20.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975"
   integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==
@@ -15906,19 +15913,15 @@ saxes@^5.0.1:
   dependencies:
     xmlchars "^2.2.0"
 
-scenario-tester@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/scenario-tester/-/scenario-tester-1.0.2.tgz#f630a844db330df2017a3cc9cedf5332c2aa2362"
-  integrity sha512-jxhDEeh5v4AXqFvsBetRh42bA9Mo+wpRQEAl9pj3ojJKn+FFjR2lv6B8mdsyI5mpaJq7mh7CZpKopLTv9gNBHA==
+scenario-tester@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/scenario-tester/-/scenario-tester-2.0.1.tgz#e53d5a0b5e63ab438021e1db350ad32b3793a09c"
+  integrity sha512-eOKsyXxYfB5PyNVOLu6vsgT7KuLA87TGZnCkWLY6xKyZfMDmMLmHFfVnYNUQz0AS4XUvQObtVNhmkJwjNsRwtA==
   dependencies:
-    "@types/fs-extra" "^9.0.7"
-    "@types/tmp" "^0.2.0"
-    "@types/yargs" "^16.0.0"
-    fixturify-project "^3.0.2"
+    fixturify-project "^4.0.1"
     fs-extra "^9.1.0"
     glob "^7.1.6"
     tmp "^0.2.1"
-    typescript "^4.1.5"
     yargs "^16.2.0"
 
 schema-utils@^1.0.0:
@@ -16276,7 +16279,7 @@ sort-object-keys@^1.1.3:
   resolved "https://registry.yarnpkg.com/sort-object-keys/-/sort-object-keys-1.1.3.tgz#bff833fe85cab147b34742e45863453c1e190b45"
   integrity sha512-855pvK+VkU7PaKYPc+Jjnmt4EzejQHyhhF33q31qG8x7maDzkeFhAAThdCYay11CISO+qAMwjOBP+fPZe0IPyg==
 
-sort-package-json@^1.39.1, sort-package-json@^1.44.0, sort-package-json@^1.48.0:
+sort-package-json@^1.39.1, sort-package-json@^1.44.0, sort-package-json@^1.48.0, sort-package-json@^1.49.0:
   version "1.50.0"
   resolved "https://registry.yarnpkg.com/sort-package-json/-/sort-package-json-1.50.0.tgz#19fc109fe23bd157bd03c8e572fa3251a52467d8"
   integrity sha512-qZpqhMU9XTntebgAgc4hv/D6Fzhh7kFnwvV6a7+q8y8J5JoaDqPYQnvXPf7BBqG95tdE8X6JVNo7/jDzcbdfUg==
@@ -17372,6 +17375,11 @@ type-fest@^0.8.1:
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
   integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==
 
+type-fest@^2.3.2:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-2.3.2.tgz#bb91f7ff24788ed81e28463eb94e5a1306f5bab3"
+  integrity sha512-cfvZ1nOC/VqAt8bVOIlFz8x+HdDASpiFYrSi0U0nzcAFlOnzzQ/gsPg2PP1uqjreO7sQCtraYJHMduXSewQsSA==
+
 type-is@~1.6.17, type-is@~1.6.18:
   version "1.6.18"
   resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
@@ -17402,11 +17410,6 @@ typescript@*, typescript@4.4.2:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.4.2.tgz#6d618640d430e3569a1dfb44f7d7e600ced3ee86"
   integrity sha512-gzP+t5W4hdy4c+68bfcv0t400HVJMMd2+H9B7gae1nQlBzCqvrXX+6GL/b3GAgyTH966pzrZ70/fRjwAtZksSQ==
 
-typescript@^4.1.5:
-  version "4.3.2"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.3.2.tgz#399ab18aac45802d6f2498de5054fcbbe716a805"
-  integrity sha512-zZ4hShnmnoVnAHpVHWpTcxdv7dWP60S2FsydQLV8V5PbS3FifjWFFRiHSWpDJahly88PRyV5teTSLoq4eG7mKw==
-
 uc.micro@^1.0.1, uc.micro@^1.0.5:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac"