Merge pull request #713 from developit/nukedpr

remove script-ext-html-webpack-plugin and add script loading option

Author: ForsakenHarmony

README.md

@@ -263,13 +263,15 @@ Routes can be exported as a JSON string or an object and can optionally be retur
 
 ```js
 // prerender-urls.js
-module.exports = [{
-	url: '/',
-	title: 'Homepage'
-}, {
-	url: '/route/random'
-}];
-
+module.exports = [
+	{
+		url: '/',
+		title: 'Homepage',
+	},
+	{
+		url: '/route/random',
+	},
+];
 ```
 
 #### Template

packages/cli/lib/lib/webpack/render-html-plugin.js

@@ -1,7 +1,6 @@
 const { resolve } = require('path');
 const { existsSync } = require('fs');
 const HtmlWebpackExcludeAssetsPlugin = require('html-webpack-exclude-assets-plugin');
-const ScriptExtHtmlWebpackPlugin = require('script-ext-html-webpack-plugin');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 const prerender = require('./prerender');
 const createLoadManifest = require('./create-load-manifest');
@@ -54,6 +53,7 @@ module.exports = function(config) {
 				Object.assign(params, { url });
 				return config.prerender ? prerender({ cwd, dest, src }, params) : '';
 			},
+			scriptLoading: 'defer'
 		});
 	};
 
@@ -89,9 +89,5 @@ module.exports = function(config) {
 		.map(conf => new HtmlWebpackPlugin(conf))
 		.concat([
 			new HtmlWebpackExcludeAssetsPlugin(),
-			new ScriptExtHtmlWebpackPlugin({
-				// inline: 'bundle.js',
-				defaultAttribute: 'defer',
-			}),
 		]);
 };

packages/cli/lib/resources/template.html

@@ -34,7 +34,7 @@
 			%>
 			<script nomodule>window.fetch||document.write('<script src="<%= htmlWebpackPlugin.files.chunks["polyfills"].entry %>"><\/script>')</script>
 		<% } else { %>
-			<script defer src="<%= htmlWebpackPlugin.files.chunks['bundle'].entry %>"></script>
+			<script <%= htmlWebpackPlugin.options.scriptLoading %>  src="<%= htmlWebpackPlugin.files.chunks['bundle'].entry %>"></script>
 			<script>window.fetch||document.write('<script src="<%= htmlWebpackPlugin.files.chunks["polyfills"].entry %>"><\/script>')</script>
 		<% } %>
 	</body>

packages/cli/package.json

@@ -105,7 +105,6 @@
     "require-relative": "^0.8.7",
     "rimraf": "^2.6.1",
     "sade": "^1.4.1",
-    "script-ext-html-webpack-plugin": "^2.0.1",
     "size-plugin": "^1.0.1",
     "source-map": "^0.7.2",
     "stack-trace": "0.0.10",