webpack 4.39.2 → 4.39.3

package/README.md

@@ -347,7 +347,7 @@ If you create a loader or plugin, we would <3 for you to open source it, and put
 
 <h2 align="center">Support</h2>
 
-We consider webpack to be a low-level tool used not only individually but also layered beneath other awesome tools. Because of its flexibility, webpack isn't always the _easiest_ entry-level solution, however we do believe it is the most powerful. That said, we're always looking for ways improve and simplify the tool without compromising functionality. If you have any ideas on ways to accomplish this, we're all ears!
+We consider webpack to be a low-level tool used not only individually but also layered beneath other awesome tools. Because of its flexibility, webpack isn't always the _easiest_ entry-level solution, however we do believe it is the most powerful. That said, we're always looking for ways to improve and simplify the tool without compromising functionality. If you have any ideas on ways to accomplish this, we're all ears!
 
 If you're just getting started, take a look at [our new docs and concepts page](https://webpack.js.org/concepts/). This has a high level overview that is great for beginners!!
 

package/lib/CachePlugin.js

@@ -24,21 +24,19 @@ class CachePlugin {
 					compilation.hooks.childCompiler.tap(
 						"CachePlugin",
 						(childCompiler, compilerName, compilerIndex) => {
-							if (cache) {
-								let childCache;
-								if (!cache.children) {
-									cache.children = {};
-								}
-								if (!cache.children[compilerName]) {
-									cache.children[compilerName] = [];
-								}
-								if (cache.children[compilerName][compilerIndex]) {
-									childCache = cache.children[compilerName][compilerIndex];
-								} else {
-									cache.children[compilerName].push((childCache = {}));
-								}
-								registerCacheToCompiler(childCompiler, childCache);
+							let childCache;
+							if (!cache.children) {
+								cache.children = {};
 							}
+							if (!cache.children[compilerName]) {
+								cache.children[compilerName] = [];
+							}
+							if (cache.children[compilerName][compilerIndex]) {
+								childCache = cache.children[compilerName][compilerIndex];
+							} else {
+								cache.children[compilerName].push((childCache = {}));
+							}
+							registerCacheToCompiler(childCompiler, childCache);
 						}
 					);
 				});

package/lib/buildChunkGraph.js

@@ -28,11 +28,13 @@ const GraphHelpers = require("./GraphHelpers");
 
 /**
  * @typedef {Object} ChunkGroupInfo
+ * @property {ChunkGroup} chunkGroup the chunk group
  * @property {Set<Module>} minAvailableModules current minimal set of modules available at this point
  * @property {boolean} minAvailableModulesOwned true, if minAvailableModules is owned and can be modified
  * @property {Set<Module>[]} availableModulesToBeMerged enqueued updates to the minimal set of available modules
  * @property {QueueItem[]} skippedItems queue items that were skipped because module is already available in parent chunks (need to reconsider when minAvailableModules is shrinking)
  * @property {Set<Module>} resultingAvailableModules set of modules available including modules from this chunk group
+ * @property {Set<ChunkGroup>} children set of children chunk groups, that will be revisited when availableModules shrink
  */
 
 /**
@@ -196,11 +198,13 @@ const visitModules = (
 			});
 		}
 		chunkGroupInfoMap.set(chunkGroup, {
+			chunkGroup,
 			minAvailableModules: new Set(),
 			minAvailableModulesOwned: true,
 			availableModulesToBeMerged: [],
 			skippedItems: [],
-			resultingAvailableModules: undefined
+			resultingAvailableModules: undefined,
+			children: undefined
 		});
 		return queue;
 	};
@@ -418,7 +422,7 @@ const visitModules = (
 		}
 		logger.timeEnd("visiting");
 
-		if (queueConnect.size > 0) {
+		while (queueConnect.size > 0) {
 			logger.time("calculating available modules");
 
 			// Figure out new parents for chunk groups
@@ -435,17 +439,26 @@ const visitModules = (
 					}
 				}
 				info.resultingAvailableModules = resultingAvailableModules;
+				if (info.children === undefined) {
+					info.children = targets;
+				} else {
+					for (const target of targets) {
+						info.children.add(target);
+					}
+				}
 
 				// 2. Update chunk group info
 				for (const target of targets) {
 					let chunkGroupInfo = chunkGroupInfoMap.get(target);
 					if (chunkGroupInfo === undefined) {
 						chunkGroupInfo = {
+							chunkGroup: target,
 							minAvailableModules: undefined,
 							minAvailableModulesOwned: undefined,
 							availableModulesToBeMerged: [],
 							skippedItems: [],
-							resultingAvailableModules: undefined
+							resultingAvailableModules: undefined,
+							children: undefined
 						};
 						chunkGroupInfoMap.set(target, chunkGroupInfo);
 					}
@@ -463,7 +476,7 @@ const visitModules = (
 				// Execute the merge
 				for (const info of outdatedChunkGroupInfo) {
 					const availableModulesToBeMerged = info.availableModulesToBeMerged;
-					let minAvailableModules = info.minAvailableModules;
+					let cachedMinAvailableModules = info.minAvailableModules;
 
 					// 1. Get minimal available modules
 					// It doesn't make sense to traverse a chunk again with more available modules.
@@ -474,29 +487,31 @@ const visitModules = (
 					}
 					let changed = false;
 					for (const availableModules of availableModulesToBeMerged) {
-						if (minAvailableModules === undefined) {
-							minAvailableModules = availableModules;
-							info.minAvailableModules = minAvailableModules;
+						if (cachedMinAvailableModules === undefined) {
+							cachedMinAvailableModules = availableModules;
+							info.minAvailableModules = cachedMinAvailableModules;
 							info.minAvailableModulesOwned = false;
 							changed = true;
 						} else {
 							if (info.minAvailableModulesOwned) {
 								// We own it and can modify it
-								for (const m of minAvailableModules) {
+								for (const m of cachedMinAvailableModules) {
 									if (!availableModules.has(m)) {
-										minAvailableModules.delete(m);
+										cachedMinAvailableModules.delete(m);
 										changed = true;
 									}
 								}
 							} else {
-								for (const m of minAvailableModules) {
+								for (const m of cachedMinAvailableModules) {
 									if (!availableModules.has(m)) {
-										// minAvailableModules need to be modified
+										// cachedMinAvailableModules need to be modified
 										// but we don't own it
-										// construct a new Set as intersection of minAvailableModules and availableModules
+										// construct a new Set as intersection of cachedMinAvailableModules and availableModules
 										/** @type {Set<Module>} */
 										const newSet = new Set();
-										const iterator = minAvailableModules[Symbol.iterator]();
+										const iterator = cachedMinAvailableModules[
+											Symbol.iterator
+										]();
 										/** @type {IteratorResult<Module>} */
 										let it;
 										while (!(it = iterator.next()).done) {
@@ -510,9 +525,16 @@ const visitModules = (
 												newSet.add(module);
 											}
 										}
-										minAvailableModules = newSet;
+										cachedMinAvailableModules = newSet;
 										info.minAvailableModulesOwned = true;
 										info.minAvailableModules = newSet;
+
+										// Update the cache from the first queue
+										// if the chunkGroup is currently cached
+										if (chunkGroup === info.chunkGroup) {
+											minAvailableModules = cachedMinAvailableModules;
+										}
+
 										changed = true;
 										break;
 									}
@@ -528,6 +550,19 @@ const visitModules = (
 						queue.push(queueItem);
 					}
 					info.skippedItems.length = 0;
+
+					// 3. Reconsider children chunk groups
+					if (info.children !== undefined) {
+						const chunkGroup = info.chunkGroup;
+						for (const c of info.children) {
+							let connectList = queueConnect.get(chunkGroup);
+							if (connectList === undefined) {
+								connectList = new Set();
+								queueConnect.set(chunkGroup, connectList);
+							}
+							connectList.add(c);
+						}
+					}
 				}
 				outdatedChunkGroupInfo.clear();
 				logger.timeEnd("merging available modules");

package/lib/wasm/WebAssemblyGenerator.js

@@ -70,7 +70,7 @@ const getImportedGlobals = ast => {
 
 	t.traverse(ast, {
 		ModuleImport({ node }) {
-			if (t.isGlobalType(node.descr) === true) {
+			if (t.isGlobalType(node.descr)) {
 				importedGlobals.push(node);
 			}
 		}
@@ -79,12 +79,18 @@ const getImportedGlobals = ast => {
 	return importedGlobals;
 };
 
+/**
+ * Get the count for imported func
+ *
+ * @param {Object} ast Module's AST
+ * @returns {Number} - count
+ */
 const getCountImportedFunc = ast => {
 	let count = 0;
 
 	t.traverse(ast, {
 		ModuleImport({ node }) {
-			if (t.isFuncImportDescr(node.descr) === true) {
+			if (t.isFuncImportDescr(node.descr)) {
 				count++;
 			}
 		}
@@ -133,7 +139,7 @@ const getNextFuncIndex = (ast, countImportedFunc) => {
 };
 
 /**
- * Create a init instruction for a global
+ * Creates an init instruction for a global type
  * @param {t.GlobalType} globalType the global type
  * @returns {t.Instruction} init expression
  */
@@ -156,7 +162,7 @@ const createDefaultInitForGlobal = globalType => {
 /**
  * Rewrite the import globals:
  * - removes the ModuleImport instruction
- * - injects at the same offset a mutable global of the same time
+ * - injects at the same offset a mutable global of the same type
  *
  * Since the imported globals are before the other global declarations, our
  * indices will be preserved.
@@ -172,7 +178,7 @@ const rewriteImportedGlobals = state => bin => {
 
 	bin = editWithAST(state.ast, bin, {
 		ModuleImport(path) {
-			if (t.isGlobalType(path.node.descr) === true) {
+			if (t.isGlobalType(path.node.descr)) {
 				const globalType = path.node.descr;
 
 				globalType.mutability = "var";
@@ -206,8 +212,8 @@ const rewriteImportedGlobals = state => bin => {
 
 				additionalInitCode.push(
 					/**
-					 * get_global in global initilizer only work for imported globals.
-					 * They have the same indices than the init params, so use the
+					 * get_global in global initializer only works for imported globals.
+					 * They have the same indices as the init params, so use the
 					 * same index.
 					 */
 					t.instruction("get_local", [initialGlobalidx]),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpack",
-  "version": "4.39.2",
+  "version": "4.39.3",
   "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",
@@ -120,12 +120,12 @@
     "pretest": "yarn lint",
     "prelint": "yarn setup",
     "lint": "yarn code-lint && yarn jest-lint && yarn type-lint && yarn special-lint",
-    "code-lint": "eslint --cache \"{setup,lib,bin,hot,buildin,benchmark,tooling,schemas}/**/*.js\" \"test/*.js\" \"test/{configCases,watchCases,statsCases,hotCases}/**/webpack.config.js\" \"examples/**/webpack.config.js\"",
+    "code-lint": "eslint . --ext '.js' --cache",
     "type-lint": "tsc --pretty",
     "special-lint": "node tooling/inherit-types && node tooling/format-schemas && node tooling/compile-to-definitions",
     "special-lint-fix": "node tooling/inherit-types --write --override && node tooling/format-schemas --write && node tooling/compile-to-definitions --write",
     "fix": "yarn code-lint --fix && yarn special-lint-fix",
-    "pretty": "prettier --loglevel warn --write \"*.{ts,js,json,yml,yaml}\" \"{setup,lib,bin,hot,buildin,benchmark,tooling,schemas}/**/*.{js,json}\" \"test/*.js\" \"test/{configCases,watchCases,statsCases,hotCases}/**/webpack.config.js\" \"examples/**/webpack.config.js\"",
+    "pretty": "prettier --loglevel warn --write \"*.{ts,js,json,yml,yaml}\" \"{setup,lib,bin,hot,buildin,benchmark,tooling,schemas}/**/*.{js,json}\" \"test/*.js\" \"test/helpers/*.js\" \"test/{configCases,watchCases,statsCases,hotCases}/**/webpack.config.js\" \"examples/**/webpack.config.js\"",
     "jest-lint": "node --max-old-space-size=4096 node_modules/jest-cli/bin/jest --testMatch \"<rootDir>/test/*.lint.js\" --no-verbose",
     "benchmark": "node --max-old-space-size=4096 --trace-deprecation node_modules/jest-cli/bin/jest --testMatch \"<rootDir>/test/*.benchmark.js\" --runInBand",
     "cover": "yarn cover:all && yarn cover:report",