Refactor callbacks

Author: GwendolenLynch

lib/plugin.js

@@ -1,12 +1,13 @@
 require('require-safe')('html-webpack-plugin');
 
-// Escape a string suitable for using in regex
-function esc(string) {
-    return string ? string.replace(/[.*+?^${}()|[\]\\]/g, '\\$&') : string;
+// Create a regular expression to search for a file by chunk name & extension, including associated source maps
+function regex(chunkName, fileExt) {
+    return new RegExp(`^(?:\\/\\w+\\/|)(${chunkName})(?:.*)(\\.${fileExt})(\\.map|)$`);
 }
 
 class WebpackHashExcludePlugin {
     options;
+    changes = {};
 
     constructor(options) {
         this.options = Object.assign({
@@ -16,34 +17,36 @@ class WebpackHashExcludePlugin {
         }, options);
     }
 
-    removeAssetsHash(compilation, callback){
-        const renameChunkFiles = (compilation, index, chunkName, filename, suffix) => {
-            const reg = new RegExp(`(${esc(chunkName)})(?:.*)(\.${suffix}|\.${suffix}\.map)$`);
-            const newFilename = filename.replace(reg, '$1$2');
-            if (newFilename === filename) return;
-            compilation.chunks[index].files.splice(index, 1, newFilename);
-            compilation.assets[newFilename] = compilation.assets[filename];
-            delete compilation.assets[filename];
-
+    removeAssetsHash(compilation, callback) {
+        const matchingChunks = compilation.chunks
+            .filter((chunk) => this.options.excludeJs.indexOf(chunk.name) > -1 || this.options.excludeCss.indexOf(chunk.name) > -1);
+        matchingChunks.forEach((chunk) => {
+            if (this.options.excludeJs.indexOf(chunk.name) > -1) {
+                this.renameChunkFiles(chunk, 'js');
+            }
+            if (this.options.excludeCss.indexOf(chunk.name) > -1) {
+                this.renameChunkFiles(chunk, 'css');
+            }
+        });
+        // compilation.assets & compilation.assetsInfo
+        for (let [oldFileName, newFileName] of Object.entries(this.changes)) {
+            compilation.assets[newFileName] = compilation.assets[oldFileName];
+            delete compilation.assets[oldFileName];
 
-            compilation.entrypoints.get(chunkName).chunks.map((chunk) => {
-                if (chunk.name === chunkName) {
-                    chunk.files = chunk.files.map((file) => file.replace(reg, '$1$2'));
-                }
-            });
-        };
+            compilation.assetsInfo.set(newFileName, compilation.assetsInfo.get(oldFileName));
+            compilation.assetsInfo.delete(oldFileName);
+        }
+        callback();
+    }
 
-        compilation.chunks.forEach((chunk) => {
-            chunk.files.forEach((filename, index) => {
-                if (this.options.excludeJs.indexOf(chunk.name) > -1 && filename.indexOf('js') > -1) {
-                    renameChunkFiles(compilation, index, chunk.name, filename, 'js');
-                }
-                if (this.options.excludeCss.indexOf(chunk.name) > -1 && filename.indexOf('css') > -1) {
-                    renameChunkFiles(compilation, index, chunk.name, filename, 'css');
-                }
-            });
+    renameChunkFiles(chunk, assetType) {
+        chunk.files.forEach((fileName, index) => {
+            const newFileName = fileName.replace(regex(chunk.name, assetType), '$1$2$3');
+            if (newFileName !== fileName) {
+                this.changes[fileName] = newFileName;
+                chunk.files[index] = newFileName;
+            }
         });
-        callback();
     }
 
     removeHtmlHash(compilation, callback) {
@@ -53,17 +56,15 @@ class WebpackHashExcludePlugin {
             let index;
 
             if (this.options.excludeJs.indexOf(chunkName) > -1) {
-                const reg = new RegExp(`^(${esc(chunkName)})(?:.*)(\.js)$`);
                 index = compilation.body.findIndex(getIndex);
                 if (index > -1) {
-                    compilation.body[index].attributes.src = compilation.body[index].attributes.src.replace(reg, '$1$2');
+                    compilation.body[index].attributes.src = compilation.body[index].attributes.src.replace(regex(chunkName, 'js'), '$1$2$3');
                 }
             }
             if (this.options.excludeCss.indexOf(chunkName) > -1) {
-                const reg = new RegExp(`^(${esc(chunkName)})(?:.*)(\.css)$`);
                 index = compilation.head.findIndex(getIndex);
                 if (index > -1) {
-                    compilation.head[index].attributes.href = compilation.head[index].attributes.href.replace(reg, '$1$2');
+                    compilation.head[index].attributes.href = compilation.head[index].attributes.href.replace(regex(chunkName, 'css'), '$1$2$3');
                 }
             }
         };
@@ -72,13 +73,15 @@ class WebpackHashExcludePlugin {
     }
 
     apply(compiler) {
-        // Remove the has from asset file names
+        // Remove the hash from asset file names
         compiler.hooks.emit.tapAsync('emit', (compilation, callback) => {
             this.removeAssetsHash(compilation, callback);
         });
         // Remove the hash value of the corresponding chunk resource file
         compiler.hooks.thisCompilation.tap('thisCompilation', compilation => {
-            const requireEnsure = (source) => source.replace('__webpack_require__.p', `'${compilation.options.output.publicPath}'`);
+            const requireEnsure = (source) => {
+                source.replace('__webpack_require__.p', `'${compilation.options.output.publicPath}'`)
+            };
             compilation.mainTemplate.hooks.requireEnsure.tap('requireEnsure', requireEnsure);
         });
         // Replace the hash value of the html static resource