@void/svelte 0.7.12 → 0.8.0

package/dist/plugin.d.mts

@@ -11,6 +11,6 @@ type VoidSvelteOptions = Readonly<{
   viewTransitions?: boolean;
   prefetch?: PrefetchConfig;
 }>;
-declare function voidSvelte(options?: VoidSvelteOptions): ReadonlyArray<Plugin>;
+declare function voidSvelte(options?: VoidSvelteOptions): Array<Plugin>;
 //#endregion
 export { VoidSvelteOptions, voidSvelte };

package/dist/plugin.mjs

@@ -1,7 +1,7 @@
 import { svelte } from "@sveltejs/vite-plugin-svelte";
+import { generateComponentManifest, resolveEffectiveLayoutChain, resolvePagesDir, resolveStaticPageDataBuildOptions, scanPages } from "void/pages";
 import { existsSync, readFileSync, readdirSync } from "node:fs";
 import { normalizePath } from "vite";
-import { generateComponentManifest, resolveEffectiveLayoutChain, resolveStaticPageDataBuildOptions, scanPages } from "void/pages";
 import { ISLANDS_CLIENT_ENTRY_ID, ISLANDS_RENDERER_ID, computePagesNeedingClientJS, extractCssImports, needsIslandClientBundle, resolveSpecifier, rewriteCssImportForVirtualModule, watchPagesForRescan } from "void/pages-islands-plugin";
 //#region ../../node_modules/.pnpm/pathe@2.0.3/node_modules/pathe/dist/shared/pathe.M-eThtNZ.mjs
 const _DRIVE_LETTER_START_RE = /^[A-Za-z]:\//;
@@ -9,42 +9,9 @@ function normalizeWindowsPath(input = "") {
 	if (!input) return input;
 	return input.replace(/\\/g, "/").replace(_DRIVE_LETTER_START_RE, (r) => r.toUpperCase());
 }
-const _UNC_REGEX = /^[/\\]{2}/;
 const _IS_ABSOLUTE_RE = /^[/\\](?![/\\])|^[/\\]{2}(?!\.)|^[A-Za-z]:[/\\]/;
 const _DRIVE_LETTER_RE = /^[A-Za-z]:$/;
 const _ROOT_FOLDER_RE = /^\/([A-Za-z]:)?$/;
-const normalize = function(path) {
-	if (path.length === 0) return ".";
-	path = normalizeWindowsPath(path);
-	const isUNCPath = path.match(_UNC_REGEX);
-	const isPathAbsolute = isAbsolute(path);
-	const trailingSeparator = path[path.length - 1] === "/";
-	path = normalizeString(path, !isPathAbsolute);
-	if (path.length === 0) {
-		if (isPathAbsolute) return "/";
-		return trailingSeparator ? "./" : ".";
-	}
-	if (trailingSeparator) path += "/";
-	if (_DRIVE_LETTER_RE.test(path)) path += "/";
-	if (isUNCPath) {
-		if (!isPathAbsolute) return `//./${path}`;
-		return `//${path}`;
-	}
-	return isPathAbsolute && !isAbsolute(path) ? `/${path}` : path;
-};
-const join = function(...segments) {
-	let path = "";
-	for (const seg of segments) {
-		if (!seg) continue;
-		if (path.length > 0) {
-			const pathTrailing = path[path.length - 1] === "/";
-			const segLeading = seg[0] === "/";
-			if (pathTrailing && segLeading) path += seg.slice(1);
-			else path += pathTrailing || segLeading ? seg : `/${seg}`;
-		} else path += seg;
-	}
-	return normalize(path);
-};
 function cwd() {
 	if (typeof process !== "undefined" && typeof process.cwd === "function") return process.cwd().replace(/\\/g, "/");
 	return "/";
@@ -140,15 +107,31 @@ const COMPONENT_EXTENSIONS = [
 	".ts",
 	".js"
 ];
+const ISLAND_IMPORT_RE = /import\s+([$_A-Za-z][$_\w]*)\s+from\s+("[^"]+"|'[^']+')\s+with\s*\{\s*island\s*:\s*("[^"]+"|'[^']+')\s*,?\s*\}/g;
+function findIslandImports(code) {
+	const imports = [];
+	let match;
+	ISLAND_IMPORT_RE.lastIndex = 0;
+	while ((match = ISLAND_IMPORT_RE.exec(code)) !== null) {
+		const specifierRaw = match[2];
+		imports.push({
+			statement: match[0],
+			importName: match[1],
+			specifier: specifierRaw.slice(1, -1),
+			hydrate: match[3].slice(1, -1)
+		});
+	}
+	return imports;
+}
 /**
 * Prefix for virtual island wrapper modules. Must NOT use the `\0` prefix
 * because `@sveltejs/vite-plugin-svelte` skips `\0`-prefixed modules in
 * its transform filter.
 */
 const WRAPPER_PREFIX = "/@void-island-wrap/";
-function islandsPlugin(pagesDir) {
+function islandsPlugin(pagesDir, options) {
 	let pageScan = null;
-	const root = dirname(pagesDir);
+	const root = options?.root ?? dirname(pagesDir);
 	const islandManifest = /* @__PURE__ */ new Map();
 	const islandCssFiles = /* @__PURE__ */ new Set();
 	let isDev = false;
@@ -173,8 +156,7 @@ function islandsPlugin(pagesDir) {
 		},
 		async buildStart() {
 			if (existsSync(pagesDir)) {
-				pageScan = await scanPages(root);
-				const importAttrRe = /import\s+\w+\s+from\s+("[^"]+"|'[^']+')\s+with\s*\{\s*island\s*:\s*("[^"]+"|'[^']+')\s*\}/g;
+				pageScan = await scanPages(root, { pagesDir });
 				const filesToScan = [
 					...pageScan.pages.map((page) => ({
 						filePath: page.componentPath,
@@ -194,11 +176,9 @@ function islandsPlugin(pagesDir) {
 					const filePath = resolve(pagesDir, entry.filePath);
 					const code = readFileSync(filePath, "utf-8");
 					const importerDir = dirname(filePath);
-					importAttrRe.lastIndex = 0;
-					let importMatch;
-					while ((importMatch = importAttrRe.exec(code)) !== null) {
-						const spec = importMatch[1].slice(1, -1);
-						const strategy = importMatch[2].slice(1, -1);
+					for (const islandImport of findIslandImports(code)) {
+						const spec = islandImport.specifier;
+						const strategy = islandImport.hydrate;
 						const absPath = resolveSpecifier(spec, importerDir, COMPONENT_EXTENSIONS);
 						if (absPath) {
 							const islandId = normalizePath(relative(root, absPath)).replace(/\.[^.]+$/, "");
@@ -258,16 +238,12 @@ function islandsPlugin(pagesDir) {
 			filter: { id: /\.island\.svelte$/ },
 			handler(code, id) {
 				if (/import\s+\{[^}]*\buseForm\b/.test(code)) this.warn(`islands: useForm cannot be imported in island page '${id}'. Use useIslandForm instead.`);
-				const importAttrRe = /import\s+(\w+)\s+from\s+("[^"]+"|'[^']+')\s+with\s*\{\s*island\s*:\s*("[^"]+"|'[^']+')\s*\}/g;
 				const importerDir = dirname(id);
 				let transformed = code;
-				let match;
-				while ((match = importAttrRe.exec(code)) !== null) {
-					const name = match[1];
-					const specRaw = match[2];
-					const strategyRaw = match[3];
-					const spec = specRaw.slice(1, -1);
-					const strategy = strategyRaw.slice(1, -1);
+				for (const islandImport of findIslandImports(code)) {
+					const name = islandImport.importName;
+					const spec = islandImport.specifier;
+					const strategy = islandImport.hydrate;
 					const absPath = resolveSpecifier(spec, importerDir, COMPONENT_EXTENSIONS);
 					if (absPath) {
 						const islandId = normalizePath(relative(root, absPath)).replace(/\.[^.]+$/, "");
@@ -280,7 +256,7 @@ function islandsPlugin(pagesDir) {
 					const islandId = absPath ? normalizePath(relative(root, absPath)).replace(/\.[^.]+$/, "") : spec;
 					const wrapperUrl = WRAPPER_PREFIX + encodeURIComponent(islandId) + ".svelte?src=" + encodeURIComponent(absPath || spec) + "&island=" + encodeURIComponent(islandId) + "&hydrate=" + encodeURIComponent(strategy);
 					const replacement = `import ${name} from ${JSON.stringify(wrapperUrl)}`;
-					transformed = transformed.replace(match[0], replacement);
+					transformed = transformed.replace(islandImport.statement, replacement);
 				}
 				if (transformed !== code) return {
 					code: transformed,
@@ -459,11 +435,28 @@ function pagesPlugin(pagesDir, options) {
 	let pageScan = null;
 	let isDev = false;
 	let viteConfig;
-	const root = dirname(pagesDir);
+	const root = options?.root ?? dirname(pagesDir);
+	const normalizedPagesDir = normalizePath(pagesDir);
+	let pendingRescan = null;
+	const rescanPages = async () => {
+		pageScan = existsSync(pagesDir) ? await scanPages(root, { pagesDir }) : 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-svelte:pages",
 		async buildStart() {
-			if (existsSync(pagesDir)) pageScan = await scanPages(root);
+			await runRescan();
 		},
 		resolveId: {
 			filter: { id: /^virtual:void-pages-(renderer|client)$/ },
@@ -473,7 +466,9 @@ function pagesPlugin(pagesDir, options) {
 		},
 		load: {
 			filter: { id: /^\0virtual:void-pages-(renderer|client)$/ },
-			handler(id) {
+			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, isDev);
@@ -484,6 +479,18 @@ function pagesPlugin(pagesDir, options) {
 				}
 			}
 		},
+		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;
+				await runRescan();
+				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"));
+		},
 		configResolved(config) {
 			viteConfig = config;
 		},
@@ -661,14 +668,16 @@ start();
 //#endregion
 //#region src/plugin.ts
 function voidSvelte(options) {
-	const pagesDir = join(process.cwd(), "pages");
+	const root = process.cwd();
+	const pagesDir = resolvePagesDir(root);
 	return [
 		...svelte(options?.svelte),
 		pagesPlugin(pagesDir, {
+			root,
 			viewTransitions: options?.viewTransitions,
 			prefetch: options?.prefetch
 		}),
-		...islandsPlugin(pagesDir)
+		...islandsPlugin(pagesDir, { root })
 	];
 }
 //#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@void/svelte",
-  "version": "0.7.12",
+  "version": "0.8.0",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/voidzero-dev/void.git",
@@ -44,12 +44,12 @@
     "svelte": "^5.55.5",
     "vite": "npm:@voidzero-dev/vite-plus-core@0.1.20",
     "vite-plus": "^0.1.20",
-    "void": "0.7.12"
+    "void": "0.8.0"
   },
   "peerDependencies": {
     "svelte": "^5.0.0",
     "vite": "^8.0.0",
-    "void": "0.7.12"
+    "void": "0.8.0"
   },
   "scripts": {
     "build": "vp pack",