fix(amd_require_dependency): generate correct code for require([deps])

nilptr · nilptr · commit 4ec6bfcd381b · 2025-01-17T23:19:26.000+08:00
chore: add more test cases for amd require
diff --git a/crates/rspack_plugin_javascript/src/dependency/amd/amd_require_dependency.rs b/crates/rspack_plugin_javascript/src/dependency/amd/amd_require_dependency.rs
@@ -81,7 +81,7 @@ impl DependencyTemplate for AMDRequireDependency {
     {
       let start_block = promise + ".then(function() {";
       let end_block = format!(
-        ";}})['catch']{}",
+        ";}})['catch']({})",
         RuntimeGlobals::UNCAUGHT_ERROR_HANDLER.name()
       );
       code_generatable_context
diff --git a/packages/rspack-test-tools/tests/configCases/amd/require/dep.js b/packages/rspack-test-tools/tests/configCases/amd/require/dep.js
@@ -0,0 +1,3 @@
+import fn from './fn';
+
+fn(123);
diff --git a/packages/rspack-test-tools/tests/configCases/amd/require/fn.js b/packages/rspack-test-tools/tests/configCases/amd/require/fn.js
@@ -0,0 +1,2 @@
+
+module.exports = jest.fn();
diff --git a/packages/rspack-test-tools/tests/configCases/amd/require/index.js b/packages/rspack-test-tools/tests/configCases/amd/require/index.js
@@ -1,3 +1,11 @@
+it("require([...]) should work well", async function () {
+	const p = require(['./dep']);
+	expect(p).toBeInstanceOf(Promise);
+
+	await p;
+
+	expect(require('./fn')).toHaveBeenCalledWith(123);
+});
 
 it("require([...], function () {}) should work well", function (done) {
 	require(['./add'], function (add) {

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ impl DependencyTemplate for AMDRequireDependency {`
`81`	`81`	`{`
`82`	`82`	`let start_block = promise + ".then(function() {";`
`83`	`83`	`let end_block = format!(`
`84`		`- ";}})['catch']{}",`
	`84`	`+ ";}})['catch']({})",`
`85`	`85`	`RuntimeGlobals::UNCAUGHT_ERROR_HANDLER.name()`
`86`	`86`	`);`
`87`	`87`	`code_generatable_context`