fix: skip double compression for child compilation

webpack-contrib · Aug 3, 2020 · 37cc813 · 37cc813
1 parent 718b1ce
commit 37cc813
Show file tree

Hide file tree

Showing 4 changed files with 70 additions and 37 deletions.
diff --git a/src/Webpack5Cache.js b/src/Webpack5Cache.js
@@ -14,7 +14,7 @@ export default class Cache {
   async get(task) {
     // eslint-disable-next-line no-param-reassign
     task.cacheIdent =
-      task.cacheIdent || `${task.file}|${serialize(task.cacheKeys)}`;
+      task.cacheIdent || `${task.name}|${serialize(task.cacheKeys)}`;
     // eslint-disable-next-line no-param-reassign
     task.cacheETag =
       task.cacheETag || this.cache.getLazyHashedEtag(task.assetSource);

diff --git a/src/index.js b/src/index.js
@@ -155,18 +155,6 @@ class TerserPlugin {
     return `Terser Plugin: ${warningMessage}${locationMessage}`;
   }
 
-  static removeQueryString(filename) {
-    let targetFilename = filename;
-
-    const queryStringIdx = targetFilename.indexOf('?');
-
-    if (queryStringIdx >= 0) {
-      targetFilename = targetFilename.substr(0, queryStringIdx);
-    }
-
-    return targetFilename;
-  }
-
   static isWebpack4() {
     return webpackVersion[0] === '4';
   }
@@ -181,8 +169,48 @@ class TerserPlugin {
       : Math.min(Number(parallel) || 0, cpus.length - 1);
   }
 
-  *taskGenerator(compiler, compilation, allExtractedComments, file) {
-    const assetSource = compilation.assets[file];
+  // eslint-disable-next-line consistent-return
+  static getAsset(compilation, name) {
+    // New API
+    if (compilation.getAsset) {
+      return compilation.getAsset(name);
+    }
+
+    if (compilation.assets[name]) {
+      return { name, source: compilation.assets[name], info: {} };
+    }
+  }
+
+  static emitAsset(compilation, name, source, assetInfo) {
+    // New API
+    if (compilation.emitAsset) {
+      compilation.emitAsset(name, source, assetInfo);
+    }
+
+    // eslint-disable-next-line no-param-reassign
+    compilation.assets[name] = source;
+  }
+
+  static updateAsset(compilation, name, newSource, assetInfo) {
+    // New API
+    if (compilation.updateAsset) {
+      compilation.updateAsset(name, newSource, assetInfo);
+    }
+
+    // eslint-disable-next-line no-param-reassign
+    compilation.assets[name] = newSource;
+  }
+
+  *taskGenerator(compiler, compilation, allExtractedComments, name) {
+    const { info, source: assetSource } = TerserPlugin.getAsset(
+      compilation,
+      name
+    );
+
+    // Skip double minimize assets from child compilation
+    if (info.minimized) {
+      yield false;
+    }
 
     let input;
     let inputSourceMap;
@@ -200,7 +228,7 @@ class TerserPlugin {
           inputSourceMap = map;
 
           compilation.warnings.push(
-            new Error(`${file} contains invalid source map`)
+            new Error(`${name} contains invalid source map`)
           );
         }
       }
@@ -221,7 +249,7 @@ class TerserPlugin {
         this.options.extractComments.filename || '[file].LICENSE.txt[query]';
 
       let query = '';
-      let filename = file;
+      let filename = name;
 
       const querySplit = filename.indexOf('?');
 
@@ -259,7 +287,7 @@ class TerserPlugin {
         compilation.errors.push(
           TerserPlugin.buildError(
             error,
-            file,
+            name,
             sourceMap,
             new RequestShortener(compiler.context)
           )
@@ -290,7 +318,7 @@ class TerserPlugin {
       if (map) {
         outputSource = new SourceMapSource(
           code,
-          file,
+          name,
           map,
           input,
           inputSourceMap,
@@ -309,7 +337,7 @@ class TerserPlugin {
           banner =
             this.options.extractComments.banner ||
             `For license information please see ${path
-              .relative(path.dirname(file), commentsFilename)
+              .relative(path.dirname(name), commentsFilename)
               .replace(/\\/g, '/')}`;
 
           if (typeof banner === 'function') {
@@ -341,10 +369,13 @@ class TerserPlugin {
         });
 
         // Extracted comments from child compilation
-        const previousExtractedComments = compilation.assets[commentsFilename];
+        const previousExtractedComments = TerserPlugin.getAsset(
+          compilation,
+          commentsFilename
+        );
 
         if (previousExtractedComments) {
-          const previousExtractedCommentsSource = previousExtractedComments.source();
+          const previousExtractedCommentsSource = previousExtractedComments.source.source();
 
           // Restore original comments and re-add them
           previousExtractedCommentsSource
@@ -356,16 +387,17 @@ class TerserPlugin {
         }
       }
 
-      // Updating assets
-      // eslint-disable-next-line no-param-reassign
-      compilation.assets[file] = outputSource;
+      TerserPlugin.updateAsset(compilation, name, outputSource, {
+        ...info,
+        minimized: true,
+      });
 
       // Handling warnings
       if (warnings && warnings.length > 0) {
         warnings.forEach((warning) => {
           const builtWarning = TerserPlugin.buildWarning(
             warning,
-            file,
+            name,
             sourceMap,
             new RequestShortener(compiler.context),
             this.options.warningsFilter
@@ -379,7 +411,7 @@ class TerserPlugin {
     };
 
     const task = {
-      file,
+      name,
       input,
       inputSourceMap,
       commentsFilename,
@@ -410,11 +442,11 @@ class TerserPlugin {
           'terser-webpack-plugin': require('../package.json').version,
           'terser-webpack-plugin-options': this.options,
           nodeVersion: process.version,
-          filename: file,
+          name,
           contentHash: digest.substr(0, hashDigestLength),
         };
 
-        task.cacheKeys = this.options.cacheKeys(defaultCacheKeys, file);
+        task.cacheKeys = this.options.cacheKeys(defaultCacheKeys, name);
       }
     } else {
       // For webpack@5 cache
@@ -619,9 +651,10 @@ class TerserPlugin {
           .sort()
           .join('\n\n');
 
-        // eslint-disable-next-line no-param-reassign
-        compilation.assets[commentsFilename] = new RawSource(
-          `${extractedComments}\n`
+        TerserPlugin.emitAsset(
+          compilation,
+          commentsFilename,
+          new RawSource(`${extractedComments}\n`)
         );
       });
 

diff --git a/src/minify.js b/src/minify.js
@@ -146,10 +146,10 @@ const buildComments = (options, terserOptions, extractedComments) => {
 };
 
 const minify = (options) => {
-  const { file, input, inputSourceMap, minify: minifyFn } = options;
+  const { name, input, inputSourceMap, minify: minifyFn } = options;
 
   if (minifyFn) {
-    return minifyFn({ [file]: input }, inputSourceMap);
+    return minifyFn({ [name]: input }, inputSourceMap);
   }
 
   // Copy terser options
@@ -169,7 +169,7 @@ const minify = (options) => {
   );
 
   const { error, map, code, warnings } = terserMinify(
-    { [file]: input },
+    { [name]: input },
     terserOptions
   );
 

diff --git a/test/worker.test.js b/test/worker.test.js
@@ -88,7 +88,7 @@ describe('worker', () => {
 
   it('should match snapshot with options.inputSourceMap', () => {
     const options = {
-      file: 'test6.js',
+      name: 'test6.js',
       input: 'function foo(x) { if (x) { return bar(); not_called1(); } }',
       inputSourceMap: {
         version: 3,
@@ -99,6 +99,6 @@ describe('worker', () => {
     };
     const workerResult = transform(serialize(options));
 
-    expect(workerResult).toMatchSnapshot(options.file);
+    expect(workerResult).toMatchSnapshot(options.name);
   });
 });