webpack 5.1.2 → 5.3.0

package/lib/Module.js

@@ -139,6 +139,12 @@ class Module extends DependenciesBlock {
 		this.resolveOptions = EMPTY_RESOLVE_OPTIONS;
 		/** @type {object | undefined} */
 		this.factoryMeta = undefined;
+		// TODO refactor this -> options object filled from Factory
+		// TODO webpack 6: use an enum
+		/** @type {boolean} */
+		this.useSourceMap = false;
+		/** @type {boolean} */
+		this.useSimpleSourceMap = false;
 
 		// Info from Build
 		/** @type {WebpackError[] | undefined} */
@@ -910,6 +916,7 @@ class Module extends DependenciesBlock {
 		write(this.resolveOptions);
 		write(this.factoryMeta);
 		write(this.useSourceMap);
+		write(this.useSimpleSourceMap);
 		write(
 			this._warnings !== undefined && this._warnings.length === 0
 				? undefined
@@ -933,6 +940,7 @@ class Module extends DependenciesBlock {
 		this.resolveOptions = read();
 		this.factoryMeta = read();
 		this.useSourceMap = read();
+		this.useSimpleSourceMap = read();
 		this._warnings = read();
 		this._errors = read();
 		this.buildMeta = read();

package/lib/NormalModule.js

@@ -249,9 +249,6 @@ class NormalModule extends Module {
 		this._lastSuccessfulBuildMeta = {};
 		this._forceBuild = true;
 		this._isEvaluatingSideEffects = false;
-
-		// TODO refactor this -> options object filled from Factory
-		this.useSourceMap = false;
 	}
 
 	/**
@@ -327,22 +324,27 @@ class NormalModule extends Module {
 		sourceMap,
 		associatedObjectForCache
 	) {
-		if (!sourceMap) {
-			return new RawSource(content);
-		}
+		if (sourceMap) {
+			if (
+				typeof sourceMap === "string" &&
+				(this.useSourceMap || this.useSimpleSourceMap)
+			) {
+				return new OriginalSource(
+					content,
+					contextifySourceUrl(context, sourceMap, associatedObjectForCache)
+				);
+			}
 
-		if (typeof sourceMap === "string") {
-			return new OriginalSource(
-				content,
-				contextifySourceUrl(context, sourceMap, associatedObjectForCache)
-			);
+			if (this.useSourceMap) {
+				return new SourceMapSource(
+					content,
+					name,
+					contextifySourceMap(context, sourceMap, associatedObjectForCache)
+				);
+			}
 		}
 
-		return new SourceMapSource(
-			content,
-			name,
-			contextifySourceMap(context, sourceMap, associatedObjectForCache)
-		);
+		return new RawSource(content);
 	}
 
 	/**
@@ -545,10 +547,14 @@ class NormalModule extends Module {
 			);
 		}
 
-		return new OriginalSource(
-			content,
-			contextifySourceUrl(context, identifier, associatedObjectForCache)
-		);
+		if (this.useSourceMap || this.useSimpleSourceMap) {
+			return new OriginalSource(
+				content,
+				contextifySourceUrl(context, identifier, associatedObjectForCache)
+			);
+		}
+
+		return new RawSource(content);
 	}
 
 	/**

package/lib/RawModule.js

@@ -99,7 +99,7 @@ class RawModule extends Module {
 	 */
 	codeGeneration(context) {
 		const sources = new Map();
-		if (this.useSourceMap) {
+		if (this.useSourceMap || this.useSimpleSourceMap) {
 			sources.set(
 				"javascript",
 				new OriginalSource(this.sourceStr, this.identifier())

package/lib/RuntimeGlobals.js

@@ -173,6 +173,11 @@ exports.loadScript = "__webpack_require__.l";
  */
 exports.chunkName = "__webpack_require__.cn";
 
+/**
+ * the runtime id of the current runtime
+ */
+exports.runtimeId = "__webpack_require__.j";
+
 /**
  * the filename of the script part of the chunk
  */

package/lib/RuntimeModule.js

@@ -5,6 +5,7 @@
 
 "use strict";
 
+const { RawSource } = require("webpack-sources");
 const OriginalSource = require("webpack-sources").OriginalSource;
 const Module = require("./Module");
 
@@ -132,7 +133,9 @@ class RuntimeModule extends Module {
 		if (generatedCode) {
 			sources.set(
 				"runtime",
-				new OriginalSource(generatedCode, this.identifier())
+				this.useSourceMap || this.useSimpleSourceMap
+					? new OriginalSource(generatedCode, this.identifier())
+					: new RawSource(generatedCode)
 			);
 		}
 		return {

package/lib/RuntimePlugin.js

@@ -21,6 +21,7 @@ const HasOwnPropertyRuntimeModule = require("./runtime/HasOwnPropertyRuntimeModu
 const LoadScriptRuntimeModule = require("./runtime/LoadScriptRuntimeModule");
 const MakeNamespaceObjectRuntimeModule = require("./runtime/MakeNamespaceObjectRuntimeModule");
 const PublicPathRuntimeModule = require("./runtime/PublicPathRuntimeModule");
+const RuntimeIdRuntimeModule = require("./runtime/RuntimeIdRuntimeModule");
 const SystemContextRuntimeModule = require("./runtime/SystemContextRuntimeModule");
 const ShareRuntimeModule = require("./sharing/ShareRuntimeModule");
 const StringXor = require("./util/StringXor");
@@ -31,6 +32,7 @@ const StringXor = require("./util/StringXor");
 
 const GLOBALS_ON_REQUIRE = [
 	RuntimeGlobals.chunkName,
+	RuntimeGlobals.runtimeId,
 	RuntimeGlobals.compatGetDefaultExport,
 	RuntimeGlobals.createFakeNamespaceObject,
 	RuntimeGlobals.definePropertyGetters,
@@ -156,6 +158,12 @@ class RuntimePlugin {
 					);
 					return true;
 				});
+			compilation.hooks.runtimeRequirementInTree
+				.for(RuntimeGlobals.runtimeId)
+				.tap("RuntimePlugin", chunk => {
+					compilation.addRuntimeModule(chunk, new RuntimeIdRuntimeModule());
+					return true;
+				});
 			compilation.hooks.runtimeRequirementInTree
 				.for(RuntimeGlobals.publicPath)
 				.tap("RuntimePlugin", (chunk, set) => {

package/lib/RuntimeTemplate.js

@@ -9,7 +9,9 @@ const InitFragment = require("./InitFragment");
 const RuntimeGlobals = require("./RuntimeGlobals");
 const Template = require("./Template");
 const { equals } = require("./util/ArrayHelpers");
+const compileBooleanMatcher = require("./util/compileBooleanMatcher");
 const propertyAccess = require("./util/propertyAccess");
+const { forEachRuntime, subtractRuntime } = require("./util/runtime");
 
 /** @typedef {import("../declarations/WebpackOptions").OutputNormalized} OutputOptions */
 /** @typedef {import("./AsyncDependenciesBlock")} AsyncDependenciesBlock */
@@ -63,6 +65,10 @@ class RuntimeTemplate {
 		return this.outputOptions.iife;
 	}
 
+	isModule() {
+		return this.outputOptions.module;
+	}
+
 	supportsConst() {
 		return this.outputOptions.environment.const;
 	}
@@ -558,6 +564,39 @@ class RuntimeTemplate {
 		return `${promise || "Promise.resolve()"}${appending}`;
 	}
 
+	/**
+	 * @param {Object} options options object
+	 * @param {ChunkGraph} options.chunkGraph the chunk graph
+	 * @param {RuntimeSpec=} options.runtime runtime for which this code will be generated
+	 * @param {RuntimeSpec | boolean=} options.runtimeCondition only execute the statement in some runtimes
+	 * @param {Set<string>} options.runtimeRequirements if set, will be filled with runtime requirements
+	 * @returns {string} expression
+	 */
+	runtimeConditionExpression({
+		chunkGraph,
+		runtimeCondition,
+		runtime,
+		runtimeRequirements
+	}) {
+		if (runtimeCondition === undefined) return "true";
+		if (typeof runtimeCondition === "boolean") return `${runtimeCondition}`;
+		/** @type {Set<string>} */
+		const positiveRuntimeIds = new Set();
+		forEachRuntime(runtimeCondition, runtime =>
+			positiveRuntimeIds.add(`${chunkGraph.getRuntimeId(runtime)}`)
+		);
+		/** @type {Set<string>} */
+		const negativeRuntimeIds = new Set();
+		forEachRuntime(subtractRuntime(runtime, runtimeCondition), runtime =>
+			negativeRuntimeIds.add(`${chunkGraph.getRuntimeId(runtime)}`)
+		);
+		runtimeRequirements.add(RuntimeGlobals.runtimeId);
+		return compileBooleanMatcher.fromLists(
+			Array.from(positiveRuntimeIds),
+			Array.from(negativeRuntimeIds)
+		)(RuntimeGlobals.runtimeId);
+	}
+
 	/**
 	 *
 	 * @param {Object} options options object
@@ -568,6 +607,8 @@ class RuntimeTemplate {
 	 * @param {string} options.importVar name of the import variable
 	 * @param {Module} options.originModule module in which the statement is emitted
 	 * @param {boolean=} options.weak true, if this is a weak dependency
+	 * @param {RuntimeSpec=} options.runtime runtime for which this code will be generated
+	 * @param {RuntimeSpec | boolean=} options.runtimeCondition only execute the statement in some runtimes
 	 * @param {Set<string>} options.runtimeRequirements if set, will be filled with runtime requirements
 	 * @returns {[string, string]} the import statement and the compat statement
 	 */

package/lib/SourceMapDevToolModuleOptionsPlugin.js

@@ -5,6 +5,8 @@
 
 "use strict";
 
+const JavascriptModulesPlugin = require("./javascript/JavascriptModulesPlugin");
+
 /** @typedef {import("./Compilation")} Compilation */
 
 class SourceMapDevToolModuleOptionsPlugin {
@@ -25,7 +27,30 @@ class SourceMapDevToolModuleOptionsPlugin {
 					module.useSourceMap = true;
 				}
 			);
+			compilation.hooks.runtimeModule.tap(
+				"SourceMapDevToolModuleOptionsPlugin",
+				module => {
+					module.useSourceMap = true;
+				}
+			);
+		} else {
+			compilation.hooks.buildModule.tap(
+				"SourceMapDevToolModuleOptionsPlugin",
+				module => {
+					module.useSimpleSourceMap = true;
+				}
+			);
+			compilation.hooks.runtimeModule.tap(
+				"SourceMapDevToolModuleOptionsPlugin",
+				module => {
+					module.useSimpleSourceMap = true;
+				}
+			);
 		}
+		JavascriptModulesPlugin.getCompilationHooks(compilation).useSourceMap.tap(
+			"SourceMapDevToolModuleOptionsPlugin",
+			() => true
+		);
 	}
 }
 

package/lib/SourceMapDevToolPlugin.js

@@ -19,6 +19,7 @@ const { absolutify } = require("./util/identifier");
 const schema = require("../schemas/plugins/SourceMapDevToolPlugin.json");
 
 /** @typedef {import("source-map").RawSourceMap} SourceMap */
+/** @typedef {import("webpack-sources").MapOptions} MapOptions */
 /** @typedef {import("webpack-sources").Source} Source */
 /** @typedef {import("../declarations/plugins/SourceMapDevToolPlugin").SourceMapDevToolPluginOptions} SourceMapDevToolPluginOptions */
 /** @typedef {import("./Cache").Etag} Etag */
@@ -54,7 +55,7 @@ const quoteMeta = str => {
  * @param {string} file current compiled file
  * @param {Source} asset the asset
  * @param {AssetInfo} assetInfo the asset info
- * @param {SourceMapDevToolPluginOptions} options source map options
+ * @param {MapOptions} options source map options
  * @param {Compilation} compilation compilation instance
  * @param {ItemCacheFacade} cacheItem cache item
  * @returns {SourceMapTask | undefined} created task instance or `undefined`
@@ -265,7 +266,10 @@ class SourceMapDevToolPlugin {
 									file,
 									asset.source,
 									asset.info,
-									options,
+									{
+										module: options.module,
+										columns: options.columns
+									},
 									compilation,
 									cacheItem
 								);

package/lib/Template.js

@@ -59,6 +59,7 @@ const MATCH_PADDED_HYPHENS_REPLACE_REGEX = /^-|-$/g;
  * @property {function(): Source} render
  * @property {string | function(PathData, AssetInfo=): string} filenameTemplate
  * @property {PathData=} pathOptions
+ * @property {AssetInfo=} info
  * @property {string} identifier
  * @property {string=} hash
  * @property {boolean=} auxiliary

package/lib/WebpackOptionsApply.js

@@ -308,7 +308,9 @@ class WebpackOptionsApply extends OptionsApply {
 		}
 		if (options.optimization.sideEffects) {
 			const SideEffectsFlagPlugin = require("./optimize/SideEffectsFlagPlugin");
-			new SideEffectsFlagPlugin().apply(compiler);
+			new SideEffectsFlagPlugin(
+				options.optimization.sideEffects === true
+			).apply(compiler);
 		}
 		if (options.optimization.providedExports) {
 			const FlagDependencyExportsPlugin = require("./FlagDependencyExportsPlugin");

package/lib/asset/AssetGenerator.js

@@ -126,22 +126,26 @@ class AssetGenerator extends Generator {
 						runtimeTemplate.outputOptions.hashDigestLength
 					);
 					module.buildInfo.fullContentHash = fullHash;
+					const sourceFilename = makePathsRelative(
+						this.compilation.compiler.context,
+						module.matchResource || module.resource,
+						this.compilation.compiler.root
+					).replace(/^\.\//, "");
 					const {
 						path: filename,
 						info
 					} = this.compilation.getAssetPathWithInfo(assetModuleFilename, {
 						module,
 						runtime,
-						filename: makePathsRelative(
-							this.compilation.compiler.context,
-							module.matchResource || module.resource,
-							this.compilation.compiler.root
-						).replace(/^\.\//, ""),
+						filename: sourceFilename,
 						chunkGraph,
 						contentHash
 					});
 					module.buildInfo.filename = filename;
-					module.buildInfo.assetInfo = info;
+					module.buildInfo.assetInfo = {
+						sourceFilename,
+						...info
+					};
 
 					runtimeRequirements.add(RuntimeGlobals.publicPath); // add __webpack_require__.p
 

package/lib/buildChunkGraph.js

@@ -8,6 +8,7 @@
 const AsyncDependencyToInitialChunkError = require("./AsyncDependencyToInitialChunkError");
 const { connectChunkGroupParentAndChild } = require("./GraphHelpers");
 const ModuleGraphConnection = require("./ModuleGraphConnection");
+const { getEntryRuntime, mergeRuntime } = require("./util/runtime");
 
 /** @typedef {import("./AsyncDependenciesBlock")} AsyncDependenciesBlock */
 /** @typedef {import("./Chunk")} Chunk */
@@ -20,6 +21,7 @@ const ModuleGraphConnection = require("./ModuleGraphConnection");
 /** @typedef {import("./ModuleGraph")} ModuleGraph */
 /** @typedef {import("./ModuleGraphConnection").ConnectionState} ConnectionState */
 /** @typedef {import("./logging/Logger").Logger} Logger */
+/** @typedef {import("./util/runtime").RuntimeSpec} RuntimeSpec */
 
 /**
  * @typedef {Object} QueueItem
@@ -36,10 +38,12 @@ const ModuleGraphConnection = require("./ModuleGraphConnection");
 /**
  * @typedef {Object} ChunkGroupInfo
  * @property {ChunkGroup} chunkGroup the chunk group
+ * @property {RuntimeSpec} runtime the runtimes
  * @property {ModuleSetPlus} minAvailableModules current minimal set of modules available at this point
  * @property {boolean} minAvailableModulesOwned true, if minAvailableModules is owned and can be modified
  * @property {ModuleSetPlus[]} availableModulesToBeMerged enqueued updates to the minimal set of available modules
  * @property {Set<Module>=} skippedItems modules that were skipped because module is already available in parent chunks (need to reconsider when minAvailableModules is shrinking)
+ * @property {Set<[Module, ModuleGraphConnection[]]>=} skippedModuleConnections referenced modules that where skipped because they were not active in this runtime
  * @property {ModuleSetPlus} resultingAvailableModules set of modules available including modules from this chunk group
  * @property {Set<ChunkGroupInfo>} children set of children chunk groups, that will be revisited when availableModules shrink
  * @property {Set<ChunkGroupInfo>} availableSources set of chunk groups that are the source for minAvailableModules
@@ -66,21 +70,41 @@ const bySetSize = (a, b) => {
 	return b.size + b.plus.size - a.size - a.plus.size;
 };
 
+/**
+ *
+ * @param {ModuleGraphConnection[]} connections list of connections
+ * @param {RuntimeSpec} runtime for which runtime
+ * @returns {ConnectionState} connection state
+ */
+const getActiveStateOfConnections = (connections, runtime) => {
+	let merged = connections[0].getActiveState(runtime);
+	if (merged === true) return true;
+	for (let i = 1; i < connections.length; i++) {
+		const c = connections[i];
+		merged = ModuleGraphConnection.addConnectionStates(
+			merged,
+			c.getActiveState(runtime)
+		);
+		if (merged === true) return true;
+	}
+	return merged;
+};
+
 /**
  * Extracts block to modules mapping from all modules
  * @param {Compilation} compilation the compilation
- * @returns {Map<DependenciesBlock, Map<Module, Exclude<ConnectionState, false>>>} the mapping block to modules
+ * @returns {Map<DependenciesBlock, Map<Module, ModuleGraphConnection[]>>} the mapping block to modules
  */
 const extractBlockModulesMap = compilation => {
 	const { moduleGraph } = compilation;
 
-	/** @type {Map<DependenciesBlock, Map<Module, Exclude<ConnectionState, false>>>} */
+	/** @type {Map<DependenciesBlock, Map<Module, ModuleGraphConnection[]>>} */
 	const blockModulesMap = new Map();
 
 	const blockQueue = new Set();
 
 	for (const module of compilation.modules) {
-		/** @type {WeakMap<Dependency, [Module, Exclude<ConnectionState, false>]>} */
+		/** @type {WeakMap<Dependency, ModuleGraphConnection>} */
 		let moduleMap;
 
 		for (const connection of moduleGraph.getOutgoingConnections(module)) {
@@ -101,7 +125,7 @@ const extractBlockModulesMap = compilation => {
 			if (moduleMap === undefined) {
 				moduleMap = new WeakMap();
 			}
-			moduleMap.set(connection.dependency, [m, state]);
+			moduleMap.set(connection.dependency, connection);
 		}
 
 		blockQueue.clear();
@@ -111,27 +135,19 @@ const extractBlockModulesMap = compilation => {
 
 			if (moduleMap !== undefined && block.dependencies) {
 				for (const dep of block.dependencies) {
-					const map = moduleMap.get(dep);
-					if (map !== undefined) {
-						const [module, state] = map;
+					const connection = moduleMap.get(dep);
+					if (connection !== undefined) {
+						const { module } = connection;
 						if (modules === undefined) {
 							modules = new Map();
 							blockModulesMap.set(block, modules);
 						}
-						let merged = state;
-						if (merged !== true) {
-							const old = modules.get(module);
-							if (old !== undefined) {
-								merged = /** @type {Exclude<ConnectionState, false>} */ (ModuleGraphConnection.addConnectionStates(
-									old,
-									merged
-								));
-								if (merged === old) {
-									continue;
-								}
-							}
+						const old = modules.get(module);
+						if (old !== undefined) {
+							old.push(connection);
+						} else {
+							modules.set(module, [connection]);
 						}
-						modules.set(module, merged);
 					}
 				}
 			}
@@ -216,9 +232,15 @@ const visitModules = (
 	// Fill queue with entrypoint modules
 	// Create ChunkGroupInfo for entrypoints
 	for (const [chunkGroup, modules] of inputEntrypointsAndModules) {
+		const runtime = getEntryRuntime(
+			compilation,
+			chunkGroup.name,
+			chunkGroup.options
+		);
 		/** @type {ChunkGroupInfo} */
 		const chunkGroupInfo = {
 			chunkGroup,
+			runtime,
 			minAvailableModules: undefined,
 			minAvailableModulesOwned: false,
 			availableModulesToBeMerged: [],
@@ -288,6 +310,8 @@ const visitModules = (
 
 	logger.timeEnd("visitModules: prepare");
 
+	/** @type {[Module, ModuleGraphConnection[]][]} */
+	const skipConnectionBuffer = [];
 	/** @type {Module[]} */
 	const skipBuffer = [];
 	/** @type {QueueItem[]} */
@@ -332,6 +356,7 @@ const visitModules = (
 					entrypoint.index = nextChunkGroupIndex++;
 					cgi = {
 						chunkGroup: entrypoint,
+						runtime: entrypoint.options.runtime || entrypoint.name,
 						minAvailableModules: EMPTY_SET,
 						minAvailableModulesOwned: false,
 						availableModulesToBeMerged: [],
@@ -377,6 +402,7 @@ const visitModules = (
 					c.index = nextChunkGroupIndex++;
 					cgi = {
 						chunkGroup: c,
+						runtime: chunkGroupInfo.runtime,
 						minAvailableModules: undefined,
 						minAvailableModulesOwned: undefined,
 						availableModulesToBeMerged: [],
@@ -455,17 +481,24 @@ const visitModules = (
 		const blockModules = blockModulesMap.get(block);
 
 		if (blockModules !== undefined) {
-			const { minAvailableModules } = chunkGroupInfo;
+			const { minAvailableModules, runtime } = chunkGroupInfo;
 			// Buffer items because order need to be reversed to get indices correct
 			// Traverse all referenced modules
-			for (const [refModule, activeState] of blockModules) {
+			for (const entry of blockModules) {
+				const [refModule, connections] = entry;
 				if (chunkGraph.isModuleInChunk(refModule, chunk)) {
 					// skip early if already connected
 					continue;
 				}
+				const activeState = getActiveStateOfConnections(connections, runtime);
+				if (activeState !== true) {
+					skipConnectionBuffer.push(entry);
+					if (activeState === false) continue;
+				}
 				if (
-					minAvailableModules.has(refModule) ||
-					minAvailableModules.plus.has(refModule)
+					activeState === true &&
+					(minAvailableModules.has(refModule) ||
+						minAvailableModules.plus.has(refModule))
 				) {
 					// already in parent chunks, skip it for now
 					skipBuffer.push(refModule);
@@ -483,6 +516,16 @@ const visitModules = (
 				});
 			}
 			// Add buffered items in reverse order
+			if (skipConnectionBuffer.length > 0) {
+				let { skippedModuleConnections } = chunkGroupInfo;
+				if (skippedModuleConnections === undefined) {
+					chunkGroupInfo.skippedModuleConnections = skippedModuleConnections = new Set();
+				}
+				for (let i = skipConnectionBuffer.length - 1; i >= 0; i--) {
+					skippedModuleConnections.add(skipConnectionBuffer[i]);
+				}
+				skipConnectionBuffer.length = 0;
+			}
 			if (skipBuffer.length > 0) {
 				let { skippedItems } = chunkGroupInfo;
 				if (skippedItems === undefined) {
@@ -522,7 +565,8 @@ const visitModules = (
 
 		if (blockModules !== undefined) {
 			// Traverse all referenced modules
-			for (const [refModule, activeState] of blockModules) {
+			for (const [refModule, connections] of blockModules) {
+				const activeState = getActiveStateOfConnections(connections, undefined);
 				// enqueue, then add and enter to be in the correct order
 				// this is relevant with circular dependencies
 				queueBuffer.push({
@@ -692,10 +736,18 @@ const visitModules = (
 				chunkGroupInfo
 			);
 
+			const runtime = chunkGroupInfo.runtime;
+
 			// 3. Update chunk group info
 			for (const target of targets) {
 				target.availableModulesToBeMerged.push(resultingAvailableModules);
 				chunkGroupsForMerging.add(target);
+				const oldRuntime = target.runtime;
+				const newRuntime = mergeRuntime(oldRuntime, runtime);
+				if (oldRuntime !== newRuntime) {
+					target.runtime = newRuntime;
+					outdatedChunkGroupInfo.add(target);
+				}
 			}
 
 			statConnectedChunkGroups += targets.size;
@@ -1000,6 +1052,35 @@ const visitModules = (
 				}
 			}
 
+			// 2. Reconsider skipped connections
+			if (info.skippedModuleConnections !== undefined) {
+				const { minAvailableModules, runtime } = info;
+				for (const entry of info.skippedModuleConnections) {
+					const [module, connections] = entry;
+					const activeState = getActiveStateOfConnections(connections, runtime);
+					if (activeState === false) continue;
+					if (activeState === true) {
+						info.skippedModuleConnections.delete(entry);
+					}
+					if (
+						activeState === true &&
+						(minAvailableModules.has(module) ||
+							minAvailableModules.plus.has(module))
+					) {
+						info.skippedItems.add(module);
+						continue;
+					}
+					queue.push({
+						action: activeState === true ? ADD_AND_ENTER_MODULE : PROCESS_BLOCK,
+						block: module,
+						module,
+						chunk: info.chunkGroup.chunks[0],
+						chunkGroup: info.chunkGroup,
+						chunkGroupInfo: info
+					});
+				}
+			}
+
 			// 2. Reconsider children chunk groups
 			if (info.children !== undefined) {
 				statChildChunkGroupsReconnected += info.children.size;
@@ -1213,6 +1294,11 @@ const buildChunkGraph = (compilation, inputEntrypointsAndModules) => {
 	);
 	logger.timeEnd("connectChunkGroups");
 
+	for (const [chunkGroup, chunkGroupInfo] of chunkGroupInfoMap) {
+		for (const chunk of chunkGroup.chunks)
+			chunk.runtime = mergeRuntime(chunk.runtime, chunkGroupInfo.runtime);
+	}
+
 	// Cleanup work
 
 	logger.time("cleanup");

package/lib/config/browserslistTargetHandler.js

@@ -119,11 +119,13 @@ const resolve = browsers => {
 	const browserProperty = !anyBrowser ? false : anyNode ? null : true;
 	const nodeProperty = !anyNode ? false : anyBrowser ? null : true;
 	const es6 = browserslistChecker("es6");
+	const letConst = browserslistChecker("let");
+	const arrowFunctions = browserslistChecker("arrow-functions");
 	const es6DynamicImport = browserslistChecker("es6-module-dynamic-import");
 	const node6 = nodeChecker(6);
 	return {
-		const: es6 && node6,
-		arrowFunction: es6 && node6,
+		const: letConst && node6,
+		arrowFunction: arrowFunctions && node6,
 		forOf: es6 && nodeChecker(5),
 		destructuring: es6 && node6,
 		bigIntLiteral: browserslistChecker("bigint") && nodeChecker(10, 4),

package/lib/config/defaults.js

@@ -848,7 +848,7 @@ const applyOptimizationDefaults = (
 		if (development) return "named";
 		return "natural";
 	});
-	D(optimization, "sideEffects", true);
+	F(optimization, "sideEffects", () => (production ? true : "flag"));
 	D(optimization, "providedExports", true);
 	D(optimization, "usedExports", production);
 	D(optimization, "innerGraph", production);