@tanstack/solid-start-server 1.121.33 → 1.121.39

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,43 +1,43 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
3
- const Solid = require("solid-js/web");
3
+ const web = require("solid-js/web");
4
4
  const solidRouter = require("@tanstack/solid-router");
5
5
  const meta = require("@solidjs/meta");
6
6
  var _tmpl$ = ["<head>", "</head>"], _tmpl$2 = ["<html>", "<body>", "</body></html>"];
7
7
  function ServerHeadContent() {
8
8
  const tags = solidRouter.useTags();
9
- Solid.useAssets(() => {
10
- return Solid.createComponent(meta.MetaProvider, {
9
+ web.useAssets(() => {
10
+ return web.createComponent(meta.MetaProvider, {
11
11
  get children() {
12
- return tags().map((tag) => Solid.createComponent(solidRouter.Asset, tag));
12
+ return tags().map((tag) => web.createComponent(solidRouter.Asset, tag));
13
13
  }
14
14
  });
15
15
  });
16
16
  return null;
17
17
  }
18
- const docType = Solid.ssr("<!DOCTYPE html>");
18
+ const docType = web.ssr("<!DOCTYPE html>");
19
19
  function StartServer(props) {
20
- return Solid.createComponent(Solid.NoHydration, {
20
+ return web.createComponent(web.NoHydration, {
21
21
  get children() {
22
- return [docType, Solid.ssr(_tmpl$2, Solid.createComponent(Solid.NoHydration, {
22
+ return [docType, web.ssr(_tmpl$2, web.createComponent(web.NoHydration, {
23
23
  get children() {
24
- return Solid.ssr(_tmpl$, Solid.escape(Solid.createComponent(Solid.HydrationScript, {})));
24
+ return web.ssr(_tmpl$, web.escape(web.createComponent(web.HydrationScript, {})));
25
25
  }
26
- }), Solid.escape(Solid.createComponent(Solid.Hydration, {
26
+ }), web.escape(web.createComponent(web.Hydration, {
27
27
  get children() {
28
- return Solid.createComponent(solidRouter.RouterProvider, {
28
+ return web.createComponent(solidRouter.RouterProvider, {
29
29
  get router() {
30
30
  return props.router;
31
31
  },
32
- InnerWrap: (props2) => Solid.createComponent(Solid.NoHydration, {
32
+ InnerWrap: (props2) => web.createComponent(web.NoHydration, {
33
33
  get children() {
34
- return Solid.createComponent(meta.MetaProvider, {
34
+ return web.createComponent(meta.MetaProvider, {
35
35
  get children() {
36
- return [Solid.createComponent(ServerHeadContent, {}), Solid.createComponent(Solid.Hydration, {
36
+ return [web.createComponent(ServerHeadContent, {}), web.createComponent(web.Hydration, {
37
37
  get children() {
38
38
  return props2.children;
39
39
  }
40
- }), Solid.createComponent(solidRouter.Scripts, {})];
40
+ }), web.createComponent(solidRouter.Scripts, {})];
41
41
  }
42
42
  });
43
43
  }
@@ -1 +1 @@
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;;;"}
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,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;;;"}
@@ -1,46 +1,18 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
3
- const Solid = require("solid-js/web");
3
+ const web = require("solid-js/web");
4
4
  const startServerCore = require("@tanstack/start-server-core");
5
+ const server = require("@tanstack/solid-router/ssr/server");
5
6
  const StartServer = require("./StartServer.cjs");
6
- function _interopNamespaceDefault(e) {
7
- const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });
8
- if (e) {
9
- for (const k in e) {
10
- if (k !== "default") {
11
- const d = Object.getOwnPropertyDescriptor(e, k);
12
- Object.defineProperty(n, k, d.get ? d : {
13
- enumerable: true,
14
- get: () => e[k]
15
- });
16
- }
17
- }
18
- }
19
- n.default = e;
20
- return Object.freeze(n);
21
- }
22
- const Solid__namespace = /* @__PURE__ */ _interopNamespaceDefault(Solid);
23
- const defaultRenderHandler = startServerCore.defineHandlerCallback(async ({
7
+ const defaultRenderHandler = startServerCore.defineHandlerCallback(({
24
8
  router,
25
9
  responseHeaders
26
- }) => {
27
- try {
28
- let html = Solid__namespace.renderToString(() => Solid.createComponent(StartServer.StartServer, {
29
- router
30
- }));
31
- const injectedHtml = await Promise.all(router.serverSsr.injectedHtml).then((htmls) => htmls.join(""));
32
- html = html.replace(`</body>`, `${injectedHtml}</body>`);
33
- return new Response(html, {
34
- status: router.state.statusCode,
35
- headers: responseHeaders
36
- });
37
- } catch (error) {
38
- console.error("Render to string error:", error);
39
- return new Response("Internal Server Error", {
40
- status: 500,
41
- headers: responseHeaders
42
- });
43
- }
44
- });
10
+ }) => server.renderRouterToString({
11
+ router,
12
+ responseHeaders,
13
+ children: () => web.createComponent(StartServer.StartServer, {
14
+ router
15
+ })
16
+ }));
45
17
  exports.defaultRenderHandler = defaultRenderHandler;
46
18
  //# sourceMappingURL=defaultRenderHandler.cjs.map
@@ -1 +1 @@
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;;"}
1
+ {"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;;"}
@@ -1,47 +1,20 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
3
- const Solid = require("solid-js/web");
4
- const isbot = require("isbot");
3
+ const web = require("solid-js/web");
5
4
  const startServerCore = require("@tanstack/start-server-core");
5
+ const server = require("@tanstack/solid-router/ssr/server");
6
6
  const StartServer = require("./StartServer.cjs");
7
- function _interopNamespaceDefault(e) {
8
- const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });
9
- if (e) {
10
- for (const k in e) {
11
- if (k !== "default") {
12
- const d = Object.getOwnPropertyDescriptor(e, k);
13
- Object.defineProperty(n, k, d.get ? d : {
14
- enumerable: true,
15
- get: () => e[k]
16
- });
17
- }
18
- }
19
- }
20
- n.default = e;
21
- return Object.freeze(n);
22
- }
23
- const Solid__namespace = /* @__PURE__ */ _interopNamespaceDefault(Solid);
24
7
  const defaultStreamHandler = startServerCore.defineHandlerCallback(async ({
25
8
  request,
26
9
  router,
27
10
  responseHeaders
28
- }) => {
29
- const {
30
- writable,
31
- readable
32
- } = new TransformStream();
33
- const stream = Solid__namespace.renderToStream(() => Solid.createComponent(StartServer.StartServer, {
11
+ }) => await server.renderRouterToStream({
12
+ request,
13
+ router,
14
+ responseHeaders,
15
+ children: () => web.createComponent(StartServer.StartServer, {
34
16
  router
35
- }));
36
- if (isbot.isbot(request.headers.get("User-Agent"))) {
37
- await stream;
38
- }
39
- stream.pipeTo(writable);
40
- const responseStream = startServerCore.transformReadableStreamWithRouter(router, readable);
41
- return new Response(responseStream, {
42
- status: router.state.statusCode,
43
- headers: responseHeaders
44
- });
45
- });
17
+ })
18
+ }));
46
19
  exports.defaultStreamHandler = defaultStreamHandler;
47
20
  //# sourceMappingURL=defaultStreamHandler.cjs.map
@@ -1 +1 @@
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;;"}
1
+ {"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;;"}
@@ -1,29 +1,17 @@
1
- import * as Solid from "solid-js/web";
2
1
  import { createComponent } from "solid-js/web";
3
2
  import { defineHandlerCallback } from "@tanstack/start-server-core";
3
+ import { renderRouterToString } from "@tanstack/solid-router/ssr/server";
4
4
  import { StartServer } from "./StartServer.js";
5
- const defaultRenderHandler = defineHandlerCallback(async ({
5
+ const defaultRenderHandler = defineHandlerCallback(({
6
6
  router,
7
7
  responseHeaders
8
- }) => {
9
- try {
10
- let html = Solid.renderToString(() => createComponent(StartServer, {
11
- router
12
- }));
13
- const injectedHtml = await Promise.all(router.serverSsr.injectedHtml).then((htmls) => htmls.join(""));
14
- html = html.replace(`</body>`, `${injectedHtml}</body>`);
15
- return new Response(html, {
16
- status: router.state.statusCode,
17
- headers: responseHeaders
18
- });
19
- } catch (error) {
20
- console.error("Render to string error:", error);
21
- return new Response("Internal Server Error", {
22
- status: 500,
23
- headers: responseHeaders
24
- });
25
- }
26
- });
8
+ }) => renderRouterToString({
9
+ router,
10
+ responseHeaders,
11
+ children: () => createComponent(StartServer, {
12
+ router
13
+ })
14
+ }));
27
15
  export {
28
16
  defaultRenderHandler
29
17
  };
@@ -1 +1 @@
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;"}
1
+ {"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;"}
@@ -1,30 +1,19 @@
1
- import * as Solid from "solid-js/web";
2
1
  import { createComponent } from "solid-js/web";
3
- import { isbot } from "isbot";
4
- import { defineHandlerCallback, transformReadableStreamWithRouter } from "@tanstack/start-server-core";
2
+ import { defineHandlerCallback } from "@tanstack/start-server-core";
3
+ import { renderRouterToStream } from "@tanstack/solid-router/ssr/server";
5
4
  import { StartServer } from "./StartServer.js";
6
5
  const defaultStreamHandler = defineHandlerCallback(async ({
7
6
  request,
8
7
  router,
9
8
  responseHeaders
10
- }) => {
11
- const {
12
- writable,
13
- readable
14
- } = new TransformStream();
15
- const stream = Solid.renderToStream(() => createComponent(StartServer, {
9
+ }) => await renderRouterToStream({
10
+ request,
11
+ router,
12
+ responseHeaders,
13
+ children: () => createComponent(StartServer, {
16
14
  router
17
- }));
18
- if (isbot(request.headers.get("User-Agent"))) {
19
- await stream;
20
- }
21
- stream.pipeTo(writable);
22
- const responseStream = transformReadableStreamWithRouter(router, readable);
23
- return new Response(responseStream, {
24
- status: router.state.statusCode,
25
- headers: responseHeaders
26
- });
27
- });
15
+ })
16
+ }));
28
17
  export {
29
18
  defaultStreamHandler
30
19
  };
@@ -1 +1 @@
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;"}
1
+ {"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/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tanstack/solid-start-server",
3
- "version": "1.121.33",
3
+ "version": "1.121.39",
4
4
  "description": "Modern and scalable routing for Solid applications",
5
5
  "author": "Tanner Linsley",
6
6
  "license": "MIT",
@@ -49,11 +49,11 @@
49
49
  "dependencies": {
50
50
  "@solidjs/meta": "^0.29.4",
51
51
  "isbot": "^5.1.22",
52
- "@tanstack/router-core": "^1.121.33",
53
- "@tanstack/solid-router": "^1.121.33",
54
- "@tanstack/start-client-core": "1.121.33",
55
- "@tanstack/history": "^1.121.21",
56
- "@tanstack/start-server-core": "1.121.33"
52
+ "@tanstack/history": "^1.121.34",
53
+ "@tanstack/router-core": "^1.121.39",
54
+ "@tanstack/solid-router": "^1.121.39",
55
+ "@tanstack/start-client-core": "1.121.39",
56
+ "@tanstack/start-server-core": "1.121.39"
57
57
  },
58
58
  "devDependencies": {
59
59
  "esbuild": "^0.25.0",
@@ -1,25 +1,12 @@
1
- import * as Solid from 'solid-js/web'
2
1
  import { defineHandlerCallback } from '@tanstack/start-server-core'
2
+ import { renderRouterToString } from '@tanstack/solid-router/ssr/server'
3
3
  import { StartServer } from './StartServer'
4
4
 
5
5
  export const defaultRenderHandler = defineHandlerCallback(
6
- async ({ router, responseHeaders }) => {
7
- try {
8
- let html = Solid.renderToString(() => <StartServer router={router} />)
9
- const injectedHtml = await Promise.all(
10
- router.serverSsr!.injectedHtml,
11
- ).then((htmls) => htmls.join(''))
12
- html = html.replace(`</body>`, `${injectedHtml}</body>`)
13
- return new Response(html, {
14
- status: router.state.statusCode,
15
- headers: responseHeaders,
16
- })
17
- } catch (error) {
18
- console.error('Render to string error:', error)
19
- return new Response('Internal Server Error', {
20
- status: 500,
21
- headers: responseHeaders,
22
- })
23
- }
24
- },
6
+ ({ router, responseHeaders }) =>
7
+ renderRouterToString({
8
+ router,
9
+ responseHeaders,
10
+ children: () => <StartServer router={router} />,
11
+ }),
25
12
  )
@@ -1,32 +1,13 @@
1
- import { isbot } from 'isbot'
2
- import * as Solid from 'solid-js/web'
3
-
4
- import {
5
- defineHandlerCallback,
6
- transformReadableStreamWithRouter,
7
- } from '@tanstack/start-server-core'
8
-
1
+ import { defineHandlerCallback } from '@tanstack/start-server-core'
2
+ import { renderRouterToStream } from '@tanstack/solid-router/ssr/server'
9
3
  import { StartServer } from './StartServer'
10
- import type { ReadableStream } from 'node:stream/web'
11
4
 
12
5
  export const defaultStreamHandler = defineHandlerCallback(
13
- async ({ request, router, responseHeaders }) => {
14
- const { writable, readable } = new TransformStream()
15
-
16
- const stream = Solid.renderToStream(() => <StartServer router={router} />)
17
-
18
- if (isbot(request.headers.get('User-Agent'))) {
19
- await stream
20
- }
21
- stream.pipeTo(writable)
22
-
23
- const responseStream = transformReadableStreamWithRouter(
6
+ async ({ request, router, responseHeaders }) =>
7
+ await renderRouterToStream({
8
+ request,
24
9
  router,
25
- readable as unknown as ReadableStream,
26
- )
27
- return new Response(responseStream as any, {
28
- status: router.state.statusCode,
29
- headers: responseHeaders,
30
- })
31
- },
10
+ responseHeaders,
11
+ children: () => <StartServer router={router} />,
12
+ }),
32
13
  )
package/src/index.tsx CHANGED
@@ -1,5 +1,4 @@
1
1
  export { StartServer } from './StartServer'
2
2
  export { defaultStreamHandler } from './defaultStreamHandler'
3
3
  export { defaultRenderHandler } from './defaultRenderHandler'
4
-
5
4
  export * from '@tanstack/start-server-core'