@void/solid 0.7.13 → 0.8.1

package/dist/plugin.mjs

@@ -1,7 +1,7 @@
 import solid from "vite-plugin-solid";
+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 "/";
@@ -164,10 +131,10 @@ function findIslandImports(code) {
 * detect the language.
 */
 const WRAPPER_PREFIX = "/@void-island-wrap/";
-function islandsPlugin(pagesDir) {
+function islandsPlugin(pagesDir, options) {
 	let pageScan = null;
 	let isDev = false;
-	const root = dirname(pagesDir);
+	const root = options?.root ?? dirname(pagesDir);
 	const islandManifest = /* @__PURE__ */ new Map();
 	const islandCssFiles = /* @__PURE__ */ new Set();
 	const wrapperMeta = /* @__PURE__ */ new Map();
@@ -193,7 +160,7 @@ function islandsPlugin(pagesDir) {
 		},
 		async buildStart() {
 			if (existsSync(pagesDir)) {
-				pageScan = await scanPages(root);
+				pageScan = await scanPages(root, { pagesDir });
 				const filesToScan = [
 					...pageScan.pages.map((page) => ({
 						filePath: page.componentPath,
@@ -451,12 +418,30 @@ function hasNonIslandPages(dir) {
 }
 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-solid:pages",
 		async buildStart() {
-			if (existsSync(pagesDir)) pageScan = await scanPages(root);
+			await runRescan();
 		},
 		resolveId: {
 			filter: { id: /^virtual:void-pages-(renderer|client)$/ },
@@ -466,7 +451,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);
@@ -477,19 +464,34 @@ 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;
 		},
 		config(_, env) {
 			if (!existsSync(pagesDir)) return;
-			if (env.command === "serve") return { optimizeDeps: {
-				exclude: ["@void/solid"],
-				include: [
-					"solid-js",
-					"solid-js/web",
-					"solid-js/store"
-				]
-			} };
+			if (env.command === "serve") {
+				isDev = true;
+				return { optimizeDeps: {
+					exclude: ["@void/solid"],
+					include: [
+						"solid-js",
+						"solid-js/web",
+						"solid-js/store"
+					]
+				} };
+			}
 			if (!hasNonIslandPages(pagesDir)) return;
 			return { build: {
 				manifest: true,
@@ -708,7 +710,8 @@ function configPlugin() {
 	};
 }
 function voidSolid(options) {
-	const pagesDir = join(process.cwd(), "pages");
+	const root = process.cwd();
+	const pagesDir = resolvePagesDir(root);
 	return [
 		configPlugin(),
 		solid({
@@ -716,10 +719,11 @@ function voidSolid(options) {
 			...options?.solid
 		}),
 		pagesPlugin(pagesDir, {
+			root,
 			viewTransitions: options?.viewTransitions,
 			prefetch: options?.prefetch
 		}),
-		...islandsPlugin(pagesDir)
+		...islandsPlugin(pagesDir, { root })
 	];
 }
 //#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@void/solid",
-  "version": "0.7.13",
+  "version": "0.8.1",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/voidzero-dev/void.git",
@@ -43,12 +43,12 @@
     "solid-js": "^1.9.12",
     "vite": "npm:@voidzero-dev/vite-plus-core@0.1.20",
     "vite-plus": "^0.1.20",
-    "void": "0.7.13"
+    "void": "0.8.1"
   },
   "peerDependencies": {
     "solid-js": "^1.9.0",
     "vite": "^8.0.0",
-    "void": "0.7.13"
+    "void": "0.8.1"
   },
   "scripts": {
     "build": "vp pack",