@tanstack/solid-router 1.133.31 → 1.133.35

package/dist/cjs/awaited.cjs

@@ -33,7 +33,14 @@ function useAwaited({
   return [promise[routerCore.TSR_DEFERRED_PROMISE].data, promise];
 }
 function Await(props) {
-  const [resource] = Solid__namespace.createResource(() => props.promise);
+  const [resource] = Solid__namespace.createResource(
+    () => routerCore.defer(props.promise),
+    // Simple passthrough - just return the promise for Solid to await
+    (p) => p,
+    {
+      deferStream: true
+    }
+  );
   return Solid$1.createComponent(Solid__namespace.Show, {
     get fallback() {
       return props.fallback;

package/dist/cjs/awaited.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"awaited.cjs","sources":["../../src/awaited.tsx"],"sourcesContent":["import * as Solid from 'solid-js'\n\nimport { TSR_DEFERRED_PROMISE, defer } from '@tanstack/router-core'\nimport type { DeferredPromise } from '@tanstack/router-core'\nimport type { SolidNode } from './route'\n\nexport type AwaitOptions<T> = {\n  promise: Promise<T>\n}\n\nexport function useAwaited<T>({\n  promise: _promise,\n}: AwaitOptions<T>): [T, DeferredPromise<T>] {\n  const promise = defer(_promise)\n\n  if (promise[TSR_DEFERRED_PROMISE].status === 'pending') {\n    throw promise\n  }\n\n  if (promise[TSR_DEFERRED_PROMISE].status === 'error') {\n    throw promise[TSR_DEFERRED_PROMISE].error\n  }\n\n  return [promise[TSR_DEFERRED_PROMISE].data, promise]\n}\n\nexport function Await<T>(\n  props: AwaitOptions<T> & {\n    fallback?: SolidNode\n    children: (result: T) => SolidNode\n  },\n) {\n  const [resource] = Solid.createResource(() => props.promise)\n\n  return (\n    <Solid.Show fallback={props.fallback} when={resource()}>\n      {(data) => props.children(data())}\n    </Solid.Show>\n  )\n}\n"],"names":["useAwaited","promise","_promise","defer","TSR_DEFERRED_PROMISE","status","error","data","Await","props","resource","Solid","createResource","_$createComponent","Show","fallback","when","children"],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAUO,SAASA,WAAc;AAAA,EAC5BC,SAASC;AACM,GAA4B;AAC3C,QAAMD,UAAUE,WAAAA,MAAMD,QAAQ;AAE9B,MAAID,QAAQG,WAAAA,oBAAoB,EAAEC,WAAW,WAAW;AACtD,UAAMJ;AAAAA,EACR;AAEA,MAAIA,QAAQG,WAAAA,oBAAoB,EAAEC,WAAW,SAAS;AACpD,UAAMJ,QAAQG,WAAAA,oBAAoB,EAAEE;AAAAA,EACtC;AAEA,SAAO,CAACL,QAAQG,WAAAA,oBAAoB,EAAEG,MAAMN,OAAO;AACrD;AAEO,SAASO,MACdC,OAIA;AACA,QAAM,CAACC,QAAQ,IAAIC,iBAAMC,eAAe,MAAMH,MAAMR,OAAO;AAE3D,SAAAY,QAAAA,gBACGF,iBAAMG,MAAI;AAAA,IAAA,IAACC,WAAQ;AAAA,aAAEN,MAAMM;AAAAA,IAAQ;AAAA,IAAA,IAAEC,OAAI;AAAA,aAAEN,SAAAA;AAAAA,IAAU;AAAA,IAAAO,UAClDV,CAAAA,SAASE,MAAMQ,SAASV,MAAM;AAAA,EAAA,CAAC;AAGvC;;;"}
+{"version":3,"file":"awaited.cjs","sources":["../../src/awaited.tsx"],"sourcesContent":["import * as Solid from 'solid-js'\n\nimport { TSR_DEFERRED_PROMISE, defer } from '@tanstack/router-core'\nimport type { DeferredPromise } from '@tanstack/router-core'\nimport type { SolidNode } from './route'\n\nexport type AwaitOptions<T> = {\n  promise: Promise<T>\n}\n\nexport function useAwaited<T>({\n  promise: _promise,\n}: AwaitOptions<T>): [T, DeferredPromise<T>] {\n  const promise = defer(_promise)\n\n  if (promise[TSR_DEFERRED_PROMISE].status === 'pending') {\n    throw promise\n  }\n\n  if (promise[TSR_DEFERRED_PROMISE].status === 'error') {\n    throw promise[TSR_DEFERRED_PROMISE].error\n  }\n\n  return [promise[TSR_DEFERRED_PROMISE].data, promise]\n}\n\nexport function Await<T>(\n  props: AwaitOptions<T> & {\n    fallback?: SolidNode\n    children: (result: T) => SolidNode\n  },\n) {\n  const [resource] = Solid.createResource(\n    () => defer(props.promise),\n    // Simple passthrough - just return the promise for Solid to await\n    (p) => p,\n    {\n      deferStream: true,\n    },\n  )\n\n  return (\n    <Solid.Show fallback={props.fallback} when={resource()}>\n      {(data) => props.children(data())}\n    </Solid.Show>\n  )\n}\n"],"names":["useAwaited","promise","_promise","defer","TSR_DEFERRED_PROMISE","status","error","data","Await","props","resource","Solid","createResource","p","deferStream","_$createComponent","Show","fallback","when","children"],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAUO,SAASA,WAAc;AAAA,EAC5BC,SAASC;AACM,GAA4B;AAC3C,QAAMD,UAAUE,WAAAA,MAAMD,QAAQ;AAE9B,MAAID,QAAQG,WAAAA,oBAAoB,EAAEC,WAAW,WAAW;AACtD,UAAMJ;AAAAA,EACR;AAEA,MAAIA,QAAQG,WAAAA,oBAAoB,EAAEC,WAAW,SAAS;AACpD,UAAMJ,QAAQG,WAAAA,oBAAoB,EAAEE;AAAAA,EACtC;AAEA,SAAO,CAACL,QAAQG,WAAAA,oBAAoB,EAAEG,MAAMN,OAAO;AACrD;AAEO,SAASO,MACdC,OAIA;AACA,QAAM,CAACC,QAAQ,IAAIC,iBAAMC;AAAAA,IACvB,MAAMT,WAAAA,MAAMM,MAAMR,OAAO;AAAA;AAAA,IAExBY,CAAAA,MAAMA;AAAAA,IACP;AAAA,MACEC,aAAa;AAAA,IAAA;AAAA,EACf;AAGF,SAAAC,QAAAA,gBACGJ,iBAAMK,MAAI;AAAA,IAAA,IAACC,WAAQ;AAAA,aAAER,MAAMQ;AAAAA,IAAQ;AAAA,IAAA,IAAEC,OAAI;AAAA,aAAER,SAAAA;AAAAA,IAAU;AAAA,IAAAS,UAClDZ,CAAAA,SAASE,MAAMU,SAASZ,MAAM;AAAA,EAAA,CAAC;AAGvC;;;"}

package/dist/cjs/ssr/renderRouterToStream.cjs

@@ -3,6 +3,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const Solid = require("solid-js/web");
 const isbot = require("isbot");
 const server = require("@tanstack/router-core/ssr/server");
+const routerCore = require("@tanstack/router-core");
 function _interopNamespaceDefault(e) {
   const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });
   if (e) {
@@ -31,8 +32,16 @@ const renderRouterToStream = async ({
     readable
   } = new TransformStream();
   const docType = Solid__namespace.ssr("<!DOCTYPE html>");
+  const serializationAdapters = router.options?.serializationAdapters || router.options.ssr?.serializationAdapters;
+  const serovalPlugins = serializationAdapters?.map((adapter) => {
+    const plugin = routerCore.makeSsrSerovalPlugin(adapter, {
+      didRun: false
+    });
+    return plugin;
+  });
   const stream = Solid__namespace.renderToStream(() => [docType, Solid.memo(children)], {
-    nonce: router.options.ssr?.nonce
+    nonce: router.options.ssr?.nonce,
+    plugins: serovalPlugins
   });
   if (isbot.isbot(request.headers.get("User-Agent"))) {
     await stream;

package/dist/cjs/ssr/renderRouterToStream.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"renderRouterToStream.cjs","sources":["../../../src/ssr/renderRouterToStream.tsx"],"sourcesContent":["import * as Solid from 'solid-js/web'\nimport { isbot } from 'isbot'\nimport { transformReadableStreamWithRouter } from '@tanstack/router-core/ssr/server'\nimport type { JSXElement } from 'solid-js'\nimport type { ReadableStream } from 'node:stream/web'\nimport type { AnyRouter } from '@tanstack/router-core'\n\nexport const renderRouterToStream = async ({\n  request,\n  router,\n  responseHeaders,\n  children,\n}: {\n  request: Request\n  router: AnyRouter\n  responseHeaders: Headers\n  children: () => JSXElement\n}) => {\n  const { writable, readable } = new TransformStream()\n\n  const docType = Solid.ssr('<!DOCTYPE html>')\n\n  const stream = Solid.renderToStream(\n    () => (\n      <>\n        {docType}\n        {children()}\n      </>\n    ),\n    {\n      nonce: router.options.ssr?.nonce,\n    },\n  )\n\n  if (isbot(request.headers.get('User-Agent'))) {\n    await stream\n  }\n  stream.pipeTo(writable)\n\n  const responseStream = transformReadableStreamWithRouter(\n    router,\n    readable as unknown as ReadableStream,\n  )\n  return new Response(responseStream as any, {\n    status: router.state.statusCode,\n    headers: responseHeaders,\n  })\n}\n"],"names":["renderRouterToStream","request","router","responseHeaders","children","writable","readable","TransformStream","docType","Solid","ssr","stream","renderToStream","_$memo","nonce","options","isbot","headers","get","pipeTo","responseStream","transformReadableStreamWithRouter","Response","status","state","statusCode"],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAOO,MAAMA,uBAAuB,OAAO;AAAA,EACzCC;AAAAA,EACAC;AAAAA,EACAC;AAAAA,EACAC;AAMF,MAAM;AACJ,QAAM;AAAA,IAAEC;AAAAA,IAAUC;AAAAA,EAAAA,IAAa,IAAIC,gBAAAA;AAEnC,QAAMC,UAAUC,iBAAMC,IAAI,iBAAiB;AAE3C,QAAMC,SAASF,iBAAMG,eACnB,MAAA,CAEKJ,SAAOK,MAAAA,KACPT,QAAQ,IAGb;AAAA,IACEU,OAAOZ,OAAOa,QAAQL,KAAKI;AAAAA,EAAAA,CAE/B;AAEA,MAAIE,MAAAA,MAAMf,QAAQgB,QAAQC,IAAI,YAAY,CAAC,GAAG;AAC5C,UAAMP;AAAAA,EACR;AACAA,SAAOQ,OAAOd,QAAQ;AAEtB,QAAMe,iBAAiBC,OAAAA,kCACrBnB,QACAI,QACF;AACA,SAAO,IAAIgB,SAASF,gBAAuB;AAAA,IACzCG,QAAQrB,OAAOsB,MAAMC;AAAAA,IACrBR,SAASd;AAAAA,EAAAA,CACV;AACH;;"}
+{"version":3,"file":"renderRouterToStream.cjs","sources":["../../../src/ssr/renderRouterToStream.tsx"],"sourcesContent":["import * as Solid from 'solid-js/web'\nimport { isbot } from 'isbot'\nimport { transformReadableStreamWithRouter } from '@tanstack/router-core/ssr/server'\nimport { makeSsrSerovalPlugin } from '@tanstack/router-core'\nimport type { JSXElement } from 'solid-js'\nimport type { ReadableStream } from 'node:stream/web'\nimport type { AnyRouter } from '@tanstack/router-core'\n\nexport const renderRouterToStream = async ({\n  request,\n  router,\n  responseHeaders,\n  children,\n}: {\n  request: Request\n  router: AnyRouter\n  responseHeaders: Headers\n  children: () => JSXElement\n}) => {\n  const { writable, readable } = new TransformStream()\n\n  const docType = Solid.ssr('<!DOCTYPE html>')\n\n  const serializationAdapters =\n    (router.options as any)?.serializationAdapters ||\n    (router.options.ssr as any)?.serializationAdapters\n  const serovalPlugins = serializationAdapters?.map((adapter: any) => {\n    const plugin = makeSsrSerovalPlugin(adapter, { didRun: false })\n    return plugin\n  })\n\n  const stream = Solid.renderToStream(\n    () => (\n      <>\n        {docType}\n        {children()}\n      </>\n    ),\n    {\n      nonce: router.options.ssr?.nonce,\n      plugins: serovalPlugins,\n    } as any,\n  )\n\n  if (isbot(request.headers.get('User-Agent'))) {\n    await stream\n  }\n  stream.pipeTo(writable)\n\n  const responseStream = transformReadableStreamWithRouter(\n    router,\n    readable as unknown as ReadableStream,\n  )\n  return new Response(responseStream as any, {\n    status: router.state.statusCode,\n    headers: responseHeaders,\n  })\n}\n"],"names":["renderRouterToStream","request","router","responseHeaders","children","writable","readable","TransformStream","docType","Solid","ssr","serializationAdapters","options","serovalPlugins","map","adapter","plugin","makeSsrSerovalPlugin","didRun","stream","renderToStream","_$memo","nonce","plugins","isbot","headers","get","pipeTo","responseStream","transformReadableStreamWithRouter","Response","status","state","statusCode"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAQO,MAAMA,uBAAuB,OAAO;AAAA,EACzCC;AAAAA,EACAC;AAAAA,EACAC;AAAAA,EACAC;AAMF,MAAM;AACJ,QAAM;AAAA,IAAEC;AAAAA,IAAUC;AAAAA,EAAAA,IAAa,IAAIC,gBAAAA;AAEnC,QAAMC,UAAUC,iBAAMC,IAAI,iBAAiB;AAE3C,QAAMC,wBACHT,OAAOU,SAAiBD,yBACxBT,OAAOU,QAAQF,KAAaC;AAC/B,QAAME,iBAAiBF,uBAAuBG,IAAI,CAACC,YAAiB;AAClE,UAAMC,SAASC,WAAAA,qBAAqBF,SAAS;AAAA,MAAEG,QAAQ;AAAA,IAAA,CAAO;AAC9D,WAAOF;AAAAA,EACT,CAAC;AAED,QAAMG,SAASV,iBAAMW,eACnB,MAAA,CAEKZ,SAAOa,MAAAA,KACPjB,QAAQ,IAGb;AAAA,IACEkB,OAAOpB,OAAOU,QAAQF,KAAKY;AAAAA,IAC3BC,SAASV;AAAAA,EAAAA,CAEb;AAEA,MAAIW,MAAAA,MAAMvB,QAAQwB,QAAQC,IAAI,YAAY,CAAC,GAAG;AAC5C,UAAMP;AAAAA,EACR;AACAA,SAAOQ,OAAOtB,QAAQ;AAEtB,QAAMuB,iBAAiBC,OAAAA,kCACrB3B,QACAI,QACF;AACA,SAAO,IAAIwB,SAASF,gBAAuB;AAAA,IACzCG,QAAQ7B,OAAO8B,MAAMC;AAAAA,IACrBR,SAAStB;AAAAA,EAAAA,CACV;AACH;;"}

package/dist/cjs/ssr/renderRouterToString.cjs

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const Solid = require("solid-js/web");
+const routerCore = require("@tanstack/router-core");
 function _interopNamespaceDefault(e) {
   const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });
   if (e) {
@@ -24,8 +25,16 @@ const renderRouterToString = async ({
   children
 }) => {
   try {
+    const serializationAdapters = router.options?.serializationAdapters || router.options.ssr?.serializationAdapters;
+    const serovalPlugins = serializationAdapters?.map((adapter) => {
+      const plugin = routerCore.makeSsrSerovalPlugin(adapter, {
+        didRun: false
+      });
+      return plugin;
+    });
     let html = Solid__namespace.renderToString(children, {
-      nonce: router.options.ssr?.nonce
+      nonce: router.options.ssr?.nonce,
+      plugins: serovalPlugins
     });
     router.serverSsr.setRenderFinished();
     const injectedHtml = await Promise.all(router.serverSsr.injectedHtml).then((htmls) => htmls.join(""));

package/dist/cjs/ssr/renderRouterToString.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"renderRouterToString.cjs","sources":["../../../src/ssr/renderRouterToString.tsx"],"sourcesContent":["import * as Solid from 'solid-js/web'\nimport type { JSXElement } from 'solid-js'\nimport type { AnyRouter } from '@tanstack/router-core'\n\nexport const renderRouterToString = async ({\n  router,\n  responseHeaders,\n  children,\n}: {\n  router: AnyRouter\n  responseHeaders: Headers\n  children: () => JSXElement\n}) => {\n  try {\n    let html = Solid.renderToString(children, {\n      nonce: router.options.ssr?.nonce,\n    })\n    router.serverSsr!.setRenderFinished()\n    const injectedHtml = await Promise.all(router.serverSsr!.injectedHtml).then(\n      (htmls) => htmls.join(''),\n    )\n    html = html.replace(`</body>`, `${injectedHtml}</body>`)\n    return new Response(`<!DOCTYPE html>${html}`, {\n      status: router.state.statusCode,\n      headers: responseHeaders,\n    })\n  } catch (error) {\n    console.error('Render to string error:', error)\n    return new Response('Internal Server Error', {\n      status: 500,\n      headers: responseHeaders,\n    })\n  }\n}\n"],"names":["renderRouterToString","router","responseHeaders","children","html","Solid","renderToString","nonce","options","ssr","serverSsr","setRenderFinished","injectedHtml","Promise","all","then","htmls","join","replace","Response","status","state","statusCode","headers","error","console"],"mappings":";;;;;;;;;;;;;;;;;;;;AAIO,MAAMA,uBAAuB,OAAO;AAAA,EACzCC;AAAAA,EACAC;AAAAA,EACAC;AAKF,MAAM;AACJ,MAAI;AACF,QAAIC,OAAOC,iBAAMC,eAAeH,UAAU;AAAA,MACxCI,OAAON,OAAOO,QAAQC,KAAKF;AAAAA,IAAAA,CAC5B;AACDN,WAAOS,UAAWC,kBAAAA;AAClB,UAAMC,eAAe,MAAMC,QAAQC,IAAIb,OAAOS,UAAWE,YAAY,EAAEG,KACpEC,CAAAA,UAAUA,MAAMC,KAAK,EAAE,CAC1B;AACAb,WAAOA,KAAKc,QAAQ,WAAW,GAAGN,YAAY,SAAS;AACvD,WAAO,IAAIO,SAAS,kBAAkBf,IAAI,IAAI;AAAA,MAC5CgB,QAAQnB,OAAOoB,MAAMC;AAAAA,MACrBC,SAASrB;AAAAA,IAAAA,CACV;AAAA,EACH,SAASsB,OAAO;AACdC,YAAQD,MAAM,2BAA2BA,KAAK;AAC9C,WAAO,IAAIL,SAAS,yBAAyB;AAAA,MAC3CC,QAAQ;AAAA,MACRG,SAASrB;AAAAA,IAAAA,CACV;AAAA,EACH;AACF;;"}
+{"version":3,"file":"renderRouterToString.cjs","sources":["../../../src/ssr/renderRouterToString.tsx"],"sourcesContent":["import * as Solid from 'solid-js/web'\nimport { makeSsrSerovalPlugin } from '@tanstack/router-core'\nimport type { AnyRouter } from '@tanstack/router-core'\nimport type { JSXElement } from 'solid-js'\n\nexport const renderRouterToString = async ({\n  router,\n  responseHeaders,\n  children,\n}: {\n  router: AnyRouter\n  responseHeaders: Headers\n  children: () => JSXElement\n}) => {\n  try {\n    const serializationAdapters =\n      (router.options as any)?.serializationAdapters ||\n      (router.options.ssr as any)?.serializationAdapters\n    const serovalPlugins = serializationAdapters?.map((adapter: any) => {\n      const plugin = makeSsrSerovalPlugin(adapter, { didRun: false })\n      return plugin\n    })\n\n    let html = Solid.renderToString(children, {\n      nonce: router.options.ssr?.nonce,\n      plugins: serovalPlugins,\n    } as any)\n    router.serverSsr!.setRenderFinished()\n    const injectedHtml = await Promise.all(router.serverSsr!.injectedHtml).then(\n      (htmls) => htmls.join(''),\n    )\n    html = html.replace(`</body>`, `${injectedHtml}</body>`)\n    return new Response(`<!DOCTYPE html>${html}`, {\n      status: router.state.statusCode,\n      headers: responseHeaders,\n    })\n  } catch (error) {\n    console.error('Render to string error:', error)\n    return new Response('Internal Server Error', {\n      status: 500,\n      headers: responseHeaders,\n    })\n  }\n}\n"],"names":["renderRouterToString","router","responseHeaders","children","serializationAdapters","options","ssr","serovalPlugins","map","adapter","plugin","makeSsrSerovalPlugin","didRun","html","Solid","renderToString","nonce","plugins","serverSsr","setRenderFinished","injectedHtml","Promise","all","then","htmls","join","replace","Response","status","state","statusCode","headers","error","console"],"mappings":";;;;;;;;;;;;;;;;;;;;;AAKO,MAAMA,uBAAuB,OAAO;AAAA,EACzCC;AAAAA,EACAC;AAAAA,EACAC;AAKF,MAAM;AACJ,MAAI;AACF,UAAMC,wBACHH,OAAOI,SAAiBD,yBACxBH,OAAOI,QAAQC,KAAaF;AAC/B,UAAMG,iBAAiBH,uBAAuBI,IAAI,CAACC,YAAiB;AAClE,YAAMC,SAASC,WAAAA,qBAAqBF,SAAS;AAAA,QAAEG,QAAQ;AAAA,MAAA,CAAO;AAC9D,aAAOF;AAAAA,IACT,CAAC;AAED,QAAIG,OAAOC,iBAAMC,eAAeZ,UAAU;AAAA,MACxCa,OAAOf,OAAOI,QAAQC,KAAKU;AAAAA,MAC3BC,SAASV;AAAAA,IAAAA,CACH;AACRN,WAAOiB,UAAWC,kBAAAA;AAClB,UAAMC,eAAe,MAAMC,QAAQC,IAAIrB,OAAOiB,UAAWE,YAAY,EAAEG,KACpEC,CAAAA,UAAUA,MAAMC,KAAK,EAAE,CAC1B;AACAZ,WAAOA,KAAKa,QAAQ,WAAW,GAAGN,YAAY,SAAS;AACvD,WAAO,IAAIO,SAAS,kBAAkBd,IAAI,IAAI;AAAA,MAC5Ce,QAAQ3B,OAAO4B,MAAMC;AAAAA,MACrBC,SAAS7B;AAAAA,IAAAA,CACV;AAAA,EACH,SAAS8B,OAAO;AACdC,YAAQD,MAAM,2BAA2BA,KAAK;AAC9C,WAAO,IAAIL,SAAS,yBAAyB;AAAA,MAC3CC,QAAQ;AAAA,MACRG,SAAS7B;AAAAA,IAAAA,CACV;AAAA,EACH;AACF;;"}

package/dist/cjs/ssr/renderRouterToString.d.cts

@@ -1,5 +1,5 @@
-import { JSXElement } from 'solid-js';
 import { AnyRouter } from '@tanstack/router-core';
+import { JSXElement } from 'solid-js';
 export declare const renderRouterToString: ({ router, responseHeaders, children, }: {
     router: AnyRouter;
     responseHeaders: Headers;

package/dist/esm/awaited.js

@@ -14,7 +14,14 @@ function useAwaited({
   return [promise[TSR_DEFERRED_PROMISE].data, promise];
 }
 function Await(props) {
-  const [resource] = Solid.createResource(() => props.promise);
+  const [resource] = Solid.createResource(
+    () => defer(props.promise),
+    // Simple passthrough - just return the promise for Solid to await
+    (p) => p,
+    {
+      deferStream: true
+    }
+  );
   return createComponent(Solid.Show, {
     get fallback() {
       return props.fallback;

package/dist/esm/awaited.js.map

@@ -1 +1 @@
-{"version":3,"file":"awaited.js","sources":["../../src/awaited.tsx"],"sourcesContent":["import * as Solid from 'solid-js'\n\nimport { TSR_DEFERRED_PROMISE, defer } from '@tanstack/router-core'\nimport type { DeferredPromise } from '@tanstack/router-core'\nimport type { SolidNode } from './route'\n\nexport type AwaitOptions<T> = {\n  promise: Promise<T>\n}\n\nexport function useAwaited<T>({\n  promise: _promise,\n}: AwaitOptions<T>): [T, DeferredPromise<T>] {\n  const promise = defer(_promise)\n\n  if (promise[TSR_DEFERRED_PROMISE].status === 'pending') {\n    throw promise\n  }\n\n  if (promise[TSR_DEFERRED_PROMISE].status === 'error') {\n    throw promise[TSR_DEFERRED_PROMISE].error\n  }\n\n  return [promise[TSR_DEFERRED_PROMISE].data, promise]\n}\n\nexport function Await<T>(\n  props: AwaitOptions<T> & {\n    fallback?: SolidNode\n    children: (result: T) => SolidNode\n  },\n) {\n  const [resource] = Solid.createResource(() => props.promise)\n\n  return (\n    <Solid.Show fallback={props.fallback} when={resource()}>\n      {(data) => props.children(data())}\n    </Solid.Show>\n  )\n}\n"],"names":["useAwaited","promise","_promise","defer","TSR_DEFERRED_PROMISE","status","error","data","Await","props","resource","Solid","createResource","_$createComponent","Show","fallback","when","children"],"mappings":";;;AAUO,SAASA,WAAc;AAAA,EAC5BC,SAASC;AACM,GAA4B;AAC3C,QAAMD,UAAUE,MAAMD,QAAQ;AAE9B,MAAID,QAAQG,oBAAoB,EAAEC,WAAW,WAAW;AACtD,UAAMJ;AAAAA,EACR;AAEA,MAAIA,QAAQG,oBAAoB,EAAEC,WAAW,SAAS;AACpD,UAAMJ,QAAQG,oBAAoB,EAAEE;AAAAA,EACtC;AAEA,SAAO,CAACL,QAAQG,oBAAoB,EAAEG,MAAMN,OAAO;AACrD;AAEO,SAASO,MACdC,OAIA;AACA,QAAM,CAACC,QAAQ,IAAIC,MAAMC,eAAe,MAAMH,MAAMR,OAAO;AAE3D,SAAAY,gBACGF,MAAMG,MAAI;AAAA,IAAA,IAACC,WAAQ;AAAA,aAAEN,MAAMM;AAAAA,IAAQ;AAAA,IAAA,IAAEC,OAAI;AAAA,aAAEN,SAAAA;AAAAA,IAAU;AAAA,IAAAO,UAClDV,CAAAA,SAASE,MAAMQ,SAASV,MAAM;AAAA,EAAA,CAAC;AAGvC;"}
+{"version":3,"file":"awaited.js","sources":["../../src/awaited.tsx"],"sourcesContent":["import * as Solid from 'solid-js'\n\nimport { TSR_DEFERRED_PROMISE, defer } from '@tanstack/router-core'\nimport type { DeferredPromise } from '@tanstack/router-core'\nimport type { SolidNode } from './route'\n\nexport type AwaitOptions<T> = {\n  promise: Promise<T>\n}\n\nexport function useAwaited<T>({\n  promise: _promise,\n}: AwaitOptions<T>): [T, DeferredPromise<T>] {\n  const promise = defer(_promise)\n\n  if (promise[TSR_DEFERRED_PROMISE].status === 'pending') {\n    throw promise\n  }\n\n  if (promise[TSR_DEFERRED_PROMISE].status === 'error') {\n    throw promise[TSR_DEFERRED_PROMISE].error\n  }\n\n  return [promise[TSR_DEFERRED_PROMISE].data, promise]\n}\n\nexport function Await<T>(\n  props: AwaitOptions<T> & {\n    fallback?: SolidNode\n    children: (result: T) => SolidNode\n  },\n) {\n  const [resource] = Solid.createResource(\n    () => defer(props.promise),\n    // Simple passthrough - just return the promise for Solid to await\n    (p) => p,\n    {\n      deferStream: true,\n    },\n  )\n\n  return (\n    <Solid.Show fallback={props.fallback} when={resource()}>\n      {(data) => props.children(data())}\n    </Solid.Show>\n  )\n}\n"],"names":["useAwaited","promise","_promise","defer","TSR_DEFERRED_PROMISE","status","error","data","Await","props","resource","Solid","createResource","p","deferStream","_$createComponent","Show","fallback","when","children"],"mappings":";;;AAUO,SAASA,WAAc;AAAA,EAC5BC,SAASC;AACM,GAA4B;AAC3C,QAAMD,UAAUE,MAAMD,QAAQ;AAE9B,MAAID,QAAQG,oBAAoB,EAAEC,WAAW,WAAW;AACtD,UAAMJ;AAAAA,EACR;AAEA,MAAIA,QAAQG,oBAAoB,EAAEC,WAAW,SAAS;AACpD,UAAMJ,QAAQG,oBAAoB,EAAEE;AAAAA,EACtC;AAEA,SAAO,CAACL,QAAQG,oBAAoB,EAAEG,MAAMN,OAAO;AACrD;AAEO,SAASO,MACdC,OAIA;AACA,QAAM,CAACC,QAAQ,IAAIC,MAAMC;AAAAA,IACvB,MAAMT,MAAMM,MAAMR,OAAO;AAAA;AAAA,IAExBY,CAAAA,MAAMA;AAAAA,IACP;AAAA,MACEC,aAAa;AAAA,IAAA;AAAA,EACf;AAGF,SAAAC,gBACGJ,MAAMK,MAAI;AAAA,IAAA,IAACC,WAAQ;AAAA,aAAER,MAAMQ;AAAAA,IAAQ;AAAA,IAAA,IAAEC,OAAI;AAAA,aAAER,SAAAA;AAAAA,IAAU;AAAA,IAAAS,UAClDZ,CAAAA,SAASE,MAAMU,SAASZ,MAAM;AAAA,EAAA,CAAC;AAGvC;"}

package/dist/esm/ssr/renderRouterToStream.js

@@ -2,6 +2,7 @@ import * as Solid from "solid-js/web";
 import { memo } from "solid-js/web";
 import { isbot } from "isbot";
 import { transformReadableStreamWithRouter } from "@tanstack/router-core/ssr/server";
+import { makeSsrSerovalPlugin } from "@tanstack/router-core";
 const renderRouterToStream = async ({
   request,
   router,
@@ -13,8 +14,16 @@ const renderRouterToStream = async ({
     readable
   } = new TransformStream();
   const docType = Solid.ssr("<!DOCTYPE html>");
+  const serializationAdapters = router.options?.serializationAdapters || router.options.ssr?.serializationAdapters;
+  const serovalPlugins = serializationAdapters?.map((adapter) => {
+    const plugin = makeSsrSerovalPlugin(adapter, {
+      didRun: false
+    });
+    return plugin;
+  });
   const stream = Solid.renderToStream(() => [docType, memo(children)], {
-    nonce: router.options.ssr?.nonce
+    nonce: router.options.ssr?.nonce,
+    plugins: serovalPlugins
   });
   if (isbot(request.headers.get("User-Agent"))) {
     await stream;

package/dist/esm/ssr/renderRouterToStream.js.map

@@ -1 +1 @@
-{"version":3,"file":"renderRouterToStream.js","sources":["../../../src/ssr/renderRouterToStream.tsx"],"sourcesContent":["import * as Solid from 'solid-js/web'\nimport { isbot } from 'isbot'\nimport { transformReadableStreamWithRouter } from '@tanstack/router-core/ssr/server'\nimport type { JSXElement } from 'solid-js'\nimport type { ReadableStream } from 'node:stream/web'\nimport type { AnyRouter } from '@tanstack/router-core'\n\nexport const renderRouterToStream = async ({\n  request,\n  router,\n  responseHeaders,\n  children,\n}: {\n  request: Request\n  router: AnyRouter\n  responseHeaders: Headers\n  children: () => JSXElement\n}) => {\n  const { writable, readable } = new TransformStream()\n\n  const docType = Solid.ssr('<!DOCTYPE html>')\n\n  const stream = Solid.renderToStream(\n    () => (\n      <>\n        {docType}\n        {children()}\n      </>\n    ),\n    {\n      nonce: router.options.ssr?.nonce,\n    },\n  )\n\n  if (isbot(request.headers.get('User-Agent'))) {\n    await stream\n  }\n  stream.pipeTo(writable)\n\n  const responseStream = transformReadableStreamWithRouter(\n    router,\n    readable as unknown as ReadableStream,\n  )\n  return new Response(responseStream as any, {\n    status: router.state.statusCode,\n    headers: responseHeaders,\n  })\n}\n"],"names":["renderRouterToStream","request","router","responseHeaders","children","writable","readable","TransformStream","docType","Solid","ssr","stream","renderToStream","_$memo","nonce","options","isbot","headers","get","pipeTo","responseStream","transformReadableStreamWithRouter","Response","status","state","statusCode"],"mappings":";;;;AAOO,MAAMA,uBAAuB,OAAO;AAAA,EACzCC;AAAAA,EACAC;AAAAA,EACAC;AAAAA,EACAC;AAMF,MAAM;AACJ,QAAM;AAAA,IAAEC;AAAAA,IAAUC;AAAAA,EAAAA,IAAa,IAAIC,gBAAAA;AAEnC,QAAMC,UAAUC,MAAMC,IAAI,iBAAiB;AAE3C,QAAMC,SAASF,MAAMG,eACnB,MAAA,CAEKJ,SAAOK,KACPT,QAAQ,IAGb;AAAA,IACEU,OAAOZ,OAAOa,QAAQL,KAAKI;AAAAA,EAAAA,CAE/B;AAEA,MAAIE,MAAMf,QAAQgB,QAAQC,IAAI,YAAY,CAAC,GAAG;AAC5C,UAAMP;AAAAA,EACR;AACAA,SAAOQ,OAAOd,QAAQ;AAEtB,QAAMe,iBAAiBC,kCACrBnB,QACAI,QACF;AACA,SAAO,IAAIgB,SAASF,gBAAuB;AAAA,IACzCG,QAAQrB,OAAOsB,MAAMC;AAAAA,IACrBR,SAASd;AAAAA,EAAAA,CACV;AACH;"}
+{"version":3,"file":"renderRouterToStream.js","sources":["../../../src/ssr/renderRouterToStream.tsx"],"sourcesContent":["import * as Solid from 'solid-js/web'\nimport { isbot } from 'isbot'\nimport { transformReadableStreamWithRouter } from '@tanstack/router-core/ssr/server'\nimport { makeSsrSerovalPlugin } from '@tanstack/router-core'\nimport type { JSXElement } from 'solid-js'\nimport type { ReadableStream } from 'node:stream/web'\nimport type { AnyRouter } from '@tanstack/router-core'\n\nexport const renderRouterToStream = async ({\n  request,\n  router,\n  responseHeaders,\n  children,\n}: {\n  request: Request\n  router: AnyRouter\n  responseHeaders: Headers\n  children: () => JSXElement\n}) => {\n  const { writable, readable } = new TransformStream()\n\n  const docType = Solid.ssr('<!DOCTYPE html>')\n\n  const serializationAdapters =\n    (router.options as any)?.serializationAdapters ||\n    (router.options.ssr as any)?.serializationAdapters\n  const serovalPlugins = serializationAdapters?.map((adapter: any) => {\n    const plugin = makeSsrSerovalPlugin(adapter, { didRun: false })\n    return plugin\n  })\n\n  const stream = Solid.renderToStream(\n    () => (\n      <>\n        {docType}\n        {children()}\n      </>\n    ),\n    {\n      nonce: router.options.ssr?.nonce,\n      plugins: serovalPlugins,\n    } as any,\n  )\n\n  if (isbot(request.headers.get('User-Agent'))) {\n    await stream\n  }\n  stream.pipeTo(writable)\n\n  const responseStream = transformReadableStreamWithRouter(\n    router,\n    readable as unknown as ReadableStream,\n  )\n  return new Response(responseStream as any, {\n    status: router.state.statusCode,\n    headers: responseHeaders,\n  })\n}\n"],"names":["renderRouterToStream","request","router","responseHeaders","children","writable","readable","TransformStream","docType","Solid","ssr","serializationAdapters","options","serovalPlugins","map","adapter","plugin","makeSsrSerovalPlugin","didRun","stream","renderToStream","_$memo","nonce","plugins","isbot","headers","get","pipeTo","responseStream","transformReadableStreamWithRouter","Response","status","state","statusCode"],"mappings":";;;;;AAQO,MAAMA,uBAAuB,OAAO;AAAA,EACzCC;AAAAA,EACAC;AAAAA,EACAC;AAAAA,EACAC;AAMF,MAAM;AACJ,QAAM;AAAA,IAAEC;AAAAA,IAAUC;AAAAA,EAAAA,IAAa,IAAIC,gBAAAA;AAEnC,QAAMC,UAAUC,MAAMC,IAAI,iBAAiB;AAE3C,QAAMC,wBACHT,OAAOU,SAAiBD,yBACxBT,OAAOU,QAAQF,KAAaC;AAC/B,QAAME,iBAAiBF,uBAAuBG,IAAI,CAACC,YAAiB;AAClE,UAAMC,SAASC,qBAAqBF,SAAS;AAAA,MAAEG,QAAQ;AAAA,IAAA,CAAO;AAC9D,WAAOF;AAAAA,EACT,CAAC;AAED,QAAMG,SAASV,MAAMW,eACnB,MAAA,CAEKZ,SAAOa,KACPjB,QAAQ,IAGb;AAAA,IACEkB,OAAOpB,OAAOU,QAAQF,KAAKY;AAAAA,IAC3BC,SAASV;AAAAA,EAAAA,CAEb;AAEA,MAAIW,MAAMvB,QAAQwB,QAAQC,IAAI,YAAY,CAAC,GAAG;AAC5C,UAAMP;AAAAA,EACR;AACAA,SAAOQ,OAAOtB,QAAQ;AAEtB,QAAMuB,iBAAiBC,kCACrB3B,QACAI,QACF;AACA,SAAO,IAAIwB,SAASF,gBAAuB;AAAA,IACzCG,QAAQ7B,OAAO8B,MAAMC;AAAAA,IACrBR,SAAStB;AAAAA,EAAAA,CACV;AACH;"}

package/dist/esm/ssr/renderRouterToString.d.ts

@@ -1,5 +1,5 @@
-import { JSXElement } from 'solid-js';
 import { AnyRouter } from '@tanstack/router-core';
+import { JSXElement } from 'solid-js';
 export declare const renderRouterToString: ({ router, responseHeaders, children, }: {
     router: AnyRouter;
     responseHeaders: Headers;

package/dist/esm/ssr/renderRouterToString.js

@@ -1,12 +1,21 @@
 import * as Solid from "solid-js/web";
+import { makeSsrSerovalPlugin } from "@tanstack/router-core";
 const renderRouterToString = async ({
   router,
   responseHeaders,
   children
 }) => {
   try {
+    const serializationAdapters = router.options?.serializationAdapters || router.options.ssr?.serializationAdapters;
+    const serovalPlugins = serializationAdapters?.map((adapter) => {
+      const plugin = makeSsrSerovalPlugin(adapter, {
+        didRun: false
+      });
+      return plugin;
+    });
     let html = Solid.renderToString(children, {
-      nonce: router.options.ssr?.nonce
+      nonce: router.options.ssr?.nonce,
+      plugins: serovalPlugins
     });
     router.serverSsr.setRenderFinished();
     const injectedHtml = await Promise.all(router.serverSsr.injectedHtml).then((htmls) => htmls.join(""));

package/dist/esm/ssr/renderRouterToString.js.map

@@ -1 +1 @@
-{"version":3,"file":"renderRouterToString.js","sources":["../../../src/ssr/renderRouterToString.tsx"],"sourcesContent":["import * as Solid from 'solid-js/web'\nimport type { JSXElement } from 'solid-js'\nimport type { AnyRouter } from '@tanstack/router-core'\n\nexport const renderRouterToString = async ({\n  router,\n  responseHeaders,\n  children,\n}: {\n  router: AnyRouter\n  responseHeaders: Headers\n  children: () => JSXElement\n}) => {\n  try {\n    let html = Solid.renderToString(children, {\n      nonce: router.options.ssr?.nonce,\n    })\n    router.serverSsr!.setRenderFinished()\n    const injectedHtml = await Promise.all(router.serverSsr!.injectedHtml).then(\n      (htmls) => htmls.join(''),\n    )\n    html = html.replace(`</body>`, `${injectedHtml}</body>`)\n    return new Response(`<!DOCTYPE html>${html}`, {\n      status: router.state.statusCode,\n      headers: responseHeaders,\n    })\n  } catch (error) {\n    console.error('Render to string error:', error)\n    return new Response('Internal Server Error', {\n      status: 500,\n      headers: responseHeaders,\n    })\n  }\n}\n"],"names":["renderRouterToString","router","responseHeaders","children","html","Solid","renderToString","nonce","options","ssr","serverSsr","setRenderFinished","injectedHtml","Promise","all","then","htmls","join","replace","Response","status","state","statusCode","headers","error","console"],"mappings":";AAIO,MAAMA,uBAAuB,OAAO;AAAA,EACzCC;AAAAA,EACAC;AAAAA,EACAC;AAKF,MAAM;AACJ,MAAI;AACF,QAAIC,OAAOC,MAAMC,eAAeH,UAAU;AAAA,MACxCI,OAAON,OAAOO,QAAQC,KAAKF;AAAAA,IAAAA,CAC5B;AACDN,WAAOS,UAAWC,kBAAAA;AAClB,UAAMC,eAAe,MAAMC,QAAQC,IAAIb,OAAOS,UAAWE,YAAY,EAAEG,KACpEC,CAAAA,UAAUA,MAAMC,KAAK,EAAE,CAC1B;AACAb,WAAOA,KAAKc,QAAQ,WAAW,GAAGN,YAAY,SAAS;AACvD,WAAO,IAAIO,SAAS,kBAAkBf,IAAI,IAAI;AAAA,MAC5CgB,QAAQnB,OAAOoB,MAAMC;AAAAA,MACrBC,SAASrB;AAAAA,IAAAA,CACV;AAAA,EACH,SAASsB,OAAO;AACdC,YAAQD,MAAM,2BAA2BA,KAAK;AAC9C,WAAO,IAAIL,SAAS,yBAAyB;AAAA,MAC3CC,QAAQ;AAAA,MACRG,SAASrB;AAAAA,IAAAA,CACV;AAAA,EACH;AACF;"}
+{"version":3,"file":"renderRouterToString.js","sources":["../../../src/ssr/renderRouterToString.tsx"],"sourcesContent":["import * as Solid from 'solid-js/web'\nimport { makeSsrSerovalPlugin } from '@tanstack/router-core'\nimport type { AnyRouter } from '@tanstack/router-core'\nimport type { JSXElement } from 'solid-js'\n\nexport const renderRouterToString = async ({\n  router,\n  responseHeaders,\n  children,\n}: {\n  router: AnyRouter\n  responseHeaders: Headers\n  children: () => JSXElement\n}) => {\n  try {\n    const serializationAdapters =\n      (router.options as any)?.serializationAdapters ||\n      (router.options.ssr as any)?.serializationAdapters\n    const serovalPlugins = serializationAdapters?.map((adapter: any) => {\n      const plugin = makeSsrSerovalPlugin(adapter, { didRun: false })\n      return plugin\n    })\n\n    let html = Solid.renderToString(children, {\n      nonce: router.options.ssr?.nonce,\n      plugins: serovalPlugins,\n    } as any)\n    router.serverSsr!.setRenderFinished()\n    const injectedHtml = await Promise.all(router.serverSsr!.injectedHtml).then(\n      (htmls) => htmls.join(''),\n    )\n    html = html.replace(`</body>`, `${injectedHtml}</body>`)\n    return new Response(`<!DOCTYPE html>${html}`, {\n      status: router.state.statusCode,\n      headers: responseHeaders,\n    })\n  } catch (error) {\n    console.error('Render to string error:', error)\n    return new Response('Internal Server Error', {\n      status: 500,\n      headers: responseHeaders,\n    })\n  }\n}\n"],"names":["renderRouterToString","router","responseHeaders","children","serializationAdapters","options","ssr","serovalPlugins","map","adapter","plugin","makeSsrSerovalPlugin","didRun","html","Solid","renderToString","nonce","plugins","serverSsr","setRenderFinished","injectedHtml","Promise","all","then","htmls","join","replace","Response","status","state","statusCode","headers","error","console"],"mappings":";;AAKO,MAAMA,uBAAuB,OAAO;AAAA,EACzCC;AAAAA,EACAC;AAAAA,EACAC;AAKF,MAAM;AACJ,MAAI;AACF,UAAMC,wBACHH,OAAOI,SAAiBD,yBACxBH,OAAOI,QAAQC,KAAaF;AAC/B,UAAMG,iBAAiBH,uBAAuBI,IAAI,CAACC,YAAiB;AAClE,YAAMC,SAASC,qBAAqBF,SAAS;AAAA,QAAEG,QAAQ;AAAA,MAAA,CAAO;AAC9D,aAAOF;AAAAA,IACT,CAAC;AAED,QAAIG,OAAOC,MAAMC,eAAeZ,UAAU;AAAA,MACxCa,OAAOf,OAAOI,QAAQC,KAAKU;AAAAA,MAC3BC,SAASV;AAAAA,IAAAA,CACH;AACRN,WAAOiB,UAAWC,kBAAAA;AAClB,UAAMC,eAAe,MAAMC,QAAQC,IAAIrB,OAAOiB,UAAWE,YAAY,EAAEG,KACpEC,CAAAA,UAAUA,MAAMC,KAAK,EAAE,CAC1B;AACAZ,WAAOA,KAAKa,QAAQ,WAAW,GAAGN,YAAY,SAAS;AACvD,WAAO,IAAIO,SAAS,kBAAkBd,IAAI,IAAI;AAAA,MAC5Ce,QAAQ3B,OAAO4B,MAAMC;AAAAA,MACrBC,SAAS7B;AAAAA,IAAAA,CACV;AAAA,EACH,SAAS8B,OAAO;AACdC,YAAQD,MAAM,2BAA2BA,KAAK;AAC9C,WAAO,IAAIL,SAAS,yBAAyB;AAAA,MAC3CC,QAAQ;AAAA,MACRG,SAAS7B;AAAAA,IAAAA,CACV;AAAA,EACH;AACF;"}

package/dist/source/awaited.jsx

@@ -11,7 +11,11 @@ export function useAwaited({ promise: _promise, }) {
     return [promise[TSR_DEFERRED_PROMISE].data, promise];
 }
 export function Await(props) {
-    const [resource] = Solid.createResource(() => props.promise);
+    const [resource] = Solid.createResource(() => defer(props.promise), 
+    // Simple passthrough - just return the promise for Solid to await
+    (p) => p, {
+        deferStream: true,
+    });
     return (<Solid.Show fallback={props.fallback} when={resource()}>
       {(data) => props.children(data())}
     </Solid.Show>);

package/dist/source/awaited.jsx.map

@@ -1 +1 @@
-{"version":3,"file":"awaited.jsx","sourceRoot":"","sources":["../../src/awaited.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,UAAU,CAAA;AAEjC,OAAO,EAAE,oBAAoB,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAA;AAQnE,MAAM,UAAU,UAAU,CAAI,EAC5B,OAAO,EAAE,QAAQ,GACD;IAChB,MAAM,OAAO,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAA;IAE/B,IAAI,OAAO,CAAC,oBAAoB,CAAC,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;QACvD,MAAM,OAAO,CAAA;IACf,CAAC;IAED,IAAI,OAAO,CAAC,oBAAoB,CAAC,CAAC,MAAM,KAAK,OAAO,EAAE,CAAC;QACrD,MAAM,OAAO,CAAC,oBAAoB,CAAC,CAAC,KAAK,CAAA;IAC3C,CAAC;IAED,OAAO,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;AACtD,CAAC;AAED,MAAM,UAAU,KAAK,CACnB,KAGC;IAED,MAAM,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAC,cAAc,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;IAE5D,OAAO,CACL,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC,CACrD;MAAA,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CACnC;IAAA,EAAE,KAAK,CAAC,IAAI,CAAC,CACd,CAAA;AACH,CAAC"}
+{"version":3,"file":"awaited.jsx","sourceRoot":"","sources":["../../src/awaited.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,UAAU,CAAA;AAEjC,OAAO,EAAE,oBAAoB,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAA;AAQnE,MAAM,UAAU,UAAU,CAAI,EAC5B,OAAO,EAAE,QAAQ,GACD;IAChB,MAAM,OAAO,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAA;IAE/B,IAAI,OAAO,CAAC,oBAAoB,CAAC,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;QACvD,MAAM,OAAO,CAAA;IACf,CAAC;IAED,IAAI,OAAO,CAAC,oBAAoB,CAAC,CAAC,MAAM,KAAK,OAAO,EAAE,CAAC;QACrD,MAAM,OAAO,CAAC,oBAAoB,CAAC,CAAC,KAAK,CAAA;IAC3C,CAAC;IAED,OAAO,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;AACtD,CAAC;AAED,MAAM,UAAU,KAAK,CACnB,KAGC;IAED,MAAM,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAC,cAAc,CACrC,GAAG,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC;IAC1B,kEAAkE;IAClE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EACR;QACE,WAAW,EAAE,IAAI;KAClB,CACF,CAAA;IAED,OAAO,CACL,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC,CACrD;MAAA,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CACnC;IAAA,EAAE,KAAK,CAAC,IAAI,CAAC,CACd,CAAA;AACH,CAAC"}

package/dist/source/ssr/renderRouterToStream.jsx

@@ -1,14 +1,22 @@
 import * as Solid from 'solid-js/web';
 import { isbot } from 'isbot';
 import { transformReadableStreamWithRouter } from '@tanstack/router-core/ssr/server';
+import { makeSsrSerovalPlugin } from '@tanstack/router-core';
 export const renderRouterToStream = async ({ request, router, responseHeaders, children, }) => {
     const { writable, readable } = new TransformStream();
     const docType = Solid.ssr('<!DOCTYPE html>');
+    const serializationAdapters = router.options?.serializationAdapters ||
+        router.options.ssr?.serializationAdapters;
+    const serovalPlugins = serializationAdapters?.map((adapter) => {
+        const plugin = makeSsrSerovalPlugin(adapter, { didRun: false });
+        return plugin;
+    });
     const stream = Solid.renderToStream(() => (<>
         {docType}
         {children()}
       </>), {
         nonce: router.options.ssr?.nonce,
+        plugins: serovalPlugins,
     });
     if (isbot(request.headers.get('User-Agent'))) {
         await stream;

package/dist/source/ssr/renderRouterToStream.jsx.map

@@ -1 +1 @@
-{"version":3,"file":"renderRouterToStream.jsx","sourceRoot":"","sources":["../../../src/ssr/renderRouterToStream.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAA;AAC7B,OAAO,EAAE,iCAAiC,EAAE,MAAM,kCAAkC,CAAA;AAKpF,MAAM,CAAC,MAAM,oBAAoB,GAAG,KAAK,EAAE,EACzC,OAAO,EACP,MAAM,EACN,eAAe,EACf,QAAQ,GAMT,EAAE,EAAE;IACH,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,IAAI,eAAe,EAAE,CAAA;IAEpD,MAAM,OAAO,GAAG,KAAK,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAA;IAE5C,MAAM,MAAM,GAAG,KAAK,CAAC,cAAc,CACjC,GAAG,EAAE,CAAC,CACJ,EACE;QAAA,CAAC,OAAO,CACR;QAAA,CAAC,QAAQ,EAAE,CACb;MAAA,GAAG,CACJ,EACD;QACE,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK;KACjC,CACF,CAAA;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,EAAE,CAAC;QAC7C,MAAM,MAAM,CAAA;IACd,CAAC;IACD,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;IAEvB,MAAM,cAAc,GAAG,iCAAiC,CACtD,MAAM,EACN,QAAqC,CACtC,CAAA;IACD,OAAO,IAAI,QAAQ,CAAC,cAAqB,EAAE;QACzC,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,UAAU;QAC/B,OAAO,EAAE,eAAe;KACzB,CAAC,CAAA;AACJ,CAAC,CAAA"}
+{"version":3,"file":"renderRouterToStream.jsx","sourceRoot":"","sources":["../../../src/ssr/renderRouterToStream.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAA;AAC7B,OAAO,EAAE,iCAAiC,EAAE,MAAM,kCAAkC,CAAA;AACpF,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAA;AAK5D,MAAM,CAAC,MAAM,oBAAoB,GAAG,KAAK,EAAE,EACzC,OAAO,EACP,MAAM,EACN,eAAe,EACf,QAAQ,GAMT,EAAE,EAAE;IACH,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,IAAI,eAAe,EAAE,CAAA;IAEpD,MAAM,OAAO,GAAG,KAAK,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAA;IAE5C,MAAM,qBAAqB,GACxB,MAAM,CAAC,OAAe,EAAE,qBAAqB;QAC7C,MAAM,CAAC,OAAO,CAAC,GAAW,EAAE,qBAAqB,CAAA;IACpD,MAAM,cAAc,GAAG,qBAAqB,EAAE,GAAG,CAAC,CAAC,OAAY,EAAE,EAAE;QACjE,MAAM,MAAM,GAAG,oBAAoB,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAA;QAC/D,OAAO,MAAM,CAAA;IACf,CAAC,CAAC,CAAA;IAEF,MAAM,MAAM,GAAG,KAAK,CAAC,cAAc,CACjC,GAAG,EAAE,CAAC,CACJ,EACE;QAAA,CAAC,OAAO,CACR;QAAA,CAAC,QAAQ,EAAE,CACb;MAAA,GAAG,CACJ,EACD;QACE,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK;QAChC,OAAO,EAAE,cAAc;KACjB,CACT,CAAA;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,EAAE,CAAC;QAC7C,MAAM,MAAM,CAAA;IACd,CAAC;IACD,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;IAEvB,MAAM,cAAc,GAAG,iCAAiC,CACtD,MAAM,EACN,QAAqC,CACtC,CAAA;IACD,OAAO,IAAI,QAAQ,CAAC,cAAqB,EAAE;QACzC,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,UAAU;QAC/B,OAAO,EAAE,eAAe;KACzB,CAAC,CAAA;AACJ,CAAC,CAAA"}

package/dist/source/ssr/renderRouterToString.d.ts

@@ -1,5 +1,5 @@
-import type { JSXElement } from 'solid-js';
 import type { AnyRouter } from '@tanstack/router-core';
+import type { JSXElement } from 'solid-js';
 export declare const renderRouterToString: ({ router, responseHeaders, children, }: {
     router: AnyRouter;
     responseHeaders: Headers;

package/dist/source/ssr/renderRouterToString.jsx

@@ -1,8 +1,16 @@
 import * as Solid from 'solid-js/web';
+import { makeSsrSerovalPlugin } from '@tanstack/router-core';
 export const renderRouterToString = async ({ router, responseHeaders, children, }) => {
     try {
+        const serializationAdapters = router.options?.serializationAdapters ||
+            router.options.ssr?.serializationAdapters;
+        const serovalPlugins = serializationAdapters?.map((adapter) => {
+            const plugin = makeSsrSerovalPlugin(adapter, { didRun: false });
+            return plugin;
+        });
         let html = Solid.renderToString(children, {
             nonce: router.options.ssr?.nonce,
+            plugins: serovalPlugins,
         });
         router.serverSsr.setRenderFinished();
         const injectedHtml = await Promise.all(router.serverSsr.injectedHtml).then((htmls) => htmls.join(''));

package/dist/source/ssr/renderRouterToString.jsx.map

@@ -1 +1 @@
-{"version":3,"file":"renderRouterToString.jsx","sourceRoot":"","sources":["../../../src/ssr/renderRouterToString.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAIrC,MAAM,CAAC,MAAM,oBAAoB,GAAG,KAAK,EAAE,EACzC,MAAM,EACN,eAAe,EACf,QAAQ,GAKT,EAAE,EAAE;IACH,IAAI,CAAC;QACH,IAAI,IAAI,GAAG,KAAK,CAAC,cAAc,CAAC,QAAQ,EAAE;YACxC,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK;SACjC,CAAC,CAAA;QACF,MAAM,CAAC,SAAU,CAAC,iBAAiB,EAAE,CAAA;QACrC,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,SAAU,CAAC,YAAY,CAAC,CAAC,IAAI,CACzE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAC1B,CAAA;QACD,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,GAAG,YAAY,SAAS,CAAC,CAAA;QACxD,OAAO,IAAI,QAAQ,CAAC,kBAAkB,IAAI,EAAE,EAAE;YAC5C,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,UAAU;YAC/B,OAAO,EAAE,eAAe;SACzB,CAAC,CAAA;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,yBAAyB,EAAE,KAAK,CAAC,CAAA;QAC/C,OAAO,IAAI,QAAQ,CAAC,uBAAuB,EAAE;YAC3C,MAAM,EAAE,GAAG;YACX,OAAO,EAAE,eAAe;SACzB,CAAC,CAAA;IACJ,CAAC;AACH,CAAC,CAAA"}
+{"version":3,"file":"renderRouterToString.jsx","sourceRoot":"","sources":["../../../src/ssr/renderRouterToString.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAA;AAI5D,MAAM,CAAC,MAAM,oBAAoB,GAAG,KAAK,EAAE,EACzC,MAAM,EACN,eAAe,EACf,QAAQ,GAKT,EAAE,EAAE;IACH,IAAI,CAAC;QACH,MAAM,qBAAqB,GACxB,MAAM,CAAC,OAAe,EAAE,qBAAqB;YAC7C,MAAM,CAAC,OAAO,CAAC,GAAW,EAAE,qBAAqB,CAAA;QACpD,MAAM,cAAc,GAAG,qBAAqB,EAAE,GAAG,CAAC,CAAC,OAAY,EAAE,EAAE;YACjE,MAAM,MAAM,GAAG,oBAAoB,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAA;YAC/D,OAAO,MAAM,CAAA;QACf,CAAC,CAAC,CAAA;QAEF,IAAI,IAAI,GAAG,KAAK,CAAC,cAAc,CAAC,QAAQ,EAAE;YACxC,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK;YAChC,OAAO,EAAE,cAAc;SACjB,CAAC,CAAA;QACT,MAAM,CAAC,SAAU,CAAC,iBAAiB,EAAE,CAAA;QACrC,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,SAAU,CAAC,YAAY,CAAC,CAAC,IAAI,CACzE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAC1B,CAAA;QACD,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,GAAG,YAAY,SAAS,CAAC,CAAA;QACxD,OAAO,IAAI,QAAQ,CAAC,kBAAkB,IAAI,EAAE,EAAE;YAC5C,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,UAAU;YAC/B,OAAO,EAAE,eAAe;SACzB,CAAC,CAAA;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,yBAAyB,EAAE,KAAK,CAAC,CAAA;QAC/C,OAAO,IAAI,QAAQ,CAAC,uBAAuB,EAAE;YAC3C,MAAM,EAAE,GAAG;YACX,OAAO,EAAE,eAAe;SACzB,CAAC,CAAA;IACJ,CAAC;AACH,CAAC,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/solid-router",
-  "version": "1.133.31",
+  "version": "1.133.35",
   "description": "Modern and scalable routing for Solid applications",
   "author": "Tanner Linsley",
   "license": "MIT",
@@ -89,19 +89,19 @@
     "tiny-invariant": "^1.3.3",
     "tiny-warning": "^1.0.3",
     "@tanstack/history": "1.133.28",
-    "@tanstack/router-core": "1.133.28"
+    "@tanstack/router-core": "1.133.35"
   },
   "devDependencies": {
     "@solidjs/testing-library": "^0.8.10",
     "@testing-library/jest-dom": "^6.6.3",
     "combinate": "^1.1.11",
     "eslint-plugin-solid": "^0.14.5",
-    "solid-js": "^1.9.9",
+    "solid-js": "^1.9.10",
     "vite-plugin-solid": "^2.11.10",
     "zod": "^3.23.8"
   },
   "peerDependencies": {
-    "solid-js": "^1.9.9"
+    "solid-js": "^1.9.10"
   },
   "scripts": {
     "clean": "rimraf ./dist && rimraf ./coverage",

package/src/awaited.tsx

@@ -30,7 +30,14 @@ export function Await<T>(
     children: (result: T) => SolidNode
   },
 ) {
-  const [resource] = Solid.createResource(() => props.promise)
+  const [resource] = Solid.createResource(
+    () => defer(props.promise),
+    // Simple passthrough - just return the promise for Solid to await
+    (p) => p,
+    {
+      deferStream: true,
+    },
+  )
 
   return (
     <Solid.Show fallback={props.fallback} when={resource()}>

package/src/ssr/renderRouterToStream.tsx

@@ -1,6 +1,7 @@
 import * as Solid from 'solid-js/web'
 import { isbot } from 'isbot'
 import { transformReadableStreamWithRouter } from '@tanstack/router-core/ssr/server'
+import { makeSsrSerovalPlugin } from '@tanstack/router-core'
 import type { JSXElement } from 'solid-js'
 import type { ReadableStream } from 'node:stream/web'
 import type { AnyRouter } from '@tanstack/router-core'
@@ -20,6 +21,14 @@ export const renderRouterToStream = async ({
 
   const docType = Solid.ssr('<!DOCTYPE html>')
 
+  const serializationAdapters =
+    (router.options as any)?.serializationAdapters ||
+    (router.options.ssr as any)?.serializationAdapters
+  const serovalPlugins = serializationAdapters?.map((adapter: any) => {
+    const plugin = makeSsrSerovalPlugin(adapter, { didRun: false })
+    return plugin
+  })
+
   const stream = Solid.renderToStream(
     () => (
       <>
@@ -29,7 +38,8 @@ export const renderRouterToStream = async ({
     ),
     {
       nonce: router.options.ssr?.nonce,
-    },
+      plugins: serovalPlugins,
+    } as any,
   )
 
   if (isbot(request.headers.get('User-Agent'))) {

package/src/ssr/renderRouterToString.tsx

@@ -1,6 +1,7 @@
 import * as Solid from 'solid-js/web'
-import type { JSXElement } from 'solid-js'
+import { makeSsrSerovalPlugin } from '@tanstack/router-core'
 import type { AnyRouter } from '@tanstack/router-core'
+import type { JSXElement } from 'solid-js'
 
 export const renderRouterToString = async ({
   router,
@@ -12,9 +13,18 @@ export const renderRouterToString = async ({
   children: () => JSXElement
 }) => {
   try {
+    const serializationAdapters =
+      (router.options as any)?.serializationAdapters ||
+      (router.options.ssr as any)?.serializationAdapters
+    const serovalPlugins = serializationAdapters?.map((adapter: any) => {
+      const plugin = makeSsrSerovalPlugin(adapter, { didRun: false })
+      return plugin
+    })
+
     let html = Solid.renderToString(children, {
       nonce: router.options.ssr?.nonce,
-    })
+      plugins: serovalPlugins,
+    } as any)
     router.serverSsr!.setRenderFinished()
     const injectedHtml = await Promise.all(router.serverSsr!.injectedHtml).then(
       (htmls) => htmls.join(''),