From 86badc3d6e6ae15035d9463a88817dd6488907f3 Mon Sep 17 00:00:00 2001 From: Jan Nicklas Date: Fri, 10 Jun 2016 14:11:01 +0200 Subject: [PATCH] Add documentation for `html-webpack-plugin-alter-asset-tags` --- CHANGELOG.md | 4 ++++ README.md | 1 + index.js | 4 ++-- package.json | 2 +- spec/BasicSpec.js | 2 +- spec/CachingSpec.js | 2 +- spec/ExampleSpec.js | 2 +- 7 files changed, 11 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3c2269c..cc72775 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ Change History ============== +v2.21.0 +---- +* Add `html-webpack-plugin-alter-asset-tags` event to allow plugins to adjust the script/link tags + v2.20.0 ---- * Exclude chunks works now even if combined with dependency sort diff --git a/README.md b/README.md index 9b33aeb..7c4051d 100644 --- a/README.md +++ b/README.md @@ -248,6 +248,7 @@ Asnyc: * `html-webpack-plugin-before-html-generation` * `html-webpack-plugin-before-html-processing` + * `html-webpack-plugin-alter-asset-tags` * `html-webpack-plugin-after-html-processing` * `html-webpack-plugin-after-emit` diff --git a/index.js b/index.js index b86b141..8d5b189 100644 --- a/index.js +++ b/index.js @@ -145,7 +145,7 @@ HtmlWebpackPlugin.prototype.apply = function (compiler) { .then(function (html) { // Prepare script and link tags var assetTags = self.generateAssetTags(assets); - var pluginArgs = {head: assetTags.head, body: assetTags.body, plugin: self, outputName: self.childCompilationOutputName}; + var pluginArgs = {head: assetTags.head, body: assetTags.body, plugin: self, chunks: chunks, outputName: self.childCompilationOutputName}; // Allow plugins to change the assetTag definitions return applyPluginsAsyncWaterfall('html-webpack-plugin-alter-asset-tags', pluginArgs) .then(function () { @@ -456,7 +456,7 @@ HtmlWebpackPlugin.prototype.htmlWebpackPluginAssets = function (compilation, chu /** * Injects the assets into the given html string */ -HtmlWebpackPlugin.prototype.generateAssetTags = function (assets, applyPluginsAsyncWaterfall) { +HtmlWebpackPlugin.prototype.generateAssetTags = function (assets) { // Turn script files into script tags var scripts = assets.js.map(function (scriptPath) { return { diff --git a/package.json b/package.json index e61e341..e099d15 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "html-webpack-plugin", - "version": "2.20.0", + "version": "2.21.0", "description": "Simplifies creation of HTML files to serve your webpack bundles", "main": "index.js", "files": [ diff --git a/spec/BasicSpec.js b/spec/BasicSpec.js index abb2488..330bc1d 100644 --- a/spec/BasicSpec.js +++ b/spec/BasicSpec.js @@ -20,7 +20,7 @@ var HtmlWebpackPlugin = require('../index.js'); var OUTPUT_DIR = path.join(__dirname, '../dist'); -jasmine.getEnv().defaultTimeoutInterval = 10000; +jasmine.getEnv().defaultTimeoutInterval = 30000; function testHtmlPlugin (webpackConfig, expectedResults, outputFile, done, expectErrors, expectWarnings) { outputFile = outputFile || 'index.html'; diff --git a/spec/CachingSpec.js b/spec/CachingSpec.js index cc47bdf..7751a50 100644 --- a/spec/CachingSpec.js +++ b/spec/CachingSpec.js @@ -18,7 +18,7 @@ var HtmlWebpackPlugin = require('../index.js'); var OUTPUT_DIR = path.join(__dirname, '../dist'); -jasmine.getEnv().defaultTimeoutInterval = 10000; +jasmine.getEnv().defaultTimeoutInterval = 30000; function setUpCompiler (htmlWebpackPlugin) { spyOn(htmlWebpackPlugin, 'evaluateCompilationResult').and.callThrough(); diff --git a/spec/ExampleSpec.js b/spec/ExampleSpec.js index 98e79a7..29220a2 100644 --- a/spec/ExampleSpec.js +++ b/spec/ExampleSpec.js @@ -20,7 +20,7 @@ var webpackMajorVersion = require('webpack/package.json').version.split('.')[0]; var OUTPUT_DIR = path.join(__dirname, '../dist'); -jasmine.getEnv().defaultTimeoutInterval = 10000; +jasmine.getEnv().defaultTimeoutInterval = 30000; function runExample (exampleName, done) { var examplePath = path.resolve(__dirname, '..', 'examples', exampleName);