Remove unused RSC exports and dead types from public API

Author: onurtemizkan

packages/react-router/src/client/index.ts

@@ -35,17 +35,6 @@ export function wrapServerFunction<T extends (...args: any[]) => Promise<any>>(
   return serverFunction;
 }
 
-/**
- * Just a passthrough in case this is imported from the client.
- */
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export function wrapServerFunctions<T extends Record<string, (...args: any[]) => Promise<any>>>(
-  _moduleName: string,
-  serverFunctions: T,
-): T {
-  return serverFunctions;
-}
-
 /**
  * @deprecated ErrorBoundary is deprecated, use React Router's error boundary instead.
  * See https://docs.sentry.io/platforms/javascript/guides/react-router/#report-errors-from-error-boundaries

packages/react-router/src/index.types.ts

@@ -31,4 +31,3 @@ export declare const unleashIntegration: typeof clientSdk.unleashIntegration;
 
 export declare const wrapServerComponent: typeof serverSdk.wrapServerComponent;
 export declare const wrapServerFunction: typeof serverSdk.wrapServerFunction;
-export declare const wrapServerFunctions: typeof serverSdk.wrapServerFunctions;

packages/react-router/src/server/index.ts

@@ -20,26 +20,6 @@ export {
 } from './createServerInstrumentation';
 
 // React Server Components (RSC) - React Router v7.9.0+
-export {
-  wrapMatchRSCServerRequest,
-  wrapRouteRSCServerRequest,
-  wrapServerFunction,
-  wrapServerFunctions,
-  wrapServerComponent,
-  isServerComponentContext,
-} from './rsc';
+export { wrapServerFunction, wrapServerComponent } from './rsc';
 
-export type {
-  RSCRouteConfigEntry,
-  RSCPayload,
-  RSCMatch,
-  DecodedPayload,
-  RouterContextProvider,
-  MatchRSCServerRequestArgs,
-  MatchRSCServerRequestFn,
-  RouteRSCServerRequestArgs,
-  RouteRSCServerRequestFn,
-  RSCHydratedRouterProps,
-  ServerComponentContext,
-  WrapServerFunctionOptions,
-} from './rsc';
+export type { ServerComponentContext, WrapServerFunctionOptions } from './rsc';

packages/react-router/src/server/rsc/index.ts

@@ -1,25 +1,4 @@
-export { wrapMatchRSCServerRequest } from './wrapMatchRSCServerRequest';
-export { wrapRouteRSCServerRequest } from './wrapRouteRSCServerRequest';
-export { wrapServerFunction, wrapServerFunctions } from './wrapServerFunction';
-export { wrapServerComponent, isServerComponentContext } from './wrapServerComponent';
+export { wrapServerFunction } from './wrapServerFunction';
+export { wrapServerComponent } from './wrapServerComponent';
 
-export type {
-  RSCRouteConfigEntry,
-  RSCPayload,
-  RSCMatch,
-  DecodedPayload,
-  RouterContextProvider,
-  DecodeReplyFunction,
-  DecodeActionFunction,
-  DecodeFormStateFunction,
-  LoadServerActionFunction,
-  SSRCreateFromReadableStreamFunction,
-  BrowserCreateFromReadableStreamFunction,
-  MatchRSCServerRequestArgs,
-  MatchRSCServerRequestFn,
-  RouteRSCServerRequestArgs,
-  RouteRSCServerRequestFn,
-  RSCHydratedRouterProps,
-  ServerComponentContext,
-  WrapServerFunctionOptions,
-} from './types';
+export type { ServerComponentContext, WrapServerFunctionOptions } from './types';

packages/react-router/src/server/rsc/types.ts

@@ -1,25 +1,3 @@
-/**
- * Type definitions for React Router RSC (React Server Components) APIs.
- *
- * These types mirror the unstable RSC APIs from react-router v7.9.0+.
- * All RSC APIs in React Router are prefixed with `unstable_` and subject to change.
- */
-
-/**
- * RSC route configuration entry - mirrors `unstable_RSCRouteConfigEntry` from react-router.
- */
-export interface RSCRouteConfigEntry {
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  [key: string]: any;
-  path?: string;
-  index?: boolean;
-  caseSensitive?: boolean;
-  id?: string;
-  children?: RSCRouteConfigEntry[];
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  lazy?: () => Promise<any>;
-}
-
 /**
  * RSC payload types - mirrors the various payload types from react-router.
  */
@@ -57,17 +35,6 @@ export type DecodeFormStateFunction = (actionResult: any, body: FormData, option
 export type LoadServerActionFunction = (id: string) => Promise<any>;
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export type SSRCreateFromReadableStreamFunction = (stream: ReadableStream<Uint8Array>) => Promise<any>;
-export type BrowserCreateFromReadableStreamFunction = (
-  stream: ReadableStream<Uint8Array>,
-  options?: { temporaryReferences?: unknown },
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-) => Promise<any>;
-
-/**
- * Router context provider - mirrors `RouterContextProvider` from react-router.
- */
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export type RouterContextProvider = any;
 
 /**
  * Arguments for `unstable_matchRSCServerRequest`.
@@ -80,7 +47,8 @@ export interface MatchRSCServerRequestArgs {
   /** Function to decode server function arguments */
   decodeReply?: DecodeReplyFunction;
   /** Per-request context provider instance */
-  requestContext?: RouterContextProvider;
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  requestContext?: any;
   /** Function to load a server action by ID */
   loadServerAction?: LoadServerActionFunction;
   /** Function to decode server actions */
@@ -92,7 +60,8 @@ export interface MatchRSCServerRequestArgs {
   /** The Request to match against */
   request: Request;
   /** Route definitions */
-  routes: RSCRouteConfigEntry[];
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  routes: any[];
   /** Function to generate Response encoding the RSC payload */
   generateResponse: (
     match: RSCMatch,
@@ -128,22 +97,6 @@ export interface RouteRSCServerRequestArgs {
  */
 export type RouteRSCServerRequestFn = (args: RouteRSCServerRequestArgs) => Promise<Response>;
 
-/**
- * Props for `unstable_RSCHydratedRouter` component.
- */
-export interface RSCHydratedRouterProps {
-  /** Function to decode RSC payloads from server */
-  createFromReadableStream: BrowserCreateFromReadableStreamFunction;
-  /** Optional fetch implementation */
-  fetch?: (request: Request) => Promise<Response>;
-  /** The decoded RSC payload to hydrate */
-  payload: RSCPayload;
-  /** Route discovery behavior: "eager" or "lazy" */
-  routeDiscovery?: 'eager' | 'lazy';
-  /** Function that returns a router context provider instance */
-  getContext?: () => RouterContextProvider;
-}
-
 /**
  * Context for server component wrapping.
  */

packages/react-router/src/server/rsc/wrapServerComponent.ts

@@ -59,14 +59,12 @@ export function wrapServerComponent<T extends (...args: any[]) => any>(
             if (span) {
               span.setStatus({ code: SPAN_STATUS_OK });
             }
-          }
-          else if (isNotFoundResponse(error)) {
+          } else if (isNotFoundResponse(error)) {
             shouldCapture = false;
             if (span) {
               span.setStatus({ code: SPAN_STATUS_ERROR, message: 'not_found' });
             }
-          }
-          else {
+          } else {
             if (span) {
               span.setStatus({ code: SPAN_STATUS_ERROR, message: 'internal_error' });
             }

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

@@ -168,9 +168,7 @@ describe('makeAutoInstrumentRSCPlugin', () => {
       const result = await plugin.load('/nonexistent/file.tsx?sentry-rsc-wrap');
       expect(result).toBeNull();
       // eslint-disable-next-line no-console
-      expect(console.log).toHaveBeenCalledWith(
-        expect.stringContaining('[Sentry RSC] Failed to read original file:'),
-      );
+      expect(console.log).toHaveBeenCalledWith(expect.stringContaining('[Sentry RSC] Failed to read original file:'));
     });
   });