@tanstack/solid-router 1.121.34 → 1.121.40
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.
- package/dist/cjs/Asset.cjs +13 -13
- package/dist/cjs/Asset.cjs.map +1 -1
- package/dist/cjs/CatchBoundary.cjs +13 -13
- package/dist/cjs/CatchBoundary.cjs.map +1 -1
- package/dist/cjs/ClientOnly.cjs +6 -6
- package/dist/cjs/ClientOnly.cjs.map +1 -1
- package/dist/cjs/HeadContent.cjs +5 -5
- package/dist/cjs/HeadContent.cjs.map +1 -1
- package/dist/cjs/Match.cjs +34 -34
- package/dist/cjs/Match.cjs.map +1 -1
- package/dist/cjs/Matches.cjs +11 -11
- package/dist/cjs/Matches.cjs.map +1 -1
- package/dist/cjs/RouterProvider.cjs +5 -5
- package/dist/cjs/RouterProvider.cjs.map +1 -1
- package/dist/cjs/SafeFragment.cjs +2 -2
- package/dist/cjs/SafeFragment.cjs.map +1 -1
- package/dist/cjs/ScriptOnce.cjs +3 -3
- package/dist/cjs/ScriptOnce.cjs.map +1 -1
- package/dist/cjs/Scripts.cjs +2 -2
- package/dist/cjs/Scripts.cjs.map +1 -1
- package/dist/cjs/awaited.cjs +2 -2
- package/dist/cjs/awaited.cjs.map +1 -1
- package/dist/cjs/index.d.cts +1 -1
- package/dist/cjs/lazyRouteComponent.cjs +6 -6
- package/dist/cjs/lazyRouteComponent.cjs.map +1 -1
- package/dist/cjs/link.cjs +3 -3
- package/dist/cjs/link.cjs.map +1 -1
- package/dist/cjs/not-found.cjs +3 -3
- package/dist/cjs/not-found.cjs.map +1 -1
- package/dist/cjs/renderRouteNotFound.cjs +4 -4
- package/dist/cjs/renderRouteNotFound.cjs.map +1 -1
- package/dist/cjs/route.cjs +4 -4
- package/dist/cjs/route.cjs.map +1 -1
- package/dist/cjs/scroll-restoration.cjs +2 -2
- package/dist/cjs/scroll-restoration.cjs.map +1 -1
- package/dist/cjs/ssr/RouterClient.cjs +45 -0
- package/dist/cjs/ssr/RouterClient.cjs.map +1 -0
- package/dist/cjs/ssr/RouterClient.d.cts +4 -0
- package/dist/cjs/ssr/RouterServer.cjs +56 -0
- package/dist/cjs/ssr/RouterServer.cjs.map +1 -0
- package/dist/cjs/ssr/RouterServer.d.cts +5 -0
- package/dist/cjs/ssr/client.cjs +5 -0
- package/dist/cjs/ssr/client.cjs.map +1 -0
- package/dist/cjs/ssr/client.d.cts +1 -0
- package/dist/cjs/ssr/defaultRenderHandler.cjs +18 -0
- package/dist/cjs/ssr/defaultRenderHandler.cjs.map +1 -0
- package/dist/cjs/ssr/defaultRenderHandler.d.cts +1 -0
- package/dist/cjs/ssr/defaultStreamHandler.cjs +20 -0
- package/dist/cjs/ssr/defaultStreamHandler.cjs.map +1 -0
- package/dist/cjs/ssr/defaultStreamHandler.d.cts +1 -0
- package/dist/cjs/ssr/renderRouterToStream.cjs +45 -0
- package/dist/cjs/ssr/renderRouterToStream.cjs.map +1 -0
- package/dist/cjs/ssr/renderRouterToStream.d.cts +8 -0
- package/dist/cjs/ssr/renderRouterToString.cjs +43 -0
- package/dist/cjs/ssr/renderRouterToString.cjs.map +1 -0
- package/dist/cjs/ssr/renderRouterToString.d.cts +7 -0
- package/dist/cjs/ssr/server.cjs +20 -0
- package/dist/cjs/ssr/server.cjs.map +1 -0
- package/dist/cjs/ssr/server.d.cts +6 -0
- package/dist/cjs/useBlocker.cjs +2 -2
- package/dist/cjs/useBlocker.cjs.map +1 -1
- package/dist/esm/index.d.ts +1 -1
- package/dist/esm/ssr/RouterClient.d.ts +4 -0
- package/dist/esm/ssr/RouterClient.js +45 -0
- package/dist/esm/ssr/RouterClient.js.map +1 -0
- package/dist/esm/ssr/RouterServer.d.ts +5 -0
- package/dist/esm/ssr/RouterServer.js +56 -0
- package/dist/esm/ssr/RouterServer.js.map +1 -0
- package/dist/esm/ssr/client.d.ts +1 -0
- package/dist/esm/ssr/client.js +5 -0
- package/dist/esm/ssr/client.js.map +1 -0
- package/dist/esm/ssr/defaultRenderHandler.d.ts +1 -0
- package/dist/esm/ssr/defaultRenderHandler.js +18 -0
- package/dist/esm/ssr/defaultRenderHandler.js.map +1 -0
- package/dist/esm/ssr/defaultStreamHandler.d.ts +1 -0
- package/dist/esm/ssr/defaultStreamHandler.js +20 -0
- package/dist/esm/ssr/defaultStreamHandler.js.map +1 -0
- package/dist/esm/ssr/renderRouterToStream.d.ts +8 -0
- package/dist/esm/ssr/renderRouterToStream.js +28 -0
- package/dist/esm/ssr/renderRouterToStream.js.map +1 -0
- package/dist/esm/ssr/renderRouterToString.d.ts +7 -0
- package/dist/esm/ssr/renderRouterToString.js +26 -0
- package/dist/esm/ssr/renderRouterToString.js.map +1 -0
- package/dist/esm/ssr/server.d.ts +6 -0
- package/dist/esm/ssr/server.js +14 -0
- package/dist/esm/ssr/server.js.map +1 -0
- package/dist/source/index.d.ts +1 -1
- package/dist/source/index.jsx.map +1 -1
- package/dist/source/ssr/RouterClient.d.ts +4 -0
- package/dist/source/ssr/RouterClient.jsx +28 -0
- package/dist/source/ssr/RouterClient.jsx.map +1 -0
- package/dist/source/ssr/RouterServer.d.ts +5 -0
- package/dist/source/ssr/RouterServer.jsx +38 -0
- package/dist/source/ssr/RouterServer.jsx.map +1 -0
- package/dist/source/ssr/client.d.ts +1 -0
- package/dist/source/ssr/client.js +2 -0
- package/dist/source/ssr/client.js.map +1 -0
- package/dist/source/ssr/defaultRenderHandler.d.ts +1 -0
- package/dist/source/ssr/defaultRenderHandler.jsx +9 -0
- package/dist/source/ssr/defaultRenderHandler.jsx.map +1 -0
- package/dist/source/ssr/defaultStreamHandler.d.ts +1 -0
- package/dist/source/ssr/defaultStreamHandler.jsx +10 -0
- package/dist/source/ssr/defaultStreamHandler.jsx.map +1 -0
- package/dist/source/ssr/renderRouterToStream.d.ts +8 -0
- package/dist/source/ssr/renderRouterToStream.jsx +17 -0
- package/dist/source/ssr/renderRouterToStream.jsx.map +1 -0
- package/dist/source/ssr/renderRouterToString.d.ts +7 -0
- package/dist/source/ssr/renderRouterToString.jsx +20 -0
- package/dist/source/ssr/renderRouterToString.jsx.map +1 -0
- package/dist/source/ssr/server.d.ts +6 -0
- package/dist/source/ssr/server.js +7 -0
- package/dist/source/ssr/server.js.map +1 -0
- package/package.json +31 -2
- package/src/index.tsx +1 -0
- package/src/ssr/RouterClient.tsx +43 -0
- package/src/ssr/RouterServer.tsx +60 -0
- package/src/ssr/client.ts +1 -0
- package/src/ssr/defaultRenderHandler.tsx +12 -0
- package/src/ssr/defaultStreamHandler.tsx +13 -0
- package/src/ssr/renderRouterToStream.tsx +36 -0
- package/src/ssr/renderRouterToString.tsx +31 -0
- package/src/ssr/server.ts +6 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.jsx","sourceRoot":"","sources":["../../src/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,SAAS,EAAE,MAAM,gBAAgB,CAAA;AACrD,OAAO,EAAE,OAAO,IAAI,OAAO,EAAE,MAAM,cAAc,CAAA;AAEjD,OAAO,EACL,KAAK,EACL,oBAAoB,EACpB,OAAO,EACP,SAAS,EACT,SAAS,EACT,YAAY,EACZ,aAAa,EACb,QAAQ,EACR,WAAW,EACX,aAAa,EACb,eAAe,EACf,aAAa,EACb,cAAc,EACd,WAAW,EACX,MAAM,EACN,MAAM,EACN,WAAW,EACX,qBAAqB,EACrB,kBAAkB,EAClB,sBAAsB,EACtB,eAAe,EACf,mBAAmB,EACnB,UAAU,EAAE,MAAM;AAClB,IAAI,EACJ,gBAAgB,EAChB,gBAAgB,EAChB,aAAa,EACb,YAAY,EACZ,SAAS,EACT,OAAO,EACP,uBAAuB,EACvB,kBAAkB,EAClB,iBAAiB,GAClB,MAAM,uBAAuB,CAAA;
|
|
1
|
+
{"version":3,"file":"index.jsx","sourceRoot":"","sources":["../../src/index.tsx"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
import { hydrate } from '@tanstack/router-core/ssr/client';
|
|
2
|
+
import { Await } from '../awaited';
|
|
3
|
+
import { HeadContent } from '../HeadContent';
|
|
4
|
+
import { RouterProvider } from '../RouterProvider';
|
|
5
|
+
let hydrationPromise;
|
|
6
|
+
const Dummy = (props) => <>{props.children}</>;
|
|
7
|
+
export function RouterClient(props) {
|
|
8
|
+
if (!hydrationPromise) {
|
|
9
|
+
if (!props.router.state.matches.length) {
|
|
10
|
+
hydrationPromise = hydrate(props.router);
|
|
11
|
+
}
|
|
12
|
+
else {
|
|
13
|
+
hydrationPromise = Promise.resolve();
|
|
14
|
+
}
|
|
15
|
+
}
|
|
16
|
+
return (<Await promise={hydrationPromise} children={() => (<Dummy>
|
|
17
|
+
<Dummy>
|
|
18
|
+
<RouterProvider router={props.router} InnerWrap={(props) => (<Dummy>
|
|
19
|
+
<Dummy>
|
|
20
|
+
<HeadContent />
|
|
21
|
+
{props.children}
|
|
22
|
+
</Dummy>
|
|
23
|
+
<Dummy />
|
|
24
|
+
</Dummy>)}/>
|
|
25
|
+
</Dummy>
|
|
26
|
+
</Dummy>)}/>);
|
|
27
|
+
}
|
|
28
|
+
//# sourceMappingURL=RouterClient.jsx.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"RouterClient.jsx","sourceRoot":"","sources":["../../../src/ssr/RouterClient.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,kCAAkC,CAAA;AAC1D,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAIlD,IAAI,gBAAgE,CAAA;AAEpE,MAAM,KAAK,GAAG,CAAC,KAAgC,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAA;AAEzE,MAAM,UAAU,YAAY,CAAC,KAA4B;IACvD,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACtB,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;YACvC,gBAAgB,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;QAC1C,CAAC;aAAM,CAAC;YACN,gBAAgB,GAAG,OAAO,CAAC,OAAO,EAAE,CAAA;QACtC,CAAC;IACH,CAAC;IACD,OAAO,CACL,CAAC,KAAK,CACJ,OAAO,CAAC,CAAC,gBAAgB,CAAC,CAC1B,QAAQ,CAAC,CAAC,GAAG,EAAE,CAAC,CACd,CAAC,KAAK,CACJ;UAAA,CAAC,KAAK,CACJ;YAAA,CAAC,cAAc,CACb,MAAM,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CACrB,SAAS,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CACpB,CAAC,KAAK,CACJ;kBAAA,CAAC,KAAK,CACJ;oBAAA,CAAC,WAAW,CAAC,AAAD,EACZ;oBAAA,CAAC,KAAK,CAAC,QAAQ,CACjB;kBAAA,EAAE,KAAK,CACP;kBAAA,CAAC,KAAK,CAAC,AAAD,EACR;gBAAA,EAAE,KAAK,CAAC,CACT,CAAC,EAEN;UAAA,EAAE,KAAK,CACT;QAAA,EAAE,KAAK,CAAC,CACT,CAAC,EACF,CACH,CAAA;AACH,CAAC"}
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
import { Hydration, HydrationScript, NoHydration, ssr, useAssets, } from 'solid-js/web';
|
|
2
|
+
import { MetaProvider } from '@solidjs/meta';
|
|
3
|
+
import { Asset } from '../Asset';
|
|
4
|
+
import { useTags } from '../HeadContent';
|
|
5
|
+
import { RouterProvider } from '../RouterProvider';
|
|
6
|
+
import { Scripts } from '../Scripts';
|
|
7
|
+
export function ServerHeadContent() {
|
|
8
|
+
const tags = useTags();
|
|
9
|
+
useAssets(() => {
|
|
10
|
+
return (<MetaProvider>
|
|
11
|
+
{tags().map((tag) => (<Asset {...tag}/>))}
|
|
12
|
+
</MetaProvider>);
|
|
13
|
+
});
|
|
14
|
+
return null;
|
|
15
|
+
}
|
|
16
|
+
const docType = ssr('<!DOCTYPE html>');
|
|
17
|
+
export function RouterServer(props) {
|
|
18
|
+
return (<NoHydration>
|
|
19
|
+
{docType}
|
|
20
|
+
<html>
|
|
21
|
+
<head>
|
|
22
|
+
<HydrationScript />
|
|
23
|
+
</head>
|
|
24
|
+
<body>
|
|
25
|
+
<Hydration>
|
|
26
|
+
<RouterProvider router={props.router} InnerWrap={(props) => (<NoHydration>
|
|
27
|
+
<MetaProvider>
|
|
28
|
+
<ServerHeadContent />
|
|
29
|
+
<Hydration>{props.children}</Hydration>
|
|
30
|
+
<Scripts />
|
|
31
|
+
</MetaProvider>
|
|
32
|
+
</NoHydration>)}/>
|
|
33
|
+
</Hydration>
|
|
34
|
+
</body>
|
|
35
|
+
</html>
|
|
36
|
+
</NoHydration>);
|
|
37
|
+
}
|
|
38
|
+
//# sourceMappingURL=RouterServer.jsx.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"RouterServer.jsx","sourceRoot":"","sources":["../../../src/ssr/RouterServer.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EACT,eAAe,EACf,WAAW,EACX,GAAG,EACH,SAAS,GACV,MAAM,cAAc,CAAA;AACrB,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AAC5C,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAA;AAChC,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAA;AACxC,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAClD,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AAGpC,MAAM,UAAU,iBAAiB;IAC/B,MAAM,IAAI,GAAG,OAAO,EAAE,CAAA;IACtB,SAAS,CAAC,GAAG,EAAE;QACb,OAAO,CACL,CAAC,YAAY,CACX;QAAA,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CACnB,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,EAAG,CACnB,CAAC,CACJ;MAAA,EAAE,YAAY,CAAC,CAChB,CAAA;IACH,CAAC,CAAC,CAAA;IACF,OAAO,IAAI,CAAA;AACb,CAAC;AAED,MAAM,OAAO,GAAG,GAAG,CAAC,iBAAiB,CAAC,CAAA;AAEtC,MAAM,UAAU,YAAY,CAA4B,KAEvD;IACC,OAAO,CACL,CAAC,WAAW,CACV;MAAA,CAAC,OAAc,CACf;MAAA,CAAC,IAAI,CACH;QAAA,CAAC,IAAI,CACH;UAAA,CAAC,eAAe,CAAC,AAAD,EAClB;QAAA,EAAE,IAAI,CACN;QAAA,CAAC,IAAI,CACH;UAAA,CAAC,SAAS,CACR;YAAA,CAAC,cAAc,CACb,MAAM,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CACrB,SAAS,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CACpB,CAAC,WAAW,CACV;kBAAA,CAAC,YAAY,CACX;oBAAA,CAAC,iBAAiB,CAAC,AAAD,EAClB;oBAAA,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,SAAS,CACtC;oBAAA,CAAC,OAAO,CAAC,AAAD,EACV;kBAAA,EAAE,YAAY,CAChB;gBAAA,EAAE,WAAW,CAAC,CACf,CAAC,EAEN;UAAA,EAAE,SAAS,CACb;QAAA,EAAE,IAAI,CACR;MAAA,EAAE,IAAI,CACR;IAAA,EAAE,WAAW,CAAC,CACf,CAAA;AACH,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export { RouterClient } from './RouterClient';
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/ssr/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare const defaultRenderHandler: import("@tanstack/router-core/ssr/server").HandlerCallback<import("@tanstack/router-core").AnyRouter>;
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import { defineHandlerCallback } from '@tanstack/router-core/ssr/server';
|
|
2
|
+
import { RouterServer } from './RouterServer';
|
|
3
|
+
import { renderRouterToString } from './renderRouterToString';
|
|
4
|
+
export const defaultRenderHandler = defineHandlerCallback(({ router, responseHeaders }) => renderRouterToString({
|
|
5
|
+
router,
|
|
6
|
+
responseHeaders,
|
|
7
|
+
children: () => <RouterServer router={router}/>,
|
|
8
|
+
}));
|
|
9
|
+
//# sourceMappingURL=defaultRenderHandler.jsx.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"defaultRenderHandler.jsx","sourceRoot":"","sources":["../../../src/ssr/defaultRenderHandler.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAA;AACxE,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAC7C,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAE7D,MAAM,CAAC,MAAM,oBAAoB,GAAG,qBAAqB,CACvD,CAAC,EAAE,MAAM,EAAE,eAAe,EAAE,EAAE,EAAE,CAC9B,oBAAoB,CAAC;IACnB,MAAM;IACN,eAAe;IACf,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,EAAG;CACjD,CAAC,CACL,CAAA"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare const defaultStreamHandler: import("@tanstack/router-core/ssr/server").HandlerCallback<import("@tanstack/router-core").AnyRouter>;
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import { defineHandlerCallback } from '@tanstack/router-core/ssr/server';
|
|
2
|
+
import { RouterServer } from './RouterServer';
|
|
3
|
+
import { renderRouterToStream } from './renderRouterToStream';
|
|
4
|
+
export const defaultStreamHandler = defineHandlerCallback(({ request, router, responseHeaders }) => renderRouterToStream({
|
|
5
|
+
request,
|
|
6
|
+
router,
|
|
7
|
+
responseHeaders,
|
|
8
|
+
children: () => <RouterServer router={router}/>,
|
|
9
|
+
}));
|
|
10
|
+
//# sourceMappingURL=defaultStreamHandler.jsx.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"defaultStreamHandler.jsx","sourceRoot":"","sources":["../../../src/ssr/defaultStreamHandler.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAA;AACxE,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAC7C,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAE7D,MAAM,CAAC,MAAM,oBAAoB,GAAG,qBAAqB,CACvD,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,EAAE,EAAE,CACvC,oBAAoB,CAAC;IACnB,OAAO;IACP,MAAM;IACN,eAAe;IACf,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,EAAG;CACjD,CAAC,CACL,CAAA"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import type { JSXElement } from 'solid-js';
|
|
2
|
+
import type { AnyRouter } from '@tanstack/router-core';
|
|
3
|
+
export declare const renderRouterToStream: ({ request, router, responseHeaders, children, }: {
|
|
4
|
+
request: Request;
|
|
5
|
+
router: AnyRouter;
|
|
6
|
+
responseHeaders: Headers;
|
|
7
|
+
children: () => JSXElement;
|
|
8
|
+
}) => Promise<Response>;
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import * as Solid from 'solid-js/web';
|
|
2
|
+
import { isbot } from 'isbot';
|
|
3
|
+
import { transformReadableStreamWithRouter } from '@tanstack/router-core/ssr/server';
|
|
4
|
+
export const renderRouterToStream = async ({ request, router, responseHeaders, children, }) => {
|
|
5
|
+
const { writable, readable } = new TransformStream();
|
|
6
|
+
const stream = Solid.renderToStream(children);
|
|
7
|
+
if (isbot(request.headers.get('User-Agent'))) {
|
|
8
|
+
await stream;
|
|
9
|
+
}
|
|
10
|
+
stream.pipeTo(writable);
|
|
11
|
+
const responseStream = transformReadableStreamWithRouter(router, readable);
|
|
12
|
+
return new Response(responseStream, {
|
|
13
|
+
status: router.state.statusCode,
|
|
14
|
+
headers: responseHeaders,
|
|
15
|
+
});
|
|
16
|
+
};
|
|
17
|
+
//# sourceMappingURL=renderRouterToStream.jsx.map
|
|
@@ -0,0 +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,MAAM,GAAG,KAAK,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAA;IAE7C,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"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import type { JSXElement } from 'solid-js';
|
|
2
|
+
import type { AnyRouter } from '@tanstack/router-core';
|
|
3
|
+
export declare const renderRouterToString: ({ router, responseHeaders, children, }: {
|
|
4
|
+
router: AnyRouter;
|
|
5
|
+
responseHeaders: Headers;
|
|
6
|
+
children: () => JSXElement;
|
|
7
|
+
}) => Promise<Response>;
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import * as Solid from 'solid-js/web';
|
|
2
|
+
export const renderRouterToString = async ({ router, responseHeaders, children, }) => {
|
|
3
|
+
try {
|
|
4
|
+
let html = Solid.renderToString(children);
|
|
5
|
+
const injectedHtml = await Promise.all(router.serverSsr.injectedHtml).then((htmls) => htmls.join(''));
|
|
6
|
+
html = html.replace(`</body>`, `${injectedHtml}</body>`);
|
|
7
|
+
return new Response(html, {
|
|
8
|
+
status: router.state.statusCode,
|
|
9
|
+
headers: responseHeaders,
|
|
10
|
+
});
|
|
11
|
+
}
|
|
12
|
+
catch (error) {
|
|
13
|
+
console.error('Render to string error:', error);
|
|
14
|
+
return new Response('Internal Server Error', {
|
|
15
|
+
status: 500,
|
|
16
|
+
headers: responseHeaders,
|
|
17
|
+
});
|
|
18
|
+
}
|
|
19
|
+
};
|
|
20
|
+
//# sourceMappingURL=renderRouterToString.jsx.map
|
|
@@ -0,0 +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,CAAC,CAAA;QACzC,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,IAAI,EAAE;YACxB,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"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
export { RouterServer } from './RouterServer';
|
|
2
|
+
export { defaultRenderHandler } from './defaultRenderHandler';
|
|
3
|
+
export { defaultStreamHandler } from './defaultStreamHandler';
|
|
4
|
+
export { renderRouterToStream } from './renderRouterToStream';
|
|
5
|
+
export { renderRouterToString } from './renderRouterToString';
|
|
6
|
+
export * from '@tanstack/router-core/ssr/server';
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
export { RouterServer } from './RouterServer';
|
|
2
|
+
export { defaultRenderHandler } from './defaultRenderHandler';
|
|
3
|
+
export { defaultStreamHandler } from './defaultStreamHandler';
|
|
4
|
+
export { renderRouterToStream } from './renderRouterToStream';
|
|
5
|
+
export { renderRouterToString } from './renderRouterToString';
|
|
6
|
+
export * from '@tanstack/router-core/ssr/server';
|
|
7
|
+
//# sourceMappingURL=server.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../src/ssr/server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAC7C,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAC7D,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAC7D,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAC7D,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAC7D,cAAc,kCAAkC,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tanstack/solid-router",
|
|
3
|
-
"version": "1.121.
|
|
3
|
+
"version": "1.121.40",
|
|
4
4
|
"description": "Modern and scalable routing for Solid applications",
|
|
5
5
|
"author": "Tanner Linsley",
|
|
6
6
|
"license": "MIT",
|
|
@@ -42,6 +42,34 @@
|
|
|
42
42
|
"default": "./dist/cjs/index.cjs"
|
|
43
43
|
}
|
|
44
44
|
},
|
|
45
|
+
"./ssr/server": {
|
|
46
|
+
"solid": {
|
|
47
|
+
"types": "./dist/source/ssr/server.d.ts",
|
|
48
|
+
"default": "./dist/source/ssr/server.js"
|
|
49
|
+
},
|
|
50
|
+
"import": {
|
|
51
|
+
"types": "./dist/esm/ssr/server.d.ts",
|
|
52
|
+
"default": "./dist/esm/ssr/server.js"
|
|
53
|
+
},
|
|
54
|
+
"require": {
|
|
55
|
+
"types": "./dist/cjs/ssr/server.d.cts",
|
|
56
|
+
"default": "./dist/cjs/ssr/server.cjs"
|
|
57
|
+
}
|
|
58
|
+
},
|
|
59
|
+
"./ssr/client": {
|
|
60
|
+
"solid": {
|
|
61
|
+
"types": "./dist/source/ssr/client.d.ts",
|
|
62
|
+
"default": "./dist/source/ssr/client.js"
|
|
63
|
+
},
|
|
64
|
+
"import": {
|
|
65
|
+
"types": "./dist/esm/ssr/client.d.ts",
|
|
66
|
+
"default": "./dist/esm/ssr/client.js"
|
|
67
|
+
},
|
|
68
|
+
"require": {
|
|
69
|
+
"types": "./dist/cjs/ssr/client.d.cts",
|
|
70
|
+
"default": "./dist/cjs/ssr/client.cjs"
|
|
71
|
+
}
|
|
72
|
+
},
|
|
45
73
|
"./package.json": "./package.json"
|
|
46
74
|
},
|
|
47
75
|
"sideEffects": false,
|
|
@@ -57,11 +85,12 @@
|
|
|
57
85
|
"@solid-primitives/refs": "^1.0.8",
|
|
58
86
|
"@solidjs/meta": "^0.29.4",
|
|
59
87
|
"@tanstack/solid-store": "^0.7.0",
|
|
88
|
+
"isbot": "^5.1.22",
|
|
60
89
|
"jsesc": "^3.0.2",
|
|
61
90
|
"tiny-invariant": "^1.3.3",
|
|
62
91
|
"tiny-warning": "^1.0.3",
|
|
63
92
|
"@tanstack/history": "1.121.34",
|
|
64
|
-
"@tanstack/router-core": "1.121.
|
|
93
|
+
"@tanstack/router-core": "1.121.40"
|
|
65
94
|
},
|
|
66
95
|
"devDependencies": {
|
|
67
96
|
"@solidjs/testing-library": "^0.8.10",
|
package/src/index.tsx
CHANGED
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
import { hydrate } from '@tanstack/router-core/ssr/client'
|
|
2
|
+
import { Await } from '../awaited'
|
|
3
|
+
import { HeadContent } from '../HeadContent'
|
|
4
|
+
import { RouterProvider } from '../RouterProvider'
|
|
5
|
+
import type { AnyRouter } from '@tanstack/router-core'
|
|
6
|
+
import type { JSXElement } from 'solid-js'
|
|
7
|
+
|
|
8
|
+
let hydrationPromise: Promise<void | Array<Array<void>>> | undefined
|
|
9
|
+
|
|
10
|
+
const Dummy = (props: { children?: JSXElement }) => <>{props.children}</>
|
|
11
|
+
|
|
12
|
+
export function RouterClient(props: { router: AnyRouter }) {
|
|
13
|
+
if (!hydrationPromise) {
|
|
14
|
+
if (!props.router.state.matches.length) {
|
|
15
|
+
hydrationPromise = hydrate(props.router)
|
|
16
|
+
} else {
|
|
17
|
+
hydrationPromise = Promise.resolve()
|
|
18
|
+
}
|
|
19
|
+
}
|
|
20
|
+
return (
|
|
21
|
+
<Await
|
|
22
|
+
promise={hydrationPromise}
|
|
23
|
+
children={() => (
|
|
24
|
+
<Dummy>
|
|
25
|
+
<Dummy>
|
|
26
|
+
<RouterProvider
|
|
27
|
+
router={props.router}
|
|
28
|
+
InnerWrap={(props) => (
|
|
29
|
+
<Dummy>
|
|
30
|
+
<Dummy>
|
|
31
|
+
<HeadContent />
|
|
32
|
+
{props.children}
|
|
33
|
+
</Dummy>
|
|
34
|
+
<Dummy />
|
|
35
|
+
</Dummy>
|
|
36
|
+
)}
|
|
37
|
+
/>
|
|
38
|
+
</Dummy>
|
|
39
|
+
</Dummy>
|
|
40
|
+
)}
|
|
41
|
+
/>
|
|
42
|
+
)
|
|
43
|
+
}
|
|
@@ -0,0 +1,60 @@
|
|
|
1
|
+
import {
|
|
2
|
+
Hydration,
|
|
3
|
+
HydrationScript,
|
|
4
|
+
NoHydration,
|
|
5
|
+
ssr,
|
|
6
|
+
useAssets,
|
|
7
|
+
} from 'solid-js/web'
|
|
8
|
+
import { MetaProvider } from '@solidjs/meta'
|
|
9
|
+
import { Asset } from '../Asset'
|
|
10
|
+
import { useTags } from '../HeadContent'
|
|
11
|
+
import { RouterProvider } from '../RouterProvider'
|
|
12
|
+
import { Scripts } from '../Scripts'
|
|
13
|
+
import type { AnyRouter } from '@tanstack/router-core'
|
|
14
|
+
|
|
15
|
+
export function ServerHeadContent() {
|
|
16
|
+
const tags = useTags()
|
|
17
|
+
useAssets(() => {
|
|
18
|
+
return (
|
|
19
|
+
<MetaProvider>
|
|
20
|
+
{tags().map((tag) => (
|
|
21
|
+
<Asset {...tag} />
|
|
22
|
+
))}
|
|
23
|
+
</MetaProvider>
|
|
24
|
+
)
|
|
25
|
+
})
|
|
26
|
+
return null
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
const docType = ssr('<!DOCTYPE html>')
|
|
30
|
+
|
|
31
|
+
export function RouterServer<TRouter extends AnyRouter>(props: {
|
|
32
|
+
router: TRouter
|
|
33
|
+
}) {
|
|
34
|
+
return (
|
|
35
|
+
<NoHydration>
|
|
36
|
+
{docType as any}
|
|
37
|
+
<html>
|
|
38
|
+
<head>
|
|
39
|
+
<HydrationScript />
|
|
40
|
+
</head>
|
|
41
|
+
<body>
|
|
42
|
+
<Hydration>
|
|
43
|
+
<RouterProvider
|
|
44
|
+
router={props.router}
|
|
45
|
+
InnerWrap={(props) => (
|
|
46
|
+
<NoHydration>
|
|
47
|
+
<MetaProvider>
|
|
48
|
+
<ServerHeadContent />
|
|
49
|
+
<Hydration>{props.children}</Hydration>
|
|
50
|
+
<Scripts />
|
|
51
|
+
</MetaProvider>
|
|
52
|
+
</NoHydration>
|
|
53
|
+
)}
|
|
54
|
+
/>
|
|
55
|
+
</Hydration>
|
|
56
|
+
</body>
|
|
57
|
+
</html>
|
|
58
|
+
</NoHydration>
|
|
59
|
+
)
|
|
60
|
+
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export { RouterClient } from './RouterClient'
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import { defineHandlerCallback } from '@tanstack/router-core/ssr/server'
|
|
2
|
+
import { RouterServer } from './RouterServer'
|
|
3
|
+
import { renderRouterToString } from './renderRouterToString'
|
|
4
|
+
|
|
5
|
+
export const defaultRenderHandler = defineHandlerCallback(
|
|
6
|
+
({ router, responseHeaders }) =>
|
|
7
|
+
renderRouterToString({
|
|
8
|
+
router,
|
|
9
|
+
responseHeaders,
|
|
10
|
+
children: () => <RouterServer router={router} />,
|
|
11
|
+
}),
|
|
12
|
+
)
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import { defineHandlerCallback } from '@tanstack/router-core/ssr/server'
|
|
2
|
+
import { RouterServer } from './RouterServer'
|
|
3
|
+
import { renderRouterToStream } from './renderRouterToStream'
|
|
4
|
+
|
|
5
|
+
export const defaultStreamHandler = defineHandlerCallback(
|
|
6
|
+
({ request, router, responseHeaders }) =>
|
|
7
|
+
renderRouterToStream({
|
|
8
|
+
request,
|
|
9
|
+
router,
|
|
10
|
+
responseHeaders,
|
|
11
|
+
children: () => <RouterServer router={router} />,
|
|
12
|
+
}),
|
|
13
|
+
)
|
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
import * as Solid from 'solid-js/web'
|
|
2
|
+
import { isbot } from 'isbot'
|
|
3
|
+
import { transformReadableStreamWithRouter } from '@tanstack/router-core/ssr/server'
|
|
4
|
+
import type { JSXElement } from 'solid-js'
|
|
5
|
+
import type { ReadableStream } from 'node:stream/web'
|
|
6
|
+
import type { AnyRouter } from '@tanstack/router-core'
|
|
7
|
+
|
|
8
|
+
export const renderRouterToStream = async ({
|
|
9
|
+
request,
|
|
10
|
+
router,
|
|
11
|
+
responseHeaders,
|
|
12
|
+
children,
|
|
13
|
+
}: {
|
|
14
|
+
request: Request
|
|
15
|
+
router: AnyRouter
|
|
16
|
+
responseHeaders: Headers
|
|
17
|
+
children: () => JSXElement
|
|
18
|
+
}) => {
|
|
19
|
+
const { writable, readable } = new TransformStream()
|
|
20
|
+
|
|
21
|
+
const stream = Solid.renderToStream(children)
|
|
22
|
+
|
|
23
|
+
if (isbot(request.headers.get('User-Agent'))) {
|
|
24
|
+
await stream
|
|
25
|
+
}
|
|
26
|
+
stream.pipeTo(writable)
|
|
27
|
+
|
|
28
|
+
const responseStream = transformReadableStreamWithRouter(
|
|
29
|
+
router,
|
|
30
|
+
readable as unknown as ReadableStream,
|
|
31
|
+
)
|
|
32
|
+
return new Response(responseStream as any, {
|
|
33
|
+
status: router.state.statusCode,
|
|
34
|
+
headers: responseHeaders,
|
|
35
|
+
})
|
|
36
|
+
}
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
import * as Solid from 'solid-js/web'
|
|
2
|
+
import type { JSXElement } from 'solid-js'
|
|
3
|
+
import type { AnyRouter } from '@tanstack/router-core'
|
|
4
|
+
|
|
5
|
+
export const renderRouterToString = async ({
|
|
6
|
+
router,
|
|
7
|
+
responseHeaders,
|
|
8
|
+
children,
|
|
9
|
+
}: {
|
|
10
|
+
router: AnyRouter
|
|
11
|
+
responseHeaders: Headers
|
|
12
|
+
children: () => JSXElement
|
|
13
|
+
}) => {
|
|
14
|
+
try {
|
|
15
|
+
let html = Solid.renderToString(children)
|
|
16
|
+
const injectedHtml = await Promise.all(router.serverSsr!.injectedHtml).then(
|
|
17
|
+
(htmls) => htmls.join(''),
|
|
18
|
+
)
|
|
19
|
+
html = html.replace(`</body>`, `${injectedHtml}</body>`)
|
|
20
|
+
return new Response(html, {
|
|
21
|
+
status: router.state.statusCode,
|
|
22
|
+
headers: responseHeaders,
|
|
23
|
+
})
|
|
24
|
+
} catch (error) {
|
|
25
|
+
console.error('Render to string error:', error)
|
|
26
|
+
return new Response('Internal Server Error', {
|
|
27
|
+
status: 500,
|
|
28
|
+
headers: responseHeaders,
|
|
29
|
+
})
|
|
30
|
+
}
|
|
31
|
+
}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
export { RouterServer } from './RouterServer'
|
|
2
|
+
export { defaultRenderHandler } from './defaultRenderHandler'
|
|
3
|
+
export { defaultStreamHandler } from './defaultStreamHandler'
|
|
4
|
+
export { renderRouterToStream } from './renderRouterToStream'
|
|
5
|
+
export { renderRouterToString } from './renderRouterToString'
|
|
6
|
+
export * from '@tanstack/router-core/ssr/server'
|