Remove dead code for Webpack 3

Author: GwendolenLynch

lib/plugin.js

@@ -1,4 +1,4 @@
-require('require-safe')('html-webpack-plugin');
+const HtmlWebpackPlugin = require('html-webpack-plugin');
 
 // Create a regular expression to search for a file by chunk name & extension, including associated source maps
 function regex(chunkName, fileExt) {
@@ -17,6 +17,19 @@ class WebpackHashExcludePlugin {
         }, options);
     }
 
+    apply(compiler) {
+        // Remove the hash from asset file names
+        compiler.hooks.emit.tapAsync('emit', (compilation, callback) => {
+            this.removeAssetsHash(compilation, callback);
+        });
+        // Replace the hash value of the html static resource
+        if (this.options.removeHtmlHash) {
+            compiler.hooks.compilation.tap('WebpackHashExclude', (compilation) => {
+                HtmlWebpackPlugin.getHooks(compilation).alterAssetTags.tapAsync('WebpackHashExclude', (data, callback) => this.removeHtmlHash(data, callback));
+            });
+        }
+    }
+
     removeAssetsHash(compilation, callback) {
         const matchingChunks = compilation.chunks
             .filter((chunk) => this.options.excludeJs.indexOf(chunk.name) > -1 || this.options.excludeCss.indexOf(chunk.name) > -1);
@@ -49,49 +62,23 @@ class WebpackHashExcludePlugin {
         });
     }
 
-    removeHtmlHash(compilation, callback) {
-        const chunksMapCallback = (chunk) => {
-            const chunkName = chunk.names[0];
-            const getIndex = (item) => item.attributes.href.indexOf(chunkName) > -1;
-            let index;
-
-            if (this.options.excludeJs.indexOf(chunkName) > -1) {
-                index = compilation.body.findIndex(getIndex);
-                if (index > -1) {
-                    compilation.body[index].attributes.src = compilation.body[index].attributes.src.replace(regex(chunkName, 'js'), '$1$2$3');
+    renameAssetTags(data, callback) {
+        data.assetTags.scripts.map((assetTag, callback) => {
+            for (let chunkName of this.options.excludeCss) {
+                if (assetTag.attributes.src.search(regex(chunkName, 'js')) > -1) {
+                    assetTag.attributes.src = assetTag.attributes.src.replace(regex(chunkName, 'js'), '$1$2$3');
                 }
             }
-            if (this.options.excludeCss.indexOf(chunkName) > -1) {
-                index = compilation.head.findIndex(getIndex);
-                if (index > -1) {
-                    compilation.head[index].attributes.href = compilation.head[index].attributes.href.replace(regex(chunkName, 'css'), '$1$2$3');
+        });
+        data.assetTags.styles.map((assetTag, callback) => {
+            for (let chunkName of this.options.excludeCss) {
+                if (assetTag.attributes.href.search(regex(chunkName, 'css')) > -1) {
+                    assetTag.attributes.href = assetTag.attributes.href.replace(regex(chunkName, 'css'), '$1$2$3');
                 }
             }
-        };
-        compilation.chunks.map(chunksMapCallback);
-        callback();
-    }
-
-    apply(compiler) {
-        // 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}'`)
-            };
-            compilation.mainTemplate.hooks.requireEnsure.tap('requireEnsure', requireEnsure);
-        });
-        // Replace the hash value of the html static resource
-        if (this.options.removeHtmlHash) {
-            compiler.hooks.compilation.tap('compilation', (compilation) => {
-                compilation.hooks.htmlWebpackPluginAlterAssetTags.tapAsync('compilation', (compilation, callback) => {
-                    this.removeHtmlHash(compilation, callback);
-                });
-            });
-        }
+
+        callback(null, data);
     }
 }