@tanstack/solid-router 1.121.0-alpha.27 → 1.121.0-alpha.28

package/dist/source/scroll-restoration.jsx.map

@@ -1 +1 @@
-{"version":3,"file":"scroll-restoration.jsx","sourceRoot":"","sources":["../../src/scroll-restoration.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,8BAA8B,EAC9B,aAAa,EACb,UAAU,GACX,MAAM,uBAAuB,CAAA;AAC9B,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AACvC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAEzC,MAAM,UAAU,iBAAiB;IAC/B,MAAM,MAAM,GAAG,SAAS,EAAE,CAAA;IAC1B,MAAM,MAAM,GACV,MAAM,CAAC,OAAO,CAAC,uBAAuB,IAAI,8BAA8B,CAAA;IAC1E,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,CAAA;IAC7C,MAAM,WAAW,GACf,OAAO,KAAK,8BAA8B,CAAC,MAAM,CAAC,cAAc,CAAC;QAC/D,CAAC,CAAC,OAAO;QACT,CAAC,CAAC,IAAI,CAAA;IAEV,IAAI,CAAC,MAAM,CAAC,iBAAiB,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;QAClD,OAAO,IAAI,CAAA;IACb,CAAC;IAED,OAAO,CACL,CAAC,UAAU,CACT,QAAQ,CAAC,CAAC,IAAI,aAAa,CAAC,QAAQ,EAAE,KAAK,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,oBAAoB,CAAC,CACzH,GAAG,CAAC,CAAC,KAAK,CAAC,EACX,CACH,CAAA;AACH,CAAC"}
+{"version":3,"file":"scroll-restoration.jsx","sourceRoot":"","sources":["../../src/scroll-restoration.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,8BAA8B,EAC9B,aAAa,EACb,UAAU,GACX,MAAM,uBAAuB,CAAA;AAC9B,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AACvC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAEzC,MAAM,UAAU,iBAAiB;IAC/B,MAAM,MAAM,GAAG,SAAS,EAAE,CAAA;IAC1B,MAAM,MAAM,GACV,MAAM,CAAC,OAAO,CAAC,uBAAuB,IAAI,8BAA8B,CAAA;IAC1E,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,CAAA;IAC7C,MAAM,WAAW,GACf,OAAO,KAAK,8BAA8B,CAAC,MAAM,CAAC,cAAc,CAAC;QAC/D,CAAC,CAAC,OAAO;QACT,CAAC,CAAC,SAAS,CAAA;IAEf,IAAI,CAAC,MAAM,CAAC,iBAAiB,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;QAClD,OAAO,IAAI,CAAA;IACb,CAAC;IAED,MAAM,oBAAoB,GAAwC;QAChE,UAAU;QACV,uBAAuB,EAAE,IAAI;KAC9B,CAAA;IACD,IAAI,WAAW,EAAE,CAAC;QAChB,oBAAoB,CAAC,GAAG,GAAG,WAAW,CAAA;IACxC,CAAC;IAED,OAAO,CACL,CAAC,UAAU,CACT,QAAQ,CAAC,CAAC,IAAI,aAAa,CAAC,QAAQ,EAAE,KAAK,IAAI,CAAC,SAAS,CAAC,oBAAoB,CAAC,GAAG,CAAC,EACnF,CACH,CAAA;AACH,CAAC"}

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

@@ -0,0 +1,4 @@
+import type { AnyRouter } from '@tanstack/router-core';
+export declare function RouterClient(props: {
+    router: AnyRouter;
+}): import("solid-js").JSX.Element;

package/dist/source/ssr/RouterClient.jsx

@@ -0,0 +1,28 @@
+import { hydrate } from '@tanstack/router-core/ssr/client';
+import { Await } from '../awaited';
+import { HeadContent } from '../HeadContent';
+import { RouterProvider } from '../RouterProvider';
+let hydrationPromise;
+const Dummy = (props) => <>{props.children}</>;
+export function RouterClient(props) {
+    if (!hydrationPromise) {
+        if (!props.router.state.matches.length) {
+            hydrationPromise = hydrate(props.router);
+        }
+        else {
+            hydrationPromise = Promise.resolve();
+        }
+    }
+    return (<Await promise={hydrationPromise} children={() => (<Dummy>
+          <Dummy>
+            <RouterProvider router={props.router} InnerWrap={(props) => (<Dummy>
+                  <Dummy>
+                    <HeadContent />
+                    {props.children}
+                  </Dummy>
+                  <Dummy />
+                </Dummy>)}/>
+          </Dummy>
+        </Dummy>)}/>);
+}
+//# sourceMappingURL=RouterClient.jsx.map

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

@@ -0,0 +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"}

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

@@ -0,0 +1,5 @@
+import type { AnyRouter } from '@tanstack/router-core';
+export declare function ServerHeadContent(): null;
+export declare function RouterServer<TRouter extends AnyRouter>(props: {
+    router: TRouter;
+}): import("solid-js").JSX.Element;

package/dist/source/ssr/RouterServer.jsx

@@ -0,0 +1,38 @@
+import { Hydration, HydrationScript, NoHydration, ssr, useAssets, } from 'solid-js/web';
+import { MetaProvider } from '@solidjs/meta';
+import { Asset } from '../Asset';
+import { useTags } from '../HeadContent';
+import { RouterProvider } from '../RouterProvider';
+import { Scripts } from '../Scripts';
+export function ServerHeadContent() {
+    const tags = useTags();
+    useAssets(() => {
+        return (<MetaProvider>
+        {tags().map((tag) => (<Asset {...tag}/>))}
+      </MetaProvider>);
+    });
+    return null;
+}
+const docType = ssr('<!DOCTYPE html>');
+export function RouterServer(props) {
+    return (<NoHydration>
+      {docType}
+      <html>
+        <head>
+          <HydrationScript />
+        </head>
+        <body>
+          <Hydration>
+            <RouterProvider router={props.router} InnerWrap={(props) => (<NoHydration>
+                  <MetaProvider>
+                    <ServerHeadContent />
+                    <Hydration>{props.children}</Hydration>
+                    <Scripts />
+                  </MetaProvider>
+                </NoHydration>)}/>
+          </Hydration>
+        </body>
+      </html>
+    </NoHydration>);
+}
+//# sourceMappingURL=RouterServer.jsx.map

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

@@ -0,0 +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"}

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

@@ -0,0 +1 @@
+export { RouterClient } from './RouterClient';

package/dist/source/ssr/client.js

@@ -0,0 +1,2 @@
+export { RouterClient } from './RouterClient';
+//# sourceMappingURL=client.js.map

package/dist/source/ssr/client.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/ssr/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA"}

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

@@ -0,0 +1 @@
+export declare const defaultRenderHandler: import("@tanstack/router-core/ssr/server").HandlerCallback<import("@tanstack/router-core").AnyRouter>;

package/dist/source/ssr/defaultRenderHandler.jsx

@@ -0,0 +1,9 @@
+import { defineHandlerCallback } from '@tanstack/router-core/ssr/server';
+import { RouterServer } from './RouterServer';
+import { renderRouterToString } from './renderRouterToString';
+export const defaultRenderHandler = defineHandlerCallback(({ router, responseHeaders }) => renderRouterToString({
+    router,
+    responseHeaders,
+    children: () => <RouterServer router={router}/>,
+}));
+//# sourceMappingURL=defaultRenderHandler.jsx.map

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

@@ -0,0 +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"}

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

@@ -0,0 +1 @@
+export declare const defaultStreamHandler: import("@tanstack/router-core/ssr/server").HandlerCallback<import("@tanstack/router-core").AnyRouter>;

package/dist/source/ssr/defaultStreamHandler.jsx

@@ -0,0 +1,10 @@
+import { defineHandlerCallback } from '@tanstack/router-core/ssr/server';
+import { RouterServer } from './RouterServer';
+import { renderRouterToStream } from './renderRouterToStream';
+export const defaultStreamHandler = defineHandlerCallback(({ request, router, responseHeaders }) => renderRouterToStream({
+    request,
+    router,
+    responseHeaders,
+    children: () => <RouterServer router={router}/>,
+}));
+//# sourceMappingURL=defaultStreamHandler.jsx.map

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

@@ -0,0 +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"}

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

@@ -0,0 +1,8 @@
+import type { JSXElement } from 'solid-js';
+import type { AnyRouter } from '@tanstack/router-core';
+export declare const renderRouterToStream: ({ request, router, responseHeaders, children, }: {
+    request: Request;
+    router: AnyRouter;
+    responseHeaders: Headers;
+    children: () => JSXElement;
+}) => Promise<Response>;

package/dist/source/ssr/renderRouterToStream.jsx

@@ -0,0 +1,17 @@
+import * as Solid from 'solid-js/web';
+import { isbot } from 'isbot';
+import { transformReadableStreamWithRouter } from '@tanstack/router-core/ssr/server';
+export const renderRouterToStream = async ({ request, router, responseHeaders, children, }) => {
+    const { writable, readable } = new TransformStream();
+    const stream = Solid.renderToStream(children);
+    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,
+    });
+};
+//# sourceMappingURL=renderRouterToStream.jsx.map

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

@@ -0,0 +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"}

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

@@ -0,0 +1,7 @@
+import type { JSXElement } from 'solid-js';
+import type { AnyRouter } from '@tanstack/router-core';
+export declare const renderRouterToString: ({ router, responseHeaders, children, }: {
+    router: AnyRouter;
+    responseHeaders: Headers;
+    children: () => JSXElement;
+}) => Promise<Response>;

package/dist/source/ssr/renderRouterToString.jsx

@@ -0,0 +1,20 @@
+import * as Solid from 'solid-js/web';
+export const renderRouterToString = async ({ router, responseHeaders, children, }) => {
+    try {
+        let html = Solid.renderToString(children);
+        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,
+        });
+    }
+};
+//# sourceMappingURL=renderRouterToString.jsx.map

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

@@ -0,0 +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"}

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

@@ -0,0 +1,6 @@
+export { RouterServer } from './RouterServer';
+export { defaultRenderHandler } from './defaultRenderHandler';
+export { defaultStreamHandler } from './defaultStreamHandler';
+export { renderRouterToStream } from './renderRouterToStream';
+export { renderRouterToString } from './renderRouterToString';
+export * from '@tanstack/router-core/ssr/server';

package/dist/source/ssr/server.js

@@ -0,0 +1,7 @@
+export { RouterServer } from './RouterServer';
+export { defaultRenderHandler } from './defaultRenderHandler';
+export { defaultStreamHandler } from './defaultStreamHandler';
+export { renderRouterToStream } from './renderRouterToStream';
+export { renderRouterToString } from './renderRouterToString';
+export * from '@tanstack/router-core/ssr/server';
+//# sourceMappingURL=server.js.map

package/dist/source/ssr/server.js.map

@@ -0,0 +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/dist/source/useBlocker.jsx

@@ -23,24 +23,32 @@ function _resolveBlockerOpts(opts, condition) {
             withResolver: false,
         };
     }
-    const shouldBlock = Boolean(opts.condition ?? true);
-    const fn = opts.blockerFn;
+    const shouldBlock = Solid.createMemo(() => Boolean(opts.condition ?? true));
     const _customBlockerFn = async () => {
-        if (shouldBlock && fn !== undefined) {
-            return await fn();
+        if (shouldBlock() && opts.blockerFn !== undefined) {
+            return await opts.blockerFn();
         }
-        return shouldBlock;
+        return shouldBlock();
     };
     return {
-        shouldBlockFn: _customBlockerFn,
-        enableBeforeUnload: shouldBlock,
-        withResolver: fn === undefined,
+        get shouldBlockFn() {
+            return _customBlockerFn;
+        },
+        get enableBeforeUnload() {
+            return shouldBlock();
+        },
+        get withResolver() {
+            return opts.blockerFn === undefined;
+        },
     };
 }
 export function useBlocker(opts, condition) {
-    const { shouldBlockFn, enableBeforeUnload = true, disabled = false, withResolver = false, } = _resolveBlockerOpts(opts, condition);
+    const props = Solid.mergeProps({
+        enableBeforeUnload: true,
+        disabled: false,
+        withResolver: false,
+    }, _resolveBlockerOpts(opts, condition));
     const router = useRouter();
-    const { history } = router;
     const [resolver, setResolver] = Solid.createSignal({
         status: 'idle',
         current: undefined,
@@ -67,12 +75,12 @@ export function useBlocker(opts, condition) {
             }
             const current = getLocation(blockerFnArgs.currentLocation);
             const next = getLocation(blockerFnArgs.nextLocation);
-            const shouldBlock = await shouldBlockFn({
+            const shouldBlock = await props.shouldBlockFn({
                 action: blockerFnArgs.action,
                 current,
                 next,
             });
-            if (!withResolver) {
+            if (!props.withResolver) {
                 return shouldBlock;
             }
             if (!shouldBlock) {
@@ -99,38 +107,47 @@ export function useBlocker(opts, condition) {
             });
             return canNavigateAsync;
         };
-        return disabled
+        const disposeBlock = props.disabled
             ? undefined
-            : history.block({ blockerFn: blockerFnComposed, enableBeforeUnload });
+            : router.history.block({
+                blockerFn: blockerFnComposed,
+                enableBeforeUnload: props.enableBeforeUnload,
+            });
+        Solid.onCleanup(() => disposeBlock?.());
     });
     return resolver;
 }
 const _resolvePromptBlockerArgs = (props) => {
     if ('shouldBlockFn' in props) {
-        return { ...props };
+        return props;
     }
-    const shouldBlock = Boolean(props.condition ?? true);
-    const fn = props.blockerFn;
+    const shouldBlock = Solid.createMemo(() => Boolean(props.condition ?? true));
     const _customBlockerFn = async () => {
-        if (shouldBlock && fn !== undefined) {
-            return await fn();
+        if (shouldBlock() && props.blockerFn !== undefined) {
+            return await props.blockerFn();
         }
         return shouldBlock;
     };
     return {
         shouldBlockFn: _customBlockerFn,
-        enableBeforeUnload: shouldBlock,
-        withResolver: fn === undefined,
+        get enableBeforeUnload() {
+            return shouldBlock();
+        },
+        get withResolver() {
+            return props.blockerFn === undefined;
+        },
     };
 };
 export function Block(opts) {
-    const { children, ...rest } = opts;
+    const [propsWithChildren, rest] = Solid.splitProps(opts, ['children']);
     const args = _resolvePromptBlockerArgs(rest);
     const resolver = useBlocker(args);
-    return children
-        ? typeof children === 'function'
-            ? children(resolver)
-            : children
-        : null;
+    const children = Solid.createMemo(() => {
+        const child = propsWithChildren.children;
+        if (resolver && typeof child === 'function')
+            return child(resolver());
+        return child;
+    });
+    return <>{children()}</>;
 }
 //# sourceMappingURL=useBlocker.jsx.map

package/dist/source/useBlocker.jsx.map

@@ -1 +1 @@
-{"version":3,"file":"useBlocker.jsx","sourceRoot":"","sources":["../../src/useBlocker.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"useBlocker.jsx","sourceRoot":"","sources":["../../src/useBlocker.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,UAAU,CAAA;AACjC,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAmFvC,SAAS,mBAAmB,CAC1B,IAA2D,EAC3D,SAAyB;IAEzB,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACvB,OAAO;YACL,aAAa,EAAE,GAAG,EAAE,CAAC,IAAI;YACzB,YAAY,EAAE,KAAK;SACpB,CAAA;IACH,CAAC;IAED,IAAI,eAAe,IAAI,IAAI,EAAE,CAAC;QAC5B,OAAO,IAAI,CAAA;IACb,CAAC;IAED,IAAI,OAAO,IAAI,KAAK,UAAU,EAAE,CAAC;QAC/B,MAAM,WAAW,GAAG,OAAO,CAAC,SAAS,IAAI,IAAI,CAAC,CAAA;QAE9C,MAAM,gBAAgB,GAAG,KAAK,IAAI,EAAE;YAClC,IAAI,WAAW;gBAAE,OAAO,MAAM,IAAI,EAAE,CAAA;YACpC,OAAO,KAAK,CAAA;QACd,CAAC,CAAA;QAED,OAAO;YACL,aAAa,EAAE,gBAAgB;YAC/B,kBAAkB,EAAE,WAAW;YAC/B,YAAY,EAAE,KAAK;SACpB,CAAA;IACH,CAAC;IAED,MAAM,WAAW,GAAG,KAAK,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,CAAC,CAAA;IAE3E,MAAM,gBAAgB,GAAG,KAAK,IAAI,EAAE;QAClC,IAAI,WAAW,EAAE,IAAI,IAAI,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;YAClD,OAAO,MAAM,IAAI,CAAC,SAAS,EAAE,CAAA;QAC/B,CAAC;QACD,OAAO,WAAW,EAAE,CAAA;IACtB,CAAC,CAAA;IAED,OAAO;QACL,IAAI,aAAa;YACf,OAAO,gBAAgB,CAAA;QACzB,CAAC;QACD,IAAI,kBAAkB;YACpB,OAAO,WAAW,EAAE,CAAA;QACtB,CAAC;QACD,IAAI,YAAY;YACd,OAAO,IAAI,CAAC,SAAS,KAAK,SAAS,CAAA;QACrC,CAAC;KACF,CAAA;AACH,CAAC;AAwBD,MAAM,UAAU,UAAU,CACxB,IAA2D,EAC3D,SAAyB;IAEzB,MAAM,KAAK,GAAG,KAAK,CAAC,UAAU,CAC5B;QACE,kBAAkB,EAAE,IAAI;QACxB,QAAQ,EAAE,KAAK;QACf,YAAY,EAAE,KAAK;KACpB,EACD,mBAAmB,CAAC,IAAI,EAAE,SAAS,CAAC,CACrC,CAAA;IAED,MAAM,MAAM,GAAG,SAAS,EAAE,CAAA;IAE1B,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,KAAK,CAAC,YAAY,CAAkB;QAClE,MAAM,EAAE,MAAM;QACd,OAAO,EAAE,SAAS;QAClB,IAAI,EAAE,SAAS;QACf,MAAM,EAAE,SAAS;QACjB,OAAO,EAAE,SAAS;QAClB,KAAK,EAAE,SAAS;KACjB,CAAC,CAAA;IAEF,KAAK,CAAC,YAAY,CAAC,GAAG,EAAE;QACtB,MAAM,iBAAiB,GAAG,KAAK,EAAE,aAA4B,EAAE,EAAE;YAC/D,SAAS,WAAW,CAClB,QAAyB;gBAEzB,MAAM,cAAc,GAAG,MAAM,CAAC,aAAa,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAA;gBAChE,MAAM,aAAa,GAAG,MAAM,CAAC,gBAAgB,CAC3C,cAAc,CAAC,QAAQ,EACvB,SAAS,CACV,CAAA;gBACD,IAAI,aAAa,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;oBAC3C,MAAM,IAAI,KAAK,CAAC,+BAA+B,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAA;gBACjE,CAAC;gBACD,OAAO;oBACL,OAAO,EAAE,aAAa,CAAC,UAAU,CAAC,EAAE;oBACpC,QAAQ,EAAE,aAAa,CAAC,UAAU,CAAC,QAAQ;oBAC3C,QAAQ,EAAE,cAAc,CAAC,QAAQ;oBACjC,MAAM,EAAE,aAAa,CAAC,WAAW;oBACjC,MAAM,EAAE,cAAc,CAAC,MAAM;iBAC9B,CAAA;YACH,CAAC;YAED,MAAM,OAAO,GAAG,WAAW,CAAC,aAAa,CAAC,eAAe,CAAC,CAAA;YAC1D,MAAM,IAAI,GAAG,WAAW,CAAC,aAAa,CAAC,YAAY,CAAC,CAAA;YAEpD,MAAM,WAAW,GAAG,MAAM,KAAK,CAAC,aAAa,CAAC;gBAC5C,MAAM,EAAE,aAAa,CAAC,MAAM;gBAC5B,OAAO;gBACP,IAAI;aACL,CAAC,CAAA;YACF,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,CAAC;gBACxB,OAAO,WAAW,CAAA;YACpB,CAAC;YAED,IAAI,CAAC,WAAW,EAAE,CAAC;gBACjB,OAAO,KAAK,CAAA;YACd,CAAC;YAED,MAAM,OAAO,GAAG,IAAI,OAAO,CAAU,CAAC,OAAO,EAAE,EAAE;gBAC/C,WAAW,CAAC;oBACV,MAAM,EAAE,SAAS;oBACjB,OAAO;oBACP,IAAI;oBACJ,MAAM,EAAE,aAAa,CAAC,MAAM;oBAC5B,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC;oBAC7B,KAAK,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC;iBAC3B,CAAC,CAAA;YACJ,CAAC,CAAC,CAAA;YAEF,MAAM,gBAAgB,GAAG,MAAM,OAAO,CAAA;YACtC,WAAW,CAAC;gBACV,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE,SAAS;gBAClB,IAAI,EAAE,SAAS;gBACf,MAAM,EAAE,SAAS;gBACjB,OAAO,EAAE,SAAS;gBAClB,KAAK,EAAE,SAAS;aACjB,CAAC,CAAA;YAEF,OAAO,gBAAgB,CAAA;QACzB,CAAC,CAAA;QAED,MAAM,YAAY,GAAG,KAAK,CAAC,QAAQ;YACjC,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC;gBACnB,SAAS,EAAE,iBAAiB;gBAC5B,kBAAkB,EAAE,KAAK,CAAC,kBAAkB;aAC7C,CAAC,CAAA;QAEN,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,YAAY,EAAE,EAAE,CAAC,CAAA;IACzC,CAAC,CAAC,CAAA;IAEF,OAAO,QAAQ,CAAA;AACjB,CAAC;AAED,MAAM,yBAAyB,GAAG,CAChC,KAAsC,EACtB,EAAE;IAClB,IAAI,eAAe,IAAI,KAAK,EAAE,CAAC;QAC7B,OAAO,KAAK,CAAA;IACd,CAAC;IAED,MAAM,WAAW,GAAG,KAAK,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,SAAS,IAAI,IAAI,CAAC,CAAC,CAAA;IAE5E,MAAM,gBAAgB,GAAG,KAAK,IAAI,EAAE;QAClC,IAAI,WAAW,EAAE,IAAI,KAAK,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;YACnD,OAAO,MAAM,KAAK,CAAC,SAAS,EAAE,CAAA;QAChC,CAAC;QACD,OAAO,WAAW,CAAA;IACpB,CAAC,CAAA;IAED,OAAO;QACL,aAAa,EAAE,gBAAgB;QAC/B,IAAI,kBAAkB;YACpB,OAAO,WAAW,EAAE,CAAA;QACtB,CAAC;QACD,IAAI,YAAY;YACd,OAAO,KAAK,CAAC,SAAS,KAAK,SAAS,CAAA;QACtC,CAAC;KACF,CAAA;AACH,CAAC,CAAA;AAYD,MAAM,UAAU,KAAK,CAAC,IAAqC;IACzD,MAAM,CAAC,iBAAiB,EAAE,IAAI,CAAC,GAAG,KAAK,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC,UAAU,CAAC,CAAC,CAAA;IACtE,MAAM,IAAI,GAAG,yBAAyB,CAAC,IAAI,CAAC,CAAA;IAE5C,MAAM,QAAQ,GAAG,UAAU,CAAC,IAAI,CAAC,CAAA;IACjC,MAAM,QAAQ,GAAG,KAAK,CAAC,UAAU,CAAC,GAAG,EAAE;QACrC,MAAM,KAAK,GAAG,iBAAiB,CAAC,QAAQ,CAAA;QACxC,IAAI,QAAQ,IAAI,OAAO,KAAK,KAAK,UAAU;YAAE,OAAO,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAA;QACrE,OAAO,KAAK,CAAA;IACd,CAAC,CAAC,CAAA;IAEF,OAAO,EAAE,CAAC,QAAQ,EAAE,CAAC,GAAG,CAAA;AAC1B,CAAC"}

package/dist/source/useNavigate.jsx

@@ -1,9 +1,19 @@
 import * as Solid from 'solid-js';
 import { useRouter } from './useRouter';
+import { useMatch } from './useMatch';
 export function useNavigate(_defaultOpts) {
-    const { navigate } = useRouter();
+    const { navigate, state } = useRouter();
+    const matchIndex = useMatch({
+        strict: false,
+        select: (match) => match.index,
+    });
     return ((options) => {
-        return navigate({ from: _defaultOpts?.from, ...options });
+        return navigate({
+            ...options,
+            from: options.from ??
+                _defaultOpts?.from ??
+                state.matches[matchIndex()].fullPath,
+        });
     });
 }
 export function Navigate(props) {

package/dist/source/useNavigate.jsx.map

@@ -1 +1 @@
-{"version":3,"file":"useNavigate.jsx","sourceRoot":"","sources":["../../src/useNavigate.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,UAAU,CAAA;AACjC,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AASvC,MAAM,UAAU,WAAW,CAGzB,YAED;IACC,MAAM,EAAE,QAAQ,EAAE,GAAG,SAAS,EAAE,CAAA;IAEhC,OAAO,CAAC,CAAC,OAAwB,EAAE,EAAE;QACnC,OAAO,QAAQ,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,IAAW,EAAE,GAAG,OAAO,EAAE,CAAC,CAAA;IAClE,CAAC,CAAoC,CAAA;AACvC,CAAC;AAED,MAAM,UAAU,QAAQ,CAMtB,KAA+D;IAC/D,MAAM,EAAE,QAAQ,EAAE,GAAG,SAAS,EAAE,CAAA;IAEhC,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE;QACjB,QAAQ,CAAC;YACP,GAAG,KAAK;SACT,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,OAAO,IAAI,CAAA;AACb,CAAC"}
+{"version":3,"file":"useNavigate.jsx","sourceRoot":"","sources":["../../src/useNavigate.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,UAAU,CAAA;AACjC,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AACvC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AASrC,MAAM,UAAU,WAAW,CAGzB,YAED;IACC,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,SAAS,EAAE,CAAA;IAEvC,MAAM,UAAU,GAAG,QAAQ,CAAC;QAC1B,MAAM,EAAE,KAAK;QACb,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK;KAC/B,CAAC,CAAA;IAEF,OAAO,CAAC,CAAC,OAAwB,EAAE,EAAE;QACnC,OAAO,QAAQ,CAAC;YACd,GAAG,OAAO;YACV,IAAI,EACF,OAAO,CAAC,IAAI;gBACZ,YAAY,EAAE,IAAI;gBAClB,KAAK,CAAC,OAAO,CAAC,UAAU,EAAE,CAAE,CAAC,QAAQ;SACxC,CAAC,CAAA;IACJ,CAAC,CAAoC,CAAA;AACvC,CAAC;AAED,MAAM,UAAU,QAAQ,CAMtB,KAA+D;IAC/D,MAAM,EAAE,QAAQ,EAAE,GAAG,SAAS,EAAE,CAAA;IAEhC,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE;QACjB,QAAQ,CAAC;YACP,GAAG,KAAK;SACT,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,OAAO,IAAI,CAAA;AACb,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/solid-router",
-  "version": "1.121.0-alpha.27",
+  "version": "1.121.0-alpha.28",
   "description": "Modern and scalable routing for Solid applications",
   "author": "Tanner Linsley",
   "license": "MIT",
@@ -42,6 +42,34 @@
         "default": "./dist/cjs/index.cjs"
       }
     },
+    "./ssr/server": {
+      "solid": {
+        "types": "./dist/source/ssr/server.d.ts",
+        "default": "./dist/source/ssr/server.js"
+      },
+      "import": {
+        "types": "./dist/esm/ssr/server.d.ts",
+        "default": "./dist/esm/ssr/server.js"
+      },
+      "require": {
+        "types": "./dist/cjs/ssr/server.d.cts",
+        "default": "./dist/cjs/ssr/server.cjs"
+      }
+    },
+    "./ssr/client": {
+      "solid": {
+        "types": "./dist/source/ssr/client.d.ts",
+        "default": "./dist/source/ssr/client.js"
+      },
+      "import": {
+        "types": "./dist/esm/ssr/client.d.ts",
+        "default": "./dist/esm/ssr/client.js"
+      },
+      "require": {
+        "types": "./dist/cjs/ssr/client.d.cts",
+        "default": "./dist/cjs/ssr/client.cjs"
+      }
+    },
     "./package.json": "./package.json"
   },
   "sideEffects": false,
@@ -56,21 +84,20 @@
     "@solid-devtools/logger": "^0.9.4",
     "@solid-primitives/refs": "^1.0.8",
     "@solidjs/meta": "^0.29.4",
-    "@tanstack/solid-store": "^0.7.0",
-    "jsesc": "^3.0.2",
+    "@tanstack/solid-store": "0.7.0",
+    "isbot": "^5.1.22",
     "tiny-invariant": "^1.3.3",
     "tiny-warning": "^1.0.3",
-    "@tanstack/router-core": "1.121.0-alpha.27",
-    "@tanstack/history": "1.121.0-alpha.1"
+    "@tanstack/history": "1.121.0-alpha.28",
+    "@tanstack/router-core": "1.121.0-alpha.28"
   },
   "devDependencies": {
     "@solidjs/testing-library": "^0.8.10",
     "@testing-library/jest-dom": "^6.6.3",
-    "@types/jsesc": "^3.0.3",
     "combinate": "^1.1.11",
     "eslint-plugin-solid": "^0.14.5",
     "solid-js": "^1.9.5",
-    "vite-plugin-solid": "^2.11.2",
+    "vite-plugin-solid": "^2.11.8",
     "zod": "^3.23.8"
   },
   "peerDependencies": {

package/src/Asset.tsx

@@ -1,7 +1,13 @@
 import { Meta, Style, Title } from '@solidjs/meta'
+import { onCleanup, onMount } from 'solid-js'
 import type { RouterManagedTag } from '@tanstack/router-core'
+import type { JSX } from 'solid-js'
 
-export function Asset({ tag, attrs, children }: RouterManagedTag): any {
+export function Asset({
+  tag,
+  attrs,
+  children,
+}: RouterManagedTag): JSX.Element | null {
   switch (tag) {
     case 'title':
       return <Title {...attrs}>{children}</Title>
@@ -12,13 +18,76 @@ export function Asset({ tag, attrs, children }: RouterManagedTag): any {
     case 'style':
       return <Style {...attrs} innerHTML={children} />
     case 'script':
-      if ((attrs as any) && (attrs as any).src) {
-        return <script {...attrs} />
-      }
-      if (typeof children === 'string')
-        return <script {...attrs} innerHTML={children} />
-      return null
+      return <Script attrs={attrs}>{children}</Script>
     default:
       return null
   }
 }
+
+interface ScriptAttrs {
+  [key: string]: string | boolean | undefined
+  src?: string
+}
+
+function Script({
+  attrs,
+  children,
+}: {
+  attrs?: ScriptAttrs
+  children?: string
+}): JSX.Element | null {
+  onMount(() => {
+    if (attrs?.src) {
+      const script = document.createElement('script')
+
+      for (const [key, value] of Object.entries(attrs)) {
+        if (value !== undefined && value !== false) {
+          script.setAttribute(
+            key,
+            typeof value === 'boolean' ? '' : String(value),
+          )
+        }
+      }
+
+      document.head.appendChild(script)
+
+      onCleanup(() => {
+        if (script.parentNode) {
+          script.parentNode.removeChild(script)
+        }
+      })
+    } else if (typeof children === 'string') {
+      const script = document.createElement('script')
+      script.textContent = children
+
+      if (attrs) {
+        for (const [key, value] of Object.entries(attrs)) {
+          if (value !== undefined && value !== false) {
+            script.setAttribute(
+              key,
+              typeof value === 'boolean' ? '' : String(value),
+            )
+          }
+        }
+      }
+
+      document.head.appendChild(script)
+
+      onCleanup(() => {
+        if (script.parentNode) {
+          script.parentNode.removeChild(script)
+        }
+      })
+    }
+  })
+
+  if (attrs?.src && typeof attrs.src === 'string') {
+    return <script {...attrs} />
+  }
+
+  if (typeof children === 'string') {
+    return <script {...attrs} innerHTML={children} />
+  }
+
+  return null
+}

package/src/ClientOnly.tsx

@@ -30,36 +30,9 @@ export interface ClientOnlyProps {
  * ```
  */
 export function ClientOnly(props: ClientOnlyProps) {
-  return useHydrated() ? <>{props.children}</> : <>{props.fallback}</>
-}
-
-/**
- * Return a boolean indicating if the JS has been hydrated already.
- * When doing Server-Side Rendering, the result will always be false.
- * When doing Client-Side Rendering, the result will always be false on the
- * first render and true from then on. Even if a new component renders it will
- * always start with true.
- *
- * @example
- * ```tsx
- * // Disable a button that needs JS to work.
- * let hydrated = useHydrated()
- * return (
- *   <button type="button" disabled={!hydrated()} onClick={doSomethingCustom}>
- *     Click me
- *   </button>
- * )
- * ```
- * @returns A signal accessor function that returns true if the JS has been hydrated already, false otherwise.
- */
-export function useHydrated() {
-  const [hydrated, setHydrated] = Solid.createSignal(!isServer)
-
-  if (!isServer) {
-    Solid.createEffect(() => {
-      setHydrated(true)
-    })
-  }
-
-  return hydrated
+  return (
+    <Solid.Show when={!isServer} fallback={props.fallback}>
+      <>{props.children}</>
+    </Solid.Show>
+  )
 }