@void/svelte 1.3.0 → 1.4.0

package/dist/plugin.mjs

@@ -1,5 +1,5 @@
 import { svelte } from "@sveltejs/vite-plugin-svelte";
-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 { preprocess } from "svelte/compiler";
@@ -329,7 +329,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";
 const SVELTE_OPTIMIZE_DEPS = {
 	exclude: ["@void/svelte"],
@@ -356,82 +355,16 @@ 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 {
+	return createPagesPlugin(pagesDir, {
 		name: "void-svelte: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 }));
-				}
-			}
-		},
-		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"));
+		root: options?.root,
+		generateRenderer(scan) {
+			return generateRendererModule(scan, pagesDir);
 		},
-		configResolved(config) {
-			viteConfig = config;
+		generateClient(scan, staticPageData) {
+			return generateClientEntry(scan, pagesDir, options?.viewTransitions, options?.prefetch, staticPageData);
 		},
-		config(_, env) {
-			isDev = env.command === "serve";
-			if (!existsSync(pagesDir)) return;
+		config({ isDev }) {
 			if (isDev) return {
 				optimizeDeps: SVELTE_OPTIMIZE_DEPS,
 				environments: { void_worker: { optimizeDeps: { exclude: ["@void/svelte"] } } }
@@ -442,7 +375,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/svelte",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "description": "Svelte pages, server rendering, forms, and navigation for Void.",
   "homepage": "https://void.cloud",
   "bugs": {
@@ -43,12 +43,12 @@
     "svelte": "^5.57.2",
     "vite": "npm:@voidzero-dev/vite-plus-core@1.3.0",
     "vite-plus": "1.3.0",
-    "void": "1.3.0"
+    "void": "1.4.0"
   },
   "peerDependencies": {
     "svelte": "^5.0.0",
     "vite": "^8.0.0",
-    "void": "1.3.0"
+    "void": "1.4.0"
   },
   "scripts": {
     "build": "vp pack",

package/src/runtime/App.svelte

@@ -30,12 +30,13 @@
   let navigation = $state(init.navigation || idleNavigationState());
   const router = createRouterFacade(init.router, () => routeUrl, () => params);
 
-  // Layouts can keep the object returned by useShared() across navigations.
-  function replaceShared(next) {
-    for (const key of Object.keys(shared)) {
-      delete shared[key];
+  // Pages and layouts keep the objects returned by useShared() and useParams()
+  // across navigations, so update them in place.
+  function replaceInPlace(target, next) {
+    for (const key of Object.keys(target)) {
+      delete target[key];
     }
-    Object.assign(shared, next || {});
+    Object.assign(target, next || {});
   }
 
   // Capitalized alias for dynamic component rendering
@@ -65,8 +66,8 @@
       init.stores.page.subscribe((v) => { currentPage = v; }),
       init.stores.props.subscribe((v) => { currentPageProps = v; }),
       init.stores.layouts.subscribe((v) => { currentLayouts = v; }),
-      init.stores.shared.subscribe(replaceShared),
-      init.stores.params.subscribe((v) => { params = v; }),
+      init.stores.shared.subscribe((v) => replaceInPlace(shared, v)),
+      init.stores.params.subscribe((v) => replaceInPlace(params, v)),
       init.stores.route.subscribe((v) => { routeUrl = v; }),
       init.stores.navigation.subscribe((v) => { navigation = v; }),
     ];

package/src/runtime/use-island-form.svelte.ts

@@ -1,9 +1,4 @@
-import {
-  VoidActionError,
-  categorizeActionError,
-  getValidationErrors,
-  isEqualFormValue,
-} from 'void/pages-client';
+import { isEqualFormValue, submitIslandAction, type VoidActionError } from 'void/pages-client';
 
 type UntypedIslandForm = {
   readonly data: Record<string, unknown>;
@@ -23,19 +18,6 @@ type UntypedIslandForm = {
   clearError(): void;
 };
 
-async function readActionErrorBody(response: Response): Promise<unknown> {
-  const contentType = response.headers.get('content-type') || '';
-  try {
-    if (contentType.includes('application/json')) {
-      return await response.json();
-    }
-    const text = await response.text();
-    return 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).
@@ -90,18 +72,14 @@ export function useIslandForm(defaults: Record<string, unknown>): UntypedIslandF
     clearError();
 
     try {
-      const response = await fetch(url, {
-        method,
-        headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify(data),
-      });
+      const result = await submitIslandAction(url, method, data);
 
-      if (response.redirected) {
-        window.location.href = response.url;
+      if (result.kind === 'redirect') {
+        window.location.href = result.url;
         return;
       }
 
-      if (response.ok) {
+      if (result.kind === 'success') {
         wasSuccessful = true;
         recentlySuccessful = true;
         defaults_ = { ...data };
@@ -109,23 +87,10 @@ export function useIslandForm(defaults: Record<string, unknown>): UntypedIslandF
           recentlySuccessful = false;
         }, 2000);
         window.location.reload();
+      } else if (result.kind === 'validation') {
+        Object.assign(errors, result.errors);
       } 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 = actionError;
+        error = result.error;
       }
     } finally {
       pending = false;