fix merge conflict

schiller-manuel · schiller-manuel · commit 68c564bde11b · 2026-01-18T20:14:32.000+01:00
diff --git a/packages/start-client-core/src/createMiddleware.ts b/packages/start-client-core/src/createMiddleware.ts
@@ -617,7 +617,6 @@ export interface FunctionMiddlewareClientFnOptions<
   serverFnMeta: ClientFnMeta
   next: FunctionMiddlewareClientNextFn<TRegister, TMiddlewares>
   filename: string
-  functionId: string
   fetch?: CustomFetch
 }
 
diff --git a/packages/start-client-core/src/createServerFn.ts b/packages/start-client-core/src/createServerFn.ts
@@ -709,7 +709,6 @@ export type ServerFnMiddlewareOptions = {
   sendContext?: any
   context?: any
   serverFnMeta: ClientFnMeta
-  functionId: string
   fetch?: CustomFetch
   /** @internal - Preserves the call-site fetch to ensure it has highest priority over middleware */
   _callSiteFetch?: CustomFetch

Original file line number	Diff line number	Diff line change
`@@ -617,7 +617,6 @@ export interface FunctionMiddlewareClientFnOptions<`
`617`	`617`	`serverFnMeta: ClientFnMeta`
`618`	`618`	`next: FunctionMiddlewareClientNextFn<TRegister, TMiddlewares>`
`619`	`619`	`filename: string`
`620`		`- functionId: string`
`621`	`620`	`fetch?: CustomFetch`
`622`	`621`	`}`
`623`	`622`