From 2c9180f366634ea0b3da798120717b395d82b186 Mon Sep 17 00:00:00 2001 From: Sibiraj Date: Thu, 20 Sep 2018 22:33:37 +0530 Subject: [PATCH 1/4] feat: support html-webpack-plugin 4.x --- package.json | 2 +- plugin.js | 18 ++++++++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 883147c..05c93cb 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ }, "peerDependencies": { "webpack": "^2 || ^3 || ^4", - "html-webpack-plugin": "^2 || ^3" + "html-webpack-plugin": "^2 || ^3 || ^4.0.0-alpah.2" }, "devDependencies": { "codecov": "^3.1.0", diff --git a/plugin.js b/plugin.js index 2b57c05..0e65eec 100644 --- a/plugin.js +++ b/plugin.js @@ -145,10 +145,20 @@ class CspHtmlWebpackPlugin { apply(compiler) { if (compiler.hooks) { compiler.hooks.compilation.tap('CspHtmlWebpackPlugin', compilation => { - compilation.hooks.htmlWebpackPluginAfterHtmlProcessing.tapAsync( - 'CspHtmlWebpackPlugin', - this.processCsp.bind(this) - ); + // HtmlWebPackPlugin 3.x + if (compilation.hooks.htmlWebpackPluginAfterHtmlProcessing) { + compilation.hooks.htmlWebpackPluginAfterHtmlProcessing.tapAsync( + 'CspHtmlWebpackPlugin', + this.processCsp.bind(this) + ); + } else { + // HtmlWebPackPlugin 4.x + const HtmlWebpackPlugin = require('html-webpack-plugin'); // eslint-disable-line global-require + HtmlWebpackPlugin.getHooks(compilation).beforeEmit.tapAsync( + 'CspHtmlWebpackPlugin', + this.processCsp.bind(this) + ); + } }); } else { compiler.plugin('compilation', compilation => { From 25845d37636836211592b35d03ccb620d17685d9 Mon Sep 17 00:00:00 2001 From: Sibiraj Date: Thu, 20 Sep 2018 23:31:15 +0530 Subject: [PATCH 2/4] fix typo in peerDependncies --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 05c93cb..8523372 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ }, "peerDependencies": { "webpack": "^2 || ^3 || ^4", - "html-webpack-plugin": "^2 || ^3 || ^4.0.0-alpah.2" + "html-webpack-plugin": "^2 || ^3 || ^4.0.0-alpha" }, "devDependencies": { "codecov": "^3.1.0", From 941d5fcb58074e4acc9e159192cc141b98eb31b4 Mon Sep 17 00:00:00 2001 From: Sibiraj Date: Fri, 28 Sep 2018 11:31:30 +0530 Subject: [PATCH 3/4] support html-webpack-plugin@beta --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8523372..67560dc 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ }, "peerDependencies": { "webpack": "^2 || ^3 || ^4", - "html-webpack-plugin": "^2 || ^3 || ^4.0.0-alpha" + "html-webpack-plugin": "^2 || ^3 || ^4.0.0-beta" }, "devDependencies": { "codecov": "^3.1.0", From e778be76b2887bf588df3f49a3fbe6e8c2f4151a Mon Sep 17 00:00:00 2001 From: Sibiraj Date: Fri, 26 Oct 2018 08:31:27 +0530 Subject: [PATCH 4/4] update html-webpack-plugin stable version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 67560dc..62cbdc7 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ }, "peerDependencies": { "webpack": "^2 || ^3 || ^4", - "html-webpack-plugin": "^2 || ^3 || ^4.0.0-beta" + "html-webpack-plugin": "^2 || ^3 || ^4" }, "devDependencies": { "codecov": "^3.1.0",