Merge pull request #773 from robinborst95/fix/co-located-template-with-re-exported-class-error-message

Adjust error message for re-exported class when it has a co-located template

Author: mansona

lib/colocated-broccoli-plugin.js

@@ -150,8 +150,12 @@ module.exports = class ColocatedTemplateProcessor extends Plugin {
           }
         );
 
-        if (hasTemplate && !jsContents.includes('export default')) {
-          let message = `\`${relativePath}\` does not contain a \`default export\`. Did you forget to export the component class?`;
+        if (hasTemplate && jsContents.includes('export { default }')) {
+          let message = `\`${backingClassPath}\` contains an \`export { default }\` re-export, but it has a co-located template. You must explicitly extend the component to assign it a different template.`;
+          jsContents = `${jsContents}\nthrow new Error(${JSON.stringify(message)});`;
+          prefix = '';
+        } else if (hasTemplate && !jsContents.includes('export default')) {
+          let message = `\`${backingClassPath}\` does not contain a \`default export\`. Did you forget to export the component class?`;
           jsContents = `${jsContents}\nthrow new Error(${JSON.stringify(message)});`;
           prefix = '';
         }

node-tests/colocated-broccoli-plugin-test.js

@@ -186,6 +186,58 @@ describe('ColocatedTemplateCompiler', function () {
     );
   });
 
+  it('emits an error for re-exported components with a different template', async function () {
+    input.write({
+      'app-name-here': {
+        'router.js': '// stuff here',
+        components: {
+          'foo.hbs': `{{yield}}`,
+          'foo.js': `export { default } from 'some-place';`,
+        },
+        templates: {
+          'application.hbs': `{{outlet}}`,
+        },
+      },
+    });
+
+    let tree = new ColocatedTemplateCompiler(input.path());
+
+    output = createBuilder(tree);
+    await output.build();
+
+    assert.deepStrictEqual(output.read(), {
+      'app-name-here': {
+        'router.js': '// stuff here',
+        components: {
+          'foo.js': stripIndent`
+            export { default } from 'some-place';\nthrow new Error(\"\`app-name-here/components/foo.js\` contains an \`export { default }\` re-export, but it has a co-located template. You must explicitly extend the component to assign it a different template.\");
+          `,
+        },
+        templates: {
+          'application.hbs': '{{outlet}}',
+        },
+      },
+    });
+
+    await output.build();
+
+    assert.deepStrictEqual(output.changes(), {}, 'NOOP update has no changes');
+
+    input.write({
+      'app-name-here': {
+        'router.js': '// other stuff here',
+      },
+    });
+
+    await output.build();
+
+    assert.deepStrictEqual(
+      output.changes(),
+      { 'app-name-here/router.js': 'change' },
+      'has only related changes'
+    );
+  });
+
   it('works for typescript component class with template', async function () {
     input.write({
       'app-name-here': {
@@ -500,7 +552,7 @@ describe('ColocatedTemplateCompiler', function () {
       'app-name-here': {
         components: {
           'foo.js': stripIndent`
-            export function whatever() {}\nthrow new Error("\`app-name-here/components/foo.hbs\` does not contain a \`default export\`. Did you forget to export the component class?");
+            export function whatever() {}\nthrow new Error("\`app-name-here/components/foo.js\` does not contain a \`default export\`. Did you forget to export the component class?");
           `,
         },
       },

node-tests/colocated-test.js

@@ -407,7 +407,7 @@ describe('Colocation - Broccoli + Babel Integration (modules API: true)', functi
       'app-name-here': {
         components: {
           'foo.js': stripIndent`
-            export function whatever() {}\nthrow new Error("\`app-name-here/components/foo.hbs\` does not contain a \`default export\`. Did you forget to export the component class?");
+            export function whatever() {}\nthrow new Error("\`app-name-here/components/foo.js\` does not contain a \`default export\`. Did you forget to export the component class?");
           `,
         },
       },
@@ -797,7 +797,7 @@ describe('Colocation - Broccoli + Babel Integration (modules API: false)', funct
       'app-name-here': {
         components: {
           'foo.js': stripIndent`
-            export function whatever() {}\nthrow new Error("\`app-name-here/components/foo.hbs\` does not contain a \`default export\`. Did you forget to export the component class?");
+            export function whatever() {}\nthrow new Error("\`app-name-here/components/foo.js\` does not contain a \`default export\`. Did you forget to export the component class?");
           `,
         },
       },