Merge pull request #52 from snadn/feat-support-hwp4

feat: support html-webpack-plugin@4
numical · Oct 29, 2018 · 87ff0a5 · 87ff0a5
2 parents 52b9393 + 8d0c19b
commit 87ff0a5
Show file tree

Hide file tree

Showing 7 changed files with 1,635 additions and 849 deletions.
diff --git a/dynavers.json b/dynavers.json
@@ -1,6 +1,7 @@
 {
   "path": "dynavers_modules",
   "versions": {
-    "webpack" : ["1.14.0", "2.7.0","3.11.0", "4.1.1"]
+    "webpack" : ["1.14.0", "2.7.0","3.11.0", "4.1.1"],
+    "html-webpack-plugin" : ["3.2.0", "4.0.0-alpha.2"]
   }
 }
diff --git a/lib/plugin.js b/lib/plugin.js
@@ -1,5 +1,7 @@
 'use strict';
 
+const htmlWebpackPlugin = require('html-webpack-plugin');
+
 const { EVENT, PLUGIN } = require('./constants.js');
 
 const debug = require('./common.js').debug;
@@ -47,38 +49,41 @@ class ScriptExtHtmlWebpackPlugin {
   compilationCallback (compilation) {
     const alterAssetTags = this.alterAssetTagsCallback.bind(this, compilation);
     if (compilation.hooks) {
-      compilation.hooks.htmlWebpackPluginAlterAssetTags.tap(PLUGIN, alterAssetTags);
+      const alterAssetTagGroups = compilation.hooks.htmlWebpackPluginAlterAssetTags || htmlWebpackPlugin.getHooks(compilation).alterAssetTagGroups;
+      alterAssetTagGroups.tap(PLUGIN, alterAssetTags);
     } else {
       compilation.plugin(EVENT, alterAssetTags);
     }
   }
 
   alterAssetTagsCallback (compilation, pluginArgs, callback) {
     const options = this.options;
+    const headTagName = pluginArgs.hasOwnProperty('headTags') ? 'headTags' : 'head';
+    const bodyTagName = pluginArgs.hasOwnProperty('bodyTags') ? 'bodyTags' : 'body';
     try {
       options.htmlWebpackOptions = getHtmlWebpackOptions(pluginArgs);
       options.compilationOptions = getCompilationOptions(compilation);
       debugEvent('starting');
       if (elements.shouldUpdate(options)) {
         debugEvent('replacing <head> <script> elements');
-        pluginArgs.head = elements.update(compilation.assets, options, pluginArgs.head);
+        pluginArgs[headTagName] = elements.update(compilation.assets, options, pluginArgs[headTagName]);
         debugEvent('replacing <body> <script> elements');
-        pluginArgs.body = elements.update(compilation.assets, options, pluginArgs.body);
+        pluginArgs[bodyTagName] = elements.update(compilation.assets, options, pluginArgs[bodyTagName]);
       }
       if (shouldAddResourceHints(options)) {
         debugEvent('adding resource hints');
-        pluginArgs.head = falsySafeConcat([
-          pluginArgs.head,
-          addInitialChunkResourceHints(options, pluginArgs.head),
-          addInitialChunkResourceHints(options, pluginArgs.body),
+        pluginArgs[headTagName] = falsySafeConcat([
+          pluginArgs[headTagName],
+          addInitialChunkResourceHints(options, pluginArgs[headTagName]),
+          addInitialChunkResourceHints(options, pluginArgs[bodyTagName]),
           addAsyncChunkResourceHints(compilation.chunks, options)
         ]);
       }
       if (customAttributes.shouldAdd(options)) {
         debugEvent('adding custom attribues to <head> <script> elements');
-        pluginArgs.head = customAttributes.add(options, pluginArgs.head);
+        pluginArgs[headTagName] = customAttributes.add(options, pluginArgs[headTagName]);
         debugEvent('adding custom attributes to <body> <script> elements');
-        pluginArgs.body = customAttributes.add(options, pluginArgs.body);
+        pluginArgs[bodyTagName] = customAttributes.add(options, pluginArgs[bodyTagName]);
       }
       debugEvent('completed');
       if (callback) {