Merge pull request #17214 from webpack/fix-regression

TheLarkInn · web-flow · commit 5ed1649e08ec · 2023-05-17T13:18:56.000-07:00
fix: regression
diff --git a/lib/dependencies/HarmonyExportExpressionDependency.js b/lib/dependencies/HarmonyExportExpressionDependency.js
@@ -174,7 +174,7 @@ HarmonyExportExpressionDependency.Template = class HarmonyExportDependencyTempla
 					runtimeRequirements.add(RuntimeGlobals.exports);
 					// This is a little bit incorrect as TDZ is not correct, but we can't use const.
 					content = `/* harmony default export */ ${exportsName}${propertyAccess(
-						used
+						typeof used === "string" ? [used] : used
 					)} = `;
 				} else {
 					content = `/* unused harmony default export */ var ${name} = `;
diff --git a/test/configCases/code-generation/import-export-format-2/cjs-module.js b/test/configCases/code-generation/import-export-format-2/cjs-module.js
@@ -0,0 +1,3 @@
+const foo = 42;
+
+module.exports = { foo };
diff --git a/test/configCases/code-generation/import-export-format-2/export-default-expression.js b/test/configCases/code-generation/import-export-format-2/export-default-expression.js
@@ -0,0 +1,3 @@
+const ___CSS_LOADER_EXPORT___ = {};
+___CSS_LOADER_EXPORT___.locals = {};
+export default ___CSS_LOADER_EXPORT___;
diff --git a/test/configCases/code-generation/import-export-format-2/harmony-module-2.js b/test/configCases/code-generation/import-export-format-2/harmony-module-2.js
@@ -0,0 +1,5 @@
+export const baz = 11;
+
+import { mod3 } from "./index";
+console.log(mod3.apple);
+
diff --git a/test/configCases/code-generation/import-export-format-2/harmony-module-3.js b/test/configCases/code-generation/import-export-format-2/harmony-module-3.js
@@ -0,0 +1 @@
+export var apple = 45;
diff --git a/test/configCases/code-generation/import-export-format-2/harmony-module.js b/test/configCases/code-generation/import-export-format-2/harmony-module.js
@@ -0,0 +1,5 @@
+export const bar = 42;
+
+const def = -12;
+export default def;
+
diff --git a/test/configCases/code-generation/import-export-format-2/index.js b/test/configCases/code-generation/import-export-format-2/index.js
@@ -0,0 +1,50 @@
+import { foo as cjsexport_harmonyimport } from "./cjs-module";
+import theDefault, { bar as harmonyexport_harmonyimport } from "./harmony-module";
+import theDefaultExpression from "./export-default-expression";
+const { harmonyexport_cjsimport } = require("./harmony-module").bar;
+const harmonyexport_cjsimportdefault = require("./export-default-expression").default;
+import { baz as harmonyexport_harmonyimport_2 } from "./harmony-module-2";
+
+import * as mod3 from "./harmony-module-3";
+export { mod3 };
+export { theDefaultExpression }
+
+const { expectSourceToContain, expectSourceToMatch } = require("../../../helpers/expectSource");
+const regexEscape = require("../../../helpers/regexEscape.js");
+
+// It's important to use propertyName when generating object members to ensure that the exported property name
+// uses the same accessor syntax (quotes vs. dot notatation) as the imported property name on the other end
+// (which needs to use propertyAccess).  Else, minifiers such as Closure Compiler will not be able to minify correctly.
+it("should use the same accessor syntax for import and export", function() {
+
+	var fs = require("fs");
+	var source = fs.readFileSync(__filename, "utf-8").toString();
+
+	// Reference these imports to generate uses in the source.
+
+	cjsexport_harmonyimport;
+	harmonyexport_harmonyimport;
+	harmonyexport_cjsimport;
+	harmonyexport_harmonyimport_2;
+	theDefault;
+	theDefaultExpression;
+	harmonyexport_cjsimportdefault;
+
+	/*********** DO NOT MATCH BELOW THIS LINE ***********/
+
+	// Checking harmonyexportinitfragment.js formation of standard export fragment
+	expectSourceToContain(source, "/* harmony export */   bar: () => (/* binding */ bar)");
+
+	// Checking formation of imports
+	expectSourceToMatch(source, `${regexEscape("const { harmonyexport_cjsimport } = (__webpack_require__(/*! ./harmony-module */ ")}\\d+${regexEscape(").bar);")}`);
+	expectSourceToMatch(source, `${regexEscape("const harmonyexport_cjsimportdefault = (__webpack_require__(/*! ./export-default-expression */ ")}\\d+${regexEscape(")[\"default\"]);")}`);
+
+	// Checking concatenatedmodule.js formation of exports
+	expectSourceToContain(source, "mod3: () => (/* reexport */ harmony_module_3_namespaceObject)");
+
+	// Checking concatenatedmodule.js formation of namespace objects
+	expectSourceToContain(source, "apple: () => (apple)");
+
+	// Do not break default option
+	expectSourceToContain(source, "[\"default\"] = (___CSS_LOADER_EXPORT___)");
+});
diff --git a/test/configCases/code-generation/import-export-format-2/webpack.config.js b/test/configCases/code-generation/import-export-format-2/webpack.config.js
@@ -0,0 +1,25 @@
+/** @type {import("../../../../").Configuration} */
+module.exports = {
+	output: {
+		environment: {
+			arrowFunction: true,
+			bigIntLiteral: false,
+			const: false,
+			destructuring: false,
+			forOf: false,
+			dynamicImport: true,
+			module: false
+		}
+	},
+	node: {
+		__dirname: false,
+		__filename: false
+	},
+	optimization: {
+		concatenateModules: true,
+		usedExports: true,
+		providedExports: true,
+		minimize: false,
+		mangleExports: false
+	}
+};

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+const foo = 42;`
	`2`	`+`
	`3`	`+module.exports = { foo };`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+const ___CSS_LOADER_EXPORT___ = {};`
	`2`	`+___CSS_LOADER_EXPORT___.locals = {};`
	`3`	`+export default ___CSS_LOADER_EXPORT___;`