From 88ffed38acec041931a54ce44e61f783dd2b9003 Mon Sep 17 00:00:00 2001
From: Marine Dunstetter <bluecut.official@gmail.com>
Date: Thu, 13 Jun 2024 19:11:16 +0200
Subject: [PATCH] feat(new app-boot): replace app-boot.js with an in-html
 module

---
 packages/compat/src/compat-app-builder.ts     |   4 +-
 test-packages/support/audit-assertions.ts     |  37 ++-
 .../tests/dummy/app/app-boot.js               |   4 -
 .../addon-template/tests/dummy/app/index.html |   7 +-
 tests/addon-template/tests/index.html         |   1 -
 tests/app-template/app/app-boot.js            |   4 -
 tests/app-template/app/index.html             |   7 +-
 tests/app-template/tests/index.html           |   1 -
 .../tests/dummy/app/app-boot.js               |   5 -
 .../tests/dummy/app/index.html                |  30 +++
 .../macro-sample-addon/tests/index.html       |  38 +++
 .../macro-sample-addon/tests/test-helper.js   |  13 +
 tests/fixtures/macro-test/tests/index.html    |   1 -
 .../compat-addon-classic-features-test.ts     |   7 +-
 .../compat-app-html-attributes-test.ts        |   4 +-
 .../compat-exclude-dot-files-test.ts          |  33 ++-
 tests/scenarios/compat-renaming-test.ts       | 147 +++++++-----
 tests/scenarios/compat-route-split-test.ts    |   4 +-
 tests/scenarios/compat-stage2-test.ts         | 226 +++++++++++++-----
 .../compat-template-colocation-test.ts        |  62 +++--
 tests/ts-app-template/app/app-boot.js         |   4 -
 tests/ts-app-template/app/index.html          |   7 +-
 tests/ts-app-template/tests/index.html        |   1 -
 23 files changed, 446 insertions(+), 201 deletions(-)
 delete mode 100644 tests/addon-template/tests/dummy/app/app-boot.js
 delete mode 100644 tests/app-template/app/app-boot.js
 delete mode 100644 tests/fixtures/macro-sample-addon/tests/dummy/app/app-boot.js
 create mode 100644 tests/fixtures/macro-sample-addon/tests/dummy/app/index.html
 create mode 100644 tests/fixtures/macro-sample-addon/tests/index.html
 create mode 100644 tests/fixtures/macro-sample-addon/tests/test-helper.js
 delete mode 100644 tests/ts-app-template/app/app-boot.js

diff --git a/packages/compat/src/compat-app-builder.ts b/packages/compat/src/compat-app-builder.ts
index 515192d798..920f55a9d1 100644
--- a/packages/compat/src/compat-app-builder.ts
+++ b/packages/compat/src/compat-app-builder.ts
@@ -628,8 +628,8 @@ export class CompatAppBuilder {
 
         ${appBoot}
 
-        1. If you want to keep the same behavior, copy and paste it to your /app/app-boot.js:
-        2. Once /app/app-boot.js has the content you need, remove the present error by setting "useAddonAppBoot" to false in the build options.
+        1. If you want to keep the same behavior, copy and paste it to the app-boot script included in app/index.html.
+        2. Once app/index.html has the content you need, remove the present error by setting "useAddonAppBoot" to false in the build options.
       `);
     }
   }
diff --git a/test-packages/support/audit-assertions.ts b/test-packages/support/audit-assertions.ts
index 1cdbe81de1..5826623285 100644
--- a/test-packages/support/audit-assertions.ts
+++ b/test-packages/support/audit-assertions.ts
@@ -56,7 +56,7 @@ export function setupAuditTest(hooks: NestedHooks, opts: () => AuditBuildOptions
       await visit();
       prepareResult(expectAudit.assert);
     },
-    module(name: string) {
+    module(name: string | RegExp) {
       return expectAudit.module(name);
     },
     get findings() {
@@ -94,7 +94,7 @@ export class ExpectAuditResults {
     readonly toRewrittenPath: (path: string) => string
   ) {}
 
-  module(inputName: string): PublicAPI<ExpectModule> {
+  module(inputName: string | RegExp): PublicAPI<ExpectModule> {
     return new ExpectModule(this, inputName);
   }
 
@@ -112,28 +112,43 @@ export class ExpectAuditResults {
 }
 
 export class ExpectModule {
-  constructor(private expectAudit: ExpectAuditResults, private inputName: string) {}
+  constructor(private expectAudit: ExpectAuditResults, private inputName: string | RegExp) {}
+
+  @Memoize()
+  private get outputName() {
+    if (typeof this.inputName === 'string') {
+      return this.expectAudit.toRewrittenPath(this.inputName);
+    } else {
+      return this.inputName.toString();
+    }
+  }
 
   @Memoize()
   private get module() {
-    let outputName = this.expectAudit.toRewrittenPath(this.inputName);
     for (let [key, value] of Object.entries(this.expectAudit.result.modules)) {
-      if (cleanUrl(key) === outputName) {
-        return value;
+      if (typeof this.inputName === 'string') {
+        if (cleanUrl(key) === this.outputName) {
+          return value;
+        }
+      } else {
+        if (this.inputName.test(cleanUrl(key))) {
+          return value;
+        }
       }
     }
-    return this.expectAudit.result.modules[outputName];
+    return this.expectAudit.result.modules[this.outputName];
   }
 
   private emitMissingModule() {
-    let outputName = this.expectAudit.toRewrittenPath(this.inputName);
-    const showNearMisses = 4;
-    let actuals = sortBy(Object.keys(this.expectAudit.result.modules), candidate => distance(candidate, outputName));
+    const showNearMisses = 20;
+    let actuals = sortBy(Object.keys(this.expectAudit.result.modules), candidate =>
+      distance(candidate, this.outputName)
+    );
     this.expectAudit.assert.pushResult({
       result: false,
       actual:
         actuals.length > showNearMisses ? actuals.slice(0, showNearMisses).join(', ') + '...' : actuals.join(', '),
-      expected: outputName,
+      expected: this.outputName,
       message: `Can't locate module ${this.inputName}`,
     });
   }
diff --git a/tests/addon-template/tests/dummy/app/app-boot.js b/tests/addon-template/tests/dummy/app/app-boot.js
deleted file mode 100644
index 6b7181516c..0000000000
--- a/tests/addon-template/tests/dummy/app/app-boot.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import Application from './app';
-import environment from './config/environment';
-
-Application.create(environment.APP);
diff --git a/tests/addon-template/tests/dummy/app/index.html b/tests/addon-template/tests/dummy/app/index.html
index c15ad774e4..c55e417ab7 100644
--- a/tests/addon-template/tests/dummy/app/index.html
+++ b/tests/addon-template/tests/dummy/app/index.html
@@ -17,7 +17,12 @@
     {{content-for "body"}}
 
     <script src="/@embroider/core/vendor.js"></script>
-    <script src="/app-boot.js" type="module"></script>
+    <script type="module">
+      import Application from './app';
+      import environment from './config/environment';
+
+      Application.create(environment.APP);
+    </script>
 
     {{content-for "body-footer"}}
   </body>
diff --git a/tests/addon-template/tests/index.html b/tests/addon-template/tests/index.html
index fc265ba949..242088d317 100644
--- a/tests/addon-template/tests/index.html
+++ b/tests/addon-template/tests/index.html
@@ -30,7 +30,6 @@
     <script src="/testem.js" integrity="" data-embroider-ignore></script>
     <script src="/@embroider/core/vendor.js"></script>
     <script src="/@embroider/core/test-support.js"></script>
-    <script src="/app-boot.js" type="module"></script>
     <script src="/@embroider/core/test-entrypoint" type="module"></script>
 
     {{content-for "body-footer"}}
diff --git a/tests/app-template/app/app-boot.js b/tests/app-template/app/app-boot.js
deleted file mode 100644
index 6b7181516c..0000000000
--- a/tests/app-template/app/app-boot.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import Application from './app';
-import environment from './config/environment';
-
-Application.create(environment.APP);
diff --git a/tests/app-template/app/index.html b/tests/app-template/app/index.html
index 60bf908cd3..c53dfc7da6 100644
--- a/tests/app-template/app/index.html
+++ b/tests/app-template/app/index.html
@@ -17,7 +17,12 @@
     {{content-for "body"}}
 
     <script src="/@embroider/core/vendor.js"></script>
-    <script src="/app-boot.js" type="module"></script>
+    <script type="module">
+      import Application from './app';
+      import environment from './config/environment';
+
+      Application.create(environment.APP);
+    </script>
 
     {{content-for "body-footer"}}
   </body>
diff --git a/tests/app-template/tests/index.html b/tests/app-template/tests/index.html
index 90b8d8be8b..c68003bd76 100644
--- a/tests/app-template/tests/index.html
+++ b/tests/app-template/tests/index.html
@@ -27,7 +27,6 @@
     <script src="/testem.js" integrity="" data-embroider-ignore></script>
     <script src="/@embroider/core/vendor.js"></script>
     <script src="/@embroider/core/test-support.js"></script>
-    <script src="/app-boot.js" type="module"></script>
     <script src="/@embroider/core/test-entrypoint" type="module"></script>
 
     {{content-for "body-footer"}} {{content-for "test-body-footer"}}
diff --git a/tests/fixtures/macro-sample-addon/tests/dummy/app/app-boot.js b/tests/fixtures/macro-sample-addon/tests/dummy/app/app-boot.js
deleted file mode 100644
index 1e28ff4cc8..0000000000
--- a/tests/fixtures/macro-sample-addon/tests/dummy/app/app-boot.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import Application from './app';
-import environment from './config/environment';
-
-window.LoadedFromCustomAppBoot = true;
-Application.create(environment.APP);
\ No newline at end of file
diff --git a/tests/fixtures/macro-sample-addon/tests/dummy/app/index.html b/tests/fixtures/macro-sample-addon/tests/dummy/app/index.html
new file mode 100644
index 0000000000..24d04a975f
--- /dev/null
+++ b/tests/fixtures/macro-sample-addon/tests/dummy/app/index.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>Dummy</title>
+    <meta name="description" content="">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+    {{content-for "head"}}
+
+    <link integrity="" rel="stylesheet" href="/@embroider/core/vendor.css">
+    <link integrity="" rel="stylesheet" href="/assets/dummy.css">
+
+    {{content-for "head-footer"}}
+  </head>
+  <body>
+    {{content-for "body"}}
+
+    <script src="/@embroider/core/vendor.js"></script>
+    <script type="module">
+      import Application from './app';
+      import environment from './config/environment';
+
+      window.LoadedFromCustomAppBoot = true;
+      Application.create(environment.APP);
+    </script>
+
+    {{content-for "body-footer"}}
+  </body>
+</html>
diff --git a/tests/fixtures/macro-sample-addon/tests/index.html b/tests/fixtures/macro-sample-addon/tests/index.html
new file mode 100644
index 0000000000..242088d317
--- /dev/null
+++ b/tests/fixtures/macro-sample-addon/tests/index.html
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>Dummy Tests</title>
+    <meta name="description" content="">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+    {{content-for "head"}}
+    {{content-for "test-head"}}
+
+    <link rel="stylesheet" href="/@embroider/core/vendor.css">
+    <link rel="stylesheet" href="/assets/dummy.css">
+    <link rel="stylesheet" href="/@embroider/core/test-support.css">
+
+    {{content-for "head-footer"}}
+    {{content-for "test-head-footer"}}
+  </head>
+  <body>
+    {{content-for "body"}}
+    {{content-for "test-body"}}
+
+    <div id="qunit"></div>
+    <div id="qunit-fixture">
+      <div id="ember-testing-container">
+        <div id="ember-testing"></div>
+      </div>
+    </div>
+
+    <script src="/testem.js" integrity="" data-embroider-ignore></script>
+    <script src="/@embroider/core/vendor.js"></script>
+    <script src="/@embroider/core/test-support.js"></script>
+    <script src="/@embroider/core/test-entrypoint" type="module"></script>
+
+    {{content-for "body-footer"}}
+    {{content-for "test-body-footer"}}
+  </body>
+</html>
diff --git a/tests/fixtures/macro-sample-addon/tests/test-helper.js b/tests/fixtures/macro-sample-addon/tests/test-helper.js
new file mode 100644
index 0000000000..8b86cbbe86
--- /dev/null
+++ b/tests/fixtures/macro-sample-addon/tests/test-helper.js
@@ -0,0 +1,13 @@
+import Application from 'dummy/app';
+import config from 'dummy/config/environment';
+import * as QUnit from 'qunit';
+import { setApplication } from '@ember/test-helpers';
+import { setup } from 'qunit-dom';
+import { start } from 'ember-qunit';
+
+window.LoadedFromCustomAppBoot = true;
+setApplication(Application.create(config.APP));
+
+setup(QUnit.assert);
+
+start();
diff --git a/tests/fixtures/macro-test/tests/index.html b/tests/fixtures/macro-test/tests/index.html
index f761bd335a..12e974b67f 100644
--- a/tests/fixtures/macro-test/tests/index.html
+++ b/tests/fixtures/macro-test/tests/index.html
@@ -36,7 +36,6 @@
     <script src="{{rootURL}}apple.js"></script>
     <script src="{{rootURL}}ordered.js"></script>
     <script src="/@embroider/core/test-support.js"></script>
-    <script src="/app-boot.js" type="module"></script>
     <script src="/@embroider/core/test-entrypoint" type="module"></script>
 
     {{content-for "body-footer"}}
diff --git a/tests/scenarios/compat-addon-classic-features-test.ts b/tests/scenarios/compat-addon-classic-features-test.ts
index 950ac53a77..3f5ebbd58c 100644
--- a/tests/scenarios/compat-addon-classic-features-test.ts
+++ b/tests/scenarios/compat-addon-classic-features-test.ts
@@ -82,7 +82,12 @@ appScenarios
               {{content-for "custom"}}
           
               <script src="/@embroider/core/vendor.js"></script>
-              <script src="/app-boot.js" type="module"></script>
+              <script type="module">
+                import Application from './app';
+                import environment from './config/environment';
+
+                Application.create(environment.APP);
+              </script>
           
               {{content-for "body-footer"}}
             </body>
diff --git a/tests/scenarios/compat-app-html-attributes-test.ts b/tests/scenarios/compat-app-html-attributes-test.ts
index af0d1048bd..e4875e1324 100644
--- a/tests/scenarios/compat-app-html-attributes-test.ts
+++ b/tests/scenarios/compat-app-html-attributes-test.ts
@@ -32,7 +32,7 @@ appScenarios
 
     // <script ... src=".../vendor.js"> => <script ... src=".../vendor.js" data-original-filename="vendor.js">
     indexHtml = indexHtml.replace('vendor.js">', 'vendor.js" data-original-filename="vendor.js">');
-    indexHtml = indexHtml.replace('/app-boot.js" ', '/app-boot.js" data-original-filename="entrypoint" ');
+    indexHtml = indexHtml.replace(' type="module">', ' data-original-filename="entrypoint" type="module">');
 
     // <script ... => <script defer ...
     indexHtml = indexHtml.replace(/<script /g, '<script defer ');
@@ -72,7 +72,7 @@ appScenarios
           'has data-original-filename vendor.js'
         );
         expectFile('./index.html').matches(
-          '" data-original-filename="entrypoint" type="module">',
+          ' data-original-filename="entrypoint" type="module">',
           'has data-original-filename entrypoint'
         );
       });
diff --git a/tests/scenarios/compat-exclude-dot-files-test.ts b/tests/scenarios/compat-exclude-dot-files-test.ts
index 04a58e8f43..0e67566408 100644
--- a/tests/scenarios/compat-exclude-dot-files-test.ts
+++ b/tests/scenarios/compat-exclude-dot-files-test.ts
@@ -2,7 +2,9 @@ import type { ExpectFile } from '@embroider/test-support/file-assertions/qunit';
 import { expectRewrittenFilesAt } from '@embroider/test-support/file-assertions/qunit';
 import { throwOnWarnings } from '@embroider/core';
 import type { PreparedApp } from 'scenario-tester';
+import CommandWatcher from './helpers/command-watcher';
 import { appScenarios, baseAddon } from './scenarios';
+import fetch from 'node-fetch';
 import QUnit from 'qunit';
 import { merge } from 'lodash';
 import { setupAuditTest } from '@embroider/test-support/audit-assertions';
@@ -51,21 +53,30 @@ appScenarios
       throwOnWarnings(hooks);
 
       let app: PreparedApp;
-
+      let server: CommandWatcher;
+      let appURL: string;
       let expectFile: ExpectFile;
 
-      hooks.before(async assert => {
+      hooks.before(async () => {
         app = await scenario.prepare();
-        let result = await app.execute('ember build', { env: { EMBROIDER_PREBUILD: 'true' } });
-        assert.equal(result.exitCode, 0, result.output);
+        server = CommandWatcher.launch('vite', ['--clearScreen', 'false'], { cwd: app.dir });
+        [, appURL] = await server.waitFor(/Local:\s+(https?:\/\/.*)\//g);
       });
 
-      let expectAudit = setupAuditTest(hooks, () => ({ app: app.dir }));
-
-      hooks.beforeEach(assert => {
+      hooks.beforeEach(async assert => {
         expectFile = expectRewrittenFilesAt(app.dir, { qunit: assert });
       });
 
+      hooks.after(async () => {
+        await server?.shutdown();
+      });
+
+      let expectAudit = setupAuditTest(hooks, () => ({
+        appURL,
+        startingFrom: ['index.html'],
+        fetch: fetch as unknown as typeof globalThis.fetch,
+      }));
+
       test('dot files are not included as app modules', function (assert) {
         // dot files should exist on disk
         expectFile('./.foobar.js').exists();
@@ -74,12 +85,12 @@ appScenarios
 
         // but not be picked up in the entrypoint
         expectAudit
-          .module('./tmp/rewritten-app/index.html')
-          .resolves('/app-boot.js')
+          .module('./index.html')
+          .resolves(/\/index.html.*/) // in-html app-boot script
           .toModule()
-          .resolves('./app')
+          .resolves(/\/app\.js.*/)
           .toModule()
-          .resolves('@embroider/core/entrypoint')
+          .resolves(/.*\/-embroider-entrypoint.js/)
           .toModule()
           .withContents(content => {
             assert.notOk(/app-template\/\.foobar/.test(content), '.foobar is not in the entrypoint');
diff --git a/tests/scenarios/compat-renaming-test.ts b/tests/scenarios/compat-renaming-test.ts
index 8a19d7ee25..3e8dfb0d2a 100644
--- a/tests/scenarios/compat-renaming-test.ts
+++ b/tests/scenarios/compat-renaming-test.ts
@@ -1,12 +1,10 @@
 import type { PreparedApp } from 'scenario-tester';
+import CommandWatcher from './helpers/command-watcher';
 import { appScenarios, baseAddon } from './scenarios';
+import fetch from 'node-fetch';
 import QUnit from 'qunit';
-import { resolve, sep } from 'path';
 const { module: Qmodule, test } = QUnit;
 
-import type { ExpectFile } from '@embroider/test-support/file-assertions/qunit';
-import { expectRewrittenFilesAt } from '@embroider/test-support/file-assertions/qunit';
-
 import { throwOnWarnings } from '@embroider/core';
 import merge from 'lodash/merge';
 import { setupAuditTest } from '@embroider/test-support/audit-assertions';
@@ -180,17 +178,24 @@ appScenarios
       throwOnWarnings(hooks);
 
       let app: PreparedApp;
-      let expectFile: ExpectFile;
+      let server: CommandWatcher;
+      let appURL: string;
 
       hooks.before(async () => {
         app = await scenario.prepare();
+        server = CommandWatcher.launch('vite', ['--clearScreen', 'false'], { cwd: app.dir });
+        [, appURL] = await server.waitFor(/Local:\s+(https?:\/\/.*)\//g);
       });
 
-      hooks.beforeEach(assert => {
-        expectFile = expectRewrittenFilesAt(app.dir, { qunit: assert });
+      hooks.after(async () => {
+        await server?.shutdown();
       });
 
-      let expectAudit = setupAuditTest(hooks, () => ({ app: app.dir }));
+      let expectAudit = setupAuditTest(hooks, () => ({
+        appURL,
+        startingFrom: ['index.html'],
+        fetch: fetch as unknown as typeof globalThis.fetch,
+      }));
 
       test('audit issues', function () {
         expectAudit.hasNoFindings();
@@ -199,126 +204,138 @@ appScenarios
       test('whole package renaming works for top-level module', function () {
         expectAudit
           .module('./components/import-lodash.js')
-          .resolves('lodash')
-          .to('./node_modules/ember-lodash/index.js');
-        expectFile('./node_modules/ember-lodash/index.js').matches(/lodash index/);
+          .resolves(/ember-lodash\/index.js/)
+          .toModule()
+          .codeContains('// lodash index');
       });
 
       test('whole package renaming works for interior module', function () {
         expectAudit
           .module('./components/import-capitalize.js')
-          .resolves('lodash/capitalize')
-          .to('./node_modules/ember-lodash/capitalize.js');
-
-        expectFile('./node_modules/ember-lodash/capitalize.js').matches(/lodash capitalize/);
+          .resolves(/ember-lodash\/capitalize.js/)
+          .toModule()
+          .codeContains('// lodash capitalize');
       });
 
       test("modules in own namespace don't get renamed", function () {
         expectAudit
           .module('./components/import-own-thing.js')
-          .resolves('emits-multiple-packages/own-thing')
-          .to('./node_modules/emits-multiple-packages/own-thing.js');
-        expectFile('./node_modules/emits-multiple-packages/own-thing.js').matches(/own thing/);
+          .resolves(/emits-multiple-packages\/own-thing.js/)
+          .toModule()
+          .codeContains('// own thing');
       });
 
       test('modules outside our namespace do get renamed', function () {
         expectAudit
           .module('./components/import-somebody-elses.js')
-          .resolves('somebody-elses-package/environment')
-          .to('./node_modules/emits-multiple-packages/somebody-elses-package/environment.js');
-        expectFile('./node_modules/emits-multiple-packages/somebody-elses-package/environment.js').matches(
-          /somebody elses environment/
-        );
+          .resolves(/somebody-elses-package\/environment.js/)
+          .toModule()
+          .codeContains('// somebody elses environment');
       });
 
       test('modules outside our namespace do get renamed, with index.js', function () {
         expectAudit
           .module('./components/import-somebody-elses-utils.js')
-          .resolves('somebody-elses-package/utils')
-          .to('./node_modules/emits-multiple-packages/somebody-elses-package/utils/index.js');
-        expectFile('./node_modules/emits-multiple-packages/somebody-elses-package/utils/index.js').matches(
-          /somebody elses utils/
-        );
+          .resolves(/somebody-elses-package\/utils\/index.js/)
+          .toModule()
+          .codeContains('// somebody elses utils');
       });
 
       test('modules outside our namespace do get renamed, with index', function () {
         expectAudit
           .module('./components/import-somebody-elses-utils-index.js')
-          .resolves('somebody-elses-package/utils/index')
-          .to('./node_modules/emits-multiple-packages/somebody-elses-package/utils/index.js');
+          .resolves(/somebody-elses-package\/utils\/index.js/)
+          .toModule()
+          .codeContains('// somebody elses utils');
       });
       test('modules outside our namespace do get renamed, with index with extension', function () {
         expectAudit
           .module('./components/import-somebody-elses-utils-index-explicit.js')
-          .resolves('somebody-elses-package/utils/index.js')
-          .to('./node_modules/emits-multiple-packages/somebody-elses-package/utils/index.js');
+          .resolves(/somebody-elses-package\/utils\/index.js/)
+          .toModule()
+          .codeContains('// somebody elses utils');
       });
-      test('renamed modules keep their classic runtime name when used as implicit-modules', function () {
+      test('renamed modules keep their classic runtime name when used as implicit-modules', function (assert) {
         expectAudit
-          .module('./tmp/rewritten-app/index.html')
-          .resolves('/app-boot.js')
+          .module('./index.html')
+          .resolves(/\/index.html.*/) // in-html app-boot script
           .toModule()
-          .resolves('./app')
+          .resolves(/\/app\.js.*/)
           .toModule()
-          .resolves('@embroider/core/entrypoint')
+          .resolves(/.*\/-embroider-entrypoint\.js/)
           .toModule()
-          .resolves('./-embroider-implicit-modules.js')
+          .resolves(/.*\/-embroider-implicit-modules\.js/)
           .toModule()
           .withContents(contents => {
             const [, objectName] = /"somebody-elses-package\/environment": (own\d+),/.exec(contents) ?? [];
 
-            return contents.includes(
-              `import * as ${objectName} from "emits-multiple-packages/somebody-elses-package/environment";`
+            let testPattern = new RegExp(
+              `import \\* as ${objectName} from ".*emits-multiple-packages/somebody-elses-package/environment.js.*";`
             );
+
+            assert.ok(testPattern.test(contents));
+
+            return true;
           }, 'module imports from the correct place and exports object with the right key');
       });
+      // TODO: is this test still valid?
       test('rewriting one module does not capture entire package namespace', function () {
         expectAudit
           .module('./components/import-somebody-elses-original.js')
-          .resolves('somebody-elses-package')
-          .to(resolve('/@embroider/ext-es/somebody-elses-package/exports=default').split(sep).join('/'));
+          .resolves(/@embroider\/ext-es\/somebody-elses-package\/exports=default/)
+          .toModule()
+          .codeContains('const m = window.require("somebody-elses-package");');
 
         expectAudit
           .module('./components/import-somebody-elses-original.js')
-          .resolves('somebody-elses-package/deeper')
-          .to(resolve('/@embroider/ext-es/somebody-elses-package/deeper/exports=default').split(sep).join('/'));
+          .resolves(/@embroider\/ext-es\/somebody-elses-package\/deeper\/exports=default/)
+          .toModule()
+          .codeContains('const m = window.require("somebody-elses-package/deeper");');
       });
       test('single file package gets captured and renamed', function () {
         expectAudit
           .module('./components/import-single-file-package.js')
-          .resolves('single-file-package')
-          .to('./node_modules/emits-multiple-packages/single-file-package/index.js');
-        expectFile('./node_modules/emits-multiple-packages/single-file-package/index.js').matches(
-          /single file package/
-        );
+          .resolves(/single-file-package\/index.js/)
+          .toModule()
+          .codeContains('// single file package');
       });
+      // TODO: in all the changes below,
+      // was the .to('./node_modules/has-app-tree-import/index.js') step important?
       test('files logically copied into app from addons resolve their own original packages', function () {
         expectAudit
-          .module('./node_modules/has-app-tree-import/_app_/first.js')
-          .resolves('has-app-tree-import')
-          .to('./node_modules/has-app-tree-import/index.js');
+          .module(/has-app-tree-import\/_app_\/first.js/)
+          .resolves(/has-app-tree-import\/index.js/)
+          .toModule()
+          .codeContains('export default "first-copy";');
         expectAudit
-          .module('./node_modules/intermediate/node_modules/has-app-tree-import/_app_/second.js')
-          .resolves('has-app-tree-import')
-          .to('./node_modules/intermediate/node_modules/has-app-tree-import/index.js');
+          .module(/has-app-tree-import\/_app_\/second.js/)
+          .resolves(/has-app-tree-import\/index.js/)
+          .toModule()
+          .codeContains('export default "second-copy";');
       });
       test(`files logically copied into app from addons resolve the addon's deps`, function () {
         expectAudit
-          .module('./node_modules/has-app-tree-import/_app_/imports-dep.js')
-          .resolves('inner-dep')
-          .to('./node_modules/has-app-tree-import/node_modules/inner-dep/index.js');
+          .module(/has-app-tree-import\/_app_\/imports-dep\.js/)
+          .resolves(/inner-dep\/index\.js/)
+          .toModule()
+          .codeContains('export default "inner-dep";');
       });
-      test(`app-tree files from addons can import from the app`, function () {
+      test(`app-tree files from addons can import from the app`, function (assert) {
         expectAudit
-          .module('./node_modules/mirage-like/_app_/mirage/config.js')
-          .resolves('app-template/components/import-lodash')
-          .to('./components/import-lodash.js');
+          .module(/mirage-like\/_app_\/mirage\/config\.js/)
+          .resolves(/components\/import-lodash\.js/)
+          .toModule()
+          .withContents(contents => {
+            assert.ok(/import lodash from ".*";/.test(contents));
+            return true;
+          });
       });
       test(`files logically copied into app from addons can resolve the app's deps`, function () {
         expectAudit
-          .module('./node_modules/mirage-like/_app_/mirage/config.js')
-          .resolves('a-library')
-          .to('./node_modules/a-library/index.js');
+          .module(/mirage-like\/_app_\/mirage\/config.js/)
+          .resolves(/a-library\/index\.js/)
+          .toModule()
+          .codeContains('');
       });
     });
   });
diff --git a/tests/scenarios/compat-route-split-test.ts b/tests/scenarios/compat-route-split-test.ts
index df02a4f8b9..116b1f2b5c 100644
--- a/tests/scenarios/compat-route-split-test.ts
+++ b/tests/scenarios/compat-route-split-test.ts
@@ -66,9 +66,9 @@ function checkContents(
 ) {
   let resolved = expectAudit
     .module('./index.html')
-    .resolves('/app-boot.js')
+    .resolves(/\/index.html.*/) // in-html app-boot script
     .toModule()
-    .resolves(/\/app\.[jt]s.*/)
+    .resolves(/\/app\.js.*/)
     .toModule()
     .resolves(/.*\/-embroider-entrypoint.js/);
 
diff --git a/tests/scenarios/compat-stage2-test.ts b/tests/scenarios/compat-stage2-test.ts
index 06b892498e..646ae448ca 100644
--- a/tests/scenarios/compat-stage2-test.ts
+++ b/tests/scenarios/compat-stage2-test.ts
@@ -2,13 +2,15 @@ import type { Options } from '@embroider/compat';
 import type { PreparedApp, Project } from 'scenario-tester';
 import { appScenarios, baseAddon, dummyAppScenarios, renameApp } from './scenarios';
 import { resolve } from 'path';
-import { Rebuilder, Transpiler } from '@embroider/test-support';
+import { Transpiler } from '@embroider/test-support';
 import type { ExpectFile } from '@embroider/test-support/file-assertions/qunit';
 import { expectRewrittenFilesAt } from '@embroider/test-support/file-assertions/qunit';
 import { throwOnWarnings } from '@embroider/core';
 import merge from 'lodash/merge';
+import fetch from 'node-fetch';
 import QUnit from 'qunit';
 import { setupAuditTest } from '@embroider/test-support/audit-assertions';
+import CommandWatcher from './helpers/command-watcher';
 
 const { module: Qmodule, test } = QUnit;
 
@@ -18,12 +20,12 @@ let stage2Scenarios = appScenarios.map('compat-stage2-build', app => {
 
 function resolveEntryPoint(expectAudit: ReturnType<typeof setupAuditTest>) {
   return expectAudit
-    .module('./tmp/rewritten-app/index.html')
-    .resolves('/app-boot.js')
+    .module('./index.html')
+    .resolves(/\/index.html.*/) // in-html app-boot script
     .toModule()
-    .resolves('./app')
+    .resolves(/\/app\.js.*/)
     .toModule()
-    .resolves('@embroider/core/entrypoint')
+    .resolves(/.*\/-embroider-entrypoint.js/)
     .toModule();
 }
 
@@ -108,19 +110,29 @@ stage2Scenarios
       throwOnWarnings(hooks);
 
       let app: PreparedApp;
+      let server: CommandWatcher;
+      let appURL: string;
       let expectFile: ExpectFile;
 
-      hooks.before(async assert => {
+      hooks.before(async () => {
         app = await scenario.prepare();
-        let result = await app.execute('ember build', { env: { EMBROIDER_PREBUILD: 'true' } });
-        assert.equal(result.exitCode, 0, result.output);
+        server = CommandWatcher.launch('vite', ['--clearScreen', 'false'], { cwd: app.dir });
+        [, appURL] = await server.waitFor(/Local:\s+(https?:\/\/.*)\//g);
       });
 
       hooks.beforeEach(assert => {
         expectFile = expectRewrittenFilesAt(app.dir, { qunit: assert });
       });
 
-      let expectAudit = setupAuditTest(hooks, () => ({ app: app.dir, 'reuse-build': true }));
+      hooks.after(async () => {
+        await server?.shutdown();
+      });
+
+      let expectAudit = setupAuditTest(hooks, () => ({
+        appURL,
+        startingFrom: ['index.html'],
+        fetch: fetch as unknown as typeof globalThis.fetch,
+      }));
 
       test('in repo addons are symlinked correctly', function () {
         // check that package json contains in repo dep
@@ -129,10 +141,14 @@ stage2Scenarios
         expectFile('./node_modules/dep-b/package.json').json().get('dependencies.in-repo-b').equals('0.0.0');
 
         // check that in-repo addons are resolvable
-        expectAudit
-          .module('./node_modules/dep-a/check-resolution.js')
-          .resolves('in-repo-a/check-resolution-target')
-          .to('./node_modules/dep-a/lib/in-repo-a/check-resolution-target.js');
+        resolveEntryPoint(expectAudit)
+          .resolves(/lib\.js/)
+          .toModule()
+          .resolves(/dep-a\/check-resolution\.js/)
+          .toModule()
+          .resolves(/in-repo-a\/check-resolution-target\.js/)
+          .toModule()
+          .codeContains('export {}');
 
         // check that the in repo addons are correctly upgraded
         expectFile('./node_modules/dep-a/lib/in-repo-a/package.json').json().get('ember-addon.version').equals(2);
@@ -141,21 +157,25 @@ stage2Scenarios
 
         // check that the app trees with in repo addon are combined correctly
         resolveEntryPoint(expectAudit)
-          .resolves('./service/in-repo.js')
-          .to('./node_modules/dep-b/lib/in-repo-c/_app_/service/in-repo.js');
+          .resolves(/service\/in-repo\.js/)
+          .toModule()
+          .codeContains('');
       });
 
       test('incorporates in-repo-addons of in-repo-addons correctly', function () {
         // secondary in-repo-addon was correctly detected and activated
         resolveEntryPoint(expectAudit)
-          .resolves('./services/secondary.js')
-          .to('./lib/secondary-in-repo-addon/_app_/services/secondary.js');
+          .resolves(/services\/secondary\.js/)
+          .toModule()
+          .codeContains('// secondary');
 
         // secondary is resolvable from primary
-        expectAudit
-          .module('./lib/primary-in-repo-addon/_app_/services/primary.js')
-          .resolves('secondary-in-repo-addon/components/secondary')
-          .to('./lib/secondary-in-repo-addon/components/secondary.js');
+        resolveEntryPoint(expectAudit)
+          .resolves(/services\/primary\.js/)
+          .toModule()
+          .resolves(/secondary-in-repo-addon\/components\/secondary\.js/)
+          .toModule()
+          .codeContains('// secondary component');
       });
     });
   });
@@ -169,14 +189,16 @@ stage2Scenarios
     let depA = addAddon(app, 'dep-a');
 
     merge(depB.files, {
-      app: { service: { 'addon.js': 'dep-b', 'dep-wins-over-dev.js': 'dep-b', 'in-repo-over-deps.js': 'dep-b' } },
+      app: {
+        service: { 'addon.js': '// dep-b', 'dep-wins-over-dev.js': '// dep-b', 'in-repo-over-deps.js': '// dep-b' },
+      },
     });
-    merge(depA.files, { app: { service: { 'addon.js': 'dep-a' } } });
+    merge(depA.files, { app: { service: { 'addon.js': '// dep-a' } } });
 
     addInRepoAddon(app, 'in-repo-a', {
-      app: { service: { 'in-repo.js': 'in-repo-a', 'in-repo-over-deps.js': 'in-repo-a' } },
+      app: { service: { 'in-repo.js': '// in-repo-a', 'in-repo-over-deps.js': '// in-repo-a' } },
     });
-    addInRepoAddon(app, 'in-repo-b', { app: { service: { 'in-repo.js': 'in-repo-b' } } });
+    addInRepoAddon(app, 'in-repo-b', { app: { service: { 'in-repo.js': '// in-repo-b' } } });
 
     let devA = addDevAddon(app, 'dev-a');
     let devB = addDevAddon(app, 'dev-b');
@@ -188,56 +210,130 @@ stage2Scenarios
     (devB.pkg['ember-addon'] as any).after = 'dev-e';
     (devF.pkg['ember-addon'] as any).before = 'dev-d';
 
-    merge(devA.files, { app: { service: { 'dev-addon.js': 'dev-a', 'dep-wins-over-dev.js': 'dev-a' } } });
-    merge(devB.files, { app: { service: { 'test-after.js': 'dev-b' } } });
-    merge(devC.files, { app: { service: { 'dev-addon.js': 'dev-c' } } });
-    merge(devD.files, { app: { service: { 'test-before.js': 'dev-d' } } });
-    merge(devE.files, { app: { service: { 'test-after.js': 'dev-e' } } });
-    merge(devF.files, { app: { service: { 'test-before.js': 'dev-f' } } });
+    merge(devA.files, { app: { service: { 'dev-addon.js': '// dev-a', 'dep-wins-over-dev.js': '// dev-a' } } });
+    merge(devB.files, { app: { service: { 'test-after.js': '// dev-b' } } });
+    merge(devC.files, { app: { service: { 'dev-addon.js': '// dev-c' } } });
+    merge(devD.files, { app: { service: { 'test-before.js': '// dev-d' } } });
+    merge(devE.files, { app: { service: { 'test-after.js': '// dev-e' } } });
+    merge(devF.files, { app: { service: { 'test-before.js': '// dev-f' } } });
   })
   .forEachScenario(scenario => {
     Qmodule(scenario.name, function (hooks) {
       throwOnWarnings(hooks);
 
       let app: PreparedApp;
+      let server: CommandWatcher;
+      let appURL: string;
 
-      hooks.before(async assert => {
+      hooks.before(async () => {
         app = await scenario.prepare();
-        let result = await app.execute('ember build', { env: { EMBROIDER_PREBUILD: 'true' } });
-        assert.equal(result.exitCode, 0, result.output);
+        server = CommandWatcher.launch('vite', ['--clearScreen', 'false'], { cwd: app.dir });
+        [, appURL] = await server.waitFor(/Local:\s+(https?:\/\/.*)\//g);
       });
 
-      let expectAudit = setupAuditTest(hooks, () => ({ app: app.dir, 'reuse-build': true }));
+      hooks.after(async () => {
+        await server?.shutdown();
+      });
+
+      let expectAudit = setupAuditTest(hooks, () => ({
+        appURL,
+        startingFrom: ['index.html'],
+        fetch: fetch as unknown as typeof globalThis.fetch,
+      }));
 
-      test('verifies that the correct lexigraphically sorted addons win', function () {
+      test('verifies that the correct lexigraphically sorted addons win', function (assert) {
         let expectModule = resolveEntryPoint(expectAudit);
-        expectModule.resolves('./service/in-repo.js').to('./lib/in-repo-b/_app_/service/in-repo.js');
-        expectModule.resolves('./service/addon.js').to('./node_modules/dep-b/_app_/service/addon.js');
-        expectModule.resolves('./service/dev-addon.js').to('./node_modules/dev-c/_app_/service/dev-addon.js');
+        expectModule.withContents(contents => {
+          const result = /import \* as (\w+) from ".*in-repo-b\/_app_\/service\/in-repo.js.*/.exec(contents) ?? [];
+          const [, amdModule] = result;
+          assert.codeContains(
+            contents,
+            `d("my-app/service/in-repo", function () {
+              return ${amdModule};
+            });`
+          );
+          return true;
+        }, 'module imports from the correct place');
+        expectModule.withContents(contents => {
+          const result = /import \* as (\w+) from ".*dep-b\/_app_\/service\/addon.js.*/.exec(contents) ?? [];
+          const [, amdModule] = result;
+          assert.codeContains(
+            contents,
+            `d("my-app/service/addon", function () {
+              return ${amdModule};
+            });`
+          );
+          return true;
+        }, 'module imports from the correct place');
+        expectModule.withContents(contents => {
+          const result = /import \* as (\w+) from ".*dev-c\/_app_\/service\/dev-addon.js.*/.exec(contents) ?? [];
+          const [, amdModule] = result;
+          assert.codeContains(
+            contents,
+            `d("my-app/service/dev-addon", function () {
+              return ${amdModule};
+            });`
+          );
+          return true;
+        }, 'module imports from the correct place');
       });
 
-      test('addons declared as dependencies should win over devDependencies', function () {
-        resolveEntryPoint(expectAudit)
-          .resolves('./service/dep-wins-over-dev.js')
-          .to('./node_modules/dep-b/_app_/service/dep-wins-over-dev.js');
+      test('addons declared as dependencies should win over devDependencies', function (assert) {
+        resolveEntryPoint(expectAudit).withContents(contents => {
+          const result =
+            /import \* as (\w+) from ".*dep-b\/_app_\/service\/dep-wins-over-dev.js.*/.exec(contents) ?? [];
+          const [, amdModule] = result;
+          assert.codeContains(
+            contents,
+            `d("my-app/service/dep-wins-over-dev", function () {
+              return ${amdModule};
+            });`
+          );
+          return true;
+        });
       });
 
-      test('in repo addons declared win over dependencies', function () {
-        resolveEntryPoint(expectAudit)
-          .resolves('./service/in-repo-over-deps.js')
-          .to('./lib/in-repo-a/_app_/service/in-repo-over-deps.js');
+      test('in repo addons declared win over dependencies', function (assert) {
+        resolveEntryPoint(expectAudit).withContents(contents => {
+          const result =
+            /import \* as (\w+) from ".*in-repo-a\/_app_\/service\/in-repo-over-deps.js.*/.exec(contents) ?? [];
+          const [, amdModule] = result;
+          assert.codeContains(
+            contents,
+            `d("my-app/service/in-repo-over-deps", function () {
+              return ${amdModule};
+            });`
+          );
+          return true;
+        });
       });
 
-      test('ordering with before specified', function () {
-        resolveEntryPoint(expectAudit)
-          .resolves('./service/test-before.js')
-          .to('./node_modules/dev-d/_app_/service/test-before.js');
+      test('ordering with before specified', function (assert) {
+        resolveEntryPoint(expectAudit).withContents(contents => {
+          const result = /import \* as (\w+) from ".*dev-d\/_app_\/service\/test-before.js.*/.exec(contents) ?? [];
+          const [, amdModule] = result;
+          assert.codeContains(
+            contents,
+            `d("my-app/service/test-before", function () {
+              return ${amdModule};
+            });`
+          );
+          return true;
+        });
       });
 
-      test('ordering with after specified', function () {
-        resolveEntryPoint(expectAudit)
-          .resolves('./service/test-after.js')
-          .to('./node_modules/dev-b/_app_/service/test-after.js');
+      test('ordering with after specified', function (assert) {
+        resolveEntryPoint(expectAudit).withContents(contents => {
+          const result = /import \* as (\w+) from ".*dev-b\/_app_\/service\/test-after.js.*/.exec(contents) ?? [];
+          const [, amdModule] = result;
+          assert.codeContains(
+            contents,
+            `d("my-app/service/test-after", function () {
+              return ${amdModule};
+            });`
+          );
+          return true;
+        });
       });
     });
   });
@@ -481,17 +577,15 @@ stage2Scenarios
       throwOnWarnings(hooks);
 
       let app: PreparedApp;
+      let server: CommandWatcher;
+      let appURL: string;
       let expectFile: ExpectFile;
       let build: Transpiler;
-      let builder: Rebuilder;
 
       hooks.before(async () => {
         app = await scenario.prepare();
-        builder = await Rebuilder.create(app.dir, { EMBROIDER_PREBUILD: 'true' });
-      });
-
-      hooks.after(async () => {
-        await builder?.shutdown();
+        server = CommandWatcher.launch('vite', ['--clearScreen', 'false'], { cwd: app.dir });
+        [, appURL] = await server.waitFor(/Local:\s+(https?:\/\/.*)\//g);
       });
 
       hooks.beforeEach(assert => {
@@ -499,7 +593,15 @@ stage2Scenarios
         build = new Transpiler(app.dir);
       });
 
-      let expectAudit = setupAuditTest(hooks, () => ({ app: app.dir, 'reuse-build': true }));
+      hooks.after(async () => {
+        await server?.shutdown();
+      });
+
+      let expectAudit = setupAuditTest(hooks, () => ({
+        appURL,
+        startingFrom: ['index.html'],
+        fetch: fetch as unknown as typeof globalThis.fetch,
+      }));
 
       test('no audit issues', function () {
         // among other things, this is asserting that dynamicComponent in
diff --git a/tests/scenarios/compat-template-colocation-test.ts b/tests/scenarios/compat-template-colocation-test.ts
index 04eaf81354..fe10732aa6 100644
--- a/tests/scenarios/compat-template-colocation-test.ts
+++ b/tests/scenarios/compat-template-colocation-test.ts
@@ -72,9 +72,9 @@ function checkContents(
 ) {
   let resolved = expectAudit
     .module('./index.html')
-    .resolves('/app-boot.js')
+    .resolves(/\/index.html.*/) // in-html app-boot script
     .toModule()
-    .resolves(/\/app\.[jt]s.*/)
+    .resolves(/\/app\.js.*/)
     .toModule()
     .resolves(/.*\/-embroider-entrypoint.js/);
 
@@ -247,28 +247,38 @@ scenarios
       throwOnWarnings(hooks);
 
       let app: PreparedApp;
+      let server: CommandWatcher;
+      let appURL: string;
       let expectFile: ExpectFile;
 
-      hooks.before(async assert => {
+      hooks.before(async () => {
         app = await scenario.prepare();
-        let result = await app.execute('ember build', { env: { EMBROIDER_PREBUILD: 'true' } });
-        assert.equal(result.exitCode, 0, result.output);
+        server = CommandWatcher.launch('vite', ['--clearScreen', 'false'], { cwd: app.dir });
+        [, appURL] = await server.waitFor(/Local:\s+(https?:\/\/.*)\//g);
       });
 
       hooks.beforeEach(assert => {
         expectFile = expectRewrittenFilesAt(app.dir, { qunit: assert });
       });
 
-      let expectAudit = setupAuditTest(hooks, () => ({ app: app.dir }));
+      hooks.after(async () => {
+        await server?.shutdown();
+      });
+
+      let expectAudit = setupAuditTest(hooks, () => ({
+        appURL,
+        startingFrom: ['index.html'],
+        fetch: fetch as unknown as typeof globalThis.fetch,
+      }));
 
       test(`app's colocated components are not implicitly included`, function (assert) {
         expectAudit
-          .module('./tmp/rewritten-app/index.html')
-          .resolves('/app-boot.js')
+          .module('./index.html')
+          .resolves(/\/index.html.*/) // in-html app-boot script
           .toModule()
-          .resolves('./app')
+          .resolves(/\/app\.js.*/)
           .toModule()
-          .resolves('@embroider/core/entrypoint')
+          .resolves(/.*\/-embroider-entrypoint.js/)
           .toModule()
           .withContents(content => {
             assert.notOk(/import \* as (\w+) from "\.\/components\/has-colocated-component.js"/.test(content));
@@ -349,26 +359,36 @@ appScenarios
       throwOnWarnings(hooks);
 
       let app: PreparedApp;
+      let server: CommandWatcher;
+      let appURL: string;
 
-      hooks.before(async assert => {
+      hooks.before(async () => {
         app = await scenario.prepare();
-        let result = await app.execute('ember build', { env: { EMBROIDER_PREBUILD: 'true' } });
-        assert.equal(result.exitCode, 0, result.output);
+        server = CommandWatcher.launch('vite', ['--clearScreen', 'false'], { cwd: app.dir });
+        [, appURL] = await server.waitFor(/Local:\s+(https?:\/\/.*)\//g);
+      });
+
+      hooks.after(async () => {
+        await server?.shutdown();
       });
 
-      let expectAudit = setupAuditTest(hooks, () => ({ app: app.dir }));
+      let expectAudit = setupAuditTest(hooks, () => ({
+        appURL,
+        startingFrom: ['index.html'],
+        fetch: fetch as unknown as typeof globalThis.fetch,
+      }));
 
       test(`app's pod components and templates are implicitly included correctly`, function (assert) {
         expectAudit
-          .module('./tmp/rewritten-app/index.html')
-          .resolves('/app-boot.js')
+          .module('./index.html')
+          .resolves(/\/index.html.*/) // in-html app-boot script
           .toModule()
-          .resolves('./app')
+          .resolves(/\/app\.js.*/)
           .toModule()
-          .resolves('@embroider/core/entrypoint')
+          .resolves(/.*\/-embroider-entrypoint.js/)
           .toModule()
           .withContents(content => {
-            let result = /import \* as (\w+) from "\.\/components\/pod-component\/component.js"/.exec(content);
+            let result = /import \* as (\w+) from "\/components\/pod-component\/component\.js"/.exec(content);
 
             if (!result) {
               throw new Error('Could not find pod component');
@@ -383,7 +403,7 @@ appScenarios
             });`
             );
 
-            result = /import \* as (\w+) from "\.\/components\/pod-component\/template.hbs"/.exec(content);
+            result = /import \* as (\w+) from "\/components\/pod-component\/template\.hbs.*"/.exec(content);
 
             if (!result) {
               throw new Error('Could not find pod component template');
@@ -398,7 +418,7 @@ appScenarios
             });`
             );
 
-            result = /import \* as (\w+) from "\.\/components\/template-only\/template.hbs"/.exec(content);
+            result = /import \* as (\w+) from "\/components\/template-only\/template\.hbs.*"/.exec(content);
 
             if (!result) {
               throw new Error('Could not find template only component');
diff --git a/tests/ts-app-template/app/app-boot.js b/tests/ts-app-template/app/app-boot.js
deleted file mode 100644
index 6b7181516c..0000000000
--- a/tests/ts-app-template/app/app-boot.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import Application from './app';
-import environment from './config/environment';
-
-Application.create(environment.APP);
diff --git a/tests/ts-app-template/app/index.html b/tests/ts-app-template/app/index.html
index 2823ca2f3d..8fcb46225b 100644
--- a/tests/ts-app-template/app/index.html
+++ b/tests/ts-app-template/app/index.html
@@ -17,7 +17,12 @@
     {{content-for "body"}}
 
     <script src="/@embroider/core/vendor.js"></script>
-    <script src="/app-boot.js" type="module"></script>
+    <script type="module">
+      import Application from './app';
+      import environment from './config/environment';
+
+      Application.create(environment.APP);
+    </script>
 
     {{content-for "body-footer"}}
   </body>
diff --git a/tests/ts-app-template/tests/index.html b/tests/ts-app-template/tests/index.html
index 12492c4806..775da4da1e 100644
--- a/tests/ts-app-template/tests/index.html
+++ b/tests/ts-app-template/tests/index.html
@@ -30,7 +30,6 @@
     <script src="/testem.js" integrity="" data-embroider-ignore></script>
     <script src="/@embroider/core/vendor.js"></script>
     <script src="/@embroider/core/test-support.js"></script>
-    <script src="/app-boot.js" type="module"></script>
     <script src="/@embroider/core/test-entrypoint" type="module"></script>
 
     {{content-for "body-footer"}}