webpack 4.41.2 → 4.41.6

package/declarations/WebpackOptions.d.ts

@@ -50,7 +50,8 @@ export type Externals =
 					request: string,
 					callback: (err?: Error, result?: string) => void
 			  ) => void)
-			| ExternalItem)[];
+			| ExternalItem
+	  )[];
 /**
  * This interface was referenced by `WebpackOptions`'s JSON-Schema
  * via the `definition` "ExternalItem".
@@ -131,7 +132,7 @@ export type RuleSetCondition =
  * This interface was referenced by `WebpackOptions`'s JSON-Schema
  * via the `definition` "RuleSetConditions".
  */
-export type RuleSetConditions = RuleSetConditionsRecursive;
+export type RuleSetConditions = RuleSetCondition[];
 /**
  * One or multiple rule conditions
  *
@@ -180,7 +181,7 @@ export type RuleSetConditionAbsolute =
  * This interface was referenced by `WebpackOptions`'s JSON-Schema
  * via the `definition` "RuleSetConditionsAbsolute".
  */
-export type RuleSetConditionsAbsolute = RuleSetConditionsAbsoluteRecursive;
+export type RuleSetConditionsAbsolute = RuleSetConditionAbsolute[];
 /**
  * This interface was referenced by `WebpackOptions`'s JSON-Schema
  * via the `definition` "RuleSetLoader".
@@ -391,7 +392,8 @@ export interface WebpackOptions {
 				| "normal"
 				| "detailed"
 				| "verbose"
-				| "errors-warnings");
+				| "errors-warnings"
+		  );
 	/**
 	 * Environment to build for
 	 */
@@ -404,7 +406,8 @@ export interface WebpackOptions {
 				| "node-webkit"
 				| "electron-main"
 				| "electron-renderer"
-				| "electron-preload")
+				| "electron-preload"
+		  )
 		| ((compiler: import("../lib/Compiler")) => void);
 	/**
 	 * Enter watch mode, which rebuilds on file change.

package/lib/CommonJsStuffPlugin.js

@@ -45,18 +45,20 @@ class CommonJsStuffPlugin {
 						.tap("CommonJsStuffPlugin", expr => {
 							parser.state.module.buildMeta.moduleConcatenationBailout =
 								"module.loaded";
-							return ParserHelpers.toConstantDependency(parser, "module.l")(
-								expr
-							);
+							return ParserHelpers.toConstantDependency(
+								parser,
+								"module.l"
+							)(expr);
 						});
 					parser.hooks.expression
 						.for("module.id")
 						.tap("CommonJsStuffPlugin", expr => {
 							parser.state.module.buildMeta.moduleConcatenationBailout =
 								"module.id";
-							return ParserHelpers.toConstantDependency(parser, "module.i")(
-								expr
-							);
+							return ParserHelpers.toConstantDependency(
+								parser,
+								"module.i"
+							)(expr);
 						});
 					parser.hooks.expression
 						.for("module.exports")

package/lib/DefinePlugin.js

@@ -190,9 +190,10 @@ class DefinePlugin {
 										strCode
 									)(expr);
 								} else {
-									return ParserHelpers.toConstantDependency(parser, strCode)(
-										expr
-									);
+									return ParserHelpers.toConstantDependency(
+										parser,
+										strCode
+									)(expr);
 								}
 							});
 						}
@@ -255,9 +256,10 @@ class DefinePlugin {
 									strCode
 								)(expr);
 							} else {
-								return ParserHelpers.toConstantDependency(parser, strCode)(
-									expr
-								);
+								return ParserHelpers.toConstantDependency(
+									parser,
+									strCode
+								)(expr);
 							}
 						});
 						parser.hooks.typeof.for(key).tap("DefinePlugin", expr => {

package/lib/EvalSourceMapDevToolModuleTemplatePlugin.js

@@ -6,6 +6,7 @@
 
 const { RawSource } = require("webpack-sources");
 const ModuleFilenameHelpers = require("./ModuleFilenameHelpers");
+const { absolutify } = require("./util/identifier");
 
 const cache = new WeakMap();
 
@@ -60,7 +61,11 @@ class EvalSourceMapDevToolModuleTemplatePlugin {
 					obj[key] = sourceMap[key];
 					return obj;
 				}, {});
+				const context = this.compilation.compiler.options.context;
 				const modules = sourceMap.sources.map(source => {
+					if (source.startsWith("webpack://")) {
+						source = absolutify(context, source.slice(10));
+					}
 					const module = self.compilation.findModule(source);
 					return module || source;
 				});

package/lib/FlagDependencyExportsPlugin.js

@@ -7,14 +7,9 @@
 const Queue = require("./util/Queue");
 
 const addToSet = (a, b) => {
-	let changed = false;
 	for (const item of b) {
-		if (!a.has(item)) {
-			a.add(item);
-			changed = true;
-		}
+		a.add(item);
 	}
-	return changed;
 };
 
 class FlagDependencyExportsPlugin {
@@ -61,14 +56,11 @@ class FlagDependencyExportsPlugin {
 							// break if it should move to the worst state
 							if (exports === true) {
 								module.buildMeta.providedExports = true;
-								notifyDependencies();
 								return true;
 							}
 							// merge in new exports
 							if (Array.isArray(exports)) {
-								if (addToSet(moduleProvidedExports, exports)) {
-									notifyDependencies();
-								}
+								addToSet(moduleProvidedExports, exports);
 							}
 							// store dependencies
 							const exportDeps = exportDesc.dependencies;
@@ -96,6 +88,26 @@ class FlagDependencyExportsPlugin {
 							}
 						};
 
+						const notifyDependenciesIfDifferent = (set, array) => {
+							const deps = dependencies.get(module);
+							if (deps !== undefined) {
+								if (set.size === array.length) {
+									let i = 0;
+									let different = false;
+									for (const item of set) {
+										if (item !== array[i++]) {
+											different = true;
+											break;
+										}
+									}
+									if (!different) return;
+								}
+								for (const dep of deps) {
+									queue.enqueue(dep);
+								}
+							}
+						};
+
 						// Start with all modules without provided exports
 						for (const module of modules) {
 							if (module.buildInfo.temporaryProvidedExports) {
@@ -114,18 +126,25 @@ class FlagDependencyExportsPlugin {
 							if (module.buildMeta.providedExports !== true) {
 								moduleWithExports =
 									module.buildMeta && module.buildMeta.exportsType;
-								moduleProvidedExports = Array.isArray(
-									module.buildMeta.providedExports
-								)
-									? new Set(module.buildMeta.providedExports)
-									: new Set();
+								moduleProvidedExports = new Set();
 								providedExportsAreTemporary = false;
 								processDependenciesBlock(module);
 								module.buildInfo.temporaryProvidedExports = providedExportsAreTemporary;
 								if (!moduleWithExports) {
+									notifyDependencies();
 									module.buildMeta.providedExports = true;
+								} else if (module.buildMeta.providedExports === true) {
+									notifyDependencies();
+								} else if (!module.buildMeta.providedExports) {
 									notifyDependencies();
-								} else if (module.buildMeta.providedExports !== true) {
+									module.buildMeta.providedExports = Array.from(
+										moduleProvidedExports
+									);
+								} else {
+									notifyDependenciesIfDifferent(
+										moduleProvidedExports,
+										module.buildMeta.providedExports
+									);
 									module.buildMeta.providedExports = Array.from(
 										moduleProvidedExports
 									);

package/lib/HotModuleReplacement.runtime.js

@@ -2,7 +2,17 @@
 	MIT License http://www.opensource.org/licenses/mit-license.php
 	Author Tobias Koppers @sokra
 */
-/*global $hash$ $requestTimeout$ installedModules $require$ hotDownloadManifest hotDownloadUpdateChunk hotDisposeChunk modules */
+// eslint-disable no-unused-vars
+var $hash$ = undefined;
+var $requestTimeout$ = undefined;
+var installedModules = undefined;
+var $require$ = undefined;
+var hotDownloadManifest = undefined;
+var hotDownloadUpdateChunk = undefined;
+var hotDisposeChunk = undefined;
+var modules = undefined;
+var chunkId = undefined;
+
 module.exports = function() {
 	var hotApplyOnUpdate = true;
 	// eslint-disable-next-line no-unused-vars
@@ -204,7 +214,6 @@ module.exports = function() {
 			/*foreachInstalledChunks*/
 			// eslint-disable-next-line no-lone-blocks
 			{
-				/*globals chunkId */
 				hotEnsureUpdateChunk(chunkId);
 			}
 			if (

package/lib/ProvidePlugin.js

@@ -62,9 +62,10 @@ class ProvidePlugin {
 								return false;
 							}
 							if (scopedName) {
-								ParserHelpers.toConstantDependency(parser, nameIdentifier)(
-									expr
-								);
+								ParserHelpers.toConstantDependency(
+									parser,
+									nameIdentifier
+								)(expr);
 							}
 							return true;
 						});

package/lib/SourceMapDevToolPlugin.js

@@ -9,6 +9,7 @@ const { ConcatSource, RawSource } = require("webpack-sources");
 const ModuleFilenameHelpers = require("./ModuleFilenameHelpers");
 const SourceMapDevToolModuleOptionsPlugin = require("./SourceMapDevToolModuleOptionsPlugin");
 const createHash = require("./util/createHash");
+const { absolutify } = require("./util/identifier");
 
 const validateOptions = require("schema-utils");
 const schema = require("../schemas/plugins/SourceMapDevToolPlugin.json");
@@ -68,16 +69,24 @@ const getTaskForFile = (file, asset, chunk, options, compilation) => {
 		sourceMap = asset.map(options);
 		source = asset.source();
 	}
-	if (sourceMap) {
-		return {
-			chunk,
-			file,
-			asset,
-			source,
-			sourceMap,
-			modules: undefined
-		};
-	}
+	if (!sourceMap || typeof source !== "string") return;
+	const context = compilation.options.context;
+	const modules = sourceMap.sources.map(source => {
+		if (source.startsWith("webpack://")) {
+			source = absolutify(context, source.slice(10));
+		}
+		const module = compilation.findModule(source);
+		return module || source;
+	});
+
+	return {
+		chunk,
+		file,
+		asset,
+		source,
+		sourceMap,
+		modules
+	};
 };
 
 class SourceMapDevToolPlugin {
@@ -212,10 +221,7 @@ class SourceMapDevToolPlugin {
 						);
 
 						if (task) {
-							const modules = task.sourceMap.sources.map(source => {
-								const module = compilation.findModule(source);
-								return module || source;
-							});
+							const modules = task.modules;
 
 							for (let idx = 0; idx < modules.length; idx++) {
 								const module = modules[idx];
@@ -234,8 +240,6 @@ class SourceMapDevToolPlugin {
 								}
 							}
 
-							task.modules = modules;
-
 							tasks.push(task);
 						}
 					});

package/lib/dependencies/HarmonyExportImportedSpecifierDependency.js

@@ -304,9 +304,13 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 		}
 
 		if (Array.isArray(importedModule.buildMeta.providedExports)) {
+			const activeFromOtherStarExports = this._discoverActiveExportsFromOtherStartExports();
 			return {
 				exports: importedModule.buildMeta.providedExports.filter(
-					id => id !== "default"
+					id =>
+						id !== "default" &&
+						!activeFromOtherStarExports.has(id) &&
+						!this.activeExports.has(id)
 				),
 				dependencies: [importedModule]
 			};

package/lib/logging/Logger.js

@@ -5,34 +5,31 @@
 
 "use strict";
 
-/**
- * @enum {string}
- */
 const LogType = Object.freeze({
-	error: "error", // message, c style arguments
-	warn: "warn", // message, c style arguments
-	info: "info", // message, c style arguments
-	log: "log", // message, c style arguments
-	debug: "debug", // message, c style arguments
+	error: /** @type {"error"} */ ("error"), // message, c style arguments
+	warn: /** @type {"warn"} */ ("warn"), // message, c style arguments
+	info: /** @type {"info"} */ ("info"), // message, c style arguments
+	log: /** @type {"log"} */ ("log"), // message, c style arguments
+	debug: /** @type {"debug"} */ ("debug"), // message, c style arguments
 
-	trace: "trace", // no arguments
+	trace: /** @type {"trace"} */ ("trace"), // no arguments
 
-	group: "group", // [label]
-	groupCollapsed: "groupCollapsed", // [label]
-	groupEnd: "groupEnd", // [label]
+	group: /** @type {"group"} */ ("group"), // [label]
+	groupCollapsed: /** @type {"groupCollapsed"} */ ("groupCollapsed"), // [label]
+	groupEnd: /** @type {"groupEnd"} */ ("groupEnd"), // [label]
 
-	profile: "profile", // [profileName]
-	profileEnd: "profileEnd", // [profileName]
+	profile: /** @type {"profile"} */ ("profile"), // [profileName]
+	profileEnd: /** @type {"profileEnd"} */ ("profileEnd"), // [profileName]
 
-	time: "time", // name, time as [seconds, nanoseconds]
+	time: /** @type {"time"} */ ("time"), // name, time as [seconds, nanoseconds]
 
-	clear: "clear", // no arguments
-	status: "status" // message, arguments
+	clear: /** @type {"clear"} */ ("clear"), // no arguments
+	status: /** @type {"status"} */ ("status") // message, arguments
 });
 
 exports.LogType = LogType;
 
-/** @typedef {keyof typeof LogType} LogTypeEnum */
+/** @typedef {typeof LogType[keyof typeof LogType]} LogTypeEnum */
 
 const LOG_SYMBOL = Symbol("webpack logger raw log method");
 const TIMERS_SYMBOL = Symbol("webpack logger times");

package/lib/node/NodeMainTemplate.runtime.js

@@ -2,7 +2,12 @@
 	MIT License http://www.opensource.org/licenses/mit-license.php
 	Author Tobias Koppers @sokra
 */
-/*global installedChunks $hotChunkFilename$ hotAddUpdateChunk $hotMainFilename$ */
+// eslint-disable-next-line no-unused-vars
+var $hotChunkFilename$ = undefined;
+var hotAddUpdateChunk = undefined;
+var installedChunks = undefined;
+var $hotMainFilename$ = undefined;
+
 module.exports = function() {
 	// eslint-disable-next-line no-unused-vars
 	function hotDownloadUpdateChunk(chunkId) {

package/lib/node/NodeMainTemplateAsync.runtime.js

@@ -2,7 +2,13 @@
 	MIT License http://www.opensource.org/licenses/mit-license.php
 	Author Tobias Koppers @sokra
 */
-/*global installedChunks $hotChunkFilename$ $require$ hotAddUpdateChunk $hotMainFilename$ */
+// eslint-disable-next-line no-unused-vars
+var $hotChunkFilename$ = undefined;
+var $require$ = undefined;
+var hotAddUpdateChunk = undefined;
+var $hotMainFilename$ = undefined;
+var installedChunks = undefined;
+
 module.exports = function() {
 	// eslint-disable-next-line no-unused-vars
 	function hotDownloadUpdateChunk(chunkId) {

package/lib/optimize/ConcatenatedModule.js

@@ -330,6 +330,7 @@ class ConcatenatedModule extends Module {
 		);
 
 		this.dependencies = [];
+		this.blocks = [];
 
 		this.warnings = [];
 		this.errors = [];
@@ -348,6 +349,10 @@ class ConcatenatedModule extends Module {
 				)) {
 					this.dependencies.push(d);
 				}
+				// populate blocks
+				for (const d of m.blocks) {
+					this.blocks.push(d);
+				}
 				// populate file dependencies
 				if (m.buildInfo.fileDependencies) {
 					for (const file of m.buildInfo.fileDependencies) {

package/lib/optimize/SideEffectsFlagPlugin.js

@@ -115,7 +115,7 @@ class SideEffectsFlagPlugin {
 								(dep instanceof HarmonyImportSpecifierDependency &&
 									!dep.namespaceObjectAsContext)
 							) {
-								const mapping = map.get(dep.id);
+								const mapping = map.get(dep._id);
 								if (mapping) {
 									dep.redirectedModule = mapping.module;
 									dep.redirectedId = mapping.exportName;

package/lib/util/identifier.js

@@ -1,6 +1,17 @@
 "use strict";
 const path = require("path");
 
+/**
+ * @param {string} context context for relative path
+ * @param {string} relativePath path
+ * @returns {string} absolute path
+ */
+const requestToAbsolute = (context, relativePath) => {
+	if (relativePath.startsWith("./") || relativePath.startsWith("../"))
+		return path.join(context, relativePath);
+	return relativePath;
+};
+
 /**
  * @typedef {Object} MakeRelativePathsCache
  * @property {Map<string, Map<string, string>>=} relativePaths
@@ -100,3 +111,17 @@ exports.contextify = (context, request) => {
 		})
 		.join("!");
 };
+
+/**
+ * @param {string} context absolute context path
+ * @param {string} request any request string
+ * @returns {string} a new request string using absolute paths when possible
+ */
+const _absolutify = (context, request) => {
+	return request
+		.split("!")
+		.map(r => requestToAbsolute(context, r))
+		.join("!");
+};
+
+exports.absolutify = _absolutify;

package/lib/wasm/WebAssemblyModulesPlugin.js

@@ -5,15 +5,16 @@
 "use strict";
 
 const Generator = require("../Generator");
-const WebAssemblyParser = require("./WebAssemblyParser");
-const WebAssemblyGenerator = require("./WebAssemblyGenerator");
-const WebAssemblyJavascriptGenerator = require("./WebAssemblyJavascriptGenerator");
-const WebAssemblyImportDependency = require("../dependencies/WebAssemblyImportDependency");
 const WebAssemblyExportImportedDependency = require("../dependencies/WebAssemblyExportImportedDependency");
+const WebAssemblyImportDependency = require("../dependencies/WebAssemblyImportDependency");
 const WebAssemblyInInitialChunkError = require("./WebAssemblyInInitialChunkError");
 
 /** @typedef {import("../Compiler")} Compiler */
 
+let WebAssemblyGenerator;
+let WebAssemblyJavascriptGenerator;
+let WebAssemblyParser;
+
 class WebAssemblyModulesPlugin {
 	constructor(options) {
 		this.options = options;
@@ -40,12 +41,21 @@ class WebAssemblyModulesPlugin {
 				normalModuleFactory.hooks.createParser
 					.for("webassembly/experimental")
 					.tap("WebAssemblyModulesPlugin", () => {
+						if (WebAssemblyParser === undefined) {
+							WebAssemblyParser = require("./WebAssemblyParser");
+						}
 						return new WebAssemblyParser();
 					});
 
 				normalModuleFactory.hooks.createGenerator
 					.for("webassembly/experimental")
 					.tap("WebAssemblyModulesPlugin", () => {
+						if (WebAssemblyGenerator === undefined) {
+							WebAssemblyGenerator = require("./WebAssemblyGenerator");
+						}
+						if (WebAssemblyJavascriptGenerator === undefined) {
+							WebAssemblyJavascriptGenerator = require("./WebAssemblyJavascriptGenerator");
+						}
 						return Generator.byType({
 							javascript: new WebAssemblyJavascriptGenerator(),
 							webassembly: new WebAssemblyGenerator(this.options)

package/lib/web/JsonpMainTemplate.runtime.js

@@ -2,7 +2,14 @@
 	MIT License http://www.opensource.org/licenses/mit-license.php
 	Author Tobias Koppers @sokra
 */
-/*globals hotAddUpdateChunk parentHotUpdateCallback document XMLHttpRequest $require$ $hotChunkFilename$ $hotMainFilename$ $crossOriginLoading$ */
+// eslint-disable-next-line no-unused-vars
+var hotAddUpdateChunk = undefined;
+var parentHotUpdateCallback = undefined;
+var $require$ = undefined;
+var $hotMainFilename$ = undefined;
+var $hotChunkFilename$ = undefined;
+var $crossOriginLoading$ = undefined;
+
 module.exports = function() {
 	// eslint-disable-next-line no-unused-vars
 	function webpackHotUpdateCallback(chunkId, moreModules) {

package/lib/webworker/WebWorkerMainTemplate.runtime.js

@@ -2,7 +2,15 @@
 	MIT License http://www.opensource.org/licenses/mit-license.php
 	Author Tobias Koppers @sokra
 */
-/*globals installedChunks hotAddUpdateChunk parentHotUpdateCallback importScripts XMLHttpRequest $require$ $hotChunkFilename$ $hotMainFilename$ */
+// eslint-disable-next-line no-unused-vars
+var hotAddUpdateChunk = undefined;
+var parentHotUpdateCallback = undefined;
+var $require$ = undefined;
+var $hotChunkFilename$ = undefined;
+var $hotMainFilename$ = undefined;
+var installedChunks = undefined;
+var importScripts = undefined;
+
 module.exports = function() {
 	// eslint-disable-next-line no-unused-vars
 	function webpackHotUpdateCallback(chunkId, moreModules) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpack",
-  "version": "4.41.2",
+  "version": "4.41.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.",
   "license": "MIT",
@@ -25,15 +25,17 @@
     "node-libs-browser": "^2.2.1",
     "schema-utils": "^1.0.0",
     "tapable": "^1.1.3",
-    "terser-webpack-plugin": "^1.4.1",
+    "terser-webpack-plugin": "^1.4.3",
     "watchpack": "^1.6.0",
     "webpack-sources": "^1.4.1"
   },
   "devDependencies": {
+    "@babel/core": "^7.7.2",
     "@types/node": "^10.12.21",
     "@types/tapable": "^1.0.1",
     "@types/webpack-sources": "^0.1.4",
     "@yarnpkg/lockfile": "^1.1.0",
+    "babel-loader": "^8.0.6",
     "benchmark": "^2.1.1",
     "bundle-loader": "~0.5.0",
     "coffee-loader": "^0.9.0",
@@ -88,6 +90,10 @@
     "type": "git",
     "url": "https://github.com/webpack/webpack.git"
   },
+  "funding": {
+    "type": "opencollective",
+    "url": "https://opencollective.com/webpack"
+  },
   "homepage": "https://github.com/webpack/webpack",
   "main": "lib/webpack.js",
   "web": "lib/webpack.web.js",

package/schemas/WebpackOptions.json

@@ -1428,8 +1428,7 @@
             "$ref": "#/definitions/RuleSetCondition"
           }
         ]
-      },
-      "tsType": "RuleSetConditionsRecursive"
+      }
     },
     "RuleSetConditionsAbsolute": {
       "type": "array",
@@ -1440,8 +1439,7 @@
             "$ref": "#/definitions/RuleSetConditionAbsolute"
           }
         ]
-      },
-      "tsType": "RuleSetConditionsAbsoluteRecursive"
+      }
     },
     "RuleSetLoader": {
       "type": "string",

package/schemas/ajv.absolutePath.js

@@ -25,8 +25,6 @@ module.exports = ajv =>
 			function callback(data) {
 				let passes = true;
 				const isExclamationMarkPresent = data.includes("!");
-				const isCorrectAbsoluteOrRelativePath =
-					expected === /^(?:[A-Za-z]:\\|\/)/.test(data);
 
 				if (isExclamationMarkPresent) {
 					callback.errors = [
@@ -40,8 +38,12 @@ module.exports = ajv =>
 					];
 					passes = false;
 				}
-
-				if (!isCorrectAbsoluteOrRelativePath) {
+				// ?:[A-Za-z]:\\ - Windows absolute path
+				// \\\\ - Windows network absolute path
+				// \/ - Unix-like OS absolute path
+				const isCorrectAbsolutePath =
+					expected === /^(?:[A-Za-z]:\\|\\\\|\/)/.test(data);
+				if (!isCorrectAbsolutePath) {
 					callback.errors = [getErrorFor(expected, data, schema)];
 					passes = false;
 				}