@void/svelte 0.27.0 → 1.0.3

package/dist/plugin.d.mts

@@ -13,4 +13,5 @@ export type VoidSvelteOptions = Readonly<{
   prefetch?: PrefetchConfig;
 }>;
 export declare function voidSvelte(options?: VoidSvelteOptions): Array<Plugin>;
-//#endregion
+//#endregion
+export {};

package/dist/plugin.mjs

@@ -2,8 +2,9 @@ import { svelte } from "@sveltejs/vite-plugin-svelte";
 import { generateComponentManifest, resolveEffectiveLayoutChain, resolvePagesDir, resolveStaticPageDataBuildOptions, scanPages } from "void/pages";
 import { existsSync, readFileSync, readdirSync } from "node:fs";
 import nodePath from "node:path";
+import { preprocess } from "svelte/compiler";
 import { normalizePath } from "vite";
-import { ISLANDS_CLIENT_ENTRY_ID, ISLANDS_RENDERER_ID, computePagesNeedingClientJS, editIslandSource, extractCssImports, findIslandImports, findStaticCssImports, needsIslandClientBundle, resolveSpecifier, rewriteCssImportForVirtualModule, watchPagesForRescan } from "void/pages-islands-plugin";
+import { ISLANDS_CLIENT_ENTRY_ID, ISLANDS_RENDERER_ID, computePagesNeedingClientJS, editIslandSource, findIslandImports, findStaticCssImports, needsIslandClientBundle, resolveSpecifier, rewriteCssImportForVirtualModule, watchPagesForRescan } from "void/pages-islands-plugin";
 //#region ../../node_modules/.pnpm/pathslash@0.1.0/node_modules/pathslash/dist/index.mjs
 const BACKSLASH_RE = /\\/g;
 const isWindows = process.platform === "win32";
@@ -61,9 +62,7 @@ function islandsPlugin(pagesDir, options) {
 	const islandManifest = /* @__PURE__ */ new Map();
 	const islandCssFiles = /* @__PURE__ */ new Set();
 	let isDev = false;
-	let viteRoot = "";
 	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 {
@@ -86,7 +85,6 @@ function islandsPlugin(pagesDir, options) {
 		enforce: "pre",
 		configResolved(config) {
 			resolvedConfig = config;
-			viteRoot = config.root;
 			isDev = config.command === "serve";
 		},
 		configureServer(server) {
@@ -127,22 +125,14 @@ function islandsPlugin(pagesDir, options) {
 			}
 		},
 		resolveId: {
-			filter: { id: /^(virtual:void-islands-(renderer|client)|\/@void-island-wrap\/)|\.svelte\.css$/ },
+			filter: { id: /^(virtual:void-islands-(renderer|client)|\/@void-island-wrap\/)/ },
 			handler(source) {
 				if (source === ISLANDS_RENDERER_ID || source === ISLANDS_CLIENT_ENTRY_ID) return "\0" + source;
 				if (source.startsWith(WRAPPER_PREFIX)) return source;
-				if (source.endsWith(".css")) {
-					const srcPath = normalizePath(source.slice(0, -4));
-					if (islandCssFiles.has(srcPath)) return srcPath + ".css";
-					if (srcPath.startsWith("/")) {
-						const absPath = normalizePath(resolve(viteRoot, srcPath.slice(1)));
-						if (islandCssFiles.has(absPath)) return absPath + ".css";
-					}
-				}
 			}
 		},
 		load: {
-			filter: { id: /^(\0virtual:void-islands-(renderer|client)|\/@void-island-wrap\/)|\.svelte\.css$/ },
+			filter: { id: /^(\0virtual:void-islands-(renderer|client)|\/@void-island-wrap\/)/ },
 			handler(id) {
 				if (id === "\0" + ISLANDS_RENDERER_ID) {
 					if (!pageScan) return "export function renderIslandPage() { throw new Error('No pages found'); }";
@@ -156,10 +146,6 @@ function islandsPlugin(pagesDir, options) {
 					return generateIslandClientEntry(islandManifest, islandCssFiles, isDev);
 				}
 				if (id.startsWith(WRAPPER_PREFIX)) return generateWrapperComponent(id);
-				if (id.endsWith(".css") && !id.startsWith("\0")) {
-					const srcPath = id.slice(0, -4);
-					if (islandCssFiles.has(srcPath)) return extractCssImports(srcPath);
-				}
 			}
 		},
 		transform: {
@@ -196,34 +182,35 @@ function islandsPlugin(pagesDir, options) {
 		name: "void-svelte:islands-style",
 		apply: "build",
 		resolveId: {
-			filter: { id: /\?island-style&/ },
+			filter: { id: /\.svelte\.css\?island-style$/ },
 			handler(source) {
 				return source;
 			}
 		},
 		load: {
-			filter: { id: /\?island-style&/ },
-			handler(id) {
-				const filePath = id.replace(/\?island-style&.*$/, "");
-				const params = new URLSearchParams(id.slice(id.indexOf("?island-style&") + 1));
-				const index = parseInt(params.get("index") || "0", 10);
-				const content = readFileSync(filePath, "utf-8");
-				const styleBlockRe = /<style\b[^>]*>([\s\S]*?)<\/style>/g;
-				let match;
-				let i = 0;
-				while ((match = styleBlockRe.exec(content)) !== null) {
-					if (i === index) return match[1];
-					i++;
+			filter: { id: /\.svelte\.css\?island-style$/ },
+			async handler(id) {
+				const file = id.slice(0, -17);
+				const api = resolvedConfig?.plugins.find((plugin) => plugin.name === "vite-plugin-svelte:config")?.api;
+				if (typeof api?.compileSvelte !== "function" || typeof api.idParser !== "function") this.error("Svelte island page styles need the @sveltejs/vite-plugin-svelte version that @void/svelte depends on.");
+				this.addWatchFile(file);
+				let code = readFileSync(file, "utf-8");
+				let map;
+				if (api.options.preprocess) {
+					const processed = await preprocess(code, api.options.preprocess, { filename: file });
+					code = processed.code;
+					map = processed.map;
+					for (const dependency of processed.dependencies ?? []) this.addWatchFile(dependency);
 				}
-				return "/* style block not found */";
+				const { compiled } = await api.compileSvelte(api.idParser(file, false), code, api.options, this.environment, map);
+				return {
+					code: compiled.css?.code ?? "",
+					map: compiled.css?.map ?? null
+				};
 			}
 		}
 	}];
 }
-/**
-* Generate a virtual Svelte wrapper component from a wrapper URL.
-* The URL encodes: src (absolute component path), island (ID), hydrate (strategy).
-*/
 function generateWrapperComponent(id) {
 	const url = new URL(id, "file://");
 	const src = decodeURIComponent(url.searchParams.get("src") || "");
@@ -267,7 +254,6 @@ export async function renderIslandPage(pageObj, assetTags) {
       layouts: layoutComponents,
       pageProps: pageObj.props,
       shared: pageObj.shared || {},
-      errors: pageObj.errors || {},
       params: pageObj.params || {},
       router: null,
       stores: null,
@@ -298,16 +284,7 @@ function generateIslandClientEntry(manifest, cssFiles, isDev) {
 	lines.push("import { initIslands } from \"void/pages-client\";");
 	if (!isDev) for (const file of cssFiles) {
 		const content = readFileSync(file, "utf-8");
-		const styleRe = /<style\b([^>]*)>/g;
-		styleRe.lastIndex = 0;
-		let styleIndex = 0;
-		let styleMatch;
-		while ((styleMatch = styleRe.exec(content)) !== null) {
-			const langMatch = styleMatch[1].match(/\blang\s*=\s*["'](\w+)["']/);
-			const lang = langMatch ? langMatch[1] : "css";
-			lines.push(`import ${JSON.stringify(file + "?island-style&index=" + styleIndex + "&lang." + lang)};`);
-			styleIndex++;
-		}
+		if (/<style\b/.test(content)) lines.push(`import ${JSON.stringify(file + ".css?island-style")};`);
 		for (const item of findStaticCssImports(content, file)) lines.push(rewriteCssImportForVirtualModule(item.statement, item.specifier, file));
 	}
 	lines.push("const islands = {");
@@ -456,7 +433,6 @@ export async function renderPage(pageObj, assetTags) {
       layouts: layoutComponents,
       pageProps: pageObj.props,
       shared: pageObj.shared || {},
-      errors: pageObj.errors || {},
       params: pageObj.params || {},
       router: createSsrRouter(pageObj.url || "/", pageObj.params || {}),
       routeUrl: pageObj.url || "/",
@@ -497,7 +473,6 @@ const pageStore = writable(null);
 const propsStore = writable({});
 const layoutsStore = writable([]);
 const sharedStore = writable({});
-const errorsStore = writable({});
 const paramsStore = writable({});
 let routeUrl = window.location.pathname + window.location.search + window.location.hash;
 let routeParams = {};
@@ -514,7 +489,6 @@ const { router, initialPageData, initialComponent, initialLayouts, start, commit
       applyUpdate(pageData, comp, layouts) {
         propsStore.set(pageData.props);
         sharedStore.set(pageData.shared || {});
-        errorsStore.set(pageData.errors || {});
         routeParams = pageData.params || {};
         paramsStore.set(routeParams);
         layoutsStore.set(layouts);
@@ -541,13 +515,12 @@ const { router, initialPageData, initialComponent, initialLayouts, start, commit
 
 const reactiveRouter = createRouterFacade(router, () => routeUrl, () => routeParams);
 
-setActionRouter(reactiveRouter);
+setActionRouter(router);
 
 pageStore.set(initialComponent);
 propsStore.set(initialPageData.props);
 layoutsStore.set(initialLayouts);
 sharedStore.set(initialPageData.shared || {});
-errorsStore.set(initialPageData.errors || {});
 routeParams = initialPageData.params || {};
 paramsStore.set(routeParams);
 
@@ -560,7 +533,6 @@ const appOptions = {
     layouts: initialLayouts,
     pageProps: initialPageData.props,
     shared: initialPageData.shared || {},
-    errors: initialPageData.errors || {},
     params: initialPageData.params || {},
     router,
     routeUrl,
@@ -570,7 +542,6 @@ const appOptions = {
       props: propsStore,
       layouts: layoutsStore,
       shared: sharedStore,
-      errors: errorsStore,
       params: paramsStore,
       route: routeStore,
       navigation: navigationStore,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@void/svelte",
-  "version": "0.27.0",
+  "version": "1.0.3",
   "description": "Svelte pages, server rendering, forms, and navigation for Void.",
   "homepage": "https://void.cloud",
   "bugs": {
@@ -38,17 +38,17 @@
     "@sveltejs/vite-plugin-svelte": "^7.3.1"
   },
   "devDependencies": {
-    "@types/node": "^26.6.4",
+    "@types/node": "^26.6.5",
     "pathslash": "^0.1.0",
     "svelte": "^5.57.2",
-    "vite": "npm:@voidzero-dev/vite-plus-core@1.1.0",
-    "vite-plus": "1.1.0",
-    "void": "0.27.0"
+    "vite": "npm:@voidzero-dev/vite-plus-core@1.2.0",
+    "vite-plus": "1.2.0",
+    "void": "1.0.3"
   },
   "peerDependencies": {
     "svelte": "^5.0.0",
     "vite": "^8.0.0",
-    "void": "0.27.0"
+    "void": "1.0.3"
   },
   "scripts": {
     "build": "vp pack",

package/src/runtime/App.svelte

@@ -12,7 +12,6 @@
     layouts: props.layouts,
     pageProps: props.pageProps,
     shared: props.shared,
-    errors: props.errors,
     params: props.params,
     router: props.router,
     routeUrl: props.routeUrl,
@@ -25,7 +24,6 @@
   let currentLayouts = $state(init.layouts);
   let currentPageProps = $state(init.pageProps);
   let shared = $state(init.shared);
-  let errors = $state(init.errors);
   let params = $state(init.params || {});
   let routeUrl = $state(init.routeUrl || "/");
   let navigation = $state(init.navigation || idleNavigationState());
@@ -46,9 +44,6 @@
   setContext("__void_shared", {
     get value() { return shared; },
   });
-  setContext("__void_errors", {
-    get value() { return errors; },
-  });
   setContext("__void_params", {
     get value() { return params; },
   });
@@ -66,7 +61,6 @@
       init.stores.props.subscribe((v) => { currentPageProps = v; }),
       init.stores.layouts.subscribe((v) => { currentLayouts = v; }),
       init.stores.shared.subscribe(replaceShared),
-      init.stores.errors.subscribe((v) => { errors = v; }),
       init.stores.params.subscribe((v) => { params = v; }),
       init.stores.route.subscribe((v) => { routeUrl = v; }),
       init.stores.navigation.subscribe((v) => { navigation = v; }),

package/src/runtime/Link.svelte

@@ -1,15 +1,16 @@
 <script lang="ts">
   import { getContext, onDestroy, onMount, type Snippet } from "svelte";
-  import { isModifiedEvent, mergeDataIntoHref, type VoidRouter } from "void/pages-client";
+  import {
+    isModifiedEvent,
+    mergeDataIntoHref,
+    type PrefetchOptions,
+    type VoidRouter,
+  } from "void/pages-client";
 
   type PrefetchStrategy = "hover" | "click" | "mount" | "visible";
   type LinkMethod = "GET" | "POST" | "PUT" | "PATCH" | "DELETE";
   type NavigateEvent = { preventDefault(): void };
   type EventHandler<T extends Event> = (event: T) => void;
-  type PrefetchOptions = {
-    cacheFor?: number | string | [string, string];
-    method?: LinkMethod;
-  };
 
   let {
     href,
@@ -57,12 +58,8 @@
 
   const router = getContext<VoidRouter>("__void_router");
 
-  function hasPrefetch(prefetch: boolean | PrefetchStrategy | Array<PrefetchStrategy>): boolean {
-    return prefetch !== false;
-  }
-
   function getStrategies(): Array<PrefetchStrategy> {
-    if (hasPrefetch(prefetchProp) && !isGet) {
+    if (prefetchProp !== false && !isGet) {
       throw new Error(
         'Link: prefetch only supports GET links. Remove `prefetch` or use method="GET".',
       );
@@ -90,13 +87,10 @@
     if (hrefWithData === current) {
       return;
     }
-    const options: PrefetchOptions = {};
+    const options: PrefetchOptions = { method: normalizedMethod };
     if (cacheFor !== undefined) {
       options.cacheFor = cacheFor;
     }
-    if (normalizedMethod) {
-      options.method = normalizedMethod;
-    }
     router.prefetch(hrefWithData, options);
   }
 

package/src/runtime/use-navigation.ts

@@ -1,8 +1,6 @@
 import { getContext } from 'svelte';
 import { idleNavigationState, type NavigationState } from 'void/pages-client';
 
-export type { NavigationState } from 'void/pages-client';
-
 export function useNavigation(): NavigationState {
   const ctx = getContext<{ value: NavigationState }>('__void_navigation');
   if (!ctx) {

package/src/runtime/use-router.ts

@@ -2,8 +2,6 @@ import { getContext } from 'svelte';
 import { ssrProxy } from 'void/pages-client';
 import type { VoidRouter } from 'void/pages-client';
 
-export type { VoidRouter } from 'void/pages-client';
-
 export function useRouter(): VoidRouter {
   return getContext<VoidRouter>('__void_router') ?? ssrProxy;
 }