webpack 3.5.3 → 3.6.0

package/lib/OptionsDefaulter.js

@@ -30,6 +30,7 @@ class OptionsDefaulter {
 	}
 
 	process(options) {
+		// TODO: change this for webpack 4: options = Object.assign({}, options);
 		for(let name in this.defaults) {
 			switch(this.config[name]) {
 				case undefined:
@@ -55,6 +56,7 @@ class OptionsDefaulter {
 					throw new Error("OptionsDefaulter cannot process " + this.config[name]);
 			}
 		}
+		// TODO: change this for webpack 4: return options;
 	}
 
 	set(name, config, def) {

package/lib/Parser.js

@@ -634,14 +634,14 @@ class Parser extends Tapable {
 		statement.params.forEach(param => {
 			this.walkPattern(param);
 		});
-		this.inScope(statement.params, function() {
+		this.inScope(statement.params, () => {
 			if(statement.body.type === "BlockStatement") {
 				this.prewalkStatement(statement.body);
 				this.walkStatement(statement.body);
 			} else {
 				this.walkExpression(statement.body);
 			}
-		}.bind(this));
+		});
 	}
 
 	prewalkImportDeclaration(statement) {
@@ -784,10 +784,10 @@ class Parser extends Tapable {
 	}
 
 	walkCatchClause(catchClause) {
-		this.inScope([catchClause.param], function() {
+		this.inScope([catchClause.param], () => {
 			this.prewalkStatement(catchClause.body);
 			this.walkStatement(catchClause.body);
-		}.bind(this));
+		});
 	}
 
 	prewalkVariableDeclarators(declarators) {
@@ -916,28 +916,28 @@ class Parser extends Tapable {
 		expression.params.forEach(param => {
 			this.walkPattern(param);
 		});
-		this.inScope(expression.params, function() {
+		this.inScope(expression.params, () => {
 			if(expression.body.type === "BlockStatement") {
 				this.prewalkStatement(expression.body);
 				this.walkStatement(expression.body);
 			} else {
 				this.walkExpression(expression.body);
 			}
-		}.bind(this));
+		});
 	}
 
 	walkArrowFunctionExpression(expression) {
 		expression.params.forEach(param => {
 			this.walkPattern(param);
 		});
-		this.inScope(expression.params, function() {
+		this.inScope(expression.params, () => {
 			if(expression.body.type === "BlockStatement") {
 				this.prewalkStatement(expression.body);
 				this.walkStatement(expression.body);
 			} else {
 				this.walkExpression(expression.body);
 			}
-		}.bind(this));
+		});
 	}
 
 	walkSequenceExpression(expression) {
@@ -1059,7 +1059,7 @@ class Parser extends Tapable {
 			const args = options.map(renameArgOrThis, this);
 			this.inScope(params.filter(function(identifier, idx) {
 				return !args[idx];
-			}), function() {
+			}), () => {
 				if(renameThis) {
 					this.scope.renames.$this = renameThis;
 				}
@@ -1074,7 +1074,7 @@ class Parser extends Tapable {
 					this.walkStatement(functionExpression.body);
 				} else
 					this.walkExpression(functionExpression.body);
-			}.bind(this));
+			});
 		}
 		if(expression.callee.type === "MemberExpression" &&
 			expression.callee.object.type === "FunctionExpression" &&

package/lib/SourceMapDevToolPlugin.js

@@ -96,7 +96,8 @@ class SourceMapDevToolPlugin {
 									return module || source;
 								});
 
-								for(const module of modules) {
+								for(let idx = 0; idx < modules.length; idx++) {
+									const module = modules[idx];
 									if(!moduleToSourceNameMapping.get(module)) {
 										moduleToSourceNameMapping.set(module, ModuleFilenameHelpers.createFilename(module, moduleFilenameTemplate, requestShortener));
 									}
@@ -121,7 +122,8 @@ class SourceMapDevToolPlugin {
 				});
 
 				// find modules with conflicting source names
-				for(const module of allModules) {
+				for(let idx = 0; idx < allModules.length; idx++) {
+					const module = allModules[idx];
 					let sourceName = moduleToSourceNameMapping.get(module);
 					let hasName = conflictDetectionSet.has(sourceName);
 					if(!hasName) {

package/lib/Template.js

@@ -10,6 +10,12 @@ const ConcatSource = require("webpack-sources").ConcatSource;
 const START_LOWERCASE_ALPHABET_CODE = "a".charCodeAt(0);
 const START_UPPERCASE_ALPHABET_CODE = "A".charCodeAt(0);
 const DELTA_A_TO_Z = "z".charCodeAt(0) - START_LOWERCASE_ALPHABET_CODE + 1;
+const FUNCTION_CONTENT_REGEX = /^function\s?\(\)\s?\{\n?|\n?\}$/g;
+const INDENT_MULTILINE_REGEX = /^\t/mg;
+const IDENTIFIER_NAME_REPLACE_REGEX = /^[^a-zA-Z$_]/;
+const IDENTIFIER_ALPHA_NUMERIC_NAME_REPLACE_REGEX = /[^a-zA-Z0-9$_]/g;
+const PATH_NAME_NORMALIZE_REPLACE_REGEX = /[^a-zA-Z0-9_!§$()=\-^°]+/g;
+const MATCH_PADDED_HYPHENS_REPLACE_REGEX = /^-|-$/g;
 
 module.exports = class Template extends Tapable {
 	constructor(outputOptions) {
@@ -18,17 +24,17 @@ module.exports = class Template extends Tapable {
 	}
 
 	static getFunctionContent(fn) {
-		return fn.toString().replace(/^function\s?\(\)\s?\{\n?|\n?\}$/g, "").replace(/^\t/mg, "");
+		return fn.toString().replace(FUNCTION_CONTENT_REGEX, "").replace(INDENT_MULTILINE_REGEX, "");
 	}
 
 	static toIdentifier(str) {
 		if(typeof str !== "string") return "";
-		return str.replace(/^[^a-zA-Z$_]/, "_").replace(/[^a-zA-Z0-9$_]/g, "_");
+		return str.replace(IDENTIFIER_NAME_REPLACE_REGEX, "_").replace(IDENTIFIER_ALPHA_NUMERIC_NAME_REPLACE_REGEX, "_");
 	}
 
 	static toPath(str) {
 		if(typeof str !== "string") return "";
-		return str.replace(/[^a-zA-Z0-9_!§$()=\-^°]+/g, "-").replace(/^-|-$/, "");
+		return str.replace(PATH_NAME_NORMALIZE_REPLACE_REGEX, "-").replace(MATCH_PADDED_HYPHENS_REPLACE_REGEX, "");
 	}
 
 	// map number to a single character a-z, A-Z or <_ + number> if number is too big
@@ -144,23 +150,27 @@ module.exports = class Template extends Tapable {
 		} else {
 			// Render an object
 			source.add("{\n");
-			allModules.sort(function(a, b) {
-				var aId = a.id + "";
-				var bId = b.id + "";
-				if(aId < bId) return -1;
-				if(aId > bId) return 1;
-				return 0;
-			}).forEach(function(module, idx) {
-				if(idx !== 0) source.add(",\n");
-				source.add("\n/***/ " + JSON.stringify(module.id) + ":\n");
-				source.add(module.source);
-			});
+			allModules
+				.sort(stringifyIdSortPredicate)
+				.forEach(function(module, idx) {
+					if(idx !== 0) source.add(",\n");
+					source.add(`\n/***/ ${JSON.stringify(module.id)}:\n`);
+					source.add(module.source);
+				});
 			source.add("\n\n" + prefix + "}");
 		}
 		return source;
 	}
 };
 
+function stringifyIdSortPredicate(a, b) {
+	var aId = a.id + "";
+	var bId = b.id + "";
+	if(aId < bId) return -1;
+	if(aId > bId) return 1;
+	return 0;
+}
+
 function moduleIdIsNumber(module) {
 	return typeof module.id === "number";
 }

package/lib/UmdMainTemplatePlugin.js

@@ -41,7 +41,7 @@ class UmdMainTemplatePlugin {
 
 	apply(compilation) {
 		const mainTemplate = compilation.mainTemplate;
-		compilation.templatesPlugin("render-with-entry", function(source, chunk, hash) {
+		compilation.templatesPlugin("render-with-entry", (source, chunk, hash) => {
 			let externals = chunk.getModules().filter(m => m.external);
 			const optionalExternals = [];
 			let requiredExternals = [];
@@ -172,19 +172,19 @@ class UmdMainTemplatePlugin {
 					"	}\n"
 				) +
 				"})(this, function(" + externalsArguments(externals) + ") {\nreturn ", "webpack/universalModuleDefinition"), source, ";\n})");
-		}.bind(this));
-		mainTemplate.plugin("global-hash-paths", function(paths) {
+		});
+		mainTemplate.plugin("global-hash-paths", (paths) => {
 			if(this.names.root) paths = paths.concat(this.names.root);
 			if(this.names.amd) paths = paths.concat(this.names.amd);
 			if(this.names.commonjs) paths = paths.concat(this.names.commonjs);
 			return paths;
-		}.bind(this));
-		mainTemplate.plugin("hash", function(hash) {
+		});
+		mainTemplate.plugin("hash", (hash) => {
 			hash.update("umd");
 			hash.update(`${this.names.root}`);
 			hash.update(`${this.names.amd}`);
 			hash.update(`${this.names.commonjs}`);
-		}.bind(this));
+		});
 	}
 }
 

package/lib/WebpackOptionsDefaulter.js

@@ -16,6 +16,7 @@ class WebpackOptionsDefaulter extends OptionsDefaulter {
 		this.set("context", process.cwd());
 		this.set("target", "web");
 
+		this.set("module", "call", value => Object.assign({}, value));
 		this.set("module.unknownContextRequest", ".");
 		this.set("module.unknownContextRegExp", false);
 		this.set("module.unknownContextRecursive", true);
@@ -29,7 +30,6 @@ class WebpackOptionsDefaulter extends OptionsDefaulter {
 		this.set("module.wrappedContextCritical", false);
 		this.set("module.strictExportPresence", false);
 		this.set("module.strictThisContextOnImports", false);
-
 		this.set("module.unsafeCache", true);
 
 		this.set("output", "call", (value, options) => {
@@ -40,7 +40,7 @@ class WebpackOptionsDefaulter extends OptionsDefaulter {
 			} else if(typeof value !== "object") {
 				return {};
 			} else {
-				return value;
+				return Object.assign({}, value);
 			}
 		});
 		this.set("output.filename", "[name].js");
@@ -68,7 +68,13 @@ class WebpackOptionsDefaulter extends OptionsDefaulter {
 		this.set("output.devtoolLineToLine", false);
 		this.set("output.strictModuleExceptionHandling", false);
 
-		this.set("node", {});
+		this.set("node", "call", value => {
+			if(typeof value === "boolean") {
+				return value;
+			} else {
+				return Object.assign({}, value);
+			}
+		});
 		this.set("node.console", false);
 		this.set("node.process", true);
 		this.set("node.global", true);
@@ -77,11 +83,18 @@ class WebpackOptionsDefaulter extends OptionsDefaulter {
 		this.set("node.__filename", "mock");
 		this.set("node.__dirname", "mock");
 
+		this.set("performance", "call", value => {
+			if(typeof value === "boolean") {
+				return value;
+			} else {
+				return Object.assign({}, value);
+			}
+		});
 		this.set("performance.maxAssetSize", 250000);
 		this.set("performance.maxEntrypointSize", 250000);
 		this.set("performance.hints", false);
 
-		this.set("resolve", {});
+		this.set("resolve", "call", value => Object.assign({}, value));
 		this.set("resolve.unsafeCache", true);
 		this.set("resolve.modules", ["node_modules"]);
 		this.set("resolve.extensions", [".js", ".json"]);
@@ -101,7 +114,8 @@ class WebpackOptionsDefaulter extends OptionsDefaulter {
 		this.set("resolve.cacheWithContext", "make", (options) => {
 			return Array.isArray(options.resolve.plugins) && options.resolve.plugins.length > 0;
 		});
-		this.set("resolveLoader", {});
+
+		this.set("resolveLoader", "call", value => Object.assign({}, value));
 		this.set("resolveLoader.unsafeCache", true);
 		this.set("resolveLoader.mainFields", ["loader", "main"]);
 		this.set("resolveLoader.extensions", [".js", ".json"]);

package/lib/dependencies/HarmonyExportImportedSpecifierDependency.js

@@ -26,11 +26,12 @@ class HarmonyExportImportedSpecifierDependency extends NullDependency {
 		const active = HarmonyModulesHelpers.isActive(this.originModule, this);
 		const importedModule = this.importDependency.module;
 
-		if(!importedModule || !used || !active) return null;
-		if(!this.originModule.usedExports) return null;
+		if(!importedModule || !used || !active || !this.originModule.usedExports) return null;
+
+		const hasUsedExports = Array.isArray(this.originModule.usedExports);
 
 		if(name) {
-			const nameIsNotInUsedExports = Array.isArray(this.originModule.usedExports) && this.originModule.usedExports.indexOf(name) < 0;
+			const nameIsNotInUsedExports = hasUsedExports && this.originModule.usedExports.indexOf(name) < 0;
 			if(nameIsNotInUsedExports) return null;
 
 			// export { name as name }
@@ -48,33 +49,31 @@ class HarmonyExportImportedSpecifierDependency extends NullDependency {
 			};
 		}
 
+		const hasProvidedExports = Array.isArray(importedModule.providedExports);
+
 		// export *
-		if(Array.isArray(this.originModule.usedExports)) {
+		if(hasUsedExports) {
 			// reexport * with known used exports
-			var activeExports = HarmonyModulesHelpers.getActiveExports(this.originModule, this);
-			if(Array.isArray(importedModule.providedExports)) {
-				return {
-					module: importedModule,
-					importedNames: this.originModule.usedExports.filter((id) => {
-						const notInActiveExports = activeExports.indexOf(id) < 0;
-						const notDefault = id !== "default";
-						const inProvidedExports = importedModule.providedExports.indexOf(id) >= 0;
-						return notInActiveExports && notDefault && inProvidedExports;
-					}),
-				};
-			}
+			const activeExports = HarmonyModulesHelpers.getActiveExports(this.originModule, this);
+			const importedNames = this.originModule.usedExports.filter(id => {
+				const notInActiveExports = activeExports.indexOf(id) < 0;
+				const notDefault = id !== "default";
+
+				if(hasProvidedExports) {
+					const inProvidedExports = importedModule.providedExports.indexOf(id) >= 0;
+					return notInActiveExports && notDefault && inProvidedExports;
+				} else {
+					return notInActiveExports && notDefault;
+				}
+			});
 
 			return {
 				module: importedModule,
-				importedNames: this.originModule.usedExports.filter(id => {
-					const notInActiveExports = activeExports.indexOf(id) < 0;
-					const notDefault = id !== "default";
-					return notInActiveExports && notDefault;
-				}),
+				importedNames
 			};
 		}
 
-		if(Array.isArray(importedModule.providedExports)) {
+		if(hasProvidedExports) {
 			return {
 				module: importedModule,
 				importedNames: importedModule.providedExports.filter(id => id !== "default"),

package/lib/dependencies/HarmonyImportDependencyParserPlugin.js

@@ -56,6 +56,8 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 		if(this.strictThisContextOnImports) {
 			// only in case when we strictly follow the spec we need a special case here
 			parser.plugin("call imported var.*", (expr) => {
+				if(expr.callee.type !== "MemberExpression") return;
+				if(expr.callee.object.type !== "Identifier") return;
 				const name = expr.callee.object.name;
 				const settings = parser.state.harmonySpecifier[`$${name}`];
 				if(settings[2] !== null)
@@ -75,6 +77,7 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 			const args = expr.arguments;
 			const fullExpr = expr;
 			expr = expr.callee;
+			if(expr.type !== "Identifier") return;
 			const name = expr.name;
 			const settings = parser.state.harmonySpecifier[`$${name}`];
 			const dep = new HarmonyImportSpecifierDependency(settings[0], settings[1], settings[2], name, expr.range, this.strictExportPresence);

package/lib/dependencies/HarmonyModulesHelpers.js

@@ -34,8 +34,8 @@ class HarmonyModulesHelpers {
 		const desc = depInQuestion.describeHarmonyExport();
 		if(!desc.exportedName) return true;
 		let before = true;
-		for(const moduleDependency of module.dependencies) {
-			const dep = moduleDependency;
+		for(let idx = 0; idx < module.dependencies.length; idx++) {
+			const dep = module.dependencies[idx];
 			if(dep === depInQuestion) {
 				before = false;
 				continue;

package/lib/optimize/ConcatenatedModule.js

@@ -172,7 +172,7 @@ class ConcatenatedModule extends Module {
 		this.built = modules.some(m => m.built);
 		this.cacheable = modules.every(m => m.cacheable);
 		const modulesSet = new Set(modules);
-		this.reasons = rootModule.reasons.filter(reason => !modulesSet.has(reason.module));
+		this.reasons = rootModule.reasons.filter(reason => !(reason.dependency instanceof HarmonyImportDependency) || !modulesSet.has(reason.module));
 		this.meta = rootModule.meta;
 		this.moduleArgument = rootModule.moduleArgument;
 		this.exportsArgument = rootModule.exportsArgument;
@@ -193,7 +193,7 @@ class ConcatenatedModule extends Module {
 				const m = info.module;
 
 				// populate dependencies
-				m.dependencies.filter(dep => !modulesSet.has(dep.module))
+				m.dependencies.filter(dep => !(dep instanceof HarmonyImportDependency) || !modulesSet.has(dep.module))
 					.forEach(d => this.dependencies.push(d));
 				// populate dep warning
 				m.dependenciesWarnings.forEach(depWarning => this.dependenciesWarnings.push(depWarning));
@@ -213,6 +213,12 @@ class ConcatenatedModule extends Module {
 		}
 	}
 
+	get modules() {
+		return this._orderedConcatenationList
+			.filter(info => info.type === "concatenated")
+			.map(info => info.module);
+	}
+
 	identifier() {
 		return this._orderedConcatenationList.map(info => {
 			switch(info.type) {
@@ -346,7 +352,6 @@ class ConcatenatedModule extends Module {
 							internalNames: new Map(),
 							exportMap: exportMap,
 							reexportMap: reexportMap,
-							needCompatibilityFlag: false,
 							hasNamespaceObject: false,
 							namespaceObjectSource: null
 						};
@@ -445,7 +450,7 @@ class ConcatenatedModule extends Module {
 		const allUsedNames = new Set([
 			"__WEBPACK_MODULE_DEFAULT_EXPORT__", // avoid using this internal name
 
-			"abstract", "arguments", "await", "boolean", "break", "byte", "case", "catch", "char", "class",
+			"abstract", "arguments", "async", "await", "boolean", "break", "byte", "case", "catch", "char", "class",
 			"const", "continue", "debugger", "default", "delete", "do", "double", "else", "enum", "eval",
 			"export", "extends", "false", "final", "finally", "float", "for", "function", "goto", "if",
 			"implements", "import", "in", "instanceof", "int", "interface", "let", "long", "native", "new",
@@ -570,7 +575,8 @@ class ConcatenatedModule extends Module {
 		const result = new ConcatSource();
 
 		// add harmony compatibility flag (must be first because of possible circular dependencies)
-		if(moduleToInfoMap.get(this.rootModule).needCompatibilityFlag) {
+		const usedExports = this.rootModule.usedExports;
+		if(usedExports === true) {
 			result.add(`Object.defineProperty(${this.exportsArgument || "exports"}, "__esModule", { value: true });\n`);
 		}
 
@@ -801,9 +807,7 @@ class HarmonyCompatibilityDependencyConcatenatedTemplate {
 	}
 
 	apply(dep, source, outputOptions, requestShortener, dependencyTemplates) {
-		if(dep.originModule === this.rootModule) {
-			this.modulesMap.get(this.rootModule).needCompatibilityFlag = true;
-		}
+		// do nothing
 	}
 }
 

package/lib/optimize/EnsureChunkConditionsPlugin.js

@@ -22,6 +22,7 @@ class EnsureChunkConditionsPlugin {
 							chunk.parents.forEach((parent) => {
 								if(!usedChunks.has(parent)) {
 									parent.addModule(module);
+									module.addChunk(parent);
 									newChunks.push(parent);
 								}
 							});

package/lib/optimize/ModuleConcatenationPlugin.js

@@ -5,6 +5,8 @@
 "use strict";
 
 const HarmonyImportDependency = require("../dependencies/HarmonyImportDependency");
+const ModuleHotAcceptDependency = require("../dependencies/ModuleHotAcceptDependency");
+const ModuleHotDeclineDependency = require("../dependencies/ModuleHotDeclineDependency");
 const ConcatenatedModule = require("./ConcatenatedModule");
 const HarmonyExportImportedSpecifierDependency = require("../dependencies/HarmonyExportImportedSpecifierDependency");
 const HarmonyCompatibilityDependency = require("../dependencies/HarmonyCompatibilityDependency");
@@ -67,6 +69,12 @@ class ModuleConcatenationPlugin {
 						continue;
 					}
 
+					// Hot Module Replacement need it's own module to work correctly
+					if(module.dependencies.some(dep => dep instanceof ModuleHotAcceptDependency || dep instanceof ModuleHotDeclineDependency)) {
+						setBailoutReason(module, "Module uses Hot Module Replacement");
+						continue;
+					}
+
 					relevantModules.push(module);
 
 					// Module must not be the entry points
@@ -155,6 +163,7 @@ class ModuleConcatenationPlugin {
 					}
 					chunks.forEach(chunk => {
 						chunk.addModule(newModule);
+						newModule.addChunk(chunk);
 						if(chunk.entryModule === concatConfiguration.rootModule)
 							chunk.entryModule = newModule;
 					});

package/lib/util/Semaphore.js

@@ -0,0 +1,32 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+class Semaphore {
+	constructor(available) {
+		this.available = available;
+		this.waiters = [];
+	}
+
+	acquire(callback) {
+		if(this.available > 0) {
+			this.available--;
+			callback();
+		} else {
+			this.waiters.push(callback);
+		}
+	}
+
+	release() {
+		if(this.waiters.length > 0) {
+			const callback = this.waiters.pop();
+			process.nextTick(callback);
+		} else {
+			this.available++;
+		}
+	}
+}
+
+module.exports = Semaphore;

package/lib/webpack.js

@@ -22,6 +22,7 @@ function webpack(options, callback) {
 	if(Array.isArray(options)) {
 		compiler = new MultiCompiler(options.map(options => webpack(options)));
 	} else if(typeof options === "object") {
+		// TODO webpack 4: process returns options
 		new WebpackOptionsDefaulter().process(options);
 
 		compiler = new Compiler();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpack",
-  "version": "3.5.3",
+  "version": "3.6.0",
   "author": "Tobias Koppers @sokra",
   "description": "Packs CommonJs/AMD modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand. Support loaders to preprocess files, i.e. json, jsx, es7, css, less, ... and your custom stuff.",
   "dependencies": {
@@ -106,7 +106,7 @@
     "nsp": "nsp check --output summary",
     "benchmark": "mocha --max-old-space-size=4096 --harmony test/*.benchmark.js -R spec",
     "cover": "node --max-old-space-size=4096 --harmony ./node_modules/istanbul/lib/cli.js cover -x '**/*.runtime.js' node_modules/mocha/bin/_mocha -- test/*.test.js",
-    "cover:min": "node --max-old-space-size=4096 --harmony ./node_modules/.bin/istanbul cover -x '**/*.runtime.js' --report lcovonly node_modules/mocha/bin/_mocha -- test/*.test.js",
+    "cover:min": "node --max-old-space-size=4096 --harmony ./node_modules/istanbul/lib/cli.js cover -x '**/*.runtime.js' --report lcovonly node_modules/mocha/bin/_mocha -- test/*.test.js",
     "publish-patch": "npm run lint && npm run beautify-lint && mocha && npm version patch && git push && git push --tags && npm publish"
   }
 }

package/schemas/webpackOptionsSchema.json

@@ -900,6 +900,11 @@
     "output": {
       "$ref": "#/definitions/output"
     },
+    "parallelism": {
+      "description": "The number of parallel processed modules in the compilation.",
+      "minimum": 1,
+      "type": "number"
+    },
     "performance": {
       "description": "Configuration for web performance recommendations.",
       "anyOf": [