@void/solid 0.7.5 → 0.7.7

package/dist/plugin.d.mts

@@ -2,15 +2,15 @@ import solid from "vite-plugin-solid";
 import { Plugin } from "vite";
 
 //#region src/plugin.d.ts
-interface PrefetchConfig {
+type PrefetchConfig = {
   hoverDelay?: number;
   cacheFor?: number | string | [string, string];
-}
-interface VoidSolidOptions {
+};
+type VoidSolidOptions = Readonly<{
   solid?: Parameters<typeof solid>[0];
   viewTransitions?: boolean;
   prefetch?: PrefetchConfig;
-}
-declare function voidSolid(options?: VoidSolidOptions): Array<Plugin>;
+}>;
+declare function voidSolid(options?: VoidSolidOptions): ReadonlyArray<Plugin>;
 //#endregion
 export { VoidSolidOptions, voidSolid };

package/dist/plugin.mjs

@@ -2,7 +2,7 @@ import solid from "vite-plugin-solid";
 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, configureIslandCssServer, extractCssImports, fileHasCssImports, needsIslandClientBundle, rebuildIslandCssMap, resolveSpecifier, rewriteCssImportForVirtualModule, watchPagesForRescan } from "void/pages-islands-plugin";
+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]:\//;
 function normalizeWindowsPath(input = "") {
@@ -157,13 +157,7 @@ function islandsPlugin(pagesDir) {
 	const wrapperMeta = /* @__PURE__ */ new Map();
 	let wrapperId = 0;
 	let viteRoot = "";
-	const islandCssMap = /* @__PURE__ */ new Map();
 	let resolvedConfig = null;
-	/** Rebuild islandCssMap from current file contents (re-runs fileHasCssImports). */
-	function rebuildIslandCssMap$1() {
-		if (!pageScan) return;
-		rebuildIslandCssMap(pageScan, pagesDir, islandCssMap, fileHasCssImports);
-	}
 	function computePagesNeedingClientJS$1() {
 		if (!pageScan) return /* @__PURE__ */ new Set();
 		return computePagesNeedingClientJS(pageScan, pagesDir, resolvedConfig);
@@ -177,10 +171,8 @@ function islandsPlugin(pagesDir) {
 			isDev = config.command === "serve";
 		},
 		configureServer(server) {
-			configureIslandCssServer(server, islandCssFiles, viteRoot, rebuildIslandCssMap$1);
 			watchPagesForRescan(server, pagesDir, root, (scan) => {
 				pageScan = scan;
-				rebuildIslandCssMap$1();
 			});
 		},
 		async buildStart() {
@@ -188,17 +180,17 @@ function islandsPlugin(pagesDir) {
 				pageScan = await scanPages(root);
 				const importAttrRe = /import\s+\w+\s+from\s+("[^"]+"|'[^']+')\s+with\s*\{\s*island\s*:\s*("[^"]+"|'[^']+')\s*\}/g;
 				const filesToScan = [
-					...pageScan.pages.map((p) => ({
-						filePath: p.componentPath,
-						island: p.island
+					...pageScan.pages.map((page) => ({
+						filePath: page.componentPath,
+						island: page.island
 					})),
-					...pageScan.layouts.map((l) => ({
-						filePath: l.filePath,
-						island: l.island
+					...pageScan.layouts.map((layout) => ({
+						filePath: layout.filePath,
+						island: layout.island
 					})),
-					...pageScan.namedLayouts.map((nl) => ({
-						filePath: nl.filePath,
-						island: nl.island
+					...pageScan.namedLayouts.map((namedLayout) => ({
+						filePath: namedLayout.filePath,
+						island: namedLayout.island
 					}))
 				];
 				for (const entry of filesToScan) {
@@ -207,10 +199,10 @@ function islandsPlugin(pagesDir) {
 					const code = readFileSync(filePath, "utf-8");
 					const importerDir = dirname(filePath);
 					importAttrRe.lastIndex = 0;
-					let m;
-					while ((m = importAttrRe.exec(code)) !== null) {
-						const spec = m[1].slice(1, -1);
-						const strategy = m[2].slice(1, -1);
+					let importMatch;
+					while ((importMatch = importAttrRe.exec(code)) !== null) {
+						const spec = importMatch[1].slice(1, -1);
+						const strategy = importMatch[2].slice(1, -1);
 						const absPath = resolveSpecifier(spec, importerDir, COMPONENT_EXTENSIONS);
 						if (absPath) {
 							const islandId = normalizePath(relative(root, absPath)).replace(/\.[^.]+$/, "");
@@ -228,7 +220,6 @@ function islandsPlugin(pagesDir) {
 					const layoutChain = resolveEffectiveLayoutChain(page, pageScan.layouts, pageScan.namedLayouts);
 					for (const layout of layoutChain) islandCssFiles.add(normalizePath(resolve(pagesDir, layout.filePath)));
 				}
-				rebuildIslandCssMap$1();
 			}
 		},
 		resolveId: {
@@ -251,10 +242,10 @@ function islandsPlugin(pagesDir) {
 			handler(id) {
 				if (id === "\0" + ISLANDS_RENDERER_ID) {
 					if (!pageScan) return "export function renderIslandPage() { throw new Error('No pages found'); }";
-					const mdPlugin = resolvedConfig?.plugins?.find((p) => p.name === "void-md");
+					const mdPlugin = resolvedConfig?.plugins?.find((plugin) => plugin.name === "void-md");
 					const mdScriptIds = new Set(mdPlugin?.api?.getClientScripts?.()?.keys() ?? []);
 					const needsJS = computePagesNeedingClientJS$1();
-					return generateIslandRenderer(pageScan, pagesDir, isDev, islandCssMap, viteRoot, mdScriptIds, needsJS);
+					return generateIslandRenderer(pageScan, pagesDir, mdScriptIds, needsJS);
 				}
 				if (id === "\0" + ISLANDS_CLIENT_ENTRY_ID) {
 					if (!pageScan) return "";
@@ -329,13 +320,7 @@ export default function _IslandWrap(props) {
 }
 `;
 }
-function generateIslandRenderer(scan, pagesDir, isDev, islandCssMap, viteRoot, mdScriptIds, pagesNeedingClientJS) {
-	let cssMapCode = "";
-	if (isDev && islandCssMap.size > 0) {
-		const cssMapObj = {};
-		for (const [compId, paths] of islandCssMap) cssMapObj[compId] = paths.map((p) => "/" + normalizePath(relative(viteRoot, p)) + ".css");
-		cssMapCode = `const __cssPaths = ${JSON.stringify(cssMapObj)};`;
-	}
+function generateIslandRenderer(scan, pagesDir, mdScriptIds, pagesNeedingClientJS) {
 	const mdScriptIdsCode = `const __mdClientScriptIds = new Set(${JSON.stringify([...mdScriptIds])});`;
 	const needsJSCode = `const __pagesNeedingClientJS = new Set(${JSON.stringify([...pagesNeedingClientJS])});`;
 	return `
@@ -345,7 +330,6 @@ import { SharedContext, ErrorsContext, ParamsContext } from "@void/solid";
 import { renderHeadToString, renderHtmlAttrs, renderBodyAttrs } from "void/pages-head";
 
 ${generateComponentManifest(scan, pagesDir)}
-${cssMapCode}
 ${mdScriptIdsCode}
 ${needsJSCode}
 
@@ -396,7 +380,7 @@ export async function renderIslandPage(pageObj, assetTags) {
 
   return \`<!doctype html>
 <html\${htmlAttrs}>
-<head>\${headHtml}\${typeof __cssPaths !== "undefined" ? (__cssPaths[pageObj.component] || []).map(url => '<link rel="stylesheet" href="' + url + '">').join("\\n") : ""}\${assetTags.css}\${__pagesNeedingClientJS.has(pageObj.component) ? assetTags.preloads : ""}\${__pagesNeedingClientJS.has(pageObj.component) ? generateHydrationScript() : ""}</head>
+<head>\${headHtml}\${assetTags.css}\${__pagesNeedingClientJS.has(pageObj.component) ? assetTags.preloads : ""}\${__pagesNeedingClientJS.has(pageObj.component) ? generateHydrationScript() : ""}</head>
 <body\${bodyAttrs}>
   <div id="app"\${__mdScriptAttr}>\${html}</div>
   \${__pagesNeedingClientJS.has(pageObj.component) ? assetTags.body : ""}
@@ -693,17 +677,24 @@ start();
 }
 //#endregion
 //#region src/plugin.ts
+const SOLID_RUNTIME_PACKAGE = "@void/solid";
+function excludeRuntimeFromOptimizeDeps() {
+	return { exclude: [SOLID_RUNTIME_PACKAGE] };
+}
 function configPlugin() {
 	return {
 		name: "void:solid:config",
 		config() {
 			return {
-				optimizeDeps: { exclude: ["@void/solid"] },
+				optimizeDeps: excludeRuntimeFromOptimizeDeps(),
 				ssr: {
-					noExternal: ["@void/solid"],
-					optimizeDeps: { exclude: ["@void/solid"] }
+					noExternal: [SOLID_RUNTIME_PACKAGE],
+					optimizeDeps: excludeRuntimeFromOptimizeDeps()
 				}
 			};
+		},
+		configEnvironment() {
+			return { optimizeDeps: excludeRuntimeFromOptimizeDeps() };
 		}
 	};
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@void/solid",
-  "version": "0.7.5",
+  "version": "0.7.7",
   "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.5"
+    "void": "0.7.7"
   },
   "peerDependencies": {
     "solid-js": "^1.9.0",
     "vite": "npm:@voidzero-dev/vite-plus-core@0.1.20",
-    "void": "0.7.5"
+    "void": "0.7.7"
   },
   "scripts": {
     "build": "vp pack",

package/src/runtime/link.tsx

@@ -16,7 +16,7 @@ type CommonProps = {
   replace?: boolean;
   reloadDocument?: boolean;
   viewTransition?: boolean;
-  prefetch?: boolean | PrefetchStrategy | Array<PrefetchStrategy>;
+  prefetch?: boolean | PrefetchStrategy | ReadonlyArray<PrefetchStrategy>;
   cacheFor?: number | string | [string, string];
   onNavigate?: (event: NavigateEvent) => void;
   children?: JSX.Element;
@@ -159,7 +159,7 @@ export function Link(props: LinkProps): JSX.Element {
   const normalizedMethod = () => linkState().method;
   const isGet = () => linkState().isGet;
   const hrefWithData = () => linkState().href;
-  const strategies = createMemo<Array<PrefetchStrategy>>(() => {
+  const strategies = createMemo<ReadonlyArray<PrefetchStrategy>>(() => {
     if (local.prefetch === false || local.prefetch === undefined || local.reloadDocument) {
       return [];
     }

package/src/runtime/use-form.ts

@@ -26,8 +26,8 @@ type UntypedForm = {
   put(opts?: FormSubmitOptions): Promise<void>;
   patch(opts?: FormSubmitOptions): Promise<void>;
   delete(opts?: FormSubmitOptions): Promise<void>;
-  reset(...fields: Array<string>): void;
-  clearErrors(...fields: Array<string>): void;
+  reset(...fields: ReadonlyArray<string>): void;
+  clearErrors(...fields: ReadonlyArray<string>): void;
   clearError(): void;
 };
 
@@ -67,8 +67,8 @@ export function useForm<U extends ActionUrl & string>(
   put(opts?: FormSubmitOptions): Promise<void>;
   patch(opts?: FormSubmitOptions): Promise<void>;
   delete(opts?: FormSubmitOptions): Promise<void>;
-  reset(...fields: Array<keyof ResolveActionBody<U> & string>): void;
-  clearErrors(...fields: Array<keyof ResolveActionBody<U> & string>): void;
+  reset(...fields: ReadonlyArray<keyof ResolveActionBody<U> & string>): void;
+  clearErrors(...fields: ReadonlyArray<keyof ResolveActionBody<U> & string>): void;
   clearError(): void;
 };
 
@@ -135,7 +135,7 @@ export function useForm(
     setDataStore(field, value);
   }
 
-  function reset(...fields: Array<string>) {
+  function reset(...fields: ReadonlyArray<string>) {
     if (fields.length === 0) {
       setDataStore(reconcile({ ...defaults_ }));
     } else {
@@ -145,7 +145,7 @@ export function useForm(
     }
   }
 
-  function clearErrors(...fields: Array<string>) {
+  function clearErrors(...fields: ReadonlyArray<string>) {
     if (fields.length === 0) {
       setLocalErrors({});
     } else {

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

@@ -29,7 +29,7 @@ async function readActionErrorBody(response: Response): Promise<unknown> {
   }
 }
 
-export interface IslandFormReturn<T extends Record<string, unknown>> {
+export type IslandFormReturn<T extends Record<string, unknown>> = Readonly<{
   data: T;
   setData: <K extends keyof T & string>(field: K, value: T[K]) => void;
   errors: Record<string, string>;
@@ -38,14 +38,14 @@ export interface IslandFormReturn<T extends Record<string, unknown>> {
   hasChanges: boolean;
   wasSuccessful: boolean;
   recentlySuccessful: boolean;
-  reset: (...fields: Array<keyof T & string>) => void;
-  clearErrors: (...fields: Array<string>) => void;
+  reset: (...fields: ReadonlyArray<keyof T & string>) => void;
+  clearErrors: (...fields: ReadonlyArray<string>) => void;
   clearError: () => void;
   post: (url: string) => Promise<void>;
   put: (url: string) => Promise<void>;
   patch: (url: string) => Promise<void>;
   delete: (url: string) => Promise<void>;
-}
+}>;
 
 /**
  * Form composable for island pages. Uses fetch + page reload instead of the
@@ -70,7 +70,7 @@ export function useIslandForm<T extends Record<string, unknown>>(defaults: T): I
     setDataStore(field, value);
   }
 
-  function reset(...fields: Array<string>) {
+  function reset(...fields: ReadonlyArray<string>) {
     if (fields.length === 0) {
       setDataStore(reconcile({ ...defaults_ }));
     } else {
@@ -80,14 +80,14 @@ export function useIslandForm<T extends Record<string, unknown>>(defaults: T): I
     }
   }
 
-  function clearErrors(...fields: Array<string>) {
+  function clearErrors(...fields: ReadonlyArray<string>) {
     if (fields.length === 0) {
       setErrors({});
     } else {
       setErrors((prev) => {
         const next = { ...prev };
-        for (const f of fields) {
-          delete next[f];
+        for (const field of fields) {
+          delete next[field];
         }
         return next;
       });