webpack 5.41.0 → 5.43.0

package/lib/Compiler.js

@@ -260,6 +260,8 @@ class Compiler {
 
 		/** @type {Compilation} */
 		this._lastCompilation = undefined;
+		/** @type {NormalModuleFactory} */
+		this._lastNormalModuleFactory = undefined;
 
 		/** @private @type {WeakMap<Source, { sizeOnlySource: SizeOnlySource, writtenTo: Map<string, number> }>} */
 		this._assetEmittingSourceCache = new WeakMap();
@@ -375,6 +377,14 @@ class Compiler {
 		}
 	}
 
+	// TODO webpack 6: solve this in a better way
+	_cleanupLastNormalModuleFactory() {
+		if (this._lastNormalModuleFactory !== undefined) {
+			this._lastNormalModuleFactory.cleanupForCache();
+			this._lastNormalModuleFactory = undefined;
+		}
+	}
+
 	/**
 	 * @param {WatchOptions} watchOptions the watcher's options
 	 * @param {Callback<Stats>} handler signals when the call finishes
@@ -1036,6 +1046,7 @@ ${other}`);
 	}
 
 	createNormalModuleFactory() {
+		this._cleanupLastNormalModuleFactory();
 		const normalModuleFactory = new NormalModuleFactory({
 			context: this.options.context,
 			fs: this.inputFileSystem,
@@ -1044,6 +1055,7 @@ ${other}`);
 			associatedObjectForCache: this.root,
 			layers: this.options.experiments.layers
 		});
+		this._lastNormalModuleFactory = normalModuleFactory;
 		this.hooks.normalModuleFactory.call(normalModuleFactory);
 		return normalModuleFactory;
 	}
@@ -1122,8 +1134,9 @@ ${other}`);
 			if (err) return callback(err);
 			// Get rid of reference to last compilation to avoid leaking memory
 			// We can't run this._cleanupLastCompilation() as the Stats to this compilation
-			// might be still in use. We try to get rid for the reference to the cache instead.
+			// might be still in use. We try to get rid of the reference to the cache instead.
 			this._lastCompilation = undefined;
+			this._lastNormalModuleFactory = undefined;
 			this.cache.shutdown(callback);
 		});
 	}

package/lib/ExternalModule.js

@@ -16,6 +16,7 @@ const StaticExportsDependency = require("./dependencies/StaticExportsDependency"
 const extractUrlAndGlobal = require("./util/extractUrlAndGlobal");
 const makeSerializable = require("./util/makeSerializable");
 const propertyAccess = require("./util/propertyAccess");
+const { register } = require("./util/serialization");
 
 /** @typedef {import("webpack-sources").Source} Source */
 /** @typedef {import("../declarations/WebpackOptions").WebpackOptionsNormalized} WebpackOptions */
@@ -169,6 +170,8 @@ class ModuleExternalInitFragment extends InitFragment {
 			`external module import ${id}`
 		);
 		this._identifier = identifier;
+		this._id = id;
+		this._request = request;
 	}
 
 	getNamespaceIdentifier() {
@@ -176,6 +179,21 @@ class ModuleExternalInitFragment extends InitFragment {
 	}
 }
 
+register(
+	ModuleExternalInitFragment,
+	"webpack/lib/ExternalModule",
+	"ModuleExternalInitFragment",
+	{
+		serialize(obj, { write }) {
+			write(obj._id);
+			write(obj._request);
+		},
+		deserialize({ read }) {
+			return new ModuleExternalInitFragment(read(), read());
+		}
+	}
+);
+
 const generateModuleRemapping = (input, exportsInfo, runtime) => {
 	if (exportsInfo.otherExportsInfo.getUsed(runtime) === UsageState.Unused) {
 		const properties = [];
@@ -429,6 +447,11 @@ class ExternalModule extends Module {
 				this.buildInfo.strict = false;
 				break;
 			case "system":
+				if (!Array.isArray(request) || request.length === 1) {
+					this.buildMeta.exportsType = "namespace";
+					canMangle = true;
+				}
+				break;
 			case "module":
 				if (this.buildInfo.module) {
 					if (!Array.isArray(request) || request.length === 1) {

package/lib/FlagDependencyUsagePlugin.js

@@ -180,7 +180,11 @@ class FlagDependencyUsagePlugin {
 									b.groupOptions &&
 									b.groupOptions.entryOptions
 								) {
-									processModule(b, b.groupOptions.entryOptions.runtime, true);
+									processModule(
+										b,
+										b.groupOptions.entryOptions.runtime || undefined,
+										true
+									);
 								} else {
 									queue.enqueue(b);
 								}

package/lib/NormalModuleFactory.js

@@ -13,8 +13,10 @@ const {
 	SyncHook,
 	HookMap
 } = require("tapable");
+const ChunkGraph = require("./ChunkGraph");
 const Module = require("./Module");
 const ModuleFactory = require("./ModuleFactory");
+const ModuleGraph = require("./ModuleGraph");
 const NormalModule = require("./NormalModule");
 const BasicEffectRulePlugin = require("./rules/BasicEffectRulePlugin");
 const BasicMatcherRulePlugin = require("./rules/BasicMatcherRulePlugin");
@@ -257,8 +259,8 @@ class NormalModuleFactory extends ModuleFactory {
 		this.parserCache = new Map();
 		/** @type {Map<string, WeakMap<Object, Generator>>} */
 		this.generatorCache = new Map();
-		/** @type {WeakSet<Module>} */
-		this._restoredUnsafeCacheEntries = new WeakSet();
+		/** @type {Set<Module>} */
+		this._restoredUnsafeCacheEntries = new Set();
 
 		const cacheParseResource = parseResource.bindCache(
 			associatedObjectForCache
@@ -661,6 +663,14 @@ class NormalModuleFactory extends ModuleFactory {
 		);
 	}
 
+	cleanupForCache() {
+		for (const module of this._restoredUnsafeCacheEntries) {
+			ChunkGraph.clearChunkGraphForModule(module);
+			ModuleGraph.clearModuleGraphForModule(module);
+			module.cleanupForCache();
+		}
+	}
+
 	/**
 	 * @param {ModuleFactoryCreateData} data data object
 	 * @param {function(Error=, ModuleFactoryResult=): void} callback callback
@@ -756,6 +766,7 @@ class NormalModuleFactory extends ModuleFactory {
 					if (!unsafeCacheData.has(module)) {
 						unsafeCacheData.set(module, module.getUnsafeCacheData());
 					}
+					this._restoredUnsafeCacheEntries.add(module);
 				}
 
 				callback(null, factoryResult);

package/lib/TemplatedPathPlugin.js

@@ -116,32 +116,30 @@ const replacePathVariables = (path, data, assetInfo) => {
 	// [path] - /some/path/
 	// [name] - file
 	// [ext] - .js
-	if (data.filename) {
-		if (typeof data.filename === "string") {
-			const { path: file, query, fragment } = parseResource(data.filename);
-
-			const ext = extname(file);
-			const base = basename(file);
-			const name = base.slice(0, base.length - ext.length);
-			const path = file.slice(0, file.length - base.length);
-
-			replacements.set("file", replacer(file));
-			replacements.set("query", replacer(query, true));
-			replacements.set("fragment", replacer(fragment, true));
-			replacements.set("path", replacer(path, true));
-			replacements.set("base", replacer(base));
-			replacements.set("name", replacer(name));
-			replacements.set("ext", replacer(ext, true));
-			// Legacy
-			replacements.set(
-				"filebase",
-				deprecated(
-					replacer(base),
-					"[filebase] is now [base]",
-					"DEP_WEBPACK_TEMPLATE_PATH_PLUGIN_REPLACE_PATH_VARIABLES_FILENAME"
-				)
-			);
-		}
+	if (typeof data.filename === "string") {
+		const { path: file, query, fragment } = parseResource(data.filename);
+
+		const ext = extname(file);
+		const base = basename(file);
+		const name = base.slice(0, base.length - ext.length);
+		const path = file.slice(0, file.length - base.length);
+
+		replacements.set("file", replacer(file));
+		replacements.set("query", replacer(query, true));
+		replacements.set("fragment", replacer(fragment, true));
+		replacements.set("path", replacer(path, true));
+		replacements.set("base", replacer(base));
+		replacements.set("name", replacer(name));
+		replacements.set("ext", replacer(ext, true));
+		// Legacy
+		replacements.set(
+			"filebase",
+			deprecated(
+				replacer(base),
+				"[filebase] is now [base]",
+				"DEP_WEBPACK_TEMPLATE_PATH_PLUGIN_REPLACE_PATH_VARIABLES_FILENAME"
+			)
+		);
 	}
 
 	// Compilation context

package/lib/WebpackOptionsApply.js

@@ -572,7 +572,8 @@ class WebpackOptionsApply extends OptionsApply {
 									snapshot: options.snapshot,
 									maxAge: cacheOptions.maxAge,
 									profile: cacheOptions.profile,
-									allowCollectingMemory: cacheOptions.allowCollectingMemory
+									allowCollectingMemory: cacheOptions.allowCollectingMemory,
+									compression: cacheOptions.compression
 								}),
 								cacheOptions.idleTimeout,
 								cacheOptions.idleTimeoutForInitialStore,

package/lib/asset/AssetGenerator.js

@@ -265,7 +265,7 @@ class AssetGenerator extends Generator {
 	 * @returns {Set<string>} available types (do not mutate)
 	 */
 	getTypes(module) {
-		if (module.buildInfo.dataUrl || this.emit === false) {
+		if ((module.buildInfo && module.buildInfo.dataUrl) || this.emit === false) {
 			return JS_TYPES;
 		} else {
 			return JS_AND_ASSET_TYPES;
@@ -289,7 +289,7 @@ class AssetGenerator extends Generator {
 				return originalSource.size();
 			}
 			default:
-				if (module.buildInfo.dataUrl) {
+				if (module.buildInfo && module.buildInfo.dataUrl) {
 					const originalSource = module.originalSource();
 
 					if (!originalSource) {

package/lib/cache/PackFileCacheStrategy.js

@@ -848,6 +848,7 @@ class PackFileCacheStrategy {
 	 * @param {number} options.maxAge max age of cache items
 	 * @param {boolean} options.profile track and log detailed timing information for individual cache items
 	 * @param {boolean} options.allowCollectingMemory allow to collect unused memory created during deserialization
+	 * @param {false | "gzip" | "brotli"} options.compression compression used
 	 */
 	constructor({
 		compiler,
@@ -859,7 +860,8 @@ class PackFileCacheStrategy {
 		snapshot,
 		maxAge,
 		profile,
-		allowCollectingMemory
+		allowCollectingMemory,
+		compression
 	}) {
 		this.fileSerializer = createFileSerializer(fs);
 		this.fileSystemInfo = new FileSystemInfo(fs, {
@@ -875,6 +877,13 @@ class PackFileCacheStrategy {
 		this.maxAge = maxAge;
 		this.profile = profile;
 		this.allowCollectingMemory = allowCollectingMemory;
+		this.compression = compression;
+		this._extension =
+			compression === "brotli"
+				? ".pack.br"
+				: compression === "gzip"
+				? ".pack.gz"
+				: ".pack";
 		this.snapshot = snapshot;
 		/** @type {Set<string>} */
 		this.buildDependencies = new Set();
@@ -916,8 +925,8 @@ class PackFileCacheStrategy {
 		logger.time("restore cache container");
 		return this.fileSerializer
 			.deserialize(null, {
-				filename: `${cacheLocation}/index.pack`,
-				extension: ".pack",
+				filename: `${cacheLocation}/index${this._extension}`,
+				extension: `${this._extension}`,
 				logger,
 				profile,
 				retainedBuffer: this.allowCollectingMemory
@@ -927,11 +936,13 @@ class PackFileCacheStrategy {
 			.catch(err => {
 				if (err.code !== "ENOENT") {
 					logger.warn(
-						`Restoring pack failed from ${cacheLocation}.pack: ${err}`
+						`Restoring pack failed from ${cacheLocation}${this._extension}: ${err}`
 					);
 					logger.debug(err.stack);
 				} else {
-					logger.debug(`No pack exists at ${cacheLocation}.pack: ${err}`);
+					logger.debug(
+						`No pack exists at ${cacheLocation}${this._extension}: ${err}`
+					);
 				}
 				return undefined;
 			})
@@ -940,14 +951,14 @@ class PackFileCacheStrategy {
 				if (!packContainer) return undefined;
 				if (!(packContainer instanceof PackContainer)) {
 					logger.warn(
-						`Restored pack from ${cacheLocation}.pack, but contained content is unexpected.`,
+						`Restored pack from ${cacheLocation}${this._extension}, but contained content is unexpected.`,
 						packContainer
 					);
 					return undefined;
 				}
 				if (packContainer.version !== version) {
 					logger.log(
-						`Restored pack from ${cacheLocation}.pack, but version doesn't match.`
+						`Restored pack from ${cacheLocation}${this._extension}, but version doesn't match.`
 					);
 					return undefined;
 				}
@@ -959,14 +970,14 @@ class PackFileCacheStrategy {
 							(err, valid) => {
 								if (err) {
 									logger.log(
-										`Restored pack from ${cacheLocation}.pack, but checking snapshot of build dependencies errored: ${err}.`
+										`Restored pack from ${cacheLocation}${this._extension}, but checking snapshot of build dependencies errored: ${err}.`
 									);
 									logger.debug(err.stack);
 									return resolve(false);
 								}
 								if (!valid) {
 									logger.log(
-										`Restored pack from ${cacheLocation}.pack, but build dependencies have changed.`
+										`Restored pack from ${cacheLocation}${this._extension}, but build dependencies have changed.`
 									);
 									return resolve(false);
 								}
@@ -981,7 +992,7 @@ class PackFileCacheStrategy {
 							(err, valid) => {
 								if (err) {
 									logger.log(
-										`Restored pack from ${cacheLocation}.pack, but checking snapshot of resolving of build dependencies errored: ${err}.`
+										`Restored pack from ${cacheLocation}${this._extension}, but checking snapshot of resolving of build dependencies errored: ${err}.`
 									);
 									logger.debug(err.stack);
 									return resolve(false);
@@ -1001,7 +1012,7 @@ class PackFileCacheStrategy {
 									(err, valid) => {
 										if (err) {
 											logger.log(
-												`Restored pack from ${cacheLocation}.pack, but resolving of build dependencies errored: ${err}.`
+												`Restored pack from ${cacheLocation}${this._extension}, but resolving of build dependencies errored: ${err}.`
 											);
 											logger.debug(err.stack);
 											return resolve(false);
@@ -1012,7 +1023,7 @@ class PackFileCacheStrategy {
 											return resolve(true);
 										}
 										logger.log(
-											`Restored pack from ${cacheLocation}.pack, but build dependencies resolve to different locations.`
+											`Restored pack from ${cacheLocation}${this._extension}, but build dependencies resolve to different locations.`
 										);
 										return resolve(false);
 									}
@@ -1052,7 +1063,7 @@ class PackFileCacheStrategy {
 			})
 			.catch(err => {
 				this.logger.warn(
-					`Restoring pack from ${cacheLocation}.pack failed: ${err}`
+					`Restoring pack from ${cacheLocation}${this._extension} failed: ${err}`
 				);
 				this.logger.debug(err.stack);
 				return new Pack(logger, this.maxAge);
@@ -1236,8 +1247,8 @@ class PackFileCacheStrategy {
 					);
 					return this.fileSerializer
 						.serialize(content, {
-							filename: `${this.cacheLocation}/index.pack`,
-							extension: ".pack",
+							filename: `${this.cacheLocation}/index${this._extension}`,
+							extension: `${this._extension}`,
 							logger: this.logger,
 							profile: this.profile
 						})

package/lib/config/defaults.js

@@ -298,6 +298,7 @@ const applyCacheDefaults = (cache, { name, mode, development }) => {
 			);
 			D(cache, "hashAlgorithm", "md4");
 			D(cache, "store", "pack");
+			D(cache, "compression", development ? false : "gzip");
 			D(cache, "profile", false);
 			D(cache, "idleTimeout", 60000);
 			D(cache, "idleTimeoutForInitialStore", 5000);

package/lib/config/normalization.js

@@ -137,6 +137,7 @@ const getNormalizedWebpackOptions = config => {
 						cacheDirectory: cache.cacheDirectory,
 						cacheLocation: cache.cacheLocation,
 						hashAlgorithm: cache.hashAlgorithm,
+						compression: cache.compression,
 						idleTimeout: cache.idleTimeout,
 						idleTimeoutForInitialStore: cache.idleTimeoutForInitialStore,
 						idleTimeoutAfterLargeChanges: cache.idleTimeoutAfterLargeChanges,

package/lib/container/ContainerPlugin.js

@@ -39,6 +39,7 @@ class ContainerPlugin {
 				type: "var",
 				name: options.name
 			},
+			runtime: options.runtime,
 			filename: options.filename || undefined,
 			exposes: parseOptions(
 				options.exposes,
@@ -60,7 +61,8 @@ class ContainerPlugin {
 	 * @returns {void}
 	 */
 	apply(compiler) {
-		const { name, exposes, shareScope, filename, library } = this._options;
+		const { name, exposes, shareScope, filename, library, runtime } =
+			this._options;
 
 		compiler.options.output.enabledLibraryTypes.push(library.type);
 
@@ -73,6 +75,7 @@ class ContainerPlugin {
 				{
 					name,
 					filename,
+					runtime,
 					library
 				},
 				error => {

package/lib/container/ModuleFederationPlugin.js

@@ -64,6 +64,7 @@ class ModuleFederationPlugin {
 					name: options.name,
 					library,
 					filename: options.filename,
+					runtime: options.runtime,
 					exposes: options.exposes
 				}).apply(compiler);
 			}

package/lib/dependencies/WorkerPlugin.js

@@ -270,7 +270,7 @@ class WorkerPlugin {
 							entryOptions.name = options.name;
 						}
 
-						if (!entryOptions.runtime) {
+						if (entryOptions.runtime === undefined) {
 							let i = workerIndexMap.get(parser.state) || 0;
 							workerIndexMap.set(parser.state, i + 1);
 							let name = `${cachedContextify(

package/lib/json/JsonData.js

@@ -0,0 +1,41 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+
+"use strict";
+
+const { register } = require("../util/serialization");
+
+class JsonData {
+	constructor(data) {
+		this._buffer = undefined;
+		this._data = undefined;
+		if (Buffer.isBuffer(data)) {
+			this._buffer = data;
+		} else {
+			this._data = data;
+		}
+	}
+
+	get() {
+		if (this._data === undefined && this._buffer !== undefined) {
+			this._data = JSON.parse(this._buffer.toString());
+		}
+		return this._data;
+	}
+}
+
+register(JsonData, "webpack/lib/json/JsonData", null, {
+	serialize(obj, { write }) {
+		if (obj._buffer === undefined && obj._data !== undefined) {
+			obj._buffer = Buffer.from(JSON.stringify(obj._data));
+		}
+		write(obj._buffer);
+	},
+	deserialize({ read }) {
+		return new JsonData(read());
+	}
+});
+
+module.exports = JsonData;

package/lib/json/JsonGenerator.js

@@ -116,7 +116,10 @@ class JsonGenerator extends Generator {
 	 * @returns {number} estimate size of the module
 	 */
 	getSize(module, type) {
-		let data = module.buildInfo.jsonData;
+		let data =
+			module.buildInfo &&
+			module.buildInfo.jsonData &&
+			module.buildInfo.jsonData.get();
 		if (!data) return 0;
 		return stringifySafe(data).length + 10;
 	}
@@ -145,7 +148,10 @@ class JsonGenerator extends Generator {
 			concatenationScope
 		}
 	) {
-		const data = module.buildInfo.jsonData;
+		const data =
+			module.buildInfo &&
+			module.buildInfo.jsonData &&
+			module.buildInfo.jsonData.get();
 		if (data === undefined) {
 			return new RawSource(
 				runtimeTemplate.missingModuleStatement({

package/lib/json/JsonParser.js

@@ -8,6 +8,7 @@
 const parseJson = require("json-parse-better-errors");
 const Parser = require("../Parser");
 const JsonExportsDependency = require("../dependencies/JsonExportsDependency");
+const JsonData = require("./JsonData");
 
 /** @typedef {import("../../declarations/plugins/JsonModulesPluginParser").JsonModulesPluginParserOptions} JsonModulesPluginParserOptions */
 /** @typedef {import("../Parser").ParserState} ParserState */
@@ -41,7 +42,7 @@ class JsonParser extends Parser {
 				? source
 				: parseFn(source[0] === "\ufeff" ? source.slice(1) : source);
 
-		state.module.buildInfo.jsonData = data;
+		state.module.buildInfo.jsonData = new JsonData(data);
 		state.module.buildInfo.strict = true;
 		state.module.buildMeta.exportsType = "default";
 		state.module.buildMeta.defaultObject =

package/lib/optimize/ConcatenatedModule.js

@@ -45,6 +45,7 @@ const {
 /** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
 /** @typedef {import("../DependencyTemplates")} DependencyTemplates */
 /** @typedef {import("../ExportsInfo").ExportInfo} ExportInfo */
+/** @template T @typedef {import("../InitFragment")<T>} InitFragment */
 /** @typedef {import("../Module").CodeGenerationContext} CodeGenerationContext */
 /** @typedef {import("../Module").CodeGenerationResult} CodeGenerationResult */
 /** @typedef {import("../Module").LibIdentOptions} LibIdentOptions */
@@ -55,6 +56,7 @@ const {
 /** @typedef {import("../ResolverFactory").ResolverWithOptions} ResolverWithOptions */
 /** @typedef {import("../RuntimeTemplate")} RuntimeTemplate */
 /** @typedef {import("../WebpackError")} WebpackError */
+/** @typedef {import("../javascript/JavascriptModulesPlugin").ChunkRenderContext} ChunkRenderContext */
 /** @typedef {import("../util/Hash")} Hash */
 /** @typedef {import("../util/fs").InputFileSystem} InputFileSystem */
 /** @typedef {import("../util/runtime").RuntimeSpec} RuntimeSpec */
@@ -104,6 +106,7 @@ if (!ReferencerClass.prototype.PropertyDefinition) {
  * @property {Object} ast
  * @property {Source} internalSource
  * @property {ReplaceSource} source
+ * @property {InitFragment<ChunkRenderContext>[]=} chunkInitFragments
  * @property {Iterable<string>} runtimeRequirements
  * @property {Scope} globalScope
  * @property {Scope} moduleScope
@@ -1508,6 +1511,8 @@ ${defineGetters}`
 			}
 		}
 
+		const chunkInitFragments = [];
+
 		// evaluate modules in order
 		for (const rawInfo of modulesWithInfo) {
 			let name;
@@ -1521,6 +1526,9 @@ ${defineGetters}`
 						)}\n`
 					);
 					result.add(info.source);
+					if (info.chunkInitFragments) {
+						for (const f of info.chunkInitFragments) chunkInitFragments.push(f);
+					}
 					if (info.runtimeRequirements) {
 						for (const r of info.runtimeRequirements) {
 							runtimeRequirements.add(r);
@@ -1583,9 +1591,14 @@ ${defineGetters}`
 			}
 		}
 
+		const data = new Map();
+		if (chunkInitFragments.length > 0)
+			data.set("chunkInitFragments", chunkInitFragments);
+
 		/** @type {CodeGenerationResult} */
 		const resultEntry = {
 			sources: new Map([["javascript", new CachedSource(result)]]),
+			data,
 			runtimeRequirements
 		};
 
@@ -1626,6 +1639,8 @@ ${defineGetters}`
 					concatenationScope
 				});
 				const source = codeGenResult.sources.get("javascript");
+				const data = codeGenResult.data;
+				const chunkInitFragments = data && data.get("chunkInitFragments");
 				const code = source.source().toString();
 				let ast;
 				try {
@@ -1662,6 +1677,7 @@ ${defineGetters}`
 				info.ast = ast;
 				info.internalSource = source;
 				info.source = resultSource;
+				info.chunkInitFragments = chunkInitFragments;
 				info.globalScope = globalScope;
 				info.moduleScope = moduleScope;
 			} catch (err) {

package/lib/optimize/RuntimeChunkPlugin.js

@@ -27,7 +27,7 @@ class RuntimeChunkPlugin {
 				(_, { name: entryName }) => {
 					if (entryName === undefined) return;
 					const data = compilation.entries.get(entryName);
-					if (!data.options.runtime && !data.options.dependOn) {
+					if (data.options.runtime === undefined && !data.options.dependOn) {
 						// Determine runtime chunk name
 						let name = this.options.name;
 						if (typeof name === "function") {

package/lib/rules/RuleSetCompiler.js

@@ -225,7 +225,7 @@ class RuleSetCompiler {
 		if (typeof condition === "string") {
 			return {
 				matchWhenEmpty: condition.length === 0,
-				fn: str => str.startsWith(condition)
+				fn: str => typeof str === "string" && str.startsWith(condition)
 			};
 		}
 		if (typeof condition === "function") {
@@ -245,7 +245,7 @@ class RuleSetCompiler {
 		if (condition instanceof RegExp) {
 			return {
 				matchWhenEmpty: condition.test(""),
-				fn: v => condition.test(v)
+				fn: v => typeof v === "string" && condition.test(v)
 			};
 		}
 		if (Array.isArray(condition)) {

package/lib/runtime/AsyncModuleRuntimeModule.js

@@ -57,19 +57,23 @@ class AsyncModuleRuntimeModule extends HelperRuntimeModule {
 								"completeQueue(queue);",
 								"queue = 0;"
 							])});`,
-							`var obj = { [webpackThen]: ${runtimeTemplate.expressionFunction(
+							`var obj = {};
+							obj[webpackThen] = ${runtimeTemplate.expressionFunction(
 								"queueFunction(queue, fn), dep.catch(reject)",
 								"fn, reject"
-							)} };`,
+							)};`,
 							"return obj;"
 						]),
 						"}"
 					]),
 					"}",
-					`return { [webpackThen]: ${runtimeTemplate.expressionFunction(
+					`var ret = {};
+					ret[webpackThen] = ${runtimeTemplate.expressionFunction(
 						"completeFunction(fn)",
 						"fn"
-					)}, [webpackExports]: dep };`
+					)};
+					ret[webpackExports] = dep;
+					return ret;`
 				])})`,
 				"deps"
 			)};`,