@tanstack/solid-start-server - npm Package Compare versions

Comparing version 1.121.34 to 1.121.39

dist/cjs/defaultRenderHandler.cjs

 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const Solid = require("solid-js/web");
+const web = require("solid-js/web");
 const startServerCore = require("@tanstack/start-server-core");
+const server = require("@tanstack/solid-router/ssr/server");
 const StartServer = require("./StartServer.cjs");
-function _interopNamespaceDefault(e) {
-  const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });
-  if (e) {
-    for (const k in e) {
-      if (k !== "default") {
-        const d = Object.getOwnPropertyDescriptor(e, k);
-        Object.defineProperty(n, k, d.get ? d : {
-          enumerable: true,
-          get: () => e[k]
-        });
-      }
-    }
-  }
-  n.default = e;
-  return Object.freeze(n);
-}
-const Solid__namespace = /* @__PURE__ */ _interopNamespaceDefault(Solid);
-const defaultRenderHandler = startServerCore.defineHandlerCallback(async ({
+const defaultRenderHandler = startServerCore.defineHandlerCallback(({
   router,
   responseHeaders
-}) => {
-  try {
-    let html = Solid__namespace.renderToString(() => Solid.createComponent(StartServer.StartServer, {
-      router
-    }));
-    const injectedHtml = await Promise.all(router.serverSsr.injectedHtml).then((htmls) => htmls.join(""));
-    html = html.replace(`</body>`, `${injectedHtml}</body>`);
-    return new Response(html, {
-      status: router.state.statusCode,
-      headers: responseHeaders
-    });
-  } catch (error) {
-    console.error("Render to string error:", error);
-    return new Response("Internal Server Error", {
-      status: 500,
-      headers: responseHeaders
-    });
-  }
-});
+}) => server.renderRouterToString({
+  router,
+  responseHeaders,
+  children: () => web.createComponent(StartServer.StartServer, {
+    router
+  })
+}));
 exports.defaultRenderHandler = defaultRenderHandler;
 //# sourceMappingURL=defaultRenderHandler.cjs.map

dist/cjs/defaultRenderHandler.cjs.map

@@ -1,1 +0,1 @@
-{"version":3,"file":"defaultRenderHandler.cjs","sources":["../../src/defaultRenderHandler.tsx"],"sourcesContent":["import * as Solid from 'solid-js/web'\nimport { defineHandlerCallback } from '@tanstack/start-server-core'\nimport { StartServer } from './StartServer'\n\nexport const defaultRenderHandler = defineHandlerCallback(\n  async ({ router, responseHeaders }) => {\n    try {\n      let html = Solid.renderToString(() => <StartServer router={router} />)\n      const injectedHtml = await Promise.all(\n        router.serverSsr!.injectedHtml,\n      ).then((htmls) => htmls.join(''))\n      html = html.replace(`</body>`, `${injectedHtml}</body>`)\n      return new Response(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)\n"],"names":["defaultRenderHandler","defineHandlerCallback","router","responseHeaders","html","Solid","renderToString","_$createComponent","StartServer","injectedHtml","Promise","all","serverSsr","then","htmls","join","replace","Response","status","state","statusCode","headers","error"],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAIaA,MAAAA,uBAAuBC,sCAClC,OAAO;AAAA,EAAEC;AAAAA,EAAQC;AAAgB,MAAM;AACjC,MAAA;AACF,QAAIC,OAAOC,iBAAMC,eAAe,MAAAC,MAAAA,gBAAOC,YAAAA,aAAW;AAAA,MAACN;AAAAA,IAAAA,CAAc,CAAI;AACrE,UAAMO,eAAe,MAAMC,QAAQC,IACjCT,OAAOU,UAAWH,YACpB,EAAEI,KAAMC,CAAAA,UAAUA,MAAMC,KAAK,EAAE,CAAC;AAChCX,WAAOA,KAAKY,QAAQ,WAAW,GAAGP,YAAY,SAAS;AAChD,WAAA,IAAIQ,SAASb,MAAM;AAAA,MACxBc,QAAQhB,OAAOiB,MAAMC;AAAAA,MACrBC,SAASlB;AAAAA,IAAAA,CACV;AAAA,WACMmB,OAAO;AACNA,YAAAA,MAAM,2BAA2BA,KAAK;AACvC,WAAA,IAAIL,SAAS,yBAAyB;AAAA,MAC3CC,QAAQ;AAAA,MACRG,SAASlB;AAAAA,IAAAA,CACV;AAAA,EAAA;AAEL,CACF;;"}
+{"version":3,"file":"defaultRenderHandler.cjs","sources":["../../src/defaultRenderHandler.tsx"],"sourcesContent":["import { defineHandlerCallback } from '@tanstack/start-server-core'\nimport { renderRouterToString } from '@tanstack/solid-router/ssr/server'\nimport { StartServer } from './StartServer'\n\nexport const defaultRenderHandler = defineHandlerCallback(\n  ({ router, responseHeaders }) =>\n    renderRouterToString({\n      router,\n      responseHeaders,\n      children: () => <StartServer router={router} />,\n    }),\n)\n"],"names":["defaultRenderHandler","defineHandlerCallback","router","responseHeaders","renderRouterToString","children","_$createComponent","StartServer"],"mappings":";;;;;;AAIaA,MAAAA,uBAAuBC,sCAClC,CAAC;AAAA,EAAEC;AAAAA,EAAQC;AAAgB,MACzBC,4BAAqB;AAAA,EACnBF;AAAAA,EACAC;AAAAA,EACAE,UAAUA,MAAAC,IAAAA,gBAAOC,yBAAW;AAAA,IAACL;AAAAA,EAAc,CAAA;AAC7C,CAAC,CACL;;"}

dist/cjs/defaultStreamHandler.cjs

 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const Solid = require("solid-js/web");
-const isbot = require("isbot");
+const web = require("solid-js/web");
 const startServerCore = require("@tanstack/start-server-core");
+const server = require("@tanstack/solid-router/ssr/server");
 const StartServer = require("./StartServer.cjs");
-function _interopNamespaceDefault(e) {
-  const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });
-  if (e) {
-    for (const k in e) {
-      if (k !== "default") {
-        const d = Object.getOwnPropertyDescriptor(e, k);
-        Object.defineProperty(n, k, d.get ? d : {
-          enumerable: true,
-          get: () => e[k]
-        });
-      }
-    }
-  }
-  n.default = e;
-  return Object.freeze(n);
-}
-const Solid__namespace = /* @__PURE__ */ _interopNamespaceDefault(Solid);
 const defaultStreamHandler = startServerCore.defineHandlerCallback(async ({
@@ -28,21 +11,11 @@ request,
   responseHeaders
-}) => {
-  const {
-    writable,
-    readable
-  } = new TransformStream();
-  const stream = Solid__namespace.renderToStream(() => Solid.createComponent(StartServer.StartServer, {
+}) => await server.renderRouterToStream({
+  request,
+  router,
+  responseHeaders,
+  children: () => web.createComponent(StartServer.StartServer, {
     router
-  }));
-  if (isbot.isbot(request.headers.get("User-Agent"))) {
-    await stream;
-  }
-  stream.pipeTo(writable);
-  const responseStream = startServerCore.transformReadableStreamWithRouter(router, readable);
-  return new Response(responseStream, {
-    status: router.state.statusCode,
-    headers: responseHeaders
-  });
-});
+  })
+}));
 exports.defaultStreamHandler = defaultStreamHandler;
 //# sourceMappingURL=defaultStreamHandler.cjs.map

dist/cjs/defaultStreamHandler.cjs.map

@@ -1,1 +0,1 @@
-{"version":3,"file":"defaultStreamHandler.cjs","sources":["../../src/defaultStreamHandler.tsx"],"sourcesContent":["import { isbot } from 'isbot'\nimport * as Solid from 'solid-js/web'\n\nimport {\n  defineHandlerCallback,\n  transformReadableStreamWithRouter,\n} from '@tanstack/start-server-core'\n\nimport { StartServer } from './StartServer'\nimport type { ReadableStream } from 'node:stream/web'\n\nexport const defaultStreamHandler = defineHandlerCallback(\n  async ({ request, router, responseHeaders }) => {\n    const { writable, readable } = new TransformStream()\n\n    const stream = Solid.renderToStream(() => <StartServer router={router} />)\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)\n"],"names":["defaultStreamHandler","defineHandlerCallback","request","router","responseHeaders","writable","readable","TransformStream","stream","Solid","renderToStream","_$createComponent","StartServer","isbot","headers","get","pipeTo","responseStream","transformReadableStreamWithRouter","Response","status","state","statusCode"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAWaA,MAAAA,uBAAuBC,sCAClC,OAAO;AAAA,EAAEC;AAAAA,EAASC;AAAAA,EAAQC;AAAgB,MAAM;AACxC,QAAA;AAAA,IAAEC;AAAAA,IAAUC;AAAAA,EAAS,IAAI,IAAIC,gBAAgB;AAEnD,QAAMC,SAASC,iBAAMC,eAAe,MAAAC,MAAAA,gBAAOC,YAAAA,aAAW;AAAA,IAACT;AAAAA,EAAAA,CAAc,CAAI;AAEzE,MAAIU,MAAAA,MAAMX,QAAQY,QAAQC,IAAI,YAAY,CAAC,GAAG;AACtCP,UAAAA;AAAAA,EAAAA;AAERA,SAAOQ,OAAOX,QAAQ;AAEhBY,QAAAA,iBAAiBC,gBAAAA,kCACrBf,QACAG,QACF;AACO,SAAA,IAAIa,SAASF,gBAAuB;AAAA,IACzCG,QAAQjB,OAAOkB,MAAMC;AAAAA,IACrBR,SAASV;AAAAA,EAAAA,CACV;AACH,CACF;;"}
+{"version":3,"file":"defaultStreamHandler.cjs","sources":["../../src/defaultStreamHandler.tsx"],"sourcesContent":["import { defineHandlerCallback } from '@tanstack/start-server-core'\nimport { renderRouterToStream } from '@tanstack/solid-router/ssr/server'\nimport { StartServer } from './StartServer'\n\nexport const defaultStreamHandler = defineHandlerCallback(\n  async ({ request, router, responseHeaders }) =>\n    await renderRouterToStream({\n      request,\n      router,\n      responseHeaders,\n      children: () => <StartServer router={router} />,\n    }),\n)\n"],"names":["defaultStreamHandler","defineHandlerCallback","request","router","responseHeaders","renderRouterToStream","children","_$createComponent","StartServer"],"mappings":";;;;;;AAIaA,MAAAA,uBAAuBC,sCAClC,OAAO;AAAA,EAAEC;AAAAA,EAASC;AAAAA,EAAQC;AAAgB,MACxC,MAAMC,OAAAA,qBAAqB;AAAA,EACzBH;AAAAA,EACAC;AAAAA,EACAC;AAAAA,EACAE,UAAUA,MAAAC,IAAAA,gBAAOC,yBAAW;AAAA,IAACL;AAAAA,EAAc,CAAA;AAC7C,CAAC,CACL;;"}

dist/cjs/StartServer.cjs

 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const Solid = require("solid-js/web");
+const web = require("solid-js/web");
 const solidRouter = require("@tanstack/solid-router");
@@ -9,6 +9,6 @@ const meta = require("@solidjs/meta");
   const tags = solidRouter.useTags();
-  Solid.useAssets(() => {
-    return Solid.createComponent(meta.MetaProvider, {
+  web.useAssets(() => {
+    return web.createComponent(meta.MetaProvider, {
       get children() {
-        return tags().map((tag) => Solid.createComponent(solidRouter.Asset, tag));
+        return tags().map((tag) => web.createComponent(solidRouter.Asset, tag));
       }
@@ -19,25 +19,25 @@ });
 }
-const docType = Solid.ssr("<!DOCTYPE html>");
+const docType = web.ssr("<!DOCTYPE html>");
 function StartServer(props) {
-  return Solid.createComponent(Solid.NoHydration, {
+  return web.createComponent(web.NoHydration, {
     get children() {
-      return [docType, Solid.ssr(_tmpl$2, Solid.createComponent(Solid.NoHydration, {
+      return [docType, web.ssr(_tmpl$2, web.createComponent(web.NoHydration, {
         get children() {
-          return Solid.ssr(_tmpl$, Solid.escape(Solid.createComponent(Solid.HydrationScript, {})));
+          return web.ssr(_tmpl$, web.escape(web.createComponent(web.HydrationScript, {})));
         }
-      }), Solid.escape(Solid.createComponent(Solid.Hydration, {
+      }), web.escape(web.createComponent(web.Hydration, {
         get children() {
-          return Solid.createComponent(solidRouter.RouterProvider, {
+          return web.createComponent(solidRouter.RouterProvider, {
             get router() {
               return props.router;
             },
-            InnerWrap: (props2) => Solid.createComponent(Solid.NoHydration, {
+            InnerWrap: (props2) => web.createComponent(web.NoHydration, {
               get children() {
-                return Solid.createComponent(meta.MetaProvider, {
+                return web.createComponent(meta.MetaProvider, {
                   get children() {
-                    return [Solid.createComponent(ServerHeadContent, {}), Solid.createComponent(Solid.Hydration, {
+                    return [web.createComponent(ServerHeadContent, {}), web.createComponent(web.Hydration, {
                       get children() {
                         return props2.children;
                       }
-                    }), Solid.createComponent(solidRouter.Scripts, {})];
+                    }), web.createComponent(solidRouter.Scripts, {})];
                   }
@@ -44,0 +44,0 @@ });

dist/cjs/StartServer.cjs.map

@@ -1,1 +0,1 @@
-{"version":3,"file":"StartServer.cjs","sources":["../../src/StartServer.tsx"],"sourcesContent":["import { Asset, RouterProvider, Scripts, useTags } from '@tanstack/solid-router'\nimport {\n  Hydration,\n  HydrationScript,\n  NoHydration,\n  ssr,\n  useAssets,\n} from 'solid-js/web'\nimport { MetaProvider } from '@solidjs/meta'\nimport type { AnyRouter } from '@tanstack/router-core'\n\nexport function ServerHeadContent() {\n  const tags = useTags()\n  useAssets(() => {\n    return (\n      <MetaProvider>\n        {tags().map((tag) => (\n          <Asset {...tag} />\n        ))}\n      </MetaProvider>\n    )\n  })\n  return null\n}\n\nconst docType = ssr('<!DOCTYPE html>')\n\nexport function StartServer<TRouter extends AnyRouter>(props: {\n  router: TRouter\n}) {\n  return (\n    <NoHydration>\n      {docType as any}\n      <html>\n        <head>\n          <HydrationScript />\n        </head>\n        <body>\n          <Hydration>\n            <RouterProvider\n              router={props.router}\n              InnerWrap={(props) => (\n                <NoHydration>\n                  <MetaProvider>\n                    <ServerHeadContent />\n                    <Hydration>{props.children}</Hydration>\n                    <Scripts />\n                  </MetaProvider>\n                </NoHydration>\n              )}\n            />\n          </Hydration>\n        </body>\n      </html>\n    </NoHydration>\n  )\n}\n"],"names":["ServerHeadContent","tags","useTags","useAssets","_$createComponent","MetaProvider","children","map","tag","Asset","docType","ssr","StartServer","props","NoHydration","_$ssr","_tmpl$2","_$NoHydration","_tmpl$","_$escape","HydrationScript","Hydration","RouterProvider","router","InnerWrap","Scripts"],"mappings":";;;;;;AAWO,SAASA,oBAAoB;AAClC,QAAMC,OAAOC,YAAAA,QAAQ;AACrBC,QAAAA,UAAU,MAAM;AACd,WAAAC,MAAAA,gBACGC,KAAAA,cAAY;AAAA,MAAA,IAAAC,WAAA;AAAA,eACVL,KAAOM,EAAAA,IAAKC,SAAGJ,sBACbK,YAAAA,OAAUD,GAAG,CACf;AAAA,MAAA;AAAA,IAAC,CAAA;AAAA,EAAA,CAGP;AACM,SAAA;AACT;AAEA,MAAME,UAAUC,UAAI,iBAAiB;AAE9B,SAASC,YAAuCC,OAEpD;AACD,SAAAT,MAAAA,gBACGU,MAAAA,aAAW;AAAA,IAAA,IAAAR,WAAA;AAAA,aACTI,CAAAA,SAAcK,MAAAA,IAAAC,SAAAZ,MAAAA,gBAAAa,MAAAA,aAAA;AAAA,QAAA,IAAAX,WAAA;AAAAS,iBAAAA,MAAAA,IAAAG,QAAAC,MAAAf,OAAAA,MAAAA,gBAGVgB,uBAAe,CAAA,CAAA,CAAA,CAAA;AAAA,QAAA;AAAA,MAAA,CAAA,GAAAD,MAAAA,OAAAf,MAAAA,gBAGfiB,iBAAS;AAAA,QAAA,IAAAf,WAAA;AAAA,iBAAAF,MAAAA,gBACPkB,YAAAA,gBAAc;AAAA,YAAA,IACbC,SAAM;AAAA,qBAAEV,MAAMU;AAAAA,YAAM;AAAA,YACpBC,WAAYX,CAAAA,WAAKT,MAAAA,gBACdU,mBAAW;AAAA,cAAA,IAAAR,WAAA;AAAA,uBAAAF,MAAAA,gBACTC,KAAAA,cAAY;AAAA,kBAAA,IAAAC,WAAA;AAAA,2BAAA,CAAAF,MACVJ,gBAAAA,mBAAiBI,CAAAA,CAAAA,GAAAA,MAAAA,gBACjBiB,MAAAA,WAAS;AAAA,sBAAA,IAAAf,WAAA;AAAA,+BAAEO,OAAMP;AAAAA,sBAAAA;AAAAA,oBAAQF,CAAAA,GAAAA,MAAAA,gBACzBqB,qBAAO,CAAA,CAAA,CAAA;AAAA,kBAAA;AAAA,gBAAA,CAAA;AAAA,cAAA;AAAA,YAAA,CAAA;AAAA,UAAA,CAGb;AAAA,QAAA;AAAA,MAAA,CAAA,CAAA,CAAA,CAAA;AAAA,IAAA;AAAA,EAAA,CAAA;AAOf;;;"}
+{"version":3,"file":"StartServer.cjs","sources":["../../src/StartServer.tsx"],"sourcesContent":["import { Asset, RouterProvider, Scripts, useTags } from '@tanstack/solid-router'\nimport {\n  Hydration,\n  HydrationScript,\n  NoHydration,\n  ssr,\n  useAssets,\n} from 'solid-js/web'\nimport { MetaProvider } from '@solidjs/meta'\nimport type { AnyRouter } from '@tanstack/router-core'\n\nexport function ServerHeadContent() {\n  const tags = useTags()\n  useAssets(() => {\n    return (\n      <MetaProvider>\n        {tags().map((tag) => (\n          <Asset {...tag} />\n        ))}\n      </MetaProvider>\n    )\n  })\n  return null\n}\n\nconst docType = ssr('<!DOCTYPE html>')\n\nexport function StartServer<TRouter extends AnyRouter>(props: {\n  router: TRouter\n}) {\n  return (\n    <NoHydration>\n      {docType as any}\n      <html>\n        <head>\n          <HydrationScript />\n        </head>\n        <body>\n          <Hydration>\n            <RouterProvider\n              router={props.router}\n              InnerWrap={(props) => (\n                <NoHydration>\n                  <MetaProvider>\n                    <ServerHeadContent />\n                    <Hydration>{props.children}</Hydration>\n                    <Scripts />\n                  </MetaProvider>\n                </NoHydration>\n              )}\n            />\n          </Hydration>\n        </body>\n      </html>\n    </NoHydration>\n  )\n}\n"],"names":["ServerHeadContent","tags","useTags","useAssets","_$createComponent","MetaProvider","children","map","tag","Asset","docType","ssr","StartServer","props","NoHydration","_$ssr","_tmpl$2","_$NoHydration","_tmpl$","_$escape","HydrationScript","Hydration","RouterProvider","router","InnerWrap","Scripts"],"mappings":";;;;;;AAWO,SAASA,oBAAoB;AAClC,QAAMC,OAAOC,YAAAA,QAAQ;AACrBC,MAAAA,UAAU,MAAM;AACd,WAAAC,IAAAA,gBACGC,KAAAA,cAAY;AAAA,MAAA,IAAAC,WAAA;AAAA,eACVL,KAAOM,EAAAA,IAAKC,SAAGJ,oBACbK,YAAAA,OAAUD,GAAG,CACf;AAAA,MAAA;AAAA,IAAC,CAAA;AAAA,EAAA,CAGP;AACM,SAAA;AACT;AAEA,MAAME,UAAUC,QAAI,iBAAiB;AAE9B,SAASC,YAAuCC,OAEpD;AACD,SAAAT,IAAAA,gBACGU,IAAAA,aAAW;AAAA,IAAA,IAAAR,WAAA;AAAA,aACTI,CAAAA,SAAcK,IAAAA,IAAAC,SAAAZ,IAAAA,gBAAAa,IAAAA,aAAA;AAAA,QAAA,IAAAX,WAAA;AAAAS,iBAAAA,IAAAA,IAAAG,QAAAC,IAAAf,OAAAA,IAAAA,gBAGVgB,qBAAe,CAAA,CAAA,CAAA,CAAA;AAAA,QAAA;AAAA,MAAA,CAAA,GAAAD,IAAAA,OAAAf,IAAAA,gBAGfiB,eAAS;AAAA,QAAA,IAAAf,WAAA;AAAA,iBAAAF,IAAAA,gBACPkB,YAAAA,gBAAc;AAAA,YAAA,IACbC,SAAM;AAAA,qBAAEV,MAAMU;AAAAA,YAAM;AAAA,YACpBC,WAAYX,CAAAA,WAAKT,IAAAA,gBACdU,iBAAW;AAAA,cAAA,IAAAR,WAAA;AAAA,uBAAAF,IAAAA,gBACTC,KAAAA,cAAY;AAAA,kBAAA,IAAAC,WAAA;AAAA,2BAAA,CAAAF,IACVJ,gBAAAA,mBAAiBI,CAAAA,CAAAA,GAAAA,IAAAA,gBACjBiB,IAAAA,WAAS;AAAA,sBAAA,IAAAf,WAAA;AAAA,+BAAEO,OAAMP;AAAAA,sBAAAA;AAAAA,oBAAQF,CAAAA,GAAAA,IAAAA,gBACzBqB,qBAAO,CAAA,CAAA,CAAA;AAAA,kBAAA;AAAA,gBAAA,CAAA;AAAA,cAAA;AAAA,YAAA,CAAA;AAAA,UAAA,CAGb;AAAA,QAAA;AAAA,MAAA,CAAA,CAAA,CAAA,CAAA;AAAA,IAAA;AAAA,EAAA,CAAA;AAOf;;;"}

dist/esm/defaultRenderHandler.js

@@ -1,27 +0,15 @@
-import * as Solid from "solid-js/web";
 import { createComponent } from "solid-js/web";
 import { defineHandlerCallback } from "@tanstack/start-server-core";
+import { renderRouterToString } from "@tanstack/solid-router/ssr/server";
 import { StartServer } from "./StartServer.js";
-const defaultRenderHandler = defineHandlerCallback(async ({
+const defaultRenderHandler = defineHandlerCallback(({
   router,
   responseHeaders
-}) => {
-  try {
-    let html = Solid.renderToString(() => createComponent(StartServer, {
-      router
-    }));
-    const injectedHtml = await Promise.all(router.serverSsr.injectedHtml).then((htmls) => htmls.join(""));
-    html = html.replace(`</body>`, `${injectedHtml}</body>`);
-    return new Response(html, {
-      status: router.state.statusCode,
-      headers: responseHeaders
-    });
-  } catch (error) {
-    console.error("Render to string error:", error);
-    return new Response("Internal Server Error", {
-      status: 500,
-      headers: responseHeaders
-    });
-  }
-});
+}) => renderRouterToString({
+  router,
+  responseHeaders,
+  children: () => createComponent(StartServer, {
+    router
+  })
+}));
 export {
@@ -28,0 +16,0 @@ defaultRenderHandler

dist/esm/defaultRenderHandler.js.map

@@ -1,1 +0,1 @@
-{"version":3,"file":"defaultRenderHandler.js","sources":["../../src/defaultRenderHandler.tsx"],"sourcesContent":["import * as Solid from 'solid-js/web'\nimport { defineHandlerCallback } from '@tanstack/start-server-core'\nimport { StartServer } from './StartServer'\n\nexport const defaultRenderHandler = defineHandlerCallback(\n  async ({ router, responseHeaders }) => {\n    try {\n      let html = Solid.renderToString(() => <StartServer router={router} />)\n      const injectedHtml = await Promise.all(\n        router.serverSsr!.injectedHtml,\n      ).then((htmls) => htmls.join(''))\n      html = html.replace(`</body>`, `${injectedHtml}</body>`)\n      return new Response(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)\n"],"names":["defaultRenderHandler","defineHandlerCallback","router","responseHeaders","html","Solid","renderToString","_$createComponent","StartServer","injectedHtml","Promise","all","serverSsr","then","htmls","join","replace","Response","status","state","statusCode","headers","error"],"mappings":";;;;AAIaA,MAAAA,uBAAuBC,sBAClC,OAAO;AAAA,EAAEC;AAAAA,EAAQC;AAAgB,MAAM;AACjC,MAAA;AACF,QAAIC,OAAOC,MAAMC,eAAe,MAAAC,gBAAOC,aAAW;AAAA,MAACN;AAAAA,IAAAA,CAAc,CAAI;AACrE,UAAMO,eAAe,MAAMC,QAAQC,IACjCT,OAAOU,UAAWH,YACpB,EAAEI,KAAMC,CAAAA,UAAUA,MAAMC,KAAK,EAAE,CAAC;AAChCX,WAAOA,KAAKY,QAAQ,WAAW,GAAGP,YAAY,SAAS;AAChD,WAAA,IAAIQ,SAASb,MAAM;AAAA,MACxBc,QAAQhB,OAAOiB,MAAMC;AAAAA,MACrBC,SAASlB;AAAAA,IAAAA,CACV;AAAA,WACMmB,OAAO;AACNA,YAAAA,MAAM,2BAA2BA,KAAK;AACvC,WAAA,IAAIL,SAAS,yBAAyB;AAAA,MAC3CC,QAAQ;AAAA,MACRG,SAASlB;AAAAA,IAAAA,CACV;AAAA,EAAA;AAEL,CACF;"}
+{"version":3,"file":"defaultRenderHandler.js","sources":["../../src/defaultRenderHandler.tsx"],"sourcesContent":["import { defineHandlerCallback } from '@tanstack/start-server-core'\nimport { renderRouterToString } from '@tanstack/solid-router/ssr/server'\nimport { StartServer } from './StartServer'\n\nexport const defaultRenderHandler = defineHandlerCallback(\n  ({ router, responseHeaders }) =>\n    renderRouterToString({\n      router,\n      responseHeaders,\n      children: () => <StartServer router={router} />,\n    }),\n)\n"],"names":["defaultRenderHandler","defineHandlerCallback","router","responseHeaders","renderRouterToString","children","_$createComponent","StartServer"],"mappings":";;;;AAIaA,MAAAA,uBAAuBC,sBAClC,CAAC;AAAA,EAAEC;AAAAA,EAAQC;AAAgB,MACzBC,qBAAqB;AAAA,EACnBF;AAAAA,EACAC;AAAAA,EACAE,UAAUA,MAAAC,gBAAOC,aAAW;AAAA,IAACL;AAAAA,EAAc,CAAA;AAC7C,CAAC,CACL;"}

dist/esm/defaultStreamHandler.js

@@ -1,5 +0,4 @@
-import * as Solid from "solid-js/web";
 import { createComponent } from "solid-js/web";
-import { isbot } from "isbot";
-import { defineHandlerCallback, transformReadableStreamWithRouter } from "@tanstack/start-server-core";
+import { defineHandlerCallback } from "@tanstack/start-server-core";
+import { renderRouterToStream } from "@tanstack/solid-router/ssr/server";
 import { StartServer } from "./StartServer.js";
@@ -10,20 +9,10 @@ const defaultStreamHandler = defineHandlerCallback(async ({
   responseHeaders
-}) => {
-  const {
-    writable,
-    readable
-  } = new TransformStream();
-  const stream = Solid.renderToStream(() => createComponent(StartServer, {
+}) => await renderRouterToStream({
+  request,
+  router,
+  responseHeaders,
+  children: () => createComponent(StartServer, {
     router
-  }));
-  if (isbot(request.headers.get("User-Agent"))) {
-    await stream;
-  }
-  stream.pipeTo(writable);
-  const responseStream = transformReadableStreamWithRouter(router, readable);
-  return new Response(responseStream, {
-    status: router.state.statusCode,
-    headers: responseHeaders
-  });
-});
+  })
+}));
 export {
@@ -30,0 +19,0 @@ defaultStreamHandler

dist/esm/defaultStreamHandler.js.map

@@ -1,1 +0,1 @@
-{"version":3,"file":"defaultStreamHandler.js","sources":["../../src/defaultStreamHandler.tsx"],"sourcesContent":["import { isbot } from 'isbot'\nimport * as Solid from 'solid-js/web'\n\nimport {\n  defineHandlerCallback,\n  transformReadableStreamWithRouter,\n} from '@tanstack/start-server-core'\n\nimport { StartServer } from './StartServer'\nimport type { ReadableStream } from 'node:stream/web'\n\nexport const defaultStreamHandler = defineHandlerCallback(\n  async ({ request, router, responseHeaders }) => {\n    const { writable, readable } = new TransformStream()\n\n    const stream = Solid.renderToStream(() => <StartServer router={router} />)\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)\n"],"names":["defaultStreamHandler","defineHandlerCallback","request","router","responseHeaders","writable","readable","TransformStream","stream","Solid","renderToStream","_$createComponent","StartServer","isbot","headers","get","pipeTo","responseStream","transformReadableStreamWithRouter","Response","status","state","statusCode"],"mappings":";;;;;AAWaA,MAAAA,uBAAuBC,sBAClC,OAAO;AAAA,EAAEC;AAAAA,EAASC;AAAAA,EAAQC;AAAgB,MAAM;AACxC,QAAA;AAAA,IAAEC;AAAAA,IAAUC;AAAAA,EAAS,IAAI,IAAIC,gBAAgB;AAEnD,QAAMC,SAASC,MAAMC,eAAe,MAAAC,gBAAOC,aAAW;AAAA,IAACT;AAAAA,EAAAA,CAAc,CAAI;AAEzE,MAAIU,MAAMX,QAAQY,QAAQC,IAAI,YAAY,CAAC,GAAG;AACtCP,UAAAA;AAAAA,EAAAA;AAERA,SAAOQ,OAAOX,QAAQ;AAEhBY,QAAAA,iBAAiBC,kCACrBf,QACAG,QACF;AACO,SAAA,IAAIa,SAASF,gBAAuB;AAAA,IACzCG,QAAQjB,OAAOkB,MAAMC;AAAAA,IACrBR,SAASV;AAAAA,EAAAA,CACV;AACH,CACF;"}
+{"version":3,"file":"defaultStreamHandler.js","sources":["../../src/defaultStreamHandler.tsx"],"sourcesContent":["import { defineHandlerCallback } from '@tanstack/start-server-core'\nimport { renderRouterToStream } from '@tanstack/solid-router/ssr/server'\nimport { StartServer } from './StartServer'\n\nexport const defaultStreamHandler = defineHandlerCallback(\n  async ({ request, router, responseHeaders }) =>\n    await renderRouterToStream({\n      request,\n      router,\n      responseHeaders,\n      children: () => <StartServer router={router} />,\n    }),\n)\n"],"names":["defaultStreamHandler","defineHandlerCallback","request","router","responseHeaders","renderRouterToStream","children","_$createComponent","StartServer"],"mappings":";;;;AAIaA,MAAAA,uBAAuBC,sBAClC,OAAO;AAAA,EAAEC;AAAAA,EAASC;AAAAA,EAAQC;AAAgB,MACxC,MAAMC,qBAAqB;AAAA,EACzBH;AAAAA,EACAC;AAAAA,EACAC;AAAAA,EACAE,UAAUA,MAAAC,gBAAOC,aAAW;AAAA,IAACL;AAAAA,EAAc,CAAA;AAC7C,CAAC,CACL;"}

package.json

 {
   "name": "@tanstack/solid-start-server",
-  "version": "1.121.34",
+  "version": "1.121.39",
   "description": "Modern and scalable routing for Solid applications",
@@ -53,6 +53,6 @@ "author": "Tanner Linsley",
     "@tanstack/history": "^1.121.34",
-    "@tanstack/router-core": "^1.121.34",
-    "@tanstack/solid-router": "^1.121.34",
-    "@tanstack/start-client-core": "1.121.34",
-    "@tanstack/start-server-core": "1.121.34"
+    "@tanstack/router-core": "^1.121.39",
+    "@tanstack/solid-router": "^1.121.39",
+    "@tanstack/start-client-core": "1.121.39",
+    "@tanstack/start-server-core": "1.121.39"
   },
@@ -59,0 +59,0 @@ "devDependencies": {

src/defaultRenderHandler.tsx

@@ -1,25 +0,12 @@
-import * as Solid from 'solid-js/web'
 import { defineHandlerCallback } from '@tanstack/start-server-core'
+import { renderRouterToString } from '@tanstack/solid-router/ssr/server'
 import { StartServer } from './StartServer'
 
 export const defaultRenderHandler = defineHandlerCallback(
-  async ({ router, responseHeaders }) => {
-    try {
-      let html = Solid.renderToString(() => <StartServer router={router} />)
-      const injectedHtml = await Promise.all(
-        router.serverSsr!.injectedHtml,
-      ).then((htmls) => htmls.join(''))
-      html = html.replace(`</body>`, `${injectedHtml}</body>`)
-      return new Response(html, {
-        status: router.state.statusCode,
-        headers: responseHeaders,
-      })
-    } catch (error) {
-      console.error('Render to string error:', error)
-      return new Response('Internal Server Error', {
-        status: 500,
-        headers: responseHeaders,
-      })
-    }
-  },
+  ({ router, responseHeaders }) =>
+    renderRouterToString({
+      router,
+      responseHeaders,
+      children: () => <StartServer router={router} />,
+    }),
 )

src/defaultStreamHandler.tsx

@@ -1,32 +0,13 @@
-import { isbot } from 'isbot'
-import * as Solid from 'solid-js/web'
-
-import {
-  defineHandlerCallback,
-  transformReadableStreamWithRouter,
-} from '@tanstack/start-server-core'
-
+import { defineHandlerCallback } from '@tanstack/start-server-core'
+import { renderRouterToStream } from '@tanstack/solid-router/ssr/server'
 import { StartServer } from './StartServer'
-import type { ReadableStream } from 'node:stream/web'
 
 export const defaultStreamHandler = defineHandlerCallback(
-  async ({ request, router, responseHeaders }) => {
-    const { writable, readable } = new TransformStream()
-
-    const stream = Solid.renderToStream(() => <StartServer router={router} />)
-
-    if (isbot(request.headers.get('User-Agent'))) {
-      await stream
-    }
-    stream.pipeTo(writable)
-
-    const responseStream = transformReadableStreamWithRouter(
+  async ({ request, router, responseHeaders }) =>
+    await renderRouterToStream({
+      request,
       router,
-      readable as unknown as ReadableStream,
-    )
-    return new Response(responseStream as any, {
-      status: router.state.statusCode,
-      headers: responseHeaders,
-    })
-  },
+      responseHeaders,
+      children: () => <StartServer router={router} />,
+    }),
 )

src/index.tsx

 export { StartServer } from './StartServer'
 export { defaultStreamHandler } from './defaultStreamHandler'
 export { defaultRenderHandler } from './defaultRenderHandler'
-
 export * from '@tanstack/start-server-core'

No alert changes

Worsened metrics

Total package byte prevSize

23867

-23.11%

Lines of code

300

-25.93%

Dependency changes

• + Added

  @tanstack/router-core@1.121.39
  (transitive)

• + Added

  @tanstack/start-client-core@1.121.39
  (transitive)

• + Added

  @tanstack/start-server-core@1.121.39
  (transitive)

• - Removed

  @tanstack/router-core@1.121.34
  (transitive)

• - Removed

  @tanstack/start-client-core@1.121.34
  (transitive)

• - Removed

  @tanstack/start-server-core@1.121.34
  (transitive)

• Updated

  @tanstack/router-core@^1.121.39

• Updated

  @tanstack/solid-router@^1.121.39

• Updated

  @tanstack/start-client-core@1.121.39

• Updated

  @tanstack/start-server-core@1.121.39