Merge pull request #355 from ember-cli/avoid-shared-mutable-state

__tests__/tests.js

@@ -64,6 +64,36 @@ describe('htmlbars-inline-precompile', function () {
     `);
   });
 
+  it('does not error when transpiling multiple modules with a single plugin config', function () {
+    let transpiled = transform(
+      "import hbs from 'htmlbars-inline-precompile';\nvar compiled = hbs`hello`;"
+    );
+
+    expect(transpiled).toMatchInlineSnapshot(`
+      "import { createTemplateFactory as _createTemplateFactory } from \\"@ember/template-factory\\";
+
+      var compiled = _createTemplateFactory(
+      /*
+        hello
+      */
+      \\"precompiled(hello)\\");"
+    `);
+
+    transpiled = transform(
+      "import hbs from 'htmlbars-inline-precompile';\nvar compiled = hbs`hello`;"
+    );
+
+    expect(transpiled).toMatchInlineSnapshot(`
+      "import { createTemplateFactory as _createTemplateFactory } from \\"@ember/template-factory\\";
+
+      var compiled = _createTemplateFactory(
+      /*
+        hello
+      */
+      \\"precompiled(hello)\\");"
+    `);
+  });
+
   it('passes options when used as a call expression', function () {
     let source = 'hello';
     transform(`import hbs from 'htmlbars-inline-precompile';\nvar compiled = hbs('${source}');`);

index.js

@@ -151,11 +151,9 @@ module.exports = function (babel) {
     }
   }
 
-  let allAddedImports = Object.create(null);
-
   function processModuleApiPolyfill(state) {
-    for (let module in allAddedImports) {
-      let addedImports = allAddedImports[module];
+    for (let module in state.allAddedImports) {
+      let addedImports = state.allAddedImports[module];
 
       for (let addedImport in addedImports) {
         let { path } = addedImports[addedImport];
@@ -187,8 +185,11 @@ module.exports = function (babel) {
       let useEmberModule = Boolean(options.useEmberModule);
       let moduleOverrides = options.moduleOverrides;
 
+      state.allAddedImports = Object.create(null);
+
       state.ensureImport = (exportName, moduleName) => {
-        let addedImports = (allAddedImports[moduleName] = allAddedImports[moduleName] || {});
+        let addedImports = (state.allAddedImports[moduleName] =
+          state.allAddedImports[moduleName] || {});
 
         if (addedImports[exportName]) return addedImports[exportName].id;
 

src/util.js

@@ -13,6 +13,8 @@ module.exports.registerRefs = (newPath, getRefPaths) => {
 
   for (let ref of refPaths) {
     let binding = ref.scope.getBinding(ref.node.name);
-    binding.reference(ref);
+    if (binding !== undefined) {
+      binding.reference(ref);
+    }
   }
 };