fix(start): pass serverBase into create rpc functions (#3214)

TanStack · Jan 22, 2025 · 26badd5 · 26badd5
1 parent 13d8cca
commit 26badd5
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 44 deletions.
diff --git a/packages/server-functions-plugin/src/index.ts b/packages/server-functions-plugin/src/index.ts
@@ -7,11 +7,10 @@ import type {
   ReplacerFn,
 } from '@tanstack/directive-functions-plugin'
 
-export type CreateClientRpcFn = (functionId: string) => any
-export type CreateSsrRpcFn = (functionId: string) => any
-export type CreateServerRpcFn = (
+export type CreateRpcFn = (
   functionId: string,
-  splitImportFn: string,
+  serverBase: string,
+  splitImportFn?: string,
 ) => any
 
 declare global {

diff --git a/packages/start-config/src/index.ts b/packages/start-config/src/index.ts
@@ -121,18 +121,19 @@ export function defineConfig(
     client: {
       getRuntimeCode: () =>
         `import { createClientRpc } from '@tanstack/start/server-functions-client'`,
-      replacer: (opts) => `createClientRpc(${JSON.stringify(opts.functionId)})`,
+      replacer: (opts) =>
+        `createClientRpc('${opts.functionId}', '${serverBase}')`,
     },
     ssr: {
       getRuntimeCode: () =>
         `import { createSsrRpc } from '@tanstack/start/server-functions-ssr'`,
-      replacer: (opts) => `createSsrRpc(${JSON.stringify(opts.functionId)})`,
+      replacer: (opts) => `createSsrRpc('${opts.functionId}', '${serverBase}')`,
     },
     server: {
       getRuntimeCode: () =>
         `import { createServerRpc } from '@tanstack/start/server-functions-server'`,
       replacer: (opts) =>
-        `createServerRpc(${JSON.stringify(opts.functionId)}, ${opts.fn})`,
+        `createServerRpc('${opts.functionId}', '${serverBase}', ${opts.fn})`,
     },
   })
 
@@ -178,7 +179,6 @@ export function defineConfig(
                 ...injectDefineEnv('TSS_PUBLIC_BASE', publicBase),
                 ...injectDefineEnv('TSS_CLIENT_BASE', clientBase),
                 ...injectDefineEnv('TSS_API_BASE', apiBase),
-                ...injectDefineEnv('TSS_SERVER_FN_BASE', serverBase),
               },
               ssr: mergeSsrOptions([
                 viteConfig.userConfig.ssr,
@@ -239,7 +239,6 @@ export function defineConfig(
                 ...injectDefineEnv('TSS_PUBLIC_BASE', publicBase),
                 ...injectDefineEnv('TSS_CLIENT_BASE', clientBase),
                 ...injectDefineEnv('TSS_API_BASE', apiBase),
-                ...injectDefineEnv('TSS_SERVER_FN_BASE', serverBase),
               },
               ssr: mergeSsrOptions([
                 viteConfig.userConfig.ssr,
@@ -408,7 +407,6 @@ export function defineConfig(
               ...injectDefineEnv('TSS_PUBLIC_BASE', publicBase),
               ...injectDefineEnv('TSS_CLIENT_BASE', clientBase),
               ...injectDefineEnv('TSS_API_BASE', apiBase),
-              ...injectDefineEnv('TSS_SERVER_FN_BASE', serverBase),
             },
           }),
           TanStackRouterVite({

diff --git a/packages/start-server-functions-client/src/index.tsx b/packages/start-server-functions-client/src/index.tsx
@@ -1,19 +1,11 @@
-import invariant from 'tiny-invariant'
 import { serverFnFetcher } from '@tanstack/start-server-functions-fetcher'
-import type { CreateClientRpcFn } from '@tanstack/server-functions-plugin'
-
-const serverBase = process.env.TSS_SERVER_FN_BASE
+import type { CreateRpcFn } from '@tanstack/server-functions-plugin'
 
 function sanitizeBase(base: string) {
   return base.replace(/^\/|\/$/g, '')
 }
 
-export const createClientRpc: CreateClientRpcFn = (functionId) => {
-  invariant(
-    serverBase,
-    '🚨A process.env.TSS_SERVER_FN_BASE env variable is required for the server functions client runtime, but was not provided.',
-  )
-
+export const createClientRpc: CreateRpcFn = (functionId, serverBase) => {
   const url = `/${sanitizeBase(serverBase)}/${functionId}`
 
   const clientFn = (...args: Array<any>) => {

diff --git a/packages/start-server-functions-server/src/index.tsx b/packages/start-server-functions-server/src/index.tsx
@@ -1,26 +1,21 @@
 import invariant from 'tiny-invariant'
-import type { CreateServerRpcFn } from '@tanstack/server-functions-plugin'
-
-const serverBase = process.env.TSS_SERVER_FN_BASE
+import type { CreateRpcFn } from '@tanstack/server-functions-plugin'
 
 function sanitizeBase(base: string) {
   return base.replace(/^\/|\/$/g, '')
 }
 
-export function getFunctionUrl(functionId: string) {
-  invariant(
-    serverBase,
-    '🚨A process.env.TSS_SERVER_FN_BASE env variable is required for the server functions ssr runtime, but was not provided.',
-  )
-
-  return `/${sanitizeBase(serverBase)}/${functionId}`
-}
-
-export const createServerRpc: CreateServerRpcFn = (
+export const createServerRpc: CreateRpcFn = (
   functionId,
+  serverBase,
   splitImportFn,
 ) => {
-  const url = getFunctionUrl(functionId)
+  invariant(
+    splitImportFn,
+    '🚨splitImportFnis required for the server functions ssr runtime, but was not provided.',
+  )
+
+  const url = `/${sanitizeBase(serverBase)}/${functionId}`
 
   return Object.assign(splitImportFn, {
     url,

diff --git a/packages/start-server-functions-ssr/src/index.tsx b/packages/start-server-functions-ssr/src/index.tsx
@@ -1,19 +1,11 @@
-import invariant from 'tiny-invariant'
 import { serverFnFetcher } from '@tanstack/start-server-functions-fetcher'
-import type { CreateSsrRpcFn } from '@tanstack/server-functions-plugin'
-
-const serverBase = process.env.TSS_SERVER_FN_BASE
+import type { CreateRpcFn } from '@tanstack/server-functions-plugin'
 
 function sanitizeBase(base: string) {
   return base.replace(/^\/|\/$/g, '')
 }
 
-export const createSsrRpc: CreateSsrRpcFn = (functionId) => {
-  invariant(
-    serverBase,
-    '🚨A process.env.TSS_SERVER_FN_BASE env variable is required for the server functions ssr runtime, but was not provided.',
-  )
-
+export const createSsrRpc: CreateRpcFn = (functionId, serverBase) => {
   const url = `/${sanitizeBase(serverBase)}/${functionId}`
 
   const ssrFn = (...args: Array<any>) => {