rari 0.2.6 → 0.2.7

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 "./server-build-DaBgiV55.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-_LR44Mbg.js";
+import "./server-build-DyMLcQhk.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-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 };