use env var for server fn base

Author: schiller-manuel

packages/server-functions-plugin/src/index.ts

@@ -8,11 +8,7 @@ import type {
   ReplacerFn,
 } from '@tanstack/directive-functions-plugin'
 
-export type CreateRpcFn = (
-  functionId: string,
-  serverBase: string,
-  splitImportFn?: string,
-) => any
+export type CreateRpcFn = (functionId: string, splitImportFn?: string) => any
 
 export type ServerFnPluginOpts = {
   /**

packages/start-plugin-core/src/plugin.ts

@@ -307,15 +307,13 @@ export function TanStackStartVitePluginCore(
       client: {
         getRuntimeCode: () =>
           `import { createClientRpc } from '@tanstack/${corePluginOpts.framework}-start/server-functions-client'`,
-        replacer: (d) =>
-          `createClientRpc('${d.functionId}', '${startConfig.serverFns.base}')`,
+        replacer: (d) => `createClientRpc('${d.functionId}')`,
         envName: VITE_ENVIRONMENT_NAMES.client,
       },
       server: {
         getRuntimeCode: () =>
           `import { createServerRpc } from '@tanstack/${corePluginOpts.framework}-start/server-functions-server'`,
-        replacer: (d) =>
-          `createServerRpc('${d.functionId}', '${startConfig.serverFns.base}', ${d.fn})`,
+        replacer: (d) => `createServerRpc('${d.functionId}', ${d.fn})`,
         envName: VITE_ENVIRONMENT_NAMES.server,
       },
     }),

packages/start-server-functions-client/src/index.ts

@@ -5,11 +5,12 @@ function sanitizeBase(base: string) {
   return base.replace(/^\/|\/$/g, '')
 }
 
-export const createClientRpc: CreateRpcFn = (functionId, serverBase) => {
-  const sanitizedAppBase = sanitizeBase(process.env.TSS_APP_BASE || '/')
-  const sanitizedServerBase = sanitizeBase(serverBase)
+const sanitizedAppBase = sanitizeBase(process.env.TSS_APP_BASE || '/')
+const sanitizedServerBase = sanitizeBase(process.env.TSS_SERVER_FN_BASE!)
+const baseUrl = `${sanitizedAppBase ? `/${sanitizedAppBase}` : ''}/${sanitizedServerBase}/`
 
-  const url = `${sanitizedAppBase ? `/${sanitizedAppBase}` : ``}/${sanitizedServerBase}/${functionId}`
+export const createClientRpc: CreateRpcFn = (functionId) => {
+  const url = baseUrl + functionId
 
   const clientFn = (...args: Array<any>) => {
     return serverFnFetcher(url, args, fetch)

packages/start-server-functions-server/src/index.ts

@@ -5,20 +5,17 @@ function sanitizeBase(base: string) {
   return base.replace(/^\/|\/$/g, '')
 }
 
-export const createServerRpc: CreateRpcFn = (
-  functionId,
-  serverBase,
-  splitImportFn,
-) => {
+const sanitizedAppBase = sanitizeBase(process.env.TSS_APP_BASE || '/')
+const sanitizedServerBase = sanitizeBase(process.env.TSS_SERVER_FN_BASE!)
+const baseUrl = `${sanitizedAppBase ? `/${sanitizedAppBase}` : ''}/${sanitizedServerBase}/`
+
+export const createServerRpc: CreateRpcFn = (functionId, splitImportFn) => {
   invariant(
     splitImportFn,
     '🚨splitImportFn required for the server functions server runtime, but was not provided.',
   )
 
-  const sanitizedAppBase = sanitizeBase(process.env.TSS_APP_BASE || '/')
-  const sanitizedServerBase = sanitizeBase(serverBase)
-
-  const url = `${sanitizedAppBase ? `/${sanitizedAppBase}` : ``}/${sanitizedServerBase}/${functionId}`
+  const url = baseUrl + functionId
 
   return Object.assign(splitImportFn, {
     url,