Merge pull request #364 from ef4/app-template-explicit

test apps should not automatically depend on auto-import
embroider-build · Mar 24, 2021 · 1e5b8f1 · 1e5b8f1
2 parents c1898c2 + b3de256
commit 1e5b8f1
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 1 deletion.
diff --git a/packages/app-template/package.json b/packages/app-template/package.json
@@ -21,7 +21,6 @@
     "@ember/optional-features": "^1.0.0",
     "babel-eslint": "^10.0.3",
     "broccoli-asset-rev": "^3.0.0",
-    "ember-auto-import": "1.10.1",
     "ember-cli-app-version": "^3.2.0",
     "ember-cli-babel": "^7.11.1",
     "ember-cli-dependency-checker": "^3.1.0",

diff --git a/test-scenarios/ember-cli-typescript-2-test.ts b/test-scenarios/ember-cli-typescript-2-test.ts
@@ -18,6 +18,7 @@ appScenarios
     });
     project.addDevDependency(aDependency);
     project.linkDevDependency('ember-cli-typescript', { baseDir: __dirname, resolveName: 'ember-cli-typescript-2' });
+    project.linkDevDependency('ember-auto-import', { baseDir: __dirname });
     project.linkDevDependency('typescript', { baseDir: __dirname, resolveName: 'typescript-4' });
 
     merge(project.files, {

diff --git a/test-scenarios/ember-cli-typescript-3-test.ts b/test-scenarios/ember-cli-typescript-3-test.ts
@@ -32,6 +32,7 @@ appScenarios
     });
     project.addDevDependency(aPureTSDependency);
 
+    project.linkDevDependency('ember-auto-import', { baseDir: __dirname });
     project.linkDevDependency('ember-cli-typescript', { baseDir: __dirname, resolveName: 'ember-cli-typescript-3' });
     project.linkDevDependency('typescript', { baseDir: __dirname, resolveName: 'typescript-4' });
 

diff --git a/test-scenarios/ember-cli-typescript-4-test.ts b/test-scenarios/ember-cli-typescript-4-test.ts
@@ -17,6 +17,7 @@ appScenarios
       },
     });
     project.addDevDependency(aDependency);
+    project.linkDevDependency('ember-auto-import', { baseDir: __dirname });
     project.linkDevDependency('ember-cli-typescript', { baseDir: __dirname, resolveName: 'ember-cli-typescript-4' });
     project.linkDevDependency('typescript', { baseDir: __dirname, resolveName: 'typescript-4' });
 

diff --git a/test-scenarios/skip-babel-test.ts b/test-scenarios/skip-babel-test.ts
@@ -28,6 +28,7 @@ appScenarios
       },
     });
     project.addDevDependency(aModuleDependency);
+    project.linkDevDependency('ember-auto-import', { baseDir: __dirname });
 
     merge(project.files, {
       'ember-cli-build.js': EMBER_CLI_BUILD_JS,