@void/solid 0.7.4 → 0.7.6

package/README.md

@@ -34,6 +34,7 @@ Main runtime APIs live at `@void/solid`:
 
 - `Link`
 - `useRouter()`
+- `useParams()`
 - `useNavigation()`
 - `useShared()`
 - `useForm()`

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() {
@@ -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: {
@@ -254,7 +245,7 @@ function islandsPlugin(pagesDir) {
 					const mdPlugin = resolvedConfig?.plugins?.find((p) => p.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,23 +320,16 @@ 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 `
 import { renderToStringAsync, generateHydrationScript } from "solid-js/web";
 import { createComponent } from "solid-js";
-import { SharedContext, ErrorsContext } from "@void/solid";
+import { SharedContext, ErrorsContext, ParamsContext } from "@void/solid";
 import { renderHeadToString, renderHtmlAttrs, renderBodyAttrs } from "void/pages-head";
 
 ${generateComponentManifest(scan, pagesDir)}
-${cssMapCode}
 ${mdScriptIdsCode}
 ${needsJSCode}
 
@@ -367,15 +351,20 @@ export async function renderIslandPage(pageObj, assetTags) {
         return createComponent(ErrorsContext.Provider, {
           value: pageObj.errors || {},
           get children() {
-            // Build layout chain inside providers so contexts are available.
-            // No RouterContext — islands have no Void Router.
-            let element = createComponent(PageComponent, pageObj.props);
-            for (let i = layoutComponents.length - 1; i >= 0; i--) {
-              const Layout = layoutComponents[i];
-              const child = element;
-              element = createComponent(Layout, { get children() { return child; } });
-            }
-            return element;
+            return createComponent(ParamsContext.Provider, {
+              value: pageObj.params || {},
+              get children() {
+                // Build layout chain inside providers so contexts are available.
+                // No RouterContext — islands have no Void Router.
+                let element = createComponent(PageComponent, pageObj.props);
+                for (let i = layoutComponents.length - 1; i >= 0; i--) {
+                  const Layout = layoutComponents[i];
+                  const child = element;
+                  element = createComponent(Layout, { get children() { return child; } });
+                }
+                return element;
+              }
+            });
           }
         });
       }
@@ -391,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 : ""}
@@ -504,7 +493,7 @@ function generateRendererModule(scan, pagesDir) {
 	return `
 import { renderToStringAsync, generateHydrationScript } from "solid-js/web";
 import { createComponent } from "solid-js";
-import { SharedContext, ErrorsContext, RouterContext, NavigationContext } from "@void/solid";
+import { SharedContext, ErrorsContext, ParamsContext, RouterContext, NavigationContext } from "@void/solid";
 import { createSsrRouter, idleNavigationState } from "void/pages-client";
 import { renderHeadToString, renderHtmlAttrs, renderBodyAttrs } from "void/pages-head";
 import { serializePageData } from "void/pages-server";
@@ -526,19 +515,24 @@ export async function renderPage(pageObj, assetTags) {
           value: pageObj.errors || {},
           get children() {
             return createComponent(RouterContext.Provider, {
-              value: createSsrRouter(pageObj.url || "/"),
+              value: createSsrRouter(pageObj.url || "/", pageObj.params || {}),
               get children() {
                 return createComponent(NavigationContext.Provider, {
                   value: () => idleNavigationState(),
                   get children() {
-                    // Build layout chain inside providers so contexts are available
-                    let element = createComponent(PageComponent, pageObj.props);
-                    for (let i = layoutComponents.length - 1; i >= 0; i--) {
-                      const Layout = layoutComponents[i];
-                      const child = element;
-                      element = createComponent(Layout, { get children() { return child; } });
-                    }
-                    return element;
+                    return createComponent(ParamsContext.Provider, {
+                      value: pageObj.params || {},
+                      get children() {
+                        // Build layout chain inside providers so contexts are available
+                        let element = createComponent(PageComponent, pageObj.props);
+                        for (let i = layoutComponents.length - 1; i >= 0; i--) {
+                          const Layout = layoutComponents[i];
+                          const child = element;
+                          element = createComponent(Layout, { get children() { return child; } });
+                        }
+                        return element;
+                      }
+                    });
                   }
                 });
               }
@@ -573,7 +567,7 @@ function generateClientEntry(scan, pagesDir, viewTransitions, prefetch, staticPa
 	return `
 import { createSignal, createComponent, batch } from "solid-js";
 import { hydrate } from "solid-js/web";
-import { SharedContext, ErrorsContext, RouterContext, NavigationContext, setActionRouter } from "@void/solid";
+import { SharedContext, ErrorsContext, ParamsContext, RouterContext, NavigationContext, setActionRouter } from "@void/solid";
 import { createRouterFacade, createVoidRouter, idleNavigationState } from "void/pages-client";
 import { parseCacheFor } from "void/pages-prefetch";
 
@@ -585,6 +579,7 @@ const [layouts, setLayouts] = createSignal([]);
 const [shared, setShared] = createSignal({});
 const [errors, setErrors] = createSignal({});
 const [routeUrl, setRouteUrl] = createSignal(window.location.pathname + window.location.search + window.location.hash);
+const [routeParams, setRouteParams] = createSignal({});
 const [navigation, setNavigation] = createSignal(idleNavigationState());
 
 const { router, initialPageData, initialComponent, initialLayouts, start } =
@@ -601,6 +596,7 @@ const { router, initialPageData, initialComponent, initialLayouts, start } =
           setLayouts(layoutComps);
           setShared((prev) => ({ ...prev, ...(pageData.shared || {}) }));
           setErrors(pageData.errors || {});
+          setRouteParams(pageData.params || {});
         });
       },
       onDeferredUpdate(props) {
@@ -621,7 +617,7 @@ const { router, initialPageData, initialComponent, initialLayouts, start } =
     },
   });
 
-const reactiveRouter = createRouterFacade(router, () => routeUrl());
+const reactiveRouter = createRouterFacade(router, () => routeUrl(), () => routeParams());
 
 setActionRouter(reactiveRouter);
 
@@ -631,6 +627,7 @@ batch(() => {
   setLayouts(initialLayouts);
   setShared(initialPageData.shared || {});
   setErrors(initialPageData.errors || {});
+  setRouteParams(initialPageData.params || {});
 });
 
 function App() {
@@ -643,19 +640,24 @@ function App() {
           return createComponent(RouterContext.Provider, {
             value: reactiveRouter,
             get children() {
-              return createComponent(NavigationContext.Provider, {
-                value: navigation,
+              return createComponent(ParamsContext.Provider, {
+                get value() { return routeParams(); },
                 get children() {
-                  const Comp = component();
-                  if (!Comp) return null;
-                  let element = createComponent(Comp, pageProps());
-                  const layoutList = layouts();
-                  for (let i = layoutList.length - 1; i >= 0; i--) {
-                    const Layout = layoutList[i];
-                    const child = element;
-                    element = createComponent(Layout, { get children() { return child; } });
-                  }
-                  return element;
+                  return createComponent(NavigationContext.Provider, {
+                    value: navigation,
+                    get children() {
+                      const Comp = component();
+                      if (!Comp) return null;
+                      let element = createComponent(Comp, pageProps());
+                      const layoutList = layouts();
+                      for (let i = layoutList.length - 1; i >= 0; i--) {
+                        const Layout = layoutList[i];
+                        const child = element;
+                        element = createComponent(Layout, { get children() { return child; } });
+                      }
+                      return element;
+                    }
+                  });
                 }
               });
             }

package/package.json

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

package/src/runtime/context.ts

@@ -8,6 +8,10 @@ export const SharedContext: Context<Record<string, unknown> | null> = createCont
 export const ErrorsContext: Context<
   Record<string, string> | (() => Record<string, string>) | null
 > = createContext<Record<string, string> | (() => Record<string, string>) | null>(null);
+export const ParamsContext: Context<Record<string, string> | null> = createContext<Record<
+  string,
+  string
+> | null>(null);
 export const RouterContext: Context<VoidRouter | null> = createContext<VoidRouter | null>(null);
 export const NavigationContext: Context<(() => NavigationState) | null> = createContext<
   (() => NavigationState) | null

package/src/runtime/index.ts

@@ -1,9 +1,16 @@
 export { Link, type LinkProps } from './link.tsx';
 export { useRouter } from './use-router.ts';
+export { useParams } from './use-params.ts';
 export { useShared } from './use-shared.ts';
 export { useForm } from './use-form.ts';
 export { useNavigation } from './use-navigation.ts';
 export { useIslandForm } from './use-island-form.ts';
 export { action, setActionRouter } from './action.ts';
-export { SharedContext, ErrorsContext, RouterContext, NavigationContext } from './context.ts';
+export {
+  SharedContext,
+  ErrorsContext,
+  ParamsContext,
+  RouterContext,
+  NavigationContext,
+} from './context.ts';
 export type { DeferredState as Deferred, InferProps } from 'void';

package/src/runtime/use-params.ts

@@ -0,0 +1,10 @@
+import { useContext } from 'solid-js';
+import { ParamsContext } from './context.ts';
+
+export function useParams<T extends Record<string, string> = Record<string, string>>(): T {
+  const params = useContext(ParamsContext);
+  if (params === null) {
+    throw new Error('useParams(): must be used inside a Void page.');
+  }
+  return params as T;
+}