webpack 3.8.1 → 3.11.0

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/SourceMapDevToolPlugin.js

@@ -158,7 +158,7 @@ class SourceMapDevToolPlugin {
 					const moduleFilenames = modules.map(m => moduleToSourceNameMapping.get(m));
 					sourceMap.sources = moduleFilenames;
 					if(sourceMap.sourcesContent && !options.noSources) {
-						sourceMap.sourcesContent = sourceMap.sourcesContent.map((content, i) => `${content}\n\n\n${ModuleFilenameHelpers.createFooter(modules[i], requestShortener)}`);
+						sourceMap.sourcesContent = sourceMap.sourcesContent.map((content, i) => typeof content === "string" ? `${content}\n\n\n${ModuleFilenameHelpers.createFooter(modules[i], requestShortener)}` : null);
 					} else {
 						sourceMap.sourcesContent = undefined;
 					}
@@ -181,14 +181,14 @@ class SourceMapDevToolPlugin {
 						}
 						let sourceMapFile = compilation.getPath(sourceMapFilename, {
 							chunk,
-							filename,
+							filename: options.fileContext ? path.relative(options.fileContext, filename) : filename,
 							query,
 							basename: basename(filename)
 						});
 						if(sourceMapFile.indexOf("[contenthash]") !== -1) {
 							sourceMapFile = sourceMapFile.replace(/\[contenthash\]/g, crypto.createHash("md5").update(sourceMapString).digest("hex"));
 						}
-						const sourceMapUrl = path.relative(path.dirname(file), sourceMapFile).replace(/\\/g, "/");
+						const sourceMapUrl = options.publicPath ? options.publicPath + sourceMapFile.replace(/\\/g, "/") : path.relative(path.dirname(file), sourceMapFile).replace(/\\/g, "/");
 						if(currentSourceMappingURLComment !== false) {
 							asset.__SourceMapDevToolData[file] = compilation.assets[file] = new ConcatSource(new RawSource(source), currentSourceMappingURLComment.replace(/\[url\]/g, sourceMapUrl));
 						}

package/lib/Stats.js

@@ -50,11 +50,13 @@ class Stats {
 	}
 
 	hasWarnings() {
-		return this.compilation.warnings.length > 0;
+		return this.compilation.warnings.length > 0 ||
+			this.compilation.children.some(child => child.getStats().hasWarnings());
 	}
 
 	hasErrors() {
-		return this.compilation.errors.length > 0;
+		return this.compilation.errors.length > 0 ||
+			this.compilation.children.some(child => child.getStats().hasErrors());
 	}
 
 	// remove a prefixed "!" that can be specified to reverse sort order

package/lib/TemplatedPathPlugin.js

@@ -60,6 +60,10 @@ const replacePathVariables = (path, data) => {
 	const chunkHash = chunk && (chunk.renderedHash || chunk.hash);
 	const chunkHashWithLength = chunk && chunk.hashWithLength;
 
+	if(typeof path === "function") {
+		path = path(data);
+	}
+
 	if(data.noChunkHash && REGEXP_CHUNKHASH_FOR_TEST.test(path)) {
 		throw new Error(`Cannot use [chunkhash] for chunk in '${path}' (use [hash] instead)`);
 	}
@@ -101,9 +105,9 @@ class TemplatedPathPlugin {
 				const outputOptions = this.outputOptions;
 				const chunkFilename = outputOptions.chunkFilename || outputOptions.filename;
 				if(REGEXP_CHUNKHASH_FOR_TEST.test(chunkFilename))
-					hash.update(JSON.stringify(chunk.getChunkMaps(true, true).hash));
+					hash.update(JSON.stringify(chunk.getChunkMaps(false, true).hash));
 				if(REGEXP_NAME_FOR_TEST.test(chunkFilename))
-					hash.update(JSON.stringify(chunk.getChunkMaps(true, true).name));
+					hash.update(JSON.stringify(chunk.getChunkMaps(false, true).name));
 			});
 		});
 	}

package/lib/UmdMainTemplatePlugin.js

@@ -171,7 +171,7 @@ class UmdMainTemplatePlugin {
 					"		for(var i in a) (typeof exports === 'object' ? exports : root)[i] = a[i];\n" +
 					"	}\n"
 				) +
-				"})(this, function(" + externalsArguments(externals) + ") {\nreturn ", "webpack/universalModuleDefinition"), source, ";\n})");
+				"})(typeof self !== 'undefined' ? self : this, function(" + externalsArguments(externals) + ") {\nreturn ", "webpack/universalModuleDefinition"), source, ";\n})");
 		});
 		mainTemplate.plugin("global-hash-paths", (paths) => {
 			if(this.names.root) paths = paths.concat(this.names.root);

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}` : "");
+	}
+};