diff --git a/packages/core/src/transform/template/rewrite-module.ts b/packages/core/src/transform/template/rewrite-module.ts
index a44c8f14c..1039d2b01 100644
--- a/packages/core/src/transform/template/rewrite-module.ts
+++ b/packages/core/src/transform/template/rewrite-module.ts
@@ -21,36 +21,6 @@ import { calculateCompanionTemplateSpans } from './inlining/companion-file.js';
  */
 export type RewriteInput = { script: SourceFile; template?: SourceFile };
 
-// HACK: We prefix every transformed TS file with these non-existent imports
-// because it causes TypeScript to consider `.gts` and `.gjs` as possible
-// implied extensions when extensions are omitted from import module specifiers,
-// i.e. it causes `import FooComponent from './foo';` to work given a `foo.gts` file.
-//
-// Origin of this hack:
-// https://github.com/typed-ember/glint/issues/806#issuecomment-2758616327
-//
-// This approach has the following desirable properties:
-//
-// 1. It doesn't break Organize Imports command
-// 2. It doesn't introduce any keywords/variables that'll show up in auto-complete suggestions
-const EXTENSION_FIXING_HEADER_HACK_GTS = `
-// @ts-expect-error
-({} as typeof import('./__glint-hacky-nonexistent.gts'));
-
-// @ts-expect-error
-({} as typeof import('./__glint-hacky-nonexistent.gjs'));
-
-`;
-
-const EXTENSION_FIXING_HEADER_HACK_GJS = `
-// @ts-expect-error
-(/** @type {typeof import("./__glint-hacky-nonexistent.gts")} */ ({}))
-
-// @ts-expect-error
-(/** @type {typeof import("./__glint-hacky-nonexistent.gjs")} */ ({}))
-
-`;
-
 /**
  * Given the script and/or template that together comprise a component module,
  * returns a `TransformedModule` representing the combined result, with the
@@ -97,17 +67,7 @@ function calculateCorrelatedSpans(
 ): CorrelatedSpansResult {
   let directives: Array<Directive> = [];
   let errors: Array<TransformError> = [];
-  let partialSpans: Array<PartialCorrelatedSpan> = [
-    {
-      originalFile: script,
-      originalStart: 0,
-      originalLength: 0,
-      insertionPoint: 0,
-      transformedSource: environment.isUntypedScript(script.filename)
-        ? EXTENSION_FIXING_HEADER_HACK_GJS
-        : EXTENSION_FIXING_HEADER_HACK_GTS,
-    },
-  ];
+  let partialSpans: Array<PartialCorrelatedSpan> = [];
 
   let { ast, emitMetadata, error } = parseScript(ts, script, environment);
 
diff --git a/packages/tsserver-plugin/src/typescript-server-plugin.ts b/packages/tsserver-plugin/src/typescript-server-plugin.ts
index 520f1b967..2e94386fa 100644
--- a/packages/tsserver-plugin/src/typescript-server-plugin.ts
+++ b/packages/tsserver-plugin/src/typescript-server-plugin.ts
@@ -61,6 +61,49 @@ const plugin = createLanguageServicePlugin(
             (fileName) => fileName,
           );
 
+          const resolveModuleNameLiterals =
+            info.languageServiceHost.resolveModuleNameLiterals?.bind(info.languageServiceHost);
+
+          if (resolveModuleNameLiterals) {
+            // TS isn't aware of our customer .gts/.gjs extensions by default which causes
+            // issues with resolving imports that omit extensions. We hackishly "teach"
+            // TS about these extensions by overriding `resolveModuleNameLiterals` to
+            // inject non-existent imports that cause TS to consider the extensions when
+            // resolving.
+            //
+            // Origin of this hack:
+            // https://github.com/typed-ember/glint/issues/806#issuecomment-2758616327
+            info.languageServiceHost.resolveModuleNameLiterals = (
+              moduleLiterals,
+              containingFile,
+              redirectedReference,
+              options,
+              ...rest
+            ) => {
+              let fakeImportNodes: any = [];
+              if (moduleLiterals.length > 0) {
+                fakeImportNodes.push({
+                  ...moduleLiterals[0],
+                  text: './__NONEXISTENT_GLINT_HACK__.gts',
+                });
+                fakeImportNodes.push({
+                  ...moduleLiterals[0],
+                  text: './__NONEXISTENT_GLINT_HACK__.gjs',
+                });
+              }
+
+              const result = resolveModuleNameLiterals(
+                [...fakeImportNodes, ...moduleLiterals],
+                containingFile,
+                redirectedReference,
+                options,
+                ...rest,
+              );
+
+              return result.slice(fakeImportNodes.length);
+            };
+          }
+
           // #3963
           // const timer = setInterval(() => {
           //   if (info.project['program']) {
diff --git a/packages/vscode/__fixtures__/ember-app-loose-and-gts/app/components/vanilla.ts b/packages/vscode/__fixtures__/ember-app-loose-and-gts/app/components/vanilla.ts
new file mode 100644
index 000000000..d4c59ecab
--- /dev/null
+++ b/packages/vscode/__fixtures__/ember-app-loose-and-gts/app/components/vanilla.ts
@@ -0,0 +1,3 @@
+import Greeting from './Greeting';
+
+export default Greeting;
diff --git a/packages/vscode/__fixtures__/template-imports-app-ts-plugin/src/index.gts b/packages/vscode/__fixtures__/template-imports-app-ts-plugin/src/index.gts
index fae47f952..5594e2179 100644
--- a/packages/vscode/__fixtures__/template-imports-app-ts-plugin/src/index.gts
+++ b/packages/vscode/__fixtures__/template-imports-app-ts-plugin/src/index.gts
@@ -1,11 +1,7 @@
 import '@glint/environment-ember-loose';
 import '@glint/environment-ember-template-imports';
 
-// TS-PLUGIN: I had to add the .gts extension in order for this to work, otherwise
-// Cannot find module './Greeting' or its corresponding type declarations. [ts-plugin(2307)]
-
-// import Greeting from './Greeting';
-import Greeting from './Greeting.gts';
+import Greeting from './Greeting';
 
 <template>
   <Greeting @target="World" />
diff --git a/test-packages/package-test-core/__tests__/language-server/imports.test.ts b/test-packages/package-test-core/__tests__/language-server/imports.test.ts
index 3a3b43475..c2ab61418 100644
--- a/test-packages/package-test-core/__tests__/language-server/imports.test.ts
+++ b/test-packages/package-test-core/__tests__/language-server/imports.test.ts
@@ -8,7 +8,7 @@ import { stripIndent } from 'common-tags';
 describe('Language Server: Imports', () => {
   afterEach(teardownSharedTestWorkspaceAfterEach);
 
-  test('support moduleResolution=bundler index.gts resolution from gts file with <template>', async () => {
+  test('support moduleResolution=bundler importing from gts file with <template>', async () => {
     const code = stripIndent`
       import Colocated from './colocated';
 
@@ -26,7 +26,7 @@ describe('Language Server: Imports', () => {
     expect(diagnostics).toMatchInlineSnapshot(`[]`);
   });
 
-  test('support moduleResolution=bundler index.gts resolution from gts file with no <template>', async () => {
+  test('support moduleResolution=bundler importing from gts file with no <template>', async () => {
     const code = stripIndent`
       import Colocated from './colocated';
 
@@ -41,4 +41,20 @@ describe('Language Server: Imports', () => {
 
     expect(diagnostics).toMatchInlineSnapshot(`[]`);
   });
+
+  test('support moduleResolution=bundler importing from vanilla TS file', async () => {
+    const code = stripIndent`
+      import Colocated from './colocated';
+
+      export default Colocated;
+    `;
+
+    const diagnostics = await requestDiagnostics(
+      'ts-template-imports-app/src/ephemeral-vanilla-typescript.ts',
+      'glimmer-ts',
+      code,
+    );
+
+    expect(diagnostics).toMatchInlineSnapshot(`[]`);
+  });
 });
diff --git a/test-packages/package-test-core/__tests__/support/character-position-viewer.html b/test-packages/package-test-core/__tests__/support/character-position-viewer.html
index b7e2c9e70..e975dd10e 100644
--- a/test-packages/package-test-core/__tests__/support/character-position-viewer.html
+++ b/test-packages/package-test-core/__tests__/support/character-position-viewer.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-  <!--
+  <head>
+    <!--
     This is a tool that makes it easier to see the line number, column number, and offset (from start of file)
     in a blob of text. This is useful for debugging tests and double checking logic that involves precise
     character positions (common in Language Tooling).
@@ -14,70 +14,75 @@
     will update, showing the current cursor position and the selected text's position as well
     as highlighting the text in the output grid.
   -->
-  <meta charset="UTF-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <title>Document</title>
-</head>
-<body>
-  <textarea id="input" style="width: 140ch; height: 400px;"></textarea>
-  <div>
-    <button id="de-indent">de-indent</button>
-  </div>
-  <div id="info"></div>
-  <div id="output"></div>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Document</title>
+  </head>
+  <body>
+    <textarea id="input" style="width: 140ch; height: 400px"></textarea>
+    <div>
+      <button id="de-indent">de-indent</button>
+    </div>
+    <div id="info"></div>
+    <div id="output"></div>
 
-  <script>
-    const input = document.getElementById('input');
-    const output = document.getElementById('output');
-    const info = document.getElementById('info');
+    <script>
+      const input = document.getElementById('input');
+      const output = document.getElementById('output');
+      const info = document.getElementById('info');
 
-    function getPositionInfo(text, offset) {
-      const lines = text.split('\n');
-      let currentOffset = 0;
-      for (let lineNum = 0; lineNum < lines.length; lineNum++) {
-        const line = lines[lineNum];
-        if (offset >= currentOffset && offset <= currentOffset + line.length) {
-          const charNum = offset - currentOffset;
-          return { lineNum, charNum, offset };
+      function getPositionInfo(text, offset) {
+        const lines = text.split('\n');
+        let currentOffset = 0;
+        for (let lineNum = 0; lineNum < lines.length; lineNum++) {
+          const line = lines[lineNum];
+          if (offset >= currentOffset && offset <= currentOffset + line.length) {
+            const charNum = offset - currentOffset;
+            return { lineNum, charNum, offset };
+          }
+          currentOffset += line.length + 1; // +1 for newline
         }
-        currentOffset += line.length + 1; // +1 for newline
+        return null;
       }
-      return null;
-    }
 
-    function updateInfo() {
-      const text = input.value;
-      const selectionStart = input.selectionStart;
-      const selectionEnd = input.selectionEnd;
-      const startPos = getPositionInfo(text, selectionStart);
-      
-      let infoText = `Cursor - Line: ${startPos.lineNum}, Character: ${startPos.charNum}, Offset: ${startPos.offset}`;
-      
-      if (selectionStart !== selectionEnd) {
-        const endPos = getPositionInfo(text, selectionEnd);
-        infoText += `<br>Selection - From (${startPos.lineNum}:${startPos.charNum}, offset ${startPos.offset}) to (${endPos.lineNum}:${endPos.charNum}, offset ${endPos.offset})`;
-        infoText += `<br>Selected length: ${selectionEnd - selectionStart}`;
+      function updateInfo() {
+        const text = input.value;
+        const selectionStart = input.selectionStart;
+        const selectionEnd = input.selectionEnd;
+        const startPos = getPositionInfo(text, selectionStart);
+
+        let infoText = `Cursor - Line: ${startPos.lineNum}, Character: ${startPos.charNum}, Offset: ${startPos.offset}`;
+
+        if (selectionStart !== selectionEnd) {
+          const endPos = getPositionInfo(text, selectionEnd);
+          infoText += `<br>Selection - From (${startPos.lineNum}:${startPos.charNum}, offset ${startPos.offset}) to (${endPos.lineNum}:${endPos.charNum}, offset ${endPos.offset})`;
+          infoText += `<br>Selected length: ${selectionEnd - selectionStart}`;
+        }
+
+        info.innerHTML = infoText;
+        updateDisplay();
       }
-      
-      info.innerHTML = infoText;
-      updateDisplay();
-    }
 
-    function updateDisplay() {
-      let offset = 0;
-      const lines = input.value.split('\n');
-      lines[lines.length - 1] = lines[lines.length - 1] + '\u0000';
-      
-      output.innerHTML = lines.map((line, lineNum) => {
-        const result = (lineNum === lines.length - 1 ? line : line + '\n').split('').map((char, charNum) => {
-          const currentOffset = offset + charNum;
-          const displayChar = char === ' ' ? '␣' : 
-                            char === '\n' ? '↵' :
-                            char === '\u0000' ? '␀' :
-                            char;
-          const isAtCursor = currentOffset === input.selectionStart;
-          const isSelected = currentOffset >= input.selectionStart && currentOffset < input.selectionEnd;
-          const result = `<div style="display: inline-block; font-family: monospace; border: 1px solid #ccc; margin: 1px; padding: 2px; ${isAtCursor ? 'background-color: #b0b0ff;' : ''} ${isSelected ? 'background-color: #b0b0ff;' : ''}">
+      function updateDisplay() {
+        let offset = 0;
+        const lines = input.value.split('\n');
+        lines[lines.length - 1] = lines[lines.length - 1] + '\u0000';
+
+        output.innerHTML = lines
+          .map((line, lineNum) => {
+            const result =
+              (lineNum === lines.length - 1 ? line : line + '\n')
+                .split('')
+                .map((char, charNum) => {
+                  const currentOffset = offset + charNum;
+                  const displayChar =
+                    char === ' ' ? '␣' : char === '\n' ? '↵' : char === '\u0000' ? '␀' : char;
+                  const isAtCursor = currentOffset === input.selectionStart;
+                  const isSelected =
+                    currentOffset >= input.selectionStart && currentOffset < input.selectionEnd;
+                  const result = `<div style="display: inline-block; font-family: monospace; border: 1px solid #ccc; margin: 1px; padding: 2px; ${
+                    isAtCursor ? 'background-color: #b0b0ff;' : ''
+                  } ${isSelected ? 'background-color: #b0b0ff;' : ''}">
             <div style="font-size: 16px;">${displayChar}</div>
             <div style="font-size: 10px; color: #666;">
               ${lineNum}<br>
@@ -85,51 +90,53 @@
               ${currentOffset}
             </div>
           </div>`;
-          return result;
-        }).join('') + '<br>';
-        offset += line.length + 1; // +1 for newline
-        return result;
-      }).join('');
-    }
+                  return result;
+                })
+                .join('') + '<br>';
+            offset += line.length + 1; // +1 for newline
+            return result;
+          })
+          .join('');
+      }
 
-    input.addEventListener('input', updateInfo);
-    input.addEventListener('click', updateInfo);
-    input.addEventListener('keyup', updateInfo);
-    input.addEventListener('select', updateInfo);
+      input.addEventListener('input', updateInfo);
+      input.addEventListener('click', updateInfo);
+      input.addEventListener('keyup', updateInfo);
+      input.addEventListener('select', updateInfo);
 
-    document.getElementById('de-indent').addEventListener('click', () => {
-      const lines = input.value.split('\n');
-      if (lines.length === 0) return;
+      document.getElementById('de-indent').addEventListener('click', () => {
+        const lines = input.value.split('\n');
+        if (lines.length === 0) return;
 
-      // Find number of leading spaces in first line
-      const firstLine = lines[0];
-      let leadingSpaces = 0;
-      for (let i = 0; i < firstLine.length; i++) {
-        if (firstLine[i] === ' ') {
-          leadingSpaces++;
-        } else {
-          break;
+        // Find number of leading spaces in first line
+        const firstLine = lines[0];
+        let leadingSpaces = 0;
+        for (let i = 0; i < firstLine.length; i++) {
+          if (firstLine[i] === ' ') {
+            leadingSpaces++;
+          } else {
+            break;
+          }
         }
-      }
 
-      if (leadingSpaces === 0) return;
+        if (leadingSpaces === 0) return;
 
-      // De-indent all lines by that amount, but don't remove non-spaces
-      const deindented = lines.map(line => {
-        let spacesToRemove = leadingSpaces;
-        let i = 0;
-        // Only remove up to leadingSpaces number of spaces from start
-        while (spacesToRemove > 0 && i < line.length && line[i] === ' ') {
-          i++;
-          spacesToRemove--;
-        }
-        return line.slice(i);
-      });
+        // De-indent all lines by that amount, but don't remove non-spaces
+        const deindented = lines.map((line) => {
+          let spacesToRemove = leadingSpaces;
+          let i = 0;
+          // Only remove up to leadingSpaces number of spaces from start
+          while (spacesToRemove > 0 && i < line.length && line[i] === ' ') {
+            i++;
+            spacesToRemove--;
+          }
+          return line.slice(i);
+        });
 
-      input.value = deindented.join('\n');
-      // Trigger input event to update display
-      input.dispatchEvent(new Event('input'));
-    });
-  </script>
-</body>
+        input.value = deindented.join('\n');
+        // Trigger input event to update display
+        input.dispatchEvent(new Event('input'));
+      });
+    </script>
+  </body>
 </html>
diff --git a/test-packages/package-test-core/__tests__/transform/rewrite.test.ts b/test-packages/package-test-core/__tests__/transform/rewrite.test.ts
index ddf9086b2..e66b2c785 100644
--- a/test-packages/package-test-core/__tests__/transform/rewrite.test.ts
+++ b/test-packages/package-test-core/__tests__/transform/rewrite.test.ts
@@ -23,14 +23,7 @@ describe('Transform: rewriteModule', () => {
 
       expect(transformedModule?.errors).toEqual([]);
       expect(transformedModule?.transformedContents).toMatchInlineSnapshot(`
-        "
-        // @ts-expect-error
-        ({} as typeof import('./__glint-hacky-nonexistent.gts'));
-
-        // @ts-expect-error
-        ({} as typeof import('./__glint-hacky-nonexistent.gjs'));
-
-        import Component from '@glimmer/component';
+        "import Component from '@glimmer/component';
         export default class MyComponent extends Component {
           static { ({} as typeof import("@glint/environment-ember-template-imports/-private/dsl")).templateForBackingValue(this, function(__glintRef__, __glintDSL__: typeof import("@glint/environment-ember-template-imports/-private/dsl")) {
         __glintRef__; __glintDSL__;
@@ -49,14 +42,7 @@ describe('Transform: rewriteModule', () => {
 
       expect(transformedModule?.errors).toEqual([]);
       expect(transformedModule?.transformedContents).toMatchInlineSnapshot(`
-        "
-        // @ts-expect-error
-        ({} as typeof import('./__glint-hacky-nonexistent.gts'));
-
-        // @ts-expect-error
-        ({} as typeof import('./__glint-hacky-nonexistent.gjs'));
-
-        export default ({} as typeof import("@glint/environment-ember-template-imports/-private/dsl")).templateExpression(function(__glintRef__, __glintDSL__: typeof import("@glint/environment-ember-template-imports/-private/dsl")) {
+        "export default ({} as typeof import("@glint/environment-ember-template-imports/-private/dsl")).templateExpression(function(__glintRef__, __glintDSL__: typeof import("@glint/environment-ember-template-imports/-private/dsl")) {
         __glintDSL__.emitContent(__glintDSL__.resolveOrReturn(dollarAmount)());
         __glintRef__; __glintDSL__;
         });"
@@ -73,14 +59,7 @@ describe('Transform: rewriteModule', () => {
 
       expect(transformedModule?.errors).toEqual([]);
       expect(transformedModule?.transformedContents).toMatchInlineSnapshot(`
-        "
-        // @ts-expect-error
-        ({} as typeof import('./__glint-hacky-nonexistent.gts'));
-
-        // @ts-expect-error
-        ({} as typeof import('./__glint-hacky-nonexistent.gjs'));
-
-        export default ({} as typeof import("@glint/environment-ember-template-imports/-private/dsl")).templateExpression(function(__glintRef__, __glintDSL__: typeof import("@glint/environment-ember-template-imports/-private/dsl")) {
+        "export default ({} as typeof import("@glint/environment-ember-template-imports/-private/dsl")).templateExpression(function(__glintRef__, __glintDSL__: typeof import("@glint/environment-ember-template-imports/-private/dsl")) {
         __glintRef__; __glintDSL__;
         });"
       `);
@@ -101,14 +80,7 @@ describe('Transform: rewriteModule', () => {
 
       expect(transformedModule?.errors).toEqual([]);
       expect(transformedModule?.transformedContents).toMatchInlineSnapshot(`
-        "
-        // @ts-expect-error
-        ({} as typeof import('./__glint-hacky-nonexistent.gts'));
-
-        // @ts-expect-error
-        ({} as typeof import('./__glint-hacky-nonexistent.gjs'));
-
-        import Component from '@glimmer/component';
+        "import Component from '@glimmer/component';
         export default class MyComponent<K extends string> extends Component<{ value: K }> {
           static { ({} as typeof import("@glint/environment-ember-template-imports/-private/dsl")).templateForBackingValue(this, function(__glintRef__, __glintDSL__: typeof import("@glint/environment-ember-template-imports/-private/dsl")) {
         __glintRef__; __glintDSL__;
@@ -131,14 +103,7 @@ describe('Transform: rewriteModule', () => {
       let transformedModule = rewriteModule(ts, { script }, emberTemplateImportsEnvironment);
 
       expect(transformedModule?.transformedContents).toMatchInlineSnapshot(`
-        "
-        // @ts-expect-error
-        ({} as typeof import('./__glint-hacky-nonexistent.gts'));
-
-        // @ts-expect-error
-        ({} as typeof import('./__glint-hacky-nonexistent.gjs'));
-
-        import Component from '@glimmer/component';
+        "import Component from '@glimmer/component';
         export default class extends Component {
           static { ({} as typeof import("@glint/environment-ember-template-imports/-private/dsl")).templateForBackingValue(this, function(__glintRef__, __glintDSL__: typeof import("@glint/environment-ember-template-imports/-private/dsl")) {
         __glintRef__; __glintDSL__;
@@ -164,14 +129,7 @@ describe('Transform: rewriteModule', () => {
 
       expect(transformedModule?.errors.length).toBe(1);
       expect(transformedModule?.transformedContents).toMatchInlineSnapshot(`
-        "
-        // @ts-expect-error
-        ({} as typeof import('./__glint-hacky-nonexistent.gts'));
-
-        // @ts-expect-error
-        ({} as typeof import('./__glint-hacky-nonexistent.gjs'));
-
-        import Component from '@glimmer/component';
+        "import Component from '@glimmer/component';
         export default class MyComponent extends Component {
           static { ({} as typeof import("@glint/environment-ember-template-imports/-private/dsl")).templateForBackingValue(this, function(__glintRef__, __glintDSL__: typeof import("@glint/environment-ember-template-imports/-private/dsl")) {
         __glintRef__; __glintDSL__;
@@ -203,14 +161,7 @@ describe('Transform: rewriteModule', () => {
 
       expect(transformedModule?.errors).toEqual([]);
       expect(transformedModule?.transformedContents).toMatchInlineSnapshot(`
-        "
-        // @ts-expect-error
-        ({} as typeof import('./__glint-hacky-nonexistent.gts'));
-
-        // @ts-expect-error
-        ({} as typeof import('./__glint-hacky-nonexistent.gjs'));
-
-        import Component from '@glimmer/component';
+        "import Component from '@glimmer/component';
         export default class MyComponent extends Component {
         static {
         ({} as typeof import("@glint/environment-ember-loose/-private/dsl")).templateForBackingValue(this, function(__glintRef__, __glintDSL__: typeof import("@glint/environment-ember-loose/-private/dsl")) {
@@ -240,14 +191,7 @@ describe('Transform: rewriteModule', () => {
 
       expect(transformedModule?.errors).toEqual([]);
       expect(transformedModule?.transformedContents).toMatchInlineSnapshot(`
-        "
-        // @ts-expect-error
-        ({} as typeof import('./__glint-hacky-nonexistent.gts'));
-
-        // @ts-expect-error
-        ({} as typeof import('./__glint-hacky-nonexistent.gjs'));
-
-        import Component from '@glimmer/component';
+        "import Component from '@glimmer/component';
         class MyComponent extends Component {
         static {
         ({} as typeof import("@glint/environment-ember-loose/-private/dsl")).templateForBackingValue(this, function(__glintRef__, __glintDSL__: typeof import("@glint/environment-ember-loose/-private/dsl")) {
@@ -277,14 +221,7 @@ describe('Transform: rewriteModule', () => {
 
       expect(transformedModule?.errors).toEqual([]);
       expect(transformedModule?.transformedContents).toMatchInlineSnapshot(`
-        "
-        // @ts-expect-error
-        ({} as typeof import('./__glint-hacky-nonexistent.gts'));
-
-        // @ts-expect-error
-        ({} as typeof import('./__glint-hacky-nonexistent.gjs'));
-
-        import Component from '@glimmer/component';
+        "import Component from '@glimmer/component';
         export default class MyComponent<K extends string> extends Component<{ value: K }> {
         static {
         ({} as typeof import("@glint/environment-ember-loose/-private/dsl")).templateForBackingValue(this, function(__glintRef__, __glintDSL__: typeof import("@glint/environment-ember-loose/-private/dsl")) {
@@ -312,14 +249,7 @@ describe('Transform: rewriteModule', () => {
       let transformedModule = rewriteModule(ts, { script, template }, emberLooseEnvironment);
 
       expect(transformedModule?.transformedContents).toMatchInlineSnapshot(`
-        "
-        // @ts-expect-error
-        ({} as typeof import('./__glint-hacky-nonexistent.gts'));
-
-        // @ts-expect-error
-        ({} as typeof import('./__glint-hacky-nonexistent.gjs'));
-
-        import Component from '@glimmer/component';
+        "import Component from '@glimmer/component';
         export default class extends Component {
         static {
         ({} as typeof import("@glint/environment-ember-loose/-private/dsl")).templateForBackingValue(this, function(__glintRef__, __glintDSL__: typeof import("@glint/environment-ember-loose/-private/dsl")) {
@@ -347,14 +277,7 @@ describe('Transform: rewriteModule', () => {
 
       expect(transformedModule?.errors).toEqual([]);
       expect(transformedModule?.transformedContents).toMatchInlineSnapshot(`
-        "
-        // @ts-expect-error
-        ({} as typeof import('./__glint-hacky-nonexistent.gts'));
-
-        // @ts-expect-error
-        ({} as typeof import('./__glint-hacky-nonexistent.gjs'));
-
-        import Component from '@glimmer/component';
+        "import Component from '@glimmer/component';
         export class MyComponent extends Component {}
         ({} as typeof import("@glint/environment-ember-loose/-private/dsl")).templateExpression(function(__glintRef__, __glintDSL__: typeof import("@glint/environment-ember-loose/-private/dsl")) {
         __glintDSL__.emitContent(__glintDSL__.resolveOrReturn(__glintDSL__.Globals["hello"])());
@@ -383,14 +306,7 @@ describe('Transform: rewriteModule', () => {
 
       expect(transformedModule?.errors).toEqual([]);
       expect(transformedModule?.transformedContents).toMatchInlineSnapshot(`
-        "
-        // @ts-expect-error
-        ({} as typeof import('./__glint-hacky-nonexistent.gts'));
-
-        // @ts-expect-error
-        ({} as typeof import('./__glint-hacky-nonexistent.gjs'));
-
-        import templateOnly from '@glimmer/component/template-only';
+        "import templateOnly from '@glimmer/component/template-only';
 
         export default templateOnly();
         ({} as typeof import("@glint/environment-ember-loose/-private/dsl")).templateForBackingValue(({} as unknown as typeof import('./test').default), function(__glintRef__, __glintDSL__: typeof import("@glint/environment-ember-loose/-private/dsl")) {
@@ -419,14 +335,7 @@ describe('Transform: rewriteModule', () => {
 
       expect(transformedModule?.errors).toEqual([]);
       expect(transformedModule?.transformedContents).toMatchInlineSnapshot(`
-        "
-        // @ts-expect-error
-        (/** @type {typeof import("./__glint-hacky-nonexistent.gts")} */ ({}))
-
-        // @ts-expect-error
-        (/** @type {typeof import("./__glint-hacky-nonexistent.gjs")} */ ({}))
-
-        import templateOnly from '@glimmer/component/template-only';
+        "import templateOnly from '@glimmer/component/template-only';
 
         export default templateOnly();
         (/** @type {typeof import("@glint/environment-ember-loose/-private/dsl")} */ ({})).templateForBackingValue((/** @type {typeof import('./test').default} */ ({})), function(__glintRef__, /** @type {typeof import("@glint/environment-ember-loose/-private/dsl")} */ __glintDSL__) {
@@ -453,14 +362,7 @@ describe('Transform: rewriteModule', () => {
 
       expect(transformedModule?.errors).toEqual([]);
       expect(transformedModule?.transformedContents).toMatchInlineSnapshot(`
-        "
-        // @ts-expect-error
-        ({} as typeof import('./__glint-hacky-nonexistent.gts'));
-
-        // @ts-expect-error
-        ({} as typeof import('./__glint-hacky-nonexistent.gjs'));
-
-        export default Foo;
+        "export default Foo;
         ({} as typeof import("@glint/environment-ember-loose/-private/dsl")).templateForBackingValue(({} as unknown as typeof import('./test').default), function(__glintRef__, __glintDSL__: typeof import("@glint/environment-ember-loose/-private/dsl")) {
         __glintDSL__.emitContent(__glintDSL__.resolveOrReturn(__glintDSL__.Globals["hello"])());
         __glintRef__; __glintDSL__;
@@ -493,14 +395,7 @@ describe('Transform: rewriteModule', () => {
 
       expect(transformedModule?.errors).toEqual([]);
       expect(transformedModule?.transformedContents).toMatchInlineSnapshot(`
-        "
-        // @ts-expect-error
-        ({} as typeof import('./__glint-hacky-nonexistent.gts'));
-
-        // @ts-expect-error
-        ({} as typeof import('./__glint-hacky-nonexistent.gjs'));
-
-        import Component from '@glimmer/component';
+        "import Component from '@glimmer/component';
         export default class MyComponent extends Component {
         static {
         ({} as typeof import("@glint/environment-ember-loose/-private/dsl")).templateForBackingValue(this, function(__glintRef__, __glintDSL__: typeof import("@glint/environment-ember-loose/-private/dsl")) {
@@ -536,14 +431,7 @@ describe('Transform: rewriteModule', () => {
 
       expect(transformedModule?.errors.length).toBe(1);
       expect(transformedModule?.transformedContents).toMatchInlineSnapshot(`
-        "
-        // @ts-expect-error
-        ({} as typeof import('./__glint-hacky-nonexistent.gts'));
-
-        // @ts-expect-error
-        ({} as typeof import('./__glint-hacky-nonexistent.gjs'));
-
-        import Component from '@glimmer/component';
+        "import Component from '@glimmer/component';
         export default class MyComponent extends Component {
         static {
         ({} as typeof import("@glint/environment-ember-loose/-private/dsl")).templateForBackingValue(this, function(__glintRef__, __glintDSL__: typeof import("@glint/environment-ember-loose/-private/dsl")) {
@@ -570,14 +458,7 @@ describe('Transform: rewriteModule', () => {
       let transformedModule = rewriteModule(ts, { script }, customEnv);
 
       expect(transformedModule?.transformedContents).toMatchInlineSnapshot(`
-        "
-        // @ts-expect-error
-        ({} as typeof import('./__glint-hacky-nonexistent.gts'));
-
-        // @ts-expect-error
-        ({} as typeof import('./__glint-hacky-nonexistent.gjs'));
-
-        import Component, { hbs } from 'special/component';
+        "import Component, { hbs } from 'special/component';
         export default class MyComponent extends Component(({} as typeof import("@glint/environment-ember-template-imports/-private/dsl")).templateExpression(function(__glintRef__, __glintDSL__: typeof import("@glint/environment-ember-template-imports/-private/dsl")) {
         __glintRef__; __glintDSL__;
         })) {
@@ -619,42 +500,42 @@ describe('Transform: rewriteModule', () => {
 
         | Mapping: TemplateEmbedding
         |  hbs(22:74):   <template>\\n    Hello, {{this.target}}!\\n  </template>
-        |  ts(181:528):  static { ({} as typeof import("@glint/environment-ember-template-imports/-private/dsl")).templateForBackingValue(this, function(__glintRef__, __glintDSL__: typeof import("@glint/environment-ember-template-imports/-private/dsl")) {\\n__glintDSL__.emitContent(__glintDSL__.resolveOrReturn(__glintRef__.this.target)());\\n__glintRef__; __glintDSL__;\\n}) }
+        |  ts(22:369):   static { ({} as typeof import("@glint/environment-ember-template-imports/-private/dsl")).templateForBackingValue(this, function(__glintRef__, __glintDSL__: typeof import("@glint/environment-ember-template-imports/-private/dsl")) {\\n__glintDSL__.emitContent(__glintDSL__.resolveOrReturn(__glintRef__.this.target)());\\n__glintRef__; __glintDSL__;\\n}) }
         |
         | | Mapping: Template
         | |  hbs(32:63):   Hello, {{this.target}}!
-        | |  ts(412:496):  __glintDSL__.emitContent(__glintDSL__.resolveOrReturn(__glintRef__.this.target)());
+        | |  ts(253:337):  __glintDSL__.emitContent(__glintDSL__.resolveOrReturn(__glintRef__.this.target)());
         | |
         | | | Mapping: TextContent
         | | |  hbs(37:43):   Hello,
-        | | |  ts(412:412):
+        | | |  ts(253:253):
         | | |
         | | | Mapping: MustacheStatement
         | | |  hbs(44:59):   {{this.target}}
-        | | |  ts(412:494):  __glintDSL__.emitContent(__glintDSL__.resolveOrReturn(__glintRef__.this.target)())
+        | | |  ts(253:335):  __glintDSL__.emitContent(__glintDSL__.resolveOrReturn(__glintRef__.this.target)())
         | | |
         | | | | Mapping: MustacheStatement
         | | | |  hbs(44:59):   {{this.target}}
-        | | | |  ts(437:493):  __glintDSL__.resolveOrReturn(__glintRef__.this.target)()
+        | | | |  ts(278:334):  __glintDSL__.resolveOrReturn(__glintRef__.this.target)()
         | | | |
         | | | | | Mapping: PathExpression
         | | | | |  hbs(46:57):   this.target
-        | | | | |  ts(466:490):  __glintRef__.this.target
+        | | | | |  ts(307:331):  __glintRef__.this.target
         | | | | |
         | | | | | | Mapping: Identifier
         | | | | | |  hbs(46:50):   this
-        | | | | | |  ts(479:483):  this
+        | | | | | |  ts(320:324):  this
         | | | | | |
         | | | | | | Mapping: Identifier
         | | | | | |  hbs(51:57):   target
-        | | | | | |  ts(484:490):  target
+        | | | | | |  ts(325:331):  target
         | | | | | |
         | | | | |
         | | | |
         | | |
         | | | Mapping: TextContent
         | | |  hbs(59:60):   !
-        | | |  ts(496:496):
+        | | |  ts(337:337):
         | | |
         | |
         |"
@@ -677,38 +558,38 @@ describe('Transform: rewriteModule', () => {
 
         | Mapping: TemplateEmbedding
         |  hbs(0:44):    <template>\\n  Hello, {{@target}}!\\n</template>
-        |  ts(159:499):  export default ({} as typeof import("@glint/environment-ember-template-imports/-private/dsl")).templateExpression(function(__glintRef__, __glintDSL__: typeof import("@glint/environment-ember-template-imports/-private/dsl")) {\\n__glintDSL__.emitContent(__glintDSL__.resolveOrReturn(__glintRef__.args.target)());\\n__glintRef__; __glintDSL__;\\n})
+        |  ts(0:340):    export default ({} as typeof import("@glint/environment-ember-template-imports/-private/dsl")).templateExpression(function(__glintRef__, __glintDSL__: typeof import("@glint/environment-ember-template-imports/-private/dsl")) {\\n__glintDSL__.emitContent(__glintDSL__.resolveOrReturn(__glintRef__.args.target)());\\n__glintRef__; __glintDSL__;\\n})
         |
         | | Mapping: Template
         | |  hbs(10:33):   Hello, {{@target}}!
-        | |  ts(385:469):  __glintDSL__.emitContent(__glintDSL__.resolveOrReturn(__glintRef__.args.target)());
+        | |  ts(226:310):  __glintDSL__.emitContent(__glintDSL__.resolveOrReturn(__glintRef__.args.target)());
         | |
         | | | Mapping: TextContent
         | | |  hbs(13:19):   Hello,
-        | | |  ts(385:385):
+        | | |  ts(226:226):
         | | |
         | | | Mapping: MustacheStatement
         | | |  hbs(20:31):   {{@target}}
-        | | |  ts(385:467):  __glintDSL__.emitContent(__glintDSL__.resolveOrReturn(__glintRef__.args.target)())
+        | | |  ts(226:308):  __glintDSL__.emitContent(__glintDSL__.resolveOrReturn(__glintRef__.args.target)())
         | | |
         | | | | Mapping: MustacheStatement
         | | | |  hbs(20:31):   {{@target}}
-        | | | |  ts(410:466):  __glintDSL__.resolveOrReturn(__glintRef__.args.target)()
+        | | | |  ts(251:307):  __glintDSL__.resolveOrReturn(__glintRef__.args.target)()
         | | | |
         | | | | | Mapping: PathExpression
         | | | | |  hbs(22:29):   @target
-        | | | | |  ts(439:463):  __glintRef__.args.target
+        | | | | |  ts(280:304):  __glintRef__.args.target
         | | | | |
         | | | | | | Mapping: Identifier
         | | | | | |  hbs(23:29):   target
-        | | | | | |  ts(457:463):  target
+        | | | | | |  ts(298:304):  target
         | | | | | |
         | | | | |
         | | | |
         | | |
         | | | Mapping: TextContent
         | | |  hbs(31:32):   !
-        | | |  ts(469:469):
+        | | |  ts(310:310):
         | | |
         | |
         |"
@@ -746,27 +627,27 @@ describe('Transform: rewriteModule', () => {
 
         | Mapping: TemplateEmbedding
         |  hbs(56:89):   <template>{{@message}}</template>
-        |  ts(215:541):  ({} as typeof import("@glint/environment-ember-template-imports/-private/dsl")).templateExpression(function(__glintRef__, __glintDSL__: typeof import("@glint/environment-ember-template-imports/-private/dsl")) {\\n__glintDSL__.emitContent(__glintDSL__.resolveOrReturn(__glintRef__.args.message)());\\n__glintRef__; __glintDSL__;\\n})
+        |  ts(56:382):   ({} as typeof import("@glint/environment-ember-template-imports/-private/dsl")).templateExpression(function(__glintRef__, __glintDSL__: typeof import("@glint/environment-ember-template-imports/-private/dsl")) {\\n__glintDSL__.emitContent(__glintDSL__.resolveOrReturn(__glintRef__.args.message)());\\n__glintRef__; __glintDSL__;\\n})
         |
         | | Mapping: Template
         | |  hbs(66:78):   {{@message}}
-        | |  ts(426:511):  __glintDSL__.emitContent(__glintDSL__.resolveOrReturn(__glintRef__.args.message)());
+        | |  ts(267:352):  __glintDSL__.emitContent(__glintDSL__.resolveOrReturn(__glintRef__.args.message)());
         | |
         | | | Mapping: MustacheStatement
         | | |  hbs(66:78):   {{@message}}
-        | | |  ts(426:509):  __glintDSL__.emitContent(__glintDSL__.resolveOrReturn(__glintRef__.args.message)())
+        | | |  ts(267:350):  __glintDSL__.emitContent(__glintDSL__.resolveOrReturn(__glintRef__.args.message)())
         | | |
         | | | | Mapping: MustacheStatement
         | | | |  hbs(66:78):   {{@message}}
-        | | | |  ts(451:508):  __glintDSL__.resolveOrReturn(__glintRef__.args.message)()
+        | | | |  ts(292:349):  __glintDSL__.resolveOrReturn(__glintRef__.args.message)()
         | | | |
         | | | | | Mapping: PathExpression
         | | | | |  hbs(68:76):   @message
-        | | | | |  ts(480:505):  __glintRef__.args.message
+        | | | | |  ts(321:346):  __glintRef__.args.message
         | | | | |
         | | | | | | Mapping: Identifier
         | | | | | |  hbs(69:76):   message
-        | | | | | |  ts(498:505):  message
+        | | | | | |  ts(339:346):  message
         | | | | | |
         | | | | |
         | | | |
@@ -776,31 +657,31 @@ describe('Transform: rewriteModule', () => {
 
         | Mapping: TemplateEmbedding
         |  hbs(139:174): <template>{{this.title}}</template>
-        |  ts(591:937):  static { ({} as typeof import("@glint/environment-ember-template-imports/-private/dsl")).templateForBackingValue(this, function(__glintRef__, __glintDSL__: typeof import("@glint/environment-ember-template-imports/-private/dsl")) {\\n__glintDSL__.emitContent(__glintDSL__.resolveOrReturn(__glintRef__.this.title)());\\n__glintRef__; __glintDSL__;\\n}) }
+        |  ts(432:778):  static { ({} as typeof import("@glint/environment-ember-template-imports/-private/dsl")).templateForBackingValue(this, function(__glintRef__, __glintDSL__: typeof import("@glint/environment-ember-template-imports/-private/dsl")) {\\n__glintDSL__.emitContent(__glintDSL__.resolveOrReturn(__glintRef__.this.title)());\\n__glintRef__; __glintDSL__;\\n}) }
         |
         | | Mapping: Template
         | |  hbs(149:163): {{this.title}}
-        | |  ts(822:905):  __glintDSL__.emitContent(__glintDSL__.resolveOrReturn(__glintRef__.this.title)());
+        | |  ts(663:746):  __glintDSL__.emitContent(__glintDSL__.resolveOrReturn(__glintRef__.this.title)());
         | |
         | | | Mapping: MustacheStatement
         | | |  hbs(149:163): {{this.title}}
-        | | |  ts(822:903):  __glintDSL__.emitContent(__glintDSL__.resolveOrReturn(__glintRef__.this.title)())
+        | | |  ts(663:744):  __glintDSL__.emitContent(__glintDSL__.resolveOrReturn(__glintRef__.this.title)())
         | | |
         | | | | Mapping: MustacheStatement
         | | | |  hbs(149:163): {{this.title}}
-        | | | |  ts(847:902):  __glintDSL__.resolveOrReturn(__glintRef__.this.title)()
+        | | | |  ts(688:743):  __glintDSL__.resolveOrReturn(__glintRef__.this.title)()
         | | | |
         | | | | | Mapping: PathExpression
         | | | | |  hbs(151:161): this.title
-        | | | | |  ts(876:899):  __glintRef__.this.title
+        | | | | |  ts(717:740):  __glintRef__.this.title
         | | | | |
         | | | | | | Mapping: Identifier
         | | | | | |  hbs(151:155): this
-        | | | | | |  ts(889:893):  this
+        | | | | | |  ts(730:734):  this
         | | | | | |
         | | | | | | Mapping: Identifier
         | | | | | |  hbs(156:161): title
-        | | | | | |  ts(894:899):  title
+        | | | | | |  ts(735:740):  title
         | | | | | |
         | | | | |
         | | | |
@@ -832,143 +713,143 @@ describe('Transform: rewriteModule', () => {
 
         | Mapping: TemplateEmbedding
         |  hbs(58:210):  <template>\\n  {{! Intentionally shadowing }}\\n  {{#let (arr 1 2) (h red="blue") as |arr h|}}\\n    Array is {{arr}}\\n    Hash is {{h}}\\n  {{/let}}\\n</template>
-        |  ts(217:862):  export default ({} as typeof import("@glint/environment-ember-template-imports/-private/dsl")).templateExpression(function(__glintRef__, __glintDSL__: typeof import("@glint/environment-ember-template-imports/-private/dsl")) {\\n{\\nconst __glintY__ = __glintDSL__.emitComponent(__glintDSL__.resolve(__glintDSL__.Globals["let"])((__glintDSL__.noop(arr), [1, 2]), (__glintDSL__.noop(h), ({\\nred: "blue",\\n}))));\\n{\\nconst [arr, h] = __glintY__.blockParams["default"];\\n__glintDSL__.emitContent(__glintDSL__.resolveOrReturn(arr)());\\n__glintDSL__.emitContent(__glintDSL__.resolveOrReturn(h)());\\n}\\n__glintDSL__.Globals["let"];\\n}\\n__glintRef__; __glintDSL__;\\n})
+        |  ts(58:703):   export default ({} as typeof import("@glint/environment-ember-template-imports/-private/dsl")).templateExpression(function(__glintRef__, __glintDSL__: typeof import("@glint/environment-ember-template-imports/-private/dsl")) {\\n{\\nconst __glintY__ = __glintDSL__.emitComponent(__glintDSL__.resolve(__glintDSL__.Globals["let"])((__glintDSL__.noop(arr), [1, 2]), (__glintDSL__.noop(h), ({\\nred: "blue",\\n}))));\\n{\\nconst [arr, h] = __glintY__.blockParams["default"];\\n__glintDSL__.emitContent(__glintDSL__.resolveOrReturn(arr)());\\n__glintDSL__.emitContent(__glintDSL__.resolveOrReturn(h)());\\n}\\n__glintDSL__.Globals["let"];\\n}\\n__glintRef__; __glintDSL__;\\n})
         |
         | | Mapping: Template
         | |  hbs(68:199):  {{! Intentionally shadowing }}\\n  {{#let (arr 1 2) (h red="blue") as |arr h|}}\\n    Array is {{arr}}\\n    Hash is {{h}}\\n  {{/let}}
-        | |  ts(443:832):  {\\nconst __glintY__ = __glintDSL__.emitComponent(__glintDSL__.resolve(__glintDSL__.Globals["let"])((__glintDSL__.noop(arr), [1, 2]), (__glintDSL__.noop(h), ({\\nred: "blue",\\n}))));\\n{\\nconst [arr, h] = __glintY__.blockParams["default"];\\n__glintDSL__.emitContent(__glintDSL__.resolveOrReturn(arr)());\\n__glintDSL__.emitContent(__glintDSL__.resolveOrReturn(h)());\\n}\\n__glintDSL__.Globals["let"];\\n}
+        | |  ts(284:673):  {\\nconst __glintY__ = __glintDSL__.emitComponent(__glintDSL__.resolve(__glintDSL__.Globals["let"])((__glintDSL__.noop(arr), [1, 2]), (__glintDSL__.noop(h), ({\\nred: "blue",\\n}))));\\n{\\nconst [arr, h] = __glintY__.blockParams["default"];\\n__glintDSL__.emitContent(__glintDSL__.resolveOrReturn(arr)());\\n__glintDSL__.emitContent(__glintDSL__.resolveOrReturn(h)());\\n}\\n__glintDSL__.Globals["let"];\\n}
         | |
         | | | Mapping: TextContent
         | | |  hbs(68:69):
-        | | |  ts(443:443):
+        | | |  ts(284:284):
         | | |
         | | | Mapping: MustacheCommentStatement
         | | |  hbs(71:101):  {{! Intentionally shadowing }}
-        | | |  ts(443:443):
+        | | |  ts(284:284):
         | | |
         | | | Mapping: BlockStatement
         | | |  hbs(104:198): {{#let (arr 1 2) (h red="blue") as |arr h|}}\\n    Array is {{arr}}\\n    Hash is {{h}}\\n  {{/let}}
-        | | |  ts(443:831):  {\\nconst __glintY__ = __glintDSL__.emitComponent(__glintDSL__.resolve(__glintDSL__.Globals["let"])((__glintDSL__.noop(arr), [1, 2]), (__glintDSL__.noop(h), ({\\nred: "blue",\\n}))));\\n{\\nconst [arr, h] = __glintY__.blockParams["default"];\\n__glintDSL__.emitContent(__glintDSL__.resolveOrReturn(arr)());\\n__glintDSL__.emitContent(__glintDSL__.resolveOrReturn(h)());\\n}\\n__glintDSL__.Globals["let"];\\n}
+        | | |  ts(284:672):  {\\nconst __glintY__ = __glintDSL__.emitComponent(__glintDSL__.resolve(__glintDSL__.Globals["let"])((__glintDSL__.noop(arr), [1, 2]), (__glintDSL__.noop(h), ({\\nred: "blue",\\n}))));\\n{\\nconst [arr, h] = __glintY__.blockParams["default"];\\n__glintDSL__.emitContent(__glintDSL__.resolveOrReturn(arr)());\\n__glintDSL__.emitContent(__glintDSL__.resolveOrReturn(h)());\\n}\\n__glintDSL__.Globals["let"];\\n}
         | | |
         | | | | Mapping: BlockStatement
         | | | |  hbs(104:198): {{#let (arr 1 2) (h red="blue") as |arr h|}}\\n    Array is {{arr}}\\n    Hash is {{h}}\\n  {{/let}}
-        | | | |  ts(491:618):  __glintDSL__.resolve(__glintDSL__.Globals["let"])((__glintDSL__.noop(arr), [1, 2]), (__glintDSL__.noop(h), ({\\nred: "blue",\\n})))
+        | | | |  ts(332:459):  __glintDSL__.resolve(__glintDSL__.Globals["let"])((__glintDSL__.noop(arr), [1, 2]), (__glintDSL__.noop(h), ({\\nred: "blue",\\n})))
         | | | |
         | | | | | Mapping: PathExpression
         | | | | |  hbs(107:110): let
-        | | | | |  ts(512:539):  __glintDSL__.Globals["let"]
+        | | | | |  ts(353:380):  __glintDSL__.Globals["let"]
         | | | | |
         | | | | | | Mapping: Identifier
         | | | | | |  hbs(107:110): let
-        | | | | | |  ts(534:537):  let
+        | | | | | |  ts(375:378):  let
         | | | | | |
         | | | | |
         | | | | | Mapping: PathExpression
         | | | | |  hbs(112:115): arr
-        | | | | |  ts(560:563):  arr
+        | | | | |  ts(401:404):  arr
         | | | | |
         | | | | | | Mapping: Identifier
         | | | | | |  hbs(112:115): arr
-        | | | | | |  ts(560:563):  arr
+        | | | | | |  ts(401:404):  arr
         | | | | | |
         | | | | |
         | | | | | Mapping: SubExpression
         | | | | |  hbs(111:120): (arr 1 2)
-        | | | | |  ts(566:572):  [1, 2]
+        | | | | |  ts(407:413):  [1, 2]
         | | | | |
         | | | | | | Mapping: NumberLiteral
         | | | | | |  hbs(116:117): 1
-        | | | | | |  ts(567:568):  1
+        | | | | | |  ts(408:409):  1
         | | | | | |
         | | | | | | Mapping: NumberLiteral
         | | | | | |  hbs(118:119): 2
-        | | | | | |  ts(570:571):  2
+        | | | | | |  ts(411:412):  2
         | | | | | |
         | | | | |
         | | | | | Mapping: PathExpression
         | | | | |  hbs(122:123): h
-        | | | | |  ts(594:595):  h
+        | | | | |  ts(435:436):  h
         | | | | |
         | | | | | | Mapping: Identifier
         | | | | | |  hbs(122:123): h
-        | | | | | |  ts(594:595):  h
+        | | | | | |  ts(435:436):  h
         | | | | | |
         | | | | |
         | | | | | Mapping: SubExpression
         | | | | |  hbs(121:135): (h red="blue")
-        | | | | |  ts(598:616):  ({\\nred: "blue",\\n})
+        | | | | |  ts(439:457):  ({\\nred: "blue",\\n})
         | | | | |
         | | | | | | Mapping: Identifier
         | | | | | |  hbs(124:127): red
-        | | | | | |  ts(601:604):  red
+        | | | | | |  ts(442:445):  red
         | | | | | |
         | | | | | | Mapping: StringLiteral
         | | | | | |  hbs(128:134): "blue"
-        | | | | | |  ts(606:612):  "blue"
+        | | | | | |  ts(447:453):  "blue"
         | | | | | |
         | | | | |
         | | | |
         | | | | Mapping: Identifier
         | | | |  hbs(140:143): arr
-        | | | |  ts(630:633):  arr
+        | | | |  ts(471:474):  arr
         | | | |
         | | | | Mapping: Identifier
         | | | |  hbs(144:145): h
-        | | | |  ts(635:636):  h
+        | | | |  ts(476:477):  h
         | | | |
         | | | | Mapping: TextContent
         | | | |  hbs(153:161): Array is
-        | | | |  ts(675:675):
+        | | | |  ts(516:516):
         | | | |
         | | | | Mapping: MustacheStatement
         | | | |  hbs(162:169): {{arr}}
-        | | | |  ts(675:736):  __glintDSL__.emitContent(__glintDSL__.resolveOrReturn(arr)())
+        | | | |  ts(516:577):  __glintDSL__.emitContent(__glintDSL__.resolveOrReturn(arr)())
         | | | |
         | | | | | Mapping: MustacheStatement
         | | | | |  hbs(162:169): {{arr}}
-        | | | | |  ts(700:735):  __glintDSL__.resolveOrReturn(arr)()
+        | | | | |  ts(541:576):  __glintDSL__.resolveOrReturn(arr)()
         | | | | |
         | | | | | | Mapping: PathExpression
         | | | | | |  hbs(164:167): arr
-        | | | | | |  ts(729:732):  arr
+        | | | | | |  ts(570:573):  arr
         | | | | | |
         | | | | | | | Mapping: Identifier
         | | | | | | |  hbs(164:167): arr
-        | | | | | | |  ts(729:732):  arr
+        | | | | | | |  ts(570:573):  arr
         | | | | | | |
         | | | | | |
         | | | | |
         | | | |
         | | | | Mapping: TextContent
         | | | |  hbs(174:181): Hash is
-        | | | |  ts(738:738):
+        | | | |  ts(579:579):
         | | | |
         | | | | Mapping: MustacheStatement
         | | | |  hbs(182:187): {{h}}
-        | | | |  ts(738:797):  __glintDSL__.emitContent(__glintDSL__.resolveOrReturn(h)())
+        | | | |  ts(579:638):  __glintDSL__.emitContent(__glintDSL__.resolveOrReturn(h)())
         | | | |
         | | | | | Mapping: MustacheStatement
         | | | | |  hbs(182:187): {{h}}
-        | | | | |  ts(763:796):  __glintDSL__.resolveOrReturn(h)()
+        | | | | |  ts(604:637):  __glintDSL__.resolveOrReturn(h)()
         | | | | |
         | | | | | | Mapping: PathExpression
         | | | | | |  hbs(184:185): h
-        | | | | | |  ts(792:793):  h
+        | | | | | |  ts(633:634):  h
         | | | | | |
         | | | | | | | Mapping: Identifier
         | | | | | | |  hbs(184:185): h
-        | | | | | | |  ts(792:793):  h
+        | | | | | | |  ts(633:634):  h
         | | | | | | |
         | | | | | |
         | | | | |
         | | | |
         | | | | Mapping: TextContent
         | | | |  hbs(187:188):
-        | | | |  ts(799:799):
+        | | | |  ts(640:640):
         | | | |
         | | | | Mapping: Identifier
         | | | |  hbs(193:196): let
-        | | | |  ts(823:826):  let
+        | | | |  ts(664:667):  let
         | | | |
         | | |
         | |
@@ -993,14 +874,7 @@ describe('Transform: rewriteModule', () => {
 
         expect(transformedModule?.errors).toEqual([]);
         expect(transformedModule?.transformedContents).toMatchInlineSnapshot(`
-          "
-          // @ts-expect-error
-          ({} as typeof import('./__glint-hacky-nonexistent.gts'));
-
-          // @ts-expect-error
-          ({} as typeof import('./__glint-hacky-nonexistent.gjs'));
-
-          import type { TOC } from '@ember/component/template-only';
+          "import type { TOC } from '@ember/component/template-only';
           export default ({} as typeof import("@glint/environment-ember-template-imports/-private/dsl")).templateExpression(function(__glintRef__, __glintDSL__: typeof import("@glint/environment-ember-template-imports/-private/dsl")) {
           __glintRef__; __glintDSL__;
           }) satisfies TOC<{
@@ -1033,14 +907,7 @@ describe('Transform: rewriteModule', () => {
 
         expect(transformedModule?.errors?.length).toBe(0);
         expect(transformedModule?.transformedContents).toMatchInlineSnapshot(`
-          "
-          // @ts-expect-error
-          ({} as typeof import('./__glint-hacky-nonexistent.gts'));
-
-          // @ts-expect-error
-          ({} as typeof import('./__glint-hacky-nonexistent.gjs'));
-
-          import type { TOC } from '@ember/component/template-only';
+          "import type { TOC } from '@ember/component/template-only';
 
           const SmolComp = 
             ({} as typeof import("@glint/environment-ember-template-imports/-private/dsl")).templateExpression(function(__glintRef__, __glintDSL__: typeof import("@glint/environment-ember-template-imports/-private/dsl")) {
@@ -1084,14 +951,7 @@ describe('Transform: rewriteModule', () => {
           expect.soft(transformedModule?.errors?.length).toBe(0);
           expect.soft(transformedModule?.errors).toMatchInlineSnapshot(`[]`);
           expect.soft(transformedModule?.transformedContents).toMatchInlineSnapshot(`
-            "
-            // @ts-expect-error
-            ({} as typeof import('./__glint-hacky-nonexistent.gts'));
-
-            // @ts-expect-error
-            ({} as typeof import('./__glint-hacky-nonexistent.gjs'));
-
-            export default ({} as typeof import("@glint/environment-ember-template-imports/-private/dsl")).templateExpression(function(__glintRef__, __glintDSL__: typeof import("@glint/environment-ember-template-imports/-private/dsl")) {
+            "export default ({} as typeof import("@glint/environment-ember-template-imports/-private/dsl")).templateExpression(function(__glintRef__, __glintDSL__: typeof import("@glint/environment-ember-template-imports/-private/dsl")) {
             __glintDSL__.emitContent(__glintDSL__.resolveOrReturn(foo)());
             __glintRef__; __glintDSL__;
             })"
diff --git a/test-packages/ts-plugin-test-app/src/auto-import-test-exporter.gts b/test-packages/ts-plugin-test-app/src/auto-import-test-exporter.gts
deleted file mode 100644
index 960744dec..000000000
--- a/test-packages/ts-plugin-test-app/src/auto-import-test-exporter.gts
+++ /dev/null
@@ -1 +0,0 @@
-export const autoImportTestExporterValue = 123;
\ No newline at end of file
diff --git a/test-packages/ts-plugin-test-app/src/auto-import-test-importer.gts b/test-packages/ts-plugin-test-app/src/auto-import-test-importer.gts
deleted file mode 100644
index bcade1d98..000000000
--- a/test-packages/ts-plugin-test-app/src/auto-import-test-importer.gts
+++ /dev/null
@@ -1 +0,0 @@
-let a = autoImportTestExporterValue