Strip Vite query strings from module IDs in RSC plugin

Author: onurtemizkan

packages/react-router/src/vite/makeAutoInstrumentRSCPlugin.ts

@@ -207,7 +207,10 @@ export function getServerFunctionWrapperCode(
   exportNames: string[],
   includeDefault: boolean = false,
 ): string {
-  const wrappedId = JSON.stringify(`${originalId}${WRAPPED_MODULE_SUFFIX}`);
+  // Vite may add query strings (e.g. ?v=abc) to module IDs — strip them so
+  // the wrapped re-import points at a clean filesystem path.
+  const cleanId = originalId.split('?')[0] ?? originalId;
+  const wrappedId = JSON.stringify(`${cleanId}${WRAPPED_MODULE_SUFFIX}`);
   const lines = [
     "'use server';",
     `import { wrapServerFunction } from '${SENTRY_PACKAGE}';`,
@@ -247,7 +250,8 @@ export function makeAutoInstrumentRSCPlugin(options: AutoInstrumentRSCOptions =
       if (!id.includes(WRAPPED_MODULE_SUFFIX)) {
         return null;
       }
-      const originalPath = id.slice(0, -WRAPPED_MODULE_SUFFIX.length);
+      const idWithoutSuffix = id.slice(0, -WRAPPED_MODULE_SUFFIX.length);
+      const originalPath = idWithoutSuffix.split('?')[0] ?? idWithoutSuffix;
       try {
         return await readFile(originalPath, 'utf-8');
       } catch {

packages/react-router/test/vite/makeAutoInstrumentRSCPlugin.test.ts

@@ -481,6 +481,13 @@ describe('makeAutoInstrumentRSCPlugin', () => {
       expect(result).not.toContain('export default');
     });
 
+    it('strips query strings from the original ID before appending the suffix', () => {
+      const result = getServerFunctionWrapperCode('/app/routes/actions.ts?v=123', ['myAction']);
+
+      expect(result).toContain('/app/routes/actions.ts?sentry-rsc-wrap');
+      expect(result).not.toContain('?v=123');
+    });
+
     it('handles file with only default export when includeDefault is true', () => {
       const result = getServerFunctionWrapperCode('/app/routes/actions.ts', [], true);