fix: library module without export statement (#19411)

hai-x · web-flow · commit fe2ce398a349 · 2025-04-16T17:04:39.000+03:00
diff --git a/lib/WebpackOptionsApply.js b/lib/WebpackOptionsApply.js
@@ -48,6 +48,7 @@ const WorkerPlugin = require("./dependencies/WorkerPlugin");
 
 const InferAsyncModulesPlugin = require("./async-modules/InferAsyncModulesPlugin");
 
+const FlagDependencyExportsPlugin = require("./FlagDependencyExportsPlugin");
 const JavascriptMetaInfoPlugin = require("./JavascriptMetaInfoPlugin");
 const DefaultStatsFactoryPlugin = require("./stats/DefaultStatsFactoryPlugin");
 const DefaultStatsPresetPlugin = require("./stats/DefaultStatsPresetPlugin");
@@ -236,9 +237,24 @@ class WebpackOptionsApply extends OptionsApply {
 			(options.output.enabledLibraryTypes);
 
 		if (enabledLibraryTypes.length > 0) {
+			let once = true;
 			for (const type of enabledLibraryTypes) {
 				const EnableLibraryPlugin = require("./library/EnableLibraryPlugin");
-				new EnableLibraryPlugin(type).apply(compiler);
+				new EnableLibraryPlugin(type, {
+					// eslint-disable-next-line no-loop-func
+					additionalApply: () => {
+						if (!once) return;
+						once = false;
+						// We rely on `exportInfo` to generate the `export statement` in certain library bundles.
+						// Therefore, we ignore the disabling of `optimization.providedExport` and continue to apply `FlagDependencyExportsPlugin`.
+						if (
+							["module", "commonjs-static", "modern-module"].includes(type) &&
+							!options.optimization.providedExports
+						) {
+							new FlagDependencyExportsPlugin().apply(compiler);
+						}
+					}
+				}).apply(compiler);
 			}
 		}
 
@@ -458,7 +474,6 @@ class WebpackOptionsApply extends OptionsApply {
 			).apply(compiler);
 		}
 		if (options.optimization.providedExports) {
-			const FlagDependencyExportsPlugin = require("./FlagDependencyExportsPlugin");
 			new FlagDependencyExportsPlugin().apply(compiler);
 		}
 		if (options.optimization.usedExports) {
diff --git a/lib/library/EnableLibraryPlugin.js b/lib/library/EnableLibraryPlugin.js
@@ -12,6 +12,11 @@
 /** @type {WeakMap<Compiler, Set<LibraryType>>} */
 const enabledTypes = new WeakMap();
 
+/**
+ * @typedef {object} EnableLibraryPluginOptions
+ * @property {() => void} [additionalApply] function that runs when applying the current plugin.
+ */
+
 /**
  * @param {Compiler} compiler the compiler instance
  * @returns {Set<LibraryType>} enabled types
@@ -28,9 +33,13 @@ const getEnabledTypes = compiler => {
 class EnableLibraryPlugin {
 	/**
 	 * @param {LibraryType} type library type that should be available
+	 * @param {EnableLibraryPluginOptions} options options of EnableLibraryPlugin
 	 */
-	constructor(type) {
+	constructor(type, options = {}) {
+		/** @type {LibraryType} */
 		this.type = type;
+		/** @type {EnableLibraryPluginOptions} */
+		this.options = options;
 	}
 
 	/**
@@ -67,13 +76,17 @@ class EnableLibraryPlugin {
 	 * @returns {void}
 	 */
 	apply(compiler) {
-		const { type } = this;
+		const { type, options } = this;
 
 		// Only enable once
 		const enabled = getEnabledTypes(compiler);
 		if (enabled.has(type)) return;
 		enabled.add(type);
 
+		if (typeof options.additionalApply === "function") {
+			options.additionalApply();
+		}
+
 		if (typeof type === "string") {
 			const enableExportProperty = () => {
 				const ExportPropertyTemplatePlugin = require("./ExportPropertyLibraryPlugin");
diff --git a/test/configCases/library/disable-provided-export/commonjs-static.js b/test/configCases/library/disable-provided-export/commonjs-static.js
@@ -0,0 +1,2 @@
+export const lib3 = 'commonjs-static'
+
diff --git a/test/configCases/library/disable-provided-export/modern-module.js b/test/configCases/library/disable-provided-export/modern-module.js
@@ -0,0 +1,8 @@
+export const lib2 = 'modern-module'
+
+export default "null"
+
+it("should compile and run", () => {
+	// avoid `No tests exported by test case`
+	expect(true).toBe(true)
+});
diff --git a/test/configCases/library/disable-provided-export/module.js b/test/configCases/library/disable-provided-export/module.js
@@ -0,0 +1,11 @@
+import React from 'react';
+
+const foo = "module"
+
+export default 'module'
+export { React, foo }
+
+it("should compile and run", () => {
+	// avoid `No tests exported by test case`
+	expect(true).toBe(true)
+});
diff --git a/test/configCases/library/disable-provided-export/run.js b/test/configCases/library/disable-provided-export/run.js
@@ -0,0 +1,11 @@
+it("should compile and run", () => {
+	expect(libModule.default).toBe("module");
+	expect(libModule.foo).toBe("module");
+	expect(Boolean(libModule.React.version)).toBe(true);
+
+	expect(libModernModule.default).toBe("modern-module");
+
+	expect(libCommonjsStatic.default).toBe("commonjs-static");
+});
+
+
diff --git a/test/configCases/library/disable-provided-export/test.filter.js b/test/configCases/library/disable-provided-export/test.filter.js
@@ -0,0 +1,3 @@
+const supportsRequireInModule = require("../../../helpers/supportsRequireInModule");
+
+module.exports = () => supportsRequireInModule();
diff --git a/test/configCases/library/disable-provided-export/webpack.config.js b/test/configCases/library/disable-provided-export/webpack.config.js
@@ -0,0 +1,97 @@
+var webpack = require("../../../../");
+
+/** @type {import("../../../../").Configuration[]} */
+module.exports = [
+	{
+		entry: "./module.js",
+		optimization: {
+			providedExports: false
+		},
+		output: {
+			library: {
+				type: "module"
+			}
+		},
+		experiments: {
+			outputModule: true
+		},
+		externals: ["react"],
+		externalsType: "module"
+	},
+	{
+		entry: "./modern-module.js",
+		optimization: {
+			providedExports: false
+		},
+		output: {
+			library: {
+				type: "modern-module",
+				export: ["lib2"]
+			}
+		},
+		experiments: {
+			outputModule: true
+		}
+	},
+	{
+		entry: "./commonjs-static.js",
+		optimization: {
+			providedExports: false
+		},
+		output: {
+			library: {
+				type: "commonjs-static"
+			}
+		}
+	},
+	{
+		entry: "./run.js",
+		plugins: [
+			new webpack.BannerPlugin({
+				raw: true,
+				banner: `
+					import lib1Default, { foo, React } from './bundle0.mjs';
+					import { lib2 } from './bundle1.mjs';
+
+					import { createRequire } from 'module';
+					const require = createRequire(import.meta.url);
+
+					const { lib3 } = require("./bundle2.js");
+
+					let libModule = { default: lib1Default, foo, React };
+					let libModernModule = { default: lib2};
+					let libCommonjsStatic = { default: lib3 };
+					`
+			}),
+			{
+				apply(compiler) {
+					compiler.hooks.done.tap(
+						{
+							name: "disable-provided-export",
+							stage: 100
+						},
+						() => {
+							expect(
+								compiler.hooks.compilation.taps.filter(
+									tap => tap.name === "FlagDependencyExportsPlugin"
+								).length
+							).toBe(1);
+						}
+					);
+				}
+			}
+		],
+		output: {
+			enabledLibraryTypes: ["module", "modern-module"],
+			library: {
+				type: "module"
+			}
+		},
+		optimization: {
+			providedExports: false
+		},
+		experiments: {
+			outputModule: true
+		}
+	}
+];
diff --git a/types.d.ts b/types.d.ts
@@ -3946,8 +3946,9 @@ declare class EnableChunkLoadingPlugin {
 	static checkEnabled(compiler: Compiler, type: string): void;
 }
 declare class EnableLibraryPlugin {
-	constructor(type: string);
+	constructor(type: string, options?: EnableLibraryPluginOptions);
 	type: string;
+	options: EnableLibraryPluginOptions;
 
 	/**
 	 * Apply the plugin
@@ -3956,6 +3957,12 @@ declare class EnableLibraryPlugin {
 	static setEnabled(compiler: Compiler, type: string): void;
 	static checkEnabled(compiler: Compiler, type: string): void;
 }
+declare interface EnableLibraryPluginOptions {
+	/**
+	 * function that runs when applying the current plugin.
+	 */
+	additionalApply?: () => void;
+}
 declare class EnableWasmLoadingPlugin {
 	constructor(type: string);
 	type: string;

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+export const lib3 = 'commonjs-static'`
	`2`	`+`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+const supportsRequireInModule = require("../../../helpers/supportsRequireInModule");`
	`2`	`+`
	`3`	`+module.exports = () => supportsRequireInModule();`