Allow colocated templates for potential pods components

Author: Turbo87

lib/__tests__/template-paths.js

@@ -4,28 +4,50 @@ describe('possibleTemplatePaths()', () => {
   const TESTS = [
     [
       'app/components/checkbox.js',
-      ['app/templates/components/checkbox.hbs', 'app/components/checkbox.hbs'],
+      ['app/components/checkbox.hbs', 'app/templates/components/checkbox.hbs'],
     ],
     [
       'app/components/nested/sub/checkbox.js',
       [
-        'app/templates/components/nested/sub/checkbox.hbs',
         'app/components/nested/sub/checkbox.hbs',
+        'app/templates/components/nested/sub/checkbox.hbs',
+      ],
+    ],
+    [
+      'app/components/checkbox/component.js',
+      [
+        'app/components/checkbox/template.hbs',
+        'app/components/checkbox/component.hbs',
+        'app/templates/components/checkbox/component.hbs',
       ],
     ],
-    ['app/components/checkbox/component.js', ['app/components/checkbox/template.hbs']],
     [
       'app/components/nested/sub/component/component.js',
-      ['app/components/nested/sub/component/template.hbs'],
+      [
+        'app/components/nested/sub/component/template.hbs',
+        'app/components/nested/sub/component/component.hbs',
+        'app/templates/components/nested/sub/component/component.hbs',
+      ],
     ],
     [
       'app/components/checkbox.ts',
-      ['app/templates/components/checkbox.hbs', 'app/components/checkbox.hbs'],
+      ['app/components/checkbox.hbs', 'app/templates/components/checkbox.hbs'],
+    ],
+    [
+      'app/components/checkbox/component.ts',
+      [
+        'app/components/checkbox/template.hbs',
+        'app/components/checkbox/component.hbs',
+        'app/templates/components/checkbox/component.hbs',
+      ],
     ],
-    ['app/components/checkbox/component.ts', ['app/components/checkbox/template.hbs']],
     [
       'app/components/nested/sub/component/component.ts',
-      ['app/components/nested/sub/component/template.hbs'],
+      [
+        'app/components/nested/sub/component/template.hbs',
+        'app/components/nested/sub/component/component.hbs',
+        'app/templates/components/nested/sub/component/component.hbs',
+      ],
     ],
   ];
 

lib/transform.js

@@ -101,15 +101,21 @@ function transform(source, template, options = {}) {
 }
 
 function possibleTemplatePaths(componentPath) {
+  let classicTemplatePath = componentPath
+    .replace('/components/', '/templates/components/')
+    .replace(/\.(js|ts)$/, '.hbs');
+
+  let colocatedTemplatePath = componentPath.replace(/\.(js|ts)$/, '.hbs');
+
+  let templatePaths = [colocatedTemplatePath, classicTemplatePath];
+
   let isPods = path.basename(componentPath, path.extname(componentPath)) === 'component';
   if (isPods) {
-    return [path.dirname(componentPath) + '/template.hbs'];
+    let podsTemplatePath = path.dirname(componentPath) + '/template.hbs';
+    templatePaths.unshift(podsTemplatePath);
   }
 
-  return [
-    componentPath.replace('/components/', '/templates/components/').replace(/\.(js|ts)$/, '.hbs'),
-    componentPath.replace(/\.(js|ts)$/, '.hbs'),
-  ];
+  return templatePaths;
 }
 
 module.exports = {