webpack 3.6.0 → 3.8.1

package/lib/SetVarMainTemplatePlugin.js

@@ -1,41 +1,41 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-const ConcatSource = require("webpack-sources").ConcatSource;
-
-class SetVarMainTemplatePlugin {
-	constructor(varExpression, copyObject) {
-		this.varExpression = varExpression;
-		this.copyObject = copyObject;
-	}
-
-	apply(compilation) {
-		const mainTemplate = compilation.mainTemplate;
-		compilation.templatesPlugin("render-with-entry", (source, chunk, hash) => {
-			const varExpression = mainTemplate.applyPluginsWaterfall("asset-path", this.varExpression, {
-				hash,
-				chunk
-			});
-			if(this.copyObject) {
-				return new ConcatSource(`(function(e, a) { for(var i in a) e[i] = a[i]; }(${varExpression}, `, source, "))");
-			} else {
-				const prefix = `${varExpression} =\n`;
-				return new ConcatSource(prefix, source);
-			}
-		});
-		mainTemplate.plugin("global-hash-paths", (paths) => {
-			if(this.varExpression) paths.push(this.varExpression);
-			return paths;
-		});
-		mainTemplate.plugin("hash", hash => {
-			hash.update("set var");
-			hash.update(`${this.varExpression}`);
-			hash.update(`${this.copyObject}`);
-		});
-	}
-}
-
-module.exports = SetVarMainTemplatePlugin;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const ConcatSource = require("webpack-sources").ConcatSource;
+
+class SetVarMainTemplatePlugin {
+	constructor(varExpression, copyObject) {
+		this.varExpression = varExpression;
+		this.copyObject = copyObject;
+	}
+
+	apply(compilation) {
+		const mainTemplate = compilation.mainTemplate;
+		compilation.templatesPlugin("render-with-entry", (source, chunk, hash) => {
+			const varExpression = mainTemplate.applyPluginsWaterfall("asset-path", this.varExpression, {
+				hash,
+				chunk
+			});
+			if(this.copyObject) {
+				return new ConcatSource(`(function(e, a) { for(var i in a) e[i] = a[i]; }(${varExpression}, `, source, "))");
+			} else {
+				const prefix = `${varExpression} =\n`;
+				return new ConcatSource(prefix, source);
+			}
+		});
+		mainTemplate.plugin("global-hash-paths", (paths) => {
+			if(this.varExpression) paths.push(this.varExpression);
+			return paths;
+		});
+		mainTemplate.plugin("hash", hash => {
+			hash.update("set var");
+			hash.update(`${this.varExpression}`);
+			hash.update(`${this.copyObject}`);
+		});
+	}
+}
+
+module.exports = SetVarMainTemplatePlugin;

package/lib/SingleEntryPlugin.js

@@ -1,35 +1,35 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-const SingleEntryDependency = require("./dependencies/SingleEntryDependency");
-
-class SingleEntryPlugin {
-	constructor(context, entry, name) {
-		this.context = context;
-		this.entry = entry;
-		this.name = name;
-	}
-
-	apply(compiler) {
-		compiler.plugin("compilation", (compilation, params) => {
-			const normalModuleFactory = params.normalModuleFactory;
-
-			compilation.dependencyFactories.set(SingleEntryDependency, normalModuleFactory);
-		});
-
-		compiler.plugin("make", (compilation, callback) => {
-			const dep = SingleEntryPlugin.createDependency(this.entry, this.name);
-			compilation.addEntry(this.context, dep, this.name, callback);
-		});
-	}
-
-	static createDependency(entry, name) {
-		const dep = new SingleEntryDependency(entry);
-		dep.loc = name;
-		return dep;
-	}
-}
-
-module.exports = SingleEntryPlugin;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+const SingleEntryDependency = require("./dependencies/SingleEntryDependency");
+
+class SingleEntryPlugin {
+	constructor(context, entry, name) {
+		this.context = context;
+		this.entry = entry;
+		this.name = name;
+	}
+
+	apply(compiler) {
+		compiler.plugin("compilation", (compilation, params) => {
+			const normalModuleFactory = params.normalModuleFactory;
+
+			compilation.dependencyFactories.set(SingleEntryDependency, normalModuleFactory);
+		});
+
+		compiler.plugin("make", (compilation, callback) => {
+			const dep = SingleEntryPlugin.createDependency(this.entry, this.name);
+			compilation.addEntry(this.context, dep, this.name, callback);
+		});
+	}
+
+	static createDependency(entry, name) {
+		const dep = new SingleEntryDependency(entry);
+		dep.loc = name;
+		return dep;
+	}
+}
+
+module.exports = SingleEntryPlugin;

package/lib/SizeFormatHelpers.js

@@ -1,18 +1,18 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Sean Larkin @thelarkinn
-*/
-"use strict";
-
-const SizeFormatHelpers = exports;
-
-SizeFormatHelpers.formatSize = size => {
-	if(size <= 0) {
-		return "0 bytes";
-	}
-
-	const abbreviations = ["bytes", "kB", "MB", "GB"];
-	const index = Math.floor(Math.log(size) / Math.log(1000));
-
-	return `${+(size / Math.pow(1000, index)).toPrecision(3)} ${abbreviations[index]}`;
-};
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Sean Larkin @thelarkinn
+*/
+"use strict";
+
+const SizeFormatHelpers = exports;
+
+SizeFormatHelpers.formatSize = size => {
+	if(size <= 0) {
+		return "0 bytes";
+	}
+
+	const abbreviations = ["bytes", "kB", "MB", "GB"];
+	const index = Math.floor(Math.log(size) / Math.log(1000));
+
+	return `${+(size / Math.pow(1000, index)).toPrecision(3)} ${abbreviations[index]}`;
+};

package/lib/SourceMapDevToolModuleOptionsPlugin.js

@@ -1,37 +1,37 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-const ModuleFilenameHelpers = require("./ModuleFilenameHelpers");
-
-class SourceMapDevToolModuleOptionsPlugin {
-	constructor(options) {
-		this.options = options;
-	}
-
-	apply(compilation) {
-		const options = this.options;
-		if(options.module !== false) {
-			compilation.plugin("build-module", module => {
-				module.useSourceMap = true;
-			});
-		}
-		if(options.lineToLine === true) {
-			compilation.plugin("build-module", module => {
-				module.lineToLine = true;
-			});
-		} else if(options.lineToLine) {
-			compilation.plugin("build-module", module => {
-				if(!module.resource) return;
-				let resourcePath = module.resource;
-				const idx = resourcePath.indexOf("?");
-				if(idx >= 0) resourcePath = resourcePath.substr(0, idx);
-				module.lineToLine = ModuleFilenameHelpers.matchObject(options.lineToLine, resourcePath);
-			});
-		}
-	}
-}
-
-module.exports = SourceMapDevToolModuleOptionsPlugin;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const ModuleFilenameHelpers = require("./ModuleFilenameHelpers");
+
+class SourceMapDevToolModuleOptionsPlugin {
+	constructor(options) {
+		this.options = options;
+	}
+
+	apply(compilation) {
+		const options = this.options;
+		if(options.module !== false) {
+			compilation.plugin("build-module", module => {
+				module.useSourceMap = true;
+			});
+		}
+		if(options.lineToLine === true) {
+			compilation.plugin("build-module", module => {
+				module.lineToLine = true;
+			});
+		} else if(options.lineToLine) {
+			compilation.plugin("build-module", module => {
+				if(!module.resource) return;
+				let resourcePath = module.resource;
+				const idx = resourcePath.indexOf("?");
+				if(idx >= 0) resourcePath = resourcePath.substr(0, idx);
+				module.lineToLine = ModuleFilenameHelpers.matchObject(options.lineToLine, resourcePath);
+			});
+		}
+	}
+}
+
+module.exports = SourceMapDevToolModuleOptionsPlugin;

package/lib/Stats.js

@@ -100,6 +100,7 @@ class Stats {
 		const requestShortener = new RequestShortener(context);
 		const showPerformance = optionOrLocalFallback(options.performance, true);
 		const showHash = optionOrLocalFallback(options.hash, true);
+		const showEnv = optionOrLocalFallback(options.env, false);
 		const showVersion = optionOrLocalFallback(options.version, true);
 		const showTimings = optionOrLocalFallback(options.timings, true);
 		const showAssets = optionOrLocalFallback(options.assets, true);
@@ -198,15 +199,22 @@ class Stats {
 			text += e.message;
 			if(showErrorDetails && e.details) text += `\n${e.details}`;
 			if(showErrorDetails && e.missing) text += e.missing.map(item => `\n[${item}]`).join("");
-			if(showModuleTrace && e.dependencies && e.origin) {
+			if(showModuleTrace && e.origin) {
 				text += `\n @ ${e.origin.readableIdentifier(requestShortener)}`;
-				e.dependencies.forEach(dep => {
-					if(!dep.loc) return;
-					if(typeof dep.loc === "string") return;
-					const locInfo = formatLocation(dep.loc);
-					if(!locInfo) return;
-					text += ` ${locInfo}`;
-				});
+				if(typeof e.originLoc === "object") {
+					const locInfo = formatLocation(e.originLoc);
+					if(locInfo)
+						text += ` ${locInfo}`;
+				}
+				if(e.dependencies) {
+					e.dependencies.forEach(dep => {
+						if(!dep.loc) return;
+						if(typeof dep.loc === "string") return;
+						const locInfo = formatLocation(dep.loc);
+						if(!locInfo) return;
+						text += ` ${locInfo}`;
+					});
+				}
 				let current = e.origin;
 				while(current.issuer) {
 					current = current.issuer;
@@ -240,6 +248,11 @@ class Stats {
 		if(showTimings && this.startTime && this.endTime) {
 			obj.time = this.endTime - this.startTime;
 		}
+
+		if(showEnv && options._env) {
+			obj.env = options._env;
+		}
+
 		if(compilation.needAdditionalPass) {
 			obj.needAdditionalPass = true;
 		}
@@ -546,6 +559,11 @@ class Stats {
 			colors.normal("ms");
 			newline();
 		}
+		if(obj.env) {
+			colors.normal("Environment (--env): ");
+			colors.bold(JSON.stringify(obj.env, null, 2));
+			newline();
+		}
 		if(obj.publicPath) {
 			colors.normal("PublicPath: ");
 			colors.bold(obj.publicPath);
@@ -900,6 +918,7 @@ class Stats {
 					chunkModules: true,
 					chunkOrigins: true,
 					depth: true,
+					env: true,
 					reasons: true,
 					usedExports: true,
 					providedExports: true,

package/lib/UmdMainTemplatePlugin.js

@@ -42,7 +42,7 @@ class UmdMainTemplatePlugin {
 	apply(compilation) {
 		const mainTemplate = compilation.mainTemplate;
 		compilation.templatesPlugin("render-with-entry", (source, chunk, hash) => {
-			let externals = chunk.getModules().filter(m => m.external);
+			let externals = chunk.getModules().filter(m => m.external && (m.type === "umd" || m.type === "umd2"));
 			const optionalExternals = [];
 			let requiredExternals = [];
 			if(this.optionalAmdExternalAsGlobal) {

package/lib/UnsupportedFeatureWarning.js

@@ -1,21 +1,21 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-const WebpackError = require("./WebpackError");
-
-class UnsupportedFeatureWarning extends WebpackError {
-	constructor(module, message) {
-		super();
-
-		this.name = "UnsupportedFeatureWarning";
-		this.message = message;
-		this.origin = this.module = module;
-
-		Error.captureStackTrace(this, this.constructor);
-	}
-}
-
-module.exports = UnsupportedFeatureWarning;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const WebpackError = require("./WebpackError");
+
+class UnsupportedFeatureWarning extends WebpackError {
+	constructor(module, message) {
+		super();
+
+		this.name = "UnsupportedFeatureWarning";
+		this.message = message;
+		this.origin = this.module = module;
+
+		Error.captureStackTrace(this, this.constructor);
+	}
+}
+
+module.exports = UnsupportedFeatureWarning;

package/lib/UseStrictPlugin.js

@@ -1,34 +1,34 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-const ConstDependency = require("./dependencies/ConstDependency");
-
-class UseStrictPlugin {
-	apply(compiler) {
-		compiler.plugin("compilation", (compilation, params) => {
-			params.normalModuleFactory.plugin("parser", (parser) => {
-				const parserInstance = parser;
-				parser.plugin("program", (ast) => {
-					const firstNode = ast.body[0];
-					if(firstNode &&
-						firstNode.type === "ExpressionStatement" &&
-						firstNode.expression.type === "Literal" &&
-						firstNode.expression.value === "use strict") {
-						// Remove "use strict" expression. It will be added later by the renderer again.
-						// This is necessary in order to not break the strict mode when webpack prepends code.
-						// @see https://github.com/webpack/webpack/issues/1970
-						const dep = new ConstDependency("", firstNode.range);
-						dep.loc = firstNode.loc;
-						parserInstance.state.current.addDependency(dep);
-						parserInstance.state.module.strict = true;
-					}
-				});
-			});
-		});
-	}
-}
-
-module.exports = UseStrictPlugin;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const ConstDependency = require("./dependencies/ConstDependency");
+
+class UseStrictPlugin {
+	apply(compiler) {
+		compiler.plugin("compilation", (compilation, params) => {
+			params.normalModuleFactory.plugin("parser", (parser) => {
+				const parserInstance = parser;
+				parser.plugin("program", (ast) => {
+					const firstNode = ast.body[0];
+					if(firstNode &&
+						firstNode.type === "ExpressionStatement" &&
+						firstNode.expression.type === "Literal" &&
+						firstNode.expression.value === "use strict") {
+						// Remove "use strict" expression. It will be added later by the renderer again.
+						// This is necessary in order to not break the strict mode when webpack prepends code.
+						// @see https://github.com/webpack/webpack/issues/1970
+						const dep = new ConstDependency("", firstNode.range);
+						dep.loc = firstNode.loc;
+						parserInstance.state.current.addDependency(dep);
+						parserInstance.state.module.strict = true;
+					}
+				});
+			});
+		});
+	}
+}
+
+module.exports = UseStrictPlugin;

package/lib/WarnCaseSensitiveModulesPlugin.js

@@ -1,31 +1,31 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-const CaseSensitiveModulesWarning = require("./CaseSensitiveModulesWarning");
-
-class WarnCaseSensitiveModulesPlugin {
-	apply(compiler) {
-		compiler.plugin("compilation", compilation => {
-			compilation.plugin("seal", () => {
-				const moduleWithoutCase = Object.create(null);
-				compilation.modules.forEach(module => {
-					const identifier = module.identifier().toLowerCase();
-					if(moduleWithoutCase[identifier]) {
-						moduleWithoutCase[identifier].push(module);
-					} else {
-						moduleWithoutCase[identifier] = [module];
-					}
-				});
-				Object.keys(moduleWithoutCase).forEach(key => {
-					if(moduleWithoutCase[key].length > 1)
-						compilation.warnings.push(new CaseSensitiveModulesWarning(moduleWithoutCase[key]));
-				});
-			});
-		});
-	}
-}
-
-module.exports = WarnCaseSensitiveModulesPlugin;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const CaseSensitiveModulesWarning = require("./CaseSensitiveModulesWarning");
+
+class WarnCaseSensitiveModulesPlugin {
+	apply(compiler) {
+		compiler.plugin("compilation", compilation => {
+			compilation.plugin("seal", () => {
+				const moduleWithoutCase = Object.create(null);
+				compilation.modules.forEach(module => {
+					const identifier = module.identifier().toLowerCase();
+					if(moduleWithoutCase[identifier]) {
+						moduleWithoutCase[identifier].push(module);
+					} else {
+						moduleWithoutCase[identifier] = [module];
+					}
+				});
+				Object.keys(moduleWithoutCase).forEach(key => {
+					if(moduleWithoutCase[key].length > 1)
+						compilation.warnings.push(new CaseSensitiveModulesWarning(moduleWithoutCase[key]));
+				});
+			});
+		});
+	}
+}
+
+module.exports = WarnCaseSensitiveModulesPlugin;

package/lib/WatchIgnorePlugin.js

@@ -1,49 +1,49 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-class WatchIgnorePlugin {
-	constructor(paths) {
-		this.paths = paths;
-	}
-
-	apply(compiler) {
-		compiler.plugin("after-environment", () => {
-			compiler.watchFileSystem = new IgnoringWatchFileSystem(compiler.watchFileSystem, this.paths);
-		});
-	}
-}
-
-module.exports = WatchIgnorePlugin;
-
-class IgnoringWatchFileSystem {
-	constructor(wfs, paths) {
-		this.wfs = wfs;
-		this.paths = paths;
-	}
-
-	watch(files, dirs, missing, startTime, options, callback, callbackUndelayed) {
-		const ignored = path => this.paths.some(p => p instanceof RegExp ? p.test(path) : path.indexOf(p) === 0);
-
-		const notIgnored = path => !ignored(path);
-
-		const ignoredFiles = files.filter(ignored);
-		const ignoredDirs = dirs.filter(ignored);
-
-		this.wfs.watch(files.filter(notIgnored), dirs.filter(notIgnored), missing, startTime, options, (err, filesModified, dirsModified, missingModified, fileTimestamps, dirTimestamps) => {
-			if(err) return callback(err);
-
-			ignoredFiles.forEach(path => {
-				fileTimestamps[path] = 1;
-			});
-
-			ignoredDirs.forEach(path => {
-				dirTimestamps[path] = 1;
-			});
-
-			callback(err, filesModified, dirsModified, missingModified, fileTimestamps, dirTimestamps);
-		}, callbackUndelayed);
-	}
-}
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+class WatchIgnorePlugin {
+	constructor(paths) {
+		this.paths = paths;
+	}
+
+	apply(compiler) {
+		compiler.plugin("after-environment", () => {
+			compiler.watchFileSystem = new IgnoringWatchFileSystem(compiler.watchFileSystem, this.paths);
+		});
+	}
+}
+
+module.exports = WatchIgnorePlugin;
+
+class IgnoringWatchFileSystem {
+	constructor(wfs, paths) {
+		this.wfs = wfs;
+		this.paths = paths;
+	}
+
+	watch(files, dirs, missing, startTime, options, callback, callbackUndelayed) {
+		const ignored = path => this.paths.some(p => p instanceof RegExp ? p.test(path) : path.indexOf(p) === 0);
+
+		const notIgnored = path => !ignored(path);
+
+		const ignoredFiles = files.filter(ignored);
+		const ignoredDirs = dirs.filter(ignored);
+
+		this.wfs.watch(files.filter(notIgnored), dirs.filter(notIgnored), missing, startTime, options, (err, filesModified, dirsModified, missingModified, fileTimestamps, dirTimestamps) => {
+			if(err) return callback(err);
+
+			ignoredFiles.forEach(path => {
+				fileTimestamps[path] = 1;
+			});
+
+			ignoredDirs.forEach(path => {
+				dirTimestamps[path] = 1;
+			});
+
+			callback(err, filesModified, dirsModified, missingModified, fileTimestamps, dirTimestamps);
+		}, callbackUndelayed);
+	}
+}

package/lib/WebpackError.js

@@ -1,11 +1,11 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Jarid Margolin @jaridmargolin
-*/
-"use strict";
-
-module.exports = class WebpackError extends Error {
-	inspect() {
-		return this.stack + (this.details ? `\n${this.details}` : "");
-	}
-};
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Jarid Margolin @jaridmargolin
+*/
+"use strict";
+
+module.exports = class WebpackError extends Error {
+	inspect() {
+		return this.stack + (this.details ? `\n${this.details}` : "");
+	}
+};