Merge pull request #154 from sandydoo/internal-simplify-auto-import-w…

…orkaround
sandydoo · Oct 13, 2021 · 2a3ab39 · 2a3ab39
2 parents b6c6838 + 9ddf504
commit 2a3ab39
Show file tree

Hide file tree

Showing 3 changed files with 739 additions and 45 deletions.
diff --git a/config/ember-try.js b/config/ember-try.js
@@ -34,24 +34,16 @@ 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',
           },
         },
       },
@@ -83,26 +75,8 @@ module.exports = async function () {
           },
         },
       },
-      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',
-          },
-        },
-      }),
+      embroiderSafe(),
+      embroiderOptimized(),
     ],
   };
 };
diff --git a/package.json b/package.json
@@ -68,6 +68,7 @@
     "babel-eslint": "^10.1.0",
     "broccoli-asset-rev": "^3.0.0",
     "dotenv": "^10.0.0",
+    "ember-auto-import": "^2.2.2",
     "ember-cli": "~3.25.3",
     "ember-cli-addon-tests": "^0.11.1",
     "ember-cli-dependency-checker": "^3.2.0",
@@ -96,7 +97,8 @@
     "qunit": "^2.16.0",
     "qunit-dom": "^1.6.0",
     "release-it": "^14.10.1",
-    "release-it-lerna-changelog": "^3.1.0"
+    "release-it-lerna-changelog": "^3.1.0",
+    "webpack": "^5.58.2"
   },
   "engines": {
     "node": "10.* || >= 12"