webpack 2.3.1 → 2.4.1

package/lib/HotModuleReplacement.runtime.js

@@ -8,7 +8,7 @@ module.exports = function() {
 	var hotApplyOnUpdate = true;
 	var hotCurrentHash = $hash$; // eslint-disable-line no-unused-vars
 	var hotCurrentModuleData = {};
-	var hotMainModule = true; // eslint-disable-line no-unused-vars
+	var hotCurrentChildModule; // eslint-disable-line no-unused-vars
 	var hotCurrentParents = []; // eslint-disable-line no-unused-vars
 	var hotCurrentParentsTemp = []; // eslint-disable-line no-unused-vars
 
@@ -20,14 +20,16 @@ module.exports = function() {
 				if(installedModules[request]) {
 					if(installedModules[request].parents.indexOf(moduleId) < 0)
 						installedModules[request].parents.push(moduleId);
-				} else hotCurrentParents = [moduleId];
+				} else {
+					hotCurrentParents = [moduleId];
+					hotCurrentChildModule = request;
+				}
 				if(me.children.indexOf(request) < 0)
 					me.children.push(request);
 			} else {
 				console.warn("[HMR] unexpected require(" + request + ") from disposed module " + moduleId);
 				hotCurrentParents = [];
 			}
-			hotMainModule = false;
 			return $require$(request);
 		};
 		var ObjectFactory = function ObjectFactory(name) {
@@ -43,34 +45,31 @@ module.exports = function() {
 			};
 		};
 		for(var name in $require$) {
-			if(Object.prototype.hasOwnProperty.call($require$, name)) {
+			if(Object.prototype.hasOwnProperty.call($require$, name) && name !== "e") {
 				Object.defineProperty(fn, name, ObjectFactory(name));
 			}
 		}
-		Object.defineProperty(fn, "e", {
-			enumerable: true,
-			value: function(chunkId) {
-				if(hotStatus === "ready")
-					hotSetStatus("prepare");
-				hotChunksLoading++;
-				return $require$.e(chunkId).then(finishChunkLoading, function(err) {
-					finishChunkLoading();
-					throw err;
-				});
+		fn.e = function(chunkId) {
+			if(hotStatus === "ready")
+				hotSetStatus("prepare");
+			hotChunksLoading++;
+			return $require$.e(chunkId).then(finishChunkLoading, function(err) {
+				finishChunkLoading();
+				throw err;
+			});
 
-				function finishChunkLoading() {
-					hotChunksLoading--;
-					if(hotStatus === "prepare") {
-						if(!hotWaitingFilesMap[chunkId]) {
-							hotEnsureUpdateChunk(chunkId);
-						}
-						if(hotChunksLoading === 0 && hotWaitingFiles === 0) {
-							hotUpdateDownloaded();
-						}
+			function finishChunkLoading() {
+				hotChunksLoading--;
+				if(hotStatus === "prepare") {
+					if(!hotWaitingFilesMap[chunkId]) {
+						hotEnsureUpdateChunk(chunkId);
+					}
+					if(hotChunksLoading === 0 && hotWaitingFiles === 0) {
+						hotUpdateDownloaded();
 					}
 				}
 			}
-		});
+		};
 		return fn;
 	}
 
@@ -82,7 +81,7 @@ module.exports = function() {
 			_selfAccepted: false,
 			_selfDeclined: false,
 			_disposeHandlers: [],
-			_main: hotMainModule,
+			_main: hotCurrentChildModule !== moduleId,
 
 			// Module API
 			active: true,
@@ -135,7 +134,7 @@ module.exports = function() {
 			//inherit from previous dispose call
 			data: hotCurrentModuleData[moduleId]
 		};
-		hotMainModule = true;
+		hotCurrentChildModule = undefined;
 		return hot;
 	}
 
@@ -173,7 +172,6 @@ module.exports = function() {
 				hotSetStatus("idle");
 				return null;
 			}
-
 			hotRequestedFilesMap = {};
 			hotWaitingFilesMap = {};
 			hotAvailableFilesMap = update.c;

package/lib/HotModuleReplacementPlugin.js

@@ -109,10 +109,8 @@ HotModuleReplacementPlugin.prototype.apply = function(compiler) {
 				c: {}
 			};
 			Object.keys(records.chunkHashs).forEach(function(chunkId) {
-				chunkId = +chunkId;
-				var currentChunk = this.chunks.filter(function(chunk) {
-					return chunk.id === chunkId;
-				})[0];
+				chunkId = isNaN(+chunkId) ? chunkId : +chunkId;
+				var currentChunk = this.chunks.find(chunk => chunk.id === chunkId);
 				if(currentChunk) {
 					var newModules = currentChunk.modules.filter(function(module) {
 						return module.hotUpdate;
@@ -171,7 +169,7 @@ HotModuleReplacementPlugin.prototype.apply = function(compiler) {
 				hotInitCode
 				.replace(/\$require\$/g, this.requireFn)
 				.replace(/\$hash\$/g, JSON.stringify(hash))
-				.replace(/\/\*foreachInstalledChunks\*\//g, chunk.chunks.length > 0 ? "for(var chunkId in installedChunks)" : "var chunkId = " + chunk.id + ";")
+				.replace(/\/\*foreachInstalledChunks\*\//g, chunk.chunks.length > 0 ? "for(var chunkId in installedChunks)" : "var chunkId = " + JSON.stringify(chunk.id) + ";")
 			]);
 		});
 

package/lib/IgnorePlugin.js

@@ -8,29 +8,60 @@ class IgnorePlugin {
 	constructor(resourceRegExp, contextRegExp) {
 		this.resourceRegExp = resourceRegExp;
 		this.contextRegExp = contextRegExp;
+
+		this.checkIgnore = this.checkIgnore.bind(this);
+	}
+
+	/*
+	 * Only returns true if a "resourceRegExp" exists
+	 * and the resource given matches the regexp.
+	 */
+	checkResouce(resource) {
+		if(!this.resourceRegExp) {
+			return false;
+		}
+		return this.resourceRegExp.test(resource);
+	}
+
+	/*
+	 * Returns true if contextRegExp does not exist
+	 * or if context matches the given regexp.
+	 */
+	checkContext(context) {
+		if(!this.contextRegExp) {
+			return true;
+		}
+		return this.contextRegExp.test(context);
+	}
+
+	/*
+	 * Returns true if result should be ignored.
+	 * false if it shouldn't.
+	 *
+	 * Not that if "contextRegExp" is given, both the "resourceRegExp"
+	 * and "contextRegExp" have to match.
+	 */
+	checkResult(result) {
+		if(!result) {
+			return true;
+		}
+		return this.checkResouce(result.request) && this.checkContext(result.context);
+	}
+
+	checkIgnore(result, callback) {
+		// check if result is ignored
+		if(this.checkResult(result)) {
+			return callback();
+		}
+		return callback(null, result);
 	}
 
 	apply(compiler) {
-		const resourceRegExp = this.resourceRegExp;
-		const contextRegExp = this.contextRegExp;
 		compiler.plugin("normal-module-factory", (nmf) => {
-			nmf.plugin("before-resolve", (result, callback) => {
-				if(!result) return callback();
-				if(resourceRegExp.test(result.request) &&
-					(!contextRegExp || contextRegExp.test(result.context))) {
-					return callback();
-				}
-				return callback(null, result);
-			});
+			nmf.plugin("before-resolve", this.checkIgnore);
 		});
 		compiler.plugin("context-module-factory", (cmf) => {
-			cmf.plugin("before-resolve", (result, callback) => {
-				if(!result) return callback();
-				if(resourceRegExp.test(result.request)) {
-					return callback();
-				}
-				return callback(null, result);
-			});
+			cmf.plugin("before-resolve", this.checkIgnore);
 		});
 	}
 }

package/lib/JsonpChunkTemplatePlugin.js

@@ -2,30 +2,30 @@
 	MIT License http://www.opensource.org/licenses/mit-license.php
 	Author Tobias Koppers @sokra
 */
-var ConcatSource = require("webpack-sources").ConcatSource;
+"use strict";
 
-function JsonpChunkTemplatePlugin() {}
-module.exports = JsonpChunkTemplatePlugin;
+const ConcatSource = require("webpack-sources").ConcatSource;
 
-JsonpChunkTemplatePlugin.prototype.apply = function(chunkTemplate) {
-	chunkTemplate.plugin("render", function(modules, chunk) {
-		var jsonpFunction = this.outputOptions.jsonpFunction;
-		var source = new ConcatSource();
-		source.add(jsonpFunction + "(" + JSON.stringify(chunk.ids) + ",");
-		source.add(modules);
-		var entries = [chunk.entryModule].filter(Boolean).map(function(m) {
-			return m.id;
+class JsonpChunkTemplatePlugin {
+	apply(chunkTemplate) {
+		chunkTemplate.plugin("render", function(modules, chunk) {
+			const jsonpFunction = this.outputOptions.jsonpFunction;
+			const source = new ConcatSource();
+			source.add(`${jsonpFunction}(${JSON.stringify(chunk.ids)},`);
+			source.add(modules);
+			const entries = [chunk.entryModule].filter(Boolean).map(m => m.id);
+			if(entries.length > 0) {
+				source.add(`,${JSON.stringify(entries)}`);
+			}
+			source.add(")");
+			return source;
+		});
+		chunkTemplate.plugin("hash", function(hash) {
+			hash.update("JsonpChunkTemplatePlugin");
+			hash.update("3");
+			hash.update(`${this.outputOptions.jsonpFunction}`);
+			hash.update(`${this.outputOptions.library}`);
 		});
-		if(entries.length > 0) {
-			source.add("," + JSON.stringify(entries));
-		}
-		source.add(")");
-		return source;
-	});
-	chunkTemplate.plugin("hash", function(hash) {
-		hash.update("JsonpChunkTemplatePlugin");
-		hash.update("3");
-		hash.update(this.outputOptions.jsonpFunction + "");
-		hash.update(this.outputOptions.library + "");
-	});
-};
+	}
+}
+module.exports = JsonpChunkTemplatePlugin;

package/lib/JsonpMainTemplatePlugin.js

@@ -2,207 +2,207 @@
 	MIT License http://www.opensource.org/licenses/mit-license.php
 	Author Tobias Koppers @sokra
 */
-var Template = require("./Template");
+"use strict";
 
-function JsonpMainTemplatePlugin() {}
-module.exports = JsonpMainTemplatePlugin;
+const Template = require("./Template");
 
-JsonpMainTemplatePlugin.prototype.constructor = JsonpMainTemplatePlugin;
-JsonpMainTemplatePlugin.prototype.apply = function(mainTemplate) {
-	mainTemplate.plugin("local-vars", function(source, chunk) {
-		if(chunk.chunks.length > 0) {
-			return this.asString([
-				source,
-				"",
-				"// objects to store loaded and loading chunks",
-				"var installedChunks = {",
-				this.indent(
-					chunk.ids.map(function(id) {
-						return id + ": 0";
-					}).join(",\n")
-				),
-				"};"
-			]);
-		}
-		return source;
-	});
-	mainTemplate.plugin("jsonp-script", function(_, chunk, hash) {
-		var chunkFilename = this.outputOptions.chunkFilename;
-		var chunkMaps = chunk.getChunkMaps();
-		var crossOriginLoading = this.outputOptions.crossOriginLoading;
-		var chunkLoadTimeout = this.outputOptions.chunkLoadTimeout || 120000;
-		return this.asString([
-			"var script = document.createElement('script');",
-			"script.type = 'text/javascript';",
-			"script.charset = 'utf-8';",
-			"script.async = true;",
-			"script.timeout = " + chunkLoadTimeout + ";",
-			crossOriginLoading ? "script.crossOrigin = '" + crossOriginLoading + "';" : "",
-			"if (" + this.requireFn + ".nc) {",
-			this.indent("script.setAttribute(\"nonce\", " + this.requireFn + ".nc);"),
-			"}",
-			"script.src = " + this.requireFn + ".p + " +
-			this.applyPluginsWaterfall("asset-path", JSON.stringify(chunkFilename), {
-				hash: "\" + " + this.renderCurrentHashCode(hash) + " + \"",
-				hashWithLength: function(length) {
-					return "\" + " + this.renderCurrentHashCode(hash, length) + " + \"";
-				}.bind(this),
+class JsonpMainTemplatePlugin {
+
+	apply(mainTemplate) {
+		mainTemplate.plugin("local-vars", function(source, chunk) {
+			if(chunk.chunks.length > 0) {
+				return this.asString([
+					source,
+					"",
+					"// objects to store loaded and loading chunks",
+					"var installedChunks = {",
+					this.indent(
+						chunk.ids.map(id => `${JSON.stringify(id)}: 0`).join(",\n")
+					),
+					"};"
+				]);
+			}
+			return source;
+		});
+		mainTemplate.plugin("jsonp-script", function(_, chunk, hash) {
+			const chunkFilename = this.outputOptions.chunkFilename;
+			const chunkMaps = chunk.getChunkMaps();
+			const crossOriginLoading = this.outputOptions.crossOriginLoading;
+			const chunkLoadTimeout = this.outputOptions.chunkLoadTimeout || 120000;
+			const scriptSrcPath = this.applyPluginsWaterfall("asset-path", JSON.stringify(chunkFilename), {
+				hash: `" + ${this.renderCurrentHashCode(hash)} + "`,
+				hashWithLength: length => `" + ${this.renderCurrentHashCode(hash, length)} + "`,
 				chunk: {
 					id: "\" + chunkId + \"",
-					hash: "\" + " + JSON.stringify(chunkMaps.hash) + "[chunkId] + \"",
-					hashWithLength: function(length) {
-						var shortChunkHashMap = {};
-						Object.keys(chunkMaps.hash).forEach(function(chunkId) {
+					hash: `" + ${JSON.stringify(chunkMaps.hash)}[chunkId] + "`,
+					hashWithLength(length) {
+						const shortChunkHashMap = Object.create(null);
+						Object.keys(chunkMaps.hash).forEach(chunkId => {
 							if(typeof chunkMaps.hash[chunkId] === "string")
 								shortChunkHashMap[chunkId] = chunkMaps.hash[chunkId].substr(0, length);
 						});
-						return "\" + " + JSON.stringify(shortChunkHashMap) + "[chunkId] + \"";
+						return `" + ${JSON.stringify(shortChunkHashMap)}[chunkId] + "`;
 					},
-					name: "\" + (" + JSON.stringify(chunkMaps.name) + "[chunkId]||chunkId) + \""
+					name: `" + (${JSON.stringify(chunkMaps.name)}[chunkId]||chunkId) + "`
 				}
-			}) + ";",
-			"var timeout = setTimeout(onScriptComplete, " + chunkLoadTimeout + ");",
-			"script.onerror = script.onload = onScriptComplete;",
-			"function onScriptComplete() {",
-			this.indent([
-				"// avoid mem leaks in IE.",
-				"script.onerror = script.onload = null;",
-				"clearTimeout(timeout);",
-				"var chunk = installedChunks[chunkId];",
-				"if(chunk !== 0) {",
+			});
+			return this.asString([
+				"var script = document.createElement('script');",
+				"script.type = 'text/javascript';",
+				"script.charset = 'utf-8';",
+				"script.async = true;",
+				`script.timeout = ${chunkLoadTimeout};`,
+				crossOriginLoading ? `script.crossOrigin = ${JSON.stringify(crossOriginLoading)};` : "",
+				`if (${this.requireFn}.nc) {`,
+				this.indent(`script.setAttribute("nonce", ${this.requireFn}.nc);`),
+				"}",
+				`script.src = ${this.requireFn}.p + ${scriptSrcPath};`,
+				`var timeout = setTimeout(onScriptComplete, ${chunkLoadTimeout});`,
+				"script.onerror = script.onload = onScriptComplete;",
+				"function onScriptComplete() {",
 				this.indent([
-					"if(chunk) chunk[1](new Error('Loading chunk ' + chunkId + ' failed.'));",
-					"installedChunks[chunkId] = undefined;"
+					"// avoid mem leaks in IE.",
+					"script.onerror = script.onload = null;",
+					"clearTimeout(timeout);",
+					"var chunk = installedChunks[chunkId];",
+					"if(chunk !== 0) {",
+					this.indent([
+						"if(chunk) {",
+						this.indent("chunk[1](new Error('Loading chunk ' + chunkId + ' failed.'));"),
+						"}",
+						"installedChunks[chunkId] = undefined;"
+					]),
+					"}"
 				]),
-				"}"
-			]),
-			"};",
-		]);
-	});
-	mainTemplate.plugin("require-ensure", function(_, chunk, hash) {
-		return this.asString([
-			"if(installedChunks[chunkId] === 0)",
-			this.indent([
-				"return Promise.resolve();"
-			]),
-			"",
-			"// a Promise means \"currently loading\".",
-			"if(installedChunks[chunkId]) {",
-			this.indent([
-				"return installedChunks[chunkId][2];"
-			]),
-			"}",
-			"",
-			"// setup Promise in chunk cache",
-			"var promise = new Promise(function(resolve, reject) {",
-			this.indent([
-				"installedChunks[chunkId] = [resolve, reject];"
-			]),
-			"});",
-			"installedChunks[chunkId][2] = promise;",
-			"",
-			"// start chunk loading",
-			"var head = document.getElementsByTagName('head')[0];",
-			this.applyPluginsWaterfall("jsonp-script", "", chunk, hash),
-			"head.appendChild(script);",
-			"",
-			"return promise;"
-		]);
-	});
-	mainTemplate.plugin("require-extensions", function(source, chunk) {
-		if(chunk.chunks.length === 0) return source;
-		return this.asString([
-			source,
-			"",
-			"// on error function for async loading",
-			this.requireFn + ".oe = function(err) { console.error(err); throw err; };"
-		]);
-	});
-	mainTemplate.plugin("bootstrap", function(source, chunk, hash) {
-		if(chunk.chunks.length > 0) {
-			var jsonpFunction = this.outputOptions.jsonpFunction;
+				"};",
+			]);
+		});
+		mainTemplate.plugin("require-ensure", function(_, chunk, hash) {
 			return this.asString([
-				source,
+				"if(installedChunks[chunkId] === 0) {",
+				this.indent([
+					"return Promise.resolve();"
+				]),
+				"}",
 				"",
-				"// install a JSONP callback for chunk loading",
-				"var parentJsonpFunction = window[" + JSON.stringify(jsonpFunction) + "];",
-				"window[" + JSON.stringify(jsonpFunction) + "] = function webpackJsonpCallback(chunkIds, moreModules, executeModules) {",
+				"// a Promise means \"currently loading\".",
+				"if(installedChunks[chunkId]) {",
 				this.indent([
-					"// add \"moreModules\" to the modules object,",
-					"// then flag all \"chunkIds\" as loaded and fire callback",
-					"var moduleId, chunkId, i = 0, resolves = [], result;",
-					"for(;i < chunkIds.length; i++) {",
-					this.indent([
-						"chunkId = chunkIds[i];",
-						"if(installedChunks[chunkId])",
-						this.indent("resolves.push(installedChunks[chunkId][0]);"),
-						"installedChunks[chunkId] = 0;"
-					]),
-					"}",
-					"for(moduleId in moreModules) {",
+					"return installedChunks[chunkId][2];"
+				]),
+				"}",
+				"",
+				"// setup Promise in chunk cache",
+				"var promise = new Promise(function(resolve, reject) {",
+				this.indent([
+					"installedChunks[chunkId] = [resolve, reject];"
+				]),
+				"});",
+				"installedChunks[chunkId][2] = promise;",
+				"",
+				"// start chunk loading",
+				"var head = document.getElementsByTagName('head')[0];",
+				this.applyPluginsWaterfall("jsonp-script", "", chunk, hash),
+				"head.appendChild(script);",
+				"",
+				"return promise;"
+			]);
+		});
+		mainTemplate.plugin("require-extensions", function(source, chunk) {
+			if(chunk.chunks.length === 0) return source;
+
+			return this.asString([
+				source,
+				"",
+				"// on error function for async loading",
+				`${this.requireFn}.oe = function(err) { console.error(err); throw err; };`
+			]);
+		});
+		mainTemplate.plugin("bootstrap", function(source, chunk, hash) {
+			if(chunk.chunks.length > 0) {
+				var jsonpFunction = this.outputOptions.jsonpFunction;
+				return this.asString([
+					source,
+					"",
+					"// install a JSONP callback for chunk loading",
+					`var parentJsonpFunction = window[${JSON.stringify(jsonpFunction)}];`,
+					`window[${JSON.stringify(jsonpFunction)}] = function webpackJsonpCallback(chunkIds, moreModules, executeModules) {`,
 					this.indent([
-						"if(Object.prototype.hasOwnProperty.call(moreModules, moduleId)) {",
-						this.indent(this.renderAddModule(hash, chunk, "moduleId", "moreModules[moduleId]")),
-						"}"
-					]),
-					"}",
-					"if(parentJsonpFunction) parentJsonpFunction(chunkIds, moreModules, executeModules);",
-					"while(resolves.length)",
-					this.indent("resolves.shift()();"),
-					this.entryPointInChildren(chunk) ? [
-						"if(executeModules) {",
+						"// add \"moreModules\" to the modules object,",
+						"// then flag all \"chunkIds\" as loaded and fire callback",
+						"var moduleId, chunkId, i = 0, resolves = [], result;",
+						"for(;i < chunkIds.length; i++) {",
 						this.indent([
-							"for(i=0; i < executeModules.length; i++) {",
-							this.indent("result = " + this.requireFn + "(" + this.requireFn + ".s = executeModules[i]);"),
+							"chunkId = chunkIds[i];",
+							"if(installedChunks[chunkId]) {",
+							this.indent("resolves.push(installedChunks[chunkId][0]);"),
+							"}",
+							"installedChunks[chunkId] = 0;"
+						]),
+						"}",
+						"for(moduleId in moreModules) {",
+						this.indent([
+							"if(Object.prototype.hasOwnProperty.call(moreModules, moduleId)) {",
+							this.indent(this.renderAddModule(hash, chunk, "moduleId", "moreModules[moduleId]")),
 							"}"
 						]),
 						"}",
-						"return result;",
-					] : ""
-				]),
-				"};"
-			]);
-		}
-		return source;
-	});
-	mainTemplate.plugin("hot-bootstrap", function(source, chunk, hash) {
-		var hotUpdateChunkFilename = this.outputOptions.hotUpdateChunkFilename;
-		var hotUpdateMainFilename = this.outputOptions.hotUpdateMainFilename;
-		var hotUpdateFunction = this.outputOptions.hotUpdateFunction;
-		var currentHotUpdateChunkFilename = this.applyPluginsWaterfall("asset-path", JSON.stringify(hotUpdateChunkFilename), {
-			hash: "\" + " + this.renderCurrentHashCode(hash) + " + \"",
-			hashWithLength: function(length) {
-				return "\" + " + this.renderCurrentHashCode(hash, length) + " + \"";
-			}.bind(this),
-			chunk: {
-				id: "\" + chunkId + \""
+						"if(parentJsonpFunction) parentJsonpFunction(chunkIds, moreModules, executeModules);",
+						"while(resolves.length) {",
+						this.indent("resolves.shift()();"),
+						"}",
+						this.entryPointInChildren(chunk) ? [
+							"if(executeModules) {",
+							this.indent([
+								"for(i=0; i < executeModules.length; i++) {",
+								this.indent(`result = ${this.requireFn}(${this.requireFn}.s = executeModules[i]);`),
+								"}"
+							]),
+							"}",
+							"return result;",
+						] : ""
+					]),
+					"};"
+				]);
 			}
+			return source;
 		});
-		var currentHotUpdateMainFilename = this.applyPluginsWaterfall("asset-path", JSON.stringify(hotUpdateMainFilename), {
-			hash: "\" + " + this.renderCurrentHashCode(hash) + " + \"",
-			hashWithLength: function(length) {
-				return "\" + " + this.renderCurrentHashCode(hash, length) + " + \"";
-			}.bind(this)
+		mainTemplate.plugin("hot-bootstrap", function(source, chunk, hash) {
+			const hotUpdateChunkFilename = this.outputOptions.hotUpdateChunkFilename;
+			const hotUpdateMainFilename = this.outputOptions.hotUpdateMainFilename;
+			const hotUpdateFunction = this.outputOptions.hotUpdateFunction;
+			const currentHotUpdateChunkFilename = this.applyPluginsWaterfall("asset-path", JSON.stringify(hotUpdateChunkFilename), {
+				hash: `" + ${this.renderCurrentHashCode(hash)} + "`,
+				hashWithLength: length => `" + ${this.renderCurrentHashCode(hash, length)} + "`,
+				chunk: {
+					id: "\" + chunkId + \""
+				}
+			});
+			const currentHotUpdateMainFilename = this.applyPluginsWaterfall("asset-path", JSON.stringify(hotUpdateMainFilename), {
+				hash: `" + ${this.renderCurrentHashCode(hash)} + "`,
+				hashWithLength: length => `" + ${this.renderCurrentHashCode(hash, length)} + "`
+			});
+			const runtimeSource = Template.getFunctionContent(require("./JsonpMainTemplate.runtime.js"))
+				.replace(/\/\/\$semicolon/g, ";")
+				.replace(/\$require\$/g, this.requireFn)
+				.replace(/\$hotMainFilename\$/g, currentHotUpdateMainFilename)
+				.replace(/\$hotChunkFilename\$/g, currentHotUpdateChunkFilename)
+				.replace(/\$hash\$/g, JSON.stringify(hash));
+			return `${source}
+function hotDisposeChunk(chunkId) {
+	delete installedChunks[chunkId];
+}
+var parentHotUpdateCallback = this[${JSON.stringify(hotUpdateFunction)}];
+this[${JSON.stringify(hotUpdateFunction)}] = ${runtimeSource}`;
 		});
-
-		return source + "\n" +
-			"function hotDisposeChunk(chunkId) {\n" +
-			"\tdelete installedChunks[chunkId];\n" +
-			"}\n" +
-			"var parentHotUpdateCallback = this[" + JSON.stringify(hotUpdateFunction) + "];\n" +
-			"this[" + JSON.stringify(hotUpdateFunction) + "] = " + Template.getFunctionContent(require("./JsonpMainTemplate.runtime.js"))
-			.replace(/\/\/\$semicolon/g, ";")
-			.replace(/\$require\$/g, this.requireFn)
-			.replace(/\$hotMainFilename\$/g, currentHotUpdateMainFilename)
-			.replace(/\$hotChunkFilename\$/g, currentHotUpdateChunkFilename)
-			.replace(/\$hash\$/g, JSON.stringify(hash));
-	});
-	mainTemplate.plugin("hash", function(hash) {
-		hash.update("jsonp");
-		hash.update("4");
-		hash.update(this.outputOptions.filename + "");
-		hash.update(this.outputOptions.chunkFilename + "");
-		hash.update(this.outputOptions.jsonpFunction + "");
-		hash.update(this.outputOptions.hotUpdateFunction + "");
-	});
-};
+		mainTemplate.plugin("hash", function(hash) {
+			hash.update("jsonp");
+			hash.update("4");
+			hash.update(`${this.outputOptions.filename}`);
+			hash.update(`${this.outputOptions.chunkFilename}`);
+			hash.update(`${this.outputOptions.jsonpFunction}`);
+			hash.update(`${this.outputOptions.hotUpdateFunction}`);
+		});
+	}
+}
+module.exports = JsonpMainTemplatePlugin;