@void/react 1.5.0 → 1.6.1

package/dist/index.d.mts

@@ -1,5 +1,5 @@
 import { AnchorHTMLAttributes, ButtonHTMLAttributes, Context, FormHTMLAttributes, JSX, ReactElement, ReactNode } from "react";
-import { ActionClient, FormMethod, FormModel, FormResetOptions, NavigationState, VoidActionError, VoidRouter } from "void/pages-client";
+import { ActionClient, BaseLinkProps, FormMethod, FormModel, FormState, IslandFormState, NavigationState, VoidActionError, VoidRouter } from "void/pages-client";
 import { CloudContextVariables, InferProps } from "void";
 import { ActionFormOptions, ActionUrl, ResolveActionBody } from "void/routes";
 type FormProps = Omit<FormHTMLAttributes<HTMLFormElement>, "action" | "onSubmit" | "method" | "onError"> & {
@@ -8,70 +8,29 @@ type FormProps = Omit<FormHTMLAttributes<HTMLFormElement>, "action" | "onSubmit"
   renderError?: (error: VoidActionError) => ReactNode;
 };
 export declare function Form({ form, method, renderError, children, ...props }: FormProps): ReactElement;
-type PrefetchStrategy = "hover" | "click" | "mount" | "visible";
-type LinkMethod = "GET" | "POST" | "PUT" | "PATCH" | "DELETE";
-type CommonProps = {
-  href: string;
-  method?: LinkMethod | Lowercase<LinkMethod>;
-  data?: Record<string, unknown>;
-  preserveScroll?: boolean;
-  preserveState?: boolean;
-  replace?: boolean;
-  reloadDocument?: boolean;
-  viewTransition?: boolean;
-  prefetch?: boolean | PrefetchStrategy | ReadonlyArray<PrefetchStrategy>;
-  cacheFor?: number | string | [string, string];
-  onNavigate?: (event: {
-    preventDefault(): void;
-  }) => void;
-};
-type LinkProps = CommonProps & Omit<AnchorHTMLAttributes<HTMLAnchorElement>, keyof CommonProps> & Omit<ButtonHTMLAttributes<HTMLButtonElement>, keyof CommonProps>;
-export declare function Link({ href, method, data, preserveScroll, preserveState, replace, reloadDocument, viewTransition, prefetch: prefetchProp, cacheFor, onNavigate, children, style, onClick: onClickProp, onMouseEnter: onMouseEnterProp, onMouseLeave: onMouseLeaveProp, onFocus: onFocusProp, onMouseDown: onMouseDownProp, onTouchStart: onTouchStartProp, ...rest }: LinkProps): JSX.Element;
+type LinkProps = BaseLinkProps & Omit<AnchorHTMLAttributes<HTMLAnchorElement>, keyof BaseLinkProps> & Omit<ButtonHTMLAttributes<HTMLButtonElement>, keyof BaseLinkProps>;
+export declare function Link({ href, method, data, preserveScroll, preserveState, replace, reloadDocument, viewTransition, prefetch, cacheFor, activeMatch, onNavigate, children, style, onClick: onClickProp, onMouseEnter: onMouseEnterProp, onMouseLeave: onMouseLeaveProp, onFocus: onFocusProp, onMouseDown: onMouseDownProp, onTouchStart: onTouchStartProp, ...rest }: LinkProps): JSX.Element;
 export declare function useRouter(): VoidRouter;
 export declare function useParams<T extends Record<string, string> = Record<string, string>>(): T;
 export declare function useShared<T = CloudContextVariables["shared"]>(): T;
+type FormReturn<TData> = FormState<TData, "setters"> & Readonly<{
+  setData: <K extends keyof TData & string>(field: K, value: TData[K]) => void;
+  post(formData: FormData): void;
+  put(formData: FormData): void;
+  patch(formData: FormData): void;
+  delete(formData: FormData): void;
+}>;
 type FormOptions = {
   params?: Record<string, string>;
   resetOnSuccess?: boolean;
+  preserveScroll?: boolean;
   onSuccess?: () => void | Promise<void>;
   onError?: (error: Record<string, string> | VoidActionError) => void | Promise<void>;
 };
-export declare function useForm<U extends ActionUrl & string>(url: U, defaults: ResolveActionBody<U>, options?: ActionFormOptions<U> & Pick<FormOptions, "onSuccess" | "onError">): {
-  data: ResolveActionBody<U>;
-  setData: <K extends keyof ResolveActionBody<U> & string>(field: K, value: ResolveActionBody<U>[K]) => void;
-  errors: Partial<Record<keyof ResolveActionBody<U> & string, string>>;
-  error: VoidActionError | null;
-  pending: boolean;
-  hasChanges: boolean;
-  wasSuccessful: boolean;
-  recentlySuccessful: boolean;
-  post(formData: FormData): void;
-  put(formData: FormData): void;
-  patch(formData: FormData): void;
-  delete(formData: FormData): void;
-  reset(options: FormResetOptions, ...fields: ReadonlyArray<keyof ResolveActionBody<U> & string>): void;
-  reset(...fields: ReadonlyArray<keyof ResolveActionBody<U> & string>): void;
-  setError(field: keyof ResolveActionBody<U> & string, message: string): void;
-  clearErrors(...fields: ReadonlyArray<keyof ResolveActionBody<U> & string>): void;
-  clearError(): void;
-};
+export declare function useForm<U extends ActionUrl & string>(url: U, defaults: ResolveActionBody<U>, options?: ActionFormOptions<U> & Pick<FormOptions, "onSuccess" | "onError" | "preserveScroll">): FormReturn<ResolveActionBody<U>>;
 export declare function useNavigation(): NavigationState;
-type IslandFormReturn<T extends Record<string, unknown>> = Readonly<{
-  data: T;
+type IslandFormReturn<T extends Record<string, unknown>> = IslandFormState<T, "setters"> & Readonly<{
   setData: <K extends keyof T & string>(field: K, value: T[K]) => void;
-  errors: Record<string, string>;
-  error: VoidActionError | null;
-  pending: boolean;
-  hasChanges: boolean;
-  wasSuccessful: boolean;
-  recentlySuccessful: boolean;
-  reset: (...fields: ReadonlyArray<keyof T & string>) => void;
-  clearErrors: (...fields: ReadonlyArray<string>) => void;
-  clearError: () => void;
-  post: (url: string) => Promise<void>;
-  put: (url: string) => Promise<void>;
-  patch: (url: string) => Promise<void>;
-  delete: (url: string) => Promise<void>;
 }>;
 /**
  * Form hook for island pages. Uses fetch + page reload instead of the

package/dist/index.mjs

@@ -1,7 +1,7 @@
 import { a as RouterContext, i as ParamsContext, n as FrontmatterContext, o as SharedContext, r as NavigationContext, t as ErrorsContext } from "./context-BQpawTZc.mjs";
 import { n as setActionRouter, t as action } from "./action-CyCVdW12.mjs";
 import { useActionState, useCallback, useContext, useEffect, useMemo, useRef, useState } from "react";
-import { cloneFormValue, formErrorMessage, formRetryMessage, formSubmissionBlocked, getValidationErrors, interpolateRouteParams, isAbortError, isEqualFormValue, isModifiedEvent, mergeDataIntoHref, parseFormResetArgs, scheduleFormRetry, ssrProxy, submitAction, submitIslandAction } from "void/pages-client";
+import { cloneFormValue, formErrorMessage, formRetryMessage, formSubmissionBlocked, getValidationErrors, handleLinkClick, interpolateRouteParams, isAbortError, isEqualFormValue, linkActiveAttributes, linkPendingAttributes, linkPrefetchStrategies, observeLinkVisible, parseFormResetArgs, prefetchLink, resolveLink, scheduleFormRetry, ssrProxy, submitAction, submitIslandAction } from "void/pages-client";
 import { jsx, jsxs } from "react/jsx-runtime";
 // src/runtime/form.tsx
 function Form({ form, method = "post", renderError, children, ...props }) {
@@ -25,80 +25,72 @@ function Form({ form, method = "post", renderError, children, ...props }) {
 	});
 }
 // src/runtime/link.tsx
-function Link({ href, method = "GET", data, preserveScroll = false, preserveState = false, replace = false, reloadDocument = false, viewTransition, prefetch: prefetchProp = false, cacheFor, onNavigate, children, style, onClick: onClickProp, onMouseEnter: onMouseEnterProp, onMouseLeave: onMouseLeaveProp, onFocus: onFocusProp, onMouseDown: onMouseDownProp, onTouchStart: onTouchStartProp, ...rest }) {
+function Link({ href, method = "GET", data, preserveScroll = false, preserveState = false, replace = false, reloadDocument = false, viewTransition, prefetch, cacheFor, activeMatch, onNavigate, children, style, onClick: onClickProp, onMouseEnter: onMouseEnterProp, onMouseLeave: onMouseLeaveProp, onFocus: onFocusProp, onMouseDown: onMouseDownProp, onTouchStart: onTouchStartProp, ...rest }) {
 	const router = useContext(RouterContext);
+	const navigation = useContext(NavigationContext);
 	const elementRef = useRef(null);
 	const hoverTimerRef = useRef(null);
-	const normalizedMethod = useMemo(() => method.toUpperCase(), [method]);
-	const isGet = normalizedMethod === "GET";
-	const hrefWithData = useMemo(() => isGet ? mergeDataIntoHref(href, data) : href, [
+	const link = useMemo(() => resolveLink({
+		href,
+		method,
+		data,
+		prefetch,
+		reloadDocument
+	}), [
 		data,
 		href,
-		isGet
+		method,
+		prefetch,
+		reloadDocument
 	]);
-	const strategies = useMemo(() => {
-		if (prefetchProp === false || reloadDocument) return [];
-		if (prefetchProp === true) return ["hover"];
-		if (typeof prefetchProp === "string") return [prefetchProp];
-		return prefetchProp;
-	}, [prefetchProp, reloadDocument]);
-	const hoverDelay = router?._hoverDelay ?? 75;
-	if (prefetchProp !== false && !isGet) throw new Error("Link: prefetch only supports GET links. Remove `prefetch` or use method=\"GET\".");
-	if (reloadDocument && !isGet) throw new Error("Link: reloadDocument only supports GET links.");
-	const doPrefetch = useCallback(() => {
-		if (!router?.prefetch) return;
-		const current = window.location.pathname + window.location.search;
-		if (hrefWithData === current) return;
-		const options = {};
-		if (cacheFor !== void 0) options.cacheFor = cacheFor;
-		router.prefetch(hrefWithData, options);
-	}, [
-		cacheFor,
-		hrefWithData,
+	const { isGet } = link;
+	const defaultStrategy = router?._prefetchDefaultStrategy;
+	const strategies = useMemo(() => linkPrefetchStrategies({
+		prefetch,
+		reloadDocument
+	}, { isGet }, defaultStrategy), [
+		defaultStrategy,
+		isGet,
+		prefetch,
+		reloadDocument
+	]);
+	const activeAttributes = useMemo(() => linkActiveAttributes(router, link, activeMatch), [
+		activeMatch,
+		link,
 		router
 	]);
-	const shouldHandleClick = useCallback((event) => {
-		if (reloadDocument || !router || event.defaultPrevented || isModifiedEvent(event)) return false;
-		if (event.currentTarget.hasAttribute("download")) return false;
-		if (new URL(hrefWithData, window.location.origin).origin !== window.location.origin) return false;
-		return true;
-	}, [
-		hrefWithData,
-		reloadDocument,
+	const pendingAttributes = useMemo(() => linkPendingAttributes(router, navigation, link), [
+		link,
+		navigation,
+		router
+	]);
+	const hoverDelay = router?._hoverDelay ?? 75;
+	const doPrefetch = useCallback(() => prefetchLink(router, link.href, cacheFor), [
+		cacheFor,
+		link.href,
 		router
 	]);
 	const onClick = useCallback((event) => {
 		onClickProp?.(event);
-		if (!shouldHandleClick(event)) return;
-		let navigatePrevented = false;
-		onNavigate?.({ preventDefault() {
-			navigatePrevented = true;
-		} });
-		if (navigatePrevented) {
-			event.preventDefault();
-			return;
-		}
-		event.preventDefault();
-		router?.visit(hrefWithData, {
-			method: normalizedMethod,
-			data: isGet ? void 0 : data,
+		handleLinkClick(event, router, link, {
+			data,
 			preserveScroll,
 			preserveState,
 			replace,
-			viewTransition
+			reloadDocument,
+			viewTransition,
+			onNavigate
 		});
 	}, [
 		data,
-		hrefWithData,
-		isGet,
-		normalizedMethod,
+		link,
 		onClickProp,
 		onNavigate,
 		preserveScroll,
 		preserveState,
+		reloadDocument,
 		replace,
 		router,
-		shouldHandleClick,
 		viewTransition
 	]);
 	const onMouseEnter = useCallback((event) => {
@@ -133,23 +125,13 @@ function Link({ href, method = "GET", data, preserveScroll = false, preserveStat
 	useEffect(() => {
 		if (strategies.length === 0) return;
 		if (strategies.includes("mount")) doPrefetch();
-		let observer = null;
-		if (strategies.includes("visible") && elementRef.current) {
-			observer = new IntersectionObserver((entries) => {
-				if (entries.some((e) => e.isIntersecting)) {
-					doPrefetch();
-					observer?.disconnect();
-					observer = null;
-				}
-			}, { rootMargin: "0px" });
-			observer.observe(elementRef.current);
-		}
+		const stopObserving = strategies.includes("visible") && elementRef.current ? observeLinkVisible(elementRef.current, doPrefetch) : null;
 		return () => {
 			if (hoverTimerRef.current) {
 				clearTimeout(hoverTimerRef.current);
 				hoverTimerRef.current = null;
 			}
-			if (observer) observer.disconnect();
+			stopObserving?.();
 		};
 	}, [doPrefetch, strategies]);
 	const eventHandlers = useMemo(() => {
@@ -190,10 +172,12 @@ function Link({ href, method = "GET", data, preserveScroll = false, preserveStat
 		touchAction: "manipulation",
 		...style
 	}), [style]);
-	if (isGet) return /* @__PURE__ */ jsx("a", {
+	if (link.isGet) return /* @__PURE__ */ jsx("a", {
 		ref: elementRef,
-		href: hrefWithData,
+		href: link.href,
 		style: resolvedStyle,
+		...activeAttributes,
+		...pendingAttributes,
 		...rest,
 		...eventHandlers,
 		children
@@ -202,6 +186,7 @@ function Link({ href, method = "GET", data, preserveScroll = false, preserveStat
 		ref: elementRef,
 		type: "button",
 		style: resolvedStyle,
+		...pendingAttributes,
 		...rest,
 		...eventHandlers,
 		children
@@ -296,6 +281,7 @@ function useForm(url, defaults, options) {
 			result = await submitAction(router, interpolateRouteParams(url, options?.params), {
 				method,
 				data: { ...dataRef.current },
+				preserveScroll: options?.preserveScroll,
 				_resolveOnShell: true
 			});
 		} catch (submitError) {

package/dist/plugin.d.mts

@@ -1,13 +1,9 @@
 import react from "@vitejs/plugin-react";
+import { PrefetchConfig } from "void/pages";
 import { Plugin } from "vite";
-type PrefetchConfig = {
-  hoverDelay?: number;
-  cacheFor?: number | string | [string, string];
-};
 export type VoidReactOptions = Readonly<{
   react?: Parameters<typeof react>[0];
   viewTransitions?: boolean;
   prefetch?: PrefetchConfig;
 }>;
-export declare function voidReact(options?: VoidReactOptions): Array<Plugin>;
-export {};
+export declare function voidReact(options?: VoidReactOptions): Array<Plugin>;

package/dist/plugin.mjs

@@ -1,9 +1,8 @@
 import react from "@vitejs/plugin-react";
-import { createPagesPlugin, generateComponentManifest, resolveEffectiveLayoutChain, resolvePagesDir, scanPages } from "void/pages";
+import { createPagesPlugin, generateComponentManifest, resolveEffectiveLayoutChain, resolvePagesDir, resolvePrefetchConfig, scanPages } from "void/pages";
 import { existsSync, readFileSync } from "node:fs";
 import nodePath from "node:path";
-import { normalizePath } from "vite";
-import { ISLANDS_CLIENT_ENTRY_ID, ISLANDS_RENDERER_ID, computePagesNeedingClientJS, editIslandSource, findIslandImports, findStaticCssImports, hasIslandPages, islandStylesPlugin, recordIslandStyles, recordedIslandStyles, resolveSpecifier, rewriteCssImportForVirtualModule, watchPagesForRescan } from "void/pages-islands-plugin";
+import { ISLANDS_CLIENT_ENTRY_ID, ISLANDS_RENDERER_ID, computePagesNeedingClientJS, createIslandManifest, editIslandSource, findIslandImports, generateIslandClientEntry, islandCssFiles, islandStylesPlugin, islandsBuildConfig, mdClientScriptIds, recordIslandStyles, recordedIslandStyles, resolveSpecifier, watchPagesForRescan } from "void/pages-islands-plugin";
 // ../../node_modules/.pnpm/pathslash@0.1.0/node_modules/pathslash/dist/index.mjs
 const BACKSLASH_RE = /\\/g;
 const isWindows = process.platform === "win32";
@@ -145,12 +144,13 @@ ${generateComponentManifest(scan, pagesDir)}
 
 	const PREAMBLE_SCRIPT = ${JSON.stringify(preambleScript)};
 	
-	export async function renderPage(pageObj, assetTags) {
+	export async function renderPage(pageObj, assetTags, requestUrl) {
 	  return renderReactPage({
 	    pageObj,
 	    assetTags,
 	    components,
 	    layoutTree,
+	    requestUrl,
 	    preambleScript: PREAMBLE_SCRIPT,
 	  });
 }
@@ -158,6 +158,7 @@ renderPage.preambleScript = PREAMBLE_SCRIPT;
 `;
 }
 function generateClientEntry(scan, pagesDir, viewTransitions, prefetch, staticPageData) {
+	const { defaultStrategy, hoverDelay, cacheFor } = resolvePrefetchConfig(prefetch);
 	return `
 	import { startReactPages } from "@void/react/pages-client";
 	import { parseCacheFor } from "void/pages-prefetch";
@@ -172,8 +173,9 @@ function generateClientEntry(scan, pagesDir, viewTransitions, prefetch, staticPa
 	  staticPageData: ${!!staticPageData?.enabled},
 	  staticPageDataFastPath: ${!!staticPageData?.fastPath},
 	  viewTransitions: ${!!viewTransitions},
-	  prefetchHoverDelay: ${prefetch?.hoverDelay ?? 75},
-	  prefetchDefaultCacheFor: parseCacheFor(${JSON.stringify(prefetch?.cacheFor ?? "30s")}),
+	  prefetchHoverDelay: ${hoverDelay},
+	  prefetchDefaultCacheFor: parseCacheFor(${JSON.stringify(cacheFor)}),
+	  prefetchDefaultStrategy: ${JSON.stringify(defaultStrategy)},
 	});
 	export { router };
 	`;
@@ -185,31 +187,31 @@ const COMPONENT_EXTENSIONS = [
 	".ts",
 	".js"
 ];
+const HYDRATE_ISLAND = `
+async function hydrateIsland(el, mod, props, frontmatter) {
+  const { hydrateRoot } = await import("react-dom/client");
+  const React = await import("react");
+  const Component = mod.default || mod;
+  let island = React.createElement(Component, props);
+  if (Object.keys(frontmatter).length > 0) {
+    const { FrontmatterContext } = await import("@void/react");
+    island = React.createElement(FrontmatterContext.Provider, { value: frontmatter }, island);
+  }
+  function HydratedIsland() {
+    React.useLayoutEffect(() => {
+      el.setAttribute("data-hydrated", "true");
+    }, []);
+    return island;
+  }
+  hydrateRoot(el, React.createElement(HydratedIsland));
+}`;
 function islandsPlugin(pagesDir, options) {
 	let pageScan = null;
 	let isDev = false;
 	const root = options?.root ?? dirname(pagesDir);
-	const islandManifest = /* @__PURE__ */ new Map();
-	const islandCssFiles = /* @__PURE__ */ new Set();
+	const islandManifest = createIslandManifest(root, COMPONENT_EXTENSIONS);
+	let cssFiles = /* @__PURE__ */ new Set();
 	let resolvedConfig = null;
-	/** Resolve an island import and record it in the client manifest. */
-	function registerIsland(spec, importerDir, hydrate) {
-		const absPath = resolveSpecifier(spec, importerDir, COMPONENT_EXTENSIONS);
-		if (!absPath) return {
-			absPath,
-			islandId: spec
-		};
-		const islandId = normalizePath(relative(root, absPath)).replace(/\.[^.]+$/, "");
-		islandManifest.set(islandId, {
-			componentPath: absPath,
-			islandId,
-			hydrate
-		});
-		return {
-			absPath,
-			islandId
-		};
-	}
 	return [{
 		name: "void-react:islands",
 		configResolved(config) {
@@ -227,33 +229,8 @@ function islandsPlugin(pagesDir, options) {
 					pagesDir,
 					environment: isDev ? "dev" : "prod"
 				});
-				const filesToScan = [
-					...pageScan.pages.map((page) => ({
-						filePath: page.componentPath,
-						island: page.island
-					})),
-					...pageScan.layouts.map((layout) => ({
-						filePath: layout.filePath,
-						island: layout.island
-					})),
-					...pageScan.namedLayouts.map((namedLayout) => ({
-						filePath: namedLayout.filePath,
-						island: namedLayout.island
-					}))
-				];
-				for (const entry of filesToScan) {
-					if (!entry.island) continue;
-					const filePath = resolve(pagesDir, entry.filePath);
-					const code = readFileSync(filePath, "utf-8");
-					const importerDir = dirname(filePath);
-					for (const islandImport of findIslandImports(code, filePath)) registerIsland(islandImport.specifier, importerDir, islandImport.hydrate);
-				}
-				for (const page of pageScan.pages) {
-					if (!page.island) continue;
-					if (/\.(tsx|jsx)$/.test(page.componentPath)) islandCssFiles.add(normalizePath(resolve(pagesDir, page.componentPath)));
-					const layoutChain = resolveEffectiveLayoutChain(page, pageScan.layouts, pageScan.namedLayouts);
-					for (const layout of layoutChain) islandCssFiles.add(normalizePath(resolve(pagesDir, layout.filePath)));
-				}
+				islandManifest.registerPages(pageScan, pagesDir);
+				cssFiles = islandCssFiles(pageScan, pagesDir, /\.(tsx|jsx)$/);
 			}
 		},
 		buildEnd() {
@@ -270,14 +247,20 @@ function islandsPlugin(pagesDir, options) {
 			handler(id) {
 				if (id === "\0" + ISLANDS_RENDERER_ID) {
 					if (!pageScan) return "export function renderIslandPage() { throw new Error('No pages found'); }";
-					const mdPlugin = resolvedConfig?.plugins?.find((plugin) => plugin.name === "void-md");
-					const mdScriptIds = new Set(mdPlugin?.api?.getClientScripts?.()?.keys() ?? []);
+					const mdScriptIds = mdClientScriptIds(resolvedConfig);
 					const needsJS = computePagesNeedingClientJS(pageScan, pagesDir, resolvedConfig);
 					return generateIslandRenderer(pageScan, pagesDir, isDev, mdScriptIds, needsJS);
 				}
 				if (id === "\0" + ISLANDS_CLIENT_ENTRY_ID) {
 					if (!pageScan) return "";
-					return generateIslandClientEntry(islandManifest, islandCssFiles, recordedIslandStyles(pagesDir), islandManifest.size > 0 || computePagesNeedingClientJS(pageScan, pagesDir, resolvedConfig).size > 0, isDev);
+					return generateIslandClientEntry({
+						manifest: islandManifest,
+						cssFiles,
+						styles: recordedIslandStyles(pagesDir),
+						needsRuntime: islandManifest.entries.size > 0 || computePagesNeedingClientJS(pageScan, pagesDir, resolvedConfig).size > 0,
+						isDev,
+						hydrateIsland: HYDRATE_ISLAND
+					});
 				}
 			}
 		},
@@ -295,7 +278,7 @@ function islandsPlugin(pagesDir, options) {
 					const strategy = islandImport.hydrate;
 					const spec = islandImport.specifier;
 					const rawName = `_raw_island_${idx++}`;
-					const { islandId } = registerIsland(spec, importerDir, strategy);
+					const { islandId } = islandManifest.register(spec, importerDir, strategy);
 					const replacement = `import ${rawName} from ${specRaw}`;
 					edits.push({
 						start: islandImport.start,
@@ -311,10 +294,7 @@ function islandsPlugin(pagesDir, options) {
 			}
 		},
 		async config(_, env) {
-			if (env.command !== "serve" && await hasIslandPages(root, pagesDir)) return { environments: { client: { build: {
-				manifest: true,
-				rollupOptions: { input: { "islands-client": ISLANDS_CLIENT_ENTRY_ID } }
-			} } } };
+			if (env.command !== "serve") return islandsBuildConfig(root, pagesDir);
 		}
 	}, islandStylesPlugin(pagesDir)];
 }
@@ -391,44 +371,6 @@ export async function renderIslandPage(pageObj, assetTags) {
 }
 `;
 }
-function generateIslandClientEntry(manifest, cssFiles, styles, needsRuntime, isDev) {
-	const entries = [...manifest.values()];
-	const uniqueIslands = /* @__PURE__ */ new Map();
-	for (const entry of entries) uniqueIslands.set(entry.islandId, entry.componentPath);
-	const lines = [];
-	if (!isDev && styles) for (const id of styles) lines.push(`import ${JSON.stringify(id)};`);
-	else if (!isDev) for (const file of cssFiles) {
-		const content = readFileSync(file, "utf-8");
-		for (const item of findStaticCssImports(content, file)) lines.push(rewriteCssImportForVirtualModule(item.statement, item.specifier, file));
-	}
-	if (!needsRuntime && !isDev) return lines.join("\n");
-	lines.push("import { initIslands } from \"void/pages-client\";");
-	lines.push("const islands = {");
-	for (const [id, path] of uniqueIslands) lines.push(`  ${JSON.stringify(id)}: () => import(${JSON.stringify(path)}),`);
-	lines.push("};");
-	lines.push(`
-async function hydrateIsland(el, mod, props, frontmatter) {
-  const { hydrateRoot } = await import("react-dom/client");
-  const React = await import("react");
-  const Component = mod.default || mod;
-  let island = React.createElement(Component, props);
-  if (Object.keys(frontmatter).length > 0) {
-    const { FrontmatterContext } = await import("@void/react");
-    island = React.createElement(FrontmatterContext.Provider, { value: frontmatter }, island);
-  }
-  function HydratedIsland() {
-    React.useLayoutEffect(() => {
-      el.setAttribute("data-hydrated", "true");
-    }, []);
-    return island;
-  }
-  hydrateRoot(el, React.createElement(HydratedIsland));
-}
-
-initIslands(islands, hydrateIsland);
-`);
-	return lines.join("\n");
-}
 // src/plugin.ts
 function voidReact(options) {
 	const root = process.cwd();

package/dist/runtime/pages-client.d.mts

@@ -1,6 +1,6 @@
 import { ComponentType } from "react";
 import { VoidRouter } from "void/pages-client";
-import { CacheForResult } from "void/pages-prefetch";
+import { CacheForResult, LinkPrefetchValue } from "void/pages-prefetch";
 import { PageObject } from "void/pages-protocol";
 type ComponentModule = {
   default: ComponentType<any>;
@@ -18,6 +18,7 @@ export type ReactPagesConfig = Readonly<{
   viewTransitions: boolean;
   prefetchHoverDelay: number;
   prefetchDefaultCacheFor: CacheForResult;
+  prefetchDefaultStrategy?: LinkPrefetchValue;
   cacheVisitedPageData?: boolean;
   /** Show this fallback for client visits whose destination remains pending at the next paint. */
   navigationFallback?: ComponentType<{

package/dist/runtime/pages-client.mjs

@@ -53,7 +53,7 @@ function currentUrl() {
 function normalizeUrl(value) {
 	const urlString = toUrlString(value);
 	if (urlString.startsWith("#")) return urlString;
-	const url = new URL(urlString, window.location.origin);
+	const url = new URL(urlString, window.location.href);
 	return url.origin === window.location.origin ? url.pathname + url.search + url.hash : url.href;
 }
 /** Page data holds a decoded path. Compare it with browser URLs in their encoded form. */
@@ -142,6 +142,7 @@ function appReducer(state, action) {
 function createRouter(engine) {
 	const router = {
 		_hoverDelay: engine._hoverDelay,
+		_prefetchDefaultStrategy: engine._prefetchDefaultStrategy,
 		get url() {
 			return new URL(currentUrl(), window.location.origin);
 		},
@@ -307,6 +308,7 @@ function App({ engine, router, viewTransitions, navigationFallback: NavigationFa
 	}, []);
 	const schedule = useCallback((url, options = {}) => {
 		const prepared = engine.prepareVisit(url, options);
+		const resolveOnData = prepared.options.resolveOn === "data" || prepared.options._resolveOnShell;
 		if (prepared.immediate) {
 			const navigation = navigationForResource(prepared);
 			activePendingNavigationId = prepared.id;
@@ -356,7 +358,7 @@ function App({ engine, router, viewTransitions, navigationFallback: NavigationFa
 						location: currentUrl()
 					});
 					resolveVisit(void 0);
-				} else if (prepared.options._resolveOnShell) {
+				} else if (resolveOnData) {
 					pendingVisitSettlers.delete(prepared.id);
 					resolveVisit(result.pageData);
 				}
@@ -371,7 +373,7 @@ function App({ engine, router, viewTransitions, navigationFallback: NavigationFa
 				if (prepared.method.toUpperCase() === "GET" && !prepared.options._resolveOnShell && isAbortError(error)) resolveVisit(void 0);
 				else rejectVisit(error);
 				if (activePendingNavigationId === prepared.id) activePendingNavigationId = null;
-				if (NavigationFallback || prepared.options._resolveOnShell || isAbortError(error) || isCallSiteActionError(error)) {
+				if (NavigationFallback || resolveOnData || isAbortError(error) || isCallSiteActionError(error)) {
 					dispatch({
 						type: "abandon",
 						resource: prepared,
@@ -491,6 +493,7 @@ async function startReactPages(config) {
 		viewTransitions: config.viewTransitions,
 		prefetchHoverDelay: config.prefetchHoverDelay,
 		prefetchDefaultCacheFor: config.prefetchDefaultCacheFor,
+		prefetchDefaultStrategy: config.prefetchDefaultStrategy,
 		cacheVisitedPageData: config.cacheVisitedPageData
 	});
 	const router = createRouter(engine);

package/dist/runtime/pages-server.d.mts

@@ -12,7 +12,8 @@ export type ReactPagesServerConfig = Readonly<{
   };
   components: Record<string, () => Promise<ComponentModule>>;
   layoutTree: Record<string, Array<string>>;
+  requestUrl?: string;
   preambleScript?: string;
 }>;
-export declare function renderReactPage({ pageObj, assetTags, components, layoutTree, preambleScript }: ReactPagesServerConfig): Promise<ReadableStream<Uint8Array>>;
+export declare function renderReactPage({ pageObj, assetTags, components, layoutTree, requestUrl, preambleScript }: ReactPagesServerConfig): Promise<ReadableStream<Uint8Array>>;
 export {};

package/dist/runtime/pages-server.mjs

@@ -111,14 +111,14 @@ function textStream(text) {
 		controller.close();
 	} });
 }
-async function renderReactPage({ pageObj, assetTags, components, layoutTree, preambleScript = "" }) {
+async function renderReactPage({ pageObj, assetTags, components, layoutTree, requestUrl, preambleScript = "" }) {
 	const PageComponent = (await components[pageObj.component]()).default;
 	const layoutIds = layoutTree[pageObj.component] || [];
 	const layoutComponents = await Promise.all(layoutIds.map(async (id) => (await components[id]()).default));
 	const renderProps = propsForReactRender(pageObj);
 	let element = React.createElement(PageComponent, renderProps);
 	for (let i = layoutComponents.length - 1; i >= 0; i--) element = React.createElement(layoutComponents[i], null, element);
-	element = React.createElement(RouterContext.Provider, { value: createSsrRouter(pageObj.url || "/", pageObj.params ?? {}) }, React.createElement(NavigationContext.Provider, { value: idleNavigationState() }, React.createElement(React.Suspense, { fallback: null }, React.createElement(SharedContext.Provider, { value: pageObj.shared || {} }, React.createElement(ParamsContext.Provider, { value: pageObj.params ?? {} }, React.createElement(ErrorsContext.Provider, { value: pageObj.errors || {} }, element))))));
+	element = React.createElement(RouterContext.Provider, { value: createSsrRouter(pageObj.url || "/", pageObj.params ?? {}, requestUrl) }, React.createElement(NavigationContext.Provider, { value: idleNavigationState() }, React.createElement(React.Suspense, { fallback: null }, React.createElement(SharedContext.Provider, { value: pageObj.shared || {} }, React.createElement(ParamsContext.Provider, { value: pageObj.params ?? {} }, React.createElement(ErrorsContext.Provider, { value: pageObj.errors || {} }, element))))));
 	const renderElement = pageObj.deferredKeys ? React.createElement(React.Fragment, null, element, React.createElement("template", { id: DEFERRED_SHELL_END_ID })) : element;
 	let shellError;
 	let shellSent = false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@void/react",
-  "version": "1.5.0",
+  "version": "1.6.1",
   "description": "React pages, server rendering, forms, and navigation for Void.",
   "homepage": "https://void.cloud",
   "bugs": {
@@ -50,13 +50,13 @@
     "react-dom": "^19.3.1",
     "vite": "npm:@voidzero-dev/vite-plus-core@1.4.0",
     "vite-plus": "1.4.0",
-    "void": "1.5.0"
+    "void": "1.6.1"
   },
   "peerDependencies": {
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
     "vite": "^8.0.0",
-    "void": "1.5.0"
+    "void": "1.6.1"
   },
   "scripts": {
     "build": "vp pack",