rari 0.5.3 → 0.5.5

package/dist/app-routes-CwvIlCCV.mjs

@@ -0,0 +1,3 @@
+import { i as writeManifest, n as generateAppRouteManifest, r as loadManifest, t as AppRouteGenerator } from "./app-routes-BjA_L5R4.mjs";
+
+export { AppRouteGenerator, generateAppRouteManifest, loadManifest, writeManifest };

package/dist/cli.mjs

@@ -1,101 +1,9 @@
 #!/usr/bin/env node
-import { t as __require } from "./chunk-DFPPfDFE.mjs";
-import { existsSync } from "node:fs";
-import { join } from "node:path";
+import { n as getInstallationInstructions, t as getBinaryPath } from "./platform-CcycgWL3.mjs";
 import process from "node:process";
 import { spawn } from "node:child_process";
 import colors from "picocolors";
 
-//#region src/platform.ts
-const SUPPORTED_PLATFORMS = {
-	"linux-x64": "rari-linux-x64",
-	"linux-arm64": "rari-linux-arm64",
-	"darwin-x64": "rari-darwin-x64",
-	"darwin-arm64": "rari-darwin-arm64",
-	"win32-x64": "rari-win32-x64"
-};
-function getPlatformInfo() {
-	const platform = process.platform;
-	const arch = process.arch;
-	let normalizedPlatform;
-	switch (platform) {
-		case "darwin":
-			normalizedPlatform = "darwin";
-			break;
-		case "linux":
-			normalizedPlatform = "linux";
-			break;
-		case "win32":
-			normalizedPlatform = "win32";
-			break;
-		default: throw new Error(`Unsupported platform: ${platform}. Rari supports Linux, macOS, and Windows.`);
-	}
-	let normalizedArch;
-	switch (arch) {
-		case "x64":
-			normalizedArch = "x64";
-			break;
-		case "arm64":
-			normalizedArch = "arm64";
-			break;
-		default: throw new Error(`Unsupported architecture: ${arch}. Rari supports x64 and ARM64.`);
-	}
-	const packageName = SUPPORTED_PLATFORMS[`${normalizedPlatform}-${normalizedArch}`];
-	if (!packageName) throw new Error(`Unsupported platform combination: ${normalizedPlatform}-${normalizedArch}. Supported platforms: ${Object.keys(SUPPORTED_PLATFORMS).join(", ")}`);
-	return {
-		platform: normalizedPlatform,
-		arch: normalizedArch,
-		packageName,
-		binaryName: normalizedPlatform === "win32" ? "rari.exe" : "rari"
-	};
-}
-function getBinaryPath() {
-	const { packageName, binaryName } = getPlatformInfo();
-	try {
-		let currentDir = process.cwd();
-		let workspaceRoot = null;
-		while (currentDir !== "/" && currentDir !== "") {
-			if (existsSync(join(currentDir, "packages"))) {
-				workspaceRoot = currentDir;
-				break;
-			}
-			currentDir = join(currentDir, "..");
-		}
-		if (workspaceRoot) {
-			const binaryPath = join(join(workspaceRoot, "packages", packageName), "bin", binaryName);
-			if (existsSync(binaryPath)) return binaryPath;
-		}
-	} catch {}
-	try {
-		const binaryPath = join(__require.resolve(`${packageName}/package.json`).replace("/package.json", ""), "bin", binaryName);
-		if (existsSync(binaryPath)) return binaryPath;
-		throw new Error(`Binary not found at ${binaryPath}`);
-	} catch {
-		throw new Error(`Failed to locate Rari binary for ${packageName}. Please ensure the platform package is installed: npm install ${packageName}`);
-	}
-}
-function getInstallationInstructions() {
-	const { packageName } = getPlatformInfo();
-	return `
-To install Rari for your platform, run:
-
-  npm install ${packageName}
-
-Or if you're using pnpm:
-
-  pnpm add ${packageName}
-
-Or if you're using yarn:
-
-  yarn add ${packageName}
-
-If you continue to have issues, you can also install from source:
-
-  cargo install --git https://github.com/rari-build/rari
-`;
-}
-
-//#endregion
 //#region src/cli.ts
 const [, , command, ...args] = process.argv;
 function logInfo(message) {
@@ -187,7 +95,7 @@ async function deployToRailway() {
 		logError(`Already running in ${getPlatformName()} environment. Use "rari start" instead.`);
 		process.exit(1);
 	}
-	const { createRailwayDeployment } = await import("./railway-B8SUWVNF.mjs");
+	const { createRailwayDeployment } = await import("./railway-B8VEi9Qi.mjs");
 	await createRailwayDeployment();
 }
 async function deployToRender() {
@@ -196,79 +104,80 @@ async function deployToRender() {
 		logError(`Already running in ${getPlatformName()} environment. Use "rari start" instead.`);
 		process.exit(1);
 	}
-	const { createRenderDeployment } = await import("./render-CnuI67F1.mjs");
+	const { createRenderDeployment } = await import("./render-Dz1orMws.mjs");
 	await createRenderDeployment();
 }
 async function main() {
 	switch (command) {
-		case "start":
-			await startRustServer();
-			break;
-		case "deploy":
-			if (args[0] === "railway") await deployToRailway();
-			else if (args[0] === "render") await deployToRender();
-			else {
-				logError("Unknown deployment target. Available: railway, render");
-				process.exit(1);
-			}
-			break;
+		case void 0:
 		case "help":
 		case "--help":
 		case "-h":
-			console.warn(`${colors.bold}Rari CLI${colors.reset}
+			console.warn(`${colors.bold("Rari CLI")}
 
-${colors.bold}Usage:${colors.reset}
-  ${colors.cyan}rari start${colors.reset}              Start the Rari server
-  ${colors.cyan}rari deploy railway${colors.reset}     Setup Railway deployment
-  ${colors.cyan}rari deploy render${colors.reset}      Setup Render deployment
-  ${colors.cyan}rari help${colors.reset}               Show this help message
+${colors.bold("Usage:")}
+  ${colors.cyan("rari start")}              Start the Rari server
+  ${colors.cyan("rari deploy railway")}     Setup Railway deployment
+  ${colors.cyan("rari deploy render")}      Setup Render deployment
+  ${colors.cyan("rari help")}               Show this help message
 
-${colors.bold}Environment Variables:${colors.reset}
-  ${colors.yellow}PORT${colors.reset}                    Server port (default: 3000)
-  ${colors.yellow}RSC_PORT${colors.reset}               Alternative server port
-  ${colors.yellow}NODE_ENV${colors.reset}               Environment (development/production)
-  ${colors.yellow}RUST_LOG${colors.reset}               Rust logging level (default: info)
+${colors.bold("Environment Variables:")}
+  ${colors.yellow("PORT")}                    Server port (default: 3000)
+  ${colors.yellow("RSC_PORT")}               Alternative server port
+  ${colors.yellow("NODE_ENV")}               Environment (development/production)
+  ${colors.yellow("RUST_LOG")}               Rust logging level (default: info)
 
-${colors.bold}Examples:${colors.reset}
-  ${colors.gray}# Start development server on port 3000${colors.reset}
-  ${colors.cyan}rari start${colors.reset}
+${colors.bold("Examples:")}
+  ${colors.gray("# Start development server on port 3000")}
+  ${colors.cyan("rari start")}
 
-  ${colors.gray}# Start production server on port 8080${colors.reset}
-  ${colors.cyan}PORT=8080 NODE_ENV=production rari start${colors.reset}
+  ${colors.gray("# Start production server on port 8080")}
+  ${colors.cyan("PORT=8080 NODE_ENV=production rari start")}
 
-  ${colors.gray}# Setup Railway deployment${colors.reset}
-  ${colors.cyan}rari deploy railway${colors.reset}
+  ${colors.gray("# Setup Railway deployment")}
+  ${colors.cyan("rari deploy railway")}
 
-  ${colors.gray}# Setup Render deployment${colors.reset}
-  ${colors.cyan}rari deploy render${colors.reset}
+  ${colors.gray("# Setup Render deployment")}
+  ${colors.cyan("rari deploy render")}
 
-  ${colors.gray}# Start with debug logging${colors.reset}
-  ${colors.cyan}RUST_LOG=debug rari start${colors.reset}
+  ${colors.gray("# Start with debug logging")}
+  ${colors.cyan("RUST_LOG=debug rari start")}
 
-${colors.bold}Deployment:${colors.reset}
-  ${colors.cyan}rari deploy railway${colors.reset}     Creates Railway deployment files
-  ${colors.cyan}rari deploy render${colors.reset}      Creates Render deployment files
+${colors.bold("Deployment:")}
+  ${colors.cyan("rari deploy railway")}     Creates Railway deployment files
+  ${colors.cyan("rari deploy render")}      Creates Render deployment files
 
   Platform deployment automatically detects the environment and configures:
   - Host binding (0.0.0.0 for platforms, 127.0.0.1 for local)
   - Port from platform's PORT environment variable
   - Production mode optimization
 
-${colors.bold}Binary Resolution:${colors.reset}
+${colors.bold("Binary Resolution:")}
   1. Platform-specific package (rari-{platform}-{arch})
   2. Global binary in PATH
   3. Install from source with Cargo
 
-${colors.bold}Notes:${colors.reset}
+${colors.bold("Notes:")}
   - Platform binary is automatically detected and used
   - Platform deployment is automatically detected and configured
   - Use Ctrl+C to stop the server gracefully
 
 `);
 			break;
+		case "start":
+			await startRustServer();
+			break;
+		case "deploy":
+			if (args[0] === "railway") await deployToRailway();
+			else if (args[0] === "render") await deployToRender();
+			else {
+				logError("Unknown deployment target. Available: railway, render");
+				process.exit(1);
+			}
+			break;
 		default:
-			console.error(`${colors.bold}Unknown command:${colors.reset} ${command}`);
-			console.warn(`Run "${colors.cyan}rari help${colors.reset}" for available commands`);
+			console.error(`${colors.bold("Unknown command:")} ${command}`);
+			console.warn(`Run "${colors.cyan("rari help")}" for available commands`);
 			process.exit(1);
 	}
 }
@@ -279,4 +188,4 @@ main().catch((error) => {
 });
 
 //#endregion
-export { getInstallationInstructions as n, getBinaryPath as t };
+export {  };

package/dist/client.d.mts

@@ -1,2 +1,2 @@
-import { $ as RouteSegment, A as NavigationErrorType, B as AppRouteManifest, C as extractStaticParams, D as NavigationError, E as NavigationErrorOverlayProps, F as LayoutManager, G as GenerateStaticParams, H as ErrorEntry, I as LayoutErrorBoundary, J as LoadingEntry, K as LayoutEntry, L as ClientRouter, M as fetchWithTimeout, N as LayoutDiff, O as NavigationErrorHandler, P as LayoutInstance, Q as PageProps, R as ClientRouterProps, S as extractServerPropsWithCache, T as NavigationErrorOverlay, U as ErrorProps, V as AppRouteMatch, W as GenerateMetadata, X as NotFoundEntry, Y as LoadingProps, Z as NotFoundProps, _ as StaticParamsResult, a as LoadingSpinner, b as extractMetadata, c as createErrorBoundary, d as PreservedState, et as RouteSegmentType, f as ScrollPosition, g as ServerPropsResult, h as MetadataResult, i as HttpRuntimeClient, j as createNavigationError, k as NavigationErrorHandlerOptions, l as createHttpRuntimeClient, m as StatePreserverConfig, n as DefaultLoading, o as NotFound, p as StatePreserver, q as LayoutProps, r as ErrorBoundary, s as RuntimeClient, t as DefaultError, u as createLoadingBoundary, v as clearPropsCache, w as hasServerSideDataFetching, x as extractServerProps, y as clearPropsCacheForComponent, z as AppRouteEntry } from "./runtime-client-DrRcA8ca.mjs";
+import { $ as RouteSegment, A as NavigationErrorType, B as AppRouteManifest, C as extractStaticParams, D as NavigationError, E as NavigationErrorOverlayProps, F as LayoutManager, G as GenerateStaticParams, H as ErrorEntry, I as LayoutErrorBoundary, J as LoadingEntry, K as LayoutEntry, L as ClientRouter, M as fetchWithTimeout, N as LayoutDiff, O as NavigationErrorHandler, P as LayoutInstance, Q as PageProps, R as ClientRouterProps, S as extractServerPropsWithCache, T as NavigationErrorOverlay, U as ErrorProps, V as AppRouteMatch, W as GenerateMetadata, X as NotFoundEntry, Y as LoadingProps, Z as NotFoundProps, _ as StaticParamsResult, a as LoadingSpinner, b as extractMetadata, c as createErrorBoundary, d as PreservedState, et as RouteSegmentType, f as ScrollPosition, g as ServerPropsResult, h as MetadataResult, i as HttpRuntimeClient, j as createNavigationError, k as NavigationErrorHandlerOptions, l as createHttpRuntimeClient, m as StatePreserverConfig, n as DefaultLoading, o as NotFound, p as StatePreserver, q as LayoutProps, r as ErrorBoundary, s as RuntimeClient, t as DefaultError, u as createLoadingBoundary, v as clearPropsCache, w as hasServerSideDataFetching, x as extractServerProps, y as clearPropsCacheForComponent, z as AppRouteEntry } from "./runtime-client-BwT0A6kC.mjs";
 export { type AppRouteEntry, type AppRouteManifest, type AppRouteMatch, ClientRouter, type ClientRouterProps, DefaultError, DefaultLoading, ErrorBoundary, type ErrorEntry, type ErrorProps, type GenerateMetadata, type GenerateStaticParams, HttpRuntimeClient, type LayoutDiff, type LayoutEntry, LayoutErrorBoundary, type LayoutInstance, LayoutManager, type LayoutProps, type LoadingEntry, type LoadingProps, LoadingSpinner, type MetadataResult, type NavigationError, NavigationErrorHandler, type NavigationErrorHandlerOptions, NavigationErrorOverlay, type NavigationErrorOverlayProps, type NavigationErrorType, NotFound, type NotFoundEntry, type NotFoundProps, type PageProps, type PreservedState, type RouteSegment, type RouteSegmentType, type RuntimeClient, type ScrollPosition, type ServerPropsResult, StatePreserver, type StatePreserverConfig, type StaticParamsResult, clearPropsCache, clearPropsCacheForComponent, createErrorBoundary, createHttpRuntimeClient, createLoadingBoundary, createNavigationError, extractMetadata, extractServerProps, extractServerPropsWithCache, extractStaticParams, fetchWithTimeout, hasServerSideDataFetching };

package/dist/client.mjs

@@ -1,3 +1,3 @@
-import { C as fetchWithTimeout, S as createNavigationError, _ as LayoutErrorBoundary, a as LoadingSpinner, b as NavigationErrorOverlay, c as createHttpRuntimeClient, d as clearPropsCacheForComponent, f as extractMetadata, g as hasServerSideDataFetching, h as extractStaticParams, i as HttpRuntimeClient, l as createLoadingBoundary, m as extractServerPropsWithCache, n as DefaultLoading, o as NotFound, p as extractServerProps, r as ErrorBoundary, s as createErrorBoundary, t as DefaultError, u as clearPropsCache, v as ClientRouter, w as LayoutManager, x as NavigationErrorHandler, y as StatePreserver } from "./runtime-client-BWSSyzPt.mjs";
+import { C as fetchWithTimeout, S as createNavigationError, _ as LayoutErrorBoundary, a as LoadingSpinner, b as NavigationErrorOverlay, c as createHttpRuntimeClient, d as clearPropsCacheForComponent, f as extractMetadata, g as hasServerSideDataFetching, h as extractStaticParams, i as HttpRuntimeClient, l as createLoadingBoundary, m as extractServerPropsWithCache, n as DefaultLoading, o as NotFound, p as extractServerProps, r as ErrorBoundary, s as createErrorBoundary, t as DefaultError, u as clearPropsCache, v as ClientRouter, w as LayoutManager, x as NavigationErrorHandler, y as StatePreserver } from "./runtime-client-B3FN-k1i.mjs";
 
 export { ClientRouter, DefaultError, DefaultLoading, ErrorBoundary, HttpRuntimeClient, LayoutErrorBoundary, LayoutManager, LoadingSpinner, NavigationErrorHandler, NavigationErrorOverlay, NotFound, StatePreserver, clearPropsCache, clearPropsCacheForComponent, createErrorBoundary, createHttpRuntimeClient, createLoadingBoundary, createNavigationError, extractMetadata, extractServerProps, extractServerPropsWithCache, extractStaticParams, fetchWithTimeout, hasServerSideDataFetching };

package/dist/index.d.mts

@@ -1,3 +1,3 @@
-import { $ as RouteSegment, B as AppRouteManifest, C as extractStaticParams, G as GenerateStaticParams, H as ErrorEntry, J as LoadingEntry, K as LayoutEntry, Q as PageProps, S as extractServerPropsWithCache, U as ErrorProps, V as AppRouteMatch, W as GenerateMetadata, X as NotFoundEntry, Y as LoadingProps, Z as NotFoundProps, _ as StaticParamsResult, b as extractMetadata, et as RouteSegmentType, g as ServerPropsResult, h as MetadataResult, i as HttpRuntimeClient, l as createHttpRuntimeClient, q as LayoutProps, s as RuntimeClient, v as clearPropsCache, w as hasServerSideDataFetching, x as extractServerProps, y as clearPropsCacheForComponent, z as AppRouteEntry } from "./runtime-client-DrRcA8ca.mjs";
-import { a as rari, c as generateAppRouteManifest, d as headers, f as ApiRouteHandlers, h as RouteHandler, i as defineRariOptions, l as loadManifest, m as RouteContext, n as Response, o as rariRouter, p as RariResponse, r as defineRariConfig, s as AppRouteGenerator, t as Request, u as writeManifest } from "./vite-CEX_9o-t.mjs";
+import { $ as RouteSegment, B as AppRouteManifest, C as extractStaticParams, G as GenerateStaticParams, H as ErrorEntry, J as LoadingEntry, K as LayoutEntry, Q as PageProps, S as extractServerPropsWithCache, U as ErrorProps, V as AppRouteMatch, W as GenerateMetadata, X as NotFoundEntry, Y as LoadingProps, Z as NotFoundProps, _ as StaticParamsResult, b as extractMetadata, et as RouteSegmentType, g as ServerPropsResult, h as MetadataResult, i as HttpRuntimeClient, l as createHttpRuntimeClient, q as LayoutProps, s as RuntimeClient, v as clearPropsCache, w as hasServerSideDataFetching, x as extractServerProps, y as clearPropsCacheForComponent, z as AppRouteEntry } from "./runtime-client-BwT0A6kC.mjs";
+import { a as rari, c as generateAppRouteManifest, d as headers, f as ApiRouteHandlers, h as RouteHandler, i as defineRariOptions, l as loadManifest, m as RouteContext, n as Response, o as rariRouter, p as RariResponse, r as defineRariConfig, s as AppRouteGenerator, t as Request, u as writeManifest } from "./vite-qZf0Yyd1.mjs";
 export { ApiRouteHandlers, AppRouteEntry, AppRouteGenerator, AppRouteManifest, AppRouteMatch, ErrorEntry, ErrorProps, GenerateMetadata, GenerateStaticParams, HttpRuntimeClient, LayoutEntry, LayoutProps, LoadingEntry, LoadingProps, MetadataResult, NotFoundEntry, NotFoundProps, PageProps, RariResponse, Request, Response, RouteContext, RouteHandler, RouteSegment, RouteSegmentType, RuntimeClient, ServerPropsResult, StaticParamsResult, clearPropsCache, clearPropsCacheForComponent, createHttpRuntimeClient, defineRariConfig, defineRariOptions, extractMetadata, extractServerProps, extractServerPropsWithCache, extractStaticParams, generateAppRouteManifest, hasServerSideDataFetching, headers, loadManifest, rari, rariRouter, writeManifest };

package/dist/index.mjs

@@ -1,7 +1,7 @@
-import { a as headers, i as rariRouter, n as defineRariOptions, o as RariResponse, r as rari, t as defineRariConfig } from "./vite-2nVNlWc7.mjs";
-import { i as writeManifest, n as generateAppRouteManifest, r as loadManifest, t as AppRouteGenerator } from "./app-routes-DpO5Hf-o.mjs";
-import { c as createHttpRuntimeClient, d as clearPropsCacheForComponent, f as extractMetadata, g as hasServerSideDataFetching, h as extractStaticParams, i as HttpRuntimeClient, m as extractServerPropsWithCache, p as extractServerProps, u as clearPropsCache } from "./runtime-client-BWSSyzPt.mjs";
-import "./loading-component-map-DR9_TT5T.mjs";
-import "./server-build-DXITrV8k.mjs";
+import { a as headers, i as rariRouter, n as defineRariOptions, o as RariResponse, r as rari, t as defineRariConfig } from "./vite-CNKYWQs-.mjs";
+import { i as writeManifest, n as generateAppRouteManifest, r as loadManifest, t as AppRouteGenerator } from "./app-routes-BjA_L5R4.mjs";
+import { c as createHttpRuntimeClient, d as clearPropsCacheForComponent, f as extractMetadata, g as hasServerSideDataFetching, h as extractStaticParams, i as HttpRuntimeClient, m as extractServerPropsWithCache, p as extractServerProps, u as clearPropsCache } from "./runtime-client-B3FN-k1i.mjs";
+import "./loading-component-map-UZ-MQYv0.mjs";
+import "./server-build-BVvKXTME.mjs";
 
 export { AppRouteGenerator, HttpRuntimeClient, RariResponse, clearPropsCache, clearPropsCacheForComponent, createHttpRuntimeClient, defineRariConfig, defineRariOptions, extractMetadata, extractServerProps, extractServerPropsWithCache, extractStaticParams, generateAppRouteManifest, hasServerSideDataFetching, headers, loadManifest, rari, rariRouter, writeManifest };

package/dist/{loading-component-map-Dda5WP1L.mjs → loading-component-map-Db2B5rLX.mjs}

@@ -1,3 +1,3 @@
-import { n as getLoadingComponentMapPath, t as generateLoadingComponentMap } from "./loading-component-map-DR9_TT5T.mjs";
+import { n as getLoadingComponentMapPath, t as generateLoadingComponentMap } from "./loading-component-map-UZ-MQYv0.mjs";
 
 export { generateLoadingComponentMap, getLoadingComponentMapPath };

package/dist/platform-Bkxq5JBQ.mjs

@@ -0,0 +1,3 @@
+import { n as getInstallationInstructions, t as getBinaryPath } from "./platform-CcycgWL3.mjs";
+
+export { getBinaryPath, getInstallationInstructions };

package/dist/platform-CcycgWL3.mjs

@@ -0,0 +1,96 @@
+import { t as __require } from "./chunk-DLSkYcPk.mjs";
+import { existsSync } from "node:fs";
+import { join } from "node:path";
+import process from "node:process";
+
+//#region src/platform.ts
+const SUPPORTED_PLATFORMS = {
+	"linux-x64": "rari-linux-x64",
+	"linux-arm64": "rari-linux-arm64",
+	"darwin-x64": "rari-darwin-x64",
+	"darwin-arm64": "rari-darwin-arm64",
+	"win32-x64": "rari-win32-x64"
+};
+function getPlatformInfo() {
+	const platform = process.platform;
+	const arch = process.arch;
+	let normalizedPlatform;
+	switch (platform) {
+		case "darwin":
+			normalizedPlatform = "darwin";
+			break;
+		case "linux":
+			normalizedPlatform = "linux";
+			break;
+		case "win32":
+			normalizedPlatform = "win32";
+			break;
+		default: throw new Error(`Unsupported platform: ${platform}. Rari supports Linux, macOS, and Windows.`);
+	}
+	let normalizedArch;
+	switch (arch) {
+		case "x64":
+			normalizedArch = "x64";
+			break;
+		case "arm64":
+			normalizedArch = "arm64";
+			break;
+		default: throw new Error(`Unsupported architecture: ${arch}. Rari supports x64 and ARM64.`);
+	}
+	const packageName = SUPPORTED_PLATFORMS[`${normalizedPlatform}-${normalizedArch}`];
+	if (!packageName) throw new Error(`Unsupported platform combination: ${normalizedPlatform}-${normalizedArch}. Supported platforms: ${Object.keys(SUPPORTED_PLATFORMS).join(", ")}`);
+	return {
+		platform: normalizedPlatform,
+		arch: normalizedArch,
+		packageName,
+		binaryName: normalizedPlatform === "win32" ? "rari.exe" : "rari"
+	};
+}
+function getBinaryPath() {
+	const { packageName, binaryName } = getPlatformInfo();
+	try {
+		let currentDir = process.cwd();
+		let workspaceRoot = null;
+		while (currentDir !== "/" && currentDir !== "") {
+			if (existsSync(join(currentDir, "packages"))) {
+				workspaceRoot = currentDir;
+				break;
+			}
+			currentDir = join(currentDir, "..");
+		}
+		if (workspaceRoot) {
+			const binaryPath = join(join(workspaceRoot, "packages", packageName), "bin", binaryName);
+			if (existsSync(binaryPath)) return binaryPath;
+		}
+	} catch {}
+	try {
+		const binaryPath = join(__require.resolve(`${packageName}/package.json`).replace("/package.json", ""), "bin", binaryName);
+		if (existsSync(binaryPath)) return binaryPath;
+		throw new Error(`Binary not found at ${binaryPath}`);
+	} catch {
+		throw new Error(`Failed to locate Rari binary for ${packageName}. Please ensure the platform package is installed: npm install ${packageName}`);
+	}
+}
+function getInstallationInstructions() {
+	const { packageName } = getPlatformInfo();
+	return `
+To install Rari for your platform, run:
+
+  npm install ${packageName}
+
+Or if you're using pnpm:
+
+  pnpm add ${packageName}
+
+Or if you're using yarn:
+
+  yarn add ${packageName}
+
+If you continue to have issues, you can also install from source:
+
+  cargo install --git https://github.com/rari-build/rari
+`;
+}
+
+//#endregion
+export { getInstallationInstructions as n, getBinaryPath as t };

package/dist/server-build-C5LYunyo.mjs

@@ -0,0 +1,3 @@
+import { n as createServerBuildPlugin, r as scanDirectory, t as ServerComponentBuilder } from "./server-build-BVvKXTME.mjs";
+
+export { ServerComponentBuilder, createServerBuildPlugin, scanDirectory };

package/dist/{vite-2nVNlWc7.mjs → vite-CNKYWQs-.mjs}

@@ -1,5 +1,5 @@
-import { t as __require } from "./chunk-DFPPfDFE.mjs";
-import { n as createServerBuildPlugin } from "./server-build-DXITrV8k.mjs";
+import { t as __require } from "./chunk-DLSkYcPk.mjs";
+import { n as createServerBuildPlugin } from "./server-build-BVvKXTME.mjs";
 import fs, { promises } from "node:fs";
 import path, { join, relative, resolve, sep } from "node:path";
 import process$1 from "node:process";
@@ -986,7 +986,6 @@ var NodeFsHandler = class {
 
 //#endregion
 //#region ../../node_modules/.pnpm/chokidar@4.0.3/node_modules/chokidar/esm/index.js
-/*! chokidar - MIT License (c) 2012 Paul Miller (paulmillr.com) */
 const SLASH = "/";
 const SLASH_SLASH = "//";
 const ONE_DOT = ".";
@@ -1745,13 +1744,13 @@ function rariRouter(options = {}) {
 				console.warn("[Manifest] Route structure unchanged, using cached manifest");
 				return cachedManifestContent;
 			}
-			const { generateAppRouteManifest: generateAppRouteManifest$1 } = await import("./app-routes-CUB8L75K.mjs");
+			const { generateAppRouteManifest: generateAppRouteManifest$1 } = await import("./app-routes-CwvIlCCV.mjs");
 			const manifest = await generateAppRouteManifest$1(appDir, { extensions: opts.extensions });
 			const manifestContent = JSON.stringify(manifest, null, 2);
 			const outDir = path.resolve(root, opts.outDir);
 			await promises.mkdir(outDir, { recursive: true });
 			await promises.writeFile(path.join(outDir, "app-routes.json"), manifestContent, "utf-8");
-			const { generateLoadingComponentMap, getLoadingComponentMapPath } = await import("./loading-component-map-Dda5WP1L.mjs");
+			const { generateLoadingComponentMap, getLoadingComponentMapPath } = await import("./loading-component-map-Db2B5rLX.mjs");
 			const loadingMapCode = generateLoadingComponentMap({
 				appDir: opts.appDir,
 				loadingComponents: manifest.loading
@@ -1882,7 +1881,7 @@ function rariRouter(options = {}) {
 				});
 				try {
 					const manifest = JSON.parse(cachedManifestContent);
-					const { generateLoadingComponentMap } = await import("./loading-component-map-Dda5WP1L.mjs");
+					const { generateLoadingComponentMap } = await import("./loading-component-map-Db2B5rLX.mjs");
 					const loadingMapCode = generateLoadingComponentMap({
 						appDir: opts.appDir,
 						loadingComponents: manifest.loading
@@ -2667,7 +2666,7 @@ const ${componentName$1} = registerClientReference(
 				let serverComponentBuilder = null;
 				const discoverAndRegisterComponents = async () => {
 					try {
-						const { ServerComponentBuilder, scanDirectory } = await import("./server-build-BGFb0d6Z.mjs");
+						const { ServerComponentBuilder, scanDirectory } = await import("./server-build-C5LYunyo.mjs");
 						const builder = new ServerComponentBuilder(projectRoot, {
 							outDir: "dist",
 							serverDir: "server",
@@ -2752,7 +2751,7 @@ const ${componentName$1} = registerClientReference(
 				};
 				const startRustServer = async () => {
 					if (rustServerProcess) return;
-					const { getBinaryPath, getInstallationInstructions } = await import("./platform-Bv9HDvl_.mjs");
+					const { getBinaryPath, getInstallationInstructions } = await import("./platform-Bkxq5JBQ.mjs");
 					let binaryPath;
 					try {
 						binaryPath = getBinaryPath();
@@ -2828,7 +2827,7 @@ const ${componentName$1} = registerClientReference(
 				const handleServerComponentHMR = async (filePath) => {
 					try {
 						if (!isServerComponent(filePath)) return;
-						const { ServerComponentBuilder } = await import("./server-build-BGFb0d6Z.mjs");
+						const { ServerComponentBuilder } = await import("./server-build-C5LYunyo.mjs");
 						const builder = new ServerComponentBuilder(projectRoot, {
 							outDir: "dist",
 							serverDir: "server",

package/dist/{vite-CEX_9o-t.d.mts → vite-qZf0Yyd1.d.mts}

@@ -1,4 +1,4 @@
-import { B as AppRouteManifest, K as LayoutEntry } from "./runtime-client-DrRcA8ca.mjs";
+import { B as AppRouteManifest, K as LayoutEntry } from "./runtime-client-BwT0A6kC.mjs";
 import React from "react";
 import { Plugin, UserConfig } from "rolldown-vite";
 

package/dist/vite.d.mts

@@ -1,3 +1,3 @@
-import { $ as RouteSegment, B as AppRouteManifest, C as extractStaticParams, G as GenerateStaticParams, H as ErrorEntry, J as LoadingEntry, K as LayoutEntry, Q as PageProps, S as extractServerPropsWithCache, U as ErrorProps, V as AppRouteMatch, W as GenerateMetadata, X as NotFoundEntry, Y as LoadingProps, Z as NotFoundProps, _ as StaticParamsResult, b as extractMetadata, et as RouteSegmentType, g as ServerPropsResult, h as MetadataResult, i as HttpRuntimeClient, l as createHttpRuntimeClient, q as LayoutProps, s as RuntimeClient, v as clearPropsCache, w as hasServerSideDataFetching, x as extractServerProps, y as clearPropsCacheForComponent, z as AppRouteEntry } from "./runtime-client-DrRcA8ca.mjs";
-import { a as rari, c as generateAppRouteManifest, d as headers, f as ApiRouteHandlers, h as RouteHandler, i as defineRariOptions, l as loadManifest, m as RouteContext, n as Response, o as rariRouter, p as RariResponse, r as defineRariConfig, s as AppRouteGenerator, t as Request, u as writeManifest } from "./vite-CEX_9o-t.mjs";
+import { $ as RouteSegment, B as AppRouteManifest, C as extractStaticParams, G as GenerateStaticParams, H as ErrorEntry, J as LoadingEntry, K as LayoutEntry, Q as PageProps, S as extractServerPropsWithCache, U as ErrorProps, V as AppRouteMatch, W as GenerateMetadata, X as NotFoundEntry, Y as LoadingProps, Z as NotFoundProps, _ as StaticParamsResult, b as extractMetadata, et as RouteSegmentType, g as ServerPropsResult, h as MetadataResult, i as HttpRuntimeClient, l as createHttpRuntimeClient, q as LayoutProps, s as RuntimeClient, v as clearPropsCache, w as hasServerSideDataFetching, x as extractServerProps, y as clearPropsCacheForComponent, z as AppRouteEntry } from "./runtime-client-BwT0A6kC.mjs";
+import { a as rari, c as generateAppRouteManifest, d as headers, f as ApiRouteHandlers, h as RouteHandler, i as defineRariOptions, l as loadManifest, m as RouteContext, n as Response, o as rariRouter, p as RariResponse, r as defineRariConfig, s as AppRouteGenerator, t as Request, u as writeManifest } from "./vite-qZf0Yyd1.mjs";
 export { ApiRouteHandlers, AppRouteEntry, AppRouteGenerator, AppRouteManifest, AppRouteMatch, ErrorEntry, ErrorProps, GenerateMetadata, GenerateStaticParams, HttpRuntimeClient, LayoutEntry, LayoutProps, LoadingEntry, LoadingProps, MetadataResult, NotFoundEntry, NotFoundProps, PageProps, RariResponse, Request, Response, RouteContext, RouteHandler, RouteSegment, RouteSegmentType, RuntimeClient, ServerPropsResult, StaticParamsResult, clearPropsCache, clearPropsCacheForComponent, createHttpRuntimeClient, defineRariConfig, defineRariOptions, extractMetadata, extractServerProps, extractServerPropsWithCache, extractStaticParams, generateAppRouteManifest, hasServerSideDataFetching, headers, loadManifest, rari, rariRouter, writeManifest };

package/dist/vite.mjs

@@ -1,7 +1,7 @@
-import { a as headers, i as rariRouter, n as defineRariOptions, o as RariResponse, r as rari, t as defineRariConfig } from "./vite-2nVNlWc7.mjs";
-import { i as writeManifest, n as generateAppRouteManifest, r as loadManifest, t as AppRouteGenerator } from "./app-routes-DpO5Hf-o.mjs";
-import { c as createHttpRuntimeClient, d as clearPropsCacheForComponent, f as extractMetadata, g as hasServerSideDataFetching, h as extractStaticParams, i as HttpRuntimeClient, m as extractServerPropsWithCache, p as extractServerProps, u as clearPropsCache } from "./runtime-client-BWSSyzPt.mjs";
-import "./loading-component-map-DR9_TT5T.mjs";
-import "./server-build-DXITrV8k.mjs";
+import { a as headers, i as rariRouter, n as defineRariOptions, o as RariResponse, r as rari, t as defineRariConfig } from "./vite-CNKYWQs-.mjs";
+import { i as writeManifest, n as generateAppRouteManifest, r as loadManifest, t as AppRouteGenerator } from "./app-routes-BjA_L5R4.mjs";
+import { c as createHttpRuntimeClient, d as clearPropsCacheForComponent, f as extractMetadata, g as hasServerSideDataFetching, h as extractStaticParams, i as HttpRuntimeClient, m as extractServerPropsWithCache, p as extractServerProps, u as clearPropsCache } from "./runtime-client-B3FN-k1i.mjs";
+import "./loading-component-map-UZ-MQYv0.mjs";
+import "./server-build-BVvKXTME.mjs";
 
 export { AppRouteGenerator, HttpRuntimeClient, RariResponse, clearPropsCache, clearPropsCacheForComponent, createHttpRuntimeClient, defineRariConfig, defineRariOptions, extractMetadata, extractServerProps, extractServerPropsWithCache, extractStaticParams, generateAppRouteManifest, hasServerSideDataFetching, headers, loadManifest, rari, rariRouter, writeManifest };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "rari",
   "type": "module",
-  "version": "0.5.3",
+  "version": "0.5.5",
   "description": "Runtime Accelerated Rendering Infrastructure (Rari)",
   "author": "Ryan Skinner",
   "license": "MIT",
@@ -89,11 +89,11 @@
     "picocolors": "^1.1.1"
   },
   "optionalDependencies": {
-    "rari-darwin-arm64": "0.5.0",
-    "rari-darwin-x64": "0.5.0",
-    "rari-linux-arm64": "0.5.0",
-    "rari-linux-x64": "0.5.0",
-    "rari-win32-x64": "0.5.0"
+    "rari-darwin-arm64": "0.5.1",
+    "rari-darwin-x64": "0.5.1",
+    "rari-linux-arm64": "0.5.1",
+    "rari-linux-x64": "0.5.1",
+    "rari-win32-x64": "0.5.1"
   },
   "devDependencies": {
     "@types/node": "^24.10.1",

package/src/cli.ts

@@ -150,71 +150,55 @@ async function deployToRender() {
 
 async function main() {
   switch (command) {
-    case 'start':
-      await startRustServer()
-      break
-
-    case 'deploy':
-      if (args[0] === 'railway') {
-        await deployToRailway()
-      }
-      else if (args[0] === 'render') {
-        await deployToRender()
-      }
-      else {
-        logError('Unknown deployment target. Available: railway, render')
-        process.exit(1)
-      }
-      break
-
+    case undefined:
     case 'help':
     case '--help':
     case '-h':
-      console.warn(`${colors.bold}Rari CLI${colors.reset}
+      console.warn(`${colors.bold('Rari CLI')}
 
-${colors.bold}Usage:${colors.reset}
-  ${colors.cyan}rari start${colors.reset}              Start the Rari server
-  ${colors.cyan}rari deploy railway${colors.reset}     Setup Railway deployment
-  ${colors.cyan}rari deploy render${colors.reset}      Setup Render deployment
-  ${colors.cyan}rari help${colors.reset}               Show this help message
+${colors.bold('Usage:')}
+  ${colors.cyan('rari start')}              Start the Rari server
+  ${colors.cyan('rari deploy railway')}     Setup Railway deployment
+  ${colors.cyan('rari deploy render')}      Setup Render deployment
+  ${colors.cyan('rari help')}               Show this help message
 
-${colors.bold}Environment Variables:${colors.reset}
-  ${colors.yellow}PORT${colors.reset}                    Server port (default: 3000)
-  ${colors.yellow}RSC_PORT${colors.reset}               Alternative server port
-  ${colors.yellow}NODE_ENV${colors.reset}               Environment (development/production)
-  ${colors.yellow}RUST_LOG${colors.reset}               Rust logging level (default: info)
+${colors.bold('Environment Variables:')}
+  ${colors.yellow('PORT')}                    Server port (default: 3000)
+  ${colors.yellow('RSC_PORT')}               Alternative server port
+  ${colors.yellow('NODE_ENV')}               Environment (development/production)
+  ${colors.yellow('RUST_LOG')}               Rust logging level (default: info)
 
-${colors.bold}Examples:${colors.reset}
-  ${colors.gray}# Start development server on port 3000${colors.reset}
-  ${colors.cyan}rari start${colors.reset}
+${colors.bold('Examples:')}
+  ${colors.gray('# Start development server on port 3000')}
+  ${colors.cyan('rari start')}
 
-  ${colors.gray}# Start production server on port 8080${colors.reset}
-  ${colors.cyan}PORT=8080 NODE_ENV=production rari start${colors.reset}
+  ${colors.gray('# Start production server on port 8080')}
+  ${colors.cyan('PORT=8080 NODE_ENV=production rari start')}
 
-  ${colors.gray}# Setup Railway deployment${colors.reset}
-  ${colors.cyan}rari deploy railway${colors.reset}
+  ${colors.gray('# Setup Railway deployment')}
+  ${colors.cyan('rari deploy railway')}
 
-  ${colors.gray}# Setup Render deployment${colors.reset}
-  ${colors.cyan}rari deploy render${colors.reset}
+  ${colors.gray('# Setup Render deployment')}
+  ${colors.cyan('rari deploy render')}
 
-  ${colors.gray}# Start with debug logging${colors.reset}
-  ${colors.cyan}RUST_LOG=debug rari start${colors.reset}
+  ${colors.gray('# Start with debug logging')}
+  ${colors.cyan('RUST_LOG=debug rari start')}
 
-${colors.bold}Deployment:${colors.reset}
-  ${colors.cyan}rari deploy railway${colors.reset}     Creates Railway deployment files
-  ${colors.cyan}rari deploy render${colors.reset}      Creates Render deployment files
+${colors.bold('Deployment:')}
+  ${colors.cyan('rari deploy railway')}     Creates Railway deployment files
+  ${colors.cyan('rari deploy render')}      Creates Render deployment files
 
   Platform deployment automatically detects the environment and configures:
   - Host binding (0.0.0.0 for platforms, 127.0.0.1 for local)
   - Port from platform's PORT environment variable
   - Production mode optimization
 
-${colors.bold}Binary Resolution:${colors.reset}
+${colors.bold('Binary Resolution:')}
   1. Platform-specific package (rari-{platform}-{arch})
   2. Global binary in PATH
   3. Install from source with Cargo
 
-${colors.bold}Notes:${colors.reset}
+${colors.bold('Notes:')}
   - Platform binary is automatically detected and used
   - Platform deployment is automatically detected and configured
   - Use Ctrl+C to stop the server gracefully
@@ -222,9 +206,26 @@ ${colors.bold}Notes:${colors.reset}
 `)
       break
 
+    case 'start':
+      await startRustServer()
+      break
+
+    case 'deploy':
+      if (args[0] === 'railway') {
+        await deployToRailway()
+      }
+      else if (args[0] === 'render') {
+        await deployToRender()
+      }
+      else {
+        logError('Unknown deployment target. Available: railway, render')
+        process.exit(1)
+      }
+      break
+
     default:
-      console.error(`${colors.bold}Unknown command:${colors.reset} ${command}`)
-      console.warn(`Run "${colors.cyan}rari help${colors.reset}" for available commands`)
+      console.error(`${colors.bold('Unknown command:')} ${command}`)
+      console.warn(`Run "${colors.cyan('rari help')}" for available commands`)
       process.exit(1)
   }
 }

package/src/runtime/AppRouterProvider.tsx

@@ -53,7 +53,6 @@ export function AppRouterProvider({ children, initialPayload, onNavigate }: AppR
   })
 
   const loadingRegistryRef = useRef<LoadingComponentRegistry>(new LoadingComponentRegistry())
-  const layoutInstancesRef = useRef<Map<string, React.ReactElement>>(new Map())
   const pendingFetchesRef = useRef<Map<string, Promise<any>>>(new Map())
   const failureHistoryRef = useRef<HMRFailure[]>([])
   const lastSuccessfulPayloadRef = useRef<string | null>(null)
@@ -183,35 +182,37 @@ export function AppRouterProvider({ children, initialPayload, onNavigate }: AppR
 
     if (Array.isArray(rsc)) {
       if (rsc.length >= 4 && rsc[0] === '$') {
-        const [, type, key, props] = rsc
+        const [, type, serverKey, props] = rsc
 
         if (typeof type === 'string' && type.startsWith('$L')) {
           const moduleInfo = modules.get(type)
-          if (moduleInfo) {
-            const Component = (globalThis as any).__clientComponents?.[moduleInfo.id]?.component
-            if (Component) {
-              const isLayout = moduleInfo.id.includes('layout')
-              const stableKey = isLayout ? `layout-${moduleInfo.id}` : key
-
-              const childProps = {
-                ...props,
-                children: props.children ? rscToReact(props.children, modules, isLayout ? moduleInfo.id : layoutPath) : undefined,
-              }
 
-              const element = React.createElement(Component, { key: stableKey, ...childProps })
+          if (!moduleInfo) {
+            console.warn('[AppRouterProvider] Module info not found for type:', type, '- skipping component')
+            return null
+          }
 
-              if (isLayout) {
-                layoutInstancesRef.current.set(stableKey, true as any)
-              }
+          const Component = (globalThis as any).__clientComponents?.[moduleInfo.id]?.component
 
-              return element
-            }
+          if (!Component) {
+            console.warn('[AppRouterProvider] Component not loaded for module:', moduleInfo.id, '- skipping component')
+            return null
           }
-          return null
+
+          const effectiveKey = serverKey || `fallback-${Math.random()}`
+
+          const childProps = {
+            ...props,
+            children: props.children ? rscToReact(props.children, modules, layoutPath) : undefined,
+          }
+
+          const element = React.createElement(Component, { key: effectiveKey, ...childProps })
+
+          return element
         }
 
         const processedProps = processProps(props, modules, layoutPath)
-        return React.createElement(type, key ? { ...processedProps, key } : processedProps)
+        return React.createElement(type, serverKey ? { ...processedProps, key: serverKey } : processedProps)
       }
       return rsc.map(child => rscToReact(child, modules, layoutPath))
     }
@@ -420,20 +421,6 @@ export function AppRouterProvider({ children, initialPayload, onNavigate }: AppR
           throw error
         }
 
-        if (layoutDiff && layoutDiff.unmountLayouts.length > 0) {
-          layoutDiff.unmountLayouts.forEach((layout) => {
-            const keysToRemove: string[] = []
-            layoutInstancesRef.current.forEach((_, key) => {
-              if (key.includes(layout.path)) {
-                keysToRemove.push(key)
-              }
-            })
-            keysToRemove.forEach((key) => {
-              layoutInstancesRef.current.delete(key)
-            })
-          })
-        }
-
         setRscPayload(parsedPayload)
 
         lastSuccessfulPayloadRef.current = rscWireFormat

package/dist/app-routes-CUB8L75K.mjs

@@ -1,3 +0,0 @@
-import { i as writeManifest, n as generateAppRouteManifest, r as loadManifest, t as AppRouteGenerator } from "./app-routes-DpO5Hf-o.mjs";
-
-export { generateAppRouteManifest };

package/dist/platform-Bv9HDvl_.mjs

@@ -1,3 +0,0 @@
-import { n as getInstallationInstructions, t as getBinaryPath } from "./cli.mjs";
-
-export { getBinaryPath, getInstallationInstructions };

package/dist/server-build-BGFb0d6Z.mjs

@@ -1,3 +0,0 @@
-import { n as createServerBuildPlugin, r as scanDirectory, t as ServerComponentBuilder } from "./server-build-DXITrV8k.mjs";
-
-export { ServerComponentBuilder, scanDirectory };