webpack 4.41.1 → 4.41.5

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".
@@ -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,11 @@
 const Queue = require("./util/Queue");
 
 const addToSet = (a, b) => {
-	let changed = false;
+	const size = a.size;
 	for (const item of b) {
-		if (!a.has(item)) {
-			a.add(item);
-			changed = true;
-		}
+		a.add(item);
 	}
-	return changed;
+	return a.size !== size;
 };
 
 class FlagDependencyExportsPlugin {
@@ -114,11 +111,7 @@ 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;

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

@@ -974,18 +974,15 @@ class Stats {
 		}
 		if (typeof obj.builtAt === "number") {
 			const builtAtDate = new Date(obj.builtAt);
-			let timeZone = null;
+			let timeZone = undefined;
 
 			try {
-				timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone;
+				builtAtDate.toLocaleTimeString();
 			} catch (err) {
-				// disregard the RangeError
-			}
-
-			// Force UTC if runtime timezone could not be detected.
-			if (!timeZone || timeZone.toLowerCase() === "etc/unknown") {
+				// Force UTC if runtime timezone is unsupported
 				timeZone = "UTC";
 			}
+
 			colors.normal("Built at: ");
 			colors.normal(
 				builtAtDate.toLocaleDateString(undefined, {

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/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/package.json

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