webpack · sokra · Apr 19, 2022 · Apr 12, 2022 · Apr 12, 2022 · Apr 14, 2022
diff --git a/lib/dependencies/HarmonyEvaluatedImportSpecifierDependency.js b/lib/dependencies/HarmonyEvaluatedImportSpecifierDependency.js
@@ -61,14 +61,46 @@ HarmonyEvaluatedImportSpecifierDependency.Template = class HarmonyEvaluatedImpor
 		const dep = /** @type {HarmonyEvaluatedImportSpecifierDependency} */ (
 			dependency
 		);
-		const { moduleGraph, runtime } = templateContext;
+		const { module, moduleGraph, runtime } = templateContext;
 		const connection = moduleGraph.getConnection(dep);
 		// Skip rendering depending when dependency is conditional
 		if (connection && !connection.isTargetActive(runtime)) return;
 
 		const exportsInfo = moduleGraph.getExportsInfo(connection.module);
 		const ids = dep.getIds(moduleGraph);
-		const value = exportsInfo.isExportProvided(ids);
+
+		let value;
+
+		const exportsType = connection.module.getExportsType(
+			moduleGraph,
+			module.buildMeta.strictHarmonyModule
+		);
+		switch (exportsType) {
+			case "default-with-named": {
+				if (ids[0] === "default") {
+					value =
+						ids.length === 1 || exportsInfo.isExportProvided(ids.slice(1));
+				} else {
+					value = exportsInfo.isExportProvided(ids);
+				}
+				break;
+			}
+			case "namespace": {
+				if (ids[0] === "__esModule") {
+					value = ids.length === 1 || undefined;
+				} else {
+					value = exportsInfo.isExportProvided(ids);
+				}
+				break;
+			}
+			case "dynamic": {
+				if (ids[0] !== "default") {
+					value = exportsInfo.isExportProvided(ids);
+				}
+				break;
+			}
+			// default-only could lead to runtime error, when default value is primitive
+		}
 
 		if (typeof value === "boolean") {
 			source.replace(dep.range[0], dep.range[1] - 1, `${value}`);

diff --git a/test/cases/parsing/harmony-deep-exports/cjs2.js b/test/cases/parsing/harmony-deep-exports/cjs2.js
@@ -0,0 +1 @@
+module.exports = require("./cjs3");
diff --git a/test/cases/parsing/harmony-deep-exports/cjs3.js b/test/cases/parsing/harmony-deep-exports/cjs3.js
@@ -0,0 +1,3 @@
+exports.a = 1;
+exports.b = 2;
+exports.cjs3DefaultProvidedInfo = __webpack_exports_info__.default.provideInfo;
diff --git a/test/cases/parsing/harmony-deep-exports/esm1.js b/test/cases/parsing/harmony-deep-exports/esm1.js
@@ -0,0 +1,2 @@
+export default 2;
+export const esmDefaultProvidedInfo = __webpack_exports_info__.default.provideInfo;
diff --git a/test/cases/parsing/harmony-deep-exports/index.js b/test/cases/parsing/harmony-deep-exports/index.js
@@ -1,6 +1,19 @@
 import * as C from "./reexport-namespace";
 import { counter } from "./reexport-namespace";
 import * as C2 from "./reexport-namespace-again";
+import cj2, { cjs3DefaultProvidedInfo } from "./cjs2";
+import esm1, { esmDefaultProvidedInfo } from "./esm1";
+
+it("default providedInfo should be correct for cjs", () => {
+	expect(cj2.a).toBe(1);
+	expect(cjs3DefaultProvidedInfo).toBe(false);
+	expect(__webpack_exports_info__.cj2.default.provideInfo).toBe(false);
+});
+
+it("default providedInfo and usedInfo should be correct for esm", () => {
+	expect(esm1).toBe(2);
+	expect(esmDefaultProvidedInfo).toBe(true);
+});
 
 it("should allow to reexport namespaces 1", () => {
 	(0, counter.reset)();

diff --git a/test/cases/parsing/harmony-export-import-specifier/cjs1.js b/test/cases/parsing/harmony-export-import-specifier/cjs1.js
@@ -0,0 +1,2 @@
+exports.a = 2;
+exports.b = 3;
diff --git a/test/cases/parsing/harmony-export-import-specifier/cjs2.js b/test/cases/parsing/harmony-export-import-specifier/cjs2.js
@@ -0,0 +1 @@
+module.exports = require("./cjs1");
diff --git a/test/cases/parsing/harmony-export-import-specifier/index.js b/test/cases/parsing/harmony-export-import-specifier/index.js
@@ -7,11 +7,15 @@ import { usedE1, usedE2 } from "./e.js";
 import { h } from "./h.js";
 import * as m from "./m";
 import {object as obj} from "./m";
+import cjs from "./cjs2";
 import * as o from "./o";
 import * as p from "./p";
 import * as q from "./q";
 import * as so from "./side-effect-free/o";
 import * as sm from "./side-effect-free/m";
+import json1 from "./some.json";
+import json2 from "./some1.json";
+import weirdCjs from "./weird-cjs";
 
 it("namespace export as from commonjs should override named export", function () {
 	expect(x).toBe(1);
@@ -48,6 +52,16 @@ it("should handle 'm in n' case", () => {
 	expect(obj.aaa).toBe(true);
 	expect("not_here" in m.object).toBe(false);
 	expect("not_here" in obj).toBe(false);
+	expect("__esModule" in q).toBe(true);
+	expect(() => "value" in q.__esModule).toThrow();
+	expect(() => "not_here" in json1).toThrow();
+	expect("not_here" in json2).toBe(false);
+	expect("a" in json2).toBe(true);
+	expect("a" in cjs).toBe(true);
+	expect("not_here" in cjs).toBe(false);
+	expect("not_here" in weirdCjs).toBe(false);
+	expect("a" in weirdCjs).toBe(true);
+	expect(() => "a" in weirdCjs.a).toThrow();
 	expect("aaa" in o).toBe(true);
 	expect("aaa" in p).toBe(false);
 	expect("ccc" in m).toBe(false);

diff --git a/test/cases/parsing/harmony-export-import-specifier/some.json b/test/cases/parsing/harmony-export-import-specifier/some.json
@@ -0,0 +1 @@
+true
diff --git a/test/cases/parsing/harmony-export-import-specifier/some1.json b/test/cases/parsing/harmony-export-import-specifier/some1.json
@@ -0,0 +1,3 @@
+{
+  "a": 1
+}
diff --git a/test/cases/parsing/harmony-export-import-specifier/weird-cjs.js b/test/cases/parsing/harmony-export-import-specifier/weird-cjs.js
@@ -0,0 +1,7 @@
+exports.__esModule = false;
+
+function dynamic(exports) {
+	exports.a = 1;
+}
+
+dynamic(exports);
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		export default 2;
		export const esmDefaultProvidedInfo = __webpack_exports_info__.default.provideInfo;
-Original file line number
+Diff line change
@@ -0,0 +1,3 @@
+    {
+      "a": 1
+    }