Merge pull request #358 from ember-cli/feat/add-template-compiler-pat…

…h-option

Adds a `templateCompilerPath` option

__tests__/mock-precompile.js

@@ -0,0 +1,5 @@
+module.exports = {
+  precompile(value) {
+    return `precompiledFromPath(${value})`;
+  },
+};

__tests__/tests.js

@@ -64,6 +64,24 @@ describe('htmlbars-inline-precompile', function () {
     `);
   });
 
+  it('supports compilation with templateCompilerPath', function () {
+    plugins[0][1].templateCompilerPath = require.resolve('./mock-precompile');
+
+    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
+      */
+      precompiledFromPath(hello));"
+    `);
+  });
+
   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`;"
@@ -822,7 +840,7 @@ describe('htmlbars-inline-precompile', function () {
 
       expect(optionsReceived).toEqual({
         contents: source,
-        scope: ['foo', 'bar'],
+        locals: ['foo', 'bar'],
       });
     });
 

index.js

@@ -66,15 +66,11 @@ module.exports = function (babel) {
       let propertyName =
         property.key.type === 'Identifier' ? property.key.name : property.key.value;
 
-      let value;
-
       if (shouldParseScope && propertyName === 'scope') {
-        value = parseScopeObject(buildError, name, property.value);
+        result.locals = parseScopeObject(buildError, name, property.value);
       } else {
-        value = parseExpression(buildError, name, property.value);
+        result[propertyName] = parseExpression(buildError, name, property.value);
       }
-
-      result[propertyName] = value;
     });
 
     return result;
@@ -169,11 +165,21 @@ module.exports = function (babel) {
     }
   }
 
+  let precompile;
+
   let visitor = {
     Program(path, state) {
       state.opts.ensureModuleApiPolyfill =
         'ensureModuleApiPolyfill' in state.opts ? state.opts.ensureModuleApiPolyfill : true;
 
+      if (state.opts.templateCompilerPath) {
+        let templateCompiler = require(state.opts.templateCompilerPath);
+
+        precompile = templateCompiler.precompile;
+      } else {
+        precompile = state.opts.precompile;
+      }
+
       if (state.opts.ensureModuleApiPolyfill) {
         // Setup state for the module API polyfill
         setupState(t, path, state);
@@ -376,7 +382,7 @@ module.exports = function (babel) {
 
       let template = path.node.quasi.quasis.map((quasi) => quasi.value.cooked).join('');
 
-      let { precompile, isProduction } = state.opts;
+      let { isProduction } = state.opts;
       let scope = shouldUseAutomaticScope(options) ? getScope(path.scope) : null;
       let strictMode = shouldUseStrictMode(options);
 
@@ -459,7 +465,7 @@ module.exports = function (babel) {
           );
       }
 
-      let { precompile, isProduction } = state.opts;
+      let { isProduction } = state.opts;
 
       // allow the user specified value to "win" over ours
       if (!('isProduction' in compilerOptions)) {

package.json

@@ -9,6 +9,9 @@
     "lint": "eslint --cache .",
     "test": "jest"
   },
+  "jest": {
+    "testPathIgnorePatterns": ["mock-precompile"]
+  },
   "dependencies": {
     "babel-plugin-ember-modules-api-polyfill": "^3.4.0"
   },