webpack 3.5.2 → 3.5.6

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

@@ -1,118 +1,119 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-const Compiler = require("./Compiler");
-const MultiCompiler = require("./MultiCompiler");
-const NodeEnvironmentPlugin = require("./node/NodeEnvironmentPlugin");
-const WebpackOptionsApply = require("./WebpackOptionsApply");
-const WebpackOptionsDefaulter = require("./WebpackOptionsDefaulter");
-const validateSchema = require("./validateSchema");
-const WebpackOptionsValidationError = require("./WebpackOptionsValidationError");
-const webpackOptionsSchema = require("../schemas/webpackOptionsSchema.json");
-
-function webpack(options, callback) {
-	const webpackOptionsValidationErrors = validateSchema(webpackOptionsSchema, options);
-	if(webpackOptionsValidationErrors.length) {
-		throw new WebpackOptionsValidationError(webpackOptionsValidationErrors);
-	}
-	let compiler;
-	if(Array.isArray(options)) {
-		compiler = new MultiCompiler(options.map(options => webpack(options)));
-	} else if(typeof options === "object") {
-		new WebpackOptionsDefaulter().process(options);
-
-		compiler = new Compiler();
-		compiler.context = options.context;
-		compiler.options = options;
-		new NodeEnvironmentPlugin().apply(compiler);
-		if(options.plugins && Array.isArray(options.plugins)) {
-			compiler.apply.apply(compiler, options.plugins);
-		}
-		compiler.applyPlugins("environment");
-		compiler.applyPlugins("after-environment");
-		compiler.options = new WebpackOptionsApply().process(options, compiler);
-	} else {
-		throw new Error("Invalid argument: options");
-	}
-	if(callback) {
-		if(typeof callback !== "function") throw new Error("Invalid argument: callback");
-		if(options.watch === true || (Array.isArray(options) && options.some(o => o.watch))) {
-			const watchOptions = Array.isArray(options) ? options.map(o => o.watchOptions || {}) : (options.watchOptions || {});
-			return compiler.watch(watchOptions, callback);
-		}
-		compiler.run(callback);
-	}
-	return compiler;
-}
-exports = module.exports = webpack;
-
-webpack.WebpackOptionsDefaulter = WebpackOptionsDefaulter;
-webpack.WebpackOptionsApply = WebpackOptionsApply;
-webpack.Compiler = Compiler;
-webpack.MultiCompiler = MultiCompiler;
-webpack.NodeEnvironmentPlugin = NodeEnvironmentPlugin;
-webpack.validate = validateSchema.bind(this, webpackOptionsSchema);
-webpack.validateSchema = validateSchema;
-webpack.WebpackOptionsValidationError = WebpackOptionsValidationError;
-
-function exportPlugins(obj, mappings) {
-	Object.keys(mappings).forEach(name => {
-		Object.defineProperty(obj, name, {
-			configurable: false,
-			enumerable: true,
-			get: mappings[name]
-		});
-	});
-}
-
-exportPlugins(exports, {
-	"DefinePlugin": () => require("./DefinePlugin"),
-	"NormalModuleReplacementPlugin": () => require("./NormalModuleReplacementPlugin"),
-	"ContextReplacementPlugin": () => require("./ContextReplacementPlugin"),
-	"IgnorePlugin": () => require("./IgnorePlugin"),
-	"WatchIgnorePlugin": () => require("./WatchIgnorePlugin"),
-	"BannerPlugin": () => require("./BannerPlugin"),
-	"PrefetchPlugin": () => require("./PrefetchPlugin"),
-	"AutomaticPrefetchPlugin": () => require("./AutomaticPrefetchPlugin"),
-	"ProvidePlugin": () => require("./ProvidePlugin"),
-	"HotModuleReplacementPlugin": () => require("./HotModuleReplacementPlugin"),
-	"SourceMapDevToolPlugin": () => require("./SourceMapDevToolPlugin"),
-	"EvalSourceMapDevToolPlugin": () => require("./EvalSourceMapDevToolPlugin"),
-	"EvalDevToolModulePlugin": () => require("./EvalDevToolModulePlugin"),
-	"CachePlugin": () => require("./CachePlugin"),
-	"ExtendedAPIPlugin": () => require("./ExtendedAPIPlugin"),
-	"ExternalsPlugin": () => require("./ExternalsPlugin"),
-	"JsonpTemplatePlugin": () => require("./JsonpTemplatePlugin"),
-	"LibraryTemplatePlugin": () => require("./LibraryTemplatePlugin"),
-	"LoaderTargetPlugin": () => require("./LoaderTargetPlugin"),
-	"MemoryOutputFileSystem": () => require("./MemoryOutputFileSystem"),
-	"ProgressPlugin": () => require("./ProgressPlugin"),
-	"SetVarMainTemplatePlugin": () => require("./SetVarMainTemplatePlugin"),
-	"UmdMainTemplatePlugin": () => require("./UmdMainTemplatePlugin"),
-	"NoErrorsPlugin": () => require("./NoErrorsPlugin"),
-	"NoEmitOnErrorsPlugin": () => require("./NoEmitOnErrorsPlugin"),
-	"NewWatchingPlugin": () => require("./NewWatchingPlugin"),
-	"EnvironmentPlugin": () => require("./EnvironmentPlugin"),
-	"DllPlugin": () => require("./DllPlugin"),
-	"DllReferencePlugin": () => require("./DllReferencePlugin"),
-	"LoaderOptionsPlugin": () => require("./LoaderOptionsPlugin"),
-	"NamedModulesPlugin": () => require("./NamedModulesPlugin"),
-	"NamedChunksPlugin": () => require("./NamedChunksPlugin"),
-	"HashedModuleIdsPlugin": () => require("./HashedModuleIdsPlugin"),
-	"ModuleFilenameHelpers": () => require("./ModuleFilenameHelpers")
-});
-exportPlugins(exports.optimize = {}, {
-	"AggressiveMergingPlugin": () => require("./optimize/AggressiveMergingPlugin"),
-	"AggressiveSplittingPlugin": () => require("./optimize/AggressiveSplittingPlugin"),
-	"CommonsChunkPlugin": () => require("./optimize/CommonsChunkPlugin"),
-	"ChunkModuleIdRangePlugin": () => require("./optimize/ChunkModuleIdRangePlugin"),
-	"DedupePlugin": () => require("./optimize/DedupePlugin"),
-	"LimitChunkCountPlugin": () => require("./optimize/LimitChunkCountPlugin"),
-	"MinChunkSizePlugin": () => require("./optimize/MinChunkSizePlugin"),
-	"ModuleConcatenationPlugin": () => require("./optimize/ModuleConcatenationPlugin"),
-	"OccurrenceOrderPlugin": () => require("./optimize/OccurrenceOrderPlugin"),
-	"UglifyJsPlugin": () => require("./optimize/UglifyJsPlugin")
-});
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const Compiler = require("./Compiler");
+const MultiCompiler = require("./MultiCompiler");
+const NodeEnvironmentPlugin = require("./node/NodeEnvironmentPlugin");
+const WebpackOptionsApply = require("./WebpackOptionsApply");
+const WebpackOptionsDefaulter = require("./WebpackOptionsDefaulter");
+const validateSchema = require("./validateSchema");
+const WebpackOptionsValidationError = require("./WebpackOptionsValidationError");
+const webpackOptionsSchema = require("../schemas/webpackOptionsSchema.json");
+
+function webpack(options, callback) {
+	const webpackOptionsValidationErrors = validateSchema(webpackOptionsSchema, options);
+	if(webpackOptionsValidationErrors.length) {
+		throw new WebpackOptionsValidationError(webpackOptionsValidationErrors);
+	}
+	let compiler;
+	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();
+		compiler.context = options.context;
+		compiler.options = options;
+		new NodeEnvironmentPlugin().apply(compiler);
+		if(options.plugins && Array.isArray(options.plugins)) {
+			compiler.apply.apply(compiler, options.plugins);
+		}
+		compiler.applyPlugins("environment");
+		compiler.applyPlugins("after-environment");
+		compiler.options = new WebpackOptionsApply().process(options, compiler);
+	} else {
+		throw new Error("Invalid argument: options");
+	}
+	if(callback) {
+		if(typeof callback !== "function") throw new Error("Invalid argument: callback");
+		if(options.watch === true || (Array.isArray(options) && options.some(o => o.watch))) {
+			const watchOptions = Array.isArray(options) ? options.map(o => o.watchOptions || {}) : (options.watchOptions || {});
+			return compiler.watch(watchOptions, callback);
+		}
+		compiler.run(callback);
+	}
+	return compiler;
+}
+exports = module.exports = webpack;
+
+webpack.WebpackOptionsDefaulter = WebpackOptionsDefaulter;
+webpack.WebpackOptionsApply = WebpackOptionsApply;
+webpack.Compiler = Compiler;
+webpack.MultiCompiler = MultiCompiler;
+webpack.NodeEnvironmentPlugin = NodeEnvironmentPlugin;
+webpack.validate = validateSchema.bind(this, webpackOptionsSchema);
+webpack.validateSchema = validateSchema;
+webpack.WebpackOptionsValidationError = WebpackOptionsValidationError;
+
+function exportPlugins(obj, mappings) {
+	Object.keys(mappings).forEach(name => {
+		Object.defineProperty(obj, name, {
+			configurable: false,
+			enumerable: true,
+			get: mappings[name]
+		});
+	});
+}
+
+exportPlugins(exports, {
+	"DefinePlugin": () => require("./DefinePlugin"),
+	"NormalModuleReplacementPlugin": () => require("./NormalModuleReplacementPlugin"),
+	"ContextReplacementPlugin": () => require("./ContextReplacementPlugin"),
+	"IgnorePlugin": () => require("./IgnorePlugin"),
+	"WatchIgnorePlugin": () => require("./WatchIgnorePlugin"),
+	"BannerPlugin": () => require("./BannerPlugin"),
+	"PrefetchPlugin": () => require("./PrefetchPlugin"),
+	"AutomaticPrefetchPlugin": () => require("./AutomaticPrefetchPlugin"),
+	"ProvidePlugin": () => require("./ProvidePlugin"),
+	"HotModuleReplacementPlugin": () => require("./HotModuleReplacementPlugin"),
+	"SourceMapDevToolPlugin": () => require("./SourceMapDevToolPlugin"),
+	"EvalSourceMapDevToolPlugin": () => require("./EvalSourceMapDevToolPlugin"),
+	"EvalDevToolModulePlugin": () => require("./EvalDevToolModulePlugin"),
+	"CachePlugin": () => require("./CachePlugin"),
+	"ExtendedAPIPlugin": () => require("./ExtendedAPIPlugin"),
+	"ExternalsPlugin": () => require("./ExternalsPlugin"),
+	"JsonpTemplatePlugin": () => require("./JsonpTemplatePlugin"),
+	"LibraryTemplatePlugin": () => require("./LibraryTemplatePlugin"),
+	"LoaderTargetPlugin": () => require("./LoaderTargetPlugin"),
+	"MemoryOutputFileSystem": () => require("./MemoryOutputFileSystem"),
+	"ProgressPlugin": () => require("./ProgressPlugin"),
+	"SetVarMainTemplatePlugin": () => require("./SetVarMainTemplatePlugin"),
+	"UmdMainTemplatePlugin": () => require("./UmdMainTemplatePlugin"),
+	"NoErrorsPlugin": () => require("./NoErrorsPlugin"),
+	"NoEmitOnErrorsPlugin": () => require("./NoEmitOnErrorsPlugin"),
+	"NewWatchingPlugin": () => require("./NewWatchingPlugin"),
+	"EnvironmentPlugin": () => require("./EnvironmentPlugin"),
+	"DllPlugin": () => require("./DllPlugin"),
+	"DllReferencePlugin": () => require("./DllReferencePlugin"),
+	"LoaderOptionsPlugin": () => require("./LoaderOptionsPlugin"),
+	"NamedModulesPlugin": () => require("./NamedModulesPlugin"),
+	"NamedChunksPlugin": () => require("./NamedChunksPlugin"),
+	"HashedModuleIdsPlugin": () => require("./HashedModuleIdsPlugin"),
+	"ModuleFilenameHelpers": () => require("./ModuleFilenameHelpers")
+});
+exportPlugins(exports.optimize = {}, {
+	"AggressiveMergingPlugin": () => require("./optimize/AggressiveMergingPlugin"),
+	"AggressiveSplittingPlugin": () => require("./optimize/AggressiveSplittingPlugin"),
+	"CommonsChunkPlugin": () => require("./optimize/CommonsChunkPlugin"),
+	"ChunkModuleIdRangePlugin": () => require("./optimize/ChunkModuleIdRangePlugin"),
+	"DedupePlugin": () => require("./optimize/DedupePlugin"),
+	"LimitChunkCountPlugin": () => require("./optimize/LimitChunkCountPlugin"),
+	"MinChunkSizePlugin": () => require("./optimize/MinChunkSizePlugin"),
+	"ModuleConcatenationPlugin": () => require("./optimize/ModuleConcatenationPlugin"),
+	"OccurrenceOrderPlugin": () => require("./optimize/OccurrenceOrderPlugin"),
+	"UglifyJsPlugin": () => require("./optimize/UglifyJsPlugin")
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpack",
-  "version": "3.5.2",
+  "version": "3.5.6",
   "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": {

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": [