@void/solid 0.21.2 → 0.21.3

package/dist/plugin.mjs

@@ -3,7 +3,7 @@ import { generateComponentManifest, resolveEffectiveLayoutChain, resolvePagesDir
 import { existsSync, readFileSync, readdirSync } from "node:fs";
 import nodePath from "node:path";
 import { normalizePath } from "vite";
-import { ISLANDS_CLIENT_ENTRY_ID, ISLANDS_RENDERER_ID, computePagesNeedingClientJS, extractCssImports, needsIslandClientBundle, resolveSpecifier, rewriteCssImportForVirtualModule, watchPagesForRescan } from "void/pages-islands-plugin";
+import { ISLANDS_CLIENT_ENTRY_ID, ISLANDS_RENDERER_ID, computePagesNeedingClientJS, editIslandSource, extractCssImports, 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";
@@ -50,22 +50,6 @@ 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 `vite-plugin-solid` skips `\0`-prefixed modules in its transform
@@ -122,7 +106,7 @@ function islandsPlugin(pagesDir, options) {
 					const filePath = resolve(pagesDir, entry.filePath);
 					const code = readFileSync(filePath, "utf-8");
 					const importerDir = dirname(filePath);
-					for (const islandImport of findIslandImports(code)) {
+					for (const islandImport of findIslandImports(code, filePath)) {
 						const spec = islandImport.specifier;
 						const strategy = islandImport.hydrate;
 						const absPath = resolveSpecifier(spec, importerDir, COMPONENT_EXTENSIONS);
@@ -188,8 +172,8 @@ function islandsPlugin(pagesDir, options) {
 			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 importerDir = dirname(id);
-				let transformed = code;
-				for (const islandImport of findIslandImports(code)) {
+				const edits = [];
+				for (const islandImport of findIslandImports(code, id)) {
 					const name = islandImport.importName;
 					const spec = islandImport.specifier;
 					const strategy = islandImport.hydrate;
@@ -210,12 +194,13 @@ function islandsPlugin(pagesDir, options) {
 						hydrate: strategy
 					});
 					const replacement = `import ${name} from ${JSON.stringify(wrapperUrl)}`;
-					transformed = transformed.replace(islandImport.statement, replacement);
+					edits.push({
+						start: islandImport.start,
+						end: islandImport.end,
+						text: replacement
+					});
 				}
-				if (transformed !== code) return {
-					code: transformed,
-					map: null
-				};
+				if (edits.length > 0) return editIslandSource(code, edits);
 			}
 		},
 		config(_, env) {
@@ -313,14 +298,9 @@ function generateIslandClientEntry(manifest, cssFiles, isDev) {
 	for (const entry of entries) uniqueIslands.set(entry.islandId, entry.componentPath);
 	const lines = [];
 	lines.push("import { initIslands } from \"void/pages-client\";");
-	if (!isDev) {
-		const cssImportRe = /^\s*import\b[^"']*["']([^"']+\.(?:css|scss|sass|less|styl|stylus|pcss|postcss))["']/gm;
-		for (const file of cssFiles) {
-			const content = readFileSync(file, "utf-8");
-			cssImportRe.lastIndex = 0;
-			let match;
-			while ((match = cssImportRe.exec(content)) !== null) lines.push(rewriteCssImportForVirtualModule(match[0], match[1], file));
-		}
+	if (!isDev) for (const file of cssFiles) {
+		const content = readFileSync(file, "utf-8");
+		for (const item of findStaticCssImports(content, file)) lines.push(rewriteCssImportForVirtualModule(item.statement, item.specifier, file));
 	}
 	lines.push("const islands = {");
 	for (const [id, path] of uniqueIslands) lines.push(`  ${JSON.stringify(id)}: () => import(${JSON.stringify(path)}),`);
@@ -519,6 +499,7 @@ export async function renderPage(pageObj, assetTags) {
 function generateClientEntry(scan, pagesDir, viewTransitions, prefetch, staticPageData) {
 	return `
 import { createSignal, createComponent, batch } from "solid-js";
+import { createMutable } from "solid-js/store";
 import { hydrate, render } from "solid-js/web";
 import { SharedContext, ErrorsContext, ParamsContext, RouterContext, NavigationContext, setActionRouter } from "@void/solid";
 import { createRouterFacade, createVoidRouter, idleNavigationState } from "void/pages-client";
@@ -529,12 +510,18 @@ ${generateComponentManifest(scan, pagesDir)}
 const [component, setComponent] = createSignal(null);
 const [pageProps, setPageProps] = createSignal({});
 const [layouts, setLayouts] = createSignal([]);
-const [shared, setShared] = createSignal({});
+const shared = createMutable({});
 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());
 
+// Keep the context object stable for layouts that call useShared() once.
+function replaceShared(next) {
+  for (const key of Object.keys(shared)) delete shared[key];
+  Object.assign(shared, next || {});
+}
+
 const { router, initialPageData, initialComponent, initialLayouts, start } =
   await createVoidRouter({
     adapter: {
@@ -547,7 +534,7 @@ const { router, initialPageData, initialComponent, initialLayouts, start } =
           setPageProps(pageData.props);
           setComponent(() => comp);
           setLayouts(layoutComps);
-          setShared((prev) => ({ ...prev, ...(pageData.shared || {}) }));
+          replaceShared(pageData.shared);
           setErrors(pageData.errors || {});
           setRouteParams(pageData.params || {});
         });
@@ -578,14 +565,14 @@ batch(() => {
   setComponent(() => initialComponent);
   setPageProps(initialPageData.props);
   setLayouts(initialLayouts);
-  setShared(initialPageData.shared || {});
+  replaceShared(initialPageData.shared);
   setErrors(initialPageData.errors || {});
   setRouteParams(initialPageData.params || {});
 });
 
 function App() {
   return createComponent(SharedContext.Provider, {
-    get value() { return shared(); },
+    value: shared,
     get children() {
       return createComponent(ErrorsContext.Provider, {
         value: errors,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@void/solid",
-  "version": "0.21.2",
+  "version": "0.21.3",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/voidzero-dev/void.git",
@@ -33,12 +33,12 @@
     "solid-js": "^1.9.15",
     "vite": "npm:@voidzero-dev/vite-plus-core@0.3.1",
     "vite-plus": "0.3.1",
-    "void": "0.21.2"
+    "void": "0.21.3"
   },
   "peerDependencies": {
     "solid-js": "^1.9.0",
     "vite": "^8.0.0",
-    "void": "0.21.2"
+    "void": "0.21.3"
   },
   "scripts": {
     "build": "vp pack",