Corrected the addon file locations for TypeScript projects (#90)

* bugfix: Replaced .js with .ts in publicEntrypoints()

* chore: Updated fixtures

* chore: Added fixtures (hello-world) to test addon-test-support

* bugfix: Created the barrel file for test-support

---------

Co-authored-by: ijlee2 <[email protected]>

Author: ijlee2

src/blueprints/ember-addon/__addonLocation__/rollup.config.mjs

@@ -20,7 +20,7 @@ export default {
     // up your addon's public API. Also make sure your package.json#exports
     // is aligned to the config here.
     // See https://github.com/embroider-build/embroider/blob/main/docs/v2-faq.md#how-can-i-define-the-public-exports-of-my-addon
-    addon.publicEntrypoints(['**/*.js', 'index.js'<% if (options.packages.addon.hasGlint) {%>, 'template-registry.js'<% } %>]),
+    <% if (options.packages.addon.hasTypeScript) { %>addon.publicEntrypoints(['**/*.js', 'index.ts'<% if (options.packages.addon.hasGlint) {%>, 'template-registry.ts'<% } %>]),<% } else { %>addon.publicEntrypoints(['**/*.js', 'index.js']),<% } %>
 
     // These are the modules that should get reexported into the traditional
     // "app" tree. Things in here should also be in publicEntrypoints above, but

src/steps/move-addon-files.ts

@@ -25,7 +25,19 @@ function moveAddonFolder(options: Options): void {
 function moveAddonTestSupportFolder(options: Options): void {
   const { locations, projectRoot } = options;
 
-  const filePaths = findFiles('addon-test-support/**/*', {
+  let filePaths = findFiles('addon-test-support/index.{js,ts}', {
+    projectRoot,
+  });
+
+  if (filePaths.length === 1) {
+    const oldPath = filePaths[0]!;
+    const newPath = `${locations.addon}/src/test-support${oldPath.endsWith('.ts') ? '.ts' : 'js'}`;
+
+    moveFiles(new Map([[oldPath, newPath]]), options);
+  }
+
+  filePaths = findFiles('addon-test-support/**/*', {
+    ignoreList: ['addon-test-support/index.{js,ts}'],
     projectRoot,
   });
 

tests/fixtures/ember-container-query-customizations/input/tests/helpers/index.ts

@@ -34,7 +34,7 @@ function setupApplicationTest(
   // This is also a good place to call test setup functions coming
   // from other addons:
   //
-  // setupIntl(hooks); // ember-intl
+  // setupIntl(hooks, 'en-us'); // ember-intl
   // setupMirage(hooks); // ember-cli-mirage
 }
 

tests/fixtures/ember-container-query-customizations/output/demo-app/tests/helpers/index.ts

@@ -34,7 +34,7 @@ function setupApplicationTest(
   // This is also a good place to call test setup functions coming
   // from other addons:
   //
-  // setupIntl(hooks); // ember-intl
+  // setupIntl(hooks, 'en-us'); // ember-intl
   // setupMirage(hooks); // ember-cli-mirage
 }
 

tests/fixtures/ember-container-query-customizations/output/packages/ember-container-query/rollup.config.mjs

@@ -20,7 +20,7 @@ export default {
     // up your addon's public API. Also make sure your package.json#exports
     // is aligned to the config here.
     // See https://github.com/embroider-build/embroider/blob/main/docs/v2-faq.md#how-can-i-define-the-public-exports-of-my-addon
-    addon.publicEntrypoints(['**/*.js', 'index.js', 'template-registry.js']),
+    addon.publicEntrypoints(['**/*.js', 'index.ts', 'template-registry.ts']),
 
     // These are the modules that should get reexported into the traditional
     // "app" tree. Things in here should also be in publicEntrypoints above, but

tests/fixtures/ember-container-query-glint/input/tests/helpers/index.ts

@@ -34,7 +34,7 @@ function setupApplicationTest(
   // This is also a good place to call test setup functions coming
   // from other addons:
   //
-  // setupIntl(hooks); // ember-intl
+  // setupIntl(hooks, 'en-us'); // ember-intl
   // setupMirage(hooks); // ember-cli-mirage
 }
 

tests/fixtures/ember-container-query-glint/output/ember-container-query/rollup.config.mjs

@@ -20,7 +20,7 @@ export default {
     // up your addon's public API. Also make sure your package.json#exports
     // is aligned to the config here.
     // See https://github.com/embroider-build/embroider/blob/main/docs/v2-faq.md#how-can-i-define-the-public-exports-of-my-addon
-    addon.publicEntrypoints(['**/*.js', 'index.js', 'template-registry.js']),
+    addon.publicEntrypoints(['**/*.js', 'index.ts', 'template-registry.ts']),
 
     // These are the modules that should get reexported into the traditional
     // "app" tree. Things in here should also be in publicEntrypoints above, but

tests/fixtures/ember-container-query-glint/output/test-app/tests/helpers/index.ts

@@ -34,7 +34,7 @@ function setupApplicationTest(
   // This is also a good place to call test setup functions coming
   // from other addons:
   //
-  // setupIntl(hooks); // ember-intl
+  // setupIntl(hooks, 'en-us'); // ember-intl
   // setupMirage(hooks); // ember-cli-mirage
 }
 

tests/fixtures/ember-container-query-javascript/input/tests/helpers/index.js

@@ -26,7 +26,7 @@ function setupApplicationTest(hooks, options) {
   // This is also a good place to call test setup functions coming
   // from other addons:
   //
-  // setupIntl(hooks); // ember-intl
+  // setupIntl(hooks, 'en-us'); // ember-intl
   // setupMirage(hooks); // ember-cli-mirage
 }
 

tests/fixtures/ember-container-query-javascript/output/test-app/tests/helpers/index.js

@@ -26,7 +26,7 @@ function setupApplicationTest(hooks, options) {
   // This is also a good place to call test setup functions coming
   // from other addons:
   //
-  // setupIntl(hooks); // ember-intl
+  // setupIntl(hooks, 'en-us'); // ember-intl
   // setupMirage(hooks); // ember-cli-mirage
 }