feat(new index.html): pass the entrypoint from app to rewritten-app

embroider-build · May 16, 2024 · 95be548 · 95be548
1 parent 9256886
commit 95be548
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/packages/compat/src/compat-app-builder.ts b/packages/compat/src/compat-app-builder.ts
@@ -381,9 +381,9 @@ export class CompatAppBuilder {
 
     // our tests entrypoint already includes a correct module dependency on the
     // app, so we only insert the app when we're not inserting tests
-    if (!asset.fileAsset.includeTests) {
-      html.insertScriptTag(html.javascript, '@embroider/core/entrypoint', { type: 'module' });
-    }
+    // if (!asset.fileAsset.includeTests) {
+    //   html.insertScriptTag(html.javascript, '@embroider/core/entrypoint', { type: 'module' });
+    // }
 
     if (this.fastbootConfig) {
       // any extra fastboot app files get inserted into our html.javascript

diff --git a/packages/compat/src/compat-app.ts b/packages/compat/src/compat-app.ts
@@ -701,12 +701,11 @@ export default class CompatApp {
   }
 
   findAppScript(scripts: HTMLScriptElement[], entrypoint: string): HTMLScriptElement {
-    let appJS = scripts.find(
-      script => this.withoutRootURL(script.src) === this.legacyEmberAppInstance.options.outputPaths.app.js
-    );
+    let moduleName = '/@embroider/core/entrypoint';
+    let appJS = scripts.find(script => this.withoutRootURL(script.src) === moduleName);
     return throwIfMissing(
       appJS,
-      this.legacyEmberAppInstance.options.outputPaths.app.js,
+      moduleName,
       scripts.map(s => s.src),
       entrypoint,
       'app javascript'

diff --git a/packages/core/src/ember-html.ts b/packages/core/src/ember-html.ts
@@ -84,7 +84,7 @@ export class PreparedEmberHTML {
   constructor(private asset: EmberAsset) {
     this.dom = new JSDOM(readFileSync(asset.sourcePath, 'utf8'));
     let html = asset.prepare(this.dom);
-    this.javascript = Placeholder.replacing(html.javascript);
+    this.javascript = Placeholder.find(html.javascript);
     this.styles = Placeholder.replacing(html.styles);
     this.implicitScripts = Placeholder.find(html.implicitScripts);
     this.testJavascript = html.testJavascript