fix: reset HTMLEntrypoint state after build (fix embroider-build#1211)

jacobq · Jun 3, 2022 · b7c45af · b7c45af
1 parent aec11b7
commit b7c45af
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/packages/core/src/html-entrypoint.ts b/packages/core/src/html-entrypoint.ts
@@ -8,7 +8,7 @@ import Placeholder from './html-placeholder';
 import { Variant } from './packager';
 
 export class HTMLEntrypoint {
-  private dom: JSDOM;
+  private dom!: JSDOM;
   private placeholders: Map<string, Placeholder[]> = new Map();
   modules: string[] = [];
   scripts: string[] = [];
@@ -20,6 +20,10 @@ export class HTMLEntrypoint {
     private publicAssetURL: string,
     public filename: string
   ) {
+    this.initialize();
+  }
+
+  initialize() {
     this.dom = new JSDOM(readFileSync(join(this.pathToVanillaApp, this.filename), 'utf8'));
 
     for (let tag of this.handledStyles()) {

diff --git a/packages/webpack/src/ember-webpack.ts b/packages/webpack/src/ember-webpack.ts
@@ -205,6 +205,10 @@ const Webpack: PackagerConstructor<Options> = class Webpack implements Packager
           compiler.hooks.done.tapPromise('EmbroiderPlugin', async stats => {
             this.summarizeStats(stats, variant, variantIndex);
             await this.writeFiles(this.bundleSummary, appInfo, variantIndex);
+            // If this webpack instance / appInfo will be reused for a
+            // subsequent build then we need to be careful not to reuse the
+            // internal JSDOM state encapsulated within it.
+            appInfo.entrypoints.forEach(ep => ep.initialize());
           });
         },
       ],