Merge branch 'v1.x' into release/v1.7.5

9aoy · web-flow · commit 6e06dcf36df0 · 2026-02-03T14:09:27.000+08:00
diff --git a/crates/rspack_plugin_rstest/src/parser_plugin.rs b/crates/rspack_plugin_rstest/src/parser_plugin.rs
@@ -15,7 +15,7 @@ use rspack_plugin_javascript::{
 use rspack_util::{SpanExt, atom::Atom, json_stringify, swc::get_swc_comments};
 use swc_core::{
   common::{Span, Spanned},
-  ecma::ast::{CallExpr, Ident, MemberExpr, UnaryExpr},
+  ecma::ast::{CallExpr, Callee, Ident, MemberExpr, UnaryExpr},
 };
 
 static RSTEST_MOCK_FIRST_ARG_TAG: &str = "strip the import call from the first arg of mock series";
@@ -705,21 +705,31 @@ impl JavascriptParserPlugin for RstestParserPlugin {
     &self,
     parser: &mut JavascriptParser,
     call_expr: &CallExpr,
-    for_name: &str,
+    _for_name: &str,
     members: &[Atom],
     _members_optionals: &[bool],
     _member_ranges: &[Span],
   ) -> Option<bool> {
-    // Handle rs.requireActual and rs.importActual calls in any context
-    if (for_name == "rs" || for_name == "rstest") && members.len() == 1 {
-      match members[0].as_str() {
-        "requireActual" => {
-          return self.process_require_actual(parser, call_expr);
-        }
-        "importActual" => {
-          return self.process_import_actual(parser, call_expr);
+    // Handle rs.requireActual and rs.importActual calls
+    // Extract the variable name from call_expr.callee to handle both:
+    // 1. Global variables: rs.importActual() or rstest.importActual()
+    // 2. ESM imports: import { rs } from '@rstest/core'; rs.importActual()
+    if members.len() == 1
+      && let Callee::Expr(callee) = &call_expr.callee
+      && let Some(member_expr) = callee.as_member()
+      && let Some(ident) = member_expr.obj.as_ident()
+    {
+      let var_name = ident.sym.as_str();
+      if var_name == "rs" || var_name == "rstest" {
+        match members[0].as_str() {
+          "requireActual" => {
+            return self.process_require_actual(parser, call_expr);
+          }
+          "importActual" => {
+            return self.process_import_actual(parser, call_expr);
+          }
+          _ => {}
         }
-        _ => {}
       }
     }
     None
diff --git a/tests/rspack-test/configCases/rstest/mock/globals/importActual.js b/tests/rspack-test/configCases/rstest/mock/globals/importActual.js
@@ -0,0 +1,12 @@
+import { foo } from '../src/barrel'
+
+rstest.mock('../src/foo')
+
+const getGlobalActual = () => rstest.importActual('../src/foo');
+
+it('importActual from global scope should works', async () => {
+	expect(foo).toBe('mocked_foo')
+	const originalFoo = await rstest.importActual('../src/foo')
+	expect(originalFoo.value).toBe('foo')
+	expect((await getGlobalActual()).value).toBe('foo')
+})
diff --git a/tests/rspack-test/configCases/rstest/mock/importActual.js b/tests/rspack-test/configCases/rstest/mock/importActual.js
@@ -1,12 +1,13 @@
 import { foo } from './src/barrel'
+import { rstest } from '@rstest/core';
 
 rstest.mock('./src/foo')
 
 const getActual = () => rstest.importActual('./src/foo');
 
 it('importActual should works', async () => {
 	expect(foo).toBe('mocked_foo')
+	expect((await getActual()).value).toBe('foo')
 	const originalFoo = await rstest.importActual('./src/foo')
 	expect(originalFoo.value).toBe('foo')
-	expect((await getActual()).value).toBe('foo')
 })
diff --git a/tests/rspack-test/configCases/rstest/mock/rspack.config.js b/tests/rspack-test/configCases/rstest/mock/rspack.config.js
@@ -182,6 +182,7 @@ module.exports = [
 		}
 	},
 	rstestEntry("./mockFirstArgIsImport.js"),
+	rstestEntry("./globals/importActual.js"),
 	{
 		...rstestEntry("./hoisted.js"),
 		externals: {

Original file line number	Diff line number	Diff line change
`@@ -182,6 +182,7 @@ module.exports = [`
`182`	`182`	`}`
`183`	`183`	`},`
`184`	`184`	`rstestEntry("./mockFirstArgIsImport.js"),`
	`185`	`+ rstestEntry("./globals/importActual.js"),`
`185`	`186`	`{`
`186`	`187`	`...rstestEntry("./hoisted.js"),`
`187`	`188`	`externals: {`