webpack 5.59.0 → 5.76.0

package/lib/debug/ProfilingPlugin.js

@@ -123,9 +123,7 @@ class Profiler {
  * @returns {Trace} The trace object
  */
 const createTrace = (fs, outputPath) => {
-	const trace = new Tracer({
-		noStream: true
-	});
+	const trace = new Tracer();
 	const profiler = new Profiler(inspector);
 	if (/\/|\\/.test(outputPath)) {
 		const dirPath = dirname(fs, outputPath);
@@ -173,6 +171,7 @@ const createTrace = (fs, outputPath) => {
 		counter,
 		profiler,
 		end: callback => {
+			trace.push("]");
 			// Wait until the write stream finishes.
 			fsStream.on("close", () => {
 				callback();
@@ -203,15 +202,17 @@ class ProfilingPlugin {
 
 		// Compiler Hooks
 		Object.keys(compiler.hooks).forEach(hookName => {
-			compiler.hooks[hookName].intercept(
-				makeInterceptorFor("Compiler", tracer)(hookName)
-			);
+			const hook = compiler.hooks[hookName];
+			if (hook) {
+				hook.intercept(makeInterceptorFor("Compiler", tracer)(hookName));
+			}
 		});
 
 		Object.keys(compiler.resolverFactory.hooks).forEach(hookName => {
-			compiler.resolverFactory.hooks[hookName].intercept(
-				makeInterceptorFor("Resolver", tracer)(hookName)
-			);
+			const hook = compiler.resolverFactory.hooks[hookName];
+			if (hook) {
+				hook.intercept(makeInterceptorFor("Resolver", tracer)(hookName));
+			}
 		});
 
 		compiler.hooks.compilation.tap(
@@ -240,10 +241,10 @@ class ProfilingPlugin {
 				stage: Infinity
 			},
 			(stats, callback) => {
+				if (compiler.watchMode) return callback();
 				tracer.profiler.stopProfiling().then(parsedResults => {
 					if (parsedResults === undefined) {
 						tracer.profiler.destroy();
-						tracer.trace.flush();
 						tracer.end(callback);
 						return;
 					}
@@ -291,7 +292,6 @@ class ProfilingPlugin {
 					});
 
 					tracer.profiler.destroy();
-					tracer.trace.flush();
 					tracer.end(callback);
 				});
 			}
@@ -303,7 +303,7 @@ const interceptAllHooksFor = (instance, tracer, logLabel) => {
 	if (Reflect.has(instance, "hooks")) {
 		Object.keys(instance.hooks).forEach(hookName => {
 			const hook = instance.hooks[hookName];
-			if (!hook._fakeHook) {
+			if (hook && !hook._fakeHook) {
 				hook.intercept(makeInterceptorFor(logLabel, tracer)(hookName));
 			}
 		});
@@ -343,16 +343,19 @@ const interceptAllJavascriptModulesPluginHooks = (compilation, tracer) => {
 };
 
 const makeInterceptorFor = (instance, tracer) => hookName => ({
-	register: ({ name, type, context, fn }) => {
-		const newFn = makeNewProfiledTapFn(hookName, tracer, {
-			name,
-			type,
-			fn
-		});
+	register: tapInfo => {
+		const { name, type, fn } = tapInfo;
+		const newFn =
+			// Don't tap our own hooks to ensure stream can close cleanly
+			name === pluginName
+				? fn
+				: makeNewProfiledTapFn(hookName, tracer, {
+						name,
+						type,
+						fn
+				  });
 		return {
-			name,
-			type,
-			context,
+			...tapInfo,
 			fn: newFn
 		};
 	}

package/lib/dependencies/AMDRequireDependency.js

@@ -90,7 +90,7 @@ AMDRequireDependency.Template = class AMDRequireDependencyTemplate extends (
 		// has array range but no function range
 		if (dep.arrayRange && !dep.functionRange) {
 			const startBlock = `${promise}.then(function() {`;
-			const endBlock = `;}).catch(${RuntimeGlobals.uncaughtErrorHandler})`;
+			const endBlock = `;})['catch'](${RuntimeGlobals.uncaughtErrorHandler})`;
 			runtimeRequirements.add(RuntimeGlobals.uncaughtErrorHandler);
 
 			source.replace(dep.outerRange[0], dep.arrayRange[0] - 1, startBlock);
@@ -103,7 +103,7 @@ AMDRequireDependency.Template = class AMDRequireDependencyTemplate extends (
 		// has function range but no array range
 		if (dep.functionRange && !dep.arrayRange) {
 			const startBlock = `${promise}.then((`;
-			const endBlock = `).bind(exports, __webpack_require__, exports, module)).catch(${RuntimeGlobals.uncaughtErrorHandler})`;
+			const endBlock = `).bind(exports, __webpack_require__, exports, module))['catch'](${RuntimeGlobals.uncaughtErrorHandler})`;
 			runtimeRequirements.add(RuntimeGlobals.uncaughtErrorHandler);
 
 			source.replace(dep.outerRange[0], dep.functionRange[0] - 1, startBlock);
@@ -118,7 +118,7 @@ AMDRequireDependency.Template = class AMDRequireDependencyTemplate extends (
 			const startBlock = `${promise}.then(function() { `;
 			const errorRangeBlock = `}${
 				dep.functionBindThis ? ".bind(this)" : ""
-			}).catch(`;
+			})['catch'](`;
 			const endBlock = `${dep.errorCallbackBindThis ? ".bind(this)" : ""})`;
 
 			source.replace(dep.outerRange[0], dep.arrayRange[0] - 1, startBlock);
@@ -150,9 +150,9 @@ AMDRequireDependency.Template = class AMDRequireDependencyTemplate extends (
 		// has array range, function range, but no errorCallbackRange
 		if (dep.arrayRange && dep.functionRange) {
 			const startBlock = `${promise}.then(function() { `;
-			const endBlock = `}${dep.functionBindThis ? ".bind(this)" : ""}).catch(${
-				RuntimeGlobals.uncaughtErrorHandler
-			})`;
+			const endBlock = `}${
+				dep.functionBindThis ? ".bind(this)" : ""
+			})['catch'](${RuntimeGlobals.uncaughtErrorHandler})`;
 			runtimeRequirements.add(RuntimeGlobals.uncaughtErrorHandler);
 
 			source.replace(dep.outerRange[0], dep.arrayRange[0] - 1, startBlock);

package/lib/dependencies/CommonJsExportsParserPlugin.js

@@ -201,7 +201,7 @@ class CommonJsExportsParserPlugin {
 				if (expr.arguments[1].type === "SpreadElement") return;
 				if (expr.arguments[2].type === "SpreadElement") return;
 				const exportsArg = parser.evaluateExpression(expr.arguments[0]);
-				if (!exportsArg || !exportsArg.isIdentifier()) return;
+				if (!exportsArg.isIdentifier()) return;
 				if (
 					exportsArg.identifier !== "exports" &&
 					exportsArg.identifier !== "module.exports" &&
@@ -210,7 +210,6 @@ class CommonJsExportsParserPlugin {
 					return;
 				}
 				const propertyArg = parser.evaluateExpression(expr.arguments[1]);
-				if (!propertyArg) return;
 				const property = propertyArg.asString();
 				if (typeof property !== "string") return;
 				enableStructuredExports();

package/lib/dependencies/CommonJsFullRequireDependency.js

@@ -117,7 +117,11 @@ CommonJsFullRequireDependency.Template = class CommonJsFullRequireDependencyTemp
 				const comment = equals(usedImported, ids)
 					? ""
 					: Template.toNormalComment(propertyAccess(ids)) + " ";
-				requireExpr += `${comment}${propertyAccess(usedImported)}`;
+				const access = `${comment}${propertyAccess(usedImported)}`;
+				requireExpr =
+					dep.asiSafe === true
+						? `(${requireExpr}${access})`
+						: `${requireExpr}${access}`;
 			}
 		}
 		source.replace(dep.range[0], dep.range[1] - 1, requireExpr);