@tanstack/solid-router 2.0.0-alpha.2 → 2.0.0-alpha.4

package/dist/esm/scroll-restoration.js

@@ -1,38 +1,27 @@
-import { createComponent } from "@solidjs/web";
-import { defaultGetScrollRestorationKey, restoreScroll, escapeHtml, storageKey } from "@tanstack/router-core";
-import { isServer } from "@tanstack/router-core/isServer";
 import { useRouter } from "./useRouter.js";
 import { ScriptOnce } from "./ScriptOnce.js";
+import { defaultGetScrollRestorationKey, escapeHtml, restoreScroll, storageKey } from "@tanstack/router-core";
+import { createComponent } from "@solidjs/web";
+import { isServer } from "@tanstack/router-core/isServer";
+//#region src/scroll-restoration.tsx
 function ScrollRestoration() {
-  const router = useRouter();
-  if (!router.isScrollRestoring || !(isServer ?? router.isServer)) {
-    return null;
-  }
-  if (typeof router.options.scrollRestoration === "function") {
-    const shouldRestore = router.options.scrollRestoration({
-      location: router.latestLocation
-    });
-    if (!shouldRestore) {
-      return null;
-    }
-  }
-  const getKey = router.options.getScrollRestorationKey || defaultGetScrollRestorationKey;
-  const userKey = getKey(router.latestLocation);
-  const resolvedKey = userKey !== defaultGetScrollRestorationKey(router.latestLocation) ? userKey : void 0;
-  const restoreScrollOptions = {
-    storageKey,
-    shouldScrollRestoration: true
-  };
-  if (resolvedKey) {
-    restoreScrollOptions.key = resolvedKey;
-  }
-  return createComponent(ScriptOnce, {
-    get children() {
-      return `(${restoreScroll.toString()})(${escapeHtml(JSON.stringify(restoreScrollOptions))})`;
-    }
-  });
+	const router = useRouter();
+	if (!router.isScrollRestoring || !(isServer ?? router.isServer)) return null;
+	if (typeof router.options.scrollRestoration === "function") {
+		if (!router.options.scrollRestoration({ location: router.latestLocation })) return null;
+	}
+	const userKey = (router.options.getScrollRestorationKey || defaultGetScrollRestorationKey)(router.latestLocation);
+	const resolvedKey = userKey !== defaultGetScrollRestorationKey(router.latestLocation) ? userKey : void 0;
+	const restoreScrollOptions = {
+		storageKey,
+		shouldScrollRestoration: true
+	};
+	if (resolvedKey) restoreScrollOptions.key = resolvedKey;
+	return createComponent(ScriptOnce, { get children() {
+		return `(${restoreScroll.toString()})(${escapeHtml(JSON.stringify(restoreScrollOptions))})`;
+	} });
 }
-export {
-  ScrollRestoration
-};
-//# sourceMappingURL=scroll-restoration.js.map
+//#endregion
+export { ScrollRestoration };
+
+//# sourceMappingURL=scroll-restoration.js.map

package/dist/esm/scroll-restoration.js.map

@@ -1 +1 @@
-{"version":3,"file":"scroll-restoration.js","sources":["../../src/scroll-restoration.tsx"],"sourcesContent":["import {\n  defaultGetScrollRestorationKey,\n  escapeHtml,\n  restoreScroll,\n  storageKey,\n} from '@tanstack/router-core'\nimport { isServer } from '@tanstack/router-core/isServer'\nimport { useRouter } from './useRouter'\nimport { ScriptOnce } from './ScriptOnce'\n\nexport function ScrollRestoration() {\n  const router = useRouter()\n  if (!router.isScrollRestoring || !(isServer ?? router.isServer)) {\n    return null\n  }\n  if (typeof router.options.scrollRestoration === 'function') {\n    const shouldRestore = router.options.scrollRestoration({\n      location: router.latestLocation,\n    })\n    if (!shouldRestore) {\n      return null\n    }\n  }\n  const getKey =\n    router.options.getScrollRestorationKey || defaultGetScrollRestorationKey\n  const userKey = getKey(router.latestLocation)\n  const resolvedKey =\n    userKey !== defaultGetScrollRestorationKey(router.latestLocation)\n      ? userKey\n      : undefined\n\n  const restoreScrollOptions: Parameters<typeof restoreScroll>[0] = {\n    storageKey,\n    shouldScrollRestoration: true,\n  }\n  if (resolvedKey) {\n    restoreScrollOptions.key = resolvedKey\n  }\n\n  return (\n    <ScriptOnce\n      children={`(${restoreScroll.toString()})(${escapeHtml(JSON.stringify(restoreScrollOptions))})`}\n    />\n  )\n}\n"],"names":["ScrollRestoration","router","useRouter","isScrollRestoring","isServer","options","scrollRestoration","shouldRestore","location","latestLocation","getKey","getScrollRestorationKey","defaultGetScrollRestorationKey","userKey","resolvedKey","undefined","restoreScrollOptions","storageKey","shouldScrollRestoration","key","_$createComponent","ScriptOnce","children","restoreScroll","toString","escapeHtml","JSON","stringify"],"mappings":";;;;;AAUO,SAASA,oBAAoB;AAClC,QAAMC,SAASC,UAAAA;AACf,MAAI,CAACD,OAAOE,qBAAqB,EAAEC,YAAYH,OAAOG,WAAW;AAC/D,WAAO;AAAA,EACT;AACA,MAAI,OAAOH,OAAOI,QAAQC,sBAAsB,YAAY;AAC1D,UAAMC,gBAAgBN,OAAOI,QAAQC,kBAAkB;AAAA,MACrDE,UAAUP,OAAOQ;AAAAA,IAAAA,CAClB;AACD,QAAI,CAACF,eAAe;AAClB,aAAO;AAAA,IACT;AAAA,EACF;AACA,QAAMG,SACJT,OAAOI,QAAQM,2BAA2BC;AAC5C,QAAMC,UAAUH,OAAOT,OAAOQ,cAAc;AAC5C,QAAMK,cACJD,YAAYD,+BAA+BX,OAAOQ,cAAc,IAC5DI,UACAE;AAEN,QAAMC,uBAA4D;AAAA,IAChEC;AAAAA,IACAC,yBAAyB;AAAA,EAAA;AAE3B,MAAIJ,aAAa;AACfE,yBAAqBG,MAAML;AAAAA,EAC7B;AAEA,SAAAM,gBACGC,YAAU;AAAA,IAAA,IACTC,WAAQ;AAAA,aAAE,IAAIC,cAAcC,SAAAA,CAAU,KAAKC,WAAWC,KAAKC,UAAUX,oBAAoB,CAAC,CAAC;AAAA,IAAG;AAAA,EAAA,CAAA;AAGpG;"}
+{"version":3,"file":"scroll-restoration.js","names":["defaultGetScrollRestorationKey","escapeHtml","restoreScroll","storageKey","isServer","useRouter","ScriptOnce","ScrollRestoration","router","isScrollRestoring","options","scrollRestoration","shouldRestore","location","latestLocation","getKey","getScrollRestorationKey","userKey","resolvedKey","undefined","restoreScrollOptions","Parameters","shouldScrollRestoration","key","_$createComponent","children","toString","JSON","stringify"],"sources":["../../src/scroll-restoration.tsx"],"sourcesContent":["import {\n  defaultGetScrollRestorationKey,\n  escapeHtml,\n  restoreScroll,\n  storageKey,\n} from '@tanstack/router-core'\nimport { isServer } from '@tanstack/router-core/isServer'\nimport { useRouter } from './useRouter'\nimport { ScriptOnce } from './ScriptOnce'\n\nexport function ScrollRestoration() {\n  const router = useRouter()\n  if (!router.isScrollRestoring || !(isServer ?? router.isServer)) {\n    return null\n  }\n  if (typeof router.options.scrollRestoration === 'function') {\n    const shouldRestore = router.options.scrollRestoration({\n      location: router.latestLocation,\n    })\n    if (!shouldRestore) {\n      return null\n    }\n  }\n  const getKey =\n    router.options.getScrollRestorationKey || defaultGetScrollRestorationKey\n  const userKey = getKey(router.latestLocation)\n  const resolvedKey =\n    userKey !== defaultGetScrollRestorationKey(router.latestLocation)\n      ? userKey\n      : undefined\n\n  const restoreScrollOptions: Parameters<typeof restoreScroll>[0] = {\n    storageKey,\n    shouldScrollRestoration: true,\n  }\n  if (resolvedKey) {\n    restoreScrollOptions.key = resolvedKey\n  }\n\n  return (\n    <ScriptOnce\n      children={`(${restoreScroll.toString()})(${escapeHtml(JSON.stringify(restoreScrollOptions))})`}\n    />\n  )\n}\n"],"mappings":";;;;;;AAUA,SAAgBO,oBAAoB;CAClC,MAAMC,SAASH,WAAW;AAC1B,KAAI,CAACG,OAAOC,qBAAqB,EAAEL,YAAYI,OAAOJ,UACpD,QAAO;AAET,KAAI,OAAOI,OAAOE,QAAQC,sBAAsB;MAI1C,CAHkBH,OAAOE,QAAQC,kBAAkB,EACrDE,UAAUL,OAAOM,gBAClB,CAAC,CAEA,QAAO;;CAKX,MAAMG,WADJT,OAAOE,QAAQM,2BAA2BhB,gCACrBQ,OAAOM,eAAe;CAC7C,MAAMI,cACJD,YAAYjB,+BAA+BQ,OAAOM,eAAe,GAC7DG,UACAE,KAAAA;CAEN,MAAMC,uBAA4D;EAChEjB;EACAmB,yBAAyB;EAC1B;AACD,KAAIJ,YACFE,sBAAqBG,MAAML;AAG7B,QAAAM,gBACGlB,YAAU,EAAA,IACTmB,WAAQ;AAAA,SAAE,IAAIvB,cAAcwB,UAAU,CAAA,IAAKzB,WAAW0B,KAAKC,UAAUR,qBAAqB,CAAC,CAAA;IAAG,CAAA"}

package/dist/esm/ssr/RouterClient.js

@@ -1,26 +1,20 @@
-import { createComponent } from "@solidjs/web";
-import { hydrate } from "@tanstack/router-core/ssr/client";
 import { Await } from "../awaited.js";
 import { RouterProvider } from "../RouterProvider.js";
-let hydrationPromise;
+import { createComponent } from "@solidjs/web";
+import { hydrate } from "@tanstack/router-core/ssr/client";
+//#region src/ssr/RouterClient.tsx
+var hydrationPromise;
 function RouterClient(props) {
-  if (!hydrationPromise) {
-    if (!props.router.state.matches.length) {
-      hydrationPromise = hydrate(props.router);
-    } else {
-      hydrationPromise = Promise.resolve();
-    }
-  }
-  return createComponent(Await, {
-    promise: hydrationPromise,
-    children: () => createComponent(RouterProvider, {
-      get router() {
-        return props.router;
-      }
-    })
-  });
+	if (!hydrationPromise) if (!props.router.state.matches.length) hydrationPromise = hydrate(props.router);
+	else hydrationPromise = Promise.resolve();
+	return createComponent(Await, {
+		promise: hydrationPromise,
+		children: () => createComponent(RouterProvider, { get router() {
+			return props.router;
+		} })
+	});
 }
-export {
-  RouterClient
-};
-//# sourceMappingURL=RouterClient.js.map
+//#endregion
+export { RouterClient };
+
+//# sourceMappingURL=RouterClient.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"RouterClient.js","sources":["../../../src/ssr/RouterClient.tsx"],"sourcesContent":["import { hydrate } from '@tanstack/router-core/ssr/client'\nimport { Await } from '../awaited'\nimport { RouterProvider } from '../RouterProvider'\nimport type { AnyRouter } from '@tanstack/router-core'\n\nlet hydrationPromise: Promise<void | Array<Array<void>>> | undefined\n\nexport function RouterClient(props: { router: AnyRouter }) {\n  if (!hydrationPromise) {\n    if (!props.router.state.matches.length) {\n      hydrationPromise = hydrate(props.router)\n    } else {\n      hydrationPromise = Promise.resolve()\n    }\n  }\n  return (\n    <Await\n      promise={hydrationPromise}\n      children={() => <RouterProvider router={props.router} />}\n    />\n  )\n}\n"],"names":["hydrationPromise","RouterClient","props","router","state","matches","length","hydrate","Promise","resolve","_$createComponent","Await","promise","children","RouterProvider"],"mappings":";;;;AAKA,IAAIA;AAEG,SAASC,aAAaC,OAA8B;AACzD,MAAI,CAACF,kBAAkB;AACrB,QAAI,CAACE,MAAMC,OAAOC,MAAMC,QAAQC,QAAQ;AACtCN,yBAAmBO,QAAQL,MAAMC,MAAM;AAAA,IACzC,OAAO;AACLH,yBAAmBQ,QAAQC,QAAAA;AAAAA,IAC7B;AAAA,EACF;AACA,SAAAC,gBACGC,OAAK;AAAA,IACJC,SAASZ;AAAAA,IACTa,UAAUA,MAAAH,gBAAOI,gBAAc;AAAA,MAAA,IAACX,SAAM;AAAA,eAAED,MAAMC;AAAAA,MAAM;AAAA,IAAA,CAAA;AAAA,EAAA,CAAI;AAG9D;"}
+{"version":3,"file":"RouterClient.js","names":["hydrate","Await","RouterProvider","AnyRouter","hydrationPromise","Promise","Array","RouterClient","props","router","state","matches","length","resolve","_$createComponent","promise","children"],"sources":["../../../src/ssr/RouterClient.tsx"],"sourcesContent":["import { hydrate } from '@tanstack/router-core/ssr/client'\nimport { Await } from '../awaited'\nimport { RouterProvider } from '../RouterProvider'\nimport type { AnyRouter } from '@tanstack/router-core'\n\nlet hydrationPromise: Promise<void | Array<Array<void>>> | undefined\n\nexport function RouterClient(props: { router: AnyRouter }) {\n  if (!hydrationPromise) {\n    if (!props.router.state.matches.length) {\n      hydrationPromise = hydrate(props.router)\n    } else {\n      hydrationPromise = Promise.resolve()\n    }\n  }\n  return (\n    <Await\n      promise={hydrationPromise}\n      children={() => <RouterProvider router={props.router} />}\n    />\n  )\n}\n"],"mappings":";;;;;AAKA,IAAII;AAEJ,SAAgBG,aAAaC,OAA8B;AACzD,KAAI,CAACJ,iBACH,KAAI,CAACI,MAAMC,OAAOC,MAAMC,QAAQC,OAC9BR,oBAAmBJ,QAAQQ,MAAMC,OAAO;KAExCL,oBAAmBC,QAAQQ,SAAS;AAGxC,QAAAC,gBACGb,OAAK;EACJc,SAASX;EACTY,gBAAUF,gBAAOZ,gBAAc,EAAA,IAACO,SAAM;AAAA,UAAED,MAAMC;KAAM,CAAA;EAAI,CAAA"}

package/dist/esm/ssr/RouterServer.js

@@ -1,13 +1,12 @@
-import { createComponent } from "@solidjs/web";
 import { RouterProvider } from "../RouterProvider.js";
+import { createComponent } from "@solidjs/web";
+//#region src/ssr/RouterServer.tsx
 function RouterServer(props) {
-  return createComponent(RouterProvider, {
-    get router() {
-      return props.router;
-    }
-  });
+	return createComponent(RouterProvider, { get router() {
+		return props.router;
+	} });
 }
-export {
-  RouterServer
-};
-//# sourceMappingURL=RouterServer.js.map
+//#endregion
+export { RouterServer };
+
+//# sourceMappingURL=RouterServer.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"RouterServer.js","sources":["../../../src/ssr/RouterServer.tsx"],"sourcesContent":["import { RouterProvider } from '../RouterProvider'\nimport type { AnyRouter } from '@tanstack/router-core'\n\nexport function RouterServer<TRouter extends AnyRouter>(props: {\n  router: TRouter\n}) {\n  return <RouterProvider router={props.router} />\n}\n"],"names":["RouterServer","props","_$createComponent","RouterProvider","router"],"mappings":";;AAGO,SAASA,aAAwCC,OAErD;AACD,SAAAC,gBAAQC,gBAAc;AAAA,IAAA,IAACC,SAAM;AAAA,aAAEH,MAAMG;AAAAA,IAAM;AAAA,EAAA,CAAA;AAC7C;"}
+{"version":3,"file":"RouterServer.js","names":["RouterProvider","AnyRouter","RouterServer","props","router","TRouter","_$createComponent"],"sources":["../../../src/ssr/RouterServer.tsx"],"sourcesContent":["import { RouterProvider } from '../RouterProvider'\nimport type { AnyRouter } from '@tanstack/router-core'\n\nexport function RouterServer<TRouter extends AnyRouter>(props: {\n  router: TRouter\n}) {\n  return <RouterProvider router={props.router} />\n}\n"],"mappings":";;;AAGA,SAAgBE,aAAwCC,OAErD;AACD,QAAAG,gBAAQN,gBAAc,EAAA,IAACI,SAAM;AAAA,SAAED,MAAMC;IAAM,CAAA"}

package/dist/esm/ssr/client.js

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

package/dist/esm/ssr/defaultRenderHandler.js

@@ -1,18 +1,14 @@
-import { createComponent } from "@solidjs/web";
-import { defineHandlerCallback } from "@tanstack/router-core/ssr/server";
 import { RouterServer } from "./RouterServer.js";
 import { renderRouterToString } from "./renderRouterToString.js";
-const defaultRenderHandler = defineHandlerCallback(({
-  router,
-  responseHeaders
-}) => renderRouterToString({
-  router,
-  responseHeaders,
-  children: () => createComponent(RouterServer, {
-    router
-  })
+import { createComponent } from "@solidjs/web";
+import { defineHandlerCallback } from "@tanstack/router-core/ssr/server";
+//#region src/ssr/defaultRenderHandler.tsx
+var defaultRenderHandler = defineHandlerCallback(({ router, responseHeaders }) => renderRouterToString({
+	router,
+	responseHeaders,
+	children: () => createComponent(RouterServer, { router })
 }));
-export {
-  defaultRenderHandler
-};
-//# sourceMappingURL=defaultRenderHandler.js.map
+//#endregion
+export { defaultRenderHandler };
+
+//# sourceMappingURL=defaultRenderHandler.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"defaultRenderHandler.js","sources":["../../../src/ssr/defaultRenderHandler.tsx"],"sourcesContent":["import { defineHandlerCallback } from '@tanstack/router-core/ssr/server'\nimport { RouterServer } from './RouterServer'\nimport { renderRouterToString } from './renderRouterToString'\n\nexport const defaultRenderHandler = defineHandlerCallback(\n  ({ router, responseHeaders }) =>\n    renderRouterToString({\n      router,\n      responseHeaders,\n      children: () => <RouterServer router={router} />,\n    }),\n)\n"],"names":["defaultRenderHandler","defineHandlerCallback","router","responseHeaders","renderRouterToString","children","_$createComponent","RouterServer"],"mappings":";;;;AAIO,MAAMA,uBAAuBC,sBAClC,CAAC;AAAA,EAAEC;AAAAA,EAAQC;AAAgB,MACzBC,qBAAqB;AAAA,EACnBF;AAAAA,EACAC;AAAAA,EACAE,UAAUA,MAAAC,gBAAOC,cAAY;AAAA,IAACL;AAAAA,EAAAA,CAAc;AAC9C,CAAC,CACL;"}
+{"version":3,"file":"defaultRenderHandler.js","names":["defineHandlerCallback","RouterServer","renderRouterToString","defaultRenderHandler","router","responseHeaders","children","_$createComponent"],"sources":["../../../src/ssr/defaultRenderHandler.tsx"],"sourcesContent":["import { defineHandlerCallback } from '@tanstack/router-core/ssr/server'\nimport { RouterServer } from './RouterServer'\nimport { renderRouterToString } from './renderRouterToString'\n\nexport const defaultRenderHandler = defineHandlerCallback(\n  ({ router, responseHeaders }) =>\n    renderRouterToString({\n      router,\n      responseHeaders,\n      children: () => <RouterServer router={router} />,\n    }),\n)\n"],"mappings":";;;;;AAIA,IAAaG,uBAAuBH,uBACjC,EAAEI,QAAQC,sBACTH,qBAAqB;CACnBE;CACAC;CACAC,gBAAUC,gBAAON,cAAY,EAASG,QAAM,CAAA;CAC7C,CACL,CAAC"}

package/dist/esm/ssr/defaultStreamHandler.js

@@ -1,20 +1,15 @@
-import { createComponent } from "@solidjs/web";
-import { defineHandlerCallback } from "@tanstack/router-core/ssr/server";
 import { RouterServer } from "./RouterServer.js";
 import { renderRouterToStream } from "./renderRouterToStream.js";
-const defaultStreamHandler = defineHandlerCallback(({
-  request,
-  router,
-  responseHeaders
-}) => renderRouterToStream({
-  request,
-  router,
-  responseHeaders,
-  children: () => createComponent(RouterServer, {
-    router
-  })
+import { createComponent } from "@solidjs/web";
+import { defineHandlerCallback } from "@tanstack/router-core/ssr/server";
+//#region src/ssr/defaultStreamHandler.tsx
+var defaultStreamHandler = defineHandlerCallback(({ request, router, responseHeaders }) => renderRouterToStream({
+	request,
+	router,
+	responseHeaders,
+	children: () => createComponent(RouterServer, { router })
 }));
-export {
-  defaultStreamHandler
-};
-//# sourceMappingURL=defaultStreamHandler.js.map
+//#endregion
+export { defaultStreamHandler };
+
+//# sourceMappingURL=defaultStreamHandler.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"defaultStreamHandler.js","sources":["../../../src/ssr/defaultStreamHandler.tsx"],"sourcesContent":["import { defineHandlerCallback } from '@tanstack/router-core/ssr/server'\nimport { RouterServer } from './RouterServer'\nimport { renderRouterToStream } from './renderRouterToStream'\n\nexport const defaultStreamHandler = defineHandlerCallback(\n  ({ request, router, responseHeaders }) =>\n    renderRouterToStream({\n      request,\n      router,\n      responseHeaders,\n      children: () => <RouterServer router={router} />,\n    }),\n)\n"],"names":["defaultStreamHandler","defineHandlerCallback","request","router","responseHeaders","renderRouterToStream","children","_$createComponent","RouterServer"],"mappings":";;;;AAIO,MAAMA,uBAAuBC,sBAClC,CAAC;AAAA,EAAEC;AAAAA,EAASC;AAAAA,EAAQC;AAAgB,MAClCC,qBAAqB;AAAA,EACnBH;AAAAA,EACAC;AAAAA,EACAC;AAAAA,EACAE,UAAUA,MAAAC,gBAAOC,cAAY;AAAA,IAACL;AAAAA,EAAAA,CAAc;AAC9C,CAAC,CACL;"}
+{"version":3,"file":"defaultStreamHandler.js","names":["defineHandlerCallback","RouterServer","renderRouterToStream","defaultStreamHandler","request","router","responseHeaders","children","_$createComponent"],"sources":["../../../src/ssr/defaultStreamHandler.tsx"],"sourcesContent":["import { defineHandlerCallback } from '@tanstack/router-core/ssr/server'\nimport { RouterServer } from './RouterServer'\nimport { renderRouterToStream } from './renderRouterToStream'\n\nexport const defaultStreamHandler = defineHandlerCallback(\n  ({ request, router, responseHeaders }) =>\n    renderRouterToStream({\n      request,\n      router,\n      responseHeaders,\n      children: () => <RouterServer router={router} />,\n    }),\n)\n"],"mappings":";;;;;AAIA,IAAaG,uBAAuBH,uBACjC,EAAEI,SAASC,QAAQC,sBAClBJ,qBAAqB;CACnBE;CACAC;CACAC;CACAC,gBAAUC,gBAAOP,cAAY,EAASI,QAAM,CAAA;CAC7C,CACL,CAAC"}

package/dist/esm/ssr/renderRouterToStream.js

@@ -1,39 +1,26 @@
+import { makeSsrSerovalPlugin } from "@tanstack/router-core";
 import * as Solid from "@solidjs/web";
-import { isbot } from "isbot";
 import { transformReadableStreamWithRouter } from "@tanstack/router-core/ssr/server";
-import { makeSsrSerovalPlugin } from "@tanstack/router-core";
-const renderRouterToStream = async ({
-  request,
-  router,
-  responseHeaders,
-  children
-}) => {
-  const {
-    writable,
-    readable
-  } = new TransformStream();
-  const serializationAdapters = router.options?.serializationAdapters || router.options.ssr?.serializationAdapters;
-  const serovalPlugins = serializationAdapters?.map((adapter) => {
-    const plugin = makeSsrSerovalPlugin(adapter, {
-      didRun: false
-    });
-    return plugin;
-  });
-  const stream = Solid.renderToStream(() => children, {
-    nonce: router.options.ssr?.nonce,
-    plugins: serovalPlugins
-  });
-  if (isbot(request.headers.get("User-Agent"))) {
-    await stream;
-  }
-  stream.pipeTo(writable);
-  const responseStream = transformReadableStreamWithRouter(router, readable);
-  return new Response(responseStream, {
-    status: router.state.statusCode,
-    headers: responseHeaders
-  });
-};
-export {
-  renderRouterToStream
+import { isbot } from "isbot";
+//#region src/ssr/renderRouterToStream.tsx
+var renderRouterToStream = async ({ request, router, responseHeaders, children }) => {
+	const { writable, readable } = new TransformStream();
+	const serovalPlugins = (router.options?.serializationAdapters || router.options.ssr?.serializationAdapters)?.map((adapter) => {
+		return makeSsrSerovalPlugin(adapter, { didRun: false });
+	});
+	const stream = Solid.renderToStream(() => children, {
+		nonce: router.options.ssr?.nonce,
+		plugins: serovalPlugins
+	});
+	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.js.map
+//#endregion
+export { renderRouterToStream };
+
+//# sourceMappingURL=renderRouterToStream.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"renderRouterToStream.js","sources":["../../../src/ssr/renderRouterToStream.tsx"],"sourcesContent":["import * as Solid from '@solidjs/web'\nimport { isbot } from 'isbot'\nimport { transformReadableStreamWithRouter } from '@tanstack/router-core/ssr/server'\nimport { makeSsrSerovalPlugin } from '@tanstack/router-core'\nimport type { JSXElement } from 'solid-js'\nimport type { ReadableStream } from 'node:stream/web'\nimport type { AnyRouter } from '@tanstack/router-core'\n\nexport const renderRouterToStream = async ({\n  request,\n  router,\n  responseHeaders,\n  children,\n}: {\n  request: Request\n  router: AnyRouter\n  responseHeaders: Headers\n  children: () => JSXElement\n}) => {\n  const { writable, readable } = new TransformStream()\n\n  const serializationAdapters =\n    (router.options as any)?.serializationAdapters ||\n    (router.options.ssr as any)?.serializationAdapters\n  const serovalPlugins = serializationAdapters?.map((adapter: any) => {\n    const plugin = makeSsrSerovalPlugin(adapter, { didRun: false })\n    return plugin\n  })\n\n  const stream = Solid.renderToStream(() => children, {\n    nonce: router.options.ssr?.nonce,\n    plugins: serovalPlugins,\n  } as any)\n\n  if (isbot(request.headers.get('User-Agent'))) {\n    await stream\n  }\n  stream.pipeTo(writable)\n\n  const responseStream = transformReadableStreamWithRouter(\n    router,\n    readable as unknown as ReadableStream,\n  )\n  return new Response(responseStream as any, {\n    status: router.state.statusCode,\n    headers: responseHeaders,\n  })\n}\n"],"names":["renderRouterToStream","request","router","responseHeaders","children","writable","readable","TransformStream","serializationAdapters","options","ssr","serovalPlugins","map","adapter","plugin","makeSsrSerovalPlugin","didRun","stream","Solid","renderToStream","nonce","plugins","isbot","headers","get","pipeTo","responseStream","transformReadableStreamWithRouter","Response","status","state","statusCode"],"mappings":";;;;AAQO,MAAMA,uBAAuB,OAAO;AAAA,EACzCC;AAAAA,EACAC;AAAAA,EACAC;AAAAA,EACAC;AAMF,MAAM;AACJ,QAAM;AAAA,IAAEC;AAAAA,IAAUC;AAAAA,EAAAA,IAAa,IAAIC,gBAAAA;AAEnC,QAAMC,wBACHN,OAAOO,SAAiBD,yBACxBN,OAAOO,QAAQC,KAAaF;AAC/B,QAAMG,iBAAiBH,uBAAuBI,IAAI,CAACC,YAAiB;AAClE,UAAMC,SAASC,qBAAqBF,SAAS;AAAA,MAAEG,QAAQ;AAAA,IAAA,CAAO;AAC9D,WAAOF;AAAAA,EACT,CAAC;AAED,QAAMG,SAASC,MAAMC,eAAe,MAAMf,UAAU;AAAA,IAClDgB,OAAOlB,OAAOO,QAAQC,KAAKU;AAAAA,IAC3BC,SAASV;AAAAA,EAAAA,CACH;AAER,MAAIW,MAAMrB,QAAQsB,QAAQC,IAAI,YAAY,CAAC,GAAG;AAC5C,UAAMP;AAAAA,EACR;AACAA,SAAOQ,OAAOpB,QAAQ;AAEtB,QAAMqB,iBAAiBC,kCACrBzB,QACAI,QACF;AACA,SAAO,IAAIsB,SAASF,gBAAuB;AAAA,IACzCG,QAAQ3B,OAAO4B,MAAMC;AAAAA,IACrBR,SAASpB;AAAAA,EAAAA,CACV;AACH;"}
+{"version":3,"file":"renderRouterToStream.js","names":["Solid","isbot","transformReadableStreamWithRouter","makeSsrSerovalPlugin","JSXElement","ReadableStream","AnyRouter","renderRouterToStream","request","router","responseHeaders","children","Request","Headers","writable","readable","TransformStream","serializationAdapters","options","ssr","serovalPlugins","map","adapter","plugin","didRun","stream","renderToStream","nonce","plugins","headers","get","pipeTo","responseStream","Response","status","state","statusCode"],"sources":["../../../src/ssr/renderRouterToStream.tsx"],"sourcesContent":["import * as Solid from '@solidjs/web'\nimport { isbot } from 'isbot'\nimport { transformReadableStreamWithRouter } from '@tanstack/router-core/ssr/server'\nimport { makeSsrSerovalPlugin } from '@tanstack/router-core'\nimport type { JSXElement } from 'solid-js'\nimport type { ReadableStream } from 'node:stream/web'\nimport type { AnyRouter } from '@tanstack/router-core'\n\nexport const renderRouterToStream = async ({\n  request,\n  router,\n  responseHeaders,\n  children,\n}: {\n  request: Request\n  router: AnyRouter\n  responseHeaders: Headers\n  children: () => JSXElement\n}) => {\n  const { writable, readable } = new TransformStream()\n\n  const serializationAdapters =\n    (router.options as any)?.serializationAdapters ||\n    (router.options.ssr as any)?.serializationAdapters\n  const serovalPlugins = serializationAdapters?.map((adapter: any) => {\n    const plugin = makeSsrSerovalPlugin(adapter, { didRun: false })\n    return plugin\n  })\n\n  const stream = Solid.renderToStream(() => children, {\n    nonce: router.options.ssr?.nonce,\n    plugins: serovalPlugins,\n  } as any)\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"],"mappings":";;;;;AAQA,IAAaO,uBAAuB,OAAO,EACzCC,SACAC,QACAC,iBACAC,eAMI;CACJ,MAAM,EAAEG,UAAUC,aAAa,IAAIC,iBAAiB;CAKpD,MAAMI,kBAFHX,OAAOS,SAAiBD,yBACxBR,OAAOS,QAAQC,KAAaF,wBACeI,KAAKC,YAAiB;AAElE,SADenB,qBAAqBmB,SAAS,EAAEE,QAAQ,OAAO,CAAC;GAE/D;CAEF,MAAMC,SAASzB,MAAM0B,qBAAqBf,UAAU;EAClDgB,OAAOlB,OAAOS,QAAQC,KAAKQ;EAC3BC,SAASR;EACV,CAAQ;AAET,KAAInB,MAAMO,QAAQqB,QAAQC,IAAI,aAAa,CAAC,CAC1C,OAAML;AAERA,QAAOM,OAAOjB,SAAS;CAEvB,MAAMkB,iBAAiB9B,kCACrBO,QACAM,SACD;AACD,QAAO,IAAIkB,SAASD,gBAAuB;EACzCE,QAAQzB,OAAO0B,MAAMC;EACrBP,SAASnB;EACV,CAAC"}

package/dist/esm/ssr/renderRouterToString.js

@@ -1,42 +1,33 @@
-import * as Solid from "@solidjs/web";
 import { makeSsrSerovalPlugin } from "@tanstack/router-core";
-const renderRouterToString = ({
-  router,
-  responseHeaders,
-  children
-}) => {
-  try {
-    const serializationAdapters = router.options?.serializationAdapters || router.options.ssr?.serializationAdapters;
-    const serovalPlugins = serializationAdapters?.map((adapter) => {
-      const plugin = makeSsrSerovalPlugin(adapter, {
-        didRun: false
-      });
-      return plugin;
-    });
-    let html = Solid.renderToString(children, {
-      nonce: router.options.ssr?.nonce,
-      plugins: serovalPlugins
-    });
-    router.serverSsr.setRenderFinished();
-    const injectedHtml = router.serverSsr.takeBufferedHtml();
-    if (injectedHtml) {
-      html = html.replace(`</body>`, () => `${injectedHtml}</body>`);
-    }
-    return new Response(`<!DOCTYPE html>${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
-    });
-  } finally {
-    router.serverSsr?.cleanup();
-  }
-};
-export {
-  renderRouterToString
+import * as Solid from "@solidjs/web";
+//#region src/ssr/renderRouterToString.tsx
+var renderRouterToString = ({ router, responseHeaders, children }) => {
+	try {
+		const serovalPlugins = (router.options?.serializationAdapters || router.options.ssr?.serializationAdapters)?.map((adapter) => {
+			return makeSsrSerovalPlugin(adapter, { didRun: false });
+		});
+		let html = Solid.renderToString(children, {
+			nonce: router.options.ssr?.nonce,
+			plugins: serovalPlugins
+		});
+		router.serverSsr.setRenderFinished();
+		const injectedHtml = router.serverSsr.takeBufferedHtml();
+		if (injectedHtml) html = html.replace(`</body>`, () => `${injectedHtml}</body>`);
+		return new Response(`<!DOCTYPE html>${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
+		});
+	} finally {
+		router.serverSsr?.cleanup();
+	}
 };
-//# sourceMappingURL=renderRouterToString.js.map
+//#endregion
+export { renderRouterToString };
+
+//# sourceMappingURL=renderRouterToString.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"renderRouterToString.js","sources":["../../../src/ssr/renderRouterToString.tsx"],"sourcesContent":["import * as Solid from '@solidjs/web'\nimport { makeSsrSerovalPlugin } from '@tanstack/router-core'\nimport type { AnyRouter } from '@tanstack/router-core'\nimport type { JSXElement } from 'solid-js'\n\nexport const renderRouterToString = ({\n  router,\n  responseHeaders,\n  children,\n}: {\n  router: AnyRouter\n  responseHeaders: Headers\n  children: () => JSXElement\n}) => {\n  try {\n    const serializationAdapters =\n      (router.options as any)?.serializationAdapters ||\n      (router.options.ssr as any)?.serializationAdapters\n    const serovalPlugins = serializationAdapters?.map((adapter: any) => {\n      const plugin = makeSsrSerovalPlugin(adapter, { didRun: false })\n      return plugin\n    })\n\n    let html = Solid.renderToString(children, {\n      nonce: router.options.ssr?.nonce,\n      plugins: serovalPlugins,\n    } as any)\n    router.serverSsr!.setRenderFinished()\n\n    const injectedHtml = router.serverSsr!.takeBufferedHtml()\n    if (injectedHtml) {\n      html = html.replace(`</body>`, () => `${injectedHtml}</body>`)\n    }\n    return new Response(`<!DOCTYPE html>${html}`, {\n      status: router.state.statusCode,\n      headers: responseHeaders,\n    })\n  } catch (error) {\n    console.error('Render to string error:', error)\n    return new Response('Internal Server Error', {\n      status: 500,\n      headers: responseHeaders,\n    })\n  } finally {\n    router.serverSsr?.cleanup()\n  }\n}\n"],"names":["renderRouterToString","router","responseHeaders","children","serializationAdapters","options","ssr","serovalPlugins","map","adapter","plugin","makeSsrSerovalPlugin","didRun","html","Solid","renderToString","nonce","plugins","serverSsr","setRenderFinished","injectedHtml","takeBufferedHtml","replace","Response","status","state","statusCode","headers","error","console","cleanup"],"mappings":";;AAKO,MAAMA,uBAAuBA,CAAC;AAAA,EACnCC;AAAAA,EACAC;AAAAA,EACAC;AAKF,MAAM;AACJ,MAAI;AACF,UAAMC,wBACHH,OAAOI,SAAiBD,yBACxBH,OAAOI,QAAQC,KAAaF;AAC/B,UAAMG,iBAAiBH,uBAAuBI,IAAI,CAACC,YAAiB;AAClE,YAAMC,SAASC,qBAAqBF,SAAS;AAAA,QAAEG,QAAQ;AAAA,MAAA,CAAO;AAC9D,aAAOF;AAAAA,IACT,CAAC;AAED,QAAIG,OAAOC,MAAMC,eAAeZ,UAAU;AAAA,MACxCa,OAAOf,OAAOI,QAAQC,KAAKU;AAAAA,MAC3BC,SAASV;AAAAA,IAAAA,CACH;AACRN,WAAOiB,UAAWC,kBAAAA;AAElB,UAAMC,eAAenB,OAAOiB,UAAWG,iBAAAA;AACvC,QAAID,cAAc;AAChBP,aAAOA,KAAKS,QAAQ,WAAW,MAAM,GAAGF,YAAY,SAAS;AAAA,IAC/D;AACA,WAAO,IAAIG,SAAS,kBAAkBV,IAAI,IAAI;AAAA,MAC5CW,QAAQvB,OAAOwB,MAAMC;AAAAA,MACrBC,SAASzB;AAAAA,IAAAA,CACV;AAAA,EACH,SAAS0B,OAAO;AACdC,YAAQD,MAAM,2BAA2BA,KAAK;AAC9C,WAAO,IAAIL,SAAS,yBAAyB;AAAA,MAC3CC,QAAQ;AAAA,MACRG,SAASzB;AAAAA,IAAAA,CACV;AAAA,EACH,UAAA;AACED,WAAOiB,WAAWY,QAAAA;AAAAA,EACpB;AACF;"}
+{"version":3,"file":"renderRouterToString.js","names":["Solid","makeSsrSerovalPlugin","AnyRouter","JSXElement","renderRouterToString","router","responseHeaders","children","Headers","serializationAdapters","options","ssr","serovalPlugins","map","adapter","plugin","didRun","html","renderToString","nonce","plugins","serverSsr","setRenderFinished","injectedHtml","takeBufferedHtml","replace","Response","status","state","statusCode","headers","error","console","cleanup"],"sources":["../../../src/ssr/renderRouterToString.tsx"],"sourcesContent":["import * as Solid from '@solidjs/web'\nimport { makeSsrSerovalPlugin } from '@tanstack/router-core'\nimport type { AnyRouter } from '@tanstack/router-core'\nimport type { JSXElement } from 'solid-js'\n\nexport const renderRouterToString = ({\n  router,\n  responseHeaders,\n  children,\n}: {\n  router: AnyRouter\n  responseHeaders: Headers\n  children: () => JSXElement\n}) => {\n  try {\n    const serializationAdapters =\n      (router.options as any)?.serializationAdapters ||\n      (router.options.ssr as any)?.serializationAdapters\n    const serovalPlugins = serializationAdapters?.map((adapter: any) => {\n      const plugin = makeSsrSerovalPlugin(adapter, { didRun: false })\n      return plugin\n    })\n\n    let html = Solid.renderToString(children, {\n      nonce: router.options.ssr?.nonce,\n      plugins: serovalPlugins,\n    } as any)\n    router.serverSsr!.setRenderFinished()\n\n    const injectedHtml = router.serverSsr!.takeBufferedHtml()\n    if (injectedHtml) {\n      html = html.replace(`</body>`, () => `${injectedHtml}</body>`)\n    }\n    return new Response(`<!DOCTYPE html>${html}`, {\n      status: router.state.statusCode,\n      headers: responseHeaders,\n    })\n  } catch (error) {\n    console.error('Render to string error:', error)\n    return new Response('Internal Server Error', {\n      status: 500,\n      headers: responseHeaders,\n    })\n  } finally {\n    router.serverSsr?.cleanup()\n  }\n}\n"],"mappings":";;;AAKA,IAAaI,wBAAwB,EACnCC,QACAC,iBACAC,eAKI;AACJ,KAAI;EAIF,MAAMK,kBAFHP,OAAOK,SAAiBD,yBACxBJ,OAAOK,QAAQC,KAAaF,wBACeI,KAAKC,YAAiB;AAElE,UADeb,qBAAqBa,SAAS,EAAEE,QAAQ,OAAO,CAAC;IAE/D;EAEF,IAAIC,OAAOjB,MAAMkB,eAAeX,UAAU;GACxCY,OAAOd,OAAOK,QAAQC,KAAKQ;GAC3BC,SAASR;GACV,CAAQ;AACTP,SAAOgB,UAAWC,mBAAmB;EAErC,MAAMC,eAAelB,OAAOgB,UAAWG,kBAAkB;AACzD,MAAID,aACFN,QAAOA,KAAKQ,QAAQ,iBAAiB,GAAGF,aAAY,SAAU;AAEhE,SAAO,IAAIG,SAAS,kBAAkBT,QAAQ;GAC5CU,QAAQtB,OAAOuB,MAAMC;GACrBC,SAASxB;GACV,CAAC;UACKyB,OAAO;AACdC,UAAQD,MAAM,2BAA2BA,MAAM;AAC/C,SAAO,IAAIL,SAAS,yBAAyB;GAC3CC,QAAQ;GACRG,SAASxB;GACV,CAAC;WACM;AACRD,SAAOgB,WAAWY,SAAS"}

package/dist/esm/ssr/server.js

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

package/dist/esm/useBlocker.d.ts

@@ -51,11 +51,14 @@ export declare function useBlocker(blockerFnOrOpts?: LegacyBlockerOpts): Solid.A
  * @deprecated Use the UseBlockerOpts object syntax instead
  */
 export declare function useBlocker(blockerFn?: LegacyBlockerFn, condition?: boolean | any): Solid.Accessor<BlockerResolver>;
-export declare function Block<TRouter extends AnyRouter = RegisteredRouter, TWithResolver extends boolean = boolean>(opts: PromptProps<TRouter, TWithResolver>): SolidNode;
-/**
- *  @deprecated Use the UseBlockerOpts property instead
- */
-export declare function Block(opts: LegacyPromptProps): SolidNode;
+interface BlockComponent {
+    <TRouter extends AnyRouter = RegisteredRouter, TWithResolver extends boolean = boolean>(opts: PromptProps<TRouter, TWithResolver>): SolidNode;
+    /**
+     *  @deprecated Use the UseBlockerOpts property instead
+     */
+    (opts: LegacyPromptProps): SolidNode;
+}
+export declare const Block: BlockComponent;
 type LegacyPromptProps = {
     blockerFn?: LegacyBlockerFn;
     condition?: boolean | any;