Merge pull request #153 from sandydoo/fix-tests-against-ember-v4

sandydoo · Oct 13, 2021 · b6c6838 · b6c6838
2 parents 1b2318b + 3c78cba
commit b6c6838
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 8 deletions.
diff --git a/config/ember-try.js b/config/ember-try.js
@@ -34,16 +34,24 @@ module.exports = async function () {
       {
         name: 'ember-beta',
         npm: {
+          dependencies: {
+            'ember-auto-import': '^2.0.0',
+          },
           devDependencies: {
             'ember-source': await getChannelURL('beta'),
+            webpack: '^5.0.0',
           },
         },
       },
       {
         name: 'ember-canary',
         npm: {
+          dependencies: {
+            'ember-auto-import': '^2.0.0',
+          },
           devDependencies: {
             'ember-source': await getChannelURL('canary'),
+            webpack: '^5.0.0',
           },
         },
       },
@@ -75,8 +83,26 @@ module.exports = async function () {
           },
         },
       },
-      embroiderSafe(),
-      embroiderOptimized(),
+      embroiderSafe({
+        npm: {
+          dependencies: {
+            'ember-auto-import': '^2.0.0',
+          },
+          devDependencies: {
+            webpack: '^5.0.0',
+          },
+        },
+      }),
+      embroiderOptimized({
+        npm: {
+          dependencies: {
+            'ember-auto-import': '^2.0.0',
+          },
+          devDependencies: {
+            webpack: '^5.0.0',
+          },
+        },
+      }),
     ],
   };
 };
diff --git a/package.json b/package.json
@@ -62,13 +62,12 @@
     "@babel/plugin-proposal-optional-chaining": "^7.14.5",
     "@ember/optional-features": "^2.0.0",
     "@ember/test-helpers": "^2.4.2",
-    "@embroider/test-setup": "^0.43.5",
+    "@embroider/test-setup": "^0.46.2",
     "@glimmer/component": "^1.0.3",
     "@glimmer/tracking": "^1.0.3",
     "babel-eslint": "^10.1.0",
     "broccoli-asset-rev": "^3.0.0",
     "dotenv": "^10.0.0",
-    "ember-auto-import": "^1.10.1",
     "ember-cli": "~3.25.3",
     "ember-cli-addon-tests": "^0.11.1",
     "ember-cli-dependency-checker": "^3.2.0",

diff --git a/yarn.lock b/yarn.lock
@@ -1073,10 +1073,10 @@
     resolve "^1.8.1"
     semver "^7.3.2"
 
-"@embroider/test-setup@^0.43.5":
-  version "0.43.5"
-  resolved "https://registry.yarnpkg.com/@embroider/test-setup/-/test-setup-0.43.5.tgz#79944cb50038802cc71d50aa0d5d7a0955ee6349"
-  integrity sha512-ke+5B0VR2343ZrOqV9Ok2LyA4m2q2ApM1Oy1RC8+3+OI5lDVg8UgZG9n/G2e77KPMFxnK3eVpXcPdLcdOxW6+w==
+"@embroider/test-setup@^0.46.2":
+  version "0.46.2"
+  resolved "https://registry.yarnpkg.com/@embroider/test-setup/-/test-setup-0.46.2.tgz#6cc57bca1f4d7ad485ff644e93fc3db69302dacb"
+  integrity sha512-eBzHMIN2XMVUqz1CD8bR8mqTpN9ByIHmPeqbPCPxGTpK4ziyQ6KRPN4whLZ8jmGH0+Gwpuc/A5y/U02LL3LQ5g==
   dependencies:
     lodash "^4.17.21"
     resolve "^1.20.0"