webpack 4.44.0 → 4.46.0

package/declarations/WebpackOptions.d.ts

@@ -683,6 +683,10 @@ export interface ResolveOptions {
 	fileSystem?: {
 		[k: string]: any;
 	};
+	/**
+	 * Enable to ignore fatal errors happening during resolving of 'resolve.roots'. Usually such errors should not happen, but this option is provided for backward-compatibility.
+	 */
+	ignoreRootsErrors?: boolean;
 	/**
 	 * Field names from the description file (package.json) which are used to find the default entry point
 	 */
@@ -703,6 +707,10 @@ export interface ResolveOptions {
 	 * Plugins for the resolver
 	 */
 	plugins?: (WebpackPluginInstance | WebpackPluginFunction)[];
+	/**
+	 * Prefer to resolve server-relative URLs (starting with '/') as absolute paths before falling back to resolve in 'resolve.roots'.
+	 */
+	preferAbsolute?: boolean;
 	/**
 	 * Custom resolver
 	 */
@@ -710,7 +718,7 @@ export interface ResolveOptions {
 		[k: string]: any;
 	};
 	/**
-	 * A list of directories in which requests that are server-relative URLs (starting with '/') are resolved. On non-windows system these requests are tried to resolve as absolute path first.
+	 * A list of directories in which requests that are server-relative URLs (starting with '/') are resolved.
 	 */
 	roots?: string[];
 	/**

package/lib/WebpackOptionsDefaulter.js

@@ -356,13 +356,23 @@ class WebpackOptionsDefaulter extends OptionsDefaulter {
 				options.resolve.plugins.length > 0
 			);
 		});
+		this.set(
+			"resolve.preferAbsolute",
+			"make",
+			options => !options.resolve.roots || options.resolve.roots.length === 0
+		);
+		this.set(
+			"resolve.ignoreRootsErrors",
+			"make",
+			options => !options.resolve.roots || options.resolve.roots.length === 0
+		);
+		this.set("resolve.roots", "make", options => [options.context]);
 
 		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"]);
 		this.set("resolveLoader.mainFiles", ["index"]);
-		this.set("resolveLoader.roots", "make", options => [options.context]);
 		this.set("resolveLoader.cacheWithContext", "make", options => {
 			return (
 				Array.isArray(options.resolveLoader.plugins) &&

package/lib/buildChunkGraph.js

@@ -38,8 +38,8 @@ const GraphHelpers = require("./GraphHelpers");
  */
 
 /**
- * @typedef {Object} ChunkGroupDep
- * @property {AsyncDependenciesBlock} block referencing block
+ * @typedef {Object} BlockChunkGroupConnection
+ * @property {ChunkGroupInfo} originChunkGroupInfo origin chunk group
  * @property {ChunkGroup} chunkGroup referenced chunk group
  */
 
@@ -143,7 +143,7 @@ const extraceBlockInfoMap = compilation => {
  * @param {Compilation} compilation the compilation
  * @param {Entrypoint[]} inputChunkGroups input groups
  * @param {Map<ChunkGroup, ChunkGroupInfo>} chunkGroupInfoMap mapping from chunk group to available modules
- * @param {Map<ChunkGroup, ChunkGroupDep[]>} chunkDependencies dependencies for chunk groups
+ * @param {Map<AsyncDependenciesBlock, BlockChunkGroupConnection[]>} blockConnections connection for blocks
  * @param {Set<DependenciesBlock>} blocksWithNestedBlocks flag for blocks that have nested blocks
  * @param {Set<ChunkGroup>} allCreatedChunkGroups filled with all chunk groups that are created here
  */
@@ -151,7 +151,7 @@ const visitModules = (
 	compilation,
 	inputChunkGroups,
 	chunkGroupInfoMap,
-	chunkDependencies,
+	blockConnections,
 	blocksWithNestedBlocks,
 	allCreatedChunkGroups
 ) => {
@@ -229,6 +229,8 @@ const visitModules = (
 	let chunk;
 	/** @type {ChunkGroup} */
 	let chunkGroup;
+	/** @type {ChunkGroupInfo} */
+	let chunkGroupInfo;
 	/** @type {DependenciesBlock} */
 	let block;
 	/** @type {Set<Module>} */
@@ -263,17 +265,17 @@ const visitModules = (
 				blockChunkGroups.set(b, c);
 				allCreatedChunkGroups.add(c);
 			}
+			blockConnections.set(b, []);
 		} else {
 			// TODO webpack 5 remove addOptions check
 			if (c.addOptions) c.addOptions(b.groupOptions);
 			c.addOrigin(module, b.loc, b.request);
 		}
 
-		// 2. We store the Block+Chunk mapping as dependency for the chunk
-		let deps = chunkDependencies.get(chunkGroup);
-		if (!deps) chunkDependencies.set(chunkGroup, (deps = []));
-		deps.push({
-			block: b,
+		// 2. We store the connection for the block
+		// to connect it later if needed
+		blockConnections.get(b).push({
+			originChunkGroupInfo: chunkGroupInfo,
 			chunkGroup: c
 		});
 
@@ -306,7 +308,7 @@ const visitModules = (
 			chunk = queueItem.chunk;
 			if (chunkGroup !== queueItem.chunkGroup) {
 				chunkGroup = queueItem.chunkGroup;
-				const chunkGroupInfo = chunkGroupInfoMap.get(chunkGroup);
+				chunkGroupInfo = chunkGroupInfoMap.get(chunkGroup);
 				minAvailableModules = chunkGroupInfo.minAvailableModules;
 				skippedItems = chunkGroupInfo.skippedItems;
 			}
@@ -583,17 +585,14 @@ const visitModules = (
 /**
  *
  * @param {Set<DependenciesBlock>} blocksWithNestedBlocks flag for blocks that have nested blocks
- * @param {Map<ChunkGroup, ChunkGroupDep[]>} chunkDependencies dependencies for chunk groups
+ * @param {Map<AsyncDependenciesBlock, BlockChunkGroupConnection[]>} blockConnections connection for blocks
  * @param {Map<ChunkGroup, ChunkGroupInfo>} chunkGroupInfoMap mapping from chunk group to available modules
  */
 const connectChunkGroups = (
 	blocksWithNestedBlocks,
-	chunkDependencies,
+	blockConnections,
 	chunkGroupInfoMap
 ) => {
-	/** @type {Set<Module>} */
-	let resultingAvailableModules;
-
 	/**
 	 * Helper function to check if all modules of a chunk are available
 	 *
@@ -611,49 +610,38 @@ const connectChunkGroups = (
 	};
 
 	// For each edge in the basic chunk graph
-	/**
-	 * @param {ChunkGroupDep} dep the dependency used for filtering
-	 * @returns {boolean} used to filter "edges" (aka Dependencies) that were pointing
-	 * to modules that are already available. Also filters circular dependencies in the chunks graph
-	 */
-	const filterFn = dep => {
-		const depChunkGroup = dep.chunkGroup;
-		// TODO is this needed?
-		if (blocksWithNestedBlocks.has(dep.block)) return true;
-		if (areModulesAvailable(depChunkGroup, resultingAvailableModules)) {
-			return false; // break all modules are already available
+	for (const [block, connections] of blockConnections) {
+		// 1. Check if connection is needed
+		// When none of the dependencies need to be connected
+		// we can skip all of them
+		// It's not possible to filter each item so it doesn't create inconsistent
+		// connections and modules can only create one version
+		// TODO maybe decide this per runtime
+		if (
+			// TODO is this needed?
+			!blocksWithNestedBlocks.has(block) &&
+			connections.every(({ chunkGroup, originChunkGroupInfo }) =>
+				areModulesAvailable(
+					chunkGroup,
+					originChunkGroupInfo.resultingAvailableModules
+				)
+			)
+		) {
+			continue;
 		}
-		return true;
-	};
-
-	// For all deps, check if chunk groups need to be connected
-	for (const [chunkGroup, deps] of chunkDependencies) {
-		if (deps.length === 0) continue;
-
-		// 1. Get info from chunk group info map
-		const info = chunkGroupInfoMap.get(chunkGroup);
-		resultingAvailableModules = info.resultingAvailableModules;
 
 		// 2. Foreach edge
-		for (let i = 0; i < deps.length; i++) {
-			const dep = deps[i];
+		for (let i = 0; i < connections.length; i++) {
+			const { chunkGroup, originChunkGroupInfo } = connections[i];
 
-			// Filter inline, rather than creating a new array from `.filter()`
-			// TODO check if inlining filterFn makes sense here
-			if (!filterFn(dep)) {
-				continue;
-			}
-			const depChunkGroup = dep.chunkGroup;
-			const depBlock = dep.block;
+			// 3. Connect block with chunk
+			GraphHelpers.connectDependenciesBlockAndChunkGroup(block, chunkGroup);
 
-			// 5. Connect block with chunk
-			GraphHelpers.connectDependenciesBlockAndChunkGroup(
-				depBlock,
-				depChunkGroup
+			// 4. Connect chunk with parent
+			GraphHelpers.connectChunkGroupParentAndChild(
+				originChunkGroupInfo.chunkGroup,
+				chunkGroup
 			);
-
-			// 6. Connect chunk with parent
-			GraphHelpers.connectChunkGroupParentAndChild(chunkGroup, depChunkGroup);
 		}
 	}
 };
@@ -685,8 +673,8 @@ const cleanupUnconnectedGroups = (compilation, allCreatedChunkGroups) => {
 const buildChunkGraph = (compilation, inputChunkGroups) => {
 	// SHARED STATE
 
-	/** @type {Map<ChunkGroup, ChunkGroupDep[]>} */
-	const chunkDependencies = new Map();
+	/** @type {Map<AsyncDependenciesBlock, BlockChunkGroupConnection[]>} */
+	const blockConnections = new Map();
 
 	/** @type {Set<ChunkGroup>} */
 	const allCreatedChunkGroups = new Set();
@@ -703,7 +691,7 @@ const buildChunkGraph = (compilation, inputChunkGroups) => {
 		compilation,
 		inputChunkGroups,
 		chunkGroupInfoMap,
-		chunkDependencies,
+		blockConnections,
 		blocksWithNestedBlocks,
 		allCreatedChunkGroups
 	);
@@ -712,7 +700,7 @@ const buildChunkGraph = (compilation, inputChunkGroups) => {
 
 	connectChunkGroups(
 		blocksWithNestedBlocks,
-		chunkDependencies,
+		blockConnections,
 		chunkGroupInfoMap
 	);
 

package/lib/dependencies/HarmonyExportImportedSpecifierDependency.js

@@ -215,6 +215,7 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 		const mode = new ExportMode("dynamic-reexport");
 		mode.module = importedModule;
 		mode.ignored = new Set([
+			"default",
 			...this.activeExports,
 			...activeFromOtherStarExports
 		]);
@@ -586,7 +587,7 @@ HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedS
 					.join("");
 
 			case "dynamic-reexport": {
-				const activeExports = mode.ignored;
+				const ignoredExports = mode.ignored;
 				let content =
 					"/* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in " +
 					importVar +
@@ -594,10 +595,10 @@ HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedS
 
 				// Filter out exports which are defined by other exports
 				// and filter out default export because it cannot be reexported with *
-				if (activeExports.size > 0) {
+				if (ignoredExports.size > 0) {
 					content +=
 						"if(" +
-						JSON.stringify(Array.from(activeExports).concat("default")) +
+						JSON.stringify(Array.from(ignoredExports)) +
 						".indexOf(__WEBPACK_IMPORT_KEY__) < 0) ";
 				} else {
 					content += "if(__WEBPACK_IMPORT_KEY__ !== 'default') ";

package/lib/optimize/SplitChunksPlugin.js

@@ -76,7 +76,7 @@ const compareEntries = (a, b) => {
 	const diffSizeReduce = aSizeReduce - bSizeReduce;
 	if (diffSizeReduce) return diffSizeReduce;
 	// 4. by cache group index
-	const indexDiff = a.cacheGroupIndex - b.cacheGroupIndex;
+	const indexDiff = b.cacheGroupIndex - a.cacheGroupIndex;
 	if (indexDiff) return indexDiff;
 	// 5. by number of modules (to be able to compare by identifier)
 	const modulesA = a.modules;
@@ -523,10 +523,14 @@ module.exports = class SplitChunksPlugin {
 								})
 							);
 						}
+						const oldSize = info.modules.size;
 						info.modules.add(module);
-						info.size += module.size();
-						if (!info.chunksKeys.has(selectedChunksKey)) {
-							info.chunksKeys.add(selectedChunksKey);
+						if (info.modules.size !== oldSize) {
+							info.size += module.size();
+						}
+						const oldChunksKeysSize = info.chunksKeys.size;
+						info.chunksKeys.add(selectedChunksKey);
+						if (oldChunksKeysSize !== info.chunksKeys.size) {
 							for (const chunk of selectedChunks) {
 								info.chunks.add(chunk);
 							}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpack",
-  "version": "4.44.0",
+  "version": "4.46.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.",
   "license": "MIT",
@@ -13,7 +13,7 @@
     "ajv": "^6.10.2",
     "ajv-keywords": "^3.4.1",
     "chrome-trace-event": "^1.0.2",
-    "enhanced-resolve": "^4.3.0",
+    "enhanced-resolve": "^4.5.0",
     "eslint-scope": "^4.0.3",
     "json-parse-better-errors": "^1.0.2",
     "loader-runner": "^2.4.0",
@@ -29,6 +29,14 @@
     "watchpack": "^1.7.4",
     "webpack-sources": "^1.4.1"
   },
+  "peerDependenciesMeta": {
+    "webpack-cli": {
+      "optional": true
+    },
+    "webpack-command": {
+      "optional": true
+    }
+  },
   "devDependencies": {
     "@babel/core": "^7.7.2",
     "@types/node": "^10.12.21",

package/schemas/WebpackOptions.json

@@ -1179,6 +1179,10 @@
         "fileSystem": {
           "description": "Filesystem for the resolver"
         },
+        "ignoreRootsErrors": {
+          "description": "Enable to ignore fatal errors happening during resolving of 'resolve.roots'. Usually such errors should not happen, but this option is provided for backward-compatibility.",
+          "type": "boolean"
+        },
         "mainFields": {
           "description": "Field names from the description file (package.json) which are used to find the default entry point",
           "anyOf": [
@@ -1226,11 +1230,15 @@
             ]
           }
         },
+        "preferAbsolute": {
+          "description": "Prefer to resolve server-relative URLs (starting with '/') as absolute paths before falling back to resolve in 'resolve.roots'.",
+          "type": "boolean"
+        },
         "resolver": {
           "description": "Custom resolver"
         },
         "roots": {
-          "description": "A list of directories in which requests that are server-relative URLs (starting with '/') are resolved. On non-windows system these requests are tried to resolve as absolute path first.",
+          "description": "A list of directories in which requests that are server-relative URLs (starting with '/') are resolved.",
           "type": "array",
           "items": {
             "description": "Directory in which requests that are server-relative URLs (starting with '/') are resolved.",