Update server-functions-plugin and cleanup server functions (#2005)

Author: katywings

packages/start/package.json

@@ -39,7 +39,7 @@
     "@babel/traverse": "^7.28.3",
     "@babel/types": "^7.28.5",
     "@solidjs/meta": "^0.29.4",
-    "@tanstack/server-functions-plugin": "^1.133.11",
+    "@tanstack/server-functions-plugin": "1.134.5",
     "@types/babel__traverse": "^7.28.0",
     "@types/micromatch": "^4.0.9",
     "cookie-es": "^2.0.0",

packages/start/src/config/index.ts

@@ -178,16 +178,32 @@ export function solidStart(options?: SolidStartOptions): Array<PluginOption> {
 			// This is the ID that will be available to look up and import
 			// our server function manifest and resolve its module
 			manifestVirtualImportId: VIRTUAL_MODULES.serverFnManifest,
-			client: {
-				envName: VITE_ENVIRONMENTS.client,
-				getRuntimeCode: () =>
-					`import { createServerReference } from "${normalize(
-						fileURLToPath(new URL("../server/server-runtime", import.meta.url)),
-					)}"`,
-				replacer: (opts) =>
-					`createServerReference(${() => {}}, '${opts.functionId}', '${opts.extractedFilename}')`,
-			},
-			server: {
+			directive: "use server",
+			callers: [
+				{
+					envConsumer: "client",
+					envName: VITE_ENVIRONMENTS.client,
+					getRuntimeCode: () =>
+						`import { createServerReference } from "${normalize(
+							fileURLToPath(new URL("../server/server-runtime", import.meta.url)),
+						)}"`,
+					replacer: (opts) =>
+						`createServerReference('${opts.functionId}')`,
+				},
+				{
+					envConsumer: "server",
+					envName: VITE_ENVIRONMENTS.server,
+					getRuntimeCode: () =>
+						`import { createServerReference } from '${normalize(
+							fileURLToPath(
+								new URL("../server/server-fns-runtime", import.meta.url),
+							),
+						)}'`,
+					replacer: (opts) =>
+						`createServerReference(${opts.fn}, '${opts.functionId}')`,
+				}
+			],
+			provider: {
 				envName: VITE_ENVIRONMENTS.server,
 				getRuntimeCode: () =>
 					`import { createServerReference } from '${normalize(
@@ -196,7 +212,7 @@ export function solidStart(options?: SolidStartOptions): Array<PluginOption> {
 						),
 					)}'`,
 				replacer: (opts) =>
-					`createServerReference(${opts.fn}, '${opts.functionId}', '${opts.extractedFilename}')`,
+					`createServerReference(${opts.fn}, '${opts.functionId}')`,
 			},
 		}),
 		{

packages/start/src/server/server-fns-runtime.ts

@@ -1,14 +1,14 @@
 import { getRequestEvent } from "solid-js/web";
 import { provideRequestEvent } from "solid-js/web/storage";
 
-export function createServerReference(fn: Function, id: string, name: string) {
+export function createServerReference(fn: Function, id: string) {
   if (typeof fn !== "function")
     throw new Error("Export from a 'use server' module must be a function");
   const baseURL = import.meta.env.SERVER_BASE_URL ?? "";
   return new Proxy(fn, {
     get(target, prop, receiver) {
       if (prop === "url") {
-        return `${baseURL}/_server?id=${encodeURIComponent(id)}&name=${encodeURIComponent(name)}`;
+        return `${baseURL}/_server?id=${encodeURIComponent(id)}`;
       }
       if (prop === "GET") return receiver;
       return (target as any)[prop];
@@ -18,7 +18,7 @@ export function createServerReference(fn: Function, id: string, name: string) {
       if (!ogEvt) throw new Error("Cannot call server function outside of a request");
       const evt = { ...ogEvt };
       evt.locals.serverFunctionMeta = {
-        id: id + "#" + name
+        id
       };
       evt.serverOnly = true;
       return provideRequestEvent(evt, () => {

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

@@ -83,15 +83,14 @@ export async function handleServerFunction(h3Event: H3Event) {
 	const instance = request.headers.get("X-Server-Instance");
 	const singleFlight = request.headers.has("X-Single-Flight");
 	const url = new URL(request.url);
-	let functionId: string | undefined | null, name: string | undefined | null;
+	let functionId: string | undefined | null;
 	if (serverReference) {
 		// invariant(typeof serverReference === "string", "Invalid server function");
-		[functionId, name] = serverReference.split("#");
+		[functionId] = serverReference.split("#");
 	} else {
 		functionId = url.searchParams.get("id");
-		name = url.searchParams.get("name");
 
-		if (!functionId || !name) {
+		if (!functionId) {
 			return process.env.NODE_ENV === "development"
 				? new Response("Server function not found", { status: 404 })
 				: new Response(null, { status: 404 });
@@ -158,7 +157,7 @@ export async function handleServerFunction(h3Event: H3Event) {
 			/* @ts-expect-error */
 			sharedConfig.context = { event };
 			event.locals.serverFunctionMeta = {
-				id: functionId + "#" + name,
+				id: functionId
 			};
 			return serverFunction(...parsed);
 		});

packages/start/src/server/server-runtime.ts

@@ -192,20 +192,20 @@ async function fetchServerFunction(
   return result;
 }
 
-export function createServerReference(fn: Function, id: string, name: string) {
+export function createServerReference(id: string) {
   const baseURL = import.meta.env.SERVER_BASE_URL ?? "";
+  const fn = (...args: any[]) => fetchServerFunction(`${baseURL}/_server`, id, {}, args);
+
   return new Proxy(fn, {
     get(target, prop, receiver) {
       if (prop === "url") {
-        return `${baseURL}/_server?id=${encodeURIComponent(id)}&name=${encodeURIComponent(name)}`;
+        return `${baseURL}/_server?id=${encodeURIComponent(id)}`;
       }
       if (prop === "GET") {
         return receiver.withOptions({ method: "GET" });
       }
       if (prop === "withOptions") {
-        const url = `${baseURL}/_server?id=${encodeURIComponent(id)}&name=${encodeURIComponent(
-          name
-        )}`;
+        const url = `${baseURL}/_server?id=${encodeURIComponent(id)}`;
         return (options: RequestInit) => {
           const fn = async (...args: any[]) => {
             const encodeArgs = options.method && options.method.toUpperCase() === "GET";
@@ -218,7 +218,7 @@ export function createServerReference(fn: Function, id: string, name: string) {
                         )}`
                       : "")
                 : `${baseURL}/_server`,
-              `${id}#${name}`,
+              id,
               options,
               encodeArgs ? [] : args
             );
@@ -229,12 +229,9 @@ export function createServerReference(fn: Function, id: string, name: string) {
       }
       return (target as any)[prop];
     },
-    apply(target, thisArg, args) {
-      return fetchServerFunction(`${baseURL}/_server`, `${id}#${name}`, {}, args);
-    }
   });
 }
 
-export function createClientReference(Component: Component<any>, id: string, name: string) {
+export function createClientReference(Component: Component<any>, id: string) {
   return Component;
 }