rari 0.7.4 → 0.7.5

package/dist/client.d.mts

@@ -1,4 +1,4 @@
-import { A as extractMetadata, C as RouteSegment, D as StaticParamsResult, E as ServerPropsResult, M as extractServerPropsWithCache, N as extractStaticParams, O as clearPropsCache, P as hasServerSideDataFetching, T as MetadataResult, _ as GenerateStaticParams, a as LoadingSpinner, b as LoadingEntry, c as createErrorBoundary, d as AppRouteEntry, f as AppRouteManifest, g as GenerateMetadata, h as ErrorProps, i as HttpRuntimeClient, j as extractServerProps, k as clearPropsCacheForComponent, l as createHttpRuntimeClient, m as ErrorEntry, n as DefaultLoading, o as NotFound, p as AppRouteMatch, r as ErrorBoundary, s as RuntimeClient, t as DefaultError, u as createLoadingBoundary, v as LayoutEntry, w as RouteSegmentType, x as NotFoundEntry } from "./runtime-client-C2xNyif4.mjs";
+import { A as extractMetadata, C as RouteSegment, D as StaticParamsResult, E as ServerPropsResult, M as extractServerPropsWithCache, N as extractStaticParams, O as clearPropsCache, P as hasServerSideDataFetching, T as MetadataResult, _ as GenerateStaticParams, a as LoadingSpinner, b as LoadingEntry, c as createErrorBoundary, d as AppRouteEntry, f as AppRouteManifest, g as GenerateMetadata, h as ErrorProps, i as HttpRuntimeClient, j as extractServerProps, k as clearPropsCacheForComponent, l as createHttpRuntimeClient, m as ErrorEntry, n as DefaultLoading, o as NotFound, p as AppRouteMatch, r as ErrorBoundary, s as RuntimeClient, t as DefaultError, u as createLoadingBoundary, v as LayoutEntry, w as RouteSegmentType, x as NotFoundEntry } from "./runtime-client-BV3qaQrj.mjs";
 import * as React from "react";
 import { Component, ErrorInfo, ReactNode } from "react";
 import * as react_jsx_runtime0 from "react/jsx-runtime";

package/dist/client.mjs

@@ -222,7 +222,8 @@ function isExternalUrl(url, currentOrigin) {
 }
 function extractPathname(url) {
 	try {
-		return new URL(url, window.location.origin).pathname;
+		const urlObj = new URL(url, window.location.origin);
+		return urlObj.pathname + urlObj.hash;
 	} catch {
 		return url;
 	}
@@ -856,8 +857,21 @@ function ClientRouter({ children, initialRoute }) {
 			console.error("[ClientRouter] Invalid navigation target:", href);
 			return;
 		}
-		const targetPath = normalizePath(href);
-		if (targetPath === currentRouteRef.current && !options.replace) return;
+		const [pathWithoutHash, hash] = href.includes("#") ? href.split("#") : [href, ""];
+		const targetPath = normalizePath(pathWithoutHash);
+		if (targetPath === currentRouteRef.current && !options.replace) {
+			if (hash) {
+				const element = document.getElementById(hash);
+				if (element) {
+					element.scrollIntoView({
+						behavior: "smooth",
+						block: "start"
+					});
+					window.history.pushState(window.history.state, "", `${targetPath}#${hash}`);
+				}
+			}
+			return;
+		}
 		const existingPending = pendingNavigationsRef.current.get(targetPath);
 		if (existingPending) return existingPending.promise;
 		const routeInfo = await getRouteInfo(targetPath);
@@ -881,8 +895,9 @@ function ClientRouter({ children, initialRoute }) {
 					timestamp: Date.now(),
 					key: historyKey
 				};
-				if (options.replace) window.history.replaceState(historyState, "", targetPath);
-				else window.history.pushState(historyState, "", targetPath);
+				const urlWithHash = hash ? `${targetPath}#${hash}` : targetPath;
+				if (options.replace) window.history.replaceState(historyState, "", urlWithHash);
+				else window.history.pushState(historyState, "", urlWithHash);
 				const fetchUrl = (window.location.origin.includes(":5173") ? "http://localhost:3000" : window.location.origin) + targetPath;
 				const response = await fetch(fetchUrl, {
 					headers: { Accept: "text/x-component" },
@@ -891,16 +906,19 @@ function ClientRouter({ children, initialRoute }) {
 				if (!response.ok) throw new Error(`Failed to fetch: ${response.status}`);
 				const finalPath = new URL(response.url).pathname;
 				const actualTargetPath = finalPath !== targetPath ? finalPath : targetPath;
-				if (finalPath !== targetPath) window.history.replaceState({
-					route: finalPath,
-					navigationId,
-					scrollPosition: {
-						x: window.scrollX,
-						y: window.scrollY
-					},
-					timestamp: Date.now(),
-					key: options.historyKey || generateHistoryKey()
-				}, "", finalPath);
+				if (finalPath !== targetPath) {
+					const finalUrlWithHash = hash ? `${finalPath}#${hash}` : finalPath;
+					window.history.replaceState({
+						route: finalPath,
+						navigationId,
+						scrollPosition: {
+							x: window.scrollX,
+							y: window.scrollY
+						},
+						timestamp: Date.now(),
+						key: options.historyKey || generateHistoryKey()
+					}, "", finalUrlWithHash);
+				}
 				if (abortController.signal.aborted) {
 					cleanupAbortedNavigation(actualTargetPath, navigationId);
 					return;
@@ -971,6 +989,17 @@ function ClientRouter({ children, initialRoute }) {
 					if (options.historyKey) requestAnimationFrame(() => {
 						statePreserverRef.current.restoreState(actualTargetPath);
 					});
+					else if (hash) requestAnimationFrame(() => {
+						const scrollToHash = (attempts = 0) => {
+							const element = document.getElementById(hash);
+							if (element) element.scrollIntoView({
+								behavior: "smooth",
+								block: "start"
+							});
+							else if (attempts < 10) setTimeout(() => scrollToHash(attempts + 1), 50);
+						};
+						scrollToHash();
+					});
 				}
 				pendingNavigationsRef.current.delete(targetPath);
 				processNavigationQueueRef.current?.();
@@ -1030,6 +1059,19 @@ function ClientRouter({ children, initialRoute }) {
 		const href = anchor.getAttribute("href");
 		if (!href) return;
 		if (isExternalUrl(href)) return;
+		if (href.startsWith("#")) {
+			event.preventDefault();
+			const hash = href.slice(1);
+			const element = document.getElementById(hash);
+			if (element) {
+				element.scrollIntoView({
+					behavior: "smooth",
+					block: "start"
+				});
+				window.history.pushState(window.history.state, "", href);
+			}
+			return;
+		}
 		event.preventDefault();
 		debouncedNavigate(extractPathname(href), { replace: false });
 	};

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import { A as extractMetadata, C as RouteSegment, D as StaticParamsResult, E as ServerPropsResult, M as extractServerPropsWithCache, N as extractStaticParams, O as clearPropsCache, P as hasServerSideDataFetching, S as PageProps, T as MetadataResult, _ as GenerateStaticParams, b as LoadingEntry, d as AppRouteEntry, f as AppRouteManifest, g as GenerateMetadata, h as ErrorProps, i as HttpRuntimeClient, j as extractServerProps, k as clearPropsCacheForComponent, l as createHttpRuntimeClient, m as ErrorEntry, p as AppRouteMatch, s as RuntimeClient, v as LayoutEntry, w as RouteSegmentType, x as NotFoundEntry, y as LayoutProps } from "./runtime-client-C2xNyif4.mjs";
-import { C as ApiRouteHandlers, D as RobotsRule, E as Robots, S as ApiResponse, T as RouteHandler, _ as ProxyResult, a as rari, b as RequestCookies, c as ProxyPluginOptions, d as RariRequest, f as CookieOptions, g as ProxyModule, h as ProxyMatcher, i as defineRariOptions, l as rariProxy, m as ProxyFunction, n as Response, o as rariRouter, p as ProxyConfig, r as defineRariConfig, s as generateAppRouteManifest, t as Request, u as RariResponse, v as RariFetchEvent, w as RouteContext, x as ResponseCookies, y as RariURL } from "./vite-BmkmtVrY.mjs";
+import { A as extractMetadata, C as RouteSegment, D as StaticParamsResult, E as ServerPropsResult, M as extractServerPropsWithCache, N as extractStaticParams, O as clearPropsCache, P as hasServerSideDataFetching, S as PageProps, T as MetadataResult, _ as GenerateStaticParams, b as LoadingEntry, d as AppRouteEntry, f as AppRouteManifest, g as GenerateMetadata, h as ErrorProps, i as HttpRuntimeClient, j as extractServerProps, k as clearPropsCacheForComponent, l as createHttpRuntimeClient, m as ErrorEntry, p as AppRouteMatch, s as RuntimeClient, v as LayoutEntry, w as RouteSegmentType, x as NotFoundEntry, y as LayoutProps } from "./runtime-client-BV3qaQrj.mjs";
+import { C as ApiRouteHandlers, D as RobotsRule, E as Robots, S as ApiResponse, T as RouteHandler, _ as ProxyResult, a as rari, b as RequestCookies, c as ProxyPluginOptions, d as RariRequest, f as CookieOptions, g as ProxyModule, h as ProxyMatcher, i as defineRariOptions, l as rariProxy, m as ProxyFunction, n as Response, o as rariRouter, p as ProxyConfig, r as defineRariConfig, s as generateAppRouteManifest, t as Request, u as RariResponse, v as RariFetchEvent, w as RouteContext, x as ResponseCookies, y as RariURL } from "./vite-BrjcNDVC.mjs";
 import "./runtime-executor-NBcG4boA.mjs";
 export { ApiResponse, ApiRouteHandlers, AppRouteEntry, AppRouteManifest, AppRouteMatch, CookieOptions, ErrorEntry, ErrorProps, GenerateMetadata, GenerateStaticParams, HttpRuntimeClient, LayoutEntry, LayoutProps, LoadingEntry, MetadataResult, NotFoundEntry, PageProps, ProxyConfig, ProxyFunction, ProxyMatcher, ProxyModule, ProxyPluginOptions, ProxyResult, RariFetchEvent, RariRequest, RariResponse, RariURL, Request, RequestCookies, Response, ResponseCookies, type Robots, type RobotsRule, RouteContext, RouteHandler, RouteSegment, RouteSegmentType, RuntimeClient, ServerPropsResult, StaticParamsResult, clearPropsCache, clearPropsCacheForComponent, createHttpRuntimeClient, defineRariConfig, defineRariOptions, extractMetadata, extractServerProps, extractServerPropsWithCache, extractStaticParams, generateAppRouteManifest, hasServerSideDataFetching, rari, rariProxy, rariRouter };

package/dist/index.mjs

@@ -1,8 +1,8 @@
-import { a as rariProxy, i as rariRouter, n as defineRariOptions, o as RariResponse, r as rari, s as ApiResponse, t as defineRariConfig } from "./vite-4h_gIEDe.mjs";
+import { a as rariProxy, i as rariRouter, n as defineRariOptions, o as RariResponse, r as rari, s as ApiResponse, t as defineRariConfig } from "./vite-BWd99saK.mjs";
 import { t as RariRequest } from "./RariRequest-DM6Q4JDB.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-B7wmvKD3.mjs";
-import { t as generateAppRouteManifest } from "./routes-B_KAzmbj.mjs";
+import { t as generateAppRouteManifest } from "./routes-BHZ20uQX.mjs";
 import "./image-CL9iVW32.mjs";
-import "./server-build-y4PwbtX3.mjs";
+import "./server-build-VeqQZBax.mjs";
 
 export { ApiResponse, HttpRuntimeClient, RariRequest, RariResponse, clearPropsCache, clearPropsCacheForComponent, createHttpRuntimeClient, defineRariConfig, defineRariOptions, extractMetadata, extractServerProps, extractServerPropsWithCache, extractStaticParams, generateAppRouteManifest, hasServerSideDataFetching, rari, rariProxy, rariRouter };

package/dist/og/index.d.mts

@@ -4,12 +4,6 @@ import { ReactElement } from "react";
 interface ImageResponseOptions {
   width?: number;
   height?: number;
-  fonts?: Array<{
-    name: string;
-    data: ArrayBuffer;
-    weight?: number;
-    style?: 'normal' | 'italic';
-  }>;
 }
 interface ImageResponseSize {
   width: number;

package/dist/og/index.mjs

@@ -6,8 +6,7 @@ var ImageResponse = class {
 		this.element = element;
 		this.options = {
 			width: options.width || 1200,
-			height: options.height || 630,
-			fonts: options.fonts || []
+			height: options.height || 630
 		};
 	}
 	toJSON() {

package/dist/{routes-B_KAzmbj.mjs → routes-BHZ20uQX.mjs}

@@ -234,11 +234,19 @@ var AppRouteGenerator = class {
 	}
 	sortRoutes(routes) {
 		return routes.sort((a, b) => {
-			if (!a.isDynamic && b.isDynamic) return -1;
-			if (a.isDynamic && !b.isDynamic) return 1;
+			const getSpecificity = (route) => {
+				if (!route.isDynamic) return 0;
+				const hasCatchAll = route.segments.some((s) => s.type === "catch-all");
+				if (route.segments.some((s) => s.type === "optional-catch-all")) return 3;
+				if (hasCatchAll) return 2;
+				return 1;
+			};
+			const aSpec = getSpecificity(a);
+			const bSpec = getSpecificity(b);
+			if (aSpec !== bSpec) return aSpec - bSpec;
 			const aDepth = a.path.split("/").length;
 			const bDepth = b.path.split("/").length;
-			if (aDepth !== bDepth) return aDepth - bDepth;
+			if (aDepth !== bDepth) return bDepth - aDepth;
 			return a.path.localeCompare(b.path);
 		});
 	}

package/dist/routes-DjIf7Qiq.mjs

@@ -0,0 +1,3 @@
+import { t as generateAppRouteManifest } from "./routes-BHZ20uQX.mjs";
+
+export { generateAppRouteManifest };

package/dist/{runtime-client-C2xNyif4.d.mts → runtime-client-BV3qaQrj.d.mts}

@@ -41,14 +41,6 @@ interface MetadataResult {
     index?: boolean;
     follow?: boolean;
     nocache?: boolean;
-    googleBot?: {
-      'index'?: boolean;
-      'follow'?: boolean;
-      'noimageindex'?: boolean;
-      'max-video-preview'?: number;
-      'max-image-preview'?: 'none' | 'standard' | 'large';
-      'max-snippet'?: number;
-    };
   };
   icons?: {
     icon?: Array<{
@@ -80,24 +72,8 @@ interface MetadataResult {
     statusBarStyle?: 'default' | 'black' | 'black-translucent';
     capable?: boolean;
   };
-  viewport?: {
-    width?: string | number;
-    height?: string | number;
-    initialScale?: number;
-    maximumScale?: number;
-    minimumScale?: number;
-    userScalable?: boolean;
-  };
-  verification?: {
-    google?: string;
-    yandex?: string;
-    yahoo?: string;
-    other?: Record<string, string>;
-  };
-  alternates?: {
-    canonical?: string;
-    languages?: Record<string, string>;
-  };
+  viewport?: string;
+  canonical?: string;
 }
 type StaticParamsResult = Array<Record<string, string | string[]>>;
 declare function extractServerProps(componentPath: string, params: Record<string, string>, searchParams: Record<string, string>): Promise<ServerPropsResult>;

package/dist/server-build-C9oLpeMw.mjs

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

package/dist/{server-build-y4PwbtX3.mjs → server-build-VeqQZBax.mjs}

@@ -54,6 +54,7 @@ var ServerComponentBuilder = class {
 			manifestPath: options.manifestPath || "server/manifest.json",
 			minify: options.minify ?? process.env.NODE_ENV === "production",
 			alias: options.alias || {},
+			define: options.define,
 			csp: options.csp,
 			rateLimit: options.rateLimit,
 			spamBlocker: options.spamBlocker
@@ -243,7 +244,8 @@ const ${importName} = (props) => {
 				jsxFragment: "React.Fragment",
 				define: {
 					"global": "globalThis",
-					"process.env.NODE_ENV": "\"production\""
+					"process.env.NODE_ENV": "\"production\"",
+					...this.options.define
 				},
 				loader: {
 					".ts": "ts",
@@ -507,7 +509,8 @@ const ${importName} = (props) => {
 				jsxFragment: "React.Fragment",
 				define: {
 					"global": "globalThis",
-					"process.env.NODE_ENV": "\"production\""
+					"process.env.NODE_ENV": "\"production\"",
+					...this.options.define
 				},
 				loader: {
 					".ts": "ts",

package/dist/{vite-4h_gIEDe.mjs → vite-BWd99saK.mjs}

@@ -1,6 +1,6 @@
 import { t as __require } from "./chunk-DViRIILg.mjs";
 import { a as DEFAULT_MAX_CACHE_SIZE, i as DEFAULT_IMAGE_SIZES, n as DEFAULT_DEVICE_SIZES, o as DEFAULT_MINIMUM_CACHE_TTL, r as DEFAULT_FORMATS, s as DEFAULT_QUALITY_LEVELS } from "./image-CL9iVW32.mjs";
-import { n as createServerBuildPlugin } from "./server-build-y4PwbtX3.mjs";
+import { n as createServerBuildPlugin } from "./server-build-VeqQZBax.mjs";
 import fs, { promises, stat, unwatchFile, watch, watchFile } from "node:fs";
 import * as sp from "node:path";
 import path, { join, relative, resolve, sep } from "node:path";
@@ -1952,7 +1952,7 @@ function rariRouter(options = {}) {
 			const currentRouteFiles = await scanRouteFiles(appDir);
 			const currentHash = computeRouteStructureHash(currentRouteFiles);
 			if (!forceRegenerate && routeStructureHash === currentHash && cachedManifestContent) return cachedManifestContent;
-			const { generateAppRouteManifest } = await import("./routes-BoXHLBse.mjs");
+			const { generateAppRouteManifest } = await import("./routes-DjIf7Qiq.mjs");
 			const manifest = await generateAppRouteManifest(appDir, { extensions: opts.extensions });
 			const manifestContent = JSON.stringify(manifest, null, 2);
 			const outDir = path.resolve(root, opts.outDir);
@@ -2846,7 +2846,7 @@ const ${componentName$1} = registerClientReference(
 			let serverComponentBuilder = null;
 			const discoverAndRegisterComponents = async () => {
 				try {
-					const { ServerComponentBuilder, scanDirectory } = await import("./server-build-Qxg1F-98.mjs");
+					const { ServerComponentBuilder, scanDirectory } = await import("./server-build-C9oLpeMw.mjs");
 					const builder = new ServerComponentBuilder(projectRoot, {
 						outDir: "dist",
 						serverDir: "server",
@@ -3011,7 +3011,7 @@ const ${componentName$1} = registerClientReference(
 			const handleServerComponentHMR = async (filePath) => {
 				try {
 					if (!isServerComponent(filePath)) return;
-					const { ServerComponentBuilder } = await import("./server-build-Qxg1F-98.mjs");
+					const { ServerComponentBuilder } = await import("./server-build-C9oLpeMw.mjs");
 					const builder = new ServerComponentBuilder(projectRoot, {
 						outDir: "dist",
 						serverDir: "server",

package/dist/{vite-BmkmtVrY.d.mts → vite-BrjcNDVC.d.mts}

@@ -1,4 +1,4 @@
-import { f as AppRouteManifest } from "./runtime-client-C2xNyif4.mjs";
+import { f as AppRouteManifest } from "./runtime-client-BV3qaQrj.mjs";
 import { Plugin, UserConfig } from "rolldown-vite";
 
 //#region src/types/metadata-route.d.ts
@@ -212,6 +212,7 @@ interface ServerBuildOptions {
   manifestPath?: string;
   minify?: boolean;
   alias?: Record<string, string>;
+  define?: Record<string, string>;
   csp?: {
     scriptSrc?: string[];
     styleSrc?: string[];

package/dist/vite.d.mts

@@ -1,4 +1,4 @@
-import { A as extractMetadata, C as RouteSegment, D as StaticParamsResult, E as ServerPropsResult, M as extractServerPropsWithCache, N as extractStaticParams, O as clearPropsCache, P as hasServerSideDataFetching, S as PageProps, T as MetadataResult, _ as GenerateStaticParams, b as LoadingEntry, d as AppRouteEntry, f as AppRouteManifest, g as GenerateMetadata, h as ErrorProps, i as HttpRuntimeClient, j as extractServerProps, k as clearPropsCacheForComponent, l as createHttpRuntimeClient, m as ErrorEntry, p as AppRouteMatch, s as RuntimeClient, v as LayoutEntry, w as RouteSegmentType, x as NotFoundEntry, y as LayoutProps } from "./runtime-client-C2xNyif4.mjs";
-import { C as ApiRouteHandlers, D as RobotsRule, E as Robots, S as ApiResponse, T as RouteHandler, _ as ProxyResult, a as rari, b as RequestCookies, c as ProxyPluginOptions, d as RariRequest, f as CookieOptions, g as ProxyModule, h as ProxyMatcher, i as defineRariOptions, l as rariProxy, m as ProxyFunction, n as Response, o as rariRouter, p as ProxyConfig, r as defineRariConfig, s as generateAppRouteManifest, t as Request, u as RariResponse, v as RariFetchEvent, w as RouteContext, x as ResponseCookies, y as RariURL } from "./vite-BmkmtVrY.mjs";
+import { A as extractMetadata, C as RouteSegment, D as StaticParamsResult, E as ServerPropsResult, M as extractServerPropsWithCache, N as extractStaticParams, O as clearPropsCache, P as hasServerSideDataFetching, S as PageProps, T as MetadataResult, _ as GenerateStaticParams, b as LoadingEntry, d as AppRouteEntry, f as AppRouteManifest, g as GenerateMetadata, h as ErrorProps, i as HttpRuntimeClient, j as extractServerProps, k as clearPropsCacheForComponent, l as createHttpRuntimeClient, m as ErrorEntry, p as AppRouteMatch, s as RuntimeClient, v as LayoutEntry, w as RouteSegmentType, x as NotFoundEntry, y as LayoutProps } from "./runtime-client-BV3qaQrj.mjs";
+import { C as ApiRouteHandlers, D as RobotsRule, E as Robots, S as ApiResponse, T as RouteHandler, _ as ProxyResult, a as rari, b as RequestCookies, c as ProxyPluginOptions, d as RariRequest, f as CookieOptions, g as ProxyModule, h as ProxyMatcher, i as defineRariOptions, l as rariProxy, m as ProxyFunction, n as Response, o as rariRouter, p as ProxyConfig, r as defineRariConfig, s as generateAppRouteManifest, t as Request, u as RariResponse, v as RariFetchEvent, w as RouteContext, x as ResponseCookies, y as RariURL } from "./vite-BrjcNDVC.mjs";
 import "./runtime-executor-NBcG4boA.mjs";
 export { ApiResponse, ApiRouteHandlers, AppRouteEntry, AppRouteManifest, AppRouteMatch, CookieOptions, ErrorEntry, ErrorProps, GenerateMetadata, GenerateStaticParams, HttpRuntimeClient, LayoutEntry, LayoutProps, LoadingEntry, MetadataResult, NotFoundEntry, PageProps, ProxyConfig, ProxyFunction, ProxyMatcher, ProxyModule, ProxyPluginOptions, ProxyResult, RariFetchEvent, RariRequest, RariResponse, RariURL, Request, RequestCookies, Response, ResponseCookies, Robots, RobotsRule, RouteContext, RouteHandler, RouteSegment, RouteSegmentType, RuntimeClient, ServerPropsResult, StaticParamsResult, clearPropsCache, clearPropsCacheForComponent, createHttpRuntimeClient, defineRariConfig, defineRariOptions, extractMetadata, extractServerProps, extractServerPropsWithCache, extractStaticParams, generateAppRouteManifest, hasServerSideDataFetching, rari, rariProxy, rariRouter };

package/dist/vite.mjs

@@ -1,8 +1,8 @@
-import { a as rariProxy, i as rariRouter, n as defineRariOptions, o as RariResponse, r as rari, s as ApiResponse, t as defineRariConfig } from "./vite-4h_gIEDe.mjs";
+import { a as rariProxy, i as rariRouter, n as defineRariOptions, o as RariResponse, r as rari, s as ApiResponse, t as defineRariConfig } from "./vite-BWd99saK.mjs";
 import { t as RariRequest } from "./RariRequest-DM6Q4JDB.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-B7wmvKD3.mjs";
-import { t as generateAppRouteManifest } from "./routes-B_KAzmbj.mjs";
+import { t as generateAppRouteManifest } from "./routes-BHZ20uQX.mjs";
 import "./image-CL9iVW32.mjs";
-import "./server-build-y4PwbtX3.mjs";
+import "./server-build-VeqQZBax.mjs";
 
 export { ApiResponse, HttpRuntimeClient, RariRequest, RariResponse, clearPropsCache, clearPropsCacheForComponent, createHttpRuntimeClient, defineRariConfig, defineRariOptions, extractMetadata, extractServerProps, extractServerPropsWithCache, extractStaticParams, generateAppRouteManifest, hasServerSideDataFetching, rari, rariProxy, rariRouter };

package/package.json

@@ -1,112 +1,111 @@
 {
   "name": "rari",
-  "type": "module",
-  "version": "0.7.4",
-  "description": "Runtime Accelerated Rendering Infrastructure (Rari)",
+  "version": "0.7.5",
   "author": "Ryan Skinner",
-  "license": "MIT",
-  "homepage": "https://github.com/rari-build/rari#readme",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/rari-build/rari.git",
-    "directory": "packages/rari"
+  "bin": {
+    "rari": "./dist/cli.mjs"
   },
   "bugs": {
     "url": "https://github.com/rari-build/rari/issues"
   },
-  "keywords": [
-    "react",
-    "server-components",
-    "rsc",
-    "rust",
-    "vite",
-    "framework",
-    "performance",
-    "ssr",
-    "typescript",
-    "deno",
-    "v8",
-    "streaming",
-    "fast",
-    "zero-config",
-    "full-stack",
-    "web-framework"
-  ],
+  "dependencies": {
+    "acorn": "^8.15.0",
+    "esbuild": "^0.27.2",
+    "picocolors": "^1.1.1"
+  },
+  "description": "Runtime Accelerated Rendering Infrastructure (Rari)",
+  "devDependencies": {
+    "@types/node": "^25.0.9",
+    "@types/react": "^19.2.8",
+    "@typescript/native-preview": "^7.0.0-dev.20260118.1",
+    "chokidar": "^5.0.0",
+    "oxlint": "^1.39.0",
+    "rolldown-vite": "^7.3.1",
+    "tsdown": "^0.18.4"
+  },
+  "engines": {
+    "node": ">=20.0.0"
+  },
   "exports": {
     ".": {
-      "types": "./dist/vite.d.mts",
       "browser": "./dist/client.mjs",
+      "default": "./dist/vite.mjs",
       "node": "./dist/vite.mjs",
-      "default": "./dist/vite.mjs"
+      "types": "./dist/vite.d.mts"
     },
     "./client": {
-      "types": "./dist/client.d.mts",
-      "default": "./dist/client.mjs"
-    },
-    "./vite": {
-      "types": "./dist/vite.d.mts",
-      "default": "./dist/vite.mjs"
+      "default": "./dist/client.mjs",
+      "types": "./dist/client.d.mts"
     },
     "./image": {
-      "types": "./dist/image/index.d.mts",
-      "default": "./dist/image/index.mjs"
-    },
-    "./og": {
-      "types": "./dist/og/index.d.mts",
-      "default": "./dist/og/index.mjs"
+      "default": "./dist/image/index.mjs",
+      "types": "./dist/image/index.d.mts"
     },
     "./mdx": {
-      "types": "./dist/mdx.d.mts",
-      "default": "./dist/mdx.mjs"
+      "default": "./dist/mdx.mjs",
+      "types": "./dist/mdx.d.mts"
+    },
+    "./og": {
+      "default": "./dist/og/index.mjs",
+      "types": "./dist/og/index.d.mts"
     },
+    "./package.json": "./package.json",
     "./runtime/actions": {
-      "types": "./dist/runtime/actions.d.mts",
-      "default": "./dist/runtime/actions.mjs"
+      "default": "./dist/runtime/actions.mjs",
+      "types": "./dist/runtime/actions.d.mts"
     },
-    "./package.json": "./package.json"
-  },
-  "types": "dist/index.d.mts",
-  "bin": {
-    "rari": "./dist/cli.mjs"
+    "./vite": {
+      "default": "./dist/vite.mjs",
+      "types": "./dist/vite.d.mts"
+    }
   },
   "files": [
     "dist",
     "src"
   ],
-  "engines": {
-    "node": ">=20.0.0"
-  },
-  "scripts": {
-    "build": "pnpm clean && pnpm typecheck && tsdown",
-    "typecheck": "tsgo",
-    "clean": "rm -rf dist",
-    "lint": "oxlint && eslint",
-    "lint:fix": "oxlint --fix && eslint --fix"
+  "homepage": "https://github.com/rari-build/rari#readme",
+  "keywords": [
+    "react",
+    "server-components",
+    "rsc",
+    "rust",
+    "vite",
+    "framework",
+    "performance",
+    "ssr",
+    "typescript",
+    "deno",
+    "v8",
+    "streaming",
+    "fast",
+    "zero-config",
+    "full-stack",
+    "web-framework"
+  ],
+  "license": "MIT",
+  "optionalDependencies": {
+    "rari-darwin-arm64": "0.7.5",
+    "rari-darwin-x64": "0.7.5",
+    "rari-linux-arm64": "0.7.5",
+    "rari-linux-x64": "0.7.5",
+    "rari-win32-x64": "0.7.5"
   },
   "peerDependencies": {
     "react": "^19.0.0",
     "react-dom": "^19.0.0"
   },
-  "dependencies": {
-    "acorn": "^8.15.0",
-    "esbuild": "^0.27.2",
-    "picocolors": "^1.1.1"
+  "repository": {
+    "directory": "packages/rari",
+    "type": "git",
+    "url": "https://github.com/rari-build/rari.git"
   },
-  "optionalDependencies": {
-    "rari-darwin-arm64": "0.7.4",
-    "rari-darwin-x64": "0.7.4",
-    "rari-linux-arm64": "0.7.4",
-    "rari-linux-x64": "0.7.4",
-    "rari-win32-x64": "0.7.4"
+  "scripts": {
+    "build": "pnpm clean && pnpm typecheck && tsdown",
+    "clean": "rm -rf dist",
+    "lint": "oxlint",
+    "lint:fix": "oxlint --fix",
+    "typecheck": "tsgo"
   },
-  "devDependencies": {
-    "@types/node": "^25.0.8",
-    "@types/react": "^19.2.8",
-    "@typescript/native-preview": "^7.0.0-dev.20260114.1",
-    "chokidar": "^5.0.0",
-    "eslint": "^9.39.2",
-    "oxlint": "^1.39.0",
-    "rolldown-vite": "^7.3.1",
-    "tsdown": "^0.18.4"
-  }
+  "type": "module",
+  "types": "dist/index.d.mts"
 }

package/src/og/ImageResponse.tsx

@@ -3,12 +3,6 @@ import type { ReactElement } from 'react'
 export interface ImageResponseOptions {
   width?: number
   height?: number
-  fonts?: Array<{
-    name: string
-    data: ArrayBuffer
-    weight?: number
-    style?: 'normal' | 'italic'
-  }>
 }
 
 export interface ImageResponseSize {
@@ -25,7 +19,6 @@ export class ImageResponse {
     this.options = {
       width: options.width || 1200,
       height: options.height || 630,
-      fonts: options.fonts || [],
     }
   }
 

package/src/router/ClientRouter.tsx

@@ -292,10 +292,19 @@ export function ClientRouter({ children, initialRoute }: ClientRouterProps) {
       return
     }
 
-    const targetPath = normalizePath(href)
-
-    if (targetPath === currentRouteRef.current && !options.replace)
+    const [pathWithoutHash, hash] = href.includes('#') ? href.split('#') : [href, '']
+    const targetPath = normalizePath(pathWithoutHash)
+
+    if (targetPath === currentRouteRef.current && !options.replace) {
+      if (hash) {
+        const element = document.getElementById(hash)
+        if (element) {
+          element.scrollIntoView({ behavior: 'smooth', block: 'start' })
+          window.history.pushState(window.history.state, '', `${targetPath}#${hash}`)
+        }
+      }
       return
+    }
 
     const existingPending = pendingNavigationsRef.current.get(targetPath)
     if (existingPending)
@@ -326,18 +335,20 @@ export function ClientRouter({ children, initialRoute }: ClientRouterProps) {
           key: historyKey,
         }
 
+        const urlWithHash = hash ? `${targetPath}#${hash}` : targetPath
+
         if (options.replace) {
           window.history.replaceState(
             historyState,
             '',
-            targetPath,
+            urlWithHash,
           )
         }
         else {
           window.history.pushState(
             historyState,
             '',
-            targetPath,
+            urlWithHash,
           )
         }
 
@@ -359,6 +370,7 @@ export function ClientRouter({ children, initialRoute }: ClientRouterProps) {
         const actualTargetPath = finalPath !== targetPath ? finalPath : targetPath
 
         if (finalPath !== targetPath) {
+          const finalUrlWithHash = hash ? `${finalPath}#${hash}` : finalPath
           window.history.replaceState(
             {
               route: finalPath,
@@ -368,7 +380,7 @@ export function ClientRouter({ children, initialRoute }: ClientRouterProps) {
               key: options.historyKey || generateHistoryKey(),
             },
             '',
-            finalPath,
+            finalUrlWithHash,
           )
         }
 
@@ -482,6 +494,20 @@ export function ClientRouter({ children, initialRoute }: ClientRouterProps) {
               statePreserverRef.current.restoreState(actualTargetPath)
             })
           }
+          else if (hash) {
+            requestAnimationFrame(() => {
+              const scrollToHash = (attempts = 0) => {
+                const element = document.getElementById(hash)
+                if (element) {
+                  element.scrollIntoView({ behavior: 'smooth', block: 'start' })
+                }
+                else if (attempts < 10) {
+                  setTimeout(() => scrollToHash(attempts + 1), 50)
+                }
+              }
+              scrollToHash()
+            })
+          }
         }
 
         pendingNavigationsRef.current.delete(targetPath)
@@ -589,6 +615,17 @@ export function ClientRouter({ children, initialRoute }: ClientRouterProps) {
     if (isExternalUrl(href))
       return
 
+    if (href.startsWith('#')) {
+      event.preventDefault()
+      const hash = href.slice(1)
+      const element = document.getElementById(hash)
+      if (element) {
+        element.scrollIntoView({ behavior: 'smooth', block: 'start' })
+        window.history.pushState(window.history.state, '', href)
+      }
+      return
+    }
+
     event.preventDefault()
 
     const pathname = extractPathname(href)

package/src/router/navigation-utils.ts

@@ -151,7 +151,7 @@ export function isExternalUrl(url: string, currentOrigin?: string): boolean {
 export function extractPathname(url: string): string {
   try {
     const urlObj = new URL(url, window.location.origin)
-    return urlObj.pathname
+    return urlObj.pathname + urlObj.hash
   }
   catch {
     return url

package/src/router/props-extractor.ts

@@ -38,14 +38,6 @@ export interface MetadataResult {
     index?: boolean
     follow?: boolean
     nocache?: boolean
-    googleBot?: {
-      'index'?: boolean
-      'follow'?: boolean
-      'noimageindex'?: boolean
-      'max-video-preview'?: number
-      'max-image-preview'?: 'none' | 'standard' | 'large'
-      'max-snippet'?: number
-    }
   }
   icons?: {
     icon?: Array<{
@@ -77,24 +69,8 @@ export interface MetadataResult {
     statusBarStyle?: 'default' | 'black' | 'black-translucent'
     capable?: boolean
   }
-  viewport?: {
-    width?: string | number
-    height?: string | number
-    initialScale?: number
-    maximumScale?: number
-    minimumScale?: number
-    userScalable?: boolean
-  }
-  verification?: {
-    google?: string
-    yandex?: string
-    yahoo?: string
-    other?: Record<string, string>
-  }
-  alternates?: {
-    canonical?: string
-    languages?: Record<string, string>
-  }
+  viewport?: string
+  canonical?: string
 }
 
 export type StaticParamsResult = Array<Record<string, string | string[]>>
@@ -226,12 +202,14 @@ export function mergeMetadata(
     merged.icons = { ...parentMetadata.icons, ...childMetadata.icons }
   if (childMetadata.manifest !== undefined)
     merged.manifest = childMetadata.manifest
+  if (childMetadata.themeColor !== undefined)
+    merged.themeColor = childMetadata.themeColor
+  if (childMetadata.appleWebApp !== undefined)
+    merged.appleWebApp = { ...parentMetadata.appleWebApp, ...childMetadata.appleWebApp }
   if (childMetadata.viewport !== undefined)
-    merged.viewport = { ...parentMetadata.viewport, ...childMetadata.viewport }
-  if (childMetadata.verification !== undefined)
-    merged.verification = { ...parentMetadata.verification, ...childMetadata.verification }
-  if (childMetadata.alternates !== undefined)
-    merged.alternates = { ...parentMetadata.alternates, ...childMetadata.alternates }
+    merged.viewport = childMetadata.viewport
+  if (childMetadata.canonical !== undefined)
+    merged.canonical = childMetadata.canonical
 
   return merged
 }

package/src/router/routes.ts

@@ -357,15 +357,30 @@ class AppRouteGenerator {
 
   private sortRoutes(routes: AppRouteEntry[]): AppRouteEntry[] {
     return routes.sort((a, b) => {
-      if (!a.isDynamic && b.isDynamic)
-        return -1
-      if (a.isDynamic && !b.isDynamic)
+      const getSpecificity = (route: AppRouteEntry): number => {
+        if (!route.isDynamic)
+          return 0
+
+        const hasCatchAll = route.segments.some(s => s.type === 'catch-all')
+        const hasOptionalCatchAll = route.segments.some(s => s.type === 'optional-catch-all')
+
+        if (hasOptionalCatchAll)
+          return 3
+        if (hasCatchAll)
+          return 2
         return 1
+      }
+
+      const aSpec = getSpecificity(a)
+      const bSpec = getSpecificity(b)
+
+      if (aSpec !== bSpec)
+        return aSpec - bSpec
 
       const aDepth = a.path.split('/').length
       const bDepth = b.path.split('/').length
       if (aDepth !== bDepth)
-        return aDepth - bDepth
+        return bDepth - aDepth
 
       return a.path.localeCompare(b.path)
     })

package/src/runtime/entry-client.js

@@ -7,11 +7,38 @@ import { AppRouterProvider } from 'virtual:app-router-provider'
 import { createFromReadableStream } from 'virtual:react-server-dom-rari-client'
 import 'virtual:rsc-integration'
 
+function getClientComponent(id) {
+  if (globalThis['~clientComponents'][id]?.component)
+    return globalThis['~clientComponents'][id].component
+
+  if (id.includes('#')) {
+    const [path, exportName] = id.split('#')
+    const componentId = globalThis['~clientComponentPaths'][path]
+    if (componentId && globalThis['~clientComponents'][componentId]) {
+      const componentInfo = globalThis['~clientComponents'][componentId]
+      if (exportName === 'default' || !exportName)
+        return componentInfo.component
+    }
+
+    const normalizedPath = path.startsWith('./') ? path.slice(2) : path
+    const componentIdByNormalizedPath = globalThis['~clientComponentPaths'][normalizedPath]
+    if (componentIdByNormalizedPath && globalThis['~clientComponents'][componentIdByNormalizedPath])
+      return globalThis['~clientComponents'][componentIdByNormalizedPath].component
+  }
+
+  const componentId = globalThis['~clientComponentNames'][id]
+  if (componentId && globalThis['~clientComponents'][componentId])
+    return globalThis['~clientComponents'][componentId].component
+
+  return null
+}
+
 if (typeof globalThis['~rari'] === 'undefined') {
   globalThis['~rari'] = {}
 }
 globalThis['~rari'].AppRouterProvider = AppRouterProvider
 globalThis['~rari'].ClientRouter = ClientRouter
+globalThis['~rari'].getClientComponent = getClientComponent
 
 // CLIENT_COMPONENT_IMPORTS_PLACEHOLDER
 
@@ -138,6 +165,34 @@ export async function renderApp() {
 
   setupPartialHydration()
 
+  if (hasServerRenderedContent && !payloadScript && !hasBufferedRows) {
+    const clientComponentElements = document.querySelectorAll('[data-client-component]')
+    if (clientComponentElements.length > 0) {
+      clientComponentElements.forEach((element) => {
+        const componentId = element.getAttribute('data-client-component')
+        const propsJson = element.getAttribute('data-props')
+
+        if (!componentId)
+          return
+
+        try {
+          const Component = getClientComponent(componentId)
+          if (!Component)
+            return
+
+          const props = propsJson ? JSON.parse(propsJson) : {}
+          element.innerHTML = ''
+          const root = createRoot(element)
+          root.render(React.createElement(Component, props))
+        }
+        catch (error) {
+          console.error(`[Rari] Failed to hydrate client component ${componentId}:`, error)
+        }
+      })
+    }
+    return
+  }
+
   if (hasServerRenderedContent && hasBufferedRows && !payloadScript) {
     const hasBoundaries = document.querySelectorAll('[data-boundary-id]').length > 0
 
@@ -152,10 +207,6 @@ export async function renderApp() {
     }
   }
 
-  if (hasServerRenderedContent && !payloadScript && !hasBufferedRows) {
-    return
-  }
-
   try {
     let element
     const isFullDocument = false

package/src/vite/server-build.ts

@@ -82,6 +82,7 @@ export interface ServerBuildOptions {
   manifestPath?: string
   minify?: boolean
   alias?: Record<string, string>
+  define?: Record<string, string>
   csp?: {
     scriptSrc?: string[]
     styleSrc?: string[]
@@ -108,10 +109,11 @@ export interface ComponentRebuildResult {
   error?: string
 }
 
-type ResolvedServerBuildOptions = Required<Omit<ServerBuildOptions, 'csp' | 'rateLimit' | 'spamBlocker'>> & {
+type ResolvedServerBuildOptions = Required<Omit<ServerBuildOptions, 'csp' | 'rateLimit' | 'spamBlocker' | 'define'>> & {
   csp?: ServerBuildOptions['csp']
   rateLimit?: ServerBuildOptions['rateLimit']
   spamBlocker?: ServerBuildOptions['spamBlocker']
+  define?: ServerBuildOptions['define']
 }
 
 export class ServerComponentBuilder {
@@ -156,6 +158,7 @@ export class ServerComponentBuilder {
       manifestPath: options.manifestPath || 'server/manifest.json',
       minify: options.minify ?? process.env.NODE_ENV === 'production',
       alias: options.alias || {},
+      define: options.define,
       csp: options.csp,
       rateLimit: options.rateLimit,
       spamBlocker: options.spamBlocker,
@@ -443,6 +446,7 @@ const ${importName} = (props) => {
         define: {
           'global': 'globalThis',
           'process.env.NODE_ENV': '"production"',
+          ...this.options.define,
         },
         loader: {
           '.ts': 'ts',
@@ -763,6 +767,7 @@ const ${importName} = (props) => {
         define: {
           'global': 'globalThis',
           'process.env.NODE_ENV': '"production"',
+          ...this.options.define,
         },
         loader: {
           '.ts': 'ts',

package/dist/routes-BoXHLBse.mjs

@@ -1,3 +0,0 @@
-import { t as generateAppRouteManifest } from "./routes-B_KAzmbj.mjs";
-
-export { generateAppRouteManifest };

package/dist/server-build-Qxg1F-98.mjs

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