fix ExportsInfo

vankop · vankop · commit 48305033f4da · 2022-02-10T16:20:53.000+03:00
- should mark every export canMangleProvide=false if there are unknown exports
- add __webpack_exports_info__.&lt;name&gt;.canMangle to api
- add test case
diff --git a/lib/ExportsInfo.js b/lib/ExportsInfo.js
@@ -291,15 +291,15 @@ class ExportsInfo {
 			}
 		}
 		for (const exportInfo of this._exports.values()) {
+			if (!canMangle && exportInfo.canMangleProvide !== false) {
+				exportInfo.canMangleProvide = false;
+				changed = true;
+			}
 			if (excludeExports && excludeExports.has(exportInfo.name)) continue;
 			if (exportInfo.provided !== true && exportInfo.provided !== null) {
 				exportInfo.provided = null;
 				changed = true;
 			}
-			if (!canMangle && exportInfo.canMangleProvide !== false) {
-				exportInfo.canMangleProvide = false;
-				changed = true;
-			}
 			if (targetKey) {
 				exportInfo.setTarget(targetKey, targetModule, [exportInfo.name], -1);
 			}
diff --git a/lib/dependencies/ExportsInfoDependency.js b/lib/dependencies/ExportsInfoDependency.js
@@ -46,6 +46,12 @@ const getProperty = (moduleGraph, module, exportName, property, runtime) => {
 		}
 	}
 	switch (property) {
+		case "canMangle": {
+			const exportsInfo = moduleGraph.getExportsInfo(module);
+			const exportInfo = exportsInfo.getExportInfo(exportName);
+			if (exportInfo) return exportInfo.canMangle;
+			return exportsInfo.otherExportsInfo.canMangleProvide;
+		}
 		case "used":
 			return (
 				moduleGraph.getExportsInfo(module).getUsed(exportName, runtime) !==
diff --git a/test/__snapshots__/StatsTestCases.basictest.js.snap b/test/__snapshots__/StatsTestCases.basictest.js.snap
@@ -3274,7 +3274,7 @@ cacheable modules 1.22 KiB
     ModuleConcatenation bailout: Module is not an ECMAScript module
 webpack x.x.x compiled successfully in X ms
 
-asset main.no-side.js 979 bytes [emitted] [minimized] (name: main)
+asset main.no-side.js 993 bytes [emitted] [minimized] (name: main)
 runtime modules 1010 bytes 4 modules
 orphan modules 102 bytes [orphan] 2 modules
 cacheable modules 1.35 KiB
diff --git a/test/configCases/parsing/harmony-reexport/a.js b/test/configCases/parsing/harmony-reexport/a.js
@@ -0,0 +1,7 @@
+import { b } from "./b";
+
+export function a() {
+	return b();
+}
+export const aUsed = __webpack_exports_info__.a.used;
+export const aProvided = __webpack_exports_info__.a.provideInfo;
diff --git a/test/configCases/parsing/harmony-reexport/b.js b/test/configCases/parsing/harmony-reexport/b.js
@@ -0,0 +1 @@
+export function b() {}
diff --git a/test/configCases/parsing/harmony-reexport/empty.js b/test/configCases/parsing/harmony-reexport/empty.js
diff --git a/test/configCases/parsing/harmony-reexport/index.js b/test/configCases/parsing/harmony-reexport/index.js
@@ -0,0 +1,9 @@
+import { a, aUsed, aCanBeMangled, aProvided } from "./reexport";
+
+if (a()) console.log("a");
+
+it("should not allow mangle if some exports are unknown", () => {
+	expect(aUsed).toBe(true);
+	expect(aProvided).toBe(true);
+	expect(aCanBeMangled).toBe(false);
+});
diff --git a/test/configCases/parsing/harmony-reexport/reexport.js b/test/configCases/parsing/harmony-reexport/reexport.js
@@ -0,0 +1,3 @@
+export * from "./a";
+export * from "./empty";
+export const aCanBeMangled = __webpack_exports_info__.a.canMangle;
diff --git a/test/configCases/parsing/harmony-reexport/webpack.config.js b/test/configCases/parsing/harmony-reexport/webpack.config.js
@@ -0,0 +1,2 @@
+/** @type {import("../../../../").Configuration} */
+module.exports = {};

Original file line number	Diff line number	Diff line change
`@@ -291,15 +291,15 @@ class ExportsInfo {`
`291`	`291`	`}`
`292`	`292`	`}`
`293`	`293`	`for (const exportInfo of this._exports.values()) {`
	`294`	`+ if (!canMangle && exportInfo.canMangleProvide !== false) {`
	`295`	`+ exportInfo.canMangleProvide = false;`
	`296`	`+ changed = true;`
	`297`	`+ }`
`294`	`298`	`if (excludeExports && excludeExports.has(exportInfo.name)) continue;`
`295`	`299`	`if (exportInfo.provided !== true && exportInfo.provided !== null) {`
`296`	`300`	`exportInfo.provided = null;`
`297`	`301`	`changed = true;`
`298`	`302`	`}`
`299`		`- if (!canMangle && exportInfo.canMangleProvide !== false) {`
`300`		`- exportInfo.canMangleProvide = false;`
`301`		`- changed = true;`
`302`		`- }`
`303`	`303`	`if (targetKey) {`
`304`	`304`	`exportInfo.setTarget(targetKey, targetModule, [exportInfo.name], -1);`
`305`	`305`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,12 @@ const getProperty = (moduleGraph, module, exportName, property, runtime) => {`
`46`	`46`	`}`
`47`	`47`	`}`
`48`	`48`	`switch (property) {`
	`49`	`+ case "canMangle": {`
	`50`	`+ const exportsInfo = moduleGraph.getExportsInfo(module);`
	`51`	`+ const exportInfo = exportsInfo.getExportInfo(exportName);`
	`52`	`+ if (exportInfo) return exportInfo.canMangle;`
	`53`	`+ return exportsInfo.otherExportsInfo.canMangleProvide;`
	`54`	`+ }`
`49`	`55`	`case "used":`
`50`	`56`	`return (`
`51`	`57`	`moduleGraph.getExportsInfo(module).getUsed(exportName, runtime) !==`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+export * from "./a";`
	`2`	`+export * from "./empty";`
	`3`	`+export const aCanBeMangled = __webpack_exports_info__.a.canMangle;`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+/** @type {import("../../../../").Configuration} */`
	`2`	`+module.exports = {};`