Merge branch 'master' of github.com:camerondubas/ember-cli-htmlbars

Author: camerondubas

CHANGELOG.md

@@ -1,3 +1,19 @@
+## v4.0.6 (2019-10-17)
+
+#### :rocket: Enhancement
+* [#334](https://github.com/ember-cli/ember-cli-htmlbars/pull/334) Add parent's name to logging output. ([@rwjblue](https://github.com/rwjblue))
+
+#### :bug: Bug Fix
+* [#333](https://github.com/ember-cli/ember-cli-htmlbars/pull/333) Enable colocated component classes to be TypeScript ([@rwjblue](https://github.com/rwjblue))
+* [#332](https://github.com/ember-cli/ember-cli-htmlbars/pull/332) Ensure "pods style" templates are compiled properly. ([@rwjblue](https://github.com/rwjblue))
+
+#### :house: Internal
+* [#125](https://github.com/ember-cli/ember-cli-htmlbars/pull/125) Add more tests using AST plugins (inline and standalone) ([@stefanpenner](https://github.com/stefanpenner))
+
+#### Committers: 2
+- Robert Jackson ([@rwjblue](https://github.com/rwjblue))
+- Stefan Penner ([@stefanpenner](https://github.com/stefanpenner))
+
 ## v4.0.5 (2019-10-04)
 
 #### :bug: Bug Fix

lib/colocated-broccoli-plugin.js

@@ -68,15 +68,25 @@ module.exports = class ColocatedTemplateProcessor extends Plugin {
         return;
       }
 
-      // TODO: deal with alternate extensions (e.g. ts)
-      let possibleJSPath = path.join(filePathParts.dir, filePathParts.name + '.js');
-      let hasJSFile = fs.existsSync(path.join(this.inputPaths[0], possibleJSPath));
-
       if (filePathParts.name === 'template') {
-        // TODO: maybe warn?
+        filesToCopy.push(filePath);
         return;
       }
 
+      let hasBackingClass = false;
+      let backingClassPath = path.join(filePathParts.dir, filePathParts.name);
+
+      if (fs.existsSync(path.join(this.inputPaths[0], backingClassPath + '.js'))) {
+        backingClassPath += '.js';
+        hasBackingClass = true;
+      } else if (fs.existsSync(path.join(this.inputPaths[0], backingClassPath + '.ts'))) {
+        backingClassPath += '.ts';
+        hasBackingClass = true;
+      } else {
+        backingClassPath += '.js';
+        hasBackingClass = false;
+      }
+
       let templateContents = fs.readFileSync(inputPath, { encoding: 'utf8' });
       let jsContents = null;
 
@@ -92,12 +102,14 @@ module.exports = class ColocatedTemplateProcessor extends Plugin {
       )})`;
       let prefix = `import { hbs } from 'ember-cli-htmlbars';\nconst __COLOCATED_TEMPLATE__ = ${hbsInvocation};\n`;
 
-      logger.debug(`processing colocated template: ${filePath} (template-only: ${hasJSFile})`);
+      logger.debug(
+        `processing colocated template: ${filePath} (template-only: ${hasBackingClass})`
+      );
 
-      if (hasJSFile) {
+      if (hasBackingClass) {
         // add the template, call setComponentTemplate
 
-        jsContents = fs.readFileSync(path.join(this.inputPaths[0], possibleJSPath), {
+        jsContents = fs.readFileSync(path.join(this.inputPaths[0], backingClassPath), {
           encoding: 'utf8',
         });
 
@@ -114,7 +126,7 @@ module.exports = class ColocatedTemplateProcessor extends Plugin {
 
       jsContents = prefix + jsContents;
 
-      let outputPath = path.join(this.outputPath, possibleJSPath);
+      let outputPath = path.join(this.outputPath, backingClassPath);
 
       // TODO: don't speculatively mkdirSync (likely do in a try/catch with ENOENT)
       mkdirp.sync(path.dirname(outputPath));

lib/ember-addon-main.js

@@ -2,7 +2,6 @@
 
 const path = require('path');
 const utils = require('./utils');
-const logger = require('heimdalljs-logger')('ember-cli-htmlbars:addon');
 const hasEdition = require('@ember/edition-utils').has;
 
 let registryInvocationCounter = 0;
@@ -12,6 +11,14 @@ module.exports = {
 
   parentRegistry: null,
 
+  init() {
+    this._super.init.apply(this, arguments);
+
+    let parentName = typeof this.parent.name === 'function' ? this.parent.name() : this.parent.name;
+
+    this.logger = require('heimdalljs-logger')('ember-cli-htmlbars:addon:' + parentName);
+  },
+
   _shouldColocateTemplates() {
     if (this._cachedShouldColocateTemplates) {
       return this._cachedShouldColocateTemplates;
@@ -36,9 +43,8 @@ module.exports = {
     this._cachedShouldColocateTemplates =
       hasOctane && hasValidBabelVersion && hasValidEmberCLIVersion;
 
-    logger.info(
-      `Colocation processing: ${this._cachedShouldColocateTemplates} (hasOctane: ${hasOctane}; hasValidEmberCLIVersion: ${hasValidEmberCLIVersion}; hasVali
-dBabelVersion: ${hasValidBabelVersion};`
+    this.logger.info(
+      `Colocation processing: ${this._cachedShouldColocateTemplates} (hasOctane: ${hasOctane}; hasValidEmberCLIVersion: ${hasValidEmberCLIVersion}; hasValidBabelVersion: ${hasValidBabelVersion};`
     );
 
     return this._cachedShouldColocateTemplates;
@@ -140,7 +146,7 @@ dBabelVersion: ${hasValidBabelVersion};`
       let templateCompilerPath = this.templateCompilerPath();
 
       if (pluginInfo.canParallelize) {
-        logger.debug('using parallel API with for babel inline precompilation plugin');
+        this.logger.debug('using parallel API with for babel inline precompilation plugin');
 
         let htmlbarsInlinePrecompilePlugin = utils.buildParalleizedBabelPlugin(
           pluginInfo,
@@ -149,8 +155,8 @@ dBabelVersion: ${hasValidBabelVersion};`
 
         babelPlugins.push(htmlbarsInlinePrecompilePlugin);
       } else {
-        logger.debug('NOT using parallel API with for babel inline precompilation plugin');
-        logger.debug('Prevented by these plugins: ' + pluginInfo.unparallelizableWrappers);
+        this.logger.debug('NOT using parallel API with for babel inline precompilation plugin');
+        this.logger.debug('Prevented by these plugins: ' + pluginInfo.unparallelizableWrappers);
 
         let htmlBarsPlugin = utils.setup(pluginInfo, {
           projectConfig: this.projectConfig(),

node-tests/colocated-plugin-test.js

@@ -105,6 +105,50 @@ describe('ColocatedTemplateCompiler', function() {
     });
   });
 
+  it('works for typescript component class with template', async function() {
+    input.write({
+      'app-name-here': {
+        components: {
+          'foo.hbs': `{{yield}}`,
+          'foo.ts': stripIndent`
+            import Component from '@glimmer/component';
+
+            export default class FooComponent extends Component {}
+          `,
+        },
+        templates: {
+          'application.hbs': `{{outlet}}`,
+        },
+      },
+    });
+
+    let tree = new ColocatedTemplateCompiler(input.path(), {
+      precompile(template) {
+        return JSON.stringify({ template });
+      },
+    });
+
+    output = createBuilder(tree);
+    await output.build();
+
+    assert.deepStrictEqual(output.read(), {
+      'app-name-here': {
+        components: {
+          'foo.ts': stripIndent`
+            import { hbs } from 'ember-cli-htmlbars';
+            const __COLOCATED_TEMPLATE__ = hbs("{{yield}}", {"contents":"{{yield}}","moduleName":"app-name-here/components/foo.hbs","parseOptions":{"srcName":"app-name-here/components/foo.hbs"}});
+            import Component from '@glimmer/component';
+
+            export default class FooComponent extends Component {}
+          `,
+        },
+        templates: {
+          'application.hbs': '{{outlet}}',
+        },
+      },
+    });
+  });
+
   it('works for scoped addon using template only component', async function() {
     input.write({
       '@scope-name': {
@@ -227,6 +271,29 @@ describe('ColocatedTemplateCompiler', function() {
     assert.deepStrictEqual(output.read(), input.read());
   });
 
+  it('does nothing for "pod" location templates', async function() {
+    input.write({
+      'addon-name-here': {
+        components: {
+          foo: {
+            'template.hbs': `{{yield}}`,
+          },
+        },
+      },
+    });
+
+    let tree = new ColocatedTemplateCompiler(input.path(), {
+      precompile(template) {
+        return JSON.stringify({ template });
+      },
+    });
+
+    output = createBuilder(tree);
+    await output.build();
+
+    assert.deepStrictEqual(output.read(), input.read());
+  });
+
   it('it works if there are no input files', async function() {
     input.write({});
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-cli-htmlbars",
-  "version": "4.0.5",
+  "version": "4.0.6",
   "description": "A library for adding htmlbars to ember CLI",
   "keywords": [
     "ember-addon",