webpack 2.2.0-rc.6 → 2.2.1

package/lib/ConstPlugin.js

@@ -3,10 +3,9 @@
 	Author Tobias Koppers @sokra
 */
 "use strict";
-
 const ConstDependency = require("./dependencies/ConstDependency");
-const BasicEvaluatedExpression = require("./BasicEvaluatedExpression");
 const NullFactory = require("./NullFactory");
+const ParserHelpers = require("./ParserHelpers");
 
 const getQuery = (request) => {
 	const i = request.indexOf("?");
@@ -46,10 +45,7 @@ class ConstPlugin {
 				});
 				parser.plugin("evaluate Identifier __resourceQuery", function(expr) {
 					if(!this.state.module) return;
-					const res = new BasicEvaluatedExpression();
-					res.setString(getQuery(this.state.module.resource));
-					res.setRange(expr.range);
-					return res;
+					return ParserHelpers.evaluateToString(getQuery(this.state.module.resource))(expr);
 				});
 				parser.plugin("expression __resourceQuery", function() {
 					if(!this.state.module) return;

package/lib/DefinePlugin.js

@@ -35,10 +35,10 @@ class DefinePlugin {
 				}(definitions, ""));
 
 				function stringifyObj(obj) {
-					return "{" + Object.keys(obj).map((key) => {
+					return "__webpack_require__.i({" + Object.keys(obj).map((key) => {
 						let code = obj[key];
 						return JSON.stringify(key) + ":" + toCode(code);
-					}).join(",") + "}";
+					}).join(",") + "})";
 				}
 
 				function toCode(code) {
@@ -54,7 +54,7 @@ class DefinePlugin {
 					const splittedKey = key.split(".");
 					splittedKey.slice(1).forEach((_, i) => {
 						const fullKey = prefix + splittedKey.slice(0, i + 1).join(".");
-						parser.plugin("can-rename " + fullKey, () => true);
+						parser.plugin("can-rename " + fullKey, ParserHelpers.approve);
 					});
 				}
 
@@ -65,7 +65,7 @@ class DefinePlugin {
 					let recurseTypeof = false;
 					code = toCode(code);
 					if(!isTypeof) {
-						parser.plugin("can-rename " + key, () => true);
+						parser.plugin("can-rename " + key, ParserHelpers.approve);
 						parser.plugin("evaluate Identifier " + key, (expr) => {
 							if(recurse) return;
 							let res = parser.evaluate(code);
@@ -73,12 +73,7 @@ class DefinePlugin {
 							res.setRange(expr.range);
 							return res;
 						});
-						parser.plugin("expression " + key, (expr) => {
-							let dep = new ConstDependency(code, expr.range);
-							dep.loc = expr.loc;
-							parser.state.current.addDependency(dep);
-							return true;
-						});
+						parser.plugin("expression " + key, ParserHelpers.toConstantDependency(code));
 					}
 					let typeofCode = isTypeof ? code : "typeof (" + code + ")";
 					parser.plugin("evaluate typeof " + key, (expr) => {
@@ -91,30 +86,17 @@ class DefinePlugin {
 					parser.plugin("typeof " + key, (expr) => {
 						let res = parser.evaluate(typeofCode);
 						if(!res.isString()) return;
-						let dep = new ConstDependency(JSON.stringify(res.string), expr.range);
-						dep.loc = expr.loc;
-						parser.state.current.addDependency(dep);
-						return true;
+						return ParserHelpers.toConstantDependency(JSON.stringify(res.string)).bind(parser)(expr);
 					});
 				}
 
 				function applyObjectDefine(key, obj) {
 					let code = stringifyObj(obj);
-					parser.plugin("can-rename " + key, () => true);
+					parser.plugin("can-rename " + key, ParserHelpers.approve);
 					parser.plugin("evaluate Identifier " + key, (expr) => new BasicEvaluatedExpression().setRange(expr.range));
 					parser.plugin("evaluate typeof " + key, ParserHelpers.evaluateToString("object"));
-					parser.plugin("expression " + key, (expr) => {
-						let dep = new ConstDependency(code, expr.range);
-						dep.loc = expr.loc;
-						parser.state.current.addDependency(dep);
-						return true;
-					});
-					parser.plugin("typeof " + key, (expr) => {
-						let dep = new ConstDependency("\"object\"", expr.range);
-						dep.loc = expr.loc;
-						parser.state.current.addDependency(dep);
-						return true;
-					});
+					parser.plugin("expression " + key, ParserHelpers.toConstantDependency(code));
+					parser.plugin("typeof " + key, ParserHelpers.toConstantDependency(JSON.stringify("object")));
 				}
 			});
 		});

package/lib/EnvironmentPlugin.js

@@ -1,6 +1,6 @@
 /*
 	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Simen Brekken @simenbrekken
+	Authors Simen Brekken @simenbrekken, Einar Löve @einarlove
 */
 
 "use strict";
@@ -9,25 +9,41 @@ const DefinePlugin = require("./DefinePlugin");
 
 class EnvironmentPlugin {
 	constructor(keys) {
-		this.keys = Array.isArray(keys) ? keys : Array.prototype.slice.call(arguments);
+		if(Array.isArray(keys)) {
+			this.keys = keys;
+			this.defaultValues = {};
+		} else if(keys && typeof keys === "object") {
+			this.keys = Object.keys(keys);
+			this.defaultValues = keys;
+		} else {
+			this.keys = Array.prototype.slice.call(arguments);
+			this.defaultValues = {};
+		}
 	}
 
 	apply(compiler) {
-		compiler.apply(new DefinePlugin(this.keys.reduce((definitions, key) => {
-			const value = process.env[key];
+		const definitions = this.keys.reduce((defs, key) => {
+			const value = process.env[key] || this.defaultValues[key];
 
 			if(value === undefined) {
-				compiler.plugin("this-compilation", (compilation) => {
-					const error = new Error(key + " environment variable is undefined.");
+				compiler.plugin("this-compilation", compilation => {
+					const error = new Error(
+						`EnvironmentPlugin - ${key} environment variable is undefined.\n\n` +
+						"You can pass an object with default values to suppress this warning.\n" +
+						"See https://webpack.js.org/plugins/environment-plugin for example."
+					);
+
 					error.name = "EnvVariableNotDefinedError";
 					compilation.warnings.push(error);
 				});
 			}
 
-			definitions["process.env." + key] = value ? JSON.stringify(value) : "undefined";
+			defs[`process.env.${key}`] = typeof value === "undefined" ? "undefined" : JSON.stringify(value);
+
+			return defs;
+		}, {});
 
-			return definitions;
-		}, {})));
+		compiler.apply(new DefinePlugin(definitions));
 	}
 }
 

package/lib/EvalDevToolModulePlugin.js

@@ -2,16 +2,21 @@
 	MIT License http://www.opensource.org/licenses/mit-license.php
 	Author Tobias Koppers @sokra
 */
-var EvalDevToolModuleTemplatePlugin = require("./EvalDevToolModuleTemplatePlugin");
+"use strict";
 
-function EvalDevToolModulePlugin(sourceUrlComment, moduleFilenameTemplate) {
-	this.sourceUrlComment = sourceUrlComment;
-	this.moduleFilenameTemplate = moduleFilenameTemplate;
+const EvalDevToolModuleTemplatePlugin = require("./EvalDevToolModuleTemplatePlugin");
+
+class EvalDevToolModulePlugin {
+	constructor(sourceUrlComment, moduleFilenameTemplate) {
+		this.sourceUrlComment = sourceUrlComment;
+		this.moduleFilenameTemplate = moduleFilenameTemplate;
+	}
+
+	apply(compiler) {
+		compiler.plugin("compilation", (compilation) => {
+			compilation.moduleTemplate.apply(new EvalDevToolModuleTemplatePlugin(this.sourceUrlComment, this.moduleFilenameTemplate));
+		});
+	}
 }
+
 module.exports = EvalDevToolModulePlugin;
-EvalDevToolModulePlugin.prototype.apply = function(compiler) {
-	var self = this;
-	compiler.plugin("compilation", function(compilation) {
-		compilation.moduleTemplate.apply(new EvalDevToolModuleTemplatePlugin(self.sourceUrlComment, self.moduleFilenameTemplate));
-	});
-};

package/lib/EvalSourceMapDevToolModuleTemplatePlugin.js

@@ -58,7 +58,7 @@ EvalSourceMapDevToolModuleTemplatePlugin.prototype.apply = function(moduleTempla
 		}
 		sourceMap.sourceRoot = options.sourceRoot || "";
 		sourceMap.file = module.id + ".js";
-		var footer = self.sourceMapComment.replace(/\[url\]/g, "data:application/json;charset=utf-8;base64," + Buffer.from(JSON.stringify(sourceMap)).toString("base64"));
+		var footer = self.sourceMapComment.replace(/\[url\]/g, "data:application/json;charset=utf-8;base64," + new Buffer(JSON.stringify(sourceMap), "utf8").toString("base64")); //eslint-disable-line
 		source.__EvalSourceMapDevToolData = new RawSource("eval(" + JSON.stringify(content + footer) + ");");
 		return source.__EvalSourceMapDevToolData;
 	});

package/lib/EvalSourceMapDevToolPlugin.js

@@ -2,25 +2,31 @@
 	MIT License http://www.opensource.org/licenses/mit-license.php
 	Author Tobias Koppers @sokra
 */
-var EvalSourceMapDevToolModuleTemplatePlugin = require("./EvalSourceMapDevToolModuleTemplatePlugin");
-var SourceMapDevToolModuleOptionsPlugin = require("./SourceMapDevToolModuleOptionsPlugin");
+"use strict";
 
-function EvalSourceMapDevToolPlugin(options) {
-	if(arguments.length > 1)
-		throw new Error("EvalSourceMapDevToolPlugin only takes one argument (pass an options object)");
-	if(typeof options === "string") {
-		options = {
-			append: options
-		};
+const EvalSourceMapDevToolModuleTemplatePlugin = require("./EvalSourceMapDevToolModuleTemplatePlugin");
+const SourceMapDevToolModuleOptionsPlugin = require("./SourceMapDevToolModuleOptionsPlugin");
+
+class EvalSourceMapDevToolPlugin {
+	constructor(options) {
+		if(arguments.length > 1)
+			throw new Error("EvalSourceMapDevToolPlugin only takes one argument (pass an options object)");
+		if(typeof options === "string") {
+			options = {
+				append: options
+			};
+		}
+		if(!options) options = {};
+		this.options = options;
+	}
+
+	apply(compiler) {
+		let options = this.options;
+		compiler.plugin("compilation", (compilation) => {
+			new SourceMapDevToolModuleOptionsPlugin(options).apply(compilation);
+			compilation.moduleTemplate.apply(new EvalSourceMapDevToolModuleTemplatePlugin(compilation, options));
+		});
 	}
-	if(!options) options = {};
-	this.options = options;
 }
+
 module.exports = EvalSourceMapDevToolPlugin;
-EvalSourceMapDevToolPlugin.prototype.apply = function(compiler) {
-	var options = this.options;
-	compiler.plugin("compilation", function(compilation) {
-		new SourceMapDevToolModuleOptionsPlugin(options).apply(compilation);
-		compilation.moduleTemplate.apply(new EvalSourceMapDevToolModuleTemplatePlugin(compilation, options));
-	});
-};

package/lib/ExtendedAPIPlugin.js

@@ -34,12 +34,7 @@ ExtendedAPIPlugin.prototype.apply = function(compiler) {
 
 		params.normalModuleFactory.plugin("parser", function(parser, parserOptions) {
 			Object.keys(REPLACEMENTS).forEach(function(key) {
-				parser.plugin("expression " + key, function(expr) {
-					var dep = new ConstDependency(REPLACEMENTS[key], expr.range);
-					dep.loc = expr.loc;
-					this.state.current.addDependency(dep);
-					return true;
-				});
+				parser.plugin("expression " + key, ParserHelpers.toConstantDependency(REPLACEMENTS[key]));
 				parser.plugin("evaluate typeof " + key, ParserHelpers.evaluateToString(REPLACEMENT_TYPES[key]));
 			});
 		});

package/lib/FlagDependencyExportsPlugin.js

@@ -2,101 +2,94 @@
 	MIT License http://www.opensource.org/licenses/mit-license.php
 	Author Tobias Koppers @sokra
 */
-function FlagDependencyExportsPlugin() {
+"use strict";
 
-}
-module.exports = FlagDependencyExportsPlugin;
+class FlagDependencyExportsPlugin {
 
-FlagDependencyExportsPlugin.prototype.apply = function(compiler) {
-	compiler.plugin("compilation", function(compilation) {
-		compilation.plugin("finish-modules", function(modules) {
+	apply(compiler) {
+		compiler.plugin("compilation", (compilation) => {
+			compilation.plugin("finish-modules", (modules) => {
 
-			var dependencies = {};
+				const dependencies = Object.create(null);
 
-			var module, moduleWithExports;
-			var queue = modules.filter(function(m) {
-				return !m.providedExports;
-			});
-			for(var i = 0; i < queue.length; i++) {
-				module = queue[i];
+				let module;
+				let moduleWithExports;
+				const queue = modules.filter((m) => !m.providedExports);
+				for(let i = 0; i < queue.length; i++) {
+					module = queue[i];
 
-				if(module.providedExports !== true) {
-					moduleWithExports = false;
-					processDependenciesBlock(module);
-					if(!moduleWithExports) {
-						module.providedExports = true;
-						notifyDependencies();
+					if(module.providedExports !== true) {
+						moduleWithExports = false;
+						processDependenciesBlock(module);
+						if(!moduleWithExports) {
+							module.providedExports = true;
+							notifyDependencies();
+						}
 					}
 				}
-			}
 
-			function processDependenciesBlock(depBlock) {
-				depBlock.dependencies.forEach(function(dep) {
-					processDependency(dep);
-				});
-				depBlock.variables.forEach(function(variable) {
-					variable.dependencies.forEach(function(dep) {
-						processDependency(dep);
-					});
-				});
-				depBlock.blocks.forEach(function(block) {
-					processDependenciesBlock(block);
-				});
-			}
-
-			function processDependency(dep, usedExports) {
-				var exportDesc = dep.getExports && dep.getExports();
-				if(!exportDesc) return;
-				moduleWithExports = true;
-				var exports = exportDesc.exports;
-				var exportDeps = exportDesc.dependencies;
-				if(exportDeps) {
-					exportDeps.forEach(function(dep) {
-						var depIdent = dep.identifier();
-						var array = dependencies["$" + depIdent];
-						if(!array) array = dependencies["$" + depIdent] = [];
-						if(array.indexOf(module) < 0)
-							array.push(module);
+				function processDependenciesBlock(depBlock) {
+					depBlock.dependencies.forEach((dep) => processDependency(dep));
+					depBlock.variables.forEach((variable) => {
+						variable.dependencies.forEach((dep) => processDependency(dep));
 					});
+					depBlock.blocks.forEach(processDependenciesBlock);
 				}
-				var changed = false;
-				if(module.providedExports !== true) {
-					if(exports === true) {
-						module.providedExports = true;
-						changed = true;
-					} else if(Array.isArray(exports)) {
-						if(Array.isArray(module.providedExports)) {
-							changed = addToSet(module.providedExports, exports);
-						} else {
-							module.providedExports = exports.slice();
+
+				function processDependency(dep, usedExports) {
+					const exportDesc = dep.getExports && dep.getExports();
+					if(!exportDesc) return;
+					moduleWithExports = true;
+					const exports = exportDesc.exports;
+					const exportDeps = exportDesc.dependencies;
+					if(exportDeps) {
+						exportDeps.forEach((dep) => {
+							const depIdent = dep.identifier();
+							let array = dependencies[depIdent];
+							if(!array) array = dependencies[depIdent] = [];
+							if(array.indexOf(module) < 0)
+								array.push(module);
+						});
+					}
+					let changed = false;
+					if(module.providedExports !== true) {
+						if(exports === true) {
+							module.providedExports = true;
 							changed = true;
+						} else if(Array.isArray(exports)) {
+							if(Array.isArray(module.providedExports)) {
+								changed = addToSet(module.providedExports, exports);
+							} else {
+								module.providedExports = exports.slice();
+								changed = true;
+							}
 						}
 					}
+					if(changed) {
+						notifyDependencies();
+					}
 				}
-				if(changed) {
-					notifyDependencies();
-				}
-			}
 
-			function notifyDependencies() {
-				var deps = dependencies["$" + module.identifier()];
-				if(deps) {
-					deps.forEach(function(dep) {
-						queue.push(dep);
-					});
+				function notifyDependencies() {
+					const deps = dependencies[module.identifier()];
+					if(deps) {
+						deps.forEach((dep) => queue.push(dep));
+					}
 				}
+			});
+
+			function addToSet(a, b) {
+				let changed = false;
+				b.forEach((item) => {
+					if(a.indexOf(item) < 0) {
+						a.push(item);
+						changed = true;
+					}
+				});
+				return changed;
 			}
 		});
+	}
+}
 
-		function addToSet(a, b) {
-			var changed = false;
-			b.forEach(function(item) {
-				if(a.indexOf(item) < 0) {
-					a.push(item);
-					changed = true;
-				}
-			});
-			return changed;
-		}
-	});
-};
+module.exports = FlagDependencyExportsPlugin;

package/lib/FlagInitialModulesAsUsedPlugin.js

@@ -2,19 +2,23 @@
 	MIT License http://www.opensource.org/licenses/mit-license.php
 	Author Tobias Koppers @sokra
 */
-function FlagInitialModulesAsUsedPlugin() {}
-module.exports = FlagInitialModulesAsUsedPlugin;
-FlagInitialModulesAsUsedPlugin.prototype.apply = function(compiler) {
-	compiler.plugin("compilation", function(compilation) {
-		compilation.plugin("after-optimize-chunks", function(chunks) {
-			chunks.forEach(function(chunk) {
-				if(!chunk.isInitial()) {
-					return;
-				}
-				chunk.modules.forEach(function(module) {
-					module.usedExports = true;
+"use strict";
+
+class FlagInitialModulesAsUsedPlugin {
+	apply(compiler) {
+		compiler.plugin("compilation", (compilation) => {
+			compilation.plugin("after-optimize-chunks", (chunks) => {
+				chunks.forEach((chunk) => {
+					if(!chunk.isInitial()) {
+						return;
+					}
+					chunk.modules.forEach((module) => {
+						module.usedExports = true;
+					});
 				});
 			});
 		});
-	});
-};
+	}
+}
+
+module.exports = FlagInitialModulesAsUsedPlugin;

package/lib/FunctionModulePlugin.js

@@ -2,17 +2,23 @@
 	MIT License http://www.opensource.org/licenses/mit-license.php
 	Author Tobias Koppers @sokra
 */
-var FunctionModuleTemplatePlugin = require("./FunctionModuleTemplatePlugin");
-var RequestShortener = require("./RequestShortener");
+"use strict";
 
-function FunctionModulePlugin(options, requestShortener) {
-	this.options = options;
-	this.requestShortener = requestShortener;
+const FunctionModuleTemplatePlugin = require("./FunctionModuleTemplatePlugin");
+const RequestShortener = require("./RequestShortener");
+
+class FunctionModulePlugin {
+	constructor(options, requestShortener) {
+		this.options = options;
+		this.requestShortener = requestShortener;
+	}
+
+	apply(compiler) {
+		compiler.plugin("compilation", (compilation) => {
+			compilation.moduleTemplate.requestShortener = this.requestShortener || new RequestShortener(compiler.context);
+			compilation.moduleTemplate.apply(new FunctionModuleTemplatePlugin());
+		});
+	}
 }
+
 module.exports = FunctionModulePlugin;
-FunctionModulePlugin.prototype.apply = function(compiler) {
-	compiler.plugin("compilation", function(compilation) {
-		compilation.moduleTemplate.requestShortener = this.requestShortener || new RequestShortener(compiler.context);
-		compilation.moduleTemplate.apply(new FunctionModuleTemplatePlugin());
-	}.bind(this));
-};

package/lib/HotModuleReplacementPlugin.js

@@ -4,7 +4,6 @@
 */
 "use strict";
 var Template = require("./Template");
-var BasicEvaluatedExpression = require("./BasicEvaluatedExpression");
 var ModuleHotAcceptDependency = require("./dependencies/ModuleHotAcceptDependency");
 var ModuleHotDeclineDependency = require("./dependencies/ModuleHotDeclineDependency");
 var RawSource = require("webpack-sources").RawSource;
@@ -197,17 +196,10 @@ HotModuleReplacementPlugin.prototype.apply = function(compiler) {
 		});
 
 		params.normalModuleFactory.plugin("parser", function(parser, parserOptions) {
-			parser.plugin("expression __webpack_hash__", function(expr) {
-				var dep = new ConstDependency("__webpack_require__.h()", expr.range);
-				dep.loc = expr.loc;
-				this.state.current.addDependency(dep);
-				return true;
-			});
+			parser.plugin("expression __webpack_hash__", ParserHelpers.toConstantDependency("__webpack_require__.h()"));
 			parser.plugin("evaluate typeof __webpack_hash__", ParserHelpers.evaluateToString("string"));
 			parser.plugin("evaluate Identifier module.hot", function(expr) {
-				return new BasicEvaluatedExpression()
-					.setBoolean(!!this.state.compilation.hotUpdateChunkTemplate)
-					.setRange(expr.range);
+				return ParserHelpers.evaluateToBoolean(!!this.state.compilation.hotUpdateChunkTemplate)(expr);
 			});
 			parser.plugin("call module.hot.accept", function(expr) {
 				if(!this.state.compilation.hotUpdateChunkTemplate) return false;
@@ -260,9 +252,7 @@ HotModuleReplacementPlugin.prototype.apply = function(compiler) {
 					}.bind(this));
 				}
 			});
-			parser.plugin("expression module.hot", function() {
-				return true;
-			});
+			parser.plugin("expression module.hot", ParserHelpers.skipTraversal);
 		});
 	});
 

package/lib/HotUpdateChunkTemplate.js

@@ -2,30 +2,29 @@
 	MIT License http://www.opensource.org/licenses/mit-license.php
 	Author Tobias Koppers @sokra
 */
-var Template = require("./Template");
+"use strict";
 
-function HotUpdateChunkTemplate(outputOptions) {
-	Template.call(this, outputOptions);
-}
+const Template = require("./Template");
 
-module.exports = HotUpdateChunkTemplate;
+module.exports = class HotUpdateChunkTemplate extends Template {
+	constructor(outputOptions) {
+		super(outputOptions);
+	}
 
-HotUpdateChunkTemplate.prototype = Object.create(Template.prototype);
-HotUpdateChunkTemplate.prototype.constructor = HotUpdateChunkTemplate;
+	render(id, modules, removedModules, hash, moduleTemplate, dependencyTemplates) {
+		let modulesSource = this.renderChunkModules({
+			id: id,
+			modules: modules,
+			removedModules: removedModules
+		}, moduleTemplate, dependencyTemplates);
+		let core = this.applyPluginsWaterfall("modules", modulesSource, modules, removedModules, moduleTemplate, dependencyTemplates);
+		let source = this.applyPluginsWaterfall("render", core, modules, removedModules, hash, id, moduleTemplate, dependencyTemplates);
+		return source;
+	}
 
-HotUpdateChunkTemplate.prototype.render = function(id, modules, removedModules, hash, moduleTemplate, dependencyTemplates) {
-	var modulesSource = this.renderChunkModules({
-		id: id,
-		modules: modules,
-		removedModules: removedModules
-	}, moduleTemplate, dependencyTemplates);
-	var core = this.applyPluginsWaterfall("modules", modulesSource, modules, removedModules, moduleTemplate, dependencyTemplates);
-	var source = this.applyPluginsWaterfall("render", core, modules, removedModules, hash, id, moduleTemplate, dependencyTemplates);
-	return source;
-};
-
-HotUpdateChunkTemplate.prototype.updateHash = function(hash) {
-	hash.update("HotUpdateChunkTemplate");
-	hash.update("1");
-	this.applyPlugins("hash", hash);
+	updateHash(hash) {
+		hash.update("HotUpdateChunkTemplate");
+		hash.update("1");
+		this.applyPlugins("hash", hash);
+	}
 };

package/lib/JsonpTemplatePlugin.js

@@ -2,16 +2,20 @@
 	MIT License http://www.opensource.org/licenses/mit-license.php
 	Author Tobias Koppers @sokra
 */
-var JsonpMainTemplatePlugin = require("./JsonpMainTemplatePlugin");
-var JsonpChunkTemplatePlugin = require("./JsonpChunkTemplatePlugin");
-var JsonpHotUpdateChunkTemplatePlugin = require("./JsonpHotUpdateChunkTemplatePlugin");
+"use strict";
+
+const JsonpMainTemplatePlugin = require("./JsonpMainTemplatePlugin");
+const JsonpChunkTemplatePlugin = require("./JsonpChunkTemplatePlugin");
+const JsonpHotUpdateChunkTemplatePlugin = require("./JsonpHotUpdateChunkTemplatePlugin");
+
+class JsonpTemplatePlugin {
+	apply(compiler) {
+		compiler.plugin("this-compilation", (compilation) => {
+			compilation.mainTemplate.apply(new JsonpMainTemplatePlugin());
+			compilation.chunkTemplate.apply(new JsonpChunkTemplatePlugin());
+			compilation.hotUpdateChunkTemplate.apply(new JsonpHotUpdateChunkTemplatePlugin());
+		});
+	}
+}
 
-function JsonpTemplatePlugin() {}
 module.exports = JsonpTemplatePlugin;
-JsonpTemplatePlugin.prototype.apply = function(compiler) {
-	compiler.plugin("this-compilation", function(compilation) {
-		compilation.mainTemplate.apply(new JsonpMainTemplatePlugin());
-		compilation.chunkTemplate.apply(new JsonpChunkTemplatePlugin());
-		compilation.hotUpdateChunkTemplate.apply(new JsonpHotUpdateChunkTemplatePlugin());
-	});
-};

package/lib/LibManifestPlugin.js

@@ -43,7 +43,7 @@ LibManifestPlugin.prototype.apply = function(compiler) {
 					return obj;
 				}.bind(this), {})
 			};
-			var content = Buffer.from(JSON.stringify(manifest, null, 2), "utf8");
+			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);