From e799c33ca34d178597feb03af20c6ae0af2caa00 Mon Sep 17 00:00:00 2001
From: Jason Johnston <jason.johnston@protectwise.com>
Date: Fri, 4 May 2018 16:01:31 -0600
Subject: [PATCH] Fix performance regression caused by parsing sourcemaps on
 every warning/error output

---
 src/index.js | 44 +++++++++++++++++++-------------------------
 1 file changed, 19 insertions(+), 25 deletions(-)

diff --git a/src/index.js b/src/index.js
index a604dc19..13850b52 100644
--- a/src/index.js
+++ b/src/index.js
@@ -48,18 +48,11 @@ class UglifyJsPlugin {
         ...uglifyOptions,
       },
     };
-    this.sourceMapsCache = new WeakMap();
   }
 
-  buildError(err, file, inputSourceMap, requestShortener) {
+  static buildError(err, file, sourceMap, requestShortener) {
     // Handling error which should have line, col, filename and message
     if (err.line) {
-      const sourceMapCacheKey = { file };
-      let sourceMap = this.sourceMapsCache.get(sourceMapCacheKey);
-      if (!sourceMap) {
-        sourceMap = new SourceMapConsumer(inputSourceMap);
-        this.sourceMapsCache.set(sourceMapCacheKey, sourceMap);
-      }
       const original = sourceMap && sourceMap.originalPositionFor({
         line: err.line,
         column: err.col,
@@ -74,20 +67,11 @@ class UglifyJsPlugin {
     return new Error(`${file} from UglifyJs\n${err.message}`);
   }
 
-  buildWarning(warning, file, inputSourceMap, warningsFilter, requestShortener) {
-    if (!file || !inputSourceMap) {
+  static buildWarning(warning, file, sourceMap, warningsFilter, requestShortener) {
+    if (!file || !sourceMap) {
       return warning;
     }
 
-    const sourceMapCacheKey = { file };
-
-    let sourceMap = this.sourceMapsCache.get(sourceMapCacheKey);
-
-    if (!sourceMap) {
-      sourceMap = new SourceMapConsumer(inputSourceMap);
-      this.sourceMapsCache.set(sourceMapCacheKey, sourceMap);
-    }
-
     const match = warningRegex.exec(warning);
     const line = +match[1];
     const column = +match[2];
@@ -187,11 +171,15 @@ class UglifyJsPlugin {
 
             tasks.push(task);
           } catch (error) {
+            let sourceMap = null;
+            if (inputSourceMap && utils.isSourceMap(inputSourceMap)) {
+              sourceMap = new SourceMapConsumer(inputSourceMap);
+            }
             compilation.errors.push(
-              this.buildError(
+              UglifyJsPlugin.buildError(
                 error,
                 file,
-                inputSourceMap,
+                sourceMap,
                 requestShortener,
               ),
             );
@@ -208,14 +196,20 @@ class UglifyJsPlugin {
           const { file, input, inputSourceMap, commentsFile } = tasks[index];
           const { error, map, code, warnings, extractedComments } = data;
 
+          // Create source map if needed
+          let sourceMap = null;
+          if (inputSourceMap && utils.isSourceMap(inputSourceMap) && (error || (warnings && warnings.length > 0))) {
+            sourceMap = new SourceMapConsumer(inputSourceMap);
+          }
+
           // Handling results
           // Error case: add errors, and go to next file
           if (error) {
             compilation.errors.push(
-              this.buildError(
+              UglifyJsPlugin.buildError(
                 error,
                 file,
-                inputSourceMap,
+                sourceMap,
                 requestShortener,
               ),
             );
@@ -275,10 +269,10 @@ class UglifyJsPlugin {
           // Handling warnings
           if (warnings && warnings.length > 0) {
             warnings.forEach((warning) => {
-              const builtWarning = this.buildWarning(
+              const builtWarning = UglifyJsPlugin.buildWarning(
                 warning,
                 file,
-                inputSourceMap,
+                sourceMap,
                 this.options.warningsFilter,
                 requestShortener,
               );