@octanejs/tanstack-start 0.2.4 → 0.2.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@octanejs/tanstack-start",
-  "version": "0.2.4",
+  "version": "0.2.6",
   "description": "TanStack Start for Octane, including file-route generation, server functions, SSR streaming, hydration, and Vite or Rsbuild integration.",
   "license": "MIT",
   "type": "module",
@@ -117,8 +117,8 @@
     "@babel/core": "7.29.7",
     "@babel/template": "^7.27.2",
     "@babel/types": "^7.28.5",
-    "@octanejs/rspack-plugin": "0.2.0",
-    "@octanejs/tanstack-router": "0.2.4",
+    "@octanejs/rspack-plugin": "0.2.2",
+    "@octanejs/tanstack-router": "0.2.6",
     "@tanstack/router-core": "1.171.34",
     "@tanstack/router-utils": "1.162.2",
     "@tanstack/start-client-core": "1.170.34",
@@ -131,7 +131,7 @@
     "magic-string": "^0.30.21",
     "pathe": "^2.0.3",
     "picomatch": "^4.0.3",
-    "prettier": "^3.9.6",
+    "prettier": "^3.9.9",
     "seroval": "^1.5.4",
     "source-map": "^0.7.6",
     "srvx": "^0.11.9",
@@ -144,7 +144,7 @@
   },
   "peerDependencies": {
     "@rsbuild/core": "^2.0.0",
-    "octane": "^0.10.0",
+    "octane": "^0.12.0",
     "vite": ">=7.0.0"
   },
   "peerDependenciesMeta": {
@@ -158,7 +158,7 @@
   "devDependencies": {
     "@rsbuild/core": "^2.1.6",
     "@types/node": "^24.13.3",
-    "octane": "0.10.2",
+    "octane": "0.12.0",
     "vite": "^8.1.5",
     "vitest": "^4.1.10"
   },

package/src/GenericHydrate.tsrx

@@ -88,9 +88,8 @@ function useHydrationGate(props: InternalHydrateProps) {
 	const isDynamicHydrate = typeof when === 'function';
 	const dynamicHydrateStrategyRef = useRef<HydrationStrategy | undefined>(undefined);
 	if (isDynamicHydrate) {
-		dynamicHydrateStrategyRef.current ??= isServer ?? typeof window === 'undefined'
-			? dynamicHydrateStrategy
-			: when();
+		dynamicHydrateStrategyRef.current ??=
+			(isServer ?? typeof window === 'undefined') ? dynamicHydrateStrategy : when();
 	}
 	const hydrateStrategy = isDynamicHydrate ? dynamicHydrateStrategyRef.current! : when;
 	const markerHydrateType: HydrationWhen = isDynamicHydrate ? dynamicType : hydrateStrategy._t!;
@@ -118,29 +117,34 @@ function useHydrationGate(props: InternalHydrateProps) {
 	shouldDeferInitialHydrationRef.current ??= !hydrated && shouldDeferHydration(hydrateStrategy);
 
 	if (!gateRef.current) {
-		gateRef.current = isServer ?? typeof window === 'undefined'
-			? createResolvedGate(id, hydrateStrategy._t!)
-			: getOrCreateGate(id, hydrateStrategy._t!);
+		gateRef.current =
+			(isServer ?? typeof window === 'undefined')
+				? createResolvedGate(id, hydrateStrategy._t!)
+				: getOrCreateGate(id, hydrateStrategy._t!);
 	}
 
 	gateRef.current.when = hydrateStrategy._t!;
 
 	if (
-		!(isServer ?? typeof window === 'undefined') && hydrateStrategy._t !== 'never' &&
-			(!shouldDeferInitialHydrationRef.current || !shouldDeferHydration(hydrateStrategy))
+		!(isServer ?? typeof window === 'undefined') &&
+		hydrateStrategy._t !== 'never' &&
+		(!shouldDeferInitialHydrationRef.current || !shouldDeferHydration(hydrateStrategy))
 	) {
 		gateRef.current.resolve();
 	}
 
-	const markerRef = useCallback((element: HTMLDivElement | null) => {
-		markerElementRef.current = element;
-		if (element) {
-			if (hydrateStrategy._t === 'never' && !shouldPreserveServerHTMLRef.current) {
-				element.replaceChildren();
+	const markerRef = useCallback(
+		(element: HTMLDivElement | null) => {
+			markerElementRef.current = element;
+			if (element) {
+				if (hydrateStrategy._t === 'never' && !shouldPreserveServerHTMLRef.current) {
+					element.replaceChildren();
+				}
+				saveFallbackHtml(id, element);
 			}
-			saveFallbackHtml(id, element);
-		}
-	}, [hydrateStrategy._t, id]);
+		},
+		[hydrateStrategy._t, id],
+	);
 
 	useEffect(() => {
 		const gate = gateRef.current!;
@@ -178,18 +182,21 @@ function useHydrationGate(props: InternalHydrateProps) {
 		const prefetchInput = latestRef.current.prefetch;
 
 		if (typeof prefetchInput === 'function') {
-			const promise = Promise.resolve().then(
-				() => prefetchInput({
-					element: markerElementRef.current,
-					signal: controller.abortController.signal,
-					preload,
-					waitFor: (strategy) => waitForHydrationPrefetchStrategy(strategy, {
+			const promise = Promise.resolve()
+				.then(() =>
+					prefetchInput({
 						element: markerElementRef.current,
 						signal: controller.abortController.signal,
-						onHydrate,
+						preload,
+						waitFor: (strategy) =>
+							waitForHydrationPrefetchStrategy(strategy, {
+								element: markerElementRef.current,
+								signal: controller.abortController.signal,
+								onHydrate,
+							}),
 					}),
-				}),
-			).then(() => undefined);
+				)
+				.then(() => undefined);
 
 			controller.promise = promise;
 			promise.catch((error) => {
@@ -265,11 +272,14 @@ function useHydrationGate(props: InternalHydrateProps) {
 			if (controller.hydrationResolvePending) return;
 			controller.hydrationResolvePending = true;
 
-			controller.promise.then(() => resolveGate(), (error) => {
-				if (!controller.abortController.signal.aborted) {
-					setPrefetchError(error);
-				}
-			});
+			controller.promise.then(
+				() => resolveGate(),
+				(error) => {
+					if (!controller.abortController.signal.aborted) {
+						setPrefetchError(error);
+					}
+				},
+			);
 		};
 
 		gate.resolve = requestHydration;
@@ -354,14 +364,13 @@ export function GenericHydrate(props: HydrateProps) @{
 	let fallback: OctaneNode;
 	if (shouldPreserveServerHTML) {
 		const html = getFallbackHtml(gate.id);
-		fallback = html
-			? <div style={{ display: 'contents' }} dangerouslySetInnerHTML={{ __html: html }} />
-			: null;
+		fallback = html ? (
+			<div style={{ display: 'contents' }} dangerouslySetInnerHTML={{ __html: html }} />
+		) : null;
 	} else {
 		fallback = props.fallback ?? null;
 	}
-	const markerAttributes =
-		markerHydrateType === dynamicType ? undefined : hydrateStrategy._a?.();
+	const markerAttributes = markerHydrateType === dynamicType ? undefined : hydrateStrategy._a?.();
 
 	const hydrateType = hydrateStrategy._t!;
 	const preserveNever = hydrateType === 'never' && !shouldPreserveServerHTML;
@@ -375,9 +384,7 @@ export function GenericHydrate(props: HydrateProps) @{
 		}}
 	>
 		@if (preserveNever) {
-			<>
-				{props.fallback ?? null}
-			</>
+			<>{props.fallback ?? null}</>
 		} @else {
 			<Suspense fallback={fallback}>
 				<HydrationGate gate={gate as Gate}>
@@ -388,7 +395,9 @@ export function GenericHydrate(props: HydrateProps) @{
 							markerElementRef.current?.removeAttribute(hydrateWhenAttribute);
 							hydrateStrategy._o?.(id);
 						}}
-					>{props.children}</HydratedBoundary>
+					>
+						{props.children}
+					</HydratedBoundary>
 				</HydrationGate>
 			</Suspense>
 		}

package/src/Hydrate.tsrx

@@ -30,16 +30,14 @@ import type {
 export type OctaneHydrationStrategy<
 	TWhen extends HydrationWhen = HydrationWhen,
 	TCanPrefetch extends boolean = boolean,
-> =
-	CoreHydrationStrategy<TWhen, TCanPrefetch> & {
-		_h: (props: HydrateProps) => OctaneNode;
-	};
+> = CoreHydrationStrategy<TWhen, TCanPrefetch> & {
+	_h: (props: HydrateProps) => OctaneNode;
+};
 
 export type HydrationStrategy<
 	TWhen extends HydrationWhen = HydrationWhen,
 	TCanPrefetch extends boolean = boolean,
-> =
-	OctaneHydrationStrategy<TWhen, TCanPrefetch>;
+> = OctaneHydrationStrategy<TWhen, TCanPrefetch>;
 
 export type HydrateWhen = OctaneHydrationStrategy | (() => OctaneHydrationStrategy);
 
@@ -63,16 +61,14 @@ export type HydrateOptions =
 			split?: boolean;
 	  });
 
-export type HydrateProps =
-	HydrateOptions & {
-		children: OctaneNode;
-	};
+export type HydrateProps = HydrateOptions & {
+	children: OctaneNode;
+};
 
-export type InternalHydrateProps =
-	HydrateProps & {
-		h?: string;
-		p?: () => Promise<void>;
-	};
+export type InternalHydrateProps = HydrateProps & {
+	h?: string;
+	p?: () => Promise<void>;
+};
 
 const dynamicType = 'dynamic';
 

package/src/hydration/never.tsrx

@@ -38,14 +38,17 @@ export function NeverHydrate(props: HydrateProps) @{
 	const id = internalProps.h ? `${internalProps.h}${octaneId}` : octaneId;
 	const shouldPreserveServerHTMLRef = useRef<boolean | undefined>(undefined);
 	shouldPreserveServerHTMLRef.current ??= (isServer ?? typeof window === 'undefined') || !hydrated;
-	const markerRef = useCallback((element: HTMLDivElement | null) => {
-		if (!element) return;
-		if (!shouldPreserveServerHTMLRef.current) {
-			element.replaceChildren();
-		} else {
-			saveFallbackHtml(id, element);
-		}
-	}, [id]);
+	const markerRef = useCallback(
+		(element: HTMLDivElement | null) => {
+			if (!element) return;
+			if (!shouldPreserveServerHTMLRef.current) {
+				element.replaceChildren();
+			} else {
+				saveFallbackHtml(id, element);
+			}
+		},
+		[id],
+	);
 	const savedHtml = getFallbackHtml(id);
 
 	<div
@@ -56,9 +59,13 @@ export function NeverHydrate(props: HydrateProps) @{
 		}}
 	>
 		<Suspense
-			fallback={savedHtml
-				? <div style={{ display: 'contents' }} dangerouslySetInnerHTML={{ __html: savedHtml }} />
-				: props.fallback ?? null}
+			fallback={
+				savedHtml ? (
+					<div style={{ display: 'contents' }} dangerouslySetInnerHTML={{ __html: savedHtml }} />
+				) : (
+					(props.fallback ?? null)
+				)
+			}
 		>
 			<NeverGate>{props.children}</NeverGate>
 		</Suspense>

package/src/hydration/visible.tsrx

@@ -89,7 +89,9 @@ export function VisibleHydrate(props: HydrateProps) @{
 
 	<div ref={markerRef}>
 		<Suspense fallback={props.fallback}>
-			<HydrationBoundary g={gate} o={props.onHydrated}>{props.children}</HydrationBoundary>
+			<HydrationBoundary g={gate} o={props.onHydrated}>
+				{props.children}
+			</HydrationBoundary>
 		</Suspense>
 	</div>
 }
@@ -110,11 +112,14 @@ export function visible(
 				return;
 			}
 
-			const observer = new IntersectionObserver((entries) => {
-				if (!entries[0]!.isIntersecting) return;
-				observer.disconnect();
-				callback();
-			}, { rootMargin, threshold });
+			const observer = new IntersectionObserver(
+				(entries) => {
+					if (!entries[0]!.isIntersecting) return;
+					observer.disconnect();
+					callback();
+				},
+				{ rootMargin, threshold },
+			);
 			observer.observe(element);
 			return () => observer.disconnect();
 		},