Merge pull request #989 from embroider-build/babel-import-util

use babel-import-util
embroider-build · Oct 1, 2021 · 2fe80c3 · 2fe80c3
2 parents f02ff6a + 31c14b5
commit 2fe80c3
Show file tree

Hide file tree

Showing 6 changed files with 72 additions and 282 deletions.
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -41,6 +41,7 @@
     "@embroider/macros": "0.45.0",
     "@embroider/shared-internals": "0.45.0",
     "assert-never": "^1.2.1",
+    "babel-import-util": "^0.2.0",
     "broccoli-node-api": "^1.7.0",
     "broccoli-persistent-filter": "^3.1.2",
     "broccoli-plugin": "^4.0.7",

diff --git a/packages/core/src/babel-import-adder.ts b/packages/core/src/babel-import-adder.ts
diff --git a/packages/core/src/babel-plugin-inline-hbs.ts b/packages/core/src/babel-plugin-inline-hbs.ts
@@ -4,7 +4,7 @@ import { join } from 'path';
 import { TemplateCompiler } from './template-compiler-common';
 import { parse } from '@babel/core';
 import { ResolvedDep } from './resolver';
-import { ImportAdder } from './babel-import-adder';
+import { ImportUtil } from 'babel-import-util';
 
 type BabelTypes = typeof t;
 
@@ -34,7 +34,7 @@ interface State {
   };
   dependencies: Map<string, ResolvedDep>;
   templateCompiler: TemplateCompiler | undefined;
-  adder: ImportAdder;
+  adder: ImportUtil;
 }
 
 export type Params = State['opts'];
@@ -47,7 +47,7 @@ export default function make(getCompiler: (opts: any) => TemplateCompiler) {
         Program: {
           enter(path: NodePath<t.Program>, state: State) {
             state.dependencies = new Map();
-            state.adder = new ImportAdder(t, path);
+            state.adder = new ImportUtil(t, path);
           },
           exit(path: NodePath<t.Program>, state: State) {
             if (state.opts.stage === 3) {

diff --git a/packages/core/src/template-colocation-plugin.ts b/packages/core/src/template-colocation-plugin.ts
@@ -4,7 +4,7 @@ import type * as t from '@babel/types';
 import { dirname } from 'path';
 import { explicitRelative } from '@embroider/shared-internals';
 import { PackageCache } from '@embroider/shared-internals';
-import { ImportAdder } from './babel-import-adder';
+import { ImportUtil } from 'babel-import-util';
 
 type BabelTypes = typeof t;
 
@@ -13,7 +13,7 @@ const packageCache = PackageCache.shared('embroider-stage3');
 interface State {
   colocatedTemplate: string | undefined;
   associate: { component: t.Identifier; template: t.Identifier } | undefined;
-  adder: ImportAdder;
+  adder: ImportUtil;
 }
 
 function setComponentTemplate(target: NodePath<t.Node>, state: State) {
@@ -26,7 +26,7 @@ export default function main(babel: unknown) {
     visitor: {
       Program: {
         enter(path: NodePath<t.Program>, state: State) {
-          state.adder = new ImportAdder(t, path);
+          state.adder = new ImportUtil(t, path);
           let filename = path.hub.file.opts.filename;
 
           let owningPackage = packageCache.ownerOfFile(filename);
@@ -127,6 +127,6 @@ export default function main(babel: unknown) {
   };
 }
 
-function importTemplate(target: NodePath<t.Node>, adder: ImportAdder, colocatedTemplate: string) {
+function importTemplate(target: NodePath<t.Node>, adder: ImportUtil, colocatedTemplate: string) {
   return adder.import(target, explicitRelative(dirname(colocatedTemplate), colocatedTemplate), 'default', 'TEMPLATE');
 }
diff --git a/packages/core/tests/import-adder.test.ts b/packages/core/tests/import-adder.test.ts