@tanstack/start-server-core 1.120.4-alpha.15 → 1.120.4-alpha.17

package/dist/cjs/server-functions-handler.cjs

@@ -37,16 +37,7 @@ const handleServerAction = async ({ request }) => {
     console.info("serverFnManifest", serverFnManifest);
     throw new Error("Server function info not found for " + serverFnId);
   }
-  let fnModule;
-  if (process.env.NODE_ENV === "development") {
-    const serverEnv = globalThis.viteDevServer.environments["server"];
-    if (!serverEnv) {
-      throw new Error(`'server' vite dev environment not found`);
-    }
-    fnModule = await serverEnv.runner.import(serverFnInfo.extractedFilename);
-  } else {
-    fnModule = await serverFnInfo.importer();
-  }
+  const fnModule = await serverFnInfo.importer();
   if (!fnModule) {
     console.info("serverFnInfo", serverFnInfo);
     throw new Error("Server function module not resolved for " + serverFnId);

package/dist/cjs/server-functions-handler.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"server-functions-handler.cjs","sources":["../../src/server-functions-handler.ts"],"sourcesContent":["import { isNotFound } from '@tanstack/router-core'\nimport invariant from 'tiny-invariant'\nimport { startSerializer } from '@tanstack/start-client-core'\n// @ts-expect-error\nimport _serverFnManifest from 'tanstack:server-fn-manifest'\nimport { getEvent, getResponseStatus } from './h3'\n\n// NOTE: This is a dummy export to silence warnings about\n// only having a default export.\nexport const dummy = 2\n\nconst serverFnManifest = _serverFnManifest as Record<\n  string,\n  {\n    functionName: string\n    extractedFilename: string\n    importer: () => Promise<any>\n  }\n>\n\nfunction sanitizeBase(base: string | undefined) {\n  if (!base) {\n    throw new Error(\n      '🚨 process.env.TSS_SERVER_FN_BASE is required in start/server-handler/index',\n    )\n  }\n\n  return base.replace(/^\\/|\\/$/g, '')\n}\n\nexport const handleServerAction = async ({ request }: { request: Request }) => {\n  const controller = new AbortController()\n  const signal = controller.signal\n  const abort = () => controller.abort()\n  request.signal.addEventListener('abort', abort)\n\n  const method = request.method\n  const url = new URL(request.url, 'http://localhost:3000')\n  // extract the serverFnId from the url as host/_server/:serverFnId\n  // Define a regex to match the path and extract the :thing part\n  const regex = new RegExp(\n    `${sanitizeBase(process.env.TSS_SERVER_FN_BASE)}/([^/?#]+)`,\n  )\n\n  // Execute the regex\n  const match = url.pathname.match(regex)\n  const serverFnId = match ? match[1] : null\n  const search = Object.fromEntries(url.searchParams.entries()) as {\n    payload?: any\n    createServerFn?: boolean\n  }\n\n  const isCreateServerFn = 'createServerFn' in search\n  const isRaw = 'raw' in search\n\n  if (typeof serverFnId !== 'string') {\n    throw new Error('Invalid server action param for serverFnId: ' + serverFnId)\n  }\n\n  const serverFnInfo = serverFnManifest[serverFnId]\n\n  if (!serverFnInfo) {\n    console.info('serverFnManifest', serverFnManifest)\n    throw new Error('Server function info not found for ' + serverFnId)\n  }\n\n  let fnModule: undefined | { [key: string]: any }\n\n  if (process.env.NODE_ENV === 'development') {\n    const serverEnv = (globalThis as any).viteDevServer.environments['server']\n    if (!serverEnv) {\n      throw new Error(`'server' vite dev environment not found`)\n    }\n    fnModule = await serverEnv.runner.import(serverFnInfo.extractedFilename)\n  } else {\n    fnModule = await serverFnInfo.importer()\n  }\n\n  if (!fnModule) {\n    console.info('serverFnInfo', serverFnInfo)\n    throw new Error('Server function module not resolved for ' + serverFnId)\n  }\n\n  const action = fnModule[serverFnInfo.functionName]\n\n  if (!action) {\n    console.info('serverFnInfo', serverFnInfo)\n    console.info('fnModule', fnModule)\n    throw new Error(\n      `Server function module export not resolved for serverFn ID: ${serverFnId}`,\n    )\n  }\n\n  // Known FormData 'Content-Type' header values\n  const formDataContentTypes = [\n    'multipart/form-data',\n    'application/x-www-form-urlencoded',\n  ]\n\n  const response = await (async () => {\n    try {\n      let result = await (async () => {\n        // FormData\n        if (\n          request.headers.get('Content-Type') &&\n          formDataContentTypes.some((type) =>\n            request.headers.get('Content-Type')?.includes(type),\n          )\n        ) {\n          // We don't support GET requests with FormData payloads... that seems impossible\n          invariant(\n            method.toLowerCase() !== 'get',\n            'GET requests with FormData payloads are not supported',\n          )\n\n          return await action(await request.formData(), signal)\n        }\n\n        // Get requests use the query string\n        if (method.toLowerCase() === 'get') {\n          // By default the payload is the search params\n          let payload: any = search\n\n          // If this GET request was created by createServerFn,\n          // then the payload will be on the payload param\n          if (isCreateServerFn) {\n            payload = search.payload\n          }\n\n          // If there's a payload, we should try to parse it\n          payload = payload ? startSerializer.parse(payload) : payload\n\n          // Send it through!\n          return await action(payload, signal)\n        }\n\n        // This must be a POST request, likely JSON???\n        const jsonPayloadAsString = await request.text()\n\n        // We should probably try to deserialize the payload\n        // as JSON, but we'll just pass it through for now.\n        const payload = startSerializer.parse(jsonPayloadAsString)\n\n        // If this POST request was created by createServerFn,\n        // it's payload will be the only argument\n        if (isCreateServerFn) {\n          return await action(payload, signal)\n        }\n\n        // Otherwise, we'll spread the payload. Need to\n        // support `use server` functions that take multiple\n        // arguments.\n        return await action(...(payload as any), signal)\n      })()\n\n      // Any time we get a Response back, we should just\n      // return it immediately.\n      if (result.result instanceof Response) {\n        return result.result\n      }\n\n      // If this is a non createServerFn request, we need to\n      // pull out the result from the result object\n      if (!isCreateServerFn) {\n        result = result.result\n\n        // The result might again be a response,\n        // and if it is, return it.\n        if (result instanceof Response) {\n          return result\n        }\n      }\n\n      // if (!search.createServerFn) {\n      //   result = result.result\n      // }\n\n      // else if (\n      //   isPlainObject(result) &&\n      //   'result' in result &&\n      //   result.result instanceof Response\n      // ) {\n      //   return result.result\n      // }\n\n      // TODO: RSCs Where are we getting this package?\n      // if (isValidElement(result)) {\n      //   const { renderToPipeableStream } = await import(\n      //     // @ts-expect-error\n      //     'react-server-dom/server'\n      //   )\n\n      //   const pipeableStream = renderToPipeableStream(result)\n\n      //   setHeaders(event, {\n      //     'Content-Type': 'text/x-component',\n      //   } as any)\n\n      //   sendStream(event, response)\n      //   event._handled = true\n\n      //   return new Response(null, { status: 200 })\n      // }\n\n      if (isNotFound(result)) {\n        return isNotFoundResponse(result)\n      }\n\n      return new Response(\n        result !== undefined ? startSerializer.stringify(result) : undefined,\n        {\n          status: getResponseStatus(getEvent()),\n          headers: {\n            'Content-Type': 'application/json',\n          },\n        },\n      )\n    } catch (error: any) {\n      if (error instanceof Response) {\n        return error\n      }\n      // else if (\n      //   isPlainObject(error) &&\n      //   'result' in error &&\n      //   error.result instanceof Response\n      // ) {\n      //   return error.result\n      // }\n\n      // Currently this server-side context has no idea how to\n      // build final URLs, so we need to defer that to the client.\n      // The client will check for __redirect and __notFound keys,\n      // and if they exist, it will handle them appropriately.\n\n      if (isNotFound(error)) {\n        return isNotFoundResponse(error)\n      }\n\n      console.info()\n      console.info('Server Fn Error!')\n      console.info()\n      console.error(error)\n      console.info()\n\n      return new Response(startSerializer.stringify(error), {\n        status: 500,\n        headers: {\n          'Content-Type': 'application/json',\n        },\n      })\n    }\n  })()\n\n  request.signal.removeEventListener('abort', abort)\n\n  if (isRaw) {\n    return response\n  }\n\n  return response\n}\n\nfunction isNotFoundResponse(error: any) {\n  const { headers, ...rest } = error\n\n  return new Response(JSON.stringify(rest), {\n    status: 200,\n    headers: {\n      'Content-Type': 'application/json',\n      ...(headers || {}),\n    },\n  })\n}\n"],"names":["payload","startSerializer","isNotFound","getResponseStatus","getEvent"],"mappings":"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"}
+{"version":3,"file":"server-functions-handler.cjs","sources":["../../src/server-functions-handler.ts"],"sourcesContent":["import { isNotFound } from '@tanstack/router-core'\nimport invariant from 'tiny-invariant'\nimport { startSerializer } from '@tanstack/start-client-core'\n// @ts-expect-error\nimport _serverFnManifest from 'tanstack:server-fn-manifest'\nimport { getEvent, getResponseStatus } from './h3'\n\nconst serverFnManifest = _serverFnManifest as Record<\n  string,\n  {\n    functionName: string\n    extractedFilename: string\n    importer: () => Promise<any>\n  }\n>\n\nfunction sanitizeBase(base: string | undefined) {\n  if (!base) {\n    throw new Error(\n      '🚨 process.env.TSS_SERVER_FN_BASE is required in start/server-handler/index',\n    )\n  }\n\n  return base.replace(/^\\/|\\/$/g, '')\n}\n\nexport const handleServerAction = async ({ request }: { request: Request }) => {\n  const controller = new AbortController()\n  const signal = controller.signal\n  const abort = () => controller.abort()\n  request.signal.addEventListener('abort', abort)\n\n  const method = request.method\n  const url = new URL(request.url, 'http://localhost:3000')\n  // extract the serverFnId from the url as host/_server/:serverFnId\n  // Define a regex to match the path and extract the :thing part\n  const regex = new RegExp(\n    `${sanitizeBase(process.env.TSS_SERVER_FN_BASE)}/([^/?#]+)`,\n  )\n\n  // Execute the regex\n  const match = url.pathname.match(regex)\n  const serverFnId = match ? match[1] : null\n  const search = Object.fromEntries(url.searchParams.entries()) as {\n    payload?: any\n    createServerFn?: boolean\n  }\n\n  const isCreateServerFn = 'createServerFn' in search\n  const isRaw = 'raw' in search\n\n  if (typeof serverFnId !== 'string') {\n    throw new Error('Invalid server action param for serverFnId: ' + serverFnId)\n  }\n\n  const serverFnInfo = serverFnManifest[serverFnId]\n\n  if (!serverFnInfo) {\n    console.info('serverFnManifest', serverFnManifest)\n    throw new Error('Server function info not found for ' + serverFnId)\n  }\n\n  const fnModule: undefined | { [key: string]: any } =\n    await serverFnInfo.importer()\n\n  if (!fnModule) {\n    console.info('serverFnInfo', serverFnInfo)\n    throw new Error('Server function module not resolved for ' + serverFnId)\n  }\n\n  const action = fnModule[serverFnInfo.functionName]\n\n  if (!action) {\n    console.info('serverFnInfo', serverFnInfo)\n    console.info('fnModule', fnModule)\n    throw new Error(\n      `Server function module export not resolved for serverFn ID: ${serverFnId}`,\n    )\n  }\n\n  // Known FormData 'Content-Type' header values\n  const formDataContentTypes = [\n    'multipart/form-data',\n    'application/x-www-form-urlencoded',\n  ]\n\n  const response = await (async () => {\n    try {\n      let result = await (async () => {\n        // FormData\n        if (\n          request.headers.get('Content-Type') &&\n          formDataContentTypes.some((type) =>\n            request.headers.get('Content-Type')?.includes(type),\n          )\n        ) {\n          // We don't support GET requests with FormData payloads... that seems impossible\n          invariant(\n            method.toLowerCase() !== 'get',\n            'GET requests with FormData payloads are not supported',\n          )\n\n          return await action(await request.formData(), signal)\n        }\n\n        // Get requests use the query string\n        if (method.toLowerCase() === 'get') {\n          // By default the payload is the search params\n          let payload: any = search\n\n          // If this GET request was created by createServerFn,\n          // then the payload will be on the payload param\n          if (isCreateServerFn) {\n            payload = search.payload\n          }\n\n          // If there's a payload, we should try to parse it\n          payload = payload ? startSerializer.parse(payload) : payload\n\n          // Send it through!\n          return await action(payload, signal)\n        }\n\n        // This must be a POST request, likely JSON???\n        const jsonPayloadAsString = await request.text()\n\n        // We should probably try to deserialize the payload\n        // as JSON, but we'll just pass it through for now.\n        const payload = startSerializer.parse(jsonPayloadAsString)\n\n        // If this POST request was created by createServerFn,\n        // it's payload will be the only argument\n        if (isCreateServerFn) {\n          return await action(payload, signal)\n        }\n\n        // Otherwise, we'll spread the payload. Need to\n        // support `use server` functions that take multiple\n        // arguments.\n        return await action(...(payload as any), signal)\n      })()\n\n      // Any time we get a Response back, we should just\n      // return it immediately.\n      if (result.result instanceof Response) {\n        return result.result\n      }\n\n      // If this is a non createServerFn request, we need to\n      // pull out the result from the result object\n      if (!isCreateServerFn) {\n        result = result.result\n\n        // The result might again be a response,\n        // and if it is, return it.\n        if (result instanceof Response) {\n          return result\n        }\n      }\n\n      // if (!search.createServerFn) {\n      //   result = result.result\n      // }\n\n      // else if (\n      //   isPlainObject(result) &&\n      //   'result' in result &&\n      //   result.result instanceof Response\n      // ) {\n      //   return result.result\n      // }\n\n      // TODO: RSCs Where are we getting this package?\n      // if (isValidElement(result)) {\n      //   const { renderToPipeableStream } = await import(\n      //     // @ts-expect-error\n      //     'react-server-dom/server'\n      //   )\n\n      //   const pipeableStream = renderToPipeableStream(result)\n\n      //   setHeaders(event, {\n      //     'Content-Type': 'text/x-component',\n      //   } as any)\n\n      //   sendStream(event, response)\n      //   event._handled = true\n\n      //   return new Response(null, { status: 200 })\n      // }\n\n      if (isNotFound(result)) {\n        return isNotFoundResponse(result)\n      }\n\n      return new Response(\n        result !== undefined ? startSerializer.stringify(result) : undefined,\n        {\n          status: getResponseStatus(getEvent()),\n          headers: {\n            'Content-Type': 'application/json',\n          },\n        },\n      )\n    } catch (error: any) {\n      if (error instanceof Response) {\n        return error\n      }\n      // else if (\n      //   isPlainObject(error) &&\n      //   'result' in error &&\n      //   error.result instanceof Response\n      // ) {\n      //   return error.result\n      // }\n\n      // Currently this server-side context has no idea how to\n      // build final URLs, so we need to defer that to the client.\n      // The client will check for __redirect and __notFound keys,\n      // and if they exist, it will handle them appropriately.\n\n      if (isNotFound(error)) {\n        return isNotFoundResponse(error)\n      }\n\n      console.info()\n      console.info('Server Fn Error!')\n      console.info()\n      console.error(error)\n      console.info()\n\n      return new Response(startSerializer.stringify(error), {\n        status: 500,\n        headers: {\n          'Content-Type': 'application/json',\n        },\n      })\n    }\n  })()\n\n  request.signal.removeEventListener('abort', abort)\n\n  if (isRaw) {\n    return response\n  }\n\n  return response\n}\n\nfunction isNotFoundResponse(error: any) {\n  const { headers, ...rest } = error\n\n  return new Response(JSON.stringify(rest), {\n    status: 200,\n    headers: {\n      'Content-Type': 'application/json',\n      ...(headers || {}),\n    },\n  })\n}\n"],"names":["payload","startSerializer","isNotFound","getResponseStatus","getEvent"],"mappings":"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"}

package/dist/cjs/server-functions-handler.d.cts

@@ -1,4 +1,3 @@
-export declare const dummy = 2;
 export declare const handleServerAction: ({ request }: {
     request: Request;
 }) => Promise<any>;

package/dist/cjs/ssr-server.cjs

@@ -57,7 +57,8 @@ function dehydrateRouter(router) {
   var _a, _b;
   const dehydratedRouter = {
     manifest: router.ssr.manifest,
-    dehydratedData: (_b = (_a = router.options).dehydrate) == null ? void 0 : _b.call(_a)
+    dehydratedData: (_b = (_a = router.options).dehydrate) == null ? void 0 : _b.call(_a),
+    lastMatchId: router.state.matches[router.state.matches.length - 1].id
   };
   router.serverSsr.injectScript(
     () => `__TSR_SSR__.dehydrated = ${jsesc(

package/dist/cjs/ssr-server.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"ssr-server.cjs","sources":["../../src/ssr-server.ts"],"sourcesContent":["import { default as warning } from 'tiny-warning'\nimport {\n  TSR_DEFERRED_PROMISE,\n  defer,\n  isPlainArray,\n  isPlainObject,\n  pick,\n} from '@tanstack/router-core'\nimport jsesc from 'jsesc'\nimport { startSerializer } from '@tanstack/start-client-core'\nimport minifiedTsrBootStrapScript from './tsrScript?script-string'\nimport type {\n  ClientExtractedBaseEntry,\n  DehydratedRouter,\n  ResolvePromiseState,\n  SsrMatch,\n} from '@tanstack/start-client-core'\nimport type {\n  AnyRouteMatch,\n  AnyRouter,\n  DeferredPromise,\n  Manifest,\n} from '@tanstack/router-core'\n\nexport type ServerExtractedEntry =\n  | ServerExtractedStream\n  | ServerExtractedPromise\n\nexport interface ServerExtractedBaseEntry extends ClientExtractedBaseEntry {\n  id: number\n  matchIndex: number\n}\n\nexport interface ServerExtractedStream extends ServerExtractedBaseEntry {\n  type: 'stream'\n  stream: ReadableStream\n}\n\nexport interface ServerExtractedPromise extends ServerExtractedBaseEntry {\n  type: 'promise'\n  promise: DeferredPromise<any>\n}\n\nexport function attachRouterServerSsrUtils(\n  router: AnyRouter,\n  manifest: Manifest | undefined,\n) {\n  router.ssr = {\n    manifest,\n    serializer: startSerializer,\n  }\n\n  router.serverSsr = {\n    injectedHtml: [],\n    streamedKeys: new Set(),\n    injectHtml: (getHtml) => {\n      const promise = Promise.resolve().then(getHtml)\n      router.serverSsr!.injectedHtml.push(promise)\n      router.emit({\n        type: 'onInjectedHtml',\n        promise,\n      })\n\n      return promise.then(() => {})\n    },\n    injectScript: (getScript, opts) => {\n      return router.serverSsr!.injectHtml(async () => {\n        const script = await getScript()\n        return `<script class='tsr-once'>${script}${\n          process.env.NODE_ENV === 'development' && (opts?.logScript ?? true)\n            ? `; console.info(\\`Injected From Server:\n${jsesc(script, { quotes: 'backtick' })}\\`)`\n            : ''\n        }; if (typeof __TSR_SSR__ !== 'undefined') __TSR_SSR__.cleanScripts()</script>`\n      })\n    },\n    streamValue: (key, value) => {\n      warning(\n        !router.serverSsr!.streamedKeys.has(key),\n        'Key has already been streamed: ' + key,\n      )\n\n      router.serverSsr!.streamedKeys.add(key)\n      router.serverSsr!.injectScript(\n        () =>\n          `__TSR_SSR__.streamedValues['${key}'] = { value: ${jsesc(\n            router.ssr!.serializer.stringify(value),\n            {\n              isScriptContext: true,\n              wrap: true,\n              json: true,\n            },\n          )}}`,\n      )\n    },\n    onMatchSettled,\n  }\n\n  router.serverSsr.injectScript(() => minifiedTsrBootStrapScript, {\n    logScript: false,\n  })\n}\n\nexport function dehydrateRouter(router: AnyRouter) {\n  const dehydratedRouter: DehydratedRouter = {\n    manifest: router.ssr!.manifest,\n    dehydratedData: router.options.dehydrate?.(),\n  }\n\n  router.serverSsr!.injectScript(\n    () =>\n      `__TSR_SSR__.dehydrated = ${jsesc(\n        router.ssr!.serializer.stringify(dehydratedRouter),\n        {\n          isScriptContext: true,\n          wrap: true,\n          json: true,\n        },\n      )}`,\n  )\n}\n\nexport function extractAsyncLoaderData(\n  loaderData: any,\n  ctx: {\n    match: AnyRouteMatch\n    router: AnyRouter\n  },\n) {\n  const extracted: Array<ServerExtractedEntry> = []\n\n  const replaced = replaceBy(loaderData, (value, path) => {\n    // If it's a stream, we need to tee it so we can read it multiple times\n    if (value instanceof ReadableStream) {\n      const [copy1, copy2] = value.tee()\n      const entry: ServerExtractedStream = {\n        type: 'stream',\n        path,\n        id: extracted.length,\n        matchIndex: ctx.match.index,\n        stream: copy2,\n      }\n\n      extracted.push(entry)\n      return copy1\n    } else if (value instanceof Promise) {\n      const deferredPromise = defer(value)\n      const entry: ServerExtractedPromise = {\n        type: 'promise',\n        path,\n        id: extracted.length,\n        matchIndex: ctx.match.index,\n        promise: deferredPromise,\n      }\n      extracted.push(entry)\n    }\n\n    return value\n  })\n\n  return { replaced, extracted }\n}\n\nexport function onMatchSettled(opts: {\n  router: AnyRouter\n  match: AnyRouteMatch\n}) {\n  const { router, match } = opts\n\n  let extracted: Array<ServerExtractedEntry> | undefined = undefined\n  let serializedLoaderData: any = undefined\n  if (match.loaderData !== undefined) {\n    const result = extractAsyncLoaderData(match.loaderData, {\n      router,\n      match,\n    })\n    match.loaderData = result.replaced\n    extracted = result.extracted\n    serializedLoaderData = extracted.reduce(\n      (acc: any, entry: ServerExtractedEntry) => {\n        return deepImmutableSetByPath(acc, ['temp', ...entry.path], undefined)\n      },\n      { temp: result.replaced },\n    ).temp\n  }\n\n  const initCode = `__TSR_SSR__.initMatch(${jsesc(\n    {\n      id: match.id,\n      __beforeLoadContext: router.ssr!.serializer.stringify(\n        match.__beforeLoadContext,\n      ),\n      loaderData: router.ssr!.serializer.stringify(serializedLoaderData),\n      error: router.ssr!.serializer.stringify(match.error),\n      extracted: extracted?.map((entry) => pick(entry, ['type', 'path'])),\n      updatedAt: match.updatedAt,\n      status: match.status,\n    } satisfies SsrMatch,\n    {\n      isScriptContext: true,\n      wrap: true,\n      json: true,\n    },\n  )})`\n\n  router.serverSsr!.injectScript(() => initCode)\n\n  if (extracted) {\n    extracted.forEach((entry) => {\n      if (entry.type === 'promise') return injectPromise(entry)\n      return injectStream(entry)\n    })\n  }\n\n  function injectPromise(entry: ServerExtractedPromise) {\n    router.serverSsr!.injectScript(async () => {\n      await entry.promise\n\n      return `__TSR_SSR__.resolvePromise(${jsesc(\n        {\n          matchId: match.id,\n          id: entry.id,\n          promiseState: entry.promise[TSR_DEFERRED_PROMISE],\n        } satisfies ResolvePromiseState,\n        {\n          isScriptContext: true,\n          wrap: true,\n          json: true,\n        },\n      )})`\n    })\n  }\n\n  function injectStream(entry: ServerExtractedStream) {\n    // Inject a promise that resolves when the stream is done\n    // We do this to keep the stream open until we're done\n    router.serverSsr!.injectHtml(async () => {\n      //\n      try {\n        const reader = entry.stream.getReader()\n        let chunk: ReadableStreamReadResult<any> | null = null\n        while (!(chunk = await reader.read()).done) {\n          if (chunk.value) {\n            const code = `__TSR_SSR__.injectChunk(${jsesc(\n              {\n                matchId: match.id,\n                id: entry.id,\n                chunk: chunk.value,\n              },\n              {\n                isScriptContext: true,\n                wrap: true,\n                json: true,\n              },\n            )})`\n\n            router.serverSsr!.injectScript(() => code)\n          }\n        }\n\n        router.serverSsr!.injectScript(\n          () =>\n            `__TSR_SSR__.closeStream(${jsesc(\n              {\n                matchId: match.id,\n                id: entry.id,\n              },\n              {\n                isScriptContext: true,\n                wrap: true,\n                json: true,\n              },\n            )})`,\n        )\n      } catch (err) {\n        console.error('stream read error', err)\n      }\n\n      return ''\n    })\n  }\n}\n\nfunction deepImmutableSetByPath<T>(obj: T, path: Array<string>, value: any): T {\n  // immutable set by path retaining array and object references\n  if (path.length === 0) {\n    return value\n  }\n\n  const [key, ...rest] = path\n\n  if (Array.isArray(obj)) {\n    return obj.map((item, i) => {\n      if (i === Number(key)) {\n        return deepImmutableSetByPath(item, rest, value)\n      }\n      return item\n    }) as T\n  }\n\n  if (isPlainObject(obj)) {\n    return {\n      ...obj,\n      [key!]: deepImmutableSetByPath((obj as any)[key!], rest, value),\n    }\n  }\n\n  return obj\n}\n\nexport function replaceBy<T>(\n  obj: T,\n  cb: (value: any, path: Array<string>) => any,\n  path: Array<string> = [],\n): T {\n  if (isPlainArray(obj)) {\n    return obj.map((value, i) => replaceBy(value, cb, [...path, `${i}`])) as any\n  }\n\n  if (isPlainObject(obj)) {\n    // Do not allow objects with illegal\n    const newObj: any = {}\n\n    for (const key in obj) {\n      newObj[key] = replaceBy(obj[key], cb, [...path, key])\n    }\n\n    return newObj\n  }\n\n  // // Detect classes, functions, and other non-serializable objects\n  // // and return undefined. Exclude some known types that are serializable\n  // if (\n  //   typeof obj === 'function' ||\n  //   (typeof obj === 'object' &&\n  //     ![Object, Promise, ReadableStream].includes((obj as any)?.constructor))\n  // ) {\n  //   console.info(obj)\n  //   warning(false, `Non-serializable value ☝️ found at ${path.join('.')}`)\n  //   return undefined as any\n  // }\n\n  const newObj = cb(obj, path)\n\n  if (newObj !== obj) {\n    return newObj\n  }\n\n  return obj\n}\n"],"names":["startSerializer","minifiedTsrBootStrapScript","defer","pick","TSR_DEFERRED_PROMISE","isPlainObject","isPlainArray","newObj"],"mappings":";;;;;;;AA2CgB,SAAA,2BACd,QACA,UACA;AACA,SAAO,MAAM;AAAA,IACX;AAAA,IACA,YAAYA,gBAAAA;AAAAA,EACd;AAEA,SAAO,YAAY;AAAA,IACjB,cAAc,CAAC;AAAA,IACf,kCAAkB,IAAI;AAAA,IACtB,YAAY,CAAC,YAAY;AACvB,YAAM,UAAU,QAAQ,QAAQ,EAAE,KAAK,OAAO;AACvC,aAAA,UAAW,aAAa,KAAK,OAAO;AAC3C,aAAO,KAAK;AAAA,QACV,MAAM;AAAA,QACN;AAAA,MAAA,CACD;AAEM,aAAA,QAAQ,KAAK,MAAM;AAAA,MAAA,CAAE;AAAA,IAC9B;AAAA,IACA,cAAc,CAAC,WAAW,SAAS;AAC1B,aAAA,OAAO,UAAW,WAAW,YAAY;AACxC,cAAA,SAAS,MAAM,UAAU;AACxB,eAAA,4BAA4B,MAAM,GACvC,QAAQ,IAAI,aAAa,mBAAkB,6BAAM,cAAa,QAC1D;AAAA,EACZ,MAAM,QAAQ,EAAE,QAAQ,WAAY,CAAA,CAAC,QACzB,EACN;AAAA,MAAA,CACD;AAAA,IACH;AAAA,IACA,aAAa,CAAC,KAAK,UAAU;AAC3B;AAAA,QACE,CAAC,OAAO,UAAW,aAAa,IAAI,GAAG;AAAA,QACvC,oCAAoC;AAAA,MACtC;AAEO,aAAA,UAAW,aAAa,IAAI,GAAG;AACtC,aAAO,UAAW;AAAA,QAChB,MACE,+BAA+B,GAAG,iBAAiB;AAAA,UACjD,OAAO,IAAK,WAAW,UAAU,KAAK;AAAA,UACtC;AAAA,YACE,iBAAiB;AAAA,YACjB,MAAM;AAAA,YACN,MAAM;AAAA,UAAA;AAAA,QACR,CACD;AAAA,MACL;AAAA,IACF;AAAA,IACA;AAAA,EACF;AAEO,SAAA,UAAU,aAAa,MAAMC,WAA4B;AAAA,IAC9D,WAAW;AAAA,EAAA,CACZ;AACH;AAEO,SAAS,gBAAgB,QAAmB;;AACjD,QAAM,mBAAqC;AAAA,IACzC,UAAU,OAAO,IAAK;AAAA,IACtB,iBAAgB,kBAAO,SAAQ,cAAf;AAAA,EAClB;AAEA,SAAO,UAAW;AAAA,IAChB,MACE,4BAA4B;AAAA,MAC1B,OAAO,IAAK,WAAW,UAAU,gBAAgB;AAAA,MACjD;AAAA,QACE,iBAAiB;AAAA,QACjB,MAAM;AAAA,QACN,MAAM;AAAA,MAAA;AAAA,IACR,CACD;AAAA,EACL;AACF;AAEgB,SAAA,uBACd,YACA,KAIA;AACA,QAAM,YAAyC,CAAC;AAEhD,QAAM,WAAW,UAAU,YAAY,CAAC,OAAO,SAAS;AAEtD,QAAI,iBAAiB,gBAAgB;AACnC,YAAM,CAAC,OAAO,KAAK,IAAI,MAAM,IAAI;AACjC,YAAM,QAA+B;AAAA,QACnC,MAAM;AAAA,QACN;AAAA,QACA,IAAI,UAAU;AAAA,QACd,YAAY,IAAI,MAAM;AAAA,QACtB,QAAQ;AAAA,MACV;AAEA,gBAAU,KAAK,KAAK;AACb,aAAA;AAAA,IAAA,WACE,iBAAiB,SAAS;AAC7B,YAAA,kBAAkBC,iBAAM,KAAK;AACnC,YAAM,QAAgC;AAAA,QACpC,MAAM;AAAA,QACN;AAAA,QACA,IAAI,UAAU;AAAA,QACd,YAAY,IAAI,MAAM;AAAA,QACtB,SAAS;AAAA,MACX;AACA,gBAAU,KAAK,KAAK;AAAA,IAAA;AAGf,WAAA;AAAA,EAAA,CACR;AAEM,SAAA,EAAE,UAAU,UAAU;AAC/B;AAEO,SAAS,eAAe,MAG5B;AACK,QAAA,EAAE,QAAQ,MAAA,IAAU;AAE1B,MAAI,YAAqD;AACzD,MAAI,uBAA4B;AAC5B,MAAA,MAAM,eAAe,QAAW;AAC5B,UAAA,SAAS,uBAAuB,MAAM,YAAY;AAAA,MAEtD;AAAA,IAAA,CACD;AACD,UAAM,aAAa,OAAO;AAC1B,gBAAY,OAAO;AACnB,2BAAuB,UAAU;AAAA,MAC/B,CAAC,KAAU,UAAgC;AAClC,eAAA,uBAAuB,KAAK,CAAC,QAAQ,GAAG,MAAM,IAAI,GAAG,MAAS;AAAA,MACvE;AAAA,MACA,EAAE,MAAM,OAAO,SAAS;AAAA,IAAA,EACxB;AAAA,EAAA;AAGJ,QAAM,WAAW,yBAAyB;AAAA,IACxC;AAAA,MACE,IAAI,MAAM;AAAA,MACV,qBAAqB,OAAO,IAAK,WAAW;AAAA,QAC1C,MAAM;AAAA,MACR;AAAA,MACA,YAAY,OAAO,IAAK,WAAW,UAAU,oBAAoB;AAAA,MACjE,OAAO,OAAO,IAAK,WAAW,UAAU,MAAM,KAAK;AAAA,MACnD,WAAW,uCAAW,IAAI,CAAC,UAAUC,gBAAK,OAAO,CAAC,QAAQ,MAAM,CAAC;AAAA,MACjE,WAAW,MAAM;AAAA,MACjB,QAAQ,MAAM;AAAA,IAChB;AAAA,IACA;AAAA,MACE,iBAAiB;AAAA,MACjB,MAAM;AAAA,MACN,MAAM;AAAA,IAAA;AAAA,EAET,CAAA;AAEM,SAAA,UAAW,aAAa,MAAM,QAAQ;AAE7C,MAAI,WAAW;AACH,cAAA,QAAQ,CAAC,UAAU;AAC3B,UAAI,MAAM,SAAS,UAAW,QAAO,cAAc,KAAK;AACxD,aAAO,aAAa,KAAK;AAAA,IAAA,CAC1B;AAAA,EAAA;AAGH,WAAS,cAAc,OAA+B;AAC7C,WAAA,UAAW,aAAa,YAAY;AACzC,YAAM,MAAM;AAEZ,aAAO,8BAA8B;AAAA,QACnC;AAAA,UACE,SAAS,MAAM;AAAA,UACf,IAAI,MAAM;AAAA,UACV,cAAc,MAAM,QAAQC,WAAoB,oBAAA;AAAA,QAClD;AAAA,QACA;AAAA,UACE,iBAAiB;AAAA,UACjB,MAAM;AAAA,UACN,MAAM;AAAA,QAAA;AAAA,MAET,CAAA;AAAA,IAAA,CACF;AAAA,EAAA;AAGH,WAAS,aAAa,OAA8B;AAG3C,WAAA,UAAW,WAAW,YAAY;AAEnC,UAAA;AACI,cAAA,SAAS,MAAM,OAAO,UAAU;AACtC,YAAI,QAA8C;AAClD,eAAO,EAAE,QAAQ,MAAM,OAAO,KAAA,GAAQ,MAAM;AAC1C,cAAI,MAAM,OAAO;AACf,kBAAM,OAAO,2BAA2B;AAAA,cACtC;AAAA,gBACE,SAAS,MAAM;AAAA,gBACf,IAAI,MAAM;AAAA,gBACV,OAAO,MAAM;AAAA,cACf;AAAA,cACA;AAAA,gBACE,iBAAiB;AAAA,gBACjB,MAAM;AAAA,gBACN,MAAM;AAAA,cAAA;AAAA,YAET,CAAA;AAEM,mBAAA,UAAW,aAAa,MAAM,IAAI;AAAA,UAAA;AAAA,QAC3C;AAGF,eAAO,UAAW;AAAA,UAChB,MACE,2BAA2B;AAAA,YACzB;AAAA,cACE,SAAS,MAAM;AAAA,cACf,IAAI,MAAM;AAAA,YACZ;AAAA,YACA;AAAA,cACE,iBAAiB;AAAA,cACjB,MAAM;AAAA,cACN,MAAM;AAAA,YAAA;AAAA,UACR,CACD;AAAA,QACL;AAAA,eACO,KAAK;AACJ,gBAAA,MAAM,qBAAqB,GAAG;AAAA,MAAA;AAGjC,aAAA;AAAA,IAAA,CACR;AAAA,EAAA;AAEL;AAEA,SAAS,uBAA0B,KAAQ,MAAqB,OAAe;AAEzE,MAAA,KAAK,WAAW,GAAG;AACd,WAAA;AAAA,EAAA;AAGT,QAAM,CAAC,KAAK,GAAG,IAAI,IAAI;AAEnB,MAAA,MAAM,QAAQ,GAAG,GAAG;AACtB,WAAO,IAAI,IAAI,CAAC,MAAM,MAAM;AACtB,UAAA,MAAM,OAAO,GAAG,GAAG;AACd,eAAA,uBAAuB,MAAM,MAAM,KAAK;AAAA,MAAA;AAE1C,aAAA;AAAA,IAAA,CACR;AAAA,EAAA;AAGC,MAAAC,WAAAA,cAAc,GAAG,GAAG;AACf,WAAA;AAAA,MACL,GAAG;AAAA,MACH,CAAC,GAAI,GAAG,uBAAwB,IAAY,GAAI,GAAG,MAAM,KAAK;AAAA,IAChE;AAAA,EAAA;AAGK,SAAA;AACT;AAEO,SAAS,UACd,KACA,IACA,OAAsB,CAAA,GACnB;AACC,MAAAC,WAAAA,aAAa,GAAG,GAAG;AACrB,WAAO,IAAI,IAAI,CAAC,OAAO,MAAM,UAAU,OAAO,IAAI,CAAC,GAAG,MAAM,GAAG,CAAC,EAAE,CAAC,CAAC;AAAA,EAAA;AAGlE,MAAAD,WAAAA,cAAc,GAAG,GAAG;AAEtB,UAAME,UAAc,CAAC;AAErB,eAAW,OAAO,KAAK;AACrBA,cAAO,GAAG,IAAI,UAAU,IAAI,GAAG,GAAG,IAAI,CAAC,GAAG,MAAM,GAAG,CAAC;AAAA,IAAA;AAG/CA,WAAAA;AAAAA,EAAA;AAeH,QAAA,SAAS,GAAG,KAAK,IAAI;AAE3B,MAAI,WAAW,KAAK;AACX,WAAA;AAAA,EAAA;AAGF,SAAA;AACT;;;;;;"}
+{"version":3,"file":"ssr-server.cjs","sources":["../../src/ssr-server.ts"],"sourcesContent":["import { default as warning } from 'tiny-warning'\nimport {\n  TSR_DEFERRED_PROMISE,\n  defer,\n  isPlainArray,\n  isPlainObject,\n  pick,\n} from '@tanstack/router-core'\nimport jsesc from 'jsesc'\nimport { startSerializer } from '@tanstack/start-client-core'\nimport minifiedTsrBootStrapScript from './tsrScript?script-string'\nimport type {\n  ClientExtractedBaseEntry,\n  DehydratedRouter,\n  ResolvePromiseState,\n  SsrMatch,\n} from '@tanstack/start-client-core'\nimport type {\n  AnyRouteMatch,\n  AnyRouter,\n  DeferredPromise,\n  Manifest,\n} from '@tanstack/router-core'\n\nexport type ServerExtractedEntry =\n  | ServerExtractedStream\n  | ServerExtractedPromise\n\nexport interface ServerExtractedBaseEntry extends ClientExtractedBaseEntry {\n  id: number\n  matchIndex: number\n}\n\nexport interface ServerExtractedStream extends ServerExtractedBaseEntry {\n  type: 'stream'\n  stream: ReadableStream\n}\n\nexport interface ServerExtractedPromise extends ServerExtractedBaseEntry {\n  type: 'promise'\n  promise: DeferredPromise<any>\n}\n\nexport function attachRouterServerSsrUtils(\n  router: AnyRouter,\n  manifest: Manifest | undefined,\n) {\n  router.ssr = {\n    manifest,\n    serializer: startSerializer,\n  }\n\n  router.serverSsr = {\n    injectedHtml: [],\n    streamedKeys: new Set(),\n    injectHtml: (getHtml) => {\n      const promise = Promise.resolve().then(getHtml)\n      router.serverSsr!.injectedHtml.push(promise)\n      router.emit({\n        type: 'onInjectedHtml',\n        promise,\n      })\n\n      return promise.then(() => {})\n    },\n    injectScript: (getScript, opts) => {\n      return router.serverSsr!.injectHtml(async () => {\n        const script = await getScript()\n        return `<script class='tsr-once'>${script}${\n          process.env.NODE_ENV === 'development' && (opts?.logScript ?? true)\n            ? `; console.info(\\`Injected From Server:\n${jsesc(script, { quotes: 'backtick' })}\\`)`\n            : ''\n        }; if (typeof __TSR_SSR__ !== 'undefined') __TSR_SSR__.cleanScripts()</script>`\n      })\n    },\n    streamValue: (key, value) => {\n      warning(\n        !router.serverSsr!.streamedKeys.has(key),\n        'Key has already been streamed: ' + key,\n      )\n\n      router.serverSsr!.streamedKeys.add(key)\n      router.serverSsr!.injectScript(\n        () =>\n          `__TSR_SSR__.streamedValues['${key}'] = { value: ${jsesc(\n            router.ssr!.serializer.stringify(value),\n            {\n              isScriptContext: true,\n              wrap: true,\n              json: true,\n            },\n          )}}`,\n      )\n    },\n    onMatchSettled,\n  }\n\n  router.serverSsr.injectScript(() => minifiedTsrBootStrapScript, {\n    logScript: false,\n  })\n}\n\nexport function dehydrateRouter(router: AnyRouter) {\n  const dehydratedRouter: DehydratedRouter = {\n    manifest: router.ssr!.manifest,\n    dehydratedData: router.options.dehydrate?.(),\n    lastMatchId: router.state.matches[router.state.matches.length - 1]!.id,\n  }\n\n  router.serverSsr!.injectScript(\n    () =>\n      `__TSR_SSR__.dehydrated = ${jsesc(\n        router.ssr!.serializer.stringify(dehydratedRouter),\n        {\n          isScriptContext: true,\n          wrap: true,\n          json: true,\n        },\n      )}`,\n  )\n}\n\nexport function extractAsyncLoaderData(\n  loaderData: any,\n  ctx: {\n    match: AnyRouteMatch\n    router: AnyRouter\n  },\n) {\n  const extracted: Array<ServerExtractedEntry> = []\n\n  const replaced = replaceBy(loaderData, (value, path) => {\n    // If it's a stream, we need to tee it so we can read it multiple times\n    if (value instanceof ReadableStream) {\n      const [copy1, copy2] = value.tee()\n      const entry: ServerExtractedStream = {\n        type: 'stream',\n        path,\n        id: extracted.length,\n        matchIndex: ctx.match.index,\n        stream: copy2,\n      }\n\n      extracted.push(entry)\n      return copy1\n    } else if (value instanceof Promise) {\n      const deferredPromise = defer(value)\n      const entry: ServerExtractedPromise = {\n        type: 'promise',\n        path,\n        id: extracted.length,\n        matchIndex: ctx.match.index,\n        promise: deferredPromise,\n      }\n      extracted.push(entry)\n    }\n\n    return value\n  })\n\n  return { replaced, extracted }\n}\n\nexport function onMatchSettled(opts: {\n  router: AnyRouter\n  match: AnyRouteMatch\n}) {\n  const { router, match } = opts\n\n  let extracted: Array<ServerExtractedEntry> | undefined = undefined\n  let serializedLoaderData: any = undefined\n  if (match.loaderData !== undefined) {\n    const result = extractAsyncLoaderData(match.loaderData, {\n      router,\n      match,\n    })\n    match.loaderData = result.replaced\n    extracted = result.extracted\n    serializedLoaderData = extracted.reduce(\n      (acc: any, entry: ServerExtractedEntry) => {\n        return deepImmutableSetByPath(acc, ['temp', ...entry.path], undefined)\n      },\n      { temp: result.replaced },\n    ).temp\n  }\n\n  const initCode = `__TSR_SSR__.initMatch(${jsesc(\n    {\n      id: match.id,\n      __beforeLoadContext: router.ssr!.serializer.stringify(\n        match.__beforeLoadContext,\n      ),\n      loaderData: router.ssr!.serializer.stringify(serializedLoaderData),\n      error: router.ssr!.serializer.stringify(match.error),\n      extracted: extracted?.map((entry) => pick(entry, ['type', 'path'])),\n      updatedAt: match.updatedAt,\n      status: match.status,\n    } satisfies SsrMatch,\n    {\n      isScriptContext: true,\n      wrap: true,\n      json: true,\n    },\n  )})`\n\n  router.serverSsr!.injectScript(() => initCode)\n\n  if (extracted) {\n    extracted.forEach((entry) => {\n      if (entry.type === 'promise') return injectPromise(entry)\n      return injectStream(entry)\n    })\n  }\n\n  function injectPromise(entry: ServerExtractedPromise) {\n    router.serverSsr!.injectScript(async () => {\n      await entry.promise\n\n      return `__TSR_SSR__.resolvePromise(${jsesc(\n        {\n          matchId: match.id,\n          id: entry.id,\n          promiseState: entry.promise[TSR_DEFERRED_PROMISE],\n        } satisfies ResolvePromiseState,\n        {\n          isScriptContext: true,\n          wrap: true,\n          json: true,\n        },\n      )})`\n    })\n  }\n\n  function injectStream(entry: ServerExtractedStream) {\n    // Inject a promise that resolves when the stream is done\n    // We do this to keep the stream open until we're done\n    router.serverSsr!.injectHtml(async () => {\n      //\n      try {\n        const reader = entry.stream.getReader()\n        let chunk: ReadableStreamReadResult<any> | null = null\n        while (!(chunk = await reader.read()).done) {\n          if (chunk.value) {\n            const code = `__TSR_SSR__.injectChunk(${jsesc(\n              {\n                matchId: match.id,\n                id: entry.id,\n                chunk: chunk.value,\n              },\n              {\n                isScriptContext: true,\n                wrap: true,\n                json: true,\n              },\n            )})`\n\n            router.serverSsr!.injectScript(() => code)\n          }\n        }\n\n        router.serverSsr!.injectScript(\n          () =>\n            `__TSR_SSR__.closeStream(${jsesc(\n              {\n                matchId: match.id,\n                id: entry.id,\n              },\n              {\n                isScriptContext: true,\n                wrap: true,\n                json: true,\n              },\n            )})`,\n        )\n      } catch (err) {\n        console.error('stream read error', err)\n      }\n\n      return ''\n    })\n  }\n}\n\nfunction deepImmutableSetByPath<T>(obj: T, path: Array<string>, value: any): T {\n  // immutable set by path retaining array and object references\n  if (path.length === 0) {\n    return value\n  }\n\n  const [key, ...rest] = path\n\n  if (Array.isArray(obj)) {\n    return obj.map((item, i) => {\n      if (i === Number(key)) {\n        return deepImmutableSetByPath(item, rest, value)\n      }\n      return item\n    }) as T\n  }\n\n  if (isPlainObject(obj)) {\n    return {\n      ...obj,\n      [key!]: deepImmutableSetByPath((obj as any)[key!], rest, value),\n    }\n  }\n\n  return obj\n}\n\nexport function replaceBy<T>(\n  obj: T,\n  cb: (value: any, path: Array<string>) => any,\n  path: Array<string> = [],\n): T {\n  if (isPlainArray(obj)) {\n    return obj.map((value, i) => replaceBy(value, cb, [...path, `${i}`])) as any\n  }\n\n  if (isPlainObject(obj)) {\n    // Do not allow objects with illegal\n    const newObj: any = {}\n\n    for (const key in obj) {\n      newObj[key] = replaceBy(obj[key], cb, [...path, key])\n    }\n\n    return newObj\n  }\n\n  // // Detect classes, functions, and other non-serializable objects\n  // // and return undefined. Exclude some known types that are serializable\n  // if (\n  //   typeof obj === 'function' ||\n  //   (typeof obj === 'object' &&\n  //     ![Object, Promise, ReadableStream].includes((obj as any)?.constructor))\n  // ) {\n  //   console.info(obj)\n  //   warning(false, `Non-serializable value ☝️ found at ${path.join('.')}`)\n  //   return undefined as any\n  // }\n\n  const newObj = cb(obj, path)\n\n  if (newObj !== obj) {\n    return newObj\n  }\n\n  return obj\n}\n"],"names":["startSerializer","minifiedTsrBootStrapScript","defer","pick","TSR_DEFERRED_PROMISE","isPlainObject","isPlainArray","newObj"],"mappings":";;;;;;;AA2CgB,SAAA,2BACd,QACA,UACA;AACA,SAAO,MAAM;AAAA,IACX;AAAA,IACA,YAAYA,gBAAAA;AAAAA,EACd;AAEA,SAAO,YAAY;AAAA,IACjB,cAAc,CAAC;AAAA,IACf,kCAAkB,IAAI;AAAA,IACtB,YAAY,CAAC,YAAY;AACvB,YAAM,UAAU,QAAQ,QAAQ,EAAE,KAAK,OAAO;AACvC,aAAA,UAAW,aAAa,KAAK,OAAO;AAC3C,aAAO,KAAK;AAAA,QACV,MAAM;AAAA,QACN;AAAA,MAAA,CACD;AAEM,aAAA,QAAQ,KAAK,MAAM;AAAA,MAAA,CAAE;AAAA,IAC9B;AAAA,IACA,cAAc,CAAC,WAAW,SAAS;AAC1B,aAAA,OAAO,UAAW,WAAW,YAAY;AACxC,cAAA,SAAS,MAAM,UAAU;AACxB,eAAA,4BAA4B,MAAM,GACvC,QAAQ,IAAI,aAAa,mBAAkB,6BAAM,cAAa,QAC1D;AAAA,EACZ,MAAM,QAAQ,EAAE,QAAQ,WAAY,CAAA,CAAC,QACzB,EACN;AAAA,MAAA,CACD;AAAA,IACH;AAAA,IACA,aAAa,CAAC,KAAK,UAAU;AAC3B;AAAA,QACE,CAAC,OAAO,UAAW,aAAa,IAAI,GAAG;AAAA,QACvC,oCAAoC;AAAA,MACtC;AAEO,aAAA,UAAW,aAAa,IAAI,GAAG;AACtC,aAAO,UAAW;AAAA,QAChB,MACE,+BAA+B,GAAG,iBAAiB;AAAA,UACjD,OAAO,IAAK,WAAW,UAAU,KAAK;AAAA,UACtC;AAAA,YACE,iBAAiB;AAAA,YACjB,MAAM;AAAA,YACN,MAAM;AAAA,UAAA;AAAA,QACR,CACD;AAAA,MACL;AAAA,IACF;AAAA,IACA;AAAA,EACF;AAEO,SAAA,UAAU,aAAa,MAAMC,WAA4B;AAAA,IAC9D,WAAW;AAAA,EAAA,CACZ;AACH;AAEO,SAAS,gBAAgB,QAAmB;;AACjD,QAAM,mBAAqC;AAAA,IACzC,UAAU,OAAO,IAAK;AAAA,IACtB,iBAAgB,kBAAO,SAAQ,cAAf;AAAA,IAChB,aAAa,OAAO,MAAM,QAAQ,OAAO,MAAM,QAAQ,SAAS,CAAC,EAAG;AAAA,EACtE;AAEA,SAAO,UAAW;AAAA,IAChB,MACE,4BAA4B;AAAA,MAC1B,OAAO,IAAK,WAAW,UAAU,gBAAgB;AAAA,MACjD;AAAA,QACE,iBAAiB;AAAA,QACjB,MAAM;AAAA,QACN,MAAM;AAAA,MAAA;AAAA,IACR,CACD;AAAA,EACL;AACF;AAEgB,SAAA,uBACd,YACA,KAIA;AACA,QAAM,YAAyC,CAAC;AAEhD,QAAM,WAAW,UAAU,YAAY,CAAC,OAAO,SAAS;AAEtD,QAAI,iBAAiB,gBAAgB;AACnC,YAAM,CAAC,OAAO,KAAK,IAAI,MAAM,IAAI;AACjC,YAAM,QAA+B;AAAA,QACnC,MAAM;AAAA,QACN;AAAA,QACA,IAAI,UAAU;AAAA,QACd,YAAY,IAAI,MAAM;AAAA,QACtB,QAAQ;AAAA,MACV;AAEA,gBAAU,KAAK,KAAK;AACb,aAAA;AAAA,IAAA,WACE,iBAAiB,SAAS;AAC7B,YAAA,kBAAkBC,iBAAM,KAAK;AACnC,YAAM,QAAgC;AAAA,QACpC,MAAM;AAAA,QACN;AAAA,QACA,IAAI,UAAU;AAAA,QACd,YAAY,IAAI,MAAM;AAAA,QACtB,SAAS;AAAA,MACX;AACA,gBAAU,KAAK,KAAK;AAAA,IAAA;AAGf,WAAA;AAAA,EAAA,CACR;AAEM,SAAA,EAAE,UAAU,UAAU;AAC/B;AAEO,SAAS,eAAe,MAG5B;AACK,QAAA,EAAE,QAAQ,MAAA,IAAU;AAE1B,MAAI,YAAqD;AACzD,MAAI,uBAA4B;AAC5B,MAAA,MAAM,eAAe,QAAW;AAC5B,UAAA,SAAS,uBAAuB,MAAM,YAAY;AAAA,MAEtD;AAAA,IAAA,CACD;AACD,UAAM,aAAa,OAAO;AAC1B,gBAAY,OAAO;AACnB,2BAAuB,UAAU;AAAA,MAC/B,CAAC,KAAU,UAAgC;AAClC,eAAA,uBAAuB,KAAK,CAAC,QAAQ,GAAG,MAAM,IAAI,GAAG,MAAS;AAAA,MACvE;AAAA,MACA,EAAE,MAAM,OAAO,SAAS;AAAA,IAAA,EACxB;AAAA,EAAA;AAGJ,QAAM,WAAW,yBAAyB;AAAA,IACxC;AAAA,MACE,IAAI,MAAM;AAAA,MACV,qBAAqB,OAAO,IAAK,WAAW;AAAA,QAC1C,MAAM;AAAA,MACR;AAAA,MACA,YAAY,OAAO,IAAK,WAAW,UAAU,oBAAoB;AAAA,MACjE,OAAO,OAAO,IAAK,WAAW,UAAU,MAAM,KAAK;AAAA,MACnD,WAAW,uCAAW,IAAI,CAAC,UAAUC,gBAAK,OAAO,CAAC,QAAQ,MAAM,CAAC;AAAA,MACjE,WAAW,MAAM;AAAA,MACjB,QAAQ,MAAM;AAAA,IAChB;AAAA,IACA;AAAA,MACE,iBAAiB;AAAA,MACjB,MAAM;AAAA,MACN,MAAM;AAAA,IAAA;AAAA,EAET,CAAA;AAEM,SAAA,UAAW,aAAa,MAAM,QAAQ;AAE7C,MAAI,WAAW;AACH,cAAA,QAAQ,CAAC,UAAU;AAC3B,UAAI,MAAM,SAAS,UAAW,QAAO,cAAc,KAAK;AACxD,aAAO,aAAa,KAAK;AAAA,IAAA,CAC1B;AAAA,EAAA;AAGH,WAAS,cAAc,OAA+B;AAC7C,WAAA,UAAW,aAAa,YAAY;AACzC,YAAM,MAAM;AAEZ,aAAO,8BAA8B;AAAA,QACnC;AAAA,UACE,SAAS,MAAM;AAAA,UACf,IAAI,MAAM;AAAA,UACV,cAAc,MAAM,QAAQC,WAAoB,oBAAA;AAAA,QAClD;AAAA,QACA;AAAA,UACE,iBAAiB;AAAA,UACjB,MAAM;AAAA,UACN,MAAM;AAAA,QAAA;AAAA,MAET,CAAA;AAAA,IAAA,CACF;AAAA,EAAA;AAGH,WAAS,aAAa,OAA8B;AAG3C,WAAA,UAAW,WAAW,YAAY;AAEnC,UAAA;AACI,cAAA,SAAS,MAAM,OAAO,UAAU;AACtC,YAAI,QAA8C;AAClD,eAAO,EAAE,QAAQ,MAAM,OAAO,KAAA,GAAQ,MAAM;AAC1C,cAAI,MAAM,OAAO;AACf,kBAAM,OAAO,2BAA2B;AAAA,cACtC;AAAA,gBACE,SAAS,MAAM;AAAA,gBACf,IAAI,MAAM;AAAA,gBACV,OAAO,MAAM;AAAA,cACf;AAAA,cACA;AAAA,gBACE,iBAAiB;AAAA,gBACjB,MAAM;AAAA,gBACN,MAAM;AAAA,cAAA;AAAA,YAET,CAAA;AAEM,mBAAA,UAAW,aAAa,MAAM,IAAI;AAAA,UAAA;AAAA,QAC3C;AAGF,eAAO,UAAW;AAAA,UAChB,MACE,2BAA2B;AAAA,YACzB;AAAA,cACE,SAAS,MAAM;AAAA,cACf,IAAI,MAAM;AAAA,YACZ;AAAA,YACA;AAAA,cACE,iBAAiB;AAAA,cACjB,MAAM;AAAA,cACN,MAAM;AAAA,YAAA;AAAA,UACR,CACD;AAAA,QACL;AAAA,eACO,KAAK;AACJ,gBAAA,MAAM,qBAAqB,GAAG;AAAA,MAAA;AAGjC,aAAA;AAAA,IAAA,CACR;AAAA,EAAA;AAEL;AAEA,SAAS,uBAA0B,KAAQ,MAAqB,OAAe;AAEzE,MAAA,KAAK,WAAW,GAAG;AACd,WAAA;AAAA,EAAA;AAGT,QAAM,CAAC,KAAK,GAAG,IAAI,IAAI;AAEnB,MAAA,MAAM,QAAQ,GAAG,GAAG;AACtB,WAAO,IAAI,IAAI,CAAC,MAAM,MAAM;AACtB,UAAA,MAAM,OAAO,GAAG,GAAG;AACd,eAAA,uBAAuB,MAAM,MAAM,KAAK;AAAA,MAAA;AAE1C,aAAA;AAAA,IAAA,CACR;AAAA,EAAA;AAGC,MAAAC,WAAAA,cAAc,GAAG,GAAG;AACf,WAAA;AAAA,MACL,GAAG;AAAA,MACH,CAAC,GAAI,GAAG,uBAAwB,IAAY,GAAI,GAAG,MAAM,KAAK;AAAA,IAChE;AAAA,EAAA;AAGK,SAAA;AACT;AAEO,SAAS,UACd,KACA,IACA,OAAsB,CAAA,GACnB;AACC,MAAAC,WAAAA,aAAa,GAAG,GAAG;AACrB,WAAO,IAAI,IAAI,CAAC,OAAO,MAAM,UAAU,OAAO,IAAI,CAAC,GAAG,MAAM,GAAG,CAAC,EAAE,CAAC,CAAC;AAAA,EAAA;AAGlE,MAAAD,WAAAA,cAAc,GAAG,GAAG;AAEtB,UAAME,UAAc,CAAC;AAErB,eAAW,OAAO,KAAK;AACrBA,cAAO,GAAG,IAAI,UAAU,IAAI,GAAG,GAAG,IAAI,CAAC,GAAG,MAAM,GAAG,CAAC;AAAA,IAAA;AAG/CA,WAAAA;AAAAA,EAAA;AAeH,QAAA,SAAS,GAAG,KAAK,IAAI;AAE3B,MAAI,WAAW,KAAK;AACX,WAAA;AAAA,EAAA;AAGF,SAAA;AACT;;;;;;"}

package/dist/esm/server-functions-handler.d.ts

@@ -1,4 +1,3 @@
-export declare const dummy = 2;
 export declare const handleServerAction: ({ request }: {
     request: Request;
 }) => Promise<any>;

package/dist/esm/server-functions-handler.js

@@ -35,16 +35,7 @@ const handleServerAction = async ({ request }) => {
     console.info("serverFnManifest", serverFnManifest);
     throw new Error("Server function info not found for " + serverFnId);
   }
-  let fnModule;
-  if (process.env.NODE_ENV === "development") {
-    const serverEnv = globalThis.viteDevServer.environments["server"];
-    if (!serverEnv) {
-      throw new Error(`'server' vite dev environment not found`);
-    }
-    fnModule = await serverEnv.runner.import(serverFnInfo.extractedFilename);
-  } else {
-    fnModule = await serverFnInfo.importer();
-  }
+  const fnModule = await serverFnInfo.importer();
   if (!fnModule) {
     console.info("serverFnInfo", serverFnInfo);
     throw new Error("Server function module not resolved for " + serverFnId);

package/dist/esm/server-functions-handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"server-functions-handler.js","sources":["../../src/server-functions-handler.ts"],"sourcesContent":["import { isNotFound } from '@tanstack/router-core'\nimport invariant from 'tiny-invariant'\nimport { startSerializer } from '@tanstack/start-client-core'\n// @ts-expect-error\nimport _serverFnManifest from 'tanstack:server-fn-manifest'\nimport { getEvent, getResponseStatus } from './h3'\n\n// NOTE: This is a dummy export to silence warnings about\n// only having a default export.\nexport const dummy = 2\n\nconst serverFnManifest = _serverFnManifest as Record<\n  string,\n  {\n    functionName: string\n    extractedFilename: string\n    importer: () => Promise<any>\n  }\n>\n\nfunction sanitizeBase(base: string | undefined) {\n  if (!base) {\n    throw new Error(\n      '🚨 process.env.TSS_SERVER_FN_BASE is required in start/server-handler/index',\n    )\n  }\n\n  return base.replace(/^\\/|\\/$/g, '')\n}\n\nexport const handleServerAction = async ({ request }: { request: Request }) => {\n  const controller = new AbortController()\n  const signal = controller.signal\n  const abort = () => controller.abort()\n  request.signal.addEventListener('abort', abort)\n\n  const method = request.method\n  const url = new URL(request.url, 'http://localhost:3000')\n  // extract the serverFnId from the url as host/_server/:serverFnId\n  // Define a regex to match the path and extract the :thing part\n  const regex = new RegExp(\n    `${sanitizeBase(process.env.TSS_SERVER_FN_BASE)}/([^/?#]+)`,\n  )\n\n  // Execute the regex\n  const match = url.pathname.match(regex)\n  const serverFnId = match ? match[1] : null\n  const search = Object.fromEntries(url.searchParams.entries()) as {\n    payload?: any\n    createServerFn?: boolean\n  }\n\n  const isCreateServerFn = 'createServerFn' in search\n  const isRaw = 'raw' in search\n\n  if (typeof serverFnId !== 'string') {\n    throw new Error('Invalid server action param for serverFnId: ' + serverFnId)\n  }\n\n  const serverFnInfo = serverFnManifest[serverFnId]\n\n  if (!serverFnInfo) {\n    console.info('serverFnManifest', serverFnManifest)\n    throw new Error('Server function info not found for ' + serverFnId)\n  }\n\n  let fnModule: undefined | { [key: string]: any }\n\n  if (process.env.NODE_ENV === 'development') {\n    const serverEnv = (globalThis as any).viteDevServer.environments['server']\n    if (!serverEnv) {\n      throw new Error(`'server' vite dev environment not found`)\n    }\n    fnModule = await serverEnv.runner.import(serverFnInfo.extractedFilename)\n  } else {\n    fnModule = await serverFnInfo.importer()\n  }\n\n  if (!fnModule) {\n    console.info('serverFnInfo', serverFnInfo)\n    throw new Error('Server function module not resolved for ' + serverFnId)\n  }\n\n  const action = fnModule[serverFnInfo.functionName]\n\n  if (!action) {\n    console.info('serverFnInfo', serverFnInfo)\n    console.info('fnModule', fnModule)\n    throw new Error(\n      `Server function module export not resolved for serverFn ID: ${serverFnId}`,\n    )\n  }\n\n  // Known FormData 'Content-Type' header values\n  const formDataContentTypes = [\n    'multipart/form-data',\n    'application/x-www-form-urlencoded',\n  ]\n\n  const response = await (async () => {\n    try {\n      let result = await (async () => {\n        // FormData\n        if (\n          request.headers.get('Content-Type') &&\n          formDataContentTypes.some((type) =>\n            request.headers.get('Content-Type')?.includes(type),\n          )\n        ) {\n          // We don't support GET requests with FormData payloads... that seems impossible\n          invariant(\n            method.toLowerCase() !== 'get',\n            'GET requests with FormData payloads are not supported',\n          )\n\n          return await action(await request.formData(), signal)\n        }\n\n        // Get requests use the query string\n        if (method.toLowerCase() === 'get') {\n          // By default the payload is the search params\n          let payload: any = search\n\n          // If this GET request was created by createServerFn,\n          // then the payload will be on the payload param\n          if (isCreateServerFn) {\n            payload = search.payload\n          }\n\n          // If there's a payload, we should try to parse it\n          payload = payload ? startSerializer.parse(payload) : payload\n\n          // Send it through!\n          return await action(payload, signal)\n        }\n\n        // This must be a POST request, likely JSON???\n        const jsonPayloadAsString = await request.text()\n\n        // We should probably try to deserialize the payload\n        // as JSON, but we'll just pass it through for now.\n        const payload = startSerializer.parse(jsonPayloadAsString)\n\n        // If this POST request was created by createServerFn,\n        // it's payload will be the only argument\n        if (isCreateServerFn) {\n          return await action(payload, signal)\n        }\n\n        // Otherwise, we'll spread the payload. Need to\n        // support `use server` functions that take multiple\n        // arguments.\n        return await action(...(payload as any), signal)\n      })()\n\n      // Any time we get a Response back, we should just\n      // return it immediately.\n      if (result.result instanceof Response) {\n        return result.result\n      }\n\n      // If this is a non createServerFn request, we need to\n      // pull out the result from the result object\n      if (!isCreateServerFn) {\n        result = result.result\n\n        // The result might again be a response,\n        // and if it is, return it.\n        if (result instanceof Response) {\n          return result\n        }\n      }\n\n      // if (!search.createServerFn) {\n      //   result = result.result\n      // }\n\n      // else if (\n      //   isPlainObject(result) &&\n      //   'result' in result &&\n      //   result.result instanceof Response\n      // ) {\n      //   return result.result\n      // }\n\n      // TODO: RSCs Where are we getting this package?\n      // if (isValidElement(result)) {\n      //   const { renderToPipeableStream } = await import(\n      //     // @ts-expect-error\n      //     'react-server-dom/server'\n      //   )\n\n      //   const pipeableStream = renderToPipeableStream(result)\n\n      //   setHeaders(event, {\n      //     'Content-Type': 'text/x-component',\n      //   } as any)\n\n      //   sendStream(event, response)\n      //   event._handled = true\n\n      //   return new Response(null, { status: 200 })\n      // }\n\n      if (isNotFound(result)) {\n        return isNotFoundResponse(result)\n      }\n\n      return new Response(\n        result !== undefined ? startSerializer.stringify(result) : undefined,\n        {\n          status: getResponseStatus(getEvent()),\n          headers: {\n            'Content-Type': 'application/json',\n          },\n        },\n      )\n    } catch (error: any) {\n      if (error instanceof Response) {\n        return error\n      }\n      // else if (\n      //   isPlainObject(error) &&\n      //   'result' in error &&\n      //   error.result instanceof Response\n      // ) {\n      //   return error.result\n      // }\n\n      // Currently this server-side context has no idea how to\n      // build final URLs, so we need to defer that to the client.\n      // The client will check for __redirect and __notFound keys,\n      // and if they exist, it will handle them appropriately.\n\n      if (isNotFound(error)) {\n        return isNotFoundResponse(error)\n      }\n\n      console.info()\n      console.info('Server Fn Error!')\n      console.info()\n      console.error(error)\n      console.info()\n\n      return new Response(startSerializer.stringify(error), {\n        status: 500,\n        headers: {\n          'Content-Type': 'application/json',\n        },\n      })\n    }\n  })()\n\n  request.signal.removeEventListener('abort', abort)\n\n  if (isRaw) {\n    return response\n  }\n\n  return response\n}\n\nfunction isNotFoundResponse(error: any) {\n  const { headers, ...rest } = error\n\n  return new Response(JSON.stringify(rest), {\n    status: 200,\n    headers: {\n      'Content-Type': 'application/json',\n      ...(headers || {}),\n    },\n  })\n}\n"],"names":["payload"],"mappings":"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"}
+{"version":3,"file":"server-functions-handler.js","sources":["../../src/server-functions-handler.ts"],"sourcesContent":["import { isNotFound } from '@tanstack/router-core'\nimport invariant from 'tiny-invariant'\nimport { startSerializer } from '@tanstack/start-client-core'\n// @ts-expect-error\nimport _serverFnManifest from 'tanstack:server-fn-manifest'\nimport { getEvent, getResponseStatus } from './h3'\n\nconst serverFnManifest = _serverFnManifest as Record<\n  string,\n  {\n    functionName: string\n    extractedFilename: string\n    importer: () => Promise<any>\n  }\n>\n\nfunction sanitizeBase(base: string | undefined) {\n  if (!base) {\n    throw new Error(\n      '🚨 process.env.TSS_SERVER_FN_BASE is required in start/server-handler/index',\n    )\n  }\n\n  return base.replace(/^\\/|\\/$/g, '')\n}\n\nexport const handleServerAction = async ({ request }: { request: Request }) => {\n  const controller = new AbortController()\n  const signal = controller.signal\n  const abort = () => controller.abort()\n  request.signal.addEventListener('abort', abort)\n\n  const method = request.method\n  const url = new URL(request.url, 'http://localhost:3000')\n  // extract the serverFnId from the url as host/_server/:serverFnId\n  // Define a regex to match the path and extract the :thing part\n  const regex = new RegExp(\n    `${sanitizeBase(process.env.TSS_SERVER_FN_BASE)}/([^/?#]+)`,\n  )\n\n  // Execute the regex\n  const match = url.pathname.match(regex)\n  const serverFnId = match ? match[1] : null\n  const search = Object.fromEntries(url.searchParams.entries()) as {\n    payload?: any\n    createServerFn?: boolean\n  }\n\n  const isCreateServerFn = 'createServerFn' in search\n  const isRaw = 'raw' in search\n\n  if (typeof serverFnId !== 'string') {\n    throw new Error('Invalid server action param for serverFnId: ' + serverFnId)\n  }\n\n  const serverFnInfo = serverFnManifest[serverFnId]\n\n  if (!serverFnInfo) {\n    console.info('serverFnManifest', serverFnManifest)\n    throw new Error('Server function info not found for ' + serverFnId)\n  }\n\n  const fnModule: undefined | { [key: string]: any } =\n    await serverFnInfo.importer()\n\n  if (!fnModule) {\n    console.info('serverFnInfo', serverFnInfo)\n    throw new Error('Server function module not resolved for ' + serverFnId)\n  }\n\n  const action = fnModule[serverFnInfo.functionName]\n\n  if (!action) {\n    console.info('serverFnInfo', serverFnInfo)\n    console.info('fnModule', fnModule)\n    throw new Error(\n      `Server function module export not resolved for serverFn ID: ${serverFnId}`,\n    )\n  }\n\n  // Known FormData 'Content-Type' header values\n  const formDataContentTypes = [\n    'multipart/form-data',\n    'application/x-www-form-urlencoded',\n  ]\n\n  const response = await (async () => {\n    try {\n      let result = await (async () => {\n        // FormData\n        if (\n          request.headers.get('Content-Type') &&\n          formDataContentTypes.some((type) =>\n            request.headers.get('Content-Type')?.includes(type),\n          )\n        ) {\n          // We don't support GET requests with FormData payloads... that seems impossible\n          invariant(\n            method.toLowerCase() !== 'get',\n            'GET requests with FormData payloads are not supported',\n          )\n\n          return await action(await request.formData(), signal)\n        }\n\n        // Get requests use the query string\n        if (method.toLowerCase() === 'get') {\n          // By default the payload is the search params\n          let payload: any = search\n\n          // If this GET request was created by createServerFn,\n          // then the payload will be on the payload param\n          if (isCreateServerFn) {\n            payload = search.payload\n          }\n\n          // If there's a payload, we should try to parse it\n          payload = payload ? startSerializer.parse(payload) : payload\n\n          // Send it through!\n          return await action(payload, signal)\n        }\n\n        // This must be a POST request, likely JSON???\n        const jsonPayloadAsString = await request.text()\n\n        // We should probably try to deserialize the payload\n        // as JSON, but we'll just pass it through for now.\n        const payload = startSerializer.parse(jsonPayloadAsString)\n\n        // If this POST request was created by createServerFn,\n        // it's payload will be the only argument\n        if (isCreateServerFn) {\n          return await action(payload, signal)\n        }\n\n        // Otherwise, we'll spread the payload. Need to\n        // support `use server` functions that take multiple\n        // arguments.\n        return await action(...(payload as any), signal)\n      })()\n\n      // Any time we get a Response back, we should just\n      // return it immediately.\n      if (result.result instanceof Response) {\n        return result.result\n      }\n\n      // If this is a non createServerFn request, we need to\n      // pull out the result from the result object\n      if (!isCreateServerFn) {\n        result = result.result\n\n        // The result might again be a response,\n        // and if it is, return it.\n        if (result instanceof Response) {\n          return result\n        }\n      }\n\n      // if (!search.createServerFn) {\n      //   result = result.result\n      // }\n\n      // else if (\n      //   isPlainObject(result) &&\n      //   'result' in result &&\n      //   result.result instanceof Response\n      // ) {\n      //   return result.result\n      // }\n\n      // TODO: RSCs Where are we getting this package?\n      // if (isValidElement(result)) {\n      //   const { renderToPipeableStream } = await import(\n      //     // @ts-expect-error\n      //     'react-server-dom/server'\n      //   )\n\n      //   const pipeableStream = renderToPipeableStream(result)\n\n      //   setHeaders(event, {\n      //     'Content-Type': 'text/x-component',\n      //   } as any)\n\n      //   sendStream(event, response)\n      //   event._handled = true\n\n      //   return new Response(null, { status: 200 })\n      // }\n\n      if (isNotFound(result)) {\n        return isNotFoundResponse(result)\n      }\n\n      return new Response(\n        result !== undefined ? startSerializer.stringify(result) : undefined,\n        {\n          status: getResponseStatus(getEvent()),\n          headers: {\n            'Content-Type': 'application/json',\n          },\n        },\n      )\n    } catch (error: any) {\n      if (error instanceof Response) {\n        return error\n      }\n      // else if (\n      //   isPlainObject(error) &&\n      //   'result' in error &&\n      //   error.result instanceof Response\n      // ) {\n      //   return error.result\n      // }\n\n      // Currently this server-side context has no idea how to\n      // build final URLs, so we need to defer that to the client.\n      // The client will check for __redirect and __notFound keys,\n      // and if they exist, it will handle them appropriately.\n\n      if (isNotFound(error)) {\n        return isNotFoundResponse(error)\n      }\n\n      console.info()\n      console.info('Server Fn Error!')\n      console.info()\n      console.error(error)\n      console.info()\n\n      return new Response(startSerializer.stringify(error), {\n        status: 500,\n        headers: {\n          'Content-Type': 'application/json',\n        },\n      })\n    }\n  })()\n\n  request.signal.removeEventListener('abort', abort)\n\n  if (isRaw) {\n    return response\n  }\n\n  return response\n}\n\nfunction isNotFoundResponse(error: any) {\n  const { headers, ...rest } = error\n\n  return new Response(JSON.stringify(rest), {\n    status: 200,\n    headers: {\n      'Content-Type': 'application/json',\n      ...(headers || {}),\n    },\n  })\n}\n"],"names":["payload"],"mappings":"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"}

package/dist/esm/ssr-server.js

@@ -55,7 +55,8 @@ function dehydrateRouter(router) {
   var _a, _b;
   const dehydratedRouter = {
     manifest: router.ssr.manifest,
-    dehydratedData: (_b = (_a = router.options).dehydrate) == null ? void 0 : _b.call(_a)
+    dehydratedData: (_b = (_a = router.options).dehydrate) == null ? void 0 : _b.call(_a),
+    lastMatchId: router.state.matches[router.state.matches.length - 1].id
   };
   router.serverSsr.injectScript(
     () => `__TSR_SSR__.dehydrated = ${jsesc(

package/dist/esm/ssr-server.js.map

@@ -1 +1 @@
-{"version":3,"file":"ssr-server.js","sources":["../../src/ssr-server.ts"],"sourcesContent":["import { default as warning } from 'tiny-warning'\nimport {\n  TSR_DEFERRED_PROMISE,\n  defer,\n  isPlainArray,\n  isPlainObject,\n  pick,\n} from '@tanstack/router-core'\nimport jsesc from 'jsesc'\nimport { startSerializer } from '@tanstack/start-client-core'\nimport minifiedTsrBootStrapScript from './tsrScript?script-string'\nimport type {\n  ClientExtractedBaseEntry,\n  DehydratedRouter,\n  ResolvePromiseState,\n  SsrMatch,\n} from '@tanstack/start-client-core'\nimport type {\n  AnyRouteMatch,\n  AnyRouter,\n  DeferredPromise,\n  Manifest,\n} from '@tanstack/router-core'\n\nexport type ServerExtractedEntry =\n  | ServerExtractedStream\n  | ServerExtractedPromise\n\nexport interface ServerExtractedBaseEntry extends ClientExtractedBaseEntry {\n  id: number\n  matchIndex: number\n}\n\nexport interface ServerExtractedStream extends ServerExtractedBaseEntry {\n  type: 'stream'\n  stream: ReadableStream\n}\n\nexport interface ServerExtractedPromise extends ServerExtractedBaseEntry {\n  type: 'promise'\n  promise: DeferredPromise<any>\n}\n\nexport function attachRouterServerSsrUtils(\n  router: AnyRouter,\n  manifest: Manifest | undefined,\n) {\n  router.ssr = {\n    manifest,\n    serializer: startSerializer,\n  }\n\n  router.serverSsr = {\n    injectedHtml: [],\n    streamedKeys: new Set(),\n    injectHtml: (getHtml) => {\n      const promise = Promise.resolve().then(getHtml)\n      router.serverSsr!.injectedHtml.push(promise)\n      router.emit({\n        type: 'onInjectedHtml',\n        promise,\n      })\n\n      return promise.then(() => {})\n    },\n    injectScript: (getScript, opts) => {\n      return router.serverSsr!.injectHtml(async () => {\n        const script = await getScript()\n        return `<script class='tsr-once'>${script}${\n          process.env.NODE_ENV === 'development' && (opts?.logScript ?? true)\n            ? `; console.info(\\`Injected From Server:\n${jsesc(script, { quotes: 'backtick' })}\\`)`\n            : ''\n        }; if (typeof __TSR_SSR__ !== 'undefined') __TSR_SSR__.cleanScripts()</script>`\n      })\n    },\n    streamValue: (key, value) => {\n      warning(\n        !router.serverSsr!.streamedKeys.has(key),\n        'Key has already been streamed: ' + key,\n      )\n\n      router.serverSsr!.streamedKeys.add(key)\n      router.serverSsr!.injectScript(\n        () =>\n          `__TSR_SSR__.streamedValues['${key}'] = { value: ${jsesc(\n            router.ssr!.serializer.stringify(value),\n            {\n              isScriptContext: true,\n              wrap: true,\n              json: true,\n            },\n          )}}`,\n      )\n    },\n    onMatchSettled,\n  }\n\n  router.serverSsr.injectScript(() => minifiedTsrBootStrapScript, {\n    logScript: false,\n  })\n}\n\nexport function dehydrateRouter(router: AnyRouter) {\n  const dehydratedRouter: DehydratedRouter = {\n    manifest: router.ssr!.manifest,\n    dehydratedData: router.options.dehydrate?.(),\n  }\n\n  router.serverSsr!.injectScript(\n    () =>\n      `__TSR_SSR__.dehydrated = ${jsesc(\n        router.ssr!.serializer.stringify(dehydratedRouter),\n        {\n          isScriptContext: true,\n          wrap: true,\n          json: true,\n        },\n      )}`,\n  )\n}\n\nexport function extractAsyncLoaderData(\n  loaderData: any,\n  ctx: {\n    match: AnyRouteMatch\n    router: AnyRouter\n  },\n) {\n  const extracted: Array<ServerExtractedEntry> = []\n\n  const replaced = replaceBy(loaderData, (value, path) => {\n    // If it's a stream, we need to tee it so we can read it multiple times\n    if (value instanceof ReadableStream) {\n      const [copy1, copy2] = value.tee()\n      const entry: ServerExtractedStream = {\n        type: 'stream',\n        path,\n        id: extracted.length,\n        matchIndex: ctx.match.index,\n        stream: copy2,\n      }\n\n      extracted.push(entry)\n      return copy1\n    } else if (value instanceof Promise) {\n      const deferredPromise = defer(value)\n      const entry: ServerExtractedPromise = {\n        type: 'promise',\n        path,\n        id: extracted.length,\n        matchIndex: ctx.match.index,\n        promise: deferredPromise,\n      }\n      extracted.push(entry)\n    }\n\n    return value\n  })\n\n  return { replaced, extracted }\n}\n\nexport function onMatchSettled(opts: {\n  router: AnyRouter\n  match: AnyRouteMatch\n}) {\n  const { router, match } = opts\n\n  let extracted: Array<ServerExtractedEntry> | undefined = undefined\n  let serializedLoaderData: any = undefined\n  if (match.loaderData !== undefined) {\n    const result = extractAsyncLoaderData(match.loaderData, {\n      router,\n      match,\n    })\n    match.loaderData = result.replaced\n    extracted = result.extracted\n    serializedLoaderData = extracted.reduce(\n      (acc: any, entry: ServerExtractedEntry) => {\n        return deepImmutableSetByPath(acc, ['temp', ...entry.path], undefined)\n      },\n      { temp: result.replaced },\n    ).temp\n  }\n\n  const initCode = `__TSR_SSR__.initMatch(${jsesc(\n    {\n      id: match.id,\n      __beforeLoadContext: router.ssr!.serializer.stringify(\n        match.__beforeLoadContext,\n      ),\n      loaderData: router.ssr!.serializer.stringify(serializedLoaderData),\n      error: router.ssr!.serializer.stringify(match.error),\n      extracted: extracted?.map((entry) => pick(entry, ['type', 'path'])),\n      updatedAt: match.updatedAt,\n      status: match.status,\n    } satisfies SsrMatch,\n    {\n      isScriptContext: true,\n      wrap: true,\n      json: true,\n    },\n  )})`\n\n  router.serverSsr!.injectScript(() => initCode)\n\n  if (extracted) {\n    extracted.forEach((entry) => {\n      if (entry.type === 'promise') return injectPromise(entry)\n      return injectStream(entry)\n    })\n  }\n\n  function injectPromise(entry: ServerExtractedPromise) {\n    router.serverSsr!.injectScript(async () => {\n      await entry.promise\n\n      return `__TSR_SSR__.resolvePromise(${jsesc(\n        {\n          matchId: match.id,\n          id: entry.id,\n          promiseState: entry.promise[TSR_DEFERRED_PROMISE],\n        } satisfies ResolvePromiseState,\n        {\n          isScriptContext: true,\n          wrap: true,\n          json: true,\n        },\n      )})`\n    })\n  }\n\n  function injectStream(entry: ServerExtractedStream) {\n    // Inject a promise that resolves when the stream is done\n    // We do this to keep the stream open until we're done\n    router.serverSsr!.injectHtml(async () => {\n      //\n      try {\n        const reader = entry.stream.getReader()\n        let chunk: ReadableStreamReadResult<any> | null = null\n        while (!(chunk = await reader.read()).done) {\n          if (chunk.value) {\n            const code = `__TSR_SSR__.injectChunk(${jsesc(\n              {\n                matchId: match.id,\n                id: entry.id,\n                chunk: chunk.value,\n              },\n              {\n                isScriptContext: true,\n                wrap: true,\n                json: true,\n              },\n            )})`\n\n            router.serverSsr!.injectScript(() => code)\n          }\n        }\n\n        router.serverSsr!.injectScript(\n          () =>\n            `__TSR_SSR__.closeStream(${jsesc(\n              {\n                matchId: match.id,\n                id: entry.id,\n              },\n              {\n                isScriptContext: true,\n                wrap: true,\n                json: true,\n              },\n            )})`,\n        )\n      } catch (err) {\n        console.error('stream read error', err)\n      }\n\n      return ''\n    })\n  }\n}\n\nfunction deepImmutableSetByPath<T>(obj: T, path: Array<string>, value: any): T {\n  // immutable set by path retaining array and object references\n  if (path.length === 0) {\n    return value\n  }\n\n  const [key, ...rest] = path\n\n  if (Array.isArray(obj)) {\n    return obj.map((item, i) => {\n      if (i === Number(key)) {\n        return deepImmutableSetByPath(item, rest, value)\n      }\n      return item\n    }) as T\n  }\n\n  if (isPlainObject(obj)) {\n    return {\n      ...obj,\n      [key!]: deepImmutableSetByPath((obj as any)[key!], rest, value),\n    }\n  }\n\n  return obj\n}\n\nexport function replaceBy<T>(\n  obj: T,\n  cb: (value: any, path: Array<string>) => any,\n  path: Array<string> = [],\n): T {\n  if (isPlainArray(obj)) {\n    return obj.map((value, i) => replaceBy(value, cb, [...path, `${i}`])) as any\n  }\n\n  if (isPlainObject(obj)) {\n    // Do not allow objects with illegal\n    const newObj: any = {}\n\n    for (const key in obj) {\n      newObj[key] = replaceBy(obj[key], cb, [...path, key])\n    }\n\n    return newObj\n  }\n\n  // // Detect classes, functions, and other non-serializable objects\n  // // and return undefined. Exclude some known types that are serializable\n  // if (\n  //   typeof obj === 'function' ||\n  //   (typeof obj === 'object' &&\n  //     ![Object, Promise, ReadableStream].includes((obj as any)?.constructor))\n  // ) {\n  //   console.info(obj)\n  //   warning(false, `Non-serializable value ☝️ found at ${path.join('.')}`)\n  //   return undefined as any\n  // }\n\n  const newObj = cb(obj, path)\n\n  if (newObj !== obj) {\n    return newObj\n  }\n\n  return obj\n}\n"],"names":["newObj"],"mappings":"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"}
+{"version":3,"file":"ssr-server.js","sources":["../../src/ssr-server.ts"],"sourcesContent":["import { default as warning } from 'tiny-warning'\nimport {\n  TSR_DEFERRED_PROMISE,\n  defer,\n  isPlainArray,\n  isPlainObject,\n  pick,\n} from '@tanstack/router-core'\nimport jsesc from 'jsesc'\nimport { startSerializer } from '@tanstack/start-client-core'\nimport minifiedTsrBootStrapScript from './tsrScript?script-string'\nimport type {\n  ClientExtractedBaseEntry,\n  DehydratedRouter,\n  ResolvePromiseState,\n  SsrMatch,\n} from '@tanstack/start-client-core'\nimport type {\n  AnyRouteMatch,\n  AnyRouter,\n  DeferredPromise,\n  Manifest,\n} from '@tanstack/router-core'\n\nexport type ServerExtractedEntry =\n  | ServerExtractedStream\n  | ServerExtractedPromise\n\nexport interface ServerExtractedBaseEntry extends ClientExtractedBaseEntry {\n  id: number\n  matchIndex: number\n}\n\nexport interface ServerExtractedStream extends ServerExtractedBaseEntry {\n  type: 'stream'\n  stream: ReadableStream\n}\n\nexport interface ServerExtractedPromise extends ServerExtractedBaseEntry {\n  type: 'promise'\n  promise: DeferredPromise<any>\n}\n\nexport function attachRouterServerSsrUtils(\n  router: AnyRouter,\n  manifest: Manifest | undefined,\n) {\n  router.ssr = {\n    manifest,\n    serializer: startSerializer,\n  }\n\n  router.serverSsr = {\n    injectedHtml: [],\n    streamedKeys: new Set(),\n    injectHtml: (getHtml) => {\n      const promise = Promise.resolve().then(getHtml)\n      router.serverSsr!.injectedHtml.push(promise)\n      router.emit({\n        type: 'onInjectedHtml',\n        promise,\n      })\n\n      return promise.then(() => {})\n    },\n    injectScript: (getScript, opts) => {\n      return router.serverSsr!.injectHtml(async () => {\n        const script = await getScript()\n        return `<script class='tsr-once'>${script}${\n          process.env.NODE_ENV === 'development' && (opts?.logScript ?? true)\n            ? `; console.info(\\`Injected From Server:\n${jsesc(script, { quotes: 'backtick' })}\\`)`\n            : ''\n        }; if (typeof __TSR_SSR__ !== 'undefined') __TSR_SSR__.cleanScripts()</script>`\n      })\n    },\n    streamValue: (key, value) => {\n      warning(\n        !router.serverSsr!.streamedKeys.has(key),\n        'Key has already been streamed: ' + key,\n      )\n\n      router.serverSsr!.streamedKeys.add(key)\n      router.serverSsr!.injectScript(\n        () =>\n          `__TSR_SSR__.streamedValues['${key}'] = { value: ${jsesc(\n            router.ssr!.serializer.stringify(value),\n            {\n              isScriptContext: true,\n              wrap: true,\n              json: true,\n            },\n          )}}`,\n      )\n    },\n    onMatchSettled,\n  }\n\n  router.serverSsr.injectScript(() => minifiedTsrBootStrapScript, {\n    logScript: false,\n  })\n}\n\nexport function dehydrateRouter(router: AnyRouter) {\n  const dehydratedRouter: DehydratedRouter = {\n    manifest: router.ssr!.manifest,\n    dehydratedData: router.options.dehydrate?.(),\n    lastMatchId: router.state.matches[router.state.matches.length - 1]!.id,\n  }\n\n  router.serverSsr!.injectScript(\n    () =>\n      `__TSR_SSR__.dehydrated = ${jsesc(\n        router.ssr!.serializer.stringify(dehydratedRouter),\n        {\n          isScriptContext: true,\n          wrap: true,\n          json: true,\n        },\n      )}`,\n  )\n}\n\nexport function extractAsyncLoaderData(\n  loaderData: any,\n  ctx: {\n    match: AnyRouteMatch\n    router: AnyRouter\n  },\n) {\n  const extracted: Array<ServerExtractedEntry> = []\n\n  const replaced = replaceBy(loaderData, (value, path) => {\n    // If it's a stream, we need to tee it so we can read it multiple times\n    if (value instanceof ReadableStream) {\n      const [copy1, copy2] = value.tee()\n      const entry: ServerExtractedStream = {\n        type: 'stream',\n        path,\n        id: extracted.length,\n        matchIndex: ctx.match.index,\n        stream: copy2,\n      }\n\n      extracted.push(entry)\n      return copy1\n    } else if (value instanceof Promise) {\n      const deferredPromise = defer(value)\n      const entry: ServerExtractedPromise = {\n        type: 'promise',\n        path,\n        id: extracted.length,\n        matchIndex: ctx.match.index,\n        promise: deferredPromise,\n      }\n      extracted.push(entry)\n    }\n\n    return value\n  })\n\n  return { replaced, extracted }\n}\n\nexport function onMatchSettled(opts: {\n  router: AnyRouter\n  match: AnyRouteMatch\n}) {\n  const { router, match } = opts\n\n  let extracted: Array<ServerExtractedEntry> | undefined = undefined\n  let serializedLoaderData: any = undefined\n  if (match.loaderData !== undefined) {\n    const result = extractAsyncLoaderData(match.loaderData, {\n      router,\n      match,\n    })\n    match.loaderData = result.replaced\n    extracted = result.extracted\n    serializedLoaderData = extracted.reduce(\n      (acc: any, entry: ServerExtractedEntry) => {\n        return deepImmutableSetByPath(acc, ['temp', ...entry.path], undefined)\n      },\n      { temp: result.replaced },\n    ).temp\n  }\n\n  const initCode = `__TSR_SSR__.initMatch(${jsesc(\n    {\n      id: match.id,\n      __beforeLoadContext: router.ssr!.serializer.stringify(\n        match.__beforeLoadContext,\n      ),\n      loaderData: router.ssr!.serializer.stringify(serializedLoaderData),\n      error: router.ssr!.serializer.stringify(match.error),\n      extracted: extracted?.map((entry) => pick(entry, ['type', 'path'])),\n      updatedAt: match.updatedAt,\n      status: match.status,\n    } satisfies SsrMatch,\n    {\n      isScriptContext: true,\n      wrap: true,\n      json: true,\n    },\n  )})`\n\n  router.serverSsr!.injectScript(() => initCode)\n\n  if (extracted) {\n    extracted.forEach((entry) => {\n      if (entry.type === 'promise') return injectPromise(entry)\n      return injectStream(entry)\n    })\n  }\n\n  function injectPromise(entry: ServerExtractedPromise) {\n    router.serverSsr!.injectScript(async () => {\n      await entry.promise\n\n      return `__TSR_SSR__.resolvePromise(${jsesc(\n        {\n          matchId: match.id,\n          id: entry.id,\n          promiseState: entry.promise[TSR_DEFERRED_PROMISE],\n        } satisfies ResolvePromiseState,\n        {\n          isScriptContext: true,\n          wrap: true,\n          json: true,\n        },\n      )})`\n    })\n  }\n\n  function injectStream(entry: ServerExtractedStream) {\n    // Inject a promise that resolves when the stream is done\n    // We do this to keep the stream open until we're done\n    router.serverSsr!.injectHtml(async () => {\n      //\n      try {\n        const reader = entry.stream.getReader()\n        let chunk: ReadableStreamReadResult<any> | null = null\n        while (!(chunk = await reader.read()).done) {\n          if (chunk.value) {\n            const code = `__TSR_SSR__.injectChunk(${jsesc(\n              {\n                matchId: match.id,\n                id: entry.id,\n                chunk: chunk.value,\n              },\n              {\n                isScriptContext: true,\n                wrap: true,\n                json: true,\n              },\n            )})`\n\n            router.serverSsr!.injectScript(() => code)\n          }\n        }\n\n        router.serverSsr!.injectScript(\n          () =>\n            `__TSR_SSR__.closeStream(${jsesc(\n              {\n                matchId: match.id,\n                id: entry.id,\n              },\n              {\n                isScriptContext: true,\n                wrap: true,\n                json: true,\n              },\n            )})`,\n        )\n      } catch (err) {\n        console.error('stream read error', err)\n      }\n\n      return ''\n    })\n  }\n}\n\nfunction deepImmutableSetByPath<T>(obj: T, path: Array<string>, value: any): T {\n  // immutable set by path retaining array and object references\n  if (path.length === 0) {\n    return value\n  }\n\n  const [key, ...rest] = path\n\n  if (Array.isArray(obj)) {\n    return obj.map((item, i) => {\n      if (i === Number(key)) {\n        return deepImmutableSetByPath(item, rest, value)\n      }\n      return item\n    }) as T\n  }\n\n  if (isPlainObject(obj)) {\n    return {\n      ...obj,\n      [key!]: deepImmutableSetByPath((obj as any)[key!], rest, value),\n    }\n  }\n\n  return obj\n}\n\nexport function replaceBy<T>(\n  obj: T,\n  cb: (value: any, path: Array<string>) => any,\n  path: Array<string> = [],\n): T {\n  if (isPlainArray(obj)) {\n    return obj.map((value, i) => replaceBy(value, cb, [...path, `${i}`])) as any\n  }\n\n  if (isPlainObject(obj)) {\n    // Do not allow objects with illegal\n    const newObj: any = {}\n\n    for (const key in obj) {\n      newObj[key] = replaceBy(obj[key], cb, [...path, key])\n    }\n\n    return newObj\n  }\n\n  // // Detect classes, functions, and other non-serializable objects\n  // // and return undefined. Exclude some known types that are serializable\n  // if (\n  //   typeof obj === 'function' ||\n  //   (typeof obj === 'object' &&\n  //     ![Object, Promise, ReadableStream].includes((obj as any)?.constructor))\n  // ) {\n  //   console.info(obj)\n  //   warning(false, `Non-serializable value ☝️ found at ${path.join('.')}`)\n  //   return undefined as any\n  // }\n\n  const newObj = cb(obj, path)\n\n  if (newObj !== obj) {\n    return newObj\n  }\n\n  return obj\n}\n"],"names":["newObj"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/start-server-core",
-  "version": "1.120.4-alpha.15",
+  "version": "1.120.4-alpha.17",
   "description": "Modern and scalable routing for React applications",
   "author": "Tanner Linsley",
   "license": "MIT",
@@ -54,8 +54,8 @@
     "tiny-warning": "^1.0.3",
     "unctx": "^2.4.1",
     "@tanstack/history": "^1.120.4-alpha.1",
-    "@tanstack/router-core": "^1.120.4-alpha.15",
-    "@tanstack/start-client-core": "^1.120.4-alpha.15"
+    "@tanstack/start-client-core": "^1.120.4-alpha.17",
+    "@tanstack/router-core": "^1.120.4-alpha.15"
   },
   "devDependencies": {
     "@types/jsesc": "^3.0.3",

package/src/server-functions-handler.ts

@@ -5,10 +5,6 @@ import { startSerializer } from '@tanstack/start-client-core'
 import _serverFnManifest from 'tanstack:server-fn-manifest'
 import { getEvent, getResponseStatus } from './h3'
 
-// NOTE: This is a dummy export to silence warnings about
-// only having a default export.
-export const dummy = 2
-
 const serverFnManifest = _serverFnManifest as Record<
   string,
   {
@@ -64,17 +60,8 @@ export const handleServerAction = async ({ request }: { request: Request }) => {
     throw new Error('Server function info not found for ' + serverFnId)
   }
 
-  let fnModule: undefined | { [key: string]: any }
-
-  if (process.env.NODE_ENV === 'development') {
-    const serverEnv = (globalThis as any).viteDevServer.environments['server']
-    if (!serverEnv) {
-      throw new Error(`'server' vite dev environment not found`)
-    }
-    fnModule = await serverEnv.runner.import(serverFnInfo.extractedFilename)
-  } else {
-    fnModule = await serverFnInfo.importer()
-  }
+  const fnModule: undefined | { [key: string]: any } =
+    await serverFnInfo.importer()
 
   if (!fnModule) {
     console.info('serverFnInfo', serverFnInfo)

package/src/ssr-server.ts

@@ -105,6 +105,7 @@ export function dehydrateRouter(router: AnyRouter) {
   const dehydratedRouter: DehydratedRouter = {
     manifest: router.ssr!.manifest,
     dehydratedData: router.options.dehydrate?.(),
+    lastMatchId: router.state.matches[router.state.matches.length - 1]!.id,
   }
 
   router.serverSsr!.injectScript(