rari 0.2.6 → 0.2.8

package/dist/client.d.ts

@@ -1,2 +1,2 @@
-import { ErrorBoundaryProps, FileRouteInfo, HttpRuntimeClient, LayoutProps, Link, LinkProps, LoadingProps, Navigate, NavigationOptions, NavigationState, Outlet, PageComponent, PageProps, Route, RouteComponent, RouteGenerationOptions, RouteMatch, RouteMeta, RouteParams, RouterConfig, RouterContext, RouterProvider, RouterProviderProps, Routes, RuntimeClient, SearchParams, buildSearchString, buildUrl, createHttpRuntimeClient, extractParamNames, findMatchingRoute, isDynamicRoute, isPathActive, joinPaths, normalizePathname, parseSearchParams, parseUrl, useNavigation, useParams, usePathname, useRoute, useRouter, useSearchParams, withRouter } from "./runtime-client-P4vvSVPV.js";
+import { ErrorBoundaryProps, FileRouteInfo, HttpRuntimeClient, LayoutProps, Link, LinkProps, LoadingProps, Navigate, NavigationOptions, NavigationState, Outlet, PageComponent, PageProps, Route, RouteComponent, RouteGenerationOptions, RouteMatch, RouteMeta, RouteParams, RouterConfig, RouterContext, RouterProvider, RouterProviderProps, Routes, RuntimeClient, SearchParams, buildSearchString, buildUrl, createHttpRuntimeClient, extractParamNames, findMatchingRoute, isDynamicRoute, isPathActive, joinPaths, normalizePathname, parseSearchParams, parseUrl, useNavigation, useParams, usePathname, useRoute, useRouter, useSearchParams, withRouter } from "./runtime-client-BEWMJWMx.js";
 export { type ErrorBoundaryProps, type FileRouteInfo, HttpRuntimeClient, type LayoutProps, Link, type LinkProps, type LoadingProps, Navigate, type NavigationOptions, type NavigationState, Outlet, type PageComponent, type PageProps, RouteComponent as Route, type RouteGenerationOptions, type RouteMatch, type RouteMeta, type RouteParams, type Route as RouteType, type RouterConfig, type RouterContext, RouterProvider, type RouterProviderProps, Routes, type RuntimeClient, type SearchParams, buildSearchString, buildUrl, createHttpRuntimeClient, extractParamNames, findMatchingRoute, isDynamicRoute, isPathActive, joinPaths, normalizePathname, parseSearchParams, parseUrl, useNavigation, useParams, usePathname, useRoute, useRouter, useSearchParams, withRouter };

package/dist/client.js

@@ -1,3 +1,3 @@
-import { HttpRuntimeClient, Link, Navigate, Outlet, RouteComponent, Routes, buildSearchString, buildUrl, createHttpRuntimeClient, extractParamNames, findMatchingRoute, isDynamicRoute, isPathActive, joinPaths, normalizePathname, parseSearchParams, parseUrl, router_default, useNavigation, useParams, usePathname, useRoute, useRouter, useSearchParams, withRouter } from "./runtime-client-CcEhh-F7.js";
+import { HttpRuntimeClient, Link, Navigate, Outlet, RouteComponent, Routes, buildSearchString, buildUrl, createHttpRuntimeClient, extractParamNames, findMatchingRoute, isDynamicRoute, isPathActive, joinPaths, normalizePathname, parseSearchParams, parseUrl, router_default, useNavigation, useParams, usePathname, useRoute, useRouter, useSearchParams, withRouter } from "./runtime-client-CC4YQweh.js";
 
 export { HttpRuntimeClient, Link, Navigate, Outlet, RouteComponent as Route, router_default as RouterProvider, Routes, buildSearchString, buildUrl, createHttpRuntimeClient, extractParamNames, findMatchingRoute, isDynamicRoute, isPathActive, joinPaths, normalizePathname, parseSearchParams, parseUrl, useNavigation, useParams, usePathname, useRoute, useRouter, useSearchParams, withRouter };

package/dist/index.d.ts

@@ -1,3 +1,3 @@
-import { ErrorBoundaryProps, FileRouteInfo, HttpRuntimeClient, LayoutProps, Link, LinkProps, LoadingProps, Navigate, NavigationOptions, NavigationState, Outlet, PageComponent, PageProps, Route, RouteComponent, RouteGenerationOptions, RouteMatch, RouteMeta, RouteParams, RouterConfig, RouterContext, RouterProvider, RouterProviderProps, Routes, RuntimeClient, SearchParams, buildSearchString, buildUrl, createHttpRuntimeClient, extractParamNames, findMatchingRoute, getRoutePriority, isDynamicRoute, isPathActive, joinPaths, normalizePathname, parseSearchParams, parseUrl, useNavigation, useParams, usePathname, useRoute, useRouter, useSearchParams, withRouter } from "./runtime-client-P4vvSVPV.js";
-import { FileRouteGenerator, convertFilePatternToRoutePattern, createReactDOMOptimization, createRouteManifest, defineRariConfig, generateFileRoutes, loadRouteManifest, rari, rariRouter, validateRoutes, watchFileRoutes } from "./server-Ph4oyo0B.js";
-export { ErrorBoundaryProps, FileRouteGenerator, FileRouteInfo, HttpRuntimeClient, LayoutProps, Link, LinkProps, LoadingProps, Navigate, NavigationOptions, NavigationState, Outlet, PageComponent, PageProps, RouteComponent as Route, RouteGenerationOptions, RouteMatch, RouteMeta, RouteParams, Route as RouteType, RouterConfig, RouterContext, RouterProvider, RouterProviderProps, Routes, RuntimeClient, SearchParams, buildSearchString, buildUrl, convertFilePatternToRoutePattern, createHttpRuntimeClient, createReactDOMOptimization, createRouteManifest, defineRariConfig, extractParamNames, findMatchingRoute, generateFileRoutes, getRoutePriority, isDynamicRoute, isPathActive, joinPaths, loadRouteManifest, normalizePathname, parseSearchParams, parseUrl, rari, rariRouter, useNavigation, useParams, usePathname, useRoute, useRouter, useSearchParams, validateRoutes, watchFileRoutes, withRouter };
+import { ErrorBoundaryProps, FileRouteInfo, HttpRuntimeClient, LayoutProps, Link, LinkProps, LoadingProps, Navigate, NavigationOptions, NavigationState, Outlet, PageComponent, PageProps, Route, RouteComponent, RouteGenerationOptions, RouteMatch, RouteMeta, RouteParams, RouterConfig, RouterContext, RouterProvider, RouterProviderProps, Routes, RuntimeClient, SearchParams, buildSearchString, buildUrl, createHttpRuntimeClient, extractParamNames, findMatchingRoute, getRoutePriority, isDynamicRoute, isPathActive, joinPaths, normalizePathname, parseSearchParams, parseUrl, useNavigation, useParams, usePathname, useRoute, useRouter, useSearchParams, withRouter } from "./runtime-client-BEWMJWMx.js";
+import { FileRouteGenerator, convertFilePatternToRoutePattern, createRouteManifest, defineRariConfig, generateFileRoutes, loadRouteManifest, rari, rariRouter, validateRoutes, watchFileRoutes } from "./server-MY0-nRif.js";
+export { ErrorBoundaryProps, FileRouteGenerator, FileRouteInfo, HttpRuntimeClient, LayoutProps, Link, LinkProps, LoadingProps, Navigate, NavigationOptions, NavigationState, Outlet, PageComponent, PageProps, RouteComponent as Route, RouteGenerationOptions, RouteMatch, RouteMeta, RouteParams, Route as RouteType, RouterConfig, RouterContext, RouterProvider, RouterProviderProps, Routes, RuntimeClient, SearchParams, buildSearchString, buildUrl, convertFilePatternToRoutePattern, createHttpRuntimeClient, createRouteManifest, defineRariConfig, extractParamNames, findMatchingRoute, generateFileRoutes, getRoutePriority, isDynamicRoute, isPathActive, joinPaths, loadRouteManifest, normalizePathname, parseSearchParams, parseUrl, rari, rariRouter, useNavigation, useParams, usePathname, useRoute, useRouter, useSearchParams, validateRoutes, watchFileRoutes, withRouter };

package/dist/index.js

@@ -1,5 +1,5 @@
-import { HttpRuntimeClient, Link, Navigate, Outlet, RouteComponent, Routes, buildSearchString, buildUrl, createHttpRuntimeClient, extractParamNames, findMatchingRoute, getRoutePriority, isDynamicRoute, isPathActive, joinPaths, normalizePathname, parseSearchParams, parseUrl, router_default, useNavigation, useParams, usePathname, useRoute, useRouter, useSearchParams, withRouter } from "./runtime-client-CcEhh-F7.js";
-import { FileRouteGenerator, convertFilePatternToRoutePattern, createReactDOMOptimization, createRouteManifest, defineRariConfig, generateFileRoutes, loadRouteManifest, rari, rariRouter, validateRoutes, watchFileRoutes } from "./server-MkYb94pQ.js";
+import { HttpRuntimeClient, Link, Navigate, Outlet, RouteComponent, Routes, buildSearchString, buildUrl, createHttpRuntimeClient, extractParamNames, findMatchingRoute, getRoutePriority, isDynamicRoute, isPathActive, joinPaths, normalizePathname, parseSearchParams, parseUrl, router_default, useNavigation, useParams, usePathname, useRoute, useRouter, useSearchParams, withRouter } from "./runtime-client-CC4YQweh.js";
+import { FileRouteGenerator, convertFilePatternToRoutePattern, createRouteManifest, defineRariConfig, generateFileRoutes, loadRouteManifest, rari, rariRouter, validateRoutes, watchFileRoutes } from "./server-DeSCwqZZ.js";
 import "./server-build-DaBgiV55.js";
 
-export { FileRouteGenerator, HttpRuntimeClient, Link, Navigate, Outlet, RouteComponent as Route, router_default as RouterProvider, Routes, buildSearchString, buildUrl, convertFilePatternToRoutePattern, createHttpRuntimeClient, createReactDOMOptimization, createRouteManifest, defineRariConfig, extractParamNames, findMatchingRoute, generateFileRoutes, getRoutePriority, isDynamicRoute, isPathActive, joinPaths, loadRouteManifest, normalizePathname, parseSearchParams, parseUrl, rari, rariRouter, useNavigation, useParams, usePathname, useRoute, useRouter, useSearchParams, validateRoutes, watchFileRoutes, withRouter };
+export { FileRouteGenerator, HttpRuntimeClient, Link, Navigate, Outlet, RouteComponent as Route, router_default as RouterProvider, Routes, buildSearchString, buildUrl, convertFilePatternToRoutePattern, createHttpRuntimeClient, createRouteManifest, defineRariConfig, extractParamNames, findMatchingRoute, generateFileRoutes, getRoutePriority, isDynamicRoute, isPathActive, joinPaths, loadRouteManifest, normalizePathname, parseSearchParams, parseUrl, rari, rariRouter, useNavigation, useParams, usePathname, useRoute, useRouter, useSearchParams, validateRoutes, watchFileRoutes, withRouter };

package/dist/{runtime-client-P4vvSVPV.d.ts → runtime-client-BEWMJWMx.d.ts}

@@ -72,7 +72,6 @@ interface RouterContext {
   replace: (path: string, options?: Omit<NavigationOptions, 'replace'>) => void;
   isActive: (path: string, exact?: boolean) => boolean;
   config: RouterConfig;
-  isReady: boolean;
 }
 interface NavigationState {
   isNavigating: boolean;

package/dist/{runtime-client-CcEhh-F7.js → runtime-client-CC4YQweh.js}

@@ -228,7 +228,8 @@ function RouterProvider({ config = DEFAULT_CONFIG, routes = DEFAULT_ROUTES, chil
 		caseSensitive: false,
 		...config
 	}), [config]);
-	const resolveRoute = useCallback((url) => {
+	const [currentRoute, setCurrentRoute] = useState(null);
+	const updateCurrentRoute = useCallback((url) => {
 		const { pathname, search, hash, searchParams } = parseUrl(url);
 		const normalizedPathname = normalizePathname(pathname);
 		const match = findMatchingRoute(normalizedPathname, routes);
@@ -240,43 +241,15 @@ function RouterProvider({ config = DEFAULT_CONFIG, routes = DEFAULT_ROUTES, chil
 				hash
 			};
 			enhancedMatch.childMatch = findDeepestChildMatch(enhancedMatch, normalizedPathname);
-			return enhancedMatch;
-		}
-		return null;
+			setCurrentRoute(enhancedMatch);
+		} else setCurrentRoute(null);
 	}, [routes]);
-	const [routerState, setRouterState] = useState(() => {
-		if (typeof window === "undefined") return {
-			currentRoute: null,
-			isReady: false
-		};
-		const url = mergedConfig.useHash ? window.location.hash.slice(1) || "/" : window.location.pathname + window.location.search + window.location.hash;
-		let initialRoute;
-		try {
-			initialRoute = resolveRoute(url);
-		} catch (error) {
-			console.error("Error resolving initial route:", error);
-			initialRoute = null;
-		}
-		const isReady$1 = true;
-		return {
-			currentRoute: initialRoute,
-			isReady: isReady$1
-		};
-	});
-	const currentRoute = routerState.currentRoute;
-	const isReady = routerState.isReady;
-	const updateCurrentRoute = useCallback((url) => {
-		const route = resolveRoute(url);
-		setRouterState({
-			currentRoute: route,
-			isReady: true
-		});
-	}, [resolveRoute]);
 	useEffect(() => {
 		const handleLocationChange = () => {
 			const url = mergedConfig.useHash ? window.location.hash.slice(1) || "/" : window.location.pathname + window.location.search + window.location.hash;
 			updateCurrentRoute(url);
 		};
+		handleLocationChange();
 		const handlePopState = () => {
 			handleLocationChange();
 		};
@@ -326,19 +299,16 @@ function RouterProvider({ config = DEFAULT_CONFIG, routes = DEFAULT_ROUTES, chil
 		if (!currentRoute) return false;
 		return isPathActive(currentRoute.pathname, path, exact);
 	}, [currentRoute]);
-	const contextValue = useMemo(() => {
-		return {
-			currentRoute,
-			routes,
-			navigate,
-			back,
-			forward,
-			replace,
-			isActive,
-			config: mergedConfig,
-			isReady
-		};
-	}, [
+	const contextValue = useMemo(() => ({
+		currentRoute,
+		routes,
+		navigate,
+		back,
+		forward,
+		replace,
+		isActive,
+		config: mergedConfig
+	}), [
 		currentRoute,
 		routes,
 		navigate,
@@ -346,8 +316,7 @@ function RouterProvider({ config = DEFAULT_CONFIG, routes = DEFAULT_ROUTES, chil
 		forward,
 		replace,
 		isActive,
-		mergedConfig,
-		isReady
+		mergedConfig
 	]);
 	return /* @__PURE__ */ jsx(RouterContext, {
 		value: contextValue,
@@ -387,7 +356,8 @@ function useParams() {
 	return currentRoute?.params || {};
 }
 function useSearchParams() {
-	const { currentRoute, navigate } = useRouter();
+	const { currentRoute } = useRouter();
+	const { navigate } = useRouter();
 	const searchParams = currentRoute?.searchParams || {};
 	const setSearchParams = useCallback((params, options = DEFAULT_CONFIG) => {
 		const newParams = typeof params === "function" ? params(searchParams) : params;

package/dist/{server-MkYb94pQ.js → server-DeSCwqZZ.js}

@@ -1,12 +1,11 @@
 import { __commonJS, __require, __toESM } from "./chunk-BLXvPPr8.js";
-import { analyzeFilePath } from "./runtime-client-CcEhh-F7.js";
+import { analyzeFilePath } from "./runtime-client-CC4YQweh.js";
 import { createServerBuildPlugin } from "./server-build-DaBgiV55.js";
 import fs, { promises } from "node:fs";
 import path from "node:path";
 import process$1 from "node:process";
 import { spawn } from "node:child_process";
 import * as acorn from "acorn";
-import { minify } from "rollup-plugin-esbuild";
 
 //#region ../../node_modules/.pnpm/picomatch@2.3.1/node_modules/picomatch/lib/constants.js
 var require_constants$2 = __commonJS({ "../../node_modules/.pnpm/picomatch@2.3.1/node_modules/picomatch/lib/constants.js"(exports, module) {
@@ -5743,6 +5742,7 @@ function rari(options = {}) {
 		}
 		newCode += `
 
+// HMR acceptance for server components
 if (import.meta.hot) {
   import.meta.hot.accept(() => {
     // Server component updated, no need to reload
@@ -5832,14 +5832,6 @@ if (import.meta.hot) {
 			const existingDedupe = Array.isArray(config.resolve.dedupe) ? config.resolve.dedupe : [];
 			const toAdd = ["react", "react-dom"];
 			config.resolve.dedupe = Array.from(new Set([...existingDedupe || [], ...toAdd]));
-			const existingResolveAlias = config.resolve.alias || {};
-			config.resolve.alias = {
-				...existingResolveAlias,
-				"react-dom/server": "react-dom/server.browser",
-				"react-dom$": "react-dom/client",
-				"react-dom/cjs/react-dom.production.min.js": "react-dom/client",
-				"react-dom/cjs/react-dom.development.js": "react-dom/client"
-			};
 			const existingAlias = Array.isArray(config.resolve.alias) ? config.resolve.alias : [];
 			const aliasFinds = new Set(existingAlias.map((a) => String(a.find)));
 			try {
@@ -5888,17 +5880,13 @@ if (import.meta.hot) {
 			config.optimizeDeps = config.optimizeDeps || {};
 			config.optimizeDeps.include = config.optimizeDeps.include || [];
 			if (!config.optimizeDeps.include.includes("react-dom/server")) config.optimizeDeps.include.push("react-dom/server");
-			if (!config.optimizeDeps.include.includes("react")) config.optimizeDeps.include.push("react");
-			if (!config.optimizeDeps.include.includes("react-dom/client")) config.optimizeDeps.include.push("react-dom/client");
-			config.optimizeDeps.exclude = config.optimizeDeps.exclude || [];
-			if (!config.optimizeDeps.exclude.includes("virtual:rsc-integration")) config.optimizeDeps.exclude.push("virtual:rsc-integration");
 			if (command === "build") for (const envName of [
 				"rsc",
 				"ssr",
 				"client"
 			]) {
 				const env = config.environments[envName];
-				if (env && env.build) env.build.rolldownOptions = env.build.rolldownOptions || {};
+				if (env && env.build) env.build.rollupOptions = env.build.rollupOptions || {};
 			}
 			config.server = config.server || {};
 			config.server.proxy = config.server.proxy || {};
@@ -5924,183 +5912,19 @@ if (import.meta.hot) {
 			};
 			if (command === "build") {
 				config.build = config.build || {};
-				config.build.rolldownOptions = config.build.rolldownOptions || {};
-				config.build.rolldownOptions.plugins = config.build.rolldownOptions.plugins || [];
-				if (Array.isArray(config.build.rolldownOptions.plugins)) {
-					config.build.rolldownOptions.plugins.push(minify());
-					config.build.rolldownOptions.plugins.push({
-						name: "html-css-optimizer",
-						generateBundle(options$1, bundle) {
-							Object.keys(bundle).forEach((fileName) => {
-								const file = bundle[fileName];
-								if (file.type === "asset" && fileName.endsWith(".html")) {
-									let html = file.source;
-									html = html.replace(/<link\s+rel="stylesheet"\s+crossorigin\s+href="([^"]+\.css)"\s*>/g, (match, href) => {
-										return `<link rel="preload" as="style" crossorigin href="${href}" fetchpriority="high" onload="this.onload=null;this.rel='stylesheet'">
-  <noscript><link rel="stylesheet" crossorigin href="${href}"></noscript>`;
-									});
-									const scriptMatch = html.match(/<script\s+type="module"\s+crossorigin\s+src="([^"]+)"\s*><\/script>/);
-									if (scriptMatch) {
-										const mainJsHref = scriptMatch[1];
-										html = html.replace(scriptMatch[0], `<link rel="preload" as="script" crossorigin href="${mainJsHref}" fetchpriority="high">
-  <script type="module" crossorigin src="${mainJsHref}" fetchpriority="high"><\/script>`);
-									}
-									file.source = html;
-								}
-							});
-						}
-					});
-				}
-				if (!config.build.rolldownOptions.input) config.build.rolldownOptions.input = { main: "./index.html" };
-				config.build.rolldownOptions.output = config.build.rolldownOptions.output || {};
-				const outputConfig = Array.isArray(config.build.rolldownOptions.output) ? config.build.rolldownOptions.output[0] || {} : config.build.rolldownOptions.output;
-				outputConfig.manualChunks = (id) => {
-					if (id.includes("node_modules/react-dom") || id.includes("react-dom/client") || id.includes("react-dom/server") || id.includes("react-dom/")) return "react-dom";
-					if ((id.includes("node_modules/react") || id.includes("react/")) && !id.includes("react-dom")) return "react";
-					if (id.includes("scheduler") && id.includes("node_modules")) return "scheduler";
-					if (id.includes("markdown-it") || id.includes("shiki")) return "vendor";
-					if (id.includes("node_modules")) return "vendor";
-				};
-				config.build.rolldownOptions.treeshake = config.build.rolldownOptions.treeshake || {
-					moduleSideEffects: (id) => {
-						if (id.includes(".css") || id.includes("polyfill")) return true;
-						if (id.includes("react-dom") || id.includes("react") || id.includes("scheduler") || id.includes("react-dom/client") || id.includes("react-dom/server")) return true;
-						if (id.includes("node_modules") && !id.includes("react")) return false;
-						return true;
-					},
-					unknownGlobalSideEffects: false
-				};
-				const existingExternal = config.build.rolldownOptions?.external || [];
-				const reactDomExternals = [
-					"react-dom/profiling",
-					"react-dom/test-utils",
-					"react-dom/server",
-					"react-dom/server.browser",
-					"react-dom/server.node",
-					"react/jsx-dev-runtime",
-					"scheduler/tracing",
-					"scheduler/unstable_mock",
-					"react/cjs/react.development.js",
-					"react/cjs/react.production.min.js",
-					"react-dom/cjs/react-dom.development.js",
-					"react-dom/cjs/react-dom.production.min.js",
-					"react-dom/src/client/ReactDOMRoot.js",
-					"react-dom/src/events/plugins",
-					"react-dom/src/shared/HTMLDOMPropertyConfig.js",
-					"react-dom/src/shared/DOMPropertyOperations.js"
-				];
-				if (Array.isArray(existingExternal)) {
-					const external = [...existingExternal];
-					external.push(...reactDomExternals.filter((dep) => !external.includes(dep)));
-					config.build.rolldownOptions.external = external;
-				} else if (typeof existingExternal === "function") {
-					const originalExternal = existingExternal;
-					config.build.rolldownOptions.external = (id, parentId, isResolved) => {
-						if (reactDomExternals.includes(id)) return true;
-						return originalExternal(id, parentId, isResolved);
-					};
-				} else config.build.rolldownOptions.external = [...Array.isArray(existingExternal) ? existingExternal : [existingExternal], ...reactDomExternals].filter(Boolean);
-				config.build.minify = true;
-				config.build.target = config.build.target || [
-					"es2020",
-					"edge88",
-					"firefox78",
-					"chrome87",
-					"safari14"
-				];
-				config.build.cssMinify = config.build.cssMinify !== false ? "esbuild" : false;
-				config.build.cssCodeSplit = true;
-				config.build.assetsInlineLimit = 4096;
-				config.build.chunkSizeWarningLimit = 1e3;
-				config.build.sourcemap = config.build.sourcemap !== void 0 ? config.build.sourcemap : true;
-				config.build.terserOptions = config.build.terserOptions || {
-					compress: {
-						drop_console: true,
-						drop_debugger: true,
-						pure_funcs: [
-							"console.log",
-							"console.info",
-							"console.debug",
-							"console.warn",
-							"invariant",
-							"warning",
-							"__DEV__",
-							"ReactDOM.render",
-							"ReactDOM.unmountComponentAtNode",
-							"ReactDOM.findDOMNode",
-							"ReactDOM.createPortal"
-						],
-						passes: 3,
-						unsafe: true,
-						unsafe_comps: true,
-						unsafe_Function: true,
-						unsafe_math: true,
-						unsafe_symbols: true,
-						unsafe_methods: true,
-						unsafe_proto: true,
-						unsafe_regexp: true,
-						unsafe_undefined: true,
-						dead_code: true,
-						side_effects: false
-					},
-					mangle: {
-						safari10: true,
-						properties: { regex: /^_/ }
-					},
-					format: { comments: false }
-				};
-				outputConfig.format = outputConfig.format || "es";
-				outputConfig.minify = true;
-				if (Array.isArray(config.build.rolldownOptions.output)) config.build.rolldownOptions.output[0] = outputConfig;
-				else config.build.rolldownOptions.output = outputConfig;
+				config.build.rollupOptions = config.build.rollupOptions || {};
+				if (!config.build.rollupOptions.input) config.build.rollupOptions.input = { main: "./index.html" };
 			}
 			if (config.environments && config.environments.client) {
 				if (!config.environments.client.build) config.environments.client.build = {};
-				if (!config.environments.client.build.rolldownOptions) config.environments.client.build.rolldownOptions = {};
-				if (!config.environments.client.build.rolldownOptions.input) config.environments.client.build.rolldownOptions.input = {};
-				if (typeof config.environments.client.build.rolldownOptions.input === "object" && !Array.isArray(config.environments.client.build.rolldownOptions.input)) config.environments.client.build.rolldownOptions.input["client-components"] = "virtual:rsc-client-components";
-				config.environments.client.build.rolldownOptions.plugins = config.environments.client.build.rolldownOptions.plugins || [];
-				if (Array.isArray(config.environments.client.build.rolldownOptions.plugins)) config.environments.client.build.rolldownOptions.plugins.push(minify());
-				config.environments.client.build.minify = true;
-				config.environments.client.build.target = config.environments.client.build.target || [
-					"es2020",
-					"edge88",
-					"firefox78",
-					"chrome87",
-					"safari14"
-				];
-				config.environments.client.build.cssMinify = "esbuild";
-				config.environments.client.build.cssCodeSplit = true;
-				config.environments.client.build.assetsInlineLimit = 4096;
-				config.environments.client.build.rolldownOptions.treeshake = {
-					moduleSideEffects: false,
-					unknownGlobalSideEffects: false
-				};
-				config.environments.client.build.rolldownOptions.output = config.environments.client.build.rolldownOptions.output || {};
-				const clientOutputConfig = Array.isArray(config.environments.client.build.rolldownOptions.output) ? config.environments.client.build.rolldownOptions.output[0] || {} : config.environments.client.build.rolldownOptions.output;
-				clientOutputConfig.manualChunks = (id) => {
-					if (id.includes("node_modules/react-dom") || id.includes("react-dom/client") || id.includes("react-dom/server") || id.includes("react-dom/")) return "react-dom";
-					if ((id.includes("node_modules/react") || id.includes("react/")) && !id.includes("react-dom")) return "react";
-					if (id.includes("scheduler") && id.includes("node_modules")) return "scheduler";
-					if (id.includes("rari") && (id.includes("router") || id.includes("navigation"))) return "router";
-					if (id.includes("markdown-it") || id.includes("shiki")) return "vendor";
-					if (id.includes("node_modules")) return "vendor";
-				};
-				clientOutputConfig.format = clientOutputConfig.format || "es";
-				clientOutputConfig.minify = true;
-				if (Array.isArray(config.environments.client.build.rolldownOptions.output)) config.environments.client.build.rolldownOptions.output[0] = clientOutputConfig;
-				else config.environments.client.build.rolldownOptions.output = clientOutputConfig;
+				if (!config.environments.client.build.rollupOptions) config.environments.client.build.rollupOptions = {};
+				if (!config.environments.client.build.rollupOptions.input) config.environments.client.build.rollupOptions.input = {};
+				if (typeof config.environments.client.build.rollupOptions.input === "object" && !Array.isArray(config.environments.client.build.rollupOptions.input)) config.environments.client.build.rollupOptions.input["client-components"] = "virtual:rsc-client-components";
 			}
 			return config;
 		},
 		transform(code, id) {
 			if (!/\.(?:tsx?|jsx?)$/.test(id)) return null;
-			if (code.includes("react-dom")) {
-				code = code.replace(/import\s+ReactDOM\s+from\s+['"]react-dom\/client['"];?/g, "import { createRoot, hydrateRoot } from 'react-dom/client';");
-				code = code.replace(/import\s+ReactDOM\s+from\s+['"]react-dom['"];?/g, "import { createRoot, hydrateRoot } from 'react-dom/client';");
-				code = code.replace(/ReactDOM\.createRoot/g, "createRoot");
-				code = code.replace(/ReactDOM\.hydrateRoot/g, "hydrateRoot");
-			}
 			const environment = this.environment;
 			if (hasTopLevelDirective(code, "use client")) {
 				componentTypeCache.set(id, "client");
@@ -6550,6 +6374,7 @@ export const __CLIENT_REFERENCE_REGISTRY__ = clientReferenceRegistry;
 export const __SERVER_REFERENCE_REGISTRY__ = serverReferenceRegistry;
 export const __CLIENT_COMPONENT_REGISTRY__ = clientComponentRegistry;
 
+// Module map for React Server Components
 export function createClientModuleMap() {
   const moduleMap = {};
 
@@ -6572,6 +6397,7 @@ export function createClientModuleMap() {
 			if (id === "virtual:rsc-integration") return `
 import React, { useState, useEffect, Suspense } from 'react';
 
+// Client component registration for RSC system compatibility
 if (typeof globalThis.__clientComponents === 'undefined') {
   globalThis.__clientComponents = {};
 }
@@ -6589,6 +6415,7 @@ export function registerClientComponent(componentFunction, id, exportName) {
 
   const componentId = componentName;
 
+  // Register in global registry for RSC traversal
   globalThis.__clientComponents[componentId] = {
     id: componentId,
     path: id,
@@ -7349,7 +7176,7 @@ class RscClient {
             const processedChildren = value.map((child, index) => {
               const result = this.reconstructElementFromRscData(child, modules);
               return result;
-            }).filter(child => child !== null && child !== undefined);
+            }).filter(child => child !== null && child !== undefined); // Remove null/undefined children
 
             if (processedChildren.length === 0) {
               processed[key] = null;
@@ -7494,6 +7321,7 @@ function ServerComponentWrapper({
 }
 
 function createServerComponentWrapper(componentName, importPath) {
+  // Use a global refresh counter to force re-mounting when components change
   let globalRefreshCounter = 0;
 
   if (typeof window !== 'undefined') {
@@ -7507,6 +7335,7 @@ function createServerComponentWrapper(componentName, importPath) {
   const ServerComponent = (props) => {
     const [mountKey, setMountKey] = useState(globalRefreshCounter);
 
+    // Force re-mount when component is invalidated
     useEffect(() => {
       const handleRscInvalidate = (event) => {
         const detail = event.detail;
@@ -7527,7 +7356,7 @@ function createServerComponentWrapper(componentName, importPath) {
     return React.createElement(Suspense, {
       fallback: null
     }, React.createElement(ServerComponentWrapper, {
-      key: componentName + '-' + mountKey,
+      key: componentName + '-' + mountKey, // Force re-mount with key change
       componentId: componentName,
       props: props,
       fallback: null
@@ -7544,7 +7373,9 @@ function createServerComponentWrapper(componentName, importPath) {
 export const fetchServerComponent = (componentId, props) =>
   rscClient.fetchServerComponent(componentId, props);
 
+// Helper function to check if a file is a server component (client-side)
 function isServerComponent(filePath) {
+  // Simple client-side check based on file path patterns
   return filePath && (
     filePath.includes('ServerWithClient') ||
     filePath.includes('server') ||
@@ -7552,26 +7383,32 @@ function isServerComponent(filePath) {
   );
 }
 
+// HMR support for RSC cache invalidation
 if (import.meta.hot) {
+  // Listen for Vite's beforeFullReload event for server components
   import.meta.hot.on('vite:beforeFullReload', async (data) => {
     if (data?.path && isServerComponent(data.path)) {
+      // Immediately invalidate cache and trigger re-registration before reload
       await invalidateRscCache({ filePath: data.path, forceReload: true });
     }
   });
 
 
 
+  // Helper function to invalidate RSC cache and trigger component re-registration
   async function invalidateRscCache(data) {
     const filePath = data?.filePath || data;
 
+    // Wait for server to be ready
     const waitForServerReady = async () => {
-      for (let i = 0; i < 20; i++) {
+      for (let i = 0; i < 20; i++) { // Try for up to 2 seconds
         try {
           const response = await fetch('/_rsc_status');
           if (response.ok) {
             return true;
           }
         } catch (e) {
+          // Server not ready yet
         }
         await new Promise(resolve => setTimeout(resolve, 100));
       }
@@ -7580,8 +7417,10 @@ if (import.meta.hot) {
 
     const serverReady = await waitForServerReady();
     if (serverReady) {
+      // Clear client-side RSC cache immediately
       rscClient.clearCache();
 
+      // Trigger immediate server component re-registration
       try {
         await fetch('/api/rsc/hmr-register', {
           method: 'POST',
@@ -7593,10 +7432,14 @@ if (import.meta.hot) {
           })
         });
 
+        // Wait a bit for the server to re-register the component
+        // The server now immediately reads and re-registers the component
         await new Promise(resolve => setTimeout(resolve, 300));
       } catch (error) {
+        // Fallback to existing timeout-based approach
       }
 
+      // Trigger re-render of active server components
       if (typeof window !== 'undefined') {
         const event = new CustomEvent('rari:rsc-invalidate', {
           detail: { filePath }
@@ -7666,73 +7509,6 @@ ${registrations.join("\n")}
 	const serverBuildPlugin = createServerBuildPlugin(options.serverBuild);
 	return [mainPlugin, serverBuildPlugin];
 }
-function createReactDOMOptimization() {
-	return { build: {
-		rollupOptions: {
-			output: { manualChunks: (id) => {
-				if (id.includes("node_modules/react-dom") || id.includes("react-dom/client") || id.includes("react-dom/server") || id.includes("react-dom/")) return "react-dom";
-				if ((id.includes("node_modules/react") || id.includes("react/")) && !id.includes("react-dom")) return "react";
-				if (id.includes("scheduler") && id.includes("node_modules")) return "scheduler";
-				if (id.includes("markdown-it") || id.includes("shiki")) return "vendor";
-				if (id.includes("node_modules")) return "vendor";
-			} },
-			treeshake: {
-				moduleSideEffects: (id) => {
-					if (id.includes(".css") || id.includes("polyfill")) return true;
-					if (id.includes("react-dom") || id.includes("react") || id.includes("scheduler") || id.includes("react-dom/client") || id.includes("react-dom/server")) return false;
-					return false;
-				},
-				unknownGlobalSideEffects: false
-			}
-		},
-		minify: "terser",
-		target: [
-			"es2020",
-			"edge88",
-			"firefox78",
-			"chrome87",
-			"safari14"
-		],
-		cssMinify: "esbuild",
-		sourcemap: false,
-		terserOptions: {
-			compress: {
-				drop_console: true,
-				drop_debugger: true,
-				pure_funcs: [
-					"console.log",
-					"console.info",
-					"console.debug",
-					"console.warn",
-					"invariant",
-					"warning",
-					"__DEV__",
-					"ReactDOM.render",
-					"ReactDOM.unmountComponentAtNode",
-					"ReactDOM.findDOMNode",
-					"ReactDOM.createPortal"
-				],
-				passes: 3,
-				unsafe: true,
-				unsafe_comps: true,
-				unsafe_Function: true,
-				unsafe_math: true,
-				unsafe_symbols: true,
-				unsafe_methods: true,
-				unsafe_proto: true,
-				unsafe_regexp: true,
-				unsafe_undefined: true,
-				dead_code: true,
-				side_effects: false
-			},
-			mangle: {
-				safari10: true,
-				properties: { regex: /^_/ }
-			},
-			format: { comments: false }
-		}
-	} };
-}
 function defineRariConfig(config) {
 	return {
 		plugins: [rari(), ...config.plugins || []],
@@ -7741,4 +7517,4 @@ function defineRariConfig(config) {
 }
 
 //#endregion
-export { FileRouteGenerator, convertFilePatternToRoutePattern, createReactDOMOptimization, createRouteManifest, defineRariConfig, generateFileRoutes, loadRouteManifest, rari, rariRouter, validateRoutes, watchFileRoutes };
+export { FileRouteGenerator, convertFilePatternToRoutePattern, createRouteManifest, defineRariConfig, generateFileRoutes, loadRouteManifest, rari, rariRouter, validateRoutes, watchFileRoutes };

package/dist/{server-Ph4oyo0B.d.ts → server-MY0-nRif.d.ts}

@@ -1,4 +1,4 @@
-import { Route, RouteGenerationOptions } from "./runtime-client-P4vvSVPV.js";
+import { Route, RouteGenerationOptions } from "./runtime-client-BEWMJWMx.js";
 import { Plugin, UserConfig } from "rolldown-vite";
 
 //#region src/router/file-routes.d.ts
@@ -62,53 +62,8 @@ interface RariOptions {
   serverHandler?: boolean;
 }
 declare function rari(options?: RariOptions): Plugin[];
-declare function createReactDOMOptimization(): {
-  build: {
-    rollupOptions: {
-      output: {
-        manualChunks: (id: string) => "react-dom" | "react" | "scheduler" | "vendor" | undefined;
-      };
-      treeshake: {
-        moduleSideEffects: (id: string) => boolean;
-        unknownGlobalSideEffects: boolean;
-      };
-    };
-    minify: string;
-    target: string[];
-    cssMinify: string;
-    sourcemap: boolean;
-    terserOptions: {
-      compress: {
-        drop_console: boolean;
-        drop_debugger: boolean;
-        pure_funcs: string[];
-        passes: number;
-        unsafe: boolean;
-        unsafe_comps: boolean;
-        unsafe_Function: boolean;
-        unsafe_math: boolean;
-        unsafe_symbols: boolean;
-        unsafe_methods: boolean;
-        unsafe_proto: boolean;
-        unsafe_regexp: boolean;
-        unsafe_undefined: boolean;
-        dead_code: boolean;
-        side_effects: boolean;
-      };
-      mangle: {
-        safari10: boolean;
-        properties: {
-          regex: RegExp;
-        };
-      };
-      format: {
-        comments: boolean;
-      };
-    };
-  };
-};
 declare function defineRariConfig(config: UserConfig & {
   plugins?: Plugin[];
 }): UserConfig;
 //#endregion
-export { FileRouteGenerator, convertFilePatternToRoutePattern, createReactDOMOptimization, createRouteManifest, defineRariConfig, generateFileRoutes, loadRouteManifest, rari, rariRouter, validateRoutes, watchFileRoutes };
+export { FileRouteGenerator, convertFilePatternToRoutePattern, createRouteManifest, defineRariConfig, generateFileRoutes, loadRouteManifest, rari, rariRouter, validateRoutes, watchFileRoutes };