webpack 2.3.3 → 2.5.1

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;

package/lib/LibManifestPlugin.js

@@ -2,52 +2,57 @@
 	MIT License http://www.opensource.org/licenses/mit-license.php
 	Author Tobias Koppers @sokra
 */
-var path = require("path");
-var async = require("async");
+"use strict";
 
-function LibManifestPlugin(options) {
-	this.options = options;
+const path = require("path");
+const asyncLib = require("async");
+
+class LibManifestPlugin {
+	constructor(options) {
+		this.options = options;
+	}
+
+	apply(compiler) {
+		compiler.plugin("emit", (compilation, callback) => {
+			asyncLib.forEach(compilation.chunks, (chunk, callback) => {
+				if(!chunk.isInitial()) {
+					callback();
+					return;
+				}
+				const targetPath = compilation.getPath(this.options.path, {
+					hash: compilation.hash,
+					chunk
+				});
+				const name = this.options.name && compilation.getPath(this.options.name, {
+					hash: compilation.hash,
+					chunk
+				});
+				const manifest = {
+					name,
+					type: this.options.type,
+					content: chunk.modules.reduce((obj, module) => {
+						if(module.libIdent) {
+							const ident = module.libIdent({
+								context: this.options.context || compiler.options.context
+							});
+							if(ident) {
+								obj[ident] = {
+									id: module.id,
+									meta: module.meta,
+									exports: Array.isArray(module.providedExports) ? module.providedExports : undefined
+								};
+							}
+						}
+						return obj;
+					}, {})
+				};
+				const content = new Buffer(JSON.stringify(manifest), "utf8"); //eslint-disable-line
+				compiler.outputFileSystem.mkdirp(path.dirname(targetPath), err => {
+					if(err) return callback(err);
+					compiler.outputFileSystem.writeFile(targetPath, content, callback);
+				});
+			}, callback);
+		});
+	}
 }
 module.exports = LibManifestPlugin;
-LibManifestPlugin.prototype.apply = function(compiler) {
-	compiler.plugin("emit", function(compilation, callback) {
-		async.forEach(compilation.chunks, function(chunk, callback) {
-			if(!chunk.isInitial()) {
-				callback();
-				return;
-			}
-			var targetPath = compilation.getPath(this.options.path, {
-				hash: compilation.hash,
-				chunk: chunk
-			});
-			var name = this.options.name && compilation.getPath(this.options.name, {
-				hash: compilation.hash,
-				chunk: chunk
-			});
-			var manifest = {
-				name: name,
-				type: this.options.type,
-				content: chunk.modules.reduce(function(obj, module) {
-					if(module.libIdent) {
-						var ident = module.libIdent({
-							context: this.options.context || compiler.options.context
-						});
-						if(ident) {
-							obj[ident] = {
-								id: module.id,
-								meta: module.meta,
-								exports: Array.isArray(module.providedExports) ? module.providedExports : undefined
-							};
-						}
-					}
-					return obj;
-				}.bind(this), {})
-			};
-			var content = new Buffer(JSON.stringify(manifest, null, 2), "utf8"); //eslint-disable-line
-			compiler.outputFileSystem.mkdirp(path.dirname(targetPath), function(err) {
-				if(err) return callback(err);
-				compiler.outputFileSystem.writeFile(targetPath, content, callback);
-			});
-		}.bind(this), callback);
-	}.bind(this));
-};

package/lib/MainTemplate.js

@@ -30,8 +30,7 @@ module.exports = class MainTemplate extends Template {
 			const buf = [];
 			if(chunk.entryModule) {
 				buf.push("// Load entry module and return exports");
-				buf.push("return " + this.renderRequireFunctionForModule(hash, chunk, JSON.stringify(chunk.entryModule.id)) +
-					"(" + this.requireFn + ".s = " + JSON.stringify(chunk.entryModule.id) + ");");
+				buf.push(`return ${this.renderRequireFunctionForModule(hash, chunk, JSON.stringify(chunk.entryModule.id))}(${this.requireFn}.s = ${JSON.stringify(chunk.entryModule.id)});`);
 			}
 			return this.asString(buf);
 		});
@@ -58,9 +57,9 @@ module.exports = class MainTemplate extends Template {
 			return this.asString([
 				source,
 				"// Check if module is in cache",
-				"if(installedModules[moduleId])",
+				"if(installedModules[moduleId]) {",
 				this.indent("return installedModules[moduleId].exports;"),
-				"",
+				"}",
 				"// Create a new module (and put it into the cache)",
 				"var module = installedModules[moduleId] = {",
 				this.indent(this.applyPluginsWaterfall("module-obj", "", chunk, hash, "moduleId")),
@@ -71,7 +70,7 @@ module.exports = class MainTemplate extends Template {
 					"var threw = true;",
 					"try {",
 					this.indent([
-						"modules[moduleId].call(module.exports, module, module.exports, " + this.renderRequireFunctionForModule(hash, chunk, "moduleId") + ");",
+						`modules[moduleId].call(module.exports, module, module.exports, ${this.renderRequireFunctionForModule(hash, chunk, "moduleId")});`,
 						"threw = false;"
 					]),
 					"} finally {",
@@ -81,7 +80,7 @@ module.exports = class MainTemplate extends Template {
 					"}"
 				] : [
 					"// Execute the module function",
-					"modules[moduleId].call(module.exports, module, module.exports, " + this.renderRequireFunctionForModule(hash, chunk, "moduleId") + ");",
+					`modules[moduleId].call(module.exports, module, module.exports, ${this.renderRequireFunctionForModule(hash, chunk, "moduleId")});`,
 				]),
 				"",
 				"// Flag the module as loaded",
@@ -103,27 +102,27 @@ module.exports = class MainTemplate extends Template {
 			if(chunk.chunks.length > 0) {
 				buf.push("// This file contains only the entry chunk.");
 				buf.push("// The chunk loading function for additional chunks");
-				buf.push(this.requireFn + ".e = function requireEnsure(chunkId) {");
+				buf.push(`${this.requireFn}.e = function requireEnsure(chunkId) {`);
 				buf.push(this.indent(this.applyPluginsWaterfall("require-ensure", "throw new Error('Not chunk loading available');", chunk, hash, "chunkId")));
 				buf.push("};");
 			}
 			buf.push("");
 			buf.push("// expose the modules object (__webpack_modules__)");
-			buf.push(this.requireFn + ".m = modules;");
+			buf.push(`${this.requireFn}.m = modules;`);
 
 			buf.push("");
 			buf.push("// expose the module cache");
-			buf.push(this.requireFn + ".c = installedModules;");
+			buf.push(`${this.requireFn}.c = installedModules;`);
 
 			buf.push("");
 			buf.push("// identity function for calling harmony imports with the correct context");
-			buf.push(this.requireFn + ".i = function(value) { return value; };");
+			buf.push(`${this.requireFn}.i = function(value) { return value; };`);
 
 			buf.push("");
 			buf.push("// define getter function for harmony exports");
-			buf.push(this.requireFn + ".d = function(exports, name, getter) {");
+			buf.push(`${this.requireFn}.d = function(exports, name, getter) {`);
 			buf.push(this.indent([
-				"if(!" + this.requireFn + ".o(exports, name)) {",
+				`if(!${this.requireFn}.o(exports, name)) {`,
 				this.indent([
 					"Object.defineProperty(exports, name, {",
 					this.indent([
@@ -146,21 +145,21 @@ module.exports = class MainTemplate extends Template {
 					"function getDefault() { return module['default']; } :",
 					"function getModuleExports() { return module; };"
 				]),
-				this.requireFn + ".d(getter, 'a', getter);",
+				`${this.requireFn}.d(getter, 'a', getter);`,
 				"return getter;"
 			]));
 			buf.push("};");
 
 			buf.push("");
 			buf.push("// Object.prototype.hasOwnProperty.call");
-			buf.push(this.requireFn + ".o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };");
+			buf.push(`${this.requireFn}.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };`);
 
 			const publicPath = this.getPublicPath({
 				hash: hash
 			});
 			buf.push("");
 			buf.push("// __webpack_public_path__");
-			buf.push(this.requireFn + ".p = " + JSON.stringify(publicPath) + ";");
+			buf.push(`${this.requireFn}.p = ${JSON.stringify(publicPath)};`);
 			return this.asString(buf);
 		});
 
@@ -173,14 +172,14 @@ module.exports = class MainTemplate extends Template {
 		buf.push(this.applyPluginsWaterfall("local-vars", "", chunk, hash));
 		buf.push("");
 		buf.push("// The require function");
-		buf.push("function " + this.requireFn + "(moduleId) {");
+		buf.push(`function ${this.requireFn}(moduleId) {`);
 		buf.push(this.indent(this.applyPluginsWaterfall("require", "", chunk, hash)));
 		buf.push("}");
 		buf.push("");
 		buf.push(this.asString(this.applyPluginsWaterfall("require-extensions", "", chunk, hash)));
 		buf.push("");
 		buf.push(this.asString(this.applyPluginsWaterfall("startup", "", chunk, hash)));
-		let source = this.applyPluginsWaterfall("render", new OriginalSource(this.prefix(buf, " \t") + "\n", "webpack/bootstrap " + hash), chunk, hash, moduleTemplate, dependencyTemplates);
+		let source = this.applyPluginsWaterfall("render", new OriginalSource(this.prefix(buf, " \t") + "\n", `webpack/bootstrap ${hash}`), chunk, hash, moduleTemplate, dependencyTemplates);
 		if(chunk.hasEntryModule()) {
 			source = this.applyPluginsWaterfall("render-with-entry", source, chunk, hash);
 		}
@@ -194,7 +193,7 @@ module.exports = class MainTemplate extends Template {
 	}
 
 	renderAddModule(hash, chunk, varModuleId, varModule) {
-		return this.applyPluginsWaterfall("add-module", "modules[" + varModuleId + "] = " + varModule + ";", chunk, hash, varModuleId, varModule);
+		return this.applyPluginsWaterfall("add-module", `modules[${varModuleId}] = ${varModule};`, chunk, hash, varModuleId, varModule);
 	}
 
 	renderCurrentHashCode(hash, length) {