diff --git a/CHANGELOG.md b/CHANGELOG.md index 85f2d66..058897f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ Change History ============== +v2.17.0 +---- +* Add `type` attribute to `script` element to prevent issues in Safari 9.1.1 + v2.16.2 ---- * Fix bug introduced by 2.16.2. Fixes #315 diff --git a/examples/appcache/dist/webpack-1/index.html b/examples/appcache/dist/webpack-1/index.html index 3a2aa9e..536e8a4 100644 --- a/examples/appcache/dist/webpack-1/index.html +++ b/examples/appcache/dist/webpack-1/index.html @@ -1 +1 @@ -Example template \ No newline at end of file +Example template \ No newline at end of file diff --git a/examples/appcache/dist/webpack-1/manifest.appcache b/examples/appcache/dist/webpack-1/manifest.appcache index 150df1a..092e10d 100644 --- a/examples/appcache/dist/webpack-1/manifest.appcache +++ b/examples/appcache/dist/webpack-1/manifest.appcache @@ -1,5 +1,5 @@ CACHE MANIFEST -# 9e067d48ea3de65b9733 +# 118634423ed0edb86d58 0714810ae3fb211173e2964249507195.png bundle.js diff --git a/examples/appcache/dist/webpack-2/index.html b/examples/appcache/dist/webpack-2/index.html index 3a2aa9e..d9fbec1 100644 --- a/examples/appcache/dist/webpack-2/index.html +++ b/examples/appcache/dist/webpack-2/index.html @@ -1 +1 @@ -Example template \ No newline at end of file +Example template diff --git a/examples/custom-template/dist/webpack-1/index.html b/examples/custom-template/dist/webpack-1/index.html index a9d8bf4..1ceade2 100644 --- a/examples/custom-template/dist/webpack-1/index.html +++ b/examples/custom-template/dist/webpack-1/index.html @@ -8,5 +8,5 @@

Partial

- + \ No newline at end of file diff --git a/examples/custom-template/dist/webpack-2/index.html b/examples/custom-template/dist/webpack-2/index.html index a9d8bf4..d68bf44 100644 --- a/examples/custom-template/dist/webpack-2/index.html +++ b/examples/custom-template/dist/webpack-2/index.html @@ -8,5 +8,5 @@

Partial

- - \ No newline at end of file + + diff --git a/examples/default/dist/webpack-1/index.html b/examples/default/dist/webpack-1/index.html index 8a7f3ef..866dfa4 100644 --- a/examples/default/dist/webpack-1/index.html +++ b/examples/default/dist/webpack-1/index.html @@ -5,5 +5,5 @@ Webpack App - + \ No newline at end of file diff --git a/examples/default/dist/webpack-2/index.html b/examples/default/dist/webpack-2/index.html index 8a7f3ef..fb18d4b 100644 --- a/examples/default/dist/webpack-2/index.html +++ b/examples/default/dist/webpack-2/index.html @@ -5,5 +5,5 @@ Webpack App - - \ No newline at end of file + + diff --git a/examples/favicon/dist/webpack-1/favicon.html b/examples/favicon/dist/webpack-1/favicon.html index 7276322..dd7daeb 100644 --- a/examples/favicon/dist/webpack-1/favicon.html +++ b/examples/favicon/dist/webpack-1/favicon.html @@ -5,5 +5,5 @@ HtmlWebpackPlugin example - + \ No newline at end of file diff --git a/examples/favicon/dist/webpack-2/favicon.html b/examples/favicon/dist/webpack-2/favicon.html index 7276322..ec5bf4b 100644 --- a/examples/favicon/dist/webpack-2/favicon.html +++ b/examples/favicon/dist/webpack-2/favicon.html @@ -5,5 +5,5 @@ HtmlWebpackPlugin example - - \ No newline at end of file + + diff --git a/examples/html-loader/dist/webpack-1/about.html b/examples/html-loader/dist/webpack-1/about.html index 5689f88..68c0cab 100644 --- a/examples/html-loader/dist/webpack-1/about.html +++ b/examples/html-loader/dist/webpack-1/about.html @@ -7,5 +7,5 @@ - + \ No newline at end of file diff --git a/examples/html-loader/dist/webpack-1/index.html b/examples/html-loader/dist/webpack-1/index.html index 5689f88..68c0cab 100644 --- a/examples/html-loader/dist/webpack-1/index.html +++ b/examples/html-loader/dist/webpack-1/index.html @@ -7,5 +7,5 @@ - + \ No newline at end of file diff --git a/examples/html-loader/dist/webpack-2/index.html b/examples/html-loader/dist/webpack-2/index.html index 5689f88..7d59df3 100644 --- a/examples/html-loader/dist/webpack-2/index.html +++ b/examples/html-loader/dist/webpack-2/index.html @@ -7,5 +7,5 @@ - - \ No newline at end of file + + diff --git a/examples/inline/dist/webpack-1/index.html b/examples/inline/dist/webpack-1/index.html index eb56c5e..bd1cda3 100644 --- a/examples/inline/dist/webpack-1/index.html +++ b/examples/inline/dist/webpack-1/index.html @@ -1,6 +1,6 @@ Jade demo \ No newline at end of file +Jade demo
Current time

1999-01-01T06:00:00.000Z

\ No newline at end of file diff --git a/examples/javascript-advanced/dist/webpack-1/index.html b/examples/javascript-advanced/dist/webpack-1/index.html index 194f6fb..61d6408 100644 --- a/examples/javascript-advanced/dist/webpack-1/index.html +++ b/examples/javascript-advanced/dist/webpack-1/index.html @@ -1,2 +1,2 @@ Webpack AppHello World from backend -

Partial

- \ No newline at end of file + \ No newline at end of file diff --git a/examples/javascript-advanced/dist/webpack-2/index.html b/examples/javascript-advanced/dist/webpack-2/index.html index 194f6fb..a57d914 100644 --- a/examples/javascript-advanced/dist/webpack-2/index.html +++ b/examples/javascript-advanced/dist/webpack-2/index.html @@ -1,2 +1,2 @@ Webpack AppHello World from backend -

Partial

- \ No newline at end of file + diff --git a/examples/javascript/dist/webpack-1/index.html b/examples/javascript/dist/webpack-1/index.html index f4f3e23..aea25f3 100644 --- a/examples/javascript/dist/webpack-1/index.html +++ b/examples/javascript/dist/webpack-1/index.html @@ -1,2 +1,2 @@ -Hello World from backend2016-03-21T08:52:41.516Z

Partial

- \ No newline at end of file +Hello World from backend2016-05-01T21:59:56.131Z

Partial

+ \ No newline at end of file diff --git a/index.js b/index.js index 10acd38..ffd73cd 100644 --- a/index.js +++ b/index.js @@ -450,7 +450,7 @@ HtmlWebpackPlugin.prototype.htmlWebpackPluginAssets = function (compilation, chu HtmlWebpackPlugin.prototype.injectAssetsIntoHtml = function (html, assets) { // Turn script files into script tags var scripts = assets.js.map(function (scriptPath) { - return ''; + return ''; }); // Make tags self-closing in case of xhtml var xhtml = this.options.xhtml ? '/' : ''; diff --git a/spec/BasicSpec.js b/spec/BasicSpec.js index 9413b4c..b43ad53 100644 --- a/spec/BasicSpec.js +++ b/spec/BasicSpec.js @@ -99,7 +99,7 @@ describe('HtmlWebpackPlugin', function () { filename: 'index_bundle.js' }, plugins: [new HtmlWebpackPlugin()] - }, [/[\s]* + diff --git a/spec/fixtures/legacy.html b/spec/fixtures/legacy.html index f7473d1..91cb157 100644 --- a/spec/fixtures/legacy.html +++ b/spec/fixtures/legacy.html @@ -6,6 +6,6 @@

Some unique text

- + diff --git a/spec/fixtures/template.jade b/spec/fixtures/template.jade index 5f56e94..39aa1a9 100644 --- a/spec/fixtures/template.jade +++ b/spec/fixtures/template.jade @@ -6,4 +6,4 @@ html body p Some unique text each jsFile in htmlWebpackPlugin.files.js - script(src!=jsFile) + script(type="text/javascript" src!=jsFile) diff --git a/spec/fixtures/test.html b/spec/fixtures/test.html index 78d0485..fa8a9ec 100644 --- a/spec/fixtures/test.html +++ b/spec/fixtures/test.html @@ -6,6 +6,6 @@

Some unique text

- + diff --git a/spec/fixtures/webpackconfig.html b/spec/fixtures/webpackconfig.html index 31d8cb6..3359eb7 100644 --- a/spec/fixtures/webpackconfig.html +++ b/spec/fixtures/webpackconfig.html @@ -6,6 +6,6 @@

Public path is <%= webpackConfig.output.publicPath %>

- +