@void/react 0.21.1 → 0.21.3

package/dist/{deferred-shell-CBIT2Zwq.mjs → deferred-shell-DOuP2YAo.mjs}

@@ -1,5 +1,6 @@
 //#region src/runtime/deferred-shell.ts
 const DEFERRED_SHELL_END_ID = "__VOID_DEFERRED_SHELL_END__";
 const DEFERRED_SHELL_END_MARKER = `<template id="${DEFERRED_SHELL_END_ID}"></template>`;
+const DEFERRED_SHELL_CANCEL_REASON = "Void deferred shell complete";
 //#endregion
-export { DEFERRED_SHELL_END_MARKER as n, DEFERRED_SHELL_END_ID as t };
+export { DEFERRED_SHELL_END_ID as n, DEFERRED_SHELL_END_MARKER as r, DEFERRED_SHELL_CANCEL_REASON as t };

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,23 +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],
-			specifierRaw,
-			specifier: specifierRaw.slice(1, -1),
-			hydrate: match[3].slice(1, -1)
-		});
-	}
-	return imports;
-}
 function islandsPlugin(pagesDir, options) {
 	let pageScan = null;
 	let isDev = false;
@@ -113,7 +96,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);
@@ -174,10 +157,10 @@ 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;
+				const edits = [];
 				const wrappers = [];
 				let idx = 0;
-				for (const islandImport of findIslandImports(code)) {
+				for (const islandImport of findIslandImports(code, id)) {
 					const name = islandImport.importName;
 					const specRaw = islandImport.specifierRaw;
 					const strategy = islandImport.hydrate;
@@ -194,16 +177,17 @@ function islandsPlugin(pagesDir, options) {
 					}
 					const islandId = absPath ? normalizePath(relative(root, absPath)).replace(/\.[^.]+$/, "") : spec;
 					const replacement = `import ${rawName} from ${specRaw}`;
-					transformed = transformed.replace(islandImport.statement, replacement);
+					edits.push({
+						start: islandImport.start,
+						end: islandImport.end,
+						text: replacement
+					});
 					wrappers.push(`var ${name} = function ${name}(props) { return _React_island.createElement("div", { "data-island": ${JSON.stringify(islandId)}, "data-props": JSON.stringify(props), "data-hydrate": ${JSON.stringify(strategy)} }, _React_island.createElement(${rawName}, props)); };`);
 				}
-				if (wrappers.length > 0) {
-					transformed = `import _React_island from "react";\n` + transformed + "\n" + wrappers.join("\n");
-					return {
-						code: transformed,
-						map: null
-					};
-				}
+				if (wrappers.length > 0) return editIslandSource(code, edits, {
+					prepend: "import _React_island from \"react\";\n",
+					append: "\n" + wrappers.join("\n")
+				});
 			}
 		},
 		config(_, env) {
@@ -292,14 +276,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)}),`);

package/dist/runtime/pages-client.mjs

@@ -1,7 +1,7 @@
 import { a as SharedContext, i as RouterContext, n as NavigationContext, r as ParamsContext, t as ErrorsContext } from "../context-B0GL7p5m.mjs";
 import { n as setActionRouter } from "../action-Bq1iSG6m.mjs";
-import { t as DEFERRED_SHELL_END_ID } from "../deferred-shell-CBIT2Zwq.mjs";
-import React, { Suspense, startTransition, use, useCallback, useEffect, useInsertionEffect, useLayoutEffect, useMemo, useReducer, useRef, useTransition } from "react";
+import { n as DEFERRED_SHELL_END_ID } from "../deferred-shell-DOuP2YAo.mjs";
+import React, { Suspense, startTransition, use, useCallback, useEffect, useInsertionEffect, useLayoutEffect, useMemo, useReducer, useTransition } from "react";
 import { createPageNavigationEngine, createRouterFacade, idleNavigationState, isAbortError, isCallSiteActionError } from "void/pages-client";
 import { createRoot, hydrateRoot } from "react-dom/client";
 //#region src/runtime/pages-client.ts
@@ -174,7 +174,7 @@ function RouteResource({ resource, onCommit }) {
 		const Layout = result.layouts[i];
 		element = React.createElement(Layout, null, element);
 	}
-	return React.createElement(RouterContext.Provider, { value: routeRouter }, React.createElement(ParamsContext.Provider, { value: routeParams }, React.createElement(SharedContext.Provider, { value: pageData.shared }, React.createElement(ErrorsContext.Provider, { value: pageData.errors ?? {} }, element))));
+	return React.createElement(RouterContext.Provider, { value: routeRouter }, React.createElement(ParamsContext.Provider, { value: routeParams }, React.createElement(SharedContext.Provider, { value: pageData.shared ?? {} }, React.createElement(ErrorsContext.Provider, { value: pageData.errors ?? {} }, element))));
 }
 function startViewTransition(resource, reveal, enabled) {
 	if (!enabled || typeof document.startViewTransition !== "function") {
@@ -193,7 +193,6 @@ function startViewTransition(resource, reveal, enabled) {
 }
 function App({ engine, router, viewTransitions, navigationFallback: NavigationFallback }) {
 	const initialPageData = engine.initialPageData;
-	const sharedStateRef = useRef(initialPageData.shared);
 	const initialResource = useMemo(() => ({
 		id: 0,
 		url: initialPageData.url || currentUrl(),
@@ -203,10 +202,7 @@ function App({ engine, router, viewTransitions, navigationFallback: NavigationFa
 		options: {},
 		immediate: false,
 		shell: Promise.resolve({
-			pageData: {
-				...initialPageData,
-				shared: initialPageData.shared
-			},
+			pageData: initialPageData,
 			component: engine.initialComponent,
 			layouts: engine.initialLayouts
 		}),
@@ -222,19 +218,6 @@ function App({ engine, router, viewTransitions, navigationFallback: NavigationFa
 		navigation: idleNavigationState()
 	});
 	const [isTransitionPending, startTransition] = useTransition();
-	const mergeShared = useCallback((result) => {
-		if (!result) return result;
-		sharedStateRef.current = {
-			...sharedStateRef.current,
-			...result.pageData.shared || {}
-		};
-		const shared = sharedStateRef.current;
-		result.pageData = {
-			...result.pageData,
-			shared
-		};
-		return result;
-	}, []);
 	const finishNavigation = useCallback((resource, result) => {
 		if (committedResources.has(resource.id)) return;
 		committedResources.add(resource.id);
@@ -299,7 +282,7 @@ function App({ engine, router, viewTransitions, navigationFallback: NavigationFa
 		});
 		const next = {
 			...prepared,
-			shell: prepared.shell.then(mergeShared).then((result) => {
+			shell: prepared.shell.then((result) => {
 				if (!result) {
 					const resolveViewTransition = viewTransitionWaiters.get(prepared.id);
 					if (resolveViewTransition) {
@@ -394,7 +377,6 @@ function App({ engine, router, viewTransitions, navigationFallback: NavigationFa
 		return pagePromise;
 	}, [
 		engine,
-		mergeShared,
 		NavigationFallback,
 		startTransition,
 		viewTransitions

package/dist/runtime/pages-server.mjs

@@ -1,12 +1,101 @@
 import { a as SharedContext, i as RouterContext, n as NavigationContext, r as ParamsContext, t as ErrorsContext } from "../context-B0GL7p5m.mjs";
-import { n as DEFERRED_SHELL_END_MARKER, t as DEFERRED_SHELL_END_ID } from "../deferred-shell-CBIT2Zwq.mjs";
+import { n as DEFERRED_SHELL_END_ID, r as DEFERRED_SHELL_END_MARKER, t as DEFERRED_SHELL_CANCEL_REASON } from "../deferred-shell-DOuP2YAo.mjs";
 import React from "react";
 import { createSsrRouter, idleNavigationState } from "void/pages-client";
 import { renderToReadableStream } from "react-dom/server";
 import { renderBodyAttrs, renderHeadToString, renderHtmlAttrs } from "void/pages-head";
 import { serializePageData } from "void/pages-server";
+//#region src/runtime/page-streams.ts
+function concatStreams(streams) {
+	let index = 0;
+	let reader;
+	let cancelled = false;
+	const cancelRemaining = async (reason) => {
+		const cancellations = [];
+		if (reader) cancellations.push(reader.cancel(reason));
+		for (let remaining = index + (reader ? 1 : 0); remaining < streams.length; remaining++) cancellations.push(streams[remaining].cancel(reason));
+		await Promise.allSettled(cancellations);
+	};
+	return new ReadableStream({
+		async pull(controller) {
+			try {
+				while (index < streams.length) {
+					reader ??= streams[index].getReader();
+					const { done, value } = await reader.read();
+					if (cancelled) return;
+					if (done) {
+						reader.releaseLock();
+						reader = void 0;
+						index++;
+						continue;
+					}
+					controller.enqueue(value);
+					return;
+				}
+				controller.close();
+			} catch (error) {
+				if (!cancelled) {
+					controller.error(error);
+					await cancelRemaining(error);
+				}
+			}
+		},
+		async cancel(reason) {
+			cancelled = true;
+			await cancelRemaining(reason);
+		}
+	}, { highWaterMark: 0 });
+}
+function readDeferredShell(stream) {
+	const reader = stream.getReader();
+	const decoder = new TextDecoder();
+	const encoder = new TextEncoder();
+	const keepLength = DEFERRED_SHELL_END_MARKER.length - 1;
+	let buffer = "";
+	let cancelled = false;
+	return new ReadableStream({
+		async pull(controller) {
+			try {
+				while (true) {
+					const { done, value } = await reader.read();
+					if (cancelled) return;
+					buffer += done ? decoder.decode() : decoder.decode(value, { stream: true });
+					const markerIndex = buffer.indexOf(DEFERRED_SHELL_END_MARKER);
+					if (markerIndex !== -1) {
+						const shell = buffer.slice(0, markerIndex + DEFERRED_SHELL_END_MARKER.length);
+						await reader.cancel(DEFERRED_SHELL_CANCEL_REASON);
+						if (!cancelled) {
+							controller.enqueue(encoder.encode(shell));
+							controller.close();
+						}
+						return;
+					}
+					if (done) {
+						if (buffer) controller.enqueue(encoder.encode(buffer));
+						controller.close();
+						return;
+					}
+					if (buffer.length > keepLength) {
+						controller.enqueue(encoder.encode(buffer.slice(0, -keepLength)));
+						buffer = buffer.slice(-keepLength);
+						return;
+					}
+				}
+			} catch (error) {
+				if (!cancelled) {
+					controller.error(error);
+					await reader.cancel(error).catch(() => {});
+				}
+			}
+		},
+		async cancel(reason) {
+			cancelled = true;
+			await reader.cancel(reason);
+		}
+	}, { highWaterMark: 0 });
+}
+//#endregion
 //#region src/runtime/pages-server.ts
-const DEFERRED_SHELL_CANCEL_REASON = "Void deferred shell complete";
 function createPendingDeferred() {
 	return new Promise(() => {});
 }
@@ -23,59 +112,6 @@ function textStream(text) {
 		controller.close();
 	} });
 }
-function concatStreams(streams) {
-	return new ReadableStream({ async start(controller) {
-		try {
-			for (const stream of streams) {
-				const reader = stream.getReader();
-				while (true) {
-					const { done, value } = await reader.read();
-					if (done) break;
-					controller.enqueue(value);
-				}
-			}
-			controller.close();
-		} catch (error) {
-			controller.error(error);
-		}
-	} });
-}
-function readDeferredShell(stream) {
-	const encoder = new TextEncoder();
-	return new ReadableStream({ async start(controller) {
-		const reader = stream.getReader();
-		const decoder = new TextDecoder();
-		let buffer = "";
-		const keepLength = DEFERRED_SHELL_END_MARKER.length - 1;
-		const flush = (text) => {
-			if (text) controller.enqueue(encoder.encode(text));
-		};
-		try {
-			while (true) {
-				const { done, value } = await reader.read();
-				if (done) {
-					buffer += decoder.decode();
-					flush(buffer);
-					break;
-				}
-				buffer += decoder.decode(value, { stream: true });
-				const markerIndex = buffer.indexOf(DEFERRED_SHELL_END_MARKER);
-				if (markerIndex !== -1) {
-					flush(buffer.slice(0, markerIndex + DEFERRED_SHELL_END_MARKER.length));
-					await reader.cancel(DEFERRED_SHELL_CANCEL_REASON);
-					break;
-				}
-				if (buffer.length > keepLength) {
-					flush(buffer.slice(0, -keepLength));
-					buffer = buffer.slice(-keepLength);
-				}
-			}
-			controller.close();
-		} catch (error) {
-			controller.error(error);
-		}
-	} });
-}
 async function renderReactPage({ pageObj, assetTags, components, layoutTree, preambleScript = "" }) {
 	const PageComponent = (await components[pageObj.component]()).default;
 	const layoutIds = layoutTree[pageObj.component] || [];
@@ -86,7 +122,7 @@ async function renderReactPage({ pageObj, assetTags, components, layoutTree, pre
 	element = React.createElement(RouterContext.Provider, { value: createSsrRouter(pageObj.url || "/", pageObj.params ?? {}) }, React.createElement(NavigationContext.Provider, { value: idleNavigationState() }, React.createElement(React.Suspense, { fallback: null }, React.createElement(SharedContext.Provider, { value: pageObj.shared || {} }, React.createElement(ParamsContext.Provider, { value: pageObj.params ?? {} }, React.createElement(ErrorsContext.Provider, { value: pageObj.errors || {} }, element))))));
 	const renderElement = pageObj.deferredKeys ? React.createElement(React.Fragment, null, element, React.createElement("template", { id: DEFERRED_SHELL_END_ID })) : element;
 	const appStream = await renderToReadableStream(renderElement, { onError(error) {
-		if (error === DEFERRED_SHELL_CANCEL_REASON) return;
+		if (error === "Void deferred shell complete") return;
 		throw error;
 	} });
 	const renderedAppStream = pageObj.deferredKeys ? readDeferredShell(appStream) : appStream;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@void/react",
-  "version": "0.21.1",
+  "version": "0.21.3",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/voidzero-dev/void.git",
@@ -43,13 +43,13 @@
     "react-dom": "^19.3.0",
     "vite": "npm:@voidzero-dev/vite-plus-core@0.3.1",
     "vite-plus": "0.3.1",
-    "void": "0.21.1"
+    "void": "0.21.3"
   },
   "peerDependencies": {
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
     "vite": "^8.0.0",
-    "void": "0.21.1"
+    "void": "0.21.3"
   },
   "scripts": {
     "build": "vp pack",