Avoid adding the import for setComponentTemplate.

This will be done by an AST plugin instead.
ember-cli · Sep 9, 2019 · 5709c0f · 5709c0f
1 parent 6de52e5
commit 5709c0f
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 16 deletions.
diff --git a/lib/colocated-broccoli-plugin.js b/lib/colocated-broccoli-plugin.js
@@ -16,19 +16,16 @@ module.exports = class ColocatedTemplateProcessor extends Plugin {
   }
 
   _transformExistingComponent(filePath, jsContents, templateContents) {
-    // TODO: deal with hygiene
     if (!jsContents.includes('export default')) {
       let message = `\`${filePath}\` does not contain a \`default export\`. Did you forget to export the component class?`;
       return `${jsContents}\nthrow new Error(${JSON.stringify(message)});`;
     }
 
-    let modifiedJS = jsContents.replace('export default', 'const CLASS =');
-
+    // TODO: deal with hygiene?
     let output = stripIndents`
-      ${modifiedJS}
-      const setComponentTemplate = Ember._setComponentTemplate;
-      const TEMPLATE = ${this.options.precompile(templateContents)};
-      export default setComponentTemplate(TEMPLATE, CLASS);`;
+      import hbs from 'ember-cli-htmlbars-inline-precompile';
+      const __COLOCATED_TEMPLATE__ = hbs\`${templateContents}\`;
+      ${jsContents}`;
 
     return output;
   }
@@ -81,11 +78,13 @@ module.exports = class ColocatedTemplateProcessor extends Plugin {
         jsContents = this._transformExistingComponent(filePath, jsContents, templateContents);
       } else {
         // create JS file, use null component pattern
-        jsContents = `const templateOnlyComponent = Ember._templateOnlyComponent;
-const setComponentTemplate = Ember._setComponentTemplate;
-const TEMPLATE = ${this.options.precompile(templateContents)};
-const CLASS = templateOnlyComponent();
-export default setComponentTemplate(TEMPLATE, CLASS);`;
+
+        jsContents = stripIndents`
+          import templateOnly from '@ember/component/template-only';
+          import hbs from 'ember-cli-htmlbars-inline-precompile';
+          const __COLOCATED_TEMPLATE__ = hbs\`${templateContents}\`;
+
+          export default templateOnly();`
       }
 
       let outputPath = path.join(this.outputPath, possibleJSPath);

diff --git a/node-tests/colocated-plugin-test.js b/node-tests/colocated-plugin-test.js
@@ -91,12 +91,12 @@ describe('ColocatedTemplateCompiler', function() {
       'app-name-here': {
         components: {
           'foo.js': stripIndent`
+            import { setComponentTemplate } from '@ember/component';
+            import hbs from 'ember-cli-htmlbars-inline-precompile';
+            const __COLOCATED_TEMPLATE__ = hbs\`{{yield}}\`;
             import Component from '@glimmer/component';
 
-            const CLASS = class FooComponent extends Component {}
-            const setComponentTemplate = Ember._setComponentTemplate;
-            const TEMPLATE = {"template":"{{yield}}"};
-            export default setComponentTemplate(TEMPLATE, CLASS);
+            export default class FooComponent extends Component {}
           `,
         },
         templates: {
@@ -215,4 +215,6 @@ describe('ColocatedTemplateCompiler', function() {
       },
     });
   });
+
+  it('does not break class decorator usage');
 });