chore(rsc): Rename rsf -> rsa (#11391)

Author: Tobbe

packages/router/src/rsc/rscFetchForClientRouter.tsx

@@ -39,13 +39,13 @@ export function rscFetch(rscId: string, props: RscFetchProps) {
     // element). So for now at least we need to send it with every RSC
     // request, so React knows what `callServer` method to use for server
     // actions inside the RSC.
-    callServer: async function (rsfId: string, args: unknown[]) {
+    callServer: async function (rsaId: string, args: unknown[]) {
       // `args` is often going to be an array with just a single element,
       // and that element will be FormData
-      console.log('ClientRouter.ts :: callServer rsfId', rsfId, 'args', args)
+      console.log('ClientRouter.ts :: callServer rsfId', rsaId, 'args', args)
 
       const searchParams = new URLSearchParams()
-      searchParams.set('action_id', rsfId)
+      searchParams.set('action_id', rsaId)
       const id = '_'
 
       const response = fetch(BASE_PATH + id + '?' + searchParams, {

packages/vite/src/buildRscClientAndServer.ts

@@ -11,7 +11,7 @@ export const buildRscClientAndServer = async ({
 }: {
   verbose?: boolean
 }) => {
-  // Analyze all files and generate a list of RSCs and RSFs
+  // Analyze all files and generate a list of RSCs and RSAs
   const { clientEntryFiles, serverEntryFiles } = await rscBuildAnalyze()
 
   // Generate the client bundle

packages/vite/src/client.ts

@@ -48,14 +48,14 @@ function fetchRSC(
     // element). So for now at least we need to send it with every RSC
     // request, so React knows what `callServer` method to use for server
     // actions inside the RSC.
-    callServer: async function (rsfId: string, args: unknown[]) {
+    callServer: async function (rsaId: string, args: unknown[]) {
       // `args` is often going to be an array with just a single element,
       // and that element will be FormData
-      console.log('client.ts :: callServer rsfId', rsfId, 'args', args)
+      console.log('client.ts :: callServer rsfId', rsaId, 'args', args)
 
       const isMutating = !!mutationMode
       const searchParams = new URLSearchParams()
-      searchParams.set('action_id', rsfId)
+      searchParams.set('action_id', rsaId)
       let id: string
 
       if (isMutating) {

packages/vite/src/rsc/rscBuildAnalyze.ts

@@ -11,7 +11,7 @@ import { rscAnalyzePlugin } from '../plugins/vite-plugin-rsc-analyze.js'
  * buildFeServer -> buildRscFeServer -> rscBuildAnalyze
  * Uses rscAnalyzePlugin to collect client and server entry points
  * Starts building the AST in entries.ts
- * Doesn't output any files, only collects a list of RSCs and RSFs
+ * Doesn't output any files, only collects a list of RSCs and RSAs
  */
 export async function rscBuildAnalyze() {
   console.log('\n')

packages/vite/src/rsc/rscRequestHandler.ts

@@ -34,8 +34,6 @@ export function createRscRequestHandler(
 ) {
   // This is mounted at /rw-rsc, so will have /rw-rsc stripped from req.url
 
-  // above this line is for ALL users ☝️, not a per request basis
-  // -------------
   return async (
     req: ExpressRequest,
     res: ExpressResponse,
@@ -96,23 +94,23 @@ export function createRscRequestHandler(
     const props: RscFetchProps = JSON.parse(
       url.searchParams.get('props') || '{}',
     )
-    let rsfId: string | undefined
+    let rsaId: string | undefined
     let args: unknown[] = []
 
     if (url.pathname.startsWith(basePath)) {
       rscId = url.pathname.split('/').pop()
-      rsfId = url.searchParams.get('action_id') || undefined
+      rsaId = url.searchParams.get('action_id') || undefined
 
       console.log('rscId', rscId)
-      console.log('rsfId', rsfId)
+      console.log('rsaId', rsaId)
 
       if (rscId && rscId !== '_') {
         res.setHeader('Content-Type', 'text/x-component')
       } else {
         rscId = undefined
       }
 
-      if (rsfId) {
+      if (rsaId) {
         // TODO (RSC): For React Server Actions we need to limit the request
         // size somehow
         // https://nextjs.org/docs/app/api-reference/functions/server-actions#size-limitation
@@ -167,7 +165,7 @@ export function createRscRequestHandler(
 
     console.log('rscRequestHandler: args', args)
 
-    if (rscId || rsfId) {
+    if (rscId || rsaId) {
       const handleError = (err: unknown) => {
         if (hasStatusCode(err)) {
           res.statusCode = err.statusCode
@@ -198,7 +196,7 @@ export function createRscRequestHandler(
         const pipeable = renderRsc({
           rscId,
           props,
-          rsfId,
+          rsaId,
           args,
           // Pass the serverState from server to the worker
           // Inside the worker, we'll use this to re-initalize the server state (because workers are stateless)
@@ -212,7 +210,7 @@ export function createRscRequestHandler(
         await sendRscFlightToStudio({
           rscId,
           props,
-          rsfId,
+          rsaId,
           args,
           basePath,
           req,

packages/vite/src/rsc/rscStudioHandlers.ts

@@ -129,7 +129,7 @@ export const sendRscFlightToStudio = async (input: StudioRenderInput) => {
     console.debug('Studio is not enabled')
     return
   }
-  const { rscId, props, rsfId, args, basePath, req, handleError } = input
+  const { rscId, props, rsaId, args, basePath, req, handleError } = input
 
   try {
     // surround renderRsc with performance metrics
@@ -144,7 +144,7 @@ export const sendRscFlightToStudio = async (input: StudioRenderInput) => {
     const pipeable = renderRsc({
       rscId,
       props,
-      rsfId,
+      rsaId,
       args,
       serverState: {
         headersInit: Object.fromEntries(getRequestHeaders().entries()),
@@ -160,7 +160,7 @@ export const sendRscFlightToStudio = async (input: StudioRenderInput) => {
     const metadata = {
       rsc: {
         rscId,
-        rsfId,
+        rsaId,
         props,
         args,
       },

packages/vite/src/rsc/rscWorker.ts

@@ -384,7 +384,7 @@ function getBundlerConfig(config: ConfigType) {
 }
 
 async function renderRsc(input: RenderInput): Promise<PipeableStream> {
-  if (input.rsfId || !input.args) {
+  if (input.rsaId || !input.args) {
     throw new Error(
       "Unexpected input. Can't request both RSCs and execute RSAs at the same time.",
     )
@@ -424,11 +424,11 @@ function isSerializedFormData(data?: unknown): data is SerializedFormData {
 async function handleRsa(input: RenderInput): Promise<PipeableStream> {
   console.log('handleRsa input', input)
 
-  if (!input.rsfId || !input.args) {
+  if (!input.rsaId || !input.args) {
     throw new Error('Unexpected input')
   }
 
-  const [fileName, actionName] = input.rsfId.split('#')
+  const [fileName, actionName] = input.rsaId.split('#')
   console.log('Server Action fileName', fileName, 'actionName', actionName)
   const module = await loadServerFile(fileName)
 

packages/vite/src/rsc/rscWorkerCommunication.ts

@@ -26,7 +26,7 @@ const worker = new Worker(workerPath, {
 export type RenderInput = {
   rscId?: string | undefined
   props: RscFetchProps | Record<string, unknown>
-  rsfId?: string | undefined
+  rsaId?: string | undefined
   args?: unknown[] | undefined
   serverState: {
     headersInit: Record<string, string>