Merge pull request #442 from ef4/analyzer-fix

mixing of old and new analyzer patterns
embroider-build · Aug 31, 2021 · fe4e1fe · fe4e1fe
2 parents 27c6113 + a649b0a
commit fe4e1fe
Show file tree

Hide file tree

Showing 10 changed files with 562 additions and 123 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/ember-auto-import/ts/analyzer-plugin.ts b/packages/ember-auto-import/ts/analyzer-plugin.ts
@@ -5,6 +5,9 @@ import { ImportSyntax, serialize } from './analyzer-syntax';
 interface State {
   imports: ImportSyntax[];
   handled: WeakSet<t.CallExpression>;
+  opts: {
+    imports?: ImportSyntax[];
+  };
 }
 
 // Ignores type-only imports & exports, which are erased from the final build
@@ -23,7 +26,7 @@ function analyzerPlugin(babel: typeof Babel) {
     visitor: {
       Program: {
         enter(_path: NodePath<t.Program>, state: State) {
-          state.imports = [];
+          state.imports = state.opts.imports || [];
           state.handled = new WeakSet();
         },
         exit(path: NodePath<t.Program>, state: State) {