webpack 2.2.0-rc.6 → 2.2.1

package/lib/LoaderTargetPlugin.js

@@ -2,15 +2,19 @@
 	MIT License http://www.opensource.org/licenses/mit-license.php
 	Author Tobias Koppers @sokra
 */
-function LoaderTargetPlugin(target) {
-	this.target = target;
+"use strict";
+
+class LoaderTargetPlugin {
+	constructor(target) {
+		this.target = target;
+	}
+
+	apply(compiler) {
+		let target = this.target;
+		compiler.plugin("compilation", (compilation) => {
+			compilation.plugin("normal-module-loader", (loaderContext) => loaderContext.target = target);
+		});
+	}
 }
+
 module.exports = LoaderTargetPlugin;
-LoaderTargetPlugin.prototype.apply = function(compiler) {
-	var target = this.target;
-	compiler.plugin("compilation", function(compilation) {
-		compilation.plugin("normal-module-loader", function(loaderContext) {
-			loaderContext.target = target;
-		});
-	});
-};

package/lib/MainTemplate.js

@@ -2,10 +2,12 @@
 	MIT License http://www.opensource.org/licenses/mit-license.php
 	Author Tobias Koppers @sokra
 */
-var ConcatSource = require("webpack-sources").ConcatSource;
-var OriginalSource = require("webpack-sources").OriginalSource;
-var PrefixSource = require("webpack-sources").PrefixSource;
-var Template = require("./Template");
+"use strict";
+
+const ConcatSource = require("webpack-sources").ConcatSource;
+const OriginalSource = require("webpack-sources").OriginalSource;
+const PrefixSource = require("webpack-sources").PrefixSource;
+const Template = require("./Template");
 
 // require function shortcuts:
 // __webpack_require__.s = the module id of the entry point
@@ -21,214 +23,214 @@ var Template = require("./Template");
 // __webpack_require__.oe = the uncatched error handler for the webpack runtime
 // __webpack_require__.nc = the script nonce
 
-function MainTemplate(outputOptions) {
-	Template.call(this, outputOptions);
-	this.plugin("startup", function(source, chunk, hash) {
-		var 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) + ");");
-		}
-		return this.asString(buf);
-	});
-	this.plugin("render", function(bootstrapSource, chunk, hash, moduleTemplate, dependencyTemplates) {
-		var source = new ConcatSource();
-		source.add("/******/ (function(modules) { // webpackBootstrap\n");
-		source.add(new PrefixSource("/******/", bootstrapSource));
-		source.add("/******/ })\n");
-		source.add("/************************************************************************/\n");
-		source.add("/******/ (");
-		var modules = this.renderChunkModules(chunk, moduleTemplate, dependencyTemplates, "/******/ ");
-		source.add(this.applyPluginsWaterfall("modules", modules, chunk, hash, moduleTemplate, dependencyTemplates));
-		source.add(")");
-		return source;
-	});
-	this.plugin("local-vars", function(source, chunk, hash) {
-		return this.asString([
-			source,
-			"// The module cache",
-			"var installedModules = {};"
-		]);
-	});
-	this.plugin("require", function(source, chunk, hash) {
-		return this.asString([
-			source,
-			"// Check if module is in cache",
-			"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")),
-			"};",
-			"",
-			this.asString(outputOptions.strictModuleExceptionHandling ? [
-				"// Execute the module function",
-				"var threw = true;",
-				"try {",
-				this.indent([
+module.exports = class MainTemplate extends Template {
+	constructor(outputOptions) {
+		super(outputOptions);
+		this.plugin("startup", (source, chunk, hash) => {
+			let 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) + ");");
+			}
+			return this.asString(buf);
+		});
+		this.plugin("render", (bootstrapSource, chunk, hash, moduleTemplate, dependencyTemplates) => {
+			let source = new ConcatSource();
+			source.add("/******/ (function(modules) { // webpackBootstrap\n");
+			source.add(new PrefixSource("/******/", bootstrapSource));
+			source.add("/******/ })\n");
+			source.add("/************************************************************************/\n");
+			source.add("/******/ (");
+			let modules = this.renderChunkModules(chunk, moduleTemplate, dependencyTemplates, "/******/ ");
+			source.add(this.applyPluginsWaterfall("modules", modules, chunk, hash, moduleTemplate, dependencyTemplates));
+			source.add(")");
+			return source;
+		});
+		this.plugin("local-vars", (source, chunk, hash) => {
+			return this.asString([
+				source,
+				"// The module cache",
+				"var installedModules = {};"
+			]);
+		});
+		this.plugin("require", (source, chunk, hash) => {
+			return this.asString([
+				source,
+				"// Check if module is in cache",
+				"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")),
+				"};",
+				"",
+				this.asString(outputOptions.strictModuleExceptionHandling ? [
+					"// Execute the module function",
+					"var threw = true;",
+					"try {",
+					this.indent([
+						"modules[moduleId].call(module.exports, module, module.exports, " + this.renderRequireFunctionForModule(hash, chunk, "moduleId") + ");",
+						"threw = false;"
+					]),
+					"} finally {",
+					this.indent([
+						"if(threw) delete installedModules[moduleId];"
+					]),
+					"}"
+				] : [
+					"// Execute the module function",
 					"modules[moduleId].call(module.exports, module, module.exports, " + this.renderRequireFunctionForModule(hash, chunk, "moduleId") + ");",
-					"threw = false;"
 				]),
-				"} finally {",
+				"",
+				"// Flag the module as loaded",
+				"module.l = true;",
+				"",
+				"// Return the exports of the module",
+				"return module.exports;"
+			]);
+		});
+		this.plugin("module-obj", (source, chunk, hash, varModuleId) => {
+			return this.asString([
+				"i: moduleId,",
+				"l: false,",
+				"exports: {}"
+			]);
+		});
+		this.plugin("require-extensions", (source, chunk, hash) => {
+			let buf = [];
+			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.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("");
+			buf.push("// expose the module cache");
+			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("");
+			buf.push("// define getter function for harmony exports");
+			buf.push(this.requireFn + ".d = function(exports, name, getter) {");
+			buf.push(this.indent([
+				"if(!" + this.requireFn + ".o(exports, name)) {",
 				this.indent([
-					"if(threw) delete installedModules[moduleId];"
+					"Object.defineProperty(exports, name, {",
+					this.indent([
+						"configurable: false,",
+						"enumerable: true,",
+						"get: getter"
+					]),
+					"});"
 				]),
 				"}"
-			] : [
-				"// Execute the module function",
-				"modules[moduleId].call(module.exports, module, module.exports, " + this.renderRequireFunctionForModule(hash, chunk, "moduleId") + ");",
-			]),
-			"",
-			"// Flag the module as loaded",
-			"module.l = true;",
-			"",
-			"// Return the exports of the module",
-			"return module.exports;"
-		]);
-	});
-	this.plugin("module-obj", function(source, chunk, hash, varModuleId) {
-		return this.asString([
-			"i: moduleId,",
-			"l: false,",
-			"exports: {}"
-		]);
-	});
-	this.plugin("require-extensions", function(source, chunk, hash) {
-		var buf = [];
-		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.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("");
-		buf.push("// expose the module cache");
-		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("");
-		buf.push("// define getter function for harmony exports");
-		buf.push(this.requireFn + ".d = function(exports, name, getter) {");
-		buf.push(this.indent([
-			"if(!" + this.requireFn + ".o(exports, name)) {",
-			this.indent([
-				"Object.defineProperty(exports, name, {",
+			buf.push("");
+			buf.push("// getDefaultExport function for compatibility with non-harmony modules");
+			buf.push(this.requireFn + ".n = function(module) {");
+			buf.push(this.indent([
+				"var getter = module && module.__esModule ?",
 				this.indent([
-					"configurable: false,",
-					"enumerable: true,",
-					"get: getter"
+					"function getDefault() { return module['default']; } :",
+					"function getModuleExports() { return module; };"
 				]),
-				"});"
-			]),
-			"}"
-		]));
-		buf.push("};");
+				this.requireFn + ".d(getter, 'a', getter);",
+				"return getter;"
+			]));
+			buf.push("};");
 
-		buf.push("");
-		buf.push("// getDefaultExport function for compatibility with non-harmony modules");
-		buf.push(this.requireFn + ".n = function(module) {");
-		buf.push(this.indent([
-			"var getter = module && module.__esModule ?",
-			this.indent([
-				"function getDefault() { return module['default']; } :",
-				"function getModuleExports() { return module; };"
-			]),
-			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); };");
+
+			let publicPath = this.getPublicPath({
+				hash: hash
+			});
+			buf.push("");
+			buf.push("// __webpack_public_path__");
+			buf.push(this.requireFn + ".p = " + JSON.stringify(publicPath) + ";");
+			return this.asString(buf);
+		});
 
-		buf.push("");
-		buf.push("// Object.prototype.hasOwnProperty.call");
-		buf.push(this.requireFn + ".o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };");
+		this.requireFn = "__webpack_require__";
+	}
 
-		var publicPath = this.getPublicPath({
-			hash: hash
-		});
+	render(hash, chunk, moduleTemplate, dependencyTemplates) {
+		let buf = [];
+		buf.push(this.applyPluginsWaterfall("bootstrap", "", chunk, hash, moduleTemplate, dependencyTemplates));
+		buf.push(this.applyPluginsWaterfall("local-vars", "", chunk, hash));
+		buf.push("");
+		buf.push("// The require function");
+		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("// __webpack_public_path__");
-		buf.push(this.requireFn + ".p = " + JSON.stringify(publicPath) + ";");
-		return this.asString(buf);
-	});
-}
-module.exports = MainTemplate;
-
-MainTemplate.prototype = Object.create(Template.prototype);
-MainTemplate.prototype.constructor = MainTemplate;
-MainTemplate.prototype.requireFn = "__webpack_require__";
-MainTemplate.prototype.render = function(hash, chunk, moduleTemplate, dependencyTemplates) {
-	var buf = [];
-	buf.push(this.applyPluginsWaterfall("bootstrap", "", chunk, hash, moduleTemplate, dependencyTemplates));
-	buf.push(this.applyPluginsWaterfall("local-vars", "", chunk, hash));
-	buf.push("");
-	buf.push("// The require function");
-	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)));
-	var 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);
+		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);
+		if(chunk.hasEntryModule()) {
+			source = this.applyPluginsWaterfall("render-with-entry", source, chunk, hash);
+		}
+		if(!source) throw new Error("Compiler error: MainTemplate plugin 'render' should return something");
+		chunk.rendered = true;
+		return new ConcatSource(source, ";");
 	}
-	if(!source) throw new Error("Compiler error: MainTemplate plugin 'render' should return something");
-	chunk.rendered = true;
-	return new ConcatSource(source, ";");
-};
 
-MainTemplate.prototype.renderRequireFunctionForModule = function(hash, chunk, varModuleId) {
-	return this.applyPluginsWaterfall("module-require", this.requireFn, chunk, hash, varModuleId);
-};
+	renderRequireFunctionForModule(hash, chunk, varModuleId) {
+		return this.applyPluginsWaterfall("module-require", this.requireFn, chunk, hash, varModuleId);
+	}
 
-MainTemplate.prototype.renderAddModule = function(hash, chunk, varModuleId, varModule) {
-	return this.applyPluginsWaterfall("add-module", "modules[" + varModuleId + "] = " + varModule + ";", chunk, hash, varModuleId, varModule);
-};
+	renderAddModule(hash, chunk, varModuleId, varModule) {
+		return this.applyPluginsWaterfall("add-module", "modules[" + varModuleId + "] = " + varModule + ";", chunk, hash, varModuleId, varModule);
+	}
 
-MainTemplate.prototype.renderCurrentHashCode = function(hash, length) {
-	length = length || Infinity;
-	return this.applyPluginsWaterfall("current-hash", JSON.stringify(hash.substr(0, length)), length);
-};
+	renderCurrentHashCode(hash, length) {
+		length = length || Infinity;
+		return this.applyPluginsWaterfall("current-hash", JSON.stringify(hash.substr(0, length)), length);
+	}
 
-MainTemplate.prototype.entryPointInChildren = function(chunk) {
-	function checkChildren(chunk, alreadyCheckedChunks) {
-		return chunk.chunks.some(function(child) {
-			if(alreadyCheckedChunks.indexOf(child) >= 0) return;
-			alreadyCheckedChunks.push(child);
-			return child.hasEntryModule() || checkChildren(child, alreadyCheckedChunks);
-		});
+	entryPointInChildren(chunk) {
+		let checkChildren = (chunk, alreadyCheckedChunks) => {
+			return chunk.chunks.some((child) => {
+				if(alreadyCheckedChunks.indexOf(child) >= 0) return;
+				alreadyCheckedChunks.push(child);
+				return child.hasEntryModule() || checkChildren(child, alreadyCheckedChunks);
+			});
+		};
+		return checkChildren(chunk, []);
 	}
-	return checkChildren(chunk, []);
-};
 
-MainTemplate.prototype.getPublicPath = function(options) {
-	return this.applyPluginsWaterfall("asset-path", this.outputOptions.publicPath || "", options);
-};
+	getPublicPath(options) {
+		return this.applyPluginsWaterfall("asset-path", this.outputOptions.publicPath || "", options);
+	}
 
-MainTemplate.prototype.updateHash = function(hash) {
-	hash.update("maintemplate");
-	hash.update("3");
-	hash.update(this.outputOptions.publicPath + "");
-	this.applyPlugins("hash", hash);
-};
+	updateHash(hash) {
+		hash.update("maintemplate");
+		hash.update("3");
+		hash.update(this.outputOptions.publicPath + "");
+		this.applyPlugins("hash", hash);
+	}
 
-MainTemplate.prototype.updateHashForChunk = function(hash, chunk) {
-	this.updateHash(hash);
-	this.applyPlugins("hash-for-chunk", hash, chunk);
-};
+	updateHashForChunk(hash, chunk) {
+		this.updateHash(hash);
+		this.applyPlugins("hash-for-chunk", hash, chunk);
+	}
 
-MainTemplate.prototype.useChunkHash = function(chunk) {
-	var paths = this.applyPluginsWaterfall("global-hash-paths", []);
-	return !this.applyPluginsBailResult("global-hash", chunk, paths);
+	useChunkHash(chunk) {
+		let paths = this.applyPluginsWaterfall("global-hash-paths", []);
+		return !this.applyPluginsBailResult("global-hash", chunk, paths);
+	}
 };

package/lib/MultiWatching.js

@@ -2,22 +2,24 @@
 	MIT License http://www.opensource.org/licenses/mit-license.php
 	Author Tobias Koppers @sokra
 */
-var async = require("async");
+"use strict";
 
-function MultiWatching(watchings) {
-	this.watchings = watchings;
-}
+const async = require("async");
+
+class MultiWatching {
+	constructor(watchings) {
+		this.watchings = watchings;
+	}
 
-MultiWatching.prototype.invalidate = function() {
-	this.watchings.forEach(function(watching) {
-		watching.invalidate();
-	});
-};
+	invalidate() {
+		this.watchings.forEach((watching) => watching.invalidate());
+	}
 
-MultiWatching.prototype.close = function(callback) {
-	async.forEach(this.watchings, function(watching, finishedCallback) {
-		watching.close(finishedCallback);
-	}, callback);
-};
+	close(callback) {
+		async.forEach(this.watchings, (watching, finishedCallback) => {
+			watching.close(finishedCallback);
+		}, callback);
+	}
+}
 
 module.exports = MultiWatching;

package/lib/NoEmitOnErrorsPlugin.js

@@ -2,18 +2,21 @@
 	MIT License http://www.opensource.org/licenses/mit-license.php
 	Author Tobias Koppers @sokra
 */
-function NoEmitOnErrorsPlugin() {}
+"use strict";
 
-module.exports = NoEmitOnErrorsPlugin;
-NoEmitOnErrorsPlugin.prototype.apply = function(compiler) {
-	compiler.plugin("should-emit", function(compilation) {
-		if(compilation.errors.length > 0)
-			return false;
-	});
-	compiler.plugin("compilation", function(compilation) {
-		compilation.plugin("should-record", function() {
+class NoEmitOnErrorsPlugin {
+	apply(compiler) {
+		compiler.plugin("should-emit", (compilation) => {
 			if(compilation.errors.length > 0)
 				return false;
 		});
-	});
-};
+		compiler.plugin("compilation", (compilation) => {
+			compilation.plugin("should-record", () => {
+				if(compilation.errors.length > 0)
+					return false;
+			});
+		});
+	}
+}
+
+module.exports = NoEmitOnErrorsPlugin;

package/lib/NodeStuffPlugin.js

@@ -5,7 +5,6 @@
 var path = require("path");
 var ParserHelpers = require("./ParserHelpers");
 var ConstDependency = require("./dependencies/ConstDependency");
-var BasicEvaluatedExpression = require("./BasicEvaluatedExpression");
 
 var NullFactory = require("./NullFactory");
 
@@ -51,12 +50,9 @@ NodeStuffPlugin.prototype.apply = function(compiler) {
 			}
 			parser.plugin("evaluate Identifier __filename", function(expr) {
 				if(!this.state.module) return;
-				var res = new BasicEvaluatedExpression();
 				var resource = this.state.module.resource;
 				var i = resource.indexOf("?");
-				res.setString(i < 0 ? resource : resource.substr(0, i));
-				res.setRange(expr.range);
-				return res;
+				return ParserHelpers.evaluateToString(i < 0 ? resource : resource.substr(0, i))(expr);
 			});
 			if(localOptions.__dirname === "mock") {
 				setConstant("__dirname", "/");
@@ -67,42 +63,22 @@ NodeStuffPlugin.prototype.apply = function(compiler) {
 			}
 			parser.plugin("evaluate Identifier __dirname", function(expr) {
 				if(!this.state.module) return;
-				var res = new BasicEvaluatedExpression();
-				res.setString(this.state.module.context);
-				res.setRange(expr.range);
-				return res;
-			});
-			parser.plugin("expression require.main", function(expr) {
-				var dep = new ConstDependency("__webpack_require__.c[__webpack_require__.s]", expr.range);
-				dep.loc = expr.loc;
-				this.state.current.addDependency(dep);
-				return true;
+				return ParserHelpers.evaluateToString(this.state.module.context)(expr);
 			});
+			parser.plugin("expression require.main", ParserHelpers.toConstantDependency("__webpack_require__.c[__webpack_require__.s]"));
 			parser.plugin(
 				"expression require.extensions",
 				ParserHelpers.expressionIsUnsupported("require.extensions is not supported by webpack. Use a loader instead.")
 			);
-			parser.plugin("expression module.loaded", function(expr) {
-				var dep = new ConstDependency("module.l", expr.range);
-				dep.loc = expr.loc;
-				this.state.current.addDependency(dep);
-				return true;
-			});
-			parser.plugin("expression module.id", function(expr) {
-				var dep = new ConstDependency("module.i", expr.range);
-				dep.loc = expr.loc;
-				this.state.current.addDependency(dep);
-				return true;
-			});
+			parser.plugin("expression module.loaded", ParserHelpers.toConstantDependency("module.l"));
+			parser.plugin("expression module.id", ParserHelpers.toConstantDependency("module.i"));
 			parser.plugin("expression module.exports", function() {
 				var module = this.state.module;
 				var isHarmony = module.meta && module.meta.harmonyModule;
 				if(!isHarmony)
 					return true;
 			});
-			parser.plugin("evaluate Identifier module.hot", function(expr) {
-				return new BasicEvaluatedExpression().setBoolean(false).setRange(expr.range);
-			});
+			parser.plugin("evaluate Identifier module.hot", ParserHelpers.evaluateToBoolean(false));
 			parser.plugin("expression module", function() {
 				var module = this.state.module;
 				var isHarmony = module.meta && module.meta.harmonyModule;

package/lib/NormalModuleFactory.js

@@ -16,8 +16,8 @@ function loaderToIdent(data) {
 		return data.loader + "?" + data.options;
 	if(typeof data.options !== "object")
 		throw new Error("loader options must be string or object");
-	if(data.options.ident)
-		return data.loader + "??" + data.options.ident;
+	if(data.ident)
+		return data.loader + "??" + data.ident;
 	return data.loader + "?" + JSON.stringify(data.options);
 }