Emit assets correctly

vercel · Aug 2, 2020 · cb3c096 · cb3c096
1 parent 0052fe1
commit cb3c096
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 49 deletions.
diff --git a/packages/next/build/webpack/plugins/build-manifest-plugin.ts b/packages/next/build/webpack/plugins/build-manifest-plugin.ts
@@ -69,8 +69,7 @@ export default class BuildManifestPlugin {
     this.modern = options.modern
   }
 
-  createAssets(compilation: any) {
-    const assets: { [name: string]: any } = {}
+  createAssets(compilation: any, assets: any) {
     const namedChunks: Map<string, CompilationType.Chunk> =
       compilation.namedChunks
     const assetMap: BuildManifest = {
@@ -213,27 +212,15 @@ export default class BuildManifestPlugin {
             stage: webpack.Compilation.PROCESS_ASSETS_STAGE_ADDITIONS,
           },
           (assets: any) => {
-            const additionalAssets = this.createAssets(compilation)
-            return {
-              ...assets,
-              ...additionalAssets,
-            }
+            this.createAssets(compilation, assets)
           }
         )
       })
       return
     }
 
-    compiler.hooks.emit.tapAsync(
-      'NextJsBuildManifest',
-      (compilation: any, callback: any) => {
-        const additionalAssets = this.createAssets(compilation)
-        compilation.assets = {
-          ...compilation.assets,
-          ...additionalAssets,
-        }
-        callback()
-      }
-    )
+    compiler.hooks.emit.tap('NextJsBuildManifest', (compilation: any) => {
+      this.createAssets(compilation, compilation.assets)
+    })
   }
 }
diff --git a/packages/next/build/webpack/plugins/pages-manifest-plugin.ts b/packages/next/build/webpack/plugins/pages-manifest-plugin.ts
@@ -17,8 +17,7 @@ export default class PagesManifestPlugin implements Plugin {
     this.serverless = serverless
   }
 
-  createAssets(compilation: any) {
-    const assets: { [name: string]: any } = {}
+  createAssets(compilation: any, assets: any) {
     const entrypoints = compilation.entrypoints
     const pages: PagesManifest = {}
 
@@ -49,7 +48,6 @@ export default class PagesManifestPlugin implements Plugin {
     }
 
     assets[PAGES_MANIFEST] = new RawSource(JSON.stringify(pages, null, 2))
-    return assets
   }
 
   apply(compiler: Compiler): void {
@@ -63,27 +61,15 @@ export default class PagesManifestPlugin implements Plugin {
             stage: webpack.Compilation.PROCESS_ASSETS_STAGE_ADDITIONS,
           },
           (assets: any) => {
-            const additionalAssets = this.createAssets(compilation)
-            return {
-              ...assets,
-              ...additionalAssets,
-            }
+            this.createAssets(compilation, assets)
           }
         )
       })
       return
     }
 
-    compiler.hooks.emit.tapAsync(
-      'NextJsPagesManifest',
-      (compilation: any, callback: any) => {
-        const additionalAssets = this.createAssets(compilation)
-        compilation.assets = {
-          ...compilation.assets,
-          ...additionalAssets,
-        }
-        callback()
-      }
-    )
+    compiler.hooks.emit.tap('NextJsPagesManifest', (compilation: any) => {
+      this.createAssets(compilation, compilation.assets)
+    })
   }
 }
diff --git a/packages/next/build/webpack/plugins/react-loadable-plugin.ts b/packages/next/build/webpack/plugins/react-loadable-plugin.ts
@@ -106,8 +106,7 @@ export class ReactLoadablePlugin {
     this.filename = opts.filename
   }
 
-  createAssets(compiler: any, compilation: any) {
-    const assets: { [name: string]: any } = {}
+  createAssets(compiler: any, compilation: any, assets: any) {
     const manifest = buildManifest(compiler, compilation)
     var json = JSON.stringify(manifest, null, 2)
     assets[this.filename] = {
@@ -132,23 +131,15 @@ export class ReactLoadablePlugin {
             stage: webpack.Compilation.PROCESS_ASSETS_STAGE_ADDITIONS,
           },
           (assets: any) => {
-            const additionalAssets = this.createAssets(compiler, compilation)
-            return {
-              ...assets,
-              ...additionalAssets,
-            }
+            this.createAssets(compiler, compilation, assets)
           }
         )
       })
       return
     }
 
     compiler.hooks.emit.tap('ReactLoadableManifest', (compilation: any) => {
-      const additionalAssets = this.createAssets(compiler, compilation)
-      compilation.assets = {
-        ...compilation.assets,
-        ...additionalAssets,
-      }
+      this.createAssets(compiler, compilation, compilation.assets)
     })
   }
 }