@void/vue 1.3.0 → 1.4.0

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { VoidActionError, categorizeActionError, cloneFormValue, createActionClient, formErrorMessage, formRetryMessage, formSubmissionBlocked, getValidationErrors, idleNavigationState, interpolateRouteParams, isAbortError, isEqualFormValue, isModifiedEvent, mergeDataIntoHref, parseFormResetArgs, scheduleFormRetry, ssrProxy, submitAction } from "void/pages-client";
+import { cloneFormValue, createActionClient, formErrorMessage, formRetryMessage, formSubmissionBlocked, getValidationErrors, idleNavigationState, interpolateRouteParams, isAbortError, isEqualFormValue, isModifiedEvent, mergeDataIntoHref, parseFormResetArgs, 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
 const Form = defineComponent({
@@ -335,15 +335,6 @@ function useNavigation() {
 }
 //#endregion
 //#region src/runtime/use-island-form.ts
-async function readActionErrorBody(response) {
-	const contentType = response.headers.get("content-type") || "";
-	try {
-		if (contentType.includes("application/json")) return await response.json();
-		return await response.text() || null;
-	} catch {
-		return null;
-	}
-}
 /**
 * Form composable for island pages. Uses fetch + page reload instead of the
 * Void Router (which is not available in island mode).
@@ -380,16 +371,12 @@ function useIslandForm(defaults) {
 		clearErrors();
 		clearError();
 		try {
-			const response = await fetch(url, {
-				method,
-				headers: { "Content-Type": "application/json" },
-				body: JSON.stringify(data)
-			});
-			if (response.redirected) {
-				window.location.href = response.url;
+			const result = await submitIslandAction(url, method, data);
+			if (result.kind === "redirect") {
+				window.location.href = result.url;
 				return;
 			}
-			if (response.ok) {
+			if (result.kind === "success") {
 				wasSuccessful.value = true;
 				recentlySuccessful.value = true;
 				defaults_ = { ...data };
@@ -397,22 +384,8 @@ function useIslandForm(defaults) {
 					recentlySuccessful.value = false;
 				}, 2e3);
 				window.location.reload();
-			} else {
-				const body = await readActionErrorBody(response);
-				const actionError = new VoidActionError({
-					body,
-					status: response.status,
-					statusText: response.statusText,
-					url
-				});
-				const validationErrors = response.status === 422 ? getValidationErrors(body) : null;
-				if (validationErrors) {
-					Object.assign(errors, validationErrors);
-					return;
-				}
-				if (categorizeActionError(response.status) === "boundary") throw actionError;
-				error.value = actionError;
-			}
+			} else if (result.kind === "validation") Object.assign(errors, result.errors);
+			else error.value = result.error;
 		} finally {
 			pending.value = false;
 		}

package/dist/plugin.mjs

@@ -1,5 +1,5 @@
 import vue from "@vitejs/plugin-vue";
-import { generateComponentManifest, resolveEffectiveLayoutChain, resolvePagesDir, resolveStaticPageDataBuildOptions, scanPages } from "void/pages";
+import { createPagesPlugin, generateComponentManifest, resolveEffectiveLayoutChain, resolvePagesDir, scanPages } from "void/pages";
 import { existsSync, readFileSync, readdirSync } from "node:fs";
 import nodePath from "node:path";
 import { normalizePath } from "vite";
@@ -313,7 +313,6 @@ initIslands(islands, hydrateIsland);
 }
 //#endregion
 //#region src/plugin-pages.ts
-const RENDERER_ID = "virtual:void-pages-renderer";
 const CLIENT_ENTRY_ID = "virtual:void-pages-client";
 /** Runtime helper injected into generated SSR and client page bundles. */
 const PATCH_PROPS_RUNTIME = `
@@ -389,30 +388,7 @@ function hasNonIslandPages(dir) {
 	return false;
 }
 function pagesPlugin(pagesDir, options) {
-	let pageScan = null;
-	let isDev = false;
-	let viteConfig;
-	const root = options?.root ?? dirname(pagesDir);
 	const normalizedPagesDir = normalizePath(pagesDir);
-	let pendingRescan = null;
-	const rescanPages = async () => {
-		pageScan = existsSync(pagesDir) ? await scanPages(root, {
-			pagesDir,
-			environment: isDev ? "dev" : "prod"
-		}) : null;
-	};
-	const runRescan = () => {
-		pendingRescan ??= rescanPages().finally(() => {
-			pendingRescan = null;
-		});
-		return pendingRescan;
-	};
-	const invalidatePageModules = (server) => {
-		for (const env of Object.values(server.environments)) for (const id of ["\0" + RENDERER_ID, "\0" + CLIENT_ENTRY_ID]) {
-			const mod = env.moduleGraph.getModuleById(id);
-			if (mod) env.moduleGraph.invalidateModule(mod);
-		}
-	};
 	return [{
 		name: "void-vue:pages-transform",
 		enforce: "pre",
@@ -439,58 +415,16 @@ function pagesPlugin(pagesDir, options) {
 				};
 			}
 		}
-	}, {
+	}, createPagesPlugin(pagesDir, {
 		name: "void-vue:pages",
-		async buildStart() {
-			await runRescan();
-		},
-		resolveId: {
-			filter: { id: /^virtual:void-pages-(renderer|client)$/ },
-			handler(id) {
-				return "\0" + id;
-			}
-		},
-		load: {
-			filter: { id: /^\0virtual:void-pages-(renderer|client)$/ },
-			async handler(id) {
-				if (isDev && pendingRescan) await pendingRescan;
-				if (!pageScan && existsSync(pagesDir)) await runRescan();
-				if (id === "\0" + RENDERER_ID) {
-					if (!pageScan) return "export function renderPage() { throw new Error('No pages found'); }";
-					return generateRendererModule(pageScan, pagesDir);
-				}
-				if (id === "\0" + CLIENT_ENTRY_ID) {
-					if (!pageScan) return "";
-					return generateClientEntry(pageScan, pagesDir, options?.viewTransitions, options?.prefetch, resolveStaticPageDataBuildOptions(root, { publicDir: viteConfig?.publicDir }));
-				}
-			}
+		root: options?.root,
+		generateRenderer(scan) {
+			return generateRendererModule(scan, pagesDir);
 		},
-		configureServer(server) {
-			const handlePagesChange = async (path, event) => {
-				const normalizedPath = normalizePath(path);
-				if (normalizedPath !== normalizedPagesDir && !normalizedPath.startsWith(normalizedPagesDir + "/")) return;
-				if (event === "change" && !normalizedPath.endsWith(".md")) return;
-				try {
-					await runRescan();
-				} catch (error) {
-					server.config.logger.error(error instanceof Error ? error.message : String(error), {
-						error: error instanceof Error ? error : void 0,
-						timestamp: true
-					});
-					return;
-				}
-				invalidatePageModules(server);
-			};
-			server.watcher.on("add", (path) => handlePagesChange(path, "add"));
-			server.watcher.on("change", (path) => handlePagesChange(path, "change"));
-			server.watcher.on("unlink", (path) => handlePagesChange(path, "unlink"));
+		generateClient(scan, staticPageData) {
+			return generateClientEntry(scan, pagesDir, options?.viewTransitions, options?.prefetch, staticPageData);
 		},
-		configResolved(config) {
-			viteConfig = config;
-		},
-		config(_, env) {
-			isDev = env.command === "serve";
-			if (!existsSync(pagesDir)) return;
+		config({ isDev }) {
 			if (isDev) return { optimizeDeps: { include: ["vue"] } };
 			if (!hasNonIslandPages(pagesDir)) return;
 			return { environments: { client: { build: {
@@ -498,7 +432,7 @@ function pagesPlugin(pagesDir, options) {
 				rollupOptions: { input: { "pages-client": CLIENT_ENTRY_ID } }
 			} } } };
 		}
-	}];
+	})];
 }
 function generateRendererModule(scan, pagesDir) {
 	return `

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@void/vue",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "description": "Vue pages, server rendering, forms, and navigation for Void.",
   "homepage": "https://void.cloud",
   "bugs": {
@@ -41,12 +41,12 @@
     "pathslash": "^0.1.0",
     "vite": "npm:@voidzero-dev/vite-plus-core@1.3.0",
     "vite-plus": "1.3.0",
-    "void": "1.3.0",
+    "void": "1.4.0",
     "vue": "^3.5.44"
   },
   "peerDependencies": {
     "vite": "^8.0.0",
-    "void": "1.3.0",
+    "void": "1.4.0",
     "vue": "^3.5.0"
   },
   "scripts": {