From a68c9769e1e392a3c7776274ac218aed75e15377 Mon Sep 17 00:00:00 2001
From: Stefan Penner <stefan.penner@gmail.com>
Date: Tue, 7 Sep 2021 11:58:37 -0600
Subject: [PATCH 01/15] Upgrade to latest ember-cli

---
 packages/compat/src/get-real-addon.ts        |  2 +-
 packages/router/package.json                 |  2 +-
 packages/util/package.json                   |  4 +-
 test-packages/fastboot-addon/package.json    |  2 +-
 test-packages/sample-transforms/package.json |  2 +-
 test-packages/support/package.json           |  2 +-
 tests/addon-template/package.json            |  2 +-
 tests/app-template/package.json              |  2 +-
 yarn.lock                                    | 54 +++++++++++++++++---
 9 files changed, 55 insertions(+), 17 deletions(-)

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 48b993a47..99dc0a6fa 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-htmlbars-inline-precompile": "^2.1.0",
diff --git a/packages/util/package.json b/packages/util/package.json
index 2e5fb7826..fe506dada 100644
--- a/packages/util/package.json
+++ b/packages/util/package.json
@@ -48,7 +48,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",
@@ -61,7 +61,7 @@
     "ember-page-title": "^6.2.1",
     "ember-qunit": "^5.1.2",
     "ember-resolver": "^8.0.2",
-    "ember-source": "~3.26",
+    "ember-source": "https://s3.amazonaws.com/builds.emberjs.com/release/shas/f243a4f0947a0be1d324b5250c4e2327c6bd7a5f.tgz",
     "ember-source-channel-url": "^3.0.0",
     "ember-template-lint": "^2.18.1",
     "ember-try": "^1.4.0",
diff --git a/test-packages/fastboot-addon/package.json b/test-packages/fastboot-addon/package.json
index 2fe59cc6d..29fce734d 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/package.json b/test-packages/sample-transforms/package.json
index 3ed396f51..2e108698f 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 bf6cc7050..25980315b 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 e57c16b28..f01cc52d8 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/yarn.lock b/yarn.lock
index 9588c6b76..8b1a51869 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2060,6 +2060,13 @@
   dependencies:
     babel-plugin-debug-macros "^0.3.4"
 
+"@glimmer/vm-babel-plugins@0.80.0":
+  version "0.80.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/vm-babel-plugins/-/vm-babel-plugins-0.80.0.tgz#e9a6b496501eed367b94c928dc48a954830af3b5"
+  integrity sha512-ZW6+L+FzjDZngGj87zn3MRRA/MrchC7Con33mCcI36v8u48maheB351uhQe+fBVU300IfyzNMvAdwdVKS5VIFw==
+  dependencies:
+    babel-plugin-debug-macros "^0.3.4"
+
 "@glimmer/vm@^0.42.2":
   version "0.42.2"
   resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.42.2.tgz#492a4f05eac587c3a37371b3c62593f20bef553d"
@@ -8147,10 +8154,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"
@@ -8166,7 +8173,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"
@@ -8232,7 +8239,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"
@@ -8241,7 +8248,7 @@ 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:
@@ -8877,6 +8884,37 @@ ember-source-channel-url@^3.0.0:
     semver "^7.3.4"
     silent-error "^1.1.1"
 
+"ember-source@https://s3.amazonaws.com/builds.emberjs.com/release/shas/f243a4f0947a0be1d324b5250c4e2327c6bd7a5f.tgz":
+  version "3.28.0-release"
+  resolved "https://s3.amazonaws.com/builds.emberjs.com/release/shas/f243a4f0947a0be1d324b5250c4e2327c6bd7a5f.tgz#83db5d57cde6579de7de1a9b8705cc0000c3a8fb"
+  dependencies:
+    "@babel/helper-module-imports" "^7.8.3"
+    "@babel/plugin-transform-block-scoping" "^7.8.3"
+    "@babel/plugin-transform-object-assign" "^7.8.3"
+    "@ember/edition-utils" "^1.2.0"
+    "@glimmer/vm-babel-plugins" "0.80.0"
+    babel-plugin-debug-macros "^0.3.3"
+    babel-plugin-filter-imports "^4.0.0"
+    broccoli-concat "^4.2.4"
+    broccoli-debug "^0.6.4"
+    broccoli-file-creator "^2.1.1"
+    broccoli-funnel "^2.0.2"
+    broccoli-merge-trees "^4.2.0"
+    chalk "^4.0.0"
+    ember-cli-babel "^7.23.0"
+    ember-cli-get-component-path-option "^1.0.0"
+    ember-cli-is-package-missing "^1.0.0"
+    ember-cli-normalize-entity-name "^1.0.0"
+    ember-cli-path-utils "^1.0.0"
+    ember-cli-string-utils "^1.1.0"
+    ember-cli-version-checker "^5.1.1"
+    ember-router-generator "^2.0.0"
+    inflection "^1.12.0"
+    jquery "^3.5.1"
+    resolve "^1.17.0"
+    semver "^7.3.4"
+    silent-error "^1.1.1"
+
 ember-source@~3.26:
   version "3.26.1"
   resolved "https://registry.yarnpkg.com/ember-source/-/ember-source-3.26.1.tgz#8c9e8a314fb0da447b944d64f9d92a80a628d7b5"
@@ -16276,7 +16314,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==

From 70e9a0f56dc5a1f96a32b87b70731e0fdd3717dd Mon Sep 17 00:00:00 2001
From: Stefan Penner <stefan.penner@gmail.com>
Date: Tue, 7 Sep 2021 15:11:43 -0600
Subject: [PATCH 02/15] bump ember-maybe-import-regenerator

---
 packages/router/package.json                 |  2 +-
 packages/util/package.json                   |  2 +-
 test-packages/fastboot-addon/package.json    |  2 +-
 test-packages/sample-transforms/package.json |  2 +-
 tests/addon-template/package.json            |  2 +-
 tests/app-template/package.json              |  2 +-
 yarn.lock                                    | 30 ++++++++++----------
 7 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/packages/router/package.json b/packages/router/package.json
index 99dc0a6fa..00c61627a 100644
--- a/packages/router/package.json
+++ b/packages/router/package.json
@@ -55,7 +55,7 @@
     "ember-disable-prototype-extensions": "^1.1.3",
     "ember-export-application-global": "^2.0.0",
     "ember-load-initializers": "^2.0.0",
-    "ember-maybe-import-regenerator": "^0.1.6",
+    "ember-maybe-import-regenerator": "^1.0.0",
     "ember-qunit": "^5.1.4",
     "ember-resolver": "^5.0.1",
     "ember-source": "~3.26",
diff --git a/packages/util/package.json b/packages/util/package.json
index fe506dada..4437064e5 100644
--- a/packages/util/package.json
+++ b/packages/util/package.json
@@ -57,7 +57,7 @@
     "ember-disable-prototype-extensions": "^1.1.3",
     "ember-export-application-global": "^2.0.1",
     "ember-load-initializers": "^2.1.2",
-    "ember-maybe-import-regenerator": "^0.1.6",
+    "ember-maybe-import-regenerator": "^1.0.0",
     "ember-page-title": "^6.2.1",
     "ember-qunit": "^5.1.2",
     "ember-resolver": "^8.0.2",
diff --git a/test-packages/fastboot-addon/package.json b/test-packages/fastboot-addon/package.json
index 29fce734d..a5d8da86b 100644
--- a/test-packages/fastboot-addon/package.json
+++ b/test-packages/fastboot-addon/package.json
@@ -41,7 +41,7 @@
     "ember-disable-prototype-extensions": "^1.1.3",
     "ember-export-application-global": "^2.0.1",
     "ember-load-initializers": "^2.1.1",
-    "ember-maybe-import-regenerator": "^0.1.6",
+    "ember-maybe-import-regenerator": "^1.0.0",
     "ember-qunit": "^5.1.4",
     "ember-resolver": "^7.0.0",
     "ember-source": "~3.26",
diff --git a/test-packages/sample-transforms/package.json b/test-packages/sample-transforms/package.json
index 2e108698f..a0bb7e4d1 100644
--- a/test-packages/sample-transforms/package.json
+++ b/test-packages/sample-transforms/package.json
@@ -39,7 +39,7 @@
     "ember-disable-prototype-extensions": "^1.1.3",
     "ember-export-application-global": "^2.0.0",
     "ember-load-initializers": "^2.0.0",
-    "ember-maybe-import-regenerator": "^0.1.6",
+    "ember-maybe-import-regenerator": "^1.0.0",
     "ember-qunit": "^5.1.4",
     "ember-resolver": "^5.0.1",
     "ember-source": "~3.26",
diff --git a/tests/addon-template/package.json b/tests/addon-template/package.json
index 25980315b..8a438330f 100644
--- a/tests/addon-template/package.json
+++ b/tests/addon-template/package.json
@@ -46,7 +46,7 @@
     "ember-disable-prototype-extensions": "^1.1.3",
     "ember-export-application-global": "^2.0.1",
     "ember-load-initializers": "^2.1.2",
-    "ember-maybe-import-regenerator": "^0.1.6",
+    "ember-maybe-import-regenerator": "^1.0.0",
     "ember-page-title": "^6.2.1",
     "ember-qunit": "^5.1.4",
     "ember-resolver": "^8.0.2",
diff --git a/tests/app-template/package.json b/tests/app-template/package.json
index f01cc52d8..830d8db6e 100644
--- a/tests/app-template/package.json
+++ b/tests/app-template/package.json
@@ -47,7 +47,7 @@
     "ember-export-application-global": "^2.0.1",
     "ember-fetch": "^8.0.1",
     "ember-load-initializers": "^2.1.2",
-    "ember-maybe-import-regenerator": "^0.1.6",
+    "ember-maybe-import-regenerator": "^1.0.0",
     "ember-page-title": "^6.2.1",
     "ember-qunit": "^5.1.4",
     "ember-resolver": "^8.0.2",
diff --git a/yarn.lock b/yarn.lock
index 8b1a51869..8a967ef6f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5122,7 +5122,7 @@ broccoli-lint-eslint@^5.0.0:
     lodash.defaultsdeep "^4.6.0"
     md5-hex "^2.0.0"
 
-broccoli-merge-trees@^1.0.0, broccoli-merge-trees@^1.1.1:
+broccoli-merge-trees@^1.1.1:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/broccoli-merge-trees/-/broccoli-merge-trees-1.2.4.tgz#a001519bb5067f06589d91afa2942445a2d0fdb5"
   integrity sha1-oAFRm7UGfwZYnZGvopQkRaLQ/bU=
@@ -7575,7 +7575,7 @@ ember-cli-babel-plugin-helpers@^1.0.0, ember-cli-babel-plugin-helpers@^1.1.0, em
   resolved "https://registry.yarnpkg.com/ember-cli-babel-plugin-helpers/-/ember-cli-babel-plugin-helpers-1.1.1.tgz#5016b80cdef37036c4282eef2d863e1d73576879"
   integrity sha512-sKvOiPNHr5F/60NLd7SFzMpYPte/nnGkq/tMIfXejfKHIhaiIkYFqX8Z9UFTKWLLn+V7NOaby6niNPZUdvKCRw==
 
-ember-cli-babel@^6.0.0-beta.4, ember-cli-babel@^6.16.0, ember-cli-babel@^6.6.0:
+ember-cli-babel@^6.16.0, ember-cli-babel@^6.6.0:
   version "6.18.0"
   resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-6.18.0.tgz#3f6435fd275172edeff2b634ee7b29ce74318957"
   integrity sha512-7ceC8joNYxY2wES16iIBlbPSxwKDBhYwC8drU3ZEvuPDMwVv1KzxCNu1fvxyFEBWhwaRNTUxSCsEVoTd9nosGA==
@@ -8550,15 +8550,15 @@ ember-load-initializers@^2.0.0, ember-load-initializers@^2.1.1, ember-load-initi
     ember-cli-babel "^7.13.0"
     ember-cli-typescript "^2.0.2"
 
-ember-maybe-import-regenerator@^0.1.6:
-  version "0.1.6"
-  resolved "https://registry.yarnpkg.com/ember-maybe-import-regenerator/-/ember-maybe-import-regenerator-0.1.6.tgz#35d41828afa6d6a59bc0da3ce47f34c573d776ca"
-  integrity sha1-NdQYKK+m1qWbwNo85H80xXPXdso=
+ember-maybe-import-regenerator@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/ember-maybe-import-regenerator/-/ember-maybe-import-regenerator-1.0.0.tgz#c05453dfd3b65dbec2b569612b01ae70b672dd7e"
+  integrity sha512-wtjgjEV0Hk4fgiAwFjOfPrGWfmFrbRW3zgNZO4oA3H5FlbMssMvWuR8blQ3QSWYHODVK9r+ThsRAs8lG4kbxqA==
   dependencies:
-    broccoli-funnel "^1.0.1"
-    broccoli-merge-trees "^1.0.0"
-    ember-cli-babel "^6.0.0-beta.4"
-    regenerator-runtime "^0.9.5"
+    broccoli-funnel "^2.0.1"
+    broccoli-merge-trees "^3.0.0"
+    ember-cli-babel "^7.26.6"
+    regenerator-runtime "^0.13.2"
 
 ember-modifier-manager-polyfill@^1.1.0, ember-modifier-manager-polyfill@^1.2.0:
   version "1.2.0"
@@ -15337,16 +15337,16 @@ regenerator-runtime@^0.11.0:
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
   integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==
 
+regenerator-runtime@^0.13.2:
+  version "0.13.9"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52"
+  integrity sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==
+
 regenerator-runtime@^0.13.4:
   version "0.13.7"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz#cac2dacc8a1ea675feaabaeb8ae833898ae46f55"
   integrity sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==
 
-regenerator-runtime@^0.9.5:
-  version "0.9.6"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.9.6.tgz#d33eb95d0d2001a4be39659707c51b0cb71ce029"
-  integrity sha1-0z65XQ0gAaS+OWWXB8UbDLcc4Ck=
-
 regenerator-transform@^0.10.0:
   version "0.10.1"
   resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.10.1.tgz#1e4996837231da8b7f3cf4114d71b5691a0680dd"

From 6660b0b8b00d62a7fabf17f11b70d20fee4f8db6 Mon Sep 17 00:00:00 2001
From: Stefan Penner <stefan.penner@gmail.com>
Date: Tue, 7 Sep 2021 15:22:44 -0600
Subject: [PATCH 03/15] @ember/jquery (use latest)

---
 packages/util/config/ember-try.js                   | 2 +-
 test-packages/fastboot-addon/config/ember-try.js    | 2 +-
 test-packages/sample-transforms/config/ember-try.js | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

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/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/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'
             }
           }
         }

From f2fa0310256f0ba372d28ad87c39635ce929ca13 Mon Sep 17 00:00:00 2001
From: Stefan Penner <stefan.penner@gmail.com>
Date: Tue, 7 Sep 2021 15:32:03 -0600
Subject: [PATCH 04/15] fix

---
 packages/util/package.json |  5 ++--
 yarn.lock                  | 53 ++++++++++----------------------------
 2 files changed, 16 insertions(+), 42 deletions(-)

diff --git a/packages/util/package.json b/packages/util/package.json
index 4437064e5..eae671ec3 100644
--- a/packages/util/package.json
+++ b/packages/util/package.json
@@ -61,7 +61,7 @@
     "ember-page-title": "^6.2.1",
     "ember-qunit": "^5.1.2",
     "ember-resolver": "^8.0.2",
-    "ember-source": "https://s3.amazonaws.com/builds.emberjs.com/release/shas/f243a4f0947a0be1d324b5250c4e2327c6bd7a5f.tgz",
+    "ember-source": "~3.26",
     "ember-source-channel-url": "^3.0.0",
     "ember-template-lint": "^2.18.1",
     "ember-try": "^1.4.0",
@@ -76,7 +76,8 @@
     "qunit": "^2.16.0",
     "qunit-dom": "^1.6.0",
     "typescript": "~4.0.0",
-    "webpack": "^5"
+    "webpack": "^5",
+    "@ember/jquery": "^2.0.0"
   },
   "engines": {
     "node": "12.* || 14.* || >= 16"
diff --git a/yarn.lock b/yarn.lock
index 8a967ef6f..2eb4c4fe2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1631,6 +1631,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"
@@ -2060,13 +2071,6 @@
   dependencies:
     babel-plugin-debug-macros "^0.3.4"
 
-"@glimmer/vm-babel-plugins@0.80.0":
-  version "0.80.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/vm-babel-plugins/-/vm-babel-plugins-0.80.0.tgz#e9a6b496501eed367b94c928dc48a954830af3b5"
-  integrity sha512-ZW6+L+FzjDZngGj87zn3MRRA/MrchC7Con33mCcI36v8u48maheB351uhQe+fBVU300IfyzNMvAdwdVKS5VIFw==
-  dependencies:
-    babel-plugin-debug-macros "^0.3.4"
-
 "@glimmer/vm@^0.42.2":
   version "0.42.2"
   resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.42.2.tgz#492a4f05eac587c3a37371b3c62593f20bef553d"
@@ -5080,7 +5084,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==
@@ -8884,37 +8888,6 @@ ember-source-channel-url@^3.0.0:
     semver "^7.3.4"
     silent-error "^1.1.1"
 
-"ember-source@https://s3.amazonaws.com/builds.emberjs.com/release/shas/f243a4f0947a0be1d324b5250c4e2327c6bd7a5f.tgz":
-  version "3.28.0-release"
-  resolved "https://s3.amazonaws.com/builds.emberjs.com/release/shas/f243a4f0947a0be1d324b5250c4e2327c6bd7a5f.tgz#83db5d57cde6579de7de1a9b8705cc0000c3a8fb"
-  dependencies:
-    "@babel/helper-module-imports" "^7.8.3"
-    "@babel/plugin-transform-block-scoping" "^7.8.3"
-    "@babel/plugin-transform-object-assign" "^7.8.3"
-    "@ember/edition-utils" "^1.2.0"
-    "@glimmer/vm-babel-plugins" "0.80.0"
-    babel-plugin-debug-macros "^0.3.3"
-    babel-plugin-filter-imports "^4.0.0"
-    broccoli-concat "^4.2.4"
-    broccoli-debug "^0.6.4"
-    broccoli-file-creator "^2.1.1"
-    broccoli-funnel "^2.0.2"
-    broccoli-merge-trees "^4.2.0"
-    chalk "^4.0.0"
-    ember-cli-babel "^7.23.0"
-    ember-cli-get-component-path-option "^1.0.0"
-    ember-cli-is-package-missing "^1.0.0"
-    ember-cli-normalize-entity-name "^1.0.0"
-    ember-cli-path-utils "^1.0.0"
-    ember-cli-string-utils "^1.1.0"
-    ember-cli-version-checker "^5.1.1"
-    ember-router-generator "^2.0.0"
-    inflection "^1.12.0"
-    jquery "^3.5.1"
-    resolve "^1.17.0"
-    semver "^7.3.4"
-    silent-error "^1.1.1"
-
 ember-source@~3.26:
   version "3.26.1"
   resolved "https://registry.yarnpkg.com/ember-source/-/ember-source-3.26.1.tgz#8c9e8a314fb0da447b944d64f9d92a80a628d7b5"
@@ -15717,7 +15690,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==

From 3c4c0bc54670a63c39abc0ce7c88c1af537151e4 Mon Sep 17 00:00:00 2001
From: Stefan Penner <stefan.penner@gmail.com>
Date: Wed, 8 Sep 2021 10:33:05 -0600
Subject: [PATCH 05/15] bump ember-engines to latest

---
 packages/compat/package.json |  4 +--
 tests/scenarios/package.json |  2 +-
 yarn.lock                    | 63 ++++++++++++++++++------------------
 3 files changed, 34 insertions(+), 35 deletions(-)

diff --git a/packages/compat/package.json b/packages/compat/package.json
index 2634cc24d..cc062ac3a 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": "~4.0.0"
   },
   "peerDependencies": {
@@ -94,4 +94,4 @@
   "volta": {
     "extends": "../../package.json"
   }
-}
\ No newline at end of file
+}
diff --git a/tests/scenarios/package.json b/tests/scenarios/package.json
index 5b24a4c4c..3bef0f3fa 100644
--- a/tests/scenarios/package.json
+++ b/tests/scenarios/package.json
@@ -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/yarn.lock b/yarn.lock
index 2eb4c4fe2..f1de3bde4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1800,6 +1800,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"
@@ -1813,6 +1826,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"
@@ -8255,7 +8280,7 @@ ember-cli@~3.28.0:
     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==
@@ -8420,36 +8445,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"
@@ -8463,11 +8464,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:

From edaf28dcd746bb85be0f64c832ce09106fb25ea4 Mon Sep 17 00:00:00 2001
From: Edward Faulkner <ef@alum.mit.edu>
Date: Fri, 10 Sep 2021 17:42:32 -0400
Subject: [PATCH 06/15] fix peerDeps testing issue

---
 tests/scenarios/engines-test.ts    | 40 ++++++++++++++++++++-------
 tests/scenarios/macro-test.ts      | 14 ++++------
 tests/scenarios/package.json       |  2 +-
 tests/scenarios/preprocess-test.ts | 10 +++----
 tests/scenarios/scenarios.ts       | 21 ++++++++++-----
 yarn.lock                          | 43 ++++++++----------------------
 6 files changed, 66 insertions(+), 64 deletions(-)

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 3bef0f3fa..6a3a514ff 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.0",
+    "scenario-tester": "1.0.3-alpha.1",
     "ts-node": "^9.1.1"
   },
   "scripts": {
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 f1de3bde4..e67378783 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -975,12 +975,12 @@
     exec-sh "^0.3.2"
     minimist "^1.2.0"
 
-"@ef4/fixturify-project@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@ef4/fixturify-project/-/fixturify-project-3.0.0.tgz#efbf85057b085c0f89079b8deae90794b6d82d7f"
-  integrity sha512-WnLkn15zawReUmlOYn8X4Mwi+iozNGvSL22GTRF0skviN89uDcf2pi88YhiSvoJf4qldRoybyJUX0SkwRyWszA==
+"@ef4/fixturify-project@4.0.0-alpha.0":
+  version "4.0.0-alpha.0"
+  resolved "https://registry.yarnpkg.com/@ef4/fixturify-project/-/fixturify-project-4.0.0-alpha.0.tgz#b0a3c8d4a6ce5f69aa1c731acc46000ef8861600"
+  integrity sha512-44MDk2S86npJMsxEe7It66M3SFqa9iizBIMrcwhkAD2FO4xKcRThpOU3Ur3dvquH15lK8QHs7kHmKSxaGWHcIg==
   dependencies:
-    fixturify "^2.1.0"
+    fixturify "^2.1.1"
     resolve-package-path "^3.1.0"
     tmp "^0.0.33"
     type-fest "^0.11.0"
@@ -2700,7 +2700,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==
@@ -2943,11 +2943,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"
@@ -2970,13 +2965,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"
@@ -15916,19 +15904,15 @@ saxes@^5.0.1:
   dependencies:
     xmlchars "^2.2.0"
 
-scenario-tester@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/scenario-tester/-/scenario-tester-1.0.0.tgz#90158d9695b03fc92a48fba639f9ccb16070c07a"
-  integrity sha512-8JkfUwFwPx1wlzWlyod9CLRiFBxtL8fb3RSdpiwXl6tKRojGpn+C0G4e0uqmjMt/Zla8QClacO8uICHPKz4rxA==
+scenario-tester@1.0.3-alpha.1:
+  version "1.0.3-alpha.1"
+  resolved "https://registry.yarnpkg.com/scenario-tester/-/scenario-tester-1.0.3-alpha.1.tgz#909f05ff8c52317bbf7b736eb0e7403cb4fa5b79"
+  integrity sha512-WvCFkfKPxUnTcquiGRU1C0agZo4nidpSYTGWiJAsLOuoqzT6RPPEsUBOohT34xbu0IkkxAcRrJ9whp2tZ+oiDA==
   dependencies:
-    "@ef4/fixturify-project" "^3.0.0"
-    "@types/fs-extra" "^9.0.7"
-    "@types/tmp" "^0.2.0"
-    "@types/yargs" "^16.0.0"
+    "@ef4/fixturify-project" "4.0.0-alpha.0"
     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:
@@ -17407,11 +17391,6 @@ typescript-memoize@^1.0.0-alpha.3, typescript-memoize@^1.0.1:
   resolved "https://registry.yarnpkg.com/typescript-memoize/-/typescript-memoize-1.0.1.tgz#0a8199aa28f6fe18517f6e9308ef7bfbe9a98d59"
   integrity sha512-oJNge1qUrOK37d5Y6Ly2txKeuelYVsFtNF6U9kXIN7juudcQaHJQg2MxLOy0CqtkW65rVDYuTCOjnSIVPd8z3w==
 
-typescript@^4.1.5:
-  version "4.3.2"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.3.2.tgz#399ab18aac45802d6f2498de5054fcbbe716a805"
-  integrity sha512-zZ4hShnmnoVnAHpVHWpTcxdv7dWP60S2FsydQLV8V5PbS3FifjWFFRiHSWpDJahly88PRyV5teTSLoq4eG7mKw==
-
 typescript@~4.0.0:
   version "4.0.7"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.7.tgz#7168032c43d2a2671c95c07812f69523c79590af"

From 54e7f325c65ad1f9e902c594c203e4c503521e35 Mon Sep 17 00:00:00 2001
From: Edward Faulkner <ef@alum.mit.edu>
Date: Mon, 13 Sep 2021 16:15:25 -0400
Subject: [PATCH 07/15] testing updated fixturify-project

---
 tests/scenarios/package.json |  2 +-
 yarn.lock                    | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/scenarios/package.json b/tests/scenarios/package.json
index ce1fdb2fc..44d3c1af6 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.3-alpha.1",
+    "scenario-tester": "1.0.3-alpha.2",
     "ts-node": "^9.1.1"
   },
   "scripts": {
diff --git a/yarn.lock b/yarn.lock
index 36ee54e6c..f8e8994a7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -975,10 +975,10 @@
     exec-sh "^0.3.2"
     minimist "^1.2.0"
 
-"@ef4/fixturify-project@4.0.0-alpha.0":
-  version "4.0.0-alpha.0"
-  resolved "https://registry.yarnpkg.com/@ef4/fixturify-project/-/fixturify-project-4.0.0-alpha.0.tgz#b0a3c8d4a6ce5f69aa1c731acc46000ef8861600"
-  integrity sha512-44MDk2S86npJMsxEe7It66M3SFqa9iizBIMrcwhkAD2FO4xKcRThpOU3Ur3dvquH15lK8QHs7kHmKSxaGWHcIg==
+"@ef4/fixturify-project@4.0.0-alpha.1":
+  version "4.0.0-alpha.1"
+  resolved "https://registry.yarnpkg.com/@ef4/fixturify-project/-/fixturify-project-4.0.0-alpha.1.tgz#0ad61464c876bbcad3a059e996612e48cab956e3"
+  integrity sha512-rJWK9bmzsFtJZ0bAUWP1CmaB0Qdvcse3mecs6/AFoQ1b7Ndv0AVLosDtnCzUiR/hIcGJisCYWLI0nt3Z+XIBgQ==
   dependencies:
     fixturify "^2.1.1"
     resolve-package-path "^3.1.0"
@@ -15904,12 +15904,12 @@ saxes@^5.0.1:
   dependencies:
     xmlchars "^2.2.0"
 
-scenario-tester@1.0.3-alpha.1:
-  version "1.0.3-alpha.1"
-  resolved "https://registry.yarnpkg.com/scenario-tester/-/scenario-tester-1.0.3-alpha.1.tgz#909f05ff8c52317bbf7b736eb0e7403cb4fa5b79"
-  integrity sha512-WvCFkfKPxUnTcquiGRU1C0agZo4nidpSYTGWiJAsLOuoqzT6RPPEsUBOohT34xbu0IkkxAcRrJ9whp2tZ+oiDA==
+scenario-tester@1.0.3-alpha.2:
+  version "1.0.3-alpha.2"
+  resolved "https://registry.yarnpkg.com/scenario-tester/-/scenario-tester-1.0.3-alpha.2.tgz#645b50855e066e6a2f14baf7abb3e0ac8d5ad14e"
+  integrity sha512-LE03r6WD5JkF9SCZanl5Es2QJtOw+92c2pgQM7nS/9Fns4OlRgSUDsvhykYvUXdH3dxKRFODBn1MAbqeY16cEg==
   dependencies:
-    "@ef4/fixturify-project" "4.0.0-alpha.0"
+    "@ef4/fixturify-project" "4.0.0-alpha.1"
     fs-extra "^9.1.0"
     glob "^7.1.6"
     tmp "^0.2.1"

From 1f0f6684bb5eba500ba16874bdbe7de08ecc5a47 Mon Sep 17 00:00:00 2001
From: Edward Faulkner <ef@alum.mit.edu>
Date: Mon, 13 Sep 2021 18:38:15 -0400
Subject: [PATCH 08/15] update to released version of scenario-tester

---
 tests/scenarios/package.json |  2 +-
 yarn.lock                    | 31 ++++++++++++++++---------------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/tests/scenarios/package.json b/tests/scenarios/package.json
index 44d3c1af6..d2eba79c2 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.3-alpha.2",
+    "scenario-tester": "2.0.0",
     "ts-node": "^9.1.1"
   },
   "scripts": {
diff --git a/yarn.lock b/yarn.lock
index f8e8994a7..ecc5636af 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -975,16 +975,6 @@
     exec-sh "^0.3.2"
     minimist "^1.2.0"
 
-"@ef4/fixturify-project@4.0.0-alpha.1":
-  version "4.0.0-alpha.1"
-  resolved "https://registry.yarnpkg.com/@ef4/fixturify-project/-/fixturify-project-4.0.0-alpha.1.tgz#0ad61464c876bbcad3a059e996612e48cab956e3"
-  integrity sha512-rJWK9bmzsFtJZ0bAUWP1CmaB0Qdvcse3mecs6/AFoQ1b7Ndv0AVLosDtnCzUiR/hIcGJisCYWLI0nt3Z+XIBgQ==
-  dependencies:
-    fixturify "^2.1.1"
-    resolve-package-path "^3.1.0"
-    tmp "^0.0.33"
-    type-fest "^0.11.0"
-
 "@ember-data/adapter@3.16.9":
   version "3.16.9"
   resolved "https://registry.yarnpkg.com/@ember-data/adapter/-/adapter-3.16.9.tgz#d4cb172b708c18ea077becae9ad8b784ce306c85"
@@ -10228,6 +10218,17 @@ fireworm@^0.7.0:
     lodash.flatten "^3.0.2"
     minimatch "^3.0.2"
 
+fixturify-project@4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/fixturify-project/-/fixturify-project-4.0.0.tgz#a0710d27dd8cab51c0c6f2ebfe4df072c3c105db"
+  integrity sha512-nz5BmTE7luowWwaDyqFdPCu4iTRYJF5x53gaGLLw7wCmbiANZa8dUOH4GmRQQD+Lnvu44+LQ4GbpMBV8QKkOlg==
+  dependencies:
+    fixturify "^2.1.1"
+    resolve-package-path "^3.1.0"
+    tmp "^0.0.33"
+    type-fest "^0.11.0"
+    walk-sync "^3.0.0"
+
 fixturify-project@^1.10.0:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/fixturify-project/-/fixturify-project-1.10.0.tgz#091c452a9bb15f09b6b9cc7cf5c0ad559f1d9aad"
@@ -15904,12 +15905,12 @@ saxes@^5.0.1:
   dependencies:
     xmlchars "^2.2.0"
 
-scenario-tester@1.0.3-alpha.2:
-  version "1.0.3-alpha.2"
-  resolved "https://registry.yarnpkg.com/scenario-tester/-/scenario-tester-1.0.3-alpha.2.tgz#645b50855e066e6a2f14baf7abb3e0ac8d5ad14e"
-  integrity sha512-LE03r6WD5JkF9SCZanl5Es2QJtOw+92c2pgQM7nS/9Fns4OlRgSUDsvhykYvUXdH3dxKRFODBn1MAbqeY16cEg==
+scenario-tester@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/scenario-tester/-/scenario-tester-2.0.0.tgz#4b40c20e3bd224d37192d94ef47c3bf31f18d909"
+  integrity sha512-PqtM4zfO4n7jggq3kQYfD3FnGS+11m47Zwh6t5O+NnjW4tLAxAozfeMr+NNhT8NK749Pk3IiqUWtbibOnFfZNg==
   dependencies:
-    "@ef4/fixturify-project" "4.0.0-alpha.1"
+    fixturify-project "4.0.0"
     fs-extra "^9.1.0"
     glob "^7.1.6"
     tmp "^0.2.1"

From 89ca42711b4ff01a382c889ffb6478f04558d7b1 Mon Sep 17 00:00:00 2001
From: Edward Faulkner <ef@alum.mit.edu>
Date: Mon, 13 Sep 2021 21:40:47 -0400
Subject: [PATCH 09/15] testing another fixed fixturify-project

---
 package.json |  3 ++-
 yarn.lock    | 21 ++++++++++++++++++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index d1546ed73..3c3d382d9 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,8 @@
   "resolutions": {
     "**/browserslist": "^4.14.0",
     "**/fastboot": "^3.1.0",
-    "**/qunit": "^2.14.1"
+    "**/qunit": "^2.14.1",
+    "scenario-tester/fixturify-project": "4.0.1-alpha.0"
   },
   "devDependencies": {
     "@types/jest": "^24.0.0",
diff --git a/yarn.lock b/yarn.lock
index ecc5636af..76a2a7ac8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2863,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==
@@ -10229,6 +10237,17 @@ fixturify-project@4.0.0:
     type-fest "^0.11.0"
     walk-sync "^3.0.0"
 
+fixturify-project@4.0.1-alpha.0:
+  version "4.0.1-alpha.0"
+  resolved "https://registry.yarnpkg.com/fixturify-project/-/fixturify-project-4.0.1-alpha.0.tgz#08ad92ca86c0b80edc49d0fe0d6dfc07849804a5"
+  integrity sha512-NVilesfxDK4yGEDHXc0hBltbs9c1lmO8xUpiTf7ijlYzvJe+Wj1sfpppLlpHWa0r7eI8VDfs7qdOHj4xyQAkdg==
+  dependencies:
+    fixturify "^2.1.1"
+    resolve-package-path "^3.1.0"
+    tmp "^0.0.33"
+    type-fest "^0.11.0"
+    walk-sync "^3.0.0"
+
 fixturify-project@^1.10.0:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/fixturify-project/-/fixturify-project-1.10.0.tgz#091c452a9bb15f09b6b9cc7cf5c0ad559f1d9aad"

From 5d245570b13b32893632b5578cba92b830229016 Mon Sep 17 00:00:00 2001
From: Edward Faulkner <ef@alum.mit.edu>
Date: Mon, 13 Sep 2021 21:58:53 -0400
Subject: [PATCH 10/15] tweak yarn resolutions

---
 package.json                 |  2 +-
 tests/scenarios/package.json |  2 +-
 yarn.lock                    | 15 ++-------------
 3 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/package.json b/package.json
index 3c3d382d9..3be817c7c 100644
--- a/package.json
+++ b/package.json
@@ -39,7 +39,7 @@
     "**/browserslist": "^4.14.0",
     "**/fastboot": "^3.1.0",
     "**/qunit": "^2.14.1",
-    "scenario-tester/fixturify-project": "4.0.1-alpha.0"
+    "**/scenario-tester/fixturify-project": "4.0.1-alpha.0"
   },
   "devDependencies": {
     "@types/jest": "^24.0.0",
diff --git a/tests/scenarios/package.json b/tests/scenarios/package.json
index d2eba79c2..89839dcd8 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": "2.0.0",
+    "scenario-tester": "^2.0.0",
     "ts-node": "^9.1.1"
   },
   "scripts": {
diff --git a/yarn.lock b/yarn.lock
index 76a2a7ac8..37376edd0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10226,18 +10226,7 @@ fireworm@^0.7.0:
     lodash.flatten "^3.0.2"
     minimatch "^3.0.2"
 
-fixturify-project@4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/fixturify-project/-/fixturify-project-4.0.0.tgz#a0710d27dd8cab51c0c6f2ebfe4df072c3c105db"
-  integrity sha512-nz5BmTE7luowWwaDyqFdPCu4iTRYJF5x53gaGLLw7wCmbiANZa8dUOH4GmRQQD+Lnvu44+LQ4GbpMBV8QKkOlg==
-  dependencies:
-    fixturify "^2.1.1"
-    resolve-package-path "^3.1.0"
-    tmp "^0.0.33"
-    type-fest "^0.11.0"
-    walk-sync "^3.0.0"
-
-fixturify-project@4.0.1-alpha.0:
+fixturify-project@4.0.0, fixturify-project@4.0.1-alpha.0:
   version "4.0.1-alpha.0"
   resolved "https://registry.yarnpkg.com/fixturify-project/-/fixturify-project-4.0.1-alpha.0.tgz#08ad92ca86c0b80edc49d0fe0d6dfc07849804a5"
   integrity sha512-NVilesfxDK4yGEDHXc0hBltbs9c1lmO8xUpiTf7ijlYzvJe+Wj1sfpppLlpHWa0r7eI8VDfs7qdOHj4xyQAkdg==
@@ -15924,7 +15913,7 @@ saxes@^5.0.1:
   dependencies:
     xmlchars "^2.2.0"
 
-scenario-tester@2.0.0:
+scenario-tester@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/scenario-tester/-/scenario-tester-2.0.0.tgz#4b40c20e3bd224d37192d94ef47c3bf31f18d909"
   integrity sha512-PqtM4zfO4n7jggq3kQYfD3FnGS+11m47Zwh6t5O+NnjW4tLAxAozfeMr+NNhT8NK749Pk3IiqUWtbibOnFfZNg==

From 221c6ee336dc0b4f7dc7310424bcffc861a82e53 Mon Sep 17 00:00:00 2001
From: Edward Faulkner <ef@alum.mit.edu>
Date: Mon, 13 Sep 2021 23:52:50 -0400
Subject: [PATCH 11/15] testing another updated scenario-tester

---
 package.json                 |  3 +--
 tests/scenarios/package.json |  2 +-
 yarn.lock                    | 12 ++++++------
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index 3be817c7c..d1546ed73 100644
--- a/package.json
+++ b/package.json
@@ -38,8 +38,7 @@
   "resolutions": {
     "**/browserslist": "^4.14.0",
     "**/fastboot": "^3.1.0",
-    "**/qunit": "^2.14.1",
-    "**/scenario-tester/fixturify-project": "4.0.1-alpha.0"
+    "**/qunit": "^2.14.1"
   },
   "devDependencies": {
     "@types/jest": "^24.0.0",
diff --git a/tests/scenarios/package.json b/tests/scenarios/package.json
index 89839dcd8..27755fd0e 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": "^2.0.0",
+    "scenario-tester": "^2.0.1-alpha.0",
     "ts-node": "^9.1.1"
   },
   "scripts": {
diff --git a/yarn.lock b/yarn.lock
index 37376edd0..2702fb95a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10226,7 +10226,7 @@ fireworm@^0.7.0:
     lodash.flatten "^3.0.2"
     minimatch "^3.0.2"
 
-fixturify-project@4.0.0, fixturify-project@4.0.1-alpha.0:
+fixturify-project@4.0.1-alpha.0:
   version "4.0.1-alpha.0"
   resolved "https://registry.yarnpkg.com/fixturify-project/-/fixturify-project-4.0.1-alpha.0.tgz#08ad92ca86c0b80edc49d0fe0d6dfc07849804a5"
   integrity sha512-NVilesfxDK4yGEDHXc0hBltbs9c1lmO8xUpiTf7ijlYzvJe+Wj1sfpppLlpHWa0r7eI8VDfs7qdOHj4xyQAkdg==
@@ -15913,12 +15913,12 @@ saxes@^5.0.1:
   dependencies:
     xmlchars "^2.2.0"
 
-scenario-tester@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/scenario-tester/-/scenario-tester-2.0.0.tgz#4b40c20e3bd224d37192d94ef47c3bf31f18d909"
-  integrity sha512-PqtM4zfO4n7jggq3kQYfD3FnGS+11m47Zwh6t5O+NnjW4tLAxAozfeMr+NNhT8NK749Pk3IiqUWtbibOnFfZNg==
+scenario-tester@^2.0.1-alpha.0:
+  version "2.0.1-alpha.0"
+  resolved "https://registry.yarnpkg.com/scenario-tester/-/scenario-tester-2.0.1-alpha.0.tgz#133155a69294dc02745cc7ae657cb965c0dbf4ab"
+  integrity sha512-/aVqW9QmHwknGyty+vx8OtkJ/kLm5+dyc5q7jt+4Gy6jX2imtuFEB60rmHYE7o9iC5nYZOq7V7we6rsrOVKBDg==
   dependencies:
-    fixturify-project "4.0.0"
+    fixturify-project "4.0.1-alpha.0"
     fs-extra "^9.1.0"
     glob "^7.1.6"
     tmp "^0.2.1"

From bc576d0f028b768f21e3b96c032b673de125a4a5 Mon Sep 17 00:00:00 2001
From: Edward Faulkner <ef@alum.mit.edu>
Date: Tue, 14 Sep 2021 03:26:21 -0400
Subject: [PATCH 12/15] testing another iteration

---
 tests/scenarios/package.json |  2 +-
 yarn.lock                    | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/scenarios/package.json b/tests/scenarios/package.json
index 27755fd0e..bc2aabaff 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": "^2.0.1-alpha.0",
+    "scenario-tester": "^2.0.1-alpha.1",
     "ts-node": "^9.1.1"
   },
   "scripts": {
diff --git a/yarn.lock b/yarn.lock
index 2702fb95a..ae9e05f98 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10226,10 +10226,10 @@ fireworm@^0.7.0:
     lodash.flatten "^3.0.2"
     minimatch "^3.0.2"
 
-fixturify-project@4.0.1-alpha.0:
-  version "4.0.1-alpha.0"
-  resolved "https://registry.yarnpkg.com/fixturify-project/-/fixturify-project-4.0.1-alpha.0.tgz#08ad92ca86c0b80edc49d0fe0d6dfc07849804a5"
-  integrity sha512-NVilesfxDK4yGEDHXc0hBltbs9c1lmO8xUpiTf7ijlYzvJe+Wj1sfpppLlpHWa0r7eI8VDfs7qdOHj4xyQAkdg==
+fixturify-project@4.0.1-alpha.1:
+  version "4.0.1-alpha.1"
+  resolved "https://registry.yarnpkg.com/fixturify-project/-/fixturify-project-4.0.1-alpha.1.tgz#73160d5d6bf84e629033d9a750964e7c71d2d524"
+  integrity sha512-YsJ7Lo/P45b/Yc29pSz1BE5ng5MFCPC/uujECPkkWHPIy1RgzH+B5G6WU2sIiJtBCCBtXUQjix9M8npeX3fm1w==
   dependencies:
     fixturify "^2.1.1"
     resolve-package-path "^3.1.0"
@@ -15913,12 +15913,12 @@ saxes@^5.0.1:
   dependencies:
     xmlchars "^2.2.0"
 
-scenario-tester@^2.0.1-alpha.0:
-  version "2.0.1-alpha.0"
-  resolved "https://registry.yarnpkg.com/scenario-tester/-/scenario-tester-2.0.1-alpha.0.tgz#133155a69294dc02745cc7ae657cb965c0dbf4ab"
-  integrity sha512-/aVqW9QmHwknGyty+vx8OtkJ/kLm5+dyc5q7jt+4Gy6jX2imtuFEB60rmHYE7o9iC5nYZOq7V7we6rsrOVKBDg==
+scenario-tester@^2.0.1-alpha.1:
+  version "2.0.1-alpha.1"
+  resolved "https://registry.yarnpkg.com/scenario-tester/-/scenario-tester-2.0.1-alpha.1.tgz#8ee1506ff4bccb315d082ba818753d4e1d3e1627"
+  integrity sha512-ZTpUYO6JdiF2EhNKZlL3jumcaDYLxkEYQQ038YGhqqODh/GHsOeYzxrDqsK2bn5uFFS5wS+zv/KowrWihJWZnA==
   dependencies:
-    fixturify-project "4.0.1-alpha.0"
+    fixturify-project "4.0.1-alpha.1"
     fs-extra "^9.1.0"
     glob "^7.1.6"
     tmp "^0.2.1"

From cd8a7381a82a253217fad38ef449f4df01af377b Mon Sep 17 00:00:00 2001
From: Edward Faulkner <ef@alum.mit.edu>
Date: Tue, 14 Sep 2021 10:25:41 -0400
Subject: [PATCH 13/15] testing another iteration 2

---
 tests/scenarios/package.json |  2 +-
 yarn.lock                    | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/scenarios/package.json b/tests/scenarios/package.json
index bc2aabaff..ed320b848 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": "^2.0.1-alpha.1",
+    "scenario-tester": "^2.0.1-alpha.2",
     "ts-node": "^9.1.1"
   },
   "scripts": {
diff --git a/yarn.lock b/yarn.lock
index ae9e05f98..0cae15db6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10226,10 +10226,10 @@ fireworm@^0.7.0:
     lodash.flatten "^3.0.2"
     minimatch "^3.0.2"
 
-fixturify-project@4.0.1-alpha.1:
-  version "4.0.1-alpha.1"
-  resolved "https://registry.yarnpkg.com/fixturify-project/-/fixturify-project-4.0.1-alpha.1.tgz#73160d5d6bf84e629033d9a750964e7c71d2d524"
-  integrity sha512-YsJ7Lo/P45b/Yc29pSz1BE5ng5MFCPC/uujECPkkWHPIy1RgzH+B5G6WU2sIiJtBCCBtXUQjix9M8npeX3fm1w==
+fixturify-project@4.0.1-alpha.2:
+  version "4.0.1-alpha.2"
+  resolved "https://registry.yarnpkg.com/fixturify-project/-/fixturify-project-4.0.1-alpha.2.tgz#06c0903706963c277ab7bc82a45f5b5c45aac04d"
+  integrity sha512-G/E09tR5C19C7K+cyz7niZ0DAPHdzy+Lzu4Mc2Qr3ALYgUaHTZJa5HKFjUbpGyQLA9mzj06lNhehpsoyYHAk6w==
   dependencies:
     fixturify "^2.1.1"
     resolve-package-path "^3.1.0"
@@ -15913,12 +15913,12 @@ saxes@^5.0.1:
   dependencies:
     xmlchars "^2.2.0"
 
-scenario-tester@^2.0.1-alpha.1:
-  version "2.0.1-alpha.1"
-  resolved "https://registry.yarnpkg.com/scenario-tester/-/scenario-tester-2.0.1-alpha.1.tgz#8ee1506ff4bccb315d082ba818753d4e1d3e1627"
-  integrity sha512-ZTpUYO6JdiF2EhNKZlL3jumcaDYLxkEYQQ038YGhqqODh/GHsOeYzxrDqsK2bn5uFFS5wS+zv/KowrWihJWZnA==
+scenario-tester@^2.0.1-alpha.2:
+  version "2.0.1-alpha.2"
+  resolved "https://registry.yarnpkg.com/scenario-tester/-/scenario-tester-2.0.1-alpha.2.tgz#d4c2a8c93edd6f34cf1d0b09c7f843e7b68fe937"
+  integrity sha512-u1ydMcAiWoW6K4chnp8WdapR54NMMaPxCj7grFEnTOnpNTsRIbaRs4+x7L2JAOPcDozSyP6dAOE/Szh9bR/4og==
   dependencies:
-    fixturify-project "4.0.1-alpha.1"
+    fixturify-project "4.0.1-alpha.2"
     fs-extra "^9.1.0"
     glob "^7.1.6"
     tmp "^0.2.1"

From c0b65bd121137b2c8e00616d837e5ee8a9fccd3b Mon Sep 17 00:00:00 2001
From: Edward Faulkner <ef@alum.mit.edu>
Date: Tue, 14 Sep 2021 12:58:28 -0400
Subject: [PATCH 14/15] testing another iteration 3

---
 tests/scenarios/package.json |  2 +-
 yarn.lock                    | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/scenarios/package.json b/tests/scenarios/package.json
index ed320b848..77baf1730 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": "^2.0.1-alpha.2",
+    "scenario-tester": "^2.0.1-alpha.3",
     "ts-node": "^9.1.1"
   },
   "scripts": {
diff --git a/yarn.lock b/yarn.lock
index 0cae15db6..54b47ef26 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10226,10 +10226,10 @@ fireworm@^0.7.0:
     lodash.flatten "^3.0.2"
     minimatch "^3.0.2"
 
-fixturify-project@4.0.1-alpha.2:
-  version "4.0.1-alpha.2"
-  resolved "https://registry.yarnpkg.com/fixturify-project/-/fixturify-project-4.0.1-alpha.2.tgz#06c0903706963c277ab7bc82a45f5b5c45aac04d"
-  integrity sha512-G/E09tR5C19C7K+cyz7niZ0DAPHdzy+Lzu4Mc2Qr3ALYgUaHTZJa5HKFjUbpGyQLA9mzj06lNhehpsoyYHAk6w==
+fixturify-project@4.0.1-alpha.3:
+  version "4.0.1-alpha.3"
+  resolved "https://registry.yarnpkg.com/fixturify-project/-/fixturify-project-4.0.1-alpha.3.tgz#c050ab3fb3fe0c6b290c281c5826d0a52bc41410"
+  integrity sha512-fHCsUzDcZkvsSeHHrawaVa0vvxgM3ZitA7wbZjlfrQlg76ShWJG7VjYdWIWTTQVfdh20R5vQP4CEcFbvo2JDpQ==
   dependencies:
     fixturify "^2.1.1"
     resolve-package-path "^3.1.0"
@@ -15913,12 +15913,12 @@ saxes@^5.0.1:
   dependencies:
     xmlchars "^2.2.0"
 
-scenario-tester@^2.0.1-alpha.2:
-  version "2.0.1-alpha.2"
-  resolved "https://registry.yarnpkg.com/scenario-tester/-/scenario-tester-2.0.1-alpha.2.tgz#d4c2a8c93edd6f34cf1d0b09c7f843e7b68fe937"
-  integrity sha512-u1ydMcAiWoW6K4chnp8WdapR54NMMaPxCj7grFEnTOnpNTsRIbaRs4+x7L2JAOPcDozSyP6dAOE/Szh9bR/4og==
+scenario-tester@^2.0.1-alpha.3:
+  version "2.0.1-alpha.3"
+  resolved "https://registry.yarnpkg.com/scenario-tester/-/scenario-tester-2.0.1-alpha.3.tgz#8d3e957394c074ede93cdb40b362234a65225fed"
+  integrity sha512-tjfSfUK6dp8ktiPv/uNHh5roif0CvWYSLiaSATSid/P9mxQUICi/i8EQCNLZSnVyfo0bxdVvBuWWwmKGTqMM9g==
   dependencies:
-    fixturify-project "4.0.1-alpha.2"
+    fixturify-project "4.0.1-alpha.3"
     fs-extra "^9.1.0"
     glob "^7.1.6"
     tmp "^0.2.1"

From bcfeb92460d9fe10cf5700af7e8d0af4d2d1232a Mon Sep 17 00:00:00 2001
From: Edward Faulkner <ef@alum.mit.edu>
Date: Tue, 14 Sep 2021 14:31:59 -0400
Subject: [PATCH 15/15] update to released version

---
 tests/scenarios/package.json |  2 +-
 yarn.lock                    | 37 ++++++++++++++++++++----------------
 2 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/tests/scenarios/package.json b/tests/scenarios/package.json
index 77baf1730..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": "^2.0.1-alpha.3",
+    "scenario-tester": "^2.0.1",
     "ts-node": "^9.1.1"
   },
   "scripts": {
diff --git a/yarn.lock b/yarn.lock
index 54b47ef26..9c8596284 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10226,17 +10226,6 @@ fireworm@^0.7.0:
     lodash.flatten "^3.0.2"
     minimatch "^3.0.2"
 
-fixturify-project@4.0.1-alpha.3:
-  version "4.0.1-alpha.3"
-  resolved "https://registry.yarnpkg.com/fixturify-project/-/fixturify-project-4.0.1-alpha.3.tgz#c050ab3fb3fe0c6b290c281c5826d0a52bc41410"
-  integrity sha512-fHCsUzDcZkvsSeHHrawaVa0vvxgM3ZitA7wbZjlfrQlg76ShWJG7VjYdWIWTTQVfdh20R5vQP4CEcFbvo2JDpQ==
-  dependencies:
-    fixturify "^2.1.1"
-    resolve-package-path "^3.1.0"
-    tmp "^0.0.33"
-    type-fest "^0.11.0"
-    walk-sync "^3.0.0"
-
 fixturify-project@^1.10.0:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/fixturify-project/-/fixturify-project-1.10.0.tgz#091c452a9bb15f09b6b9cc7cf5c0ad559f1d9aad"
@@ -10254,6 +10243,17 @@ fixturify-project@^2.1.0, fixturify-project@^2.1.1:
     tmp "^0.0.33"
     type-fest "^0.11.0"
 
+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 "^2.3.2"
+    walk-sync "^3.0.0"
+
 fixturify@^0.3.2:
   version "0.3.4"
   resolved "https://registry.yarnpkg.com/fixturify/-/fixturify-0.3.4.tgz#c676de404a7f8ee8e64d0b76118e62ec95ab7b25"
@@ -15913,12 +15913,12 @@ saxes@^5.0.1:
   dependencies:
     xmlchars "^2.2.0"
 
-scenario-tester@^2.0.1-alpha.3:
-  version "2.0.1-alpha.3"
-  resolved "https://registry.yarnpkg.com/scenario-tester/-/scenario-tester-2.0.1-alpha.3.tgz#8d3e957394c074ede93cdb40b362234a65225fed"
-  integrity sha512-tjfSfUK6dp8ktiPv/uNHh5roif0CvWYSLiaSATSid/P9mxQUICi/i8EQCNLZSnVyfo0bxdVvBuWWwmKGTqMM9g==
+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:
-    fixturify-project "4.0.1-alpha.3"
+    fixturify-project "^4.0.1"
     fs-extra "^9.1.0"
     glob "^7.1.6"
     tmp "^0.2.1"
@@ -17375,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"