fix(core): resolve require.resolve from source module (#1322)

9aoy · web-flow · commit 9b77a98587bf · 2026-05-29T13:53:44.000+08:00
diff --git a/e2e/externals/require-resolve-origin/exportHelper.js b/e2e/externals/require-resolve-origin/exportHelper.js
@@ -0,0 +1 @@
+module.exports = 'helper';
diff --git a/e2e/externals/require-resolve-origin/index.d.ts b/e2e/externals/require-resolve-origin/index.d.ts
@@ -0,0 +1,2 @@
+export declare const resolveHelper: () => string;
+export declare const resolveWithPaths: (base: string) => string;
diff --git a/e2e/externals/require-resolve-origin/index.js b/e2e/externals/require-resolve-origin/index.js
@@ -0,0 +1,7 @@
+// Without `injectRequireResolveOrigin`, rstest used to resolve these
+// `require.resolve()` calls against the test entry. This fixture lives in a
+// different directory, so relative specifiers must use this module as origin.
+export const resolveHelper = () => require.resolve('./exportHelper');
+
+export const resolveWithPaths = (base) =>
+  require.resolve('rstest-require-resolve-target', { paths: [base] });
diff --git a/e2e/externals/requireResolveOrigin.test.ts b/e2e/externals/requireResolveOrigin.test.ts
@@ -0,0 +1,35 @@
+import { mkdirSync, writeFileSync } from 'node:fs';
+import { dirname, join } from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { expect, it } from '@rstest/core';
+import {
+  resolveHelper,
+  resolveWithPaths,
+} from './require-resolve-origin/index.js';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+const customPath = join(__dirname, 'require-resolve-origin/custom-path');
+const packageDir = join(
+  customPath,
+  'node_modules/rstest-require-resolve-target',
+);
+
+mkdirSync(packageDir, { recursive: true });
+writeFileSync(
+  join(packageDir, 'package.json'),
+  JSON.stringify({ main: 'index.js', name: 'rstest-require-resolve-target' }),
+);
+writeFileSync(join(packageDir, 'index.js'), "module.exports = 'target';");
+
+it('should resolve require.resolve relative to the source module', () => {
+  expect(resolveHelper()).toMatch(
+    /[\\/]require-resolve-origin[\\/]exportHelper\.js$/,
+  );
+});
+
+it('should preserve require.resolve paths option with injected origin', () => {
+  expect(resolveWithPaths(customPath)).toMatch(
+    /[\\/]custom-path[\\/]node_modules[\\/]rstest-require-resolve-target[\\/]index\.js$/,
+  );
+});
diff --git a/packages/core/src/core/plugins/basic.ts b/packages/core/src/core/plugins/basic.ts
@@ -128,17 +128,27 @@ export const pluginBasic: (context: RstestContext) => RsbuildPlugin = (
                 config.devtool = 'nosources-source-map';
               }
 
+              const rstestPluginOptions = {
+                injectModulePathName: true,
+                importMetaPathName: true,
+                hoistMockModule: true,
+                manualMockRoot: pathe.resolve(rootPath, '__mocks__'),
+                // The runtime hook below resolves relative dynamic-import
+                // specifiers against the source module that produced the
+                // call, instead of the test entry, fixing #1207.
+                injectDynamicImportOrigin: true,
+                // The runtime hook below resolves relative require.resolve
+                // specifiers against the source module that produced the
+                // call, instead of the test entry, fixing #848.
+                injectRequireResolveOrigin: {
+                  functionName: outputModule
+                    ? 'import.meta.__rstest_require_resolve__'
+                    : '__rstest_require_resolve__',
+                },
+              };
+
               config.plugins.push(
-                new rspack.experiments.RstestPlugin({
-                  injectModulePathName: true,
-                  importMetaPathName: true,
-                  hoistMockModule: true,
-                  manualMockRoot: pathe.resolve(rootPath, '__mocks__'),
-                  // The runtime hook below resolves relative dynamic-import
-                  // specifiers against the source module that produced the
-                  // call, instead of the test entry, fixing #1207.
-                  injectDynamicImportOrigin: true,
-                }),
+                new rspack.experiments.RstestPlugin(rstestPluginOptions),
               );
 
               config.module.rules ??= [];
diff --git a/packages/core/src/runtime/worker/loadEsModule.ts b/packages/core/src/runtime/worker/loadEsModule.ts
@@ -1,4 +1,7 @@
-import { builtinModules, createRequire } from 'node:module';
+import {
+  builtinModules,
+  createRequire as createNativeRequire,
+} from 'node:module';
 import { isAbsolute } from 'node:path';
 import { fileURLToPath, pathToFileURL } from 'node:url';
 import vm, { type SourceTextModule } from 'node:vm';
@@ -39,7 +42,8 @@ const resolveModule = (
     : pathToFileURL(resolveBase).href;
 
   if (!importMetaResolve) {
-    return pathToFileURL(createRequire(parentURL).resolve(specifier)).href;
+    return pathToFileURL(createNativeRequire(parentURL).resolve(specifier))
+      .href;
   }
 
   // Node's loader hook worker clones the parent URL when native TypeScript
@@ -65,6 +69,42 @@ export const appendSourceURL = (
     : `${codeContent}\n${suffix}`;
 };
 
+const defineRstestRequireResolve =
+  ({
+    testPath,
+    distPath,
+    assetFiles,
+  }: {
+    testPath: string;
+    distPath: string;
+    assetFiles: Record<string, string>;
+  }) =>
+  (
+    specifier: string,
+    optionsOrOrigin?: string | { paths?: string[] },
+    maybeOrigin?: string,
+  ): string => {
+    const options =
+      typeof optionsOrOrigin === 'string' ? undefined : optionsOrOrigin;
+    const origin =
+      typeof optionsOrOrigin === 'string' ? optionsOrOrigin : maybeOrigin;
+    const resolveBase = origin ?? testPath;
+
+    const currentDirectory = path.dirname(origin ?? distPath);
+    const joinedPath = isRelativePath(specifier)
+      ? path.join(currentDirectory, specifier)
+      : specifier;
+    const normalizedPath = path.normalize(
+      joinedPath.startsWith('file://') ? fileURLToPath(joinedPath) : joinedPath,
+    );
+
+    if (assetFiles[normalizedPath]) {
+      return normalizedPath;
+    }
+
+    return createNativeRequire(resolveBase).resolve(specifier, options);
+  };
+
 const defineRstestDynamicImport =
   ({
     distPath,
@@ -235,6 +275,12 @@ export const loadModule = async ({
           esmMode: EsmMode.Unknown,
         });
         // @ts-expect-error
+        meta.__rstest_require_resolve__ = defineRstestRequireResolve({
+          assetFiles,
+          testPath,
+          distPath: distPath || testPath,
+        });
+        // @ts-expect-error
         meta.readWasmFile = (
           wasmPath: URL,
           callback: (err: Error | null, data?: Buffer) => void,
diff --git a/packages/core/src/runtime/worker/loadModule.ts b/packages/core/src/runtime/worker/loadModule.ts
@@ -24,6 +24,44 @@ const resolveModule = (specifier: string, resolveBase: string): string | URL =>
       : pathToFileURL(resolveBase).href,
   );
 
+const defineRstestRequireResolve =
+  ({
+    testPath,
+    distPath,
+    assetFiles,
+  }: {
+    testPath: string;
+    distPath: string;
+    assetFiles: Record<string, string>;
+  }) =>
+  (
+    specifier: string,
+    optionsOrOrigin?: string | { paths?: string[] },
+    maybeOrigin?: string,
+  ): string => {
+    const options =
+      typeof optionsOrOrigin === 'string' ? undefined : optionsOrOrigin;
+    // `origin` is the absolute path of the source module that produced the
+    // `require.resolve()` call, injected by rspack's `RstestPlugin` when
+    // `injectRequireResolveOrigin` is enabled. Falling back keeps native
+    // `require.resolve` semantics for un-rewritten calls.
+    const origin =
+      typeof optionsOrOrigin === 'string' ? optionsOrOrigin : maybeOrigin;
+    const resolveBase = origin ?? testPath;
+
+    const currentDirectory = path.dirname(origin ?? distPath);
+    const joinedPath = isRelativePath(specifier)
+      ? path.join(currentDirectory, specifier)
+      : specifier;
+    const normalizedPath = path.normalize(joinedPath);
+
+    if (assetFiles[normalizedPath]) {
+      return normalizedPath;
+    }
+
+    return createNativeRequire(resolveBase).resolve(specifier, options);
+  };
+
 const createRequire = (
   filename: string,
   distPath: string,
@@ -69,7 +107,13 @@ const createRequire = (
     const resolved = _require.resolve(id);
     return _require(resolved);
   }) as NodeJS.Require;
-  require.resolve = _require.resolve;
+  const requireResolve = defineRstestRequireResolve({
+    testPath: filename,
+    distPath,
+    assetFiles,
+  }) as NodeJS.RequireResolve;
+  requireResolve.paths = _require.resolve.paths.bind(_require.resolve);
+  require.resolve = requireResolve;
   require.main = _require.main;
   return require;
 };
@@ -225,6 +269,11 @@ export const loadModule = ({
       interopDefault,
       assetFiles,
     }),
+    __rstest_require_resolve__: defineRstestRequireResolve({
+      testPath,
+      distPath,
+      assetFiles,
+    }),
     __dirname: fileDir,
     __filename: testPath,
     ...rstestContext,
diff --git a/packages/core/tests/core/__snapshots__/rsbuild.test.ts.snap b/packages/core/tests/core/__snapshots__/rsbuild.test.ts.snap
@@ -514,6 +514,9 @@ exports[`prepareRsbuild > should generate rspack config correctly (esm output) 1
           "importMetaPathName": true,
           "injectDynamicImportOrigin": true,
           "injectModulePathName": true,
+          "injectRequireResolveOrigin": {
+            "functionName": "import.meta.__rstest_require_resolve__",
+          },
           "manualMockRoot": "<ROOT>/packages/core/__mocks__",
         },
       ],
@@ -1098,6 +1101,9 @@ exports[`prepareRsbuild > should generate rspack config correctly (jsdom) 1`] =
           "importMetaPathName": true,
           "injectDynamicImportOrigin": true,
           "injectModulePathName": true,
+          "injectRequireResolveOrigin": {
+            "functionName": "__rstest_require_resolve__",
+          },
           "manualMockRoot": "<ROOT>/packages/core/__mocks__",
         },
       ],
@@ -1668,6 +1674,9 @@ exports[`prepareRsbuild > should generate rspack config correctly (node) 1`] = `
           "importMetaPathName": true,
           "injectDynamicImportOrigin": true,
           "injectModulePathName": true,
+          "injectRequireResolveOrigin": {
+            "functionName": "__rstest_require_resolve__",
+          },
           "manualMockRoot": "<ROOT>/packages/core/__mocks__",
         },
       ],
@@ -2240,6 +2249,9 @@ exports[`prepareRsbuild > should generate rspack config correctly in watch mode
           "importMetaPathName": true,
           "injectDynamicImportOrigin": true,
           "injectModulePathName": true,
+          "injectRequireResolveOrigin": {
+            "functionName": "__rstest_require_resolve__",
+          },
           "manualMockRoot": "<ROOT>/packages/core/__mocks__",
         },
       ],
@@ -3147,6 +3159,9 @@ exports[`prepareRsbuild > should generate rspack config correctly with projects
           "importMetaPathName": true,
           "injectDynamicImportOrigin": true,
           "injectModulePathName": true,
+          "injectRequireResolveOrigin": {
+            "functionName": "__rstest_require_resolve__",
+          },
           "manualMockRoot": "<ROOT>/packages/core/__mocks__",
         },
       ],
@@ -3718,6 +3733,9 @@ exports[`prepareRsbuild > should generate rspack config correctly with projects
           "importMetaPathName": true,
           "injectDynamicImportOrigin": true,
           "injectModulePathName": true,
+          "injectRequireResolveOrigin": {
+            "functionName": "__rstest_require_resolve__",
+          },
           "manualMockRoot": "<ROOT>/packages/core/__mocks__",
         },
       ],
diff --git a/packages/core/tests/runner/requireResolveOrigin.test.ts b/packages/core/tests/runner/requireResolveOrigin.test.ts

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+export declare const resolveHelper: () => string;`
	`2`	`+export declare const resolveWithPaths: (base: string) => string;`