From 46d994ead883f1fe16ef645da12d05b66718d865 Mon Sep 17 00:00:00 2001 From: Edward Faulkner Date: Fri, 27 Jan 2023 12:06:39 -0500 Subject: [PATCH 1/2] restore original ts extension priority I don't really know what https://github.com/embroider-build/embroider/commit/7882a2da97ce31f720dc7eabb8bef7d149a5b18b was trying to achieve and it definitely looks weird and it's the cause of #1336 and probably #1341. Maybe CI will tell me why this was done in the first place... --- packages/compat/src/compat-app.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/compat/src/compat-app.ts b/packages/compat/src/compat-app.ts index 15ad6f3e7..e432a1669 100644 --- a/packages/compat/src/compat-app.ts +++ b/packages/compat/src/compat-app.ts @@ -231,7 +231,7 @@ class CompatAppAdapter implements AppAdapter { // For TS, we defer to ember-cli-babel, and the setting for // "enableTypescriptTransform" can be set with and without // ember-cli-typescript - return ['.wasm', '.mjs', '.js', '.json', '.hbs', '.hbs.js', '.ts']; + return ['.ts', '.wasm', '.mjs', '.js', '.json', '.hbs', '.hbs.js']; } private *emberEntrypoints(htmlTreePath: string): IterableIterator { From 13aa13d7834f7454d4a1476cc2031316a51093b1 Mon Sep 17 00:00:00 2001 From: Edward Faulkner Date: Fri, 27 Jan 2023 12:08:00 -0500 Subject: [PATCH 2/2] ts between js and template --- packages/compat/src/compat-app.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/compat/src/compat-app.ts b/packages/compat/src/compat-app.ts index e432a1669..9813a30dc 100644 --- a/packages/compat/src/compat-app.ts +++ b/packages/compat/src/compat-app.ts @@ -231,7 +231,7 @@ class CompatAppAdapter implements AppAdapter { // For TS, we defer to ember-cli-babel, and the setting for // "enableTypescriptTransform" can be set with and without // ember-cli-typescript - return ['.ts', '.wasm', '.mjs', '.js', '.json', '.hbs', '.hbs.js']; + return ['.wasm', '.mjs', '.js', '.json', '.ts', '.hbs', '.hbs.js']; } private *emberEntrypoints(htmlTreePath: string): IterableIterator {