@void/vue 1.4.0 → 1.6.0

package/dist/index.d.mts

@@ -1,74 +1,29 @@
-import { ActionClient, FormResetOptions, NavigationState, VisitOptions, VoidActionError, VoidRouter } from "void/pages-client";
-import { Component } from "vue";
+import { ActionClient, BaseLinkProps, FormState, FormSubmitOptions, IslandFormState, NavigationState, VoidRouter } from "void/pages-client";
+import { AnchorHTMLAttributes, ButtonHTMLAttributes, Component, DefineSetupFnComponent } from "vue";
 import { CloudContextVariables, DeferredState as Deferred, InferProps } from "void";
 import { ActionFormOptions, ActionUrl, ResolveActionBody } from "void/routes";
-//#region src/runtime/form.d.ts
 export declare const Form: Component;
-//#endregion
-//#region src/runtime/link.d.ts
-export declare const Link: Component;
-//#endregion
-//#region src/runtime/use-router.d.ts
+type LinkProps = BaseLinkProps & Omit<AnchorHTMLAttributes, keyof BaseLinkProps> & Omit<ButtonHTMLAttributes, keyof BaseLinkProps>;
+export declare const Link: DefineSetupFnComponent<LinkProps>;
 export declare function useRouter(): VoidRouter;
-//#endregion
-//#region src/runtime/use-params.d.ts
 export declare function useParams<T extends Record<string, string> = Record<string, string>>(): T;
-//#endregion
-//#region src/runtime/use-shared.d.ts
 export declare function useShared<T = CloudContextVariables["shared"]>(): T;
-//#endregion
-//#region src/runtime/use-form.d.ts
-type FormSubmitOptions = Omit<VisitOptions, "method" | "data"> & {
-  data?: Record<string, unknown>;
-};
-export declare function useForm<U extends ActionUrl & string>(url: U, defaults: ResolveActionBody<U>, options?: ActionFormOptions<U>): {
-  data: ResolveActionBody<U>;
-  errors: Partial<Record<keyof ResolveActionBody<U> & string, string>>;
-  error: VoidActionError | null;
-  pending: boolean;
-  hasChanges: boolean;
-  wasSuccessful: boolean;
-  recentlySuccessful: boolean;
+type FormReturn<TData> = FormState<TData, "in-place"> & Readonly<{
   post(opts?: FormSubmitOptions): Promise<void>;
   put(opts?: FormSubmitOptions): Promise<void>;
   patch(opts?: FormSubmitOptions): Promise<void>;
   delete(opts?: FormSubmitOptions): Promise<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;
-};
-//#endregion
-//#region src/runtime/use-navigation.d.ts
+}>;
+export declare function useForm<U extends ActionUrl & string>(url: U, defaults: ResolveActionBody<U>, options?: ActionFormOptions<U>): FormReturn<ResolveActionBody<U>>;
 export declare function useNavigation(): NavigationState;
-//#endregion
-//#region src/runtime/use-island-form.d.ts
-type IslandFormReturn<T extends Record<string, unknown>> = Readonly<{
-  data: T;
-  errors: Record<string, string>;
-  error: VoidActionError | null;
-  pending: boolean;
-  hasChanges: boolean;
-  wasSuccessful: boolean;
-  recentlySuccessful: boolean;
+type IslandFormReturn<T extends Record<string, unknown>> = IslandFormState<T, "in-place"> & Readonly<{
   submit(url: string, method: string): Promise<void>;
-  post(url: string): Promise<void>;
-  put(url: string): Promise<void>;
-  patch(url: string): Promise<void>;
-  delete(url: string): Promise<void>;
-  reset(...fields: ReadonlyArray<keyof T & string>): void;
-  clearErrors(...fields: ReadonlyArray<string>): void;
-  clearError(): void;
 }>;
 /**
  * Form composable for island pages. Uses fetch + page reload instead of the
  * Void Router (which is not available in island mode).
  */
 export declare function useIslandForm<T extends Record<string, unknown>>(defaults: T): IslandFormReturn<T>;
-//#endregion
-//#region src/runtime/action.d.ts
 export declare const action: ActionClient["action"];
 export declare const setActionRouter: ActionClient["setActionRouter"];
-//#endregion
 export type { Deferred, InferProps };

package/dist/index.mjs

@@ -1,6 +1,6 @@
-import { cloneFormValue, createActionClient, formErrorMessage, formRetryMessage, formSubmissionBlocked, getValidationErrors, idleNavigationState, interpolateRouteParams, isAbortError, isEqualFormValue, isModifiedEvent, mergeDataIntoHref, parseFormResetArgs, scheduleFormRetry, ssrProxy, submitAction, submitIslandAction } from "void/pages-client";
+import { cloneFormValue, createActionClient, formErrorMessage, formRetryMessage, formSubmissionBlocked, getValidationErrors, handleLinkClick, idleNavigationState, interpolateRouteParams, isAbortError, isEqualFormValue, linkActiveAttributes, linkPendingAttributes, linkPrefetchStrategies, observeLinkVisible, parseFormResetArgs, prefetchLink, resolveLink, scheduleFormRetry, ssrProxy, submitAction, submitIslandAction } from "void/pages-client";
 import { computed, defineComponent, h, inject, onMounted, onUnmounted, reactive, ref, shallowRef, watch } from "vue";
-//#region src/runtime/form.ts
+// src/runtime/form.ts
 const Form = defineComponent({
 	name: "VoidForm",
 	inheritAttrs: false,
@@ -42,8 +42,65 @@ const Form = defineComponent({
 		};
 	}
 });
-//#endregion
-//#region src/runtime/link.ts
+// src/runtime/link.ts
+const linkPropOptions = {
+	href: {
+		type: String,
+		required: true
+	},
+	method: {
+		type: String,
+		default: "GET"
+	},
+	data: {
+		type: Object,
+		default: void 0
+	},
+	preserveScroll: {
+		type: Boolean,
+		default: false
+	},
+	preserveState: {
+		type: Boolean,
+		default: false
+	},
+	replace: {
+		type: Boolean,
+		default: false
+	},
+	reloadDocument: {
+		type: Boolean,
+		default: false
+	},
+	viewTransition: {
+		type: Boolean,
+		default: void 0
+	},
+	onNavigate: {
+		type: Function,
+		default: void 0
+	},
+	prefetch: {
+		type: [
+			Boolean,
+			String,
+			Array
+		],
+		default: void 0
+	},
+	cacheFor: {
+		type: [
+			Number,
+			String,
+			Array
+		],
+		default: void 0
+	},
+	activeMatch: {
+		type: String,
+		default: void 0
+	}
+};
 function callHandler(handler, event) {
 	if (Array.isArray(handler)) {
 		for (const fn of handler) if (typeof fn === "function") fn(event);
@@ -51,108 +108,28 @@ function callHandler(handler, event) {
 }
 const Link = defineComponent({
 	name: "Link",
-	props: {
-		href: {
-			type: String,
-			required: true
-		},
-		method: {
-			type: String,
-			default: "GET"
-		},
-		data: {
-			type: Object,
-			default: void 0
-		},
-		preserveScroll: {
-			type: Boolean,
-			default: false
-		},
-		preserveState: {
-			type: Boolean,
-			default: false
-		},
-		replace: {
-			type: Boolean,
-			default: false
-		},
-		reloadDocument: {
-			type: Boolean,
-			default: false
-		},
-		viewTransition: {
-			type: Boolean,
-			default: void 0
-		},
-		onNavigate: {
-			type: Function,
-			default: void 0
-		},
-		prefetch: {
-			type: [
-				Boolean,
-				String,
-				Array
-			],
-			default: false
-		},
-		cacheFor: {
-			type: [
-				Number,
-				String,
-				Array
-			],
-			default: void 0
-		}
-	},
+	props: linkPropOptions,
 	setup(props, { slots, attrs }) {
 		const router = inject("__void_router", null);
+		const navigation = inject("__void_navigation", null);
 		const elRef = ref(null);
-		const normalizedMethod = computed(() => props.method.toUpperCase());
-		const isGet = computed(() => normalizedMethod.value === "GET");
-		const hrefWithData = computed(() => isGet.value ? mergeDataIntoHref(props.href, props.data) : props.href);
-		const strategies = computed(() => {
-			if (props.prefetch === false || props.reloadDocument) return [];
-			if (props.prefetch === true) return ["hover"];
-			if (typeof props.prefetch === "string") return [props.prefetch];
-			return props.prefetch;
-		});
+		const link = computed(() => resolveLink(props));
+		const strategies = computed(() => linkPrefetchStrategies(props, link.value, router?._prefetchDefaultStrategy));
+		const activeAttributes = computed(() => linkActiveAttributes(router, link.value, props.activeMatch));
+		const pendingAttributes = computed(() => linkPendingAttributes(router, navigation, link.value));
 		function doPrefetch() {
-			if (!router?.prefetch) return;
-			const current = window.location.pathname + window.location.search;
-			if (hrefWithData.value === current) return;
-			const options = { method: normalizedMethod.value };
-			if (props.cacheFor !== void 0) options.cacheFor = props.cacheFor;
-			router.prefetch(hrefWithData.value, options);
+			prefetchLink(router, link.value.href, props.cacheFor);
 		}
 		function onClick(e) {
 			callHandler(attrs.onClick, e);
-			if (props.reloadDocument || !router || e.defaultPrevented || isModifiedEvent(e)) return;
-			if (e.currentTarget.hasAttribute("download")) return;
-			if (new URL(hrefWithData.value, window.location.origin).origin !== window.location.origin) return;
-			let navigatePrevented = false;
-			props.onNavigate?.({ preventDefault() {
-				navigatePrevented = true;
-			} });
-			if (navigatePrevented) {
-				e.preventDefault();
-				return;
-			}
-			e.preventDefault();
-			router.visit(hrefWithData.value, {
-				method: normalizedMethod.value,
-				data: isGet.value ? void 0 : props.data,
-				preserveScroll: props.preserveScroll,
-				preserveState: props.preserveState,
-				replace: props.replace,
-				viewTransition: props.viewTransition
-			});
+			handleLinkClick(e, router, link.value, props);
 		}
 		let hoverTimer = null;
-		let observer = null;
+		let stopObserving = null;
 		function onMouseEnter(e) {
 			callHandler(attrs.onMouseenter ?? attrs.onMouseEnter, e);
 			if (e.defaultPrevented) return;
+			if (hoverTimer) clearTimeout(hoverTimer);
 			hoverTimer = setTimeout(doPrefetch, router?._hoverDelay ?? 75);
 		}
 		function onMouseLeave(e) {
@@ -176,28 +153,15 @@ const Link = defineComponent({
 		}
 		onMounted(() => {
 			if (strategies.value.includes("mount")) doPrefetch();
-			if (strategies.value.includes("visible") && elRef.value) {
-				observer = new IntersectionObserver((entries) => {
-					if (entries.some((e) => e.isIntersecting)) {
-						doPrefetch();
-						observer?.disconnect();
-						observer = null;
-					}
-				}, { rootMargin: "0px" });
-				observer.observe(elRef.value);
-			}
+			if (strategies.value.includes("visible") && elRef.value) stopObserving = observeLinkVisible(elRef.value, doPrefetch);
 		});
 		onUnmounted(() => {
 			if (hoverTimer) clearTimeout(hoverTimer);
-			if (observer) {
-				observer.disconnect();
-				observer = null;
-			}
+			stopObserving?.();
 		});
 		return () => {
-			if (props.prefetch !== false && !isGet.value) throw new Error("Link: prefetch only supports GET links. Remove `prefetch` or use method=\"GET\".");
-			if (props.reloadDocument && !isGet.value) throw new Error("Link: reloadDocument only supports GET links.");
-			const tag = isGet.value ? "a" : "button";
+			const { href, isGet } = link.value;
+			const tag = isGet ? "a" : "button";
 			const eventHandlers = { onClick };
 			if (strategies.value.includes("hover")) {
 				eventHandlers.onMouseenter = onMouseEnter;
@@ -210,36 +174,34 @@ const Link = defineComponent({
 				eventHandlers.onTouchstart = onTouchStart;
 			}
 			return h(tag, {
+				...activeAttributes.value,
+				...pendingAttributes.value,
 				...attrs,
 				ref: elRef,
-				...isGet.value ? { href: hrefWithData.value } : { type: "button" },
+				...isGet ? { href } : { type: "button" },
 				style: [{ touchAction: "manipulation" }, attrs.style],
 				...eventHandlers
 			}, slots.default?.());
 		};
 	}
 });
-//#endregion
-//#region src/runtime/use-router.ts
+// src/runtime/use-router.ts
 function useRouter() {
 	return inject("__void_router", null) ?? ssrProxy;
 }
-//#endregion
-//#region src/runtime/use-params.ts
+// src/runtime/use-params.ts
 function useParams() {
 	const params = inject("__void_params");
 	if (!params) throw new Error("useParams(): must be used inside a Void page.");
 	return params;
 }
-//#endregion
-//#region src/runtime/use-shared.ts
+// src/runtime/use-shared.ts
 function useShared() {
 	const shared = inject("__void_shared");
 	if (!shared) throw new Error("useShared(): must be used inside a Void page.");
 	return shared;
 }
-//#endregion
-//#region src/runtime/use-form.ts
+// src/runtime/use-form.ts
 function useForm(url, defaults, options) {
 	const initialDefaults = cloneFormValue(defaults);
 	const router = inject("__void_router", null);
@@ -328,17 +290,11 @@ function useForm(url, defaults, options) {
 		delete: (opts) => submit("DELETE", opts)
 	});
 }
-//#endregion
-//#region src/runtime/use-navigation.ts
+// src/runtime/use-navigation.ts
 function useNavigation() {
 	return inject("__void_navigation", null) ?? idleNavigationState();
 }
-//#endregion
-//#region src/runtime/use-island-form.ts
-/**
-* Form composable for island pages. Uses fetch + page reload instead of the
-* Void Router (which is not available in island mode).
-*/
+// src/runtime/use-island-form.ts
 function useIslandForm(defaults) {
 	const data = reactive({ ...defaults });
 	const errors = reactive({});
@@ -408,10 +364,8 @@ function useIslandForm(defaults) {
 		delete: (url) => submit(url, "DELETE")
 	});
 }
-//#endregion
-//#region src/runtime/action.ts
+// src/runtime/action.ts
 const client = createActionClient();
 const action = client.action;
 const setActionRouter = client.setActionRouter;
-//#endregion
 export { Form, Link, action, setActionRouter, useForm, useIslandForm, useNavigation, useParams, useRouter, useShared };

package/dist/plugin.d.mts

@@ -1,17 +1,9 @@
 import vue from "@vitejs/plugin-vue";
+import { PrefetchConfig } from "void/pages";
 import { Plugin } from "vite";
-//#region src/plugin-pages.d.ts
-type PrefetchConfig = {
-  hoverDelay?: number;
-  cacheFor?: number | string | [string, string];
-};
-//#endregion
-//#region src/plugin.d.ts
 export type VoidVueOptions = Readonly<{
   vue?: Parameters<typeof vue>[0];
   viewTransitions?: boolean;
   prefetch?: PrefetchConfig;
 }>;
-export declare function voidVue(options?: VoidVueOptions): Array<Plugin>;
-//#endregion
-export {};
+export declare function voidVue(options?: VoidVueOptions): Array<Plugin>;

package/dist/plugin.mjs

@@ -1,10 +1,10 @@
 import vue from "@vitejs/plugin-vue";
-import { createPagesPlugin, generateComponentManifest, resolveEffectiveLayoutChain, resolvePagesDir, scanPages } from "void/pages";
-import { existsSync, readFileSync, readdirSync } from "node:fs";
+import { createPagesPlugin, generateComponentManifest, resolvePagesDir, resolvePrefetchConfig, scanPages } from "void/pages";
+import { existsSync, readdirSync } from "node:fs";
 import nodePath from "node:path";
+import { ISLANDS_CLIENT_ENTRY_ID, ISLANDS_RENDERER_ID, computePagesNeedingClientJS, createIslandManifest, editIslandSource, findIslandImports, generateIslandClientEntry, islandCssFiles, islandStylesPlugin, islandsBuildConfig, mdClientScriptIds, recordIslandStyles, recordedIslandStyles, watchPagesForRescan } from "void/pages-islands-plugin";
 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";
-//#region ../../node_modules/.pnpm/pathslash@0.1.0/node_modules/pathslash/dist/index.mjs
+// ../../node_modules/.pnpm/pathslash@0.1.0/node_modules/pathslash/dist/index.mjs
 const BACKSLASH_RE = /\\/g;
 const isWindows = process.platform === "win32";
 /**
@@ -42,8 +42,7 @@ const posix = { ...nodePath.posix };
 posix.posix = win32.posix = posix;
 posix.win32 = win32.win32 = win32;
 const { basename, delimiter, dirname, extname, format, isAbsolute, join, matchesGlob, normalize, parse, relative, resolve, sep, toNamespacedPath } = isWindows ? win32 : posix;
-//#endregion
-//#region src/plugin-islands.ts
+// src/plugin-islands.ts
 const COMPONENT_EXTENSIONS = [
 	".vue",
 	".tsx",
@@ -51,30 +50,36 @@ const COMPONENT_EXTENSIONS = [
 	".ts",
 	".js"
 ];
+const HYDRATE_ISLAND = `
+async function hydrateIsland(el, mod, props, frontmatter) {
+  const { createSSRApp, h } = await import("vue");
+  const Component = mod.default || mod;
+  const app = createSSRApp({ render: () => h(Component, props) });
+  app.provide("__void_frontmatter", frontmatter);
+  app.mount(el);
+  el.setAttribute("data-hydrated", "true");
+}`;
+/** Imports for the `<style>` blocks of a Vue component. */
+function styleBlockImports(file, content) {
+	const imports = [];
+	let index = 0;
+	for (const match of content.matchAll(/<style\b([^>]*)>/g)) {
+		const attrs = match[1];
+		const lang = attrs.match(/\blang\s*=\s*["'](\w+)["']/)?.[1] ?? "css";
+		let query = `?vue&type=style&index=${index}&lang.${lang}`;
+		if (/\bscoped\b/.test(attrs)) query += "&scoped=true";
+		imports.push(`import ${JSON.stringify(file + query)};`);
+		index++;
+	}
+	return imports;
+}
 function islandsPlugin(pagesDir, options) {
 	let pageScan = null;
 	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 isDev = false;
 	let resolvedConfig = null;
-	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-vue:islands",
 		enforce: "pre",
@@ -93,33 +98,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 (page.componentPath.endsWith(".vue")) 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, /\.vue$/);
 			}
 		},
 		buildEnd() {
@@ -141,14 +121,21 @@ 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, 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,
+						styleBlockImports,
+						hydrateIsland: HYDRATE_ISLAND
+					});
 				}
 			}
 		},
@@ -166,7 +153,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,
@@ -194,10 +181,7 @@ function islandsPlugin(pagesDir, options) {
 		async config(_, env) {
 			if (!existsSync(pagesDir)) return;
 			if (env.command === "serve") return { optimizeDeps: { include: ["vue"] } };
-			if (await hasIslandPages(root, pagesDir)) return { environments: { client: { build: {
-				manifest: true,
-				rollupOptions: { input: { "islands-client": ISLANDS_CLIENT_ENTRY_ID } }
-			} } } };
+			return islandsBuildConfig(root, pagesDir);
 		}
 	}, islandStylesPlugin(pagesDir)];
 }
@@ -266,53 +250,7 @@ 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) {
-		const styleRe = /<style\b([^>]*)>/g;
-		for (const file of cssFiles) {
-			const content = readFileSync(file, "utf-8");
-			styleRe.lastIndex = 0;
-			let index = 0;
-			let match;
-			while ((match = styleRe.exec(content)) !== null) {
-				const attrs = match[1];
-				const scoped = /\bscoped\b/.test(attrs);
-				const langMatch = attrs.match(/\blang\s*=\s*["'](\w+)["']/);
-				const lang = langMatch ? langMatch[1] : "css";
-				let query = `?vue&type=style&index=${index}&lang.${lang}`;
-				if (scoped) query += "&scoped=true";
-				lines.push(`import ${JSON.stringify(file + query)};`);
-				index++;
-			}
-			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 { createSSRApp, h } = await import("vue");
-  const Component = mod.default || mod;
-  const app = createSSRApp({ render: () => h(Component, props) });
-  app.provide("__void_frontmatter", frontmatter);
-  app.mount(el);
-  el.setAttribute("data-hydrated", "true");
-}
-
-initIslands(islands, hydrateIsland);
-`);
-	return lines.join("\n");
-}
-//#endregion
-//#region src/plugin-pages.ts
+// src/plugin-pages.ts
 const CLIENT_ENTRY_ID = "virtual:void-pages-client";
 /** Runtime helper injected into generated SSR and client page bundles. */
 const PATCH_PROPS_RUNTIME = `
@@ -446,7 +384,7 @@ ${generateComponentManifest(scan, pagesDir)}
 
 ${PATCH_PROPS_RUNTIME}
 
-export async function renderPage(pageObj, assetTags) {
+export async function renderPage(pageObj, assetTags, requestUrl) {
   const PageComponent = (await components[pageObj.component]()).default;
   const layoutIds = layoutTree[pageObj.component] || [];
   const layoutComponents = await Promise.all(
@@ -457,7 +395,7 @@ export async function renderPage(pageObj, assetTags) {
     setup() {
       provide("__void_shared", reactive(pageObj.shared || {}));
       provide("__void_params", reactive(pageObj.params || {}));
-      provide("__void_router", createSsrRouter(pageObj.url || "/", pageObj.params || {}));
+      provide("__void_router", createSsrRouter(pageObj.url || "/", pageObj.params || {}, requestUrl));
       provide("__void_navigation", idleNavigationState());
       return () => {
         patchProps(PageComponent, pageObj.props);
@@ -490,6 +428,7 @@ export async function renderPage(pageObj, assetTags) {
 `;
 }
 function generateClientEntry(scan, pagesDir, viewTransitions, prefetch, staticPageData) {
+	const { defaultStrategy, hoverDelay, cacheFor } = resolvePrefetchConfig(prefetch);
 	return `
 import { createApp, createSSRApp, h, reactive, provide, shallowRef, nextTick, ref } from "vue";
 import { createDeferred, resolveDeferred, rejectDeferred } from "@void/vue/deferred";
@@ -536,8 +475,9 @@ const { router, initialPageData, initialComponent, initialLayouts, start, commit
     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)},
     onRouteChange(url) {
       routeUrl.value = url;
     },
@@ -588,8 +528,7 @@ start();
 commitInitialRender();
 `;
 }
-//#endregion
-//#region src/plugin.ts
+// src/plugin.ts
 function voidVue(options) {
 	const root = process.cwd();
 	const pagesDir = resolvePagesDir(root);
@@ -603,5 +542,4 @@ function voidVue(options) {
 		...islandsPlugin(pagesDir, { root })
 	];
 }
-//#endregion
 export { voidVue };

package/dist/runtime/use-deferred.d.mts

@@ -1,4 +1,3 @@
-//#region src/runtime/use-deferred.d.ts
 export type DeferredRef<T = unknown> = {
   value: null;
   loading: true;
@@ -14,5 +13,4 @@ export type DeferredRef<T = unknown> = {
 };
 export declare function createDeferred<T = unknown>(): DeferredRef<T>;
 export declare function resolveDeferred(ref: DeferredRef, data: unknown): void;
-export declare function rejectDeferred(ref: DeferredRef, error: string): void;
-//#endregion
+export declare function rejectDeferred(ref: DeferredRef, error: string): void;

package/dist/runtime/use-deferred.mjs

@@ -1,5 +1,5 @@
 import { reactive } from "vue";
-//#region src/runtime/use-deferred.ts
+// src/runtime/use-deferred.ts
 function createDeferred() {
 	return reactive({
 		value: null,
@@ -17,5 +17,4 @@ function rejectDeferred(ref, error) {
 	r.error = new Error(error);
 	r.loading = false;
 }
-//#endregion
 export { createDeferred, rejectDeferred, resolveDeferred };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@void/vue",
-  "version": "1.4.0",
+  "version": "1.6.0",
   "description": "Vue pages, server rendering, forms, and navigation for Void.",
   "homepage": "https://void.cloud",
   "bugs": {
@@ -37,16 +37,16 @@
     "@vitejs/plugin-vue": "^6.0.10"
   },
   "devDependencies": {
-    "@types/node": "^26.6.5",
+    "@types/node": "^26.6.6",
     "pathslash": "^0.1.0",
-    "vite": "npm:@voidzero-dev/vite-plus-core@1.3.0",
-    "vite-plus": "1.3.0",
-    "void": "1.4.0",
+    "vite": "npm:@voidzero-dev/vite-plus-core@1.4.0",
+    "vite-plus": "1.4.0",
+    "void": "1.6.0",
     "vue": "^3.5.44"
   },
   "peerDependencies": {
     "vite": "^8.0.0",
-    "void": "1.4.0",
+    "void": "1.6.0",
     "vue": "^3.5.0"
   },
   "scripts": {