fix: should not mangle when destructuring a reexport

webpack · Feb 19, 2024 · 65d547f · 65d547f
2 parents 0b2a5a0 + fc7b34d
commit 65d547f
Show file tree

Hide file tree

Showing 7 changed files with 51 additions and 5 deletions.
diff --git a/lib/dependencies/HarmonyImportSpecifierDependency.js b/lib/dependencies/HarmonyImportSpecifierDependency.js
@@ -143,7 +143,8 @@ class HarmonyImportSpecifierDependency extends HarmonyImportDependency {
 	 */
 	getReferencedExports(moduleGraph, runtime) {
 		let ids = this.getIds(moduleGraph);
-		if (ids.length === 0) return this._getReferencedExportsInDestructuring();
+		if (ids.length === 0)
+			return this._getReferencedExportsInDestructuring(moduleGraph);
 		let namespaceObjectAsContext = this.namespaceObjectAsContext;
 		if (ids[0] === "default") {
 			const selfModule = moduleGraph.getParentModule(this);
@@ -160,7 +161,7 @@ class HarmonyImportSpecifierDependency extends HarmonyImportDependency {
 				case "default-only":
 				case "default-with-named":
 					if (ids.length === 1)
-						return this._getReferencedExportsInDestructuring();
+						return this._getReferencedExportsInDestructuring(moduleGraph);
 					ids = ids.slice(1);
 					namespaceObjectAsContext = true;
 					break;
@@ -178,21 +179,30 @@ class HarmonyImportSpecifierDependency extends HarmonyImportDependency {
 			ids = ids.slice(0, -1);
 		}
 
-		return this._getReferencedExportsInDestructuring(ids);
+		return this._getReferencedExportsInDestructuring(moduleGraph, ids);
 	}
 
 	/**
+	 * @param {ModuleGraph} moduleGraph module graph
 	 * @param {string[]=} ids ids
 	 * @returns {(string[] | ReferencedExport)[]} referenced exports
 	 */
-	_getReferencedExportsInDestructuring(ids) {
+	_getReferencedExportsInDestructuring(moduleGraph, ids) {
 		if (this.referencedPropertiesInDestructuring) {
 			/** @type {ReferencedExport[]} */
 			const refs = [];
+			const importedModule = moduleGraph.getModule(this);
+			const canMangle =
+				Array.isArray(ids) &&
+				ids.length > 0 &&
+				!moduleGraph
+					.getExportsInfo(importedModule)
+					.getExportInfo(ids[0])
+					.isReexport();
 			for (const key of this.referencedPropertiesInDestructuring) {
 				refs.push({
 					name: ids ? ids.concat([key]) : [key],
-					canMangle: Array.isArray(ids) && ids.length > 0
+					canMangle
 				});
 			}
 			return refs;

diff --git a/test/configCases/mangle/mangle-with-destructuring-assignment/index.js b/test/configCases/mangle/mangle-with-destructuring-assignment/index.js
@@ -1,4 +1,5 @@
 import * as module from "./module";
+import { obj3, obj3CanMangle, obj4, obj4CanMangle } from "./reexport?side-effects" // enable side effects to ensure reexport is not skipped
 
 it("should not mangle export when destructuring module", () => {
 	const { obj: { a, b }, objCanMangle } = module
@@ -19,3 +20,18 @@ it("should mangle export when using module dot property", () => {
 	expect(module.aaa).toBe("aaa");
 	expect(module.aaaCanMangle).toBe(true)
 });
+
+it("should not mangle export when destructuring module's property is a module", () => {
+	const { aaa, bbb } = obj3;
+	expect(aaa).toBe("a");
+	expect(bbb).toBe("b");
+	expect(obj3CanMangle).toBe(false)
+});
+
+it("should not mangle export when destructuring module's nested property is a module", () => {
+	const { nested: { obj5, obj5CanMangle } } = obj4;
+	expect(obj5.aaa).toBe("a");
+	expect(obj5.bbb).toBe("b");
+	expect(obj4CanMangle).toBe(true);
+	expect(obj5CanMangle).toBe(false)
+});
diff --git a/test/configCases/mangle/mangle-with-destructuring-assignment/module2.js b/test/configCases/mangle/mangle-with-destructuring-assignment/module2.js
@@ -0,0 +1,2 @@
+export const aaa = "a";
+export const bbb = "b";
diff --git a/test/configCases/mangle/mangle-with-destructuring-assignment/module3.js b/test/configCases/mangle/mangle-with-destructuring-assignment/module3.js
@@ -0,0 +1,2 @@
+export const aaa = "a";
+export const bbb = "b";
diff --git a/test/configCases/mangle/mangle-with-destructuring-assignment/reexport.js b/test/configCases/mangle/mangle-with-destructuring-assignment/reexport.js
@@ -0,0 +1,6 @@
+export * as obj3 from "./module2"
+export const obj3CanMangle = __webpack_exports_info__.obj3.canMangle;
+
+import * as reexport2 from "./reexport2?side-effects"
+export const obj4 = { nested: reexport2 }
+export const obj4CanMangle = __webpack_exports_info__.reexport2.canMangle;
diff --git a/test/configCases/mangle/mangle-with-destructuring-assignment/reexport2.js b/test/configCases/mangle/mangle-with-destructuring-assignment/reexport2.js
@@ -0,0 +1,2 @@
+export * as obj5 from "./module3"
+export const obj5CanMangle = __webpack_exports_info__.obj5.canMangle;
diff --git a/test/configCases/mangle/mangle-with-destructuring-assignment/webpack.config.js b/test/configCases/mangle/mangle-with-destructuring-assignment/webpack.config.js
@@ -1,5 +1,13 @@
 /** @type {import("../../../../").Configuration} */
 module.exports = {
+	module: {
+		rules: [
+			{
+				resourceQuery: /side-effects/,
+				sideEffects: true
+			}
+		]
+	},
 	optimization: {
 		mangleExports: true,
 		usedExports: true,