webpack 1.13.3 → 1.14.0

package/lib/UmdMainTemplatePlugin.js

@@ -1,146 +1,146 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-var ConcatSource = require("webpack-core/lib/ConcatSource");
-var OriginalSource = require("webpack-core/lib/OriginalSource");
-
-function accessorToObjectAccess(accessor) {
-	return accessor.map(function(a) {
-		return "[" + JSON.stringify(a) + "]";
-	}).join("");
-}
-
-function accessorAccess(base, accessor) {
-	accessor = [].concat(accessor);
-	return accessor.map(function(a, idx) {
-		a = base + accessorToObjectAccess(accessor.slice(0, idx + 1));
-		if(idx === accessor.length - 1) return a;
-		return a + " = " + a + " || {}";
-	}).join(", ");
-}
-
-function UmdMainTemplatePlugin(name, options) {
-	this.name = name;
-	this.optionalAmdExternalAsGlobal = options.optionalAmdExternalAsGlobal;
-	this.namedDefine = options.namedDefine;
-}
-module.exports = UmdMainTemplatePlugin;
-UmdMainTemplatePlugin.prototype.apply = function(compilation) {
-	var mainTemplate = compilation.mainTemplate;
-	compilation.templatesPlugin("render-with-entry", function(source, chunk, hash) {
-		var externals = chunk.modules.filter(function(m) {
-			return m.external;
-		});
-		var optionalExternals = [],
-			requiredExternals = [];
-		if(this.optionalAmdExternalAsGlobal) {
-			externals.forEach(function(m) {
-				if(m.optional) {
-					optionalExternals.push(m);
-				} else {
-					requiredExternals.push(m);
-				}
-			});
-			externals = requiredExternals.concat(optionalExternals);
-		} else {
-			requiredExternals = externals;
-		}
-
-		function replaceKeys(str) {
-			return mainTemplate.applyPluginsWaterfall("asset-path", str, {
-				hash: hash,
-				chunk: chunk
-			});
-		}
-
-		function externalsDepsArray(modules) {
-			return "[" + replaceKeys(modules.map(function(m) {
-				return JSON.stringify(typeof m.request === "object" ? m.request.amd : m.request);
-			}).join(", ")) + "]";
-		}
-
-		function externalsRootArray(modules) {
-			return replaceKeys(modules.map(function(m) {
-				var request = m.request;
-				if(typeof request === "object") request = request.root;
-				return "root" + accessorToObjectAccess([].concat(request));
-			}).join(", "));
-		}
-
-		function externalsRequireArray(type) {
-			return replaceKeys(externals.map(function(m) {
-				var request = m.request;
-				if(typeof request === "object") request = request[type];
-				if(Array.isArray(request)) {
-					var expr = "require(" + JSON.stringify(request[0]) + ")" + accessorToObjectAccess(request.slice(1));
-				} else
-					var expr = "require(" + JSON.stringify(request) + ")";
-				if(m.optional) {
-					expr = "(function webpackLoadOptionalExternalModule() { try { return " + expr + "; } catch(e) {} }())";
-				}
-				return expr;
-			}).join(", "));
-		}
-
-		function externalsArguments(modules) {
-			return modules.map(function(m) {
-				return "__WEBPACK_EXTERNAL_MODULE_" + m.id + "__";
-			}).join(", ");
-		}
-
-		function libraryName(library) {
-			return JSON.stringify(replaceKeys([].concat(library).pop()));
-		}
-
-		if(optionalExternals.length > 0) {
-			var amdFactory = "function webpackLoadOptionalExternalModuleAmd(" + externalsArguments(requiredExternals) + ") {\n" +
-				"			return factory(" + (
-					requiredExternals.length > 0 ?
-					externalsArguments(requiredExternals) + ", " + externalsRootArray(optionalExternals) :
-					externalsRootArray(optionalExternals)
-				) + ");\n" +
-				"		}";
-		} else {
-			var amdFactory = "factory";
-		}
-
-		return new ConcatSource(new OriginalSource(
-			"(function webpackUniversalModuleDefinition(root, factory) {\n" +
-			"	if(typeof exports === 'object' && typeof module === 'object')\n" +
-			"		module.exports = factory(" + externalsRequireArray("commonjs2") + ");\n" +
-			"	else if(typeof define === 'function' && define.amd)\n" +
-			(requiredExternals.length > 0 ?
-				(this.name && this.namedDefine === true ?
-					"		define(" + libraryName(this.name) + ", " + externalsDepsArray(requiredExternals) + ", " + amdFactory + ");\n" :
-					"		define(" + externalsDepsArray(requiredExternals) + ", " + amdFactory + ");\n"
-				) :
-				(this.name && this.namedDefine === true ?
-					"		define(" + libraryName(this.name) + ", [], " + amdFactory + ");\n" :
-					"		define([], " + amdFactory + ");\n"
-				)
-			) +
-			(this.name ?
-				"	else if(typeof exports === 'object')\n" +
-				"		exports[" + libraryName(this.name) + "] = factory(" + externalsRequireArray("commonjs") + ");\n" +
-				"	else\n" +
-				"		" + replaceKeys(accessorAccess("root", this.name)) + " = factory(" + externalsRootArray(externals) + ");\n" :
-				"	else {\n" +
-				(externals.length > 0 ?
-					"		var a = typeof exports === 'object' ? factory(" + externalsRequireArray("commonjs") + ") : factory(" + externalsRootArray(externals) + ");\n" :
-					"		var a = factory();\n"
-				) +
-				"		for(var i in a) (typeof exports === 'object' ? exports : root)[i] = a[i];\n" +
-				"	}\n"
-			) +
-			"})(this, function(" + externalsArguments(externals) + ") {\nreturn ", "webpack/universalModuleDefinition"), source, "\n});\n");
-	}.bind(this));
-	mainTemplate.plugin("global-hash-paths", function(paths) {
-		if(this.name) paths = paths.concat(this.name);
-		return paths;
-	}.bind(this));
-	mainTemplate.plugin("hash", function(hash) {
-		hash.update("umd");
-		hash.update(this.name + "");
-	}.bind(this));
-};
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+var ConcatSource = require("webpack-core/lib/ConcatSource");
+var OriginalSource = require("webpack-core/lib/OriginalSource");
+
+function accessorToObjectAccess(accessor) {
+	return accessor.map(function(a) {
+		return "[" + JSON.stringify(a) + "]";
+	}).join("");
+}
+
+function accessorAccess(base, accessor) {
+	accessor = [].concat(accessor);
+	return accessor.map(function(a, idx) {
+		a = base + accessorToObjectAccess(accessor.slice(0, idx + 1));
+		if(idx === accessor.length - 1) return a;
+		return a + " = " + a + " || {}";
+	}).join(", ");
+}
+
+function UmdMainTemplatePlugin(name, options) {
+	this.name = name;
+	this.optionalAmdExternalAsGlobal = options.optionalAmdExternalAsGlobal;
+	this.namedDefine = options.namedDefine;
+}
+module.exports = UmdMainTemplatePlugin;
+UmdMainTemplatePlugin.prototype.apply = function(compilation) {
+	var mainTemplate = compilation.mainTemplate;
+	compilation.templatesPlugin("render-with-entry", function(source, chunk, hash) {
+		var externals = chunk.modules.filter(function(m) {
+			return m.external;
+		});
+		var optionalExternals = [],
+			requiredExternals = [];
+		if(this.optionalAmdExternalAsGlobal) {
+			externals.forEach(function(m) {
+				if(m.optional) {
+					optionalExternals.push(m);
+				} else {
+					requiredExternals.push(m);
+				}
+			});
+			externals = requiredExternals.concat(optionalExternals);
+		} else {
+			requiredExternals = externals;
+		}
+
+		function replaceKeys(str) {
+			return mainTemplate.applyPluginsWaterfall("asset-path", str, {
+				hash: hash,
+				chunk: chunk
+			});
+		}
+
+		function externalsDepsArray(modules) {
+			return "[" + replaceKeys(modules.map(function(m) {
+				return JSON.stringify(typeof m.request === "object" ? m.request.amd : m.request);
+			}).join(", ")) + "]";
+		}
+
+		function externalsRootArray(modules) {
+			return replaceKeys(modules.map(function(m) {
+				var request = m.request;
+				if(typeof request === "object") request = request.root;
+				return "root" + accessorToObjectAccess([].concat(request));
+			}).join(", "));
+		}
+
+		function externalsRequireArray(type) {
+			return replaceKeys(externals.map(function(m) {
+				var request = m.request;
+				if(typeof request === "object") request = request[type];
+				if(Array.isArray(request)) {
+					var expr = "require(" + JSON.stringify(request[0]) + ")" + accessorToObjectAccess(request.slice(1));
+				} else
+					var expr = "require(" + JSON.stringify(request) + ")";
+				if(m.optional) {
+					expr = "(function webpackLoadOptionalExternalModule() { try { return " + expr + "; } catch(e) {} }())";
+				}
+				return expr;
+			}).join(", "));
+		}
+
+		function externalsArguments(modules) {
+			return modules.map(function(m) {
+				return "__WEBPACK_EXTERNAL_MODULE_" + m.id + "__";
+			}).join(", ");
+		}
+
+		function libraryName(library) {
+			return JSON.stringify(replaceKeys([].concat(library).pop()));
+		}
+
+		if(optionalExternals.length > 0) {
+			var amdFactory = "function webpackLoadOptionalExternalModuleAmd(" + externalsArguments(requiredExternals) + ") {\n" +
+				"			return factory(" + (
+					requiredExternals.length > 0 ?
+					externalsArguments(requiredExternals) + ", " + externalsRootArray(optionalExternals) :
+					externalsRootArray(optionalExternals)
+				) + ");\n" +
+				"		}";
+		} else {
+			var amdFactory = "factory";
+		}
+
+		return new ConcatSource(new OriginalSource(
+			"(function webpackUniversalModuleDefinition(root, factory) {\n" +
+			"	if(typeof exports === 'object' && typeof module === 'object')\n" +
+			"		module.exports = factory(" + externalsRequireArray("commonjs2") + ");\n" +
+			"	else if(typeof define === 'function' && define.amd)\n" +
+			(requiredExternals.length > 0 ?
+				(this.name && this.namedDefine === true ?
+					"		define(" + libraryName(this.name) + ", " + externalsDepsArray(requiredExternals) + ", " + amdFactory + ");\n" :
+					"		define(" + externalsDepsArray(requiredExternals) + ", " + amdFactory + ");\n"
+				) :
+				(this.name && this.namedDefine === true ?
+					"		define(" + libraryName(this.name) + ", [], " + amdFactory + ");\n" :
+					"		define([], " + amdFactory + ");\n"
+				)
+			) +
+			(this.name ?
+				"	else if(typeof exports === 'object')\n" +
+				"		exports[" + libraryName(this.name) + "] = factory(" + externalsRequireArray("commonjs") + ");\n" +
+				"	else\n" +
+				"		" + replaceKeys(accessorAccess("root", this.name)) + " = factory(" + externalsRootArray(externals) + ");\n" :
+				"	else {\n" +
+				(externals.length > 0 ?
+					"		var a = typeof exports === 'object' ? factory(" + externalsRequireArray("commonjs") + ") : factory(" + externalsRootArray(externals) + ");\n" :
+					"		var a = factory();\n"
+				) +
+				"		for(var i in a) (typeof exports === 'object' ? exports : root)[i] = a[i];\n" +
+				"	}\n"
+			) +
+			"})(this, function(" + externalsArguments(externals) + ") {\nreturn ", "webpack/universalModuleDefinition"), source, "\n});\n");
+	}.bind(this));
+	mainTemplate.plugin("global-hash-paths", function(paths) {
+		if(this.name) paths = paths.concat(this.name);
+		return paths;
+	}.bind(this));
+	mainTemplate.plugin("hash", function(hash) {
+		hash.update("umd");
+		hash.update(this.name + "");
+	}.bind(this));
+};

package/lib/UnsupportedFeatureWarning.js

@@ -1,14 +1,14 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-function UnsupportedFeatureWarning(module, message) {
-	Error.call(this);
-	Error.captureStackTrace(this, UnsupportedFeatureWarning);
-	this.name = "UnsupportedFeatureWarning";
-	this.message = message;
-	this.origin = this.module = module;
-}
-module.exports = UnsupportedFeatureWarning;
-
-UnsupportedFeatureWarning.prototype = Object.create(Error.prototype);
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+function UnsupportedFeatureWarning(module, message) {
+	Error.call(this);
+	Error.captureStackTrace(this, UnsupportedFeatureWarning);
+	this.name = "UnsupportedFeatureWarning";
+	this.message = message;
+	this.origin = this.module = module;
+}
+module.exports = UnsupportedFeatureWarning;
+
+UnsupportedFeatureWarning.prototype = Object.create(Error.prototype);

package/lib/WarnCaseSensitiveModulesPlugin.js

@@ -1,27 +1,27 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-var CaseSensitiveModulesWarning = require("./CaseSensitiveModulesWarning");
-
-function WarnCaseSensitiveModulesPlugin() {}
-module.exports = WarnCaseSensitiveModulesPlugin;
-
-WarnCaseSensitiveModulesPlugin.prototype.apply = function(compiler) {
-	compiler.plugin("compilation", function(compilation) {
-		compilation.plugin("seal", function() {
-			var moduleWithoutCase = {};
-			this.modules.forEach(function(module) {
-				var ident = module.identifier().toLowerCase();
-				if(moduleWithoutCase["$" + ident]) {
-					if(moduleWithoutCase["$" + ident] !== true)
-						this.warnings.push(new CaseSensitiveModulesWarning(moduleWithoutCase["$" + ident]));
-					this.warnings.push(new CaseSensitiveModulesWarning(module));
-					moduleWithoutCase["$" + ident] = true;
-				} else {
-					moduleWithoutCase["$" + ident] = module;
-				}
-			}, this);
-		});
-	});
-};
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+var CaseSensitiveModulesWarning = require("./CaseSensitiveModulesWarning");
+
+function WarnCaseSensitiveModulesPlugin() {}
+module.exports = WarnCaseSensitiveModulesPlugin;
+
+WarnCaseSensitiveModulesPlugin.prototype.apply = function(compiler) {
+	compiler.plugin("compilation", function(compilation) {
+		compilation.plugin("seal", function() {
+			var moduleWithoutCase = {};
+			this.modules.forEach(function(module) {
+				var ident = module.identifier().toLowerCase();
+				if(moduleWithoutCase["$" + ident]) {
+					if(moduleWithoutCase["$" + ident] !== true)
+						this.warnings.push(new CaseSensitiveModulesWarning(moduleWithoutCase["$" + ident]));
+					this.warnings.push(new CaseSensitiveModulesWarning(module));
+					moduleWithoutCase["$" + ident] = true;
+				} else {
+					moduleWithoutCase["$" + ident] = module;
+				}
+			}, this);
+		});
+	});
+};

package/lib/WatchIgnorePlugin.js

@@ -1,45 +1,45 @@
-function WatchIgnorePlugin(paths) {
-	this.paths = paths;
-}
-
-module.exports = WatchIgnorePlugin;
-
-WatchIgnorePlugin.prototype.apply = function(compiler) {
-	compiler.plugin("after-environment", function() {
-		compiler.watchFileSystem = new IgnoringWatchFileSystem(compiler.watchFileSystem, this.paths);
-	}.bind(this));
-};
-
-function IgnoringWatchFileSystem(wfs, paths) {
-	this.wfs = wfs;
-	this.paths = paths;
-}
-
-IgnoringWatchFileSystem.prototype.watch = function(files, dirs, missing, startTime, options, callback, callbackUndelayed) {
-	var ignored = function(path) {
-		return this.paths.some(function(p) {
-			return p instanceof RegExp ? p.test(path) : path.indexOf(p) === 0;
-		});
-	}.bind(this);
-
-	var notIgnored = function(path) {
-		return !ignored(path);
-	};
-
-	var ignoredFiles = files.filter(ignored);
-	var ignoredDirs = dirs.filter(ignored);
-
-	this.wfs.watch(files.filter(notIgnored), dirs.filter(notIgnored), missing, startTime, options, function(err, filesModified, dirsModified, missingModified, fileTimestamps, dirTimestamps) {
-		if(err) return callback(err);
-
-		ignoredFiles.forEach(function(path) {
-			fileTimestamps[path] = 1;
-		});
-
-		ignoredDirs.forEach(function(path) {
-			dirTimestamps[path] = 1;
-		});
-
-		callback(err, filesModified, dirsModified, missingModified, fileTimestamps, dirTimestamps);
-	}, callbackUndelayed);
-};
+function WatchIgnorePlugin(paths) {
+	this.paths = paths;
+}
+
+module.exports = WatchIgnorePlugin;
+
+WatchIgnorePlugin.prototype.apply = function(compiler) {
+	compiler.plugin("after-environment", function() {
+		compiler.watchFileSystem = new IgnoringWatchFileSystem(compiler.watchFileSystem, this.paths);
+	}.bind(this));
+};
+
+function IgnoringWatchFileSystem(wfs, paths) {
+	this.wfs = wfs;
+	this.paths = paths;
+}
+
+IgnoringWatchFileSystem.prototype.watch = function(files, dirs, missing, startTime, options, callback, callbackUndelayed) {
+	var ignored = function(path) {
+		return this.paths.some(function(p) {
+			return p instanceof RegExp ? p.test(path) : path.indexOf(p) === 0;
+		});
+	}.bind(this);
+
+	var notIgnored = function(path) {
+		return !ignored(path);
+	};
+
+	var ignoredFiles = files.filter(ignored);
+	var ignoredDirs = dirs.filter(ignored);
+
+	this.wfs.watch(files.filter(notIgnored), dirs.filter(notIgnored), missing, startTime, options, function(err, filesModified, dirsModified, missingModified, fileTimestamps, dirTimestamps) {
+		if(err) return callback(err);
+
+		ignoredFiles.forEach(function(path) {
+			fileTimestamps[path] = 1;
+		});
+
+		ignoredDirs.forEach(function(path) {
+			dirTimestamps[path] = 1;
+		});
+
+		callback(err, filesModified, dirsModified, missingModified, fileTimestamps, dirTimestamps);
+	}, callbackUndelayed);
+};