resolve components helpers with explicit extensions

embroider-build · Dec 9, 2023 · a12e437 · a12e437
1 parent a58c41b
commit a12e437
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/packages/core/src/module-resolver.ts b/packages/core/src/module-resolver.ts
@@ -532,22 +532,25 @@ export class Resolver {
   }
 
   private *componentTemplateCandidates(inPackageName: string) {
-    yield { prefix: '/templates/components/', suffix: '' };
-    yield { prefix: '/components/', suffix: '/template' };
+    yield { prefix: '/templates/components/', suffix: '.hbs' };
+    yield { prefix: '/components/', suffix: '/template.hbs' };
 
     let pods = this.podPrefix(inPackageName);
     if (pods) {
-      yield { prefix: `${pods}/components/`, suffix: '/template' };
+      yield { prefix: `${pods}/components/`, suffix: '/template.hbs' };
     }
   }
 
   private *componentJSCandidates(inPackageName: string) {
-    yield { prefix: '/components/', suffix: '' };
-    yield { prefix: '/components/', suffix: '/component' };
+    yield { prefix: '/components/', suffix: '.js' };
+    yield { prefix: '/components/', suffix: '.ts' };
+    yield { prefix: '/components/', suffix: '/component.js' };
+    yield { prefix: '/components/', suffix: '/component.ts' };
 
     let pods = this.podPrefix(inPackageName);
     if (pods) {
-      yield { prefix: `${pods}/components/`, suffix: '/component' };
+      yield { prefix: `${pods}/components/`, suffix: '/component.js' };
+      yield { prefix: `${pods}/components/`, suffix: '/component.ts' };
     }
   }
 
@@ -1152,7 +1155,7 @@ export class Resolver {
     if (filename.match(/\.(hbs|js|hbs\.js)$/)) {
       yield filename;
     } else {
-      for (let ext of ['.js', '.hbs.js', '.hbs']) {
+      for (let ext of ['.js', '.hbs.js', '.hbs', '.ts']) {
         yield `${filename}${ext}`;
       }
     }