Merge pull request #148 from arthirm/multi-ember-app-bug-fix

Fix issue with '_registeredWithBabel' check

Author: rwjblue

index.js

@@ -56,7 +56,7 @@ module.exports = {
 
     // add the HTMLBarsInlinePrecompilePlugin to the list of plugins used by
     // the `ember-cli-babel` addon
-    if (!this._registeredWithBabel) {
+    if (!this._isBabelPluginRegistered(babelPlugins)) {
       let templateCompilerPath = this.templateCompilerPath();
       let parallelConfig = this.getParallelConfig(pluginWrappers);
       let pluginInfo = AstPlugins.setupDependentPlugins(pluginWrappers);
@@ -93,10 +93,28 @@ module.exports = {
         });
         babelPlugins.push(htmlBarsPlugin);
       }
-      this._registeredWithBabel = true;
     }
   },
 
+  /**
+   * This function checks if 'ember-cli-htmlbars-inline-precompile' is already present in babelPlugins.
+   * The plugin object will be different for non parallel API and parallel API.
+   * For parallel api, check the `baseDir` of a plugin to see if it has current dirname
+   * For non parallel api, check the 'modulePaths' to see if it contains 'ember-cli-htmlbars-inline-precompile'
+   * @param {*} plugins
+   */
+  _isBabelPluginRegistered(plugins) {
+    return plugins.some(plugin => {
+      if (Array.isArray(plugin)) {
+        return plugin[0] === require.resolve('babel-plugin-htmlbars-inline-precompile');
+      } else if (plugin !== null && typeof plugin === 'object' && plugin._parallelBabel !== undefined) {
+        return plugin._parallelBabel.requireFile === path.resolve(__dirname, 'lib/require-from-worker');
+      } else {
+        return false;
+      }
+    });
+  },
+
   _getAddonOptions() {
     return (this.parent && this.parent.options) || (this.app && this.app.options) || {};
   },

lib/ast-plugins.js

@@ -2,7 +2,7 @@
 
 const fs = require('fs');
 const path = require('path');
-const HTMLBarsInlinePrecompilePlugin = require('babel-plugin-htmlbars-inline-precompile');
+const HTMLBarsInlinePrecompilePlugin = require.resolve('babel-plugin-htmlbars-inline-precompile');
 const hashForDep = require('hash-for-dep');
 const debugGenerator = require('heimdalljs-logger');
 const _logger = debugGenerator('ember-cli-htmlbars-inline-precompile');

node-tests/test.js

@@ -5,10 +5,11 @@ const expect = require('chai').expect;
 const fs = require('fs');
 const path = require('path');
 const Registry = require('ember-cli-preprocess-registry');
-const HTMLBarsInlinePrecompilePlugin = require('babel-plugin-htmlbars-inline-precompile');
+const HTMLBarsInlinePrecompilePlugin = require.resolve('babel-plugin-htmlbars-inline-precompile');
 const hashForDep = require('hash-for-dep');
 const pluginHashForDep = hashForDep(path.resolve(__dirname, './fixtures'));
 const InlinePrecompile = require('../');
+const defaultsDeep = require('ember-cli-lodash-subset').defaultsDeep;
 
 describe('canParallelize()', function() {
   it('returns true for 0 plugins', function() {
@@ -257,4 +258,38 @@ describe('included()', function() {
       expect(cacheKey).to.equal(expectedCacheKey);
     });
   });
+
+  describe('different instances of inline precompile for the same parent', function() {
+    it('should have only 1 inlinePrecompile registered for parallel babel', function() {
+      let InlinePrecompile1  = defaultsDeep( {}, require('../'))
+      let InlinePrecompile2  = defaultsDeep( {}, require('../'))
+      parent = { options: { babel: { plugins: [] } } };
+      InlinePrecompile1.parent = parent;
+      InlinePrecompile2.parent = parent;
+
+      InlinePrecompile1.included();
+      configuredPlugins = parent.options.babel.plugins;
+      expect(configuredPlugins.length).to.eql(1);
+      InlinePrecompile2.included();
+      configuredPlugins = parent.options.babel.plugins;
+      expect(configuredPlugins.length).to.eql(1);
+    });
+
+    it('should have only 1 inlinePrecompile registered for non parallel babel', function() {
+      registry.add('htmlbars-ast-plugin', nonParallelPlugin);
+      let InlinePrecompile1  = defaultsDeep( {}, require('../'))
+      let InlinePrecompile2  = defaultsDeep( {}, require('../'))
+      parent = { options: { babel: { plugins: [] } } };
+      InlinePrecompile1.parent = parent;
+      InlinePrecompile2.parent = parent;
+
+      InlinePrecompile1.included();
+      configuredPlugins = parent.options.babel.plugins;
+      expect(configuredPlugins.length).to.eql(1);
+      InlinePrecompile2.included();
+      configuredPlugins = parent.options.babel.plugins;
+      expect(configuredPlugins.length).to.eql(1);
+    });
+
+  });
 });

package.json

@@ -26,6 +26,7 @@
     "ember-cli-dependency-checker": "^3.0.0",
     "ember-cli-htmlbars": "^3.0.0",
     "ember-cli-inject-live-reload": "^2.0.1",
+    "ember-cli-lodash-subset": "^2.0.1",
     "ember-cli-preprocess-registry": "^3.1.1",
     "ember-cli-template-lint": "^1.0.0-beta.1",
     "ember-cli-test-loader": "^2.2.0",