@alepha/react 0.7.6 → 0.7.7

package/dist/index.d.cts

@@ -1,19 +1,20 @@
-import * as _alepha_core11 from "@alepha/core";
+import * as _alepha_core12 from "@alepha/core";
 import * as _alepha_core18 from "@alepha/core";
-import * as _alepha_core15 from "@alepha/core";
+import * as _alepha_core16 from "@alepha/core";
 import * as _alepha_core6 from "@alepha/core";
 import { Alepha, Async, KIND, Module, OPTIONS, Service, Static, TObject, TSchema } from "@alepha/core";
-import { ApiLinksResponse, ClientScope, HttpClient, HttpVirtualClient, ServerHandler, ServerRequest, ServerRouterProvider, ServerTimingProvider } from "@alepha/server";
-import * as _sinclair_typebox10 from "@sinclair/typebox";
+import { ApiLinksResponse, ServerHandler, ServerRequest, ServerRouterProvider, ServerTimingProvider } from "@alepha/server";
+import * as _sinclair_typebox11 from "@sinclair/typebox";
 import * as _sinclair_typebox1 from "@sinclair/typebox";
+import * as react23 from "react";
 import * as react24 from "react";
-import * as react22 from "react";
 import React, { AnchorHTMLAttributes, ErrorInfo, FC, PropsWithChildren, ReactNode } from "react";
 import { ServerRouteCache } from "@alepha/server-cache";
+import { ClientScope, HttpVirtualClient, LinkProvider } from "@alepha/server-links";
 import { Root } from "react-dom/client";
 import { Route, RouterProvider } from "@alepha/router";
-import * as react_jsx_runtime20 from "react/jsx-runtime";
-import * as react_jsx_runtime23 from "react/jsx-runtime";
+import * as react_jsx_runtime21 from "react/jsx-runtime";
+import * as react_jsx_runtime22 from "react/jsx-runtime";
 import { ServerStaticProvider } from "@alepha/server-static";
 
 //#region src/components/ClientOnly.d.ts
@@ -111,7 +112,6 @@ interface PageDescriptorOptions<TConfig extends PageConfigSchema = PageConfigSch
     [OPTIONS]: PageDescriptorOptions<PageConfigSchema, TPropsParent>;
   };
   can?: () => boolean;
-  head?: Head | ((props: TProps, previous?: Head) => Head);
   errorHandler?: (error: Error) => ReactNode;
   prerender?: boolean | {
     entries?: Array<Partial<PageRequestConfig<TConfig>>>;
@@ -142,49 +142,13 @@ declare const $page: {
 interface PageDescriptorRenderOptions {
   params?: Record<string, string>;
   query?: Record<string, string>;
-  withLayout?: boolean;
+  html?: boolean;
+  hydration?: boolean;
 }
 interface PageDescriptorRenderResult {
   html: string;
   context: PageReactContext;
 }
-interface Head {
-  title?: string;
-  description?: string;
-  titleSeparator?: string;
-  htmlAttributes?: Record<string, string>;
-  bodyAttributes?: Record<string, string>;
-  meta?: Array<{
-    name: string;
-    content: string;
-  }>;
-  keywords?: string[];
-  author?: string;
-  robots?: string;
-  themeColor?: string;
-  viewport?: string | {
-    width?: string;
-    height?: string;
-    initialScale?: string;
-    maximumScale?: string;
-    userScalable?: "no" | "yes" | "0" | "1";
-    interactiveWidget?: "resizes-visual" | "resizes-content" | "overlays-content";
-  };
-  og?: {
-    title?: string;
-    description?: string;
-    image?: string;
-    url?: string;
-    type?: string;
-  };
-  twitter?: {
-    card?: string;
-    title?: string;
-    description?: string;
-    image?: string;
-    site?: string;
-  };
-}
 interface PageRequestConfig<TConfig extends PageConfigSchema = PageConfigSchema> {
   params: TConfig["params"] extends TSchema ? Static<TConfig["params"]> : Record<string, string>;
   query: TConfig["query"] extends TSchema ? Static<TConfig["query"]> : Record<string, string>;
@@ -192,14 +156,14 @@ interface PageRequestConfig<TConfig extends PageConfigSchema = PageConfigSchema>
 type PageResolve<TConfig extends PageConfigSchema = PageConfigSchema, TPropsParent extends object = TPropsParentDefault> = PageRequestConfig<TConfig> & TPropsParent & PageReactContext;
 //#endregion
 //#region src/providers/PageDescriptorProvider.d.ts
-declare const envSchema$1: _alepha_core11.TObject<{
-  REACT_STRICT_MODE: _sinclair_typebox10.TBoolean;
+declare const envSchema$1: _alepha_core12.TObject<{
+  REACT_STRICT_MODE: _sinclair_typebox11.TBoolean;
 }>;
 declare module "@alepha/core" {
   interface Env extends Partial<Static<typeof envSchema$1>> {}
 }
 declare class PageDescriptorProvider {
-  protected readonly log: _alepha_core11.Logger;
+  protected readonly log: _alepha_core12.Logger;
   protected readonly env: {
     REACT_STRICT_MODE: boolean;
   };
@@ -215,7 +179,6 @@ declare class PageDescriptorProvider {
   createLayers(route: PageRoute, request: PageRequest): Promise<CreateLayersResult>;
   protected getErrorHandler(route: PageRoute): ((error: Error) => ReactNode) | undefined;
   protected createElement(page: PageRoute, props: Record<string, any>): Promise<ReactNode>;
-  protected fillHead(page: PageRoute, ctx: PageRequest, props: Record<string, any>): void;
   renderError(error: Error): ReactNode;
   renderEmptyView(): ReactNode;
   href(page: {
@@ -225,7 +188,7 @@ declare class PageDescriptorProvider {
   }, params?: Record<string, any>): string;
   compile(path: string, params?: Record<string, string>): string;
   protected renderView(index: number, path: string, view: ReactNode | undefined, page: PageRoute): ReactNode;
-  protected readonly configure: _alepha_core11.HookDescriptor<"configure">;
+  protected readonly configure: _alepha_core12.HookDescriptor<"configure">;
   protected map(pages: Array<{
     value: {
       [OPTIONS]: PageDescriptorOptions;
@@ -261,6 +224,7 @@ interface Layer {
   element: ReactNode;
   index: number;
   path: string;
+  route?: PageRoute;
 }
 type PreviousLayerData = Omit<Layer, "element" | "index" | "path">;
 interface AnchorProps {
@@ -302,33 +266,10 @@ interface CreateLayersResult extends RouterState {
  */
 interface PageReactContext {
   url: URL;
-  head: Head;
   onError: (error: Error) => ReactNode;
   links?: ApiLinksResponse;
 }
 //#endregion
-//#region src/providers/ServerHeadProvider.d.ts
-interface Head$1 {
-  title?: string;
-  htmlAttributes?: Record<string, string>;
-  bodyAttributes?: Record<string, string>;
-  meta?: Array<{
-    name: string;
-    content: string;
-  }>;
-}
-declare class ServerHeadProvider {
-  renderHead(template: string, head: Head$1): string;
-  mergeAttributes(existing: string, attrs: Record<string, string>): string;
-  parseAttributes(attrStr: string): Record<string, string>;
-  escapeHtml(str: string): string;
-}
-//#endregion
-//#region src/providers/BrowserHeadProvider.d.ts
-declare class BrowserHeadProvider {
-  renderHead(document: Document, head: Head$1): void;
-}
-//#endregion
 //#region src/providers/BrowserRouterProvider.d.ts
 interface BrowserRoute extends Route {
   page: PageRoute;
@@ -345,11 +286,10 @@ declare class BrowserRouterProvider extends RouterProvider<BrowserRoute> {
 //#endregion
 //#region src/providers/ReactBrowserProvider.d.ts
 declare class ReactBrowserProvider {
-  protected readonly log: _alepha_core15.Logger;
-  protected readonly client: HttpClient;
+  protected readonly log: _alepha_core16.Logger;
+  protected readonly client: LinkProvider;
   protected readonly alepha: Alepha;
   protected readonly router: BrowserRouterProvider;
-  protected readonly headProvider: BrowserHeadProvider;
   protected root: Root;
   transitioning?: {
     to: string;
@@ -368,8 +308,7 @@ declare class ReactBrowserProvider {
    * Get embedded layers from the server.
    */
   protected getHydrationState(): ReactHydrationState | undefined;
-  readonly ready: _alepha_core15.HookDescriptor<"ready">;
-  readonly onTransitionEnd: _alepha_core15.HookDescriptor<"react:transition:end">;
+  readonly ready: _alepha_core16.HookDescriptor<"ready">;
 }
 interface RouterGoOptions {
   replace?: boolean;
@@ -426,7 +365,7 @@ interface LinkProps extends AnchorHTMLAttributes<HTMLAnchorElement> {
   to: string | PageDescriptor;
   children?: React.ReactNode;
 }
-declare const Link: (props: LinkProps) => react_jsx_runtime20.JSX.Element | null;
+declare const Link: (props: LinkProps) => react_jsx_runtime21.JSX.Element | null;
 //#endregion
 //#region src/components/NestedView.d.ts
 interface NestedViewProps {
@@ -453,7 +392,7 @@ interface NestedViewProps {
  * }
  * ```
  */
-declare const NestedView: (props: NestedViewProps) => react_jsx_runtime23.JSX.Element;
+declare const NestedView: (props: NestedViewProps) => react_jsx_runtime22.JSX.Element;
 //#endregion
 //#region src/contexts/RouterContext.d.ts
 interface RouterContextValue {
@@ -461,14 +400,14 @@ interface RouterContextValue {
   state: RouterState;
   context: PageReactContext;
 }
-declare const RouterContext: react24.Context<RouterContextValue | undefined>;
+declare const RouterContext: react23.Context<RouterContextValue | undefined>;
 //#endregion
 //#region src/contexts/RouterLayerContext.d.ts
 interface RouterLayerContextValue {
   index: number;
   path: string;
 }
-declare const RouterLayerContext: react22.Context<RouterLayerContextValue | undefined>;
+declare const RouterLayerContext: react24.Context<RouterLayerContextValue | undefined>;
 //#endregion
 //#region src/hooks/RouterHookApi.d.ts
 declare class RouterHookApi {
@@ -597,7 +536,6 @@ declare class ReactServerProvider {
   protected readonly pageDescriptorProvider: PageDescriptorProvider;
   protected readonly serverStaticProvider: ServerStaticProvider;
   protected readonly serverRouterProvider: ServerRouterProvider;
-  protected readonly headProvider: ServerHeadProvider;
   protected readonly serverTimingProvider: ServerTimingProvider;
   protected readonly env: {
     REACT_SSR_ENABLED?: boolean | undefined;
@@ -607,7 +545,7 @@ declare class ReactServerProvider {
   };
   protected readonly ROOT_DIV_REGEX: RegExp;
   readonly onConfigure: _alepha_core6.HookDescriptor<"configure">;
-  get template(): string | undefined;
+  get template(): string;
   protected registerPages(templateLoader: TemplateLoader): Promise<void>;
   protected getPublicDirectory(): string;
   protected configureStaticServer(root: string): Promise<void>;
@@ -615,15 +553,16 @@ declare class ReactServerProvider {
   /**
    * For testing purposes, creates a render function that can be used.
    */
-  protected createRenderFunction(name: string, withIndex?: boolean): (options?: {
-    params?: Record<string, string>;
-    query?: Record<string, string>;
-  }) => Promise<{
+  protected createRenderFunction(name: string, withIndex?: boolean): (options?: PageDescriptorRenderOptions) => Promise<{
+    context: PageRequest;
+    state: CreateLayersResult;
+    html: string;
+  } | {
     context: PageRequest;
     html: string;
   }>;
   protected createHandler(page: PageRoute, templateLoader: TemplateLoader): ServerHandler;
-  renderToHtml(template: string, state: RouterState, context: PageReactContext): string;
+  renderToHtml(template: string, state: RouterState, context: PageReactContext, hydration?: boolean): string;
   protected fillTemplate(response: {
     html: string;
   }, app: string, script: string): void;
@@ -633,21 +572,33 @@ type TemplateLoader = () => Promise<string | undefined>;
 //#region src/index.d.ts
 declare module "@alepha/core" {
   interface Hooks {
+    "react:router:createLayers": {
+      request: ServerRequest;
+      context: PageRequest;
+      layers: PageRequest[];
+    };
+    "react:server:render:begin": {
+      request?: ServerRequest;
+      context: PageRequest;
+    };
+    "react:server:render:end": {
+      request?: ServerRequest;
+      context: PageRequest;
+      state: RouterState;
+      html: string;
+    };
     "react:browser:render": {
       state: RouterState;
       context: PageReactContext;
       hydration?: ReactHydrationState;
     };
-    "react:server:render": {
-      request: ServerRequest;
-      pageRequest: PageRequest;
-    };
     "react:transition:begin": {
       state: RouterState;
       context: PageReactContext;
     };
     "react:transition:success": {
       state: RouterState;
+      context: PageReactContext;
     };
     "react:transition:error": {
       error: Error;
@@ -674,5 +625,5 @@ declare class AlephaReact implements Module {
   readonly $services: (alepha: Alepha) => Alepha;
 }
 //#endregion
-export { $page, AlephaReact, AnchorProps, ClientOnly, CreateLayersResult, ErrorBoundary, Head, HrefLike, Layer, Link, NestedView, PageConfigSchema, PageDescriptor, PageDescriptorOptions, PageDescriptorProvider, PageDescriptorRenderOptions, PageDescriptorRenderResult, PageReactContext, PageRequest, PageRequestConfig, PageResolve, PageRoute, PageRouteEntry, PreviousLayerData, ReactBrowserProvider, ReactHydrationState, ReactServerProvider, RedirectionError, RouterContext, RouterContextValue, RouterGoOptions, RouterHookApi, RouterLayerContext, RouterLayerContextValue, RouterRenderResult, RouterStackItem, RouterState, TPropsDefault, TPropsParentDefault, TransitionOptions, UseActiveHook, UseQueryParamsHookOptions, VirtualRouter, isPageRoute, useActive, useAlepha, useClient, useInject, useQueryParams, useRouter, useRouterEvents, useRouterState };
+export { $page, AlephaReact, AnchorProps, ClientOnly, CreateLayersResult, ErrorBoundary, HrefLike, Layer, Link, NestedView, PageConfigSchema, PageDescriptor, PageDescriptorOptions, PageDescriptorProvider, PageDescriptorRenderOptions, PageDescriptorRenderResult, PageReactContext, PageRequest, PageRequestConfig, PageResolve, PageRoute, PageRouteEntry, PreviousLayerData, ReactBrowserProvider, ReactHydrationState, ReactServerProvider, RedirectionError, RouterContext, RouterContextValue, RouterGoOptions, RouterHookApi, RouterLayerContext, RouterLayerContextValue, RouterRenderResult, RouterStackItem, RouterState, TPropsDefault, TPropsParentDefault, TransitionOptions, UseActiveHook, UseQueryParamsHookOptions, VirtualRouter, isPageRoute, useActive, useAlepha, useClient, useInject, useQueryParams, useRouter, useRouterEvents, useRouterState };
 //# sourceMappingURL=index.d.cts.map

package/dist/index.d.ts

@@ -1,19 +1,20 @@
-import * as _alepha_core2 from "@alepha/core";
+import * as _alepha_core12 from "@alepha/core";
 import * as _alepha_core23 from "@alepha/core";
-import * as _alepha_core15 from "@alepha/core";
-import * as _alepha_core11 from "@alepha/core";
+import * as _alepha_core16 from "@alepha/core";
+import * as _alepha_core6 from "@alepha/core";
 import { Alepha, Async, KIND, Module, OPTIONS, Service, Static, TObject, TSchema } from "@alepha/core";
-import { ApiLinksResponse, ClientScope, HttpClient, HttpVirtualClient, ServerHandler, ServerRequest, ServerRouterProvider, ServerTimingProvider } from "@alepha/server";
+import { ApiLinksResponse, ServerHandler, ServerRequest, ServerRouterProvider, ServerTimingProvider } from "@alepha/server";
 import { ServerRouteCache } from "@alepha/server-cache";
-import * as react18 from "react";
-import * as react21 from "react";
+import * as react19 from "react";
+import * as react20 from "react";
 import React, { AnchorHTMLAttributes, ErrorInfo, FC, PropsWithChildren, ReactNode } from "react";
-import * as react_jsx_runtime20 from "react/jsx-runtime";
 import * as react_jsx_runtime22 from "react/jsx-runtime";
+import * as react_jsx_runtime21 from "react/jsx-runtime";
+import { ClientScope, HttpVirtualClient, LinkProvider } from "@alepha/server-links";
 import { ServerStaticProvider } from "@alepha/server-static";
 import { Route, RouterProvider } from "@alepha/router";
+import * as _sinclair_typebox11 from "@sinclair/typebox";
 import * as _sinclair_typebox1 from "@sinclair/typebox";
-import * as _sinclair_typebox6 from "@sinclair/typebox";
 import { Root } from "react-dom/client";
 
 //#region src/components/ClientOnly.d.ts
@@ -111,7 +112,6 @@ interface PageDescriptorOptions<TConfig extends PageConfigSchema = PageConfigSch
     [OPTIONS]: PageDescriptorOptions<PageConfigSchema, TPropsParent>;
   };
   can?: () => boolean;
-  head?: Head | ((props: TProps, previous?: Head) => Head);
   errorHandler?: (error: Error) => ReactNode;
   prerender?: boolean | {
     entries?: Array<Partial<PageRequestConfig<TConfig>>>;
@@ -142,49 +142,13 @@ declare const $page: {
 interface PageDescriptorRenderOptions {
   params?: Record<string, string>;
   query?: Record<string, string>;
-  withLayout?: boolean;
+  html?: boolean;
+  hydration?: boolean;
 }
 interface PageDescriptorRenderResult {
   html: string;
   context: PageReactContext;
 }
-interface Head {
-  title?: string;
-  description?: string;
-  titleSeparator?: string;
-  htmlAttributes?: Record<string, string>;
-  bodyAttributes?: Record<string, string>;
-  meta?: Array<{
-    name: string;
-    content: string;
-  }>;
-  keywords?: string[];
-  author?: string;
-  robots?: string;
-  themeColor?: string;
-  viewport?: string | {
-    width?: string;
-    height?: string;
-    initialScale?: string;
-    maximumScale?: string;
-    userScalable?: "no" | "yes" | "0" | "1";
-    interactiveWidget?: "resizes-visual" | "resizes-content" | "overlays-content";
-  };
-  og?: {
-    title?: string;
-    description?: string;
-    image?: string;
-    url?: string;
-    type?: string;
-  };
-  twitter?: {
-    card?: string;
-    title?: string;
-    description?: string;
-    image?: string;
-    site?: string;
-  };
-}
 interface PageRequestConfig<TConfig extends PageConfigSchema = PageConfigSchema> {
   params: TConfig["params"] extends TSchema ? Static<TConfig["params"]> : Record<string, string>;
   query: TConfig["query"] extends TSchema ? Static<TConfig["query"]> : Record<string, string>;
@@ -192,14 +156,14 @@ interface PageRequestConfig<TConfig extends PageConfigSchema = PageConfigSchema>
 type PageResolve<TConfig extends PageConfigSchema = PageConfigSchema, TPropsParent extends object = TPropsParentDefault> = PageRequestConfig<TConfig> & TPropsParent & PageReactContext;
 //#endregion
 //#region src/providers/PageDescriptorProvider.d.ts
-declare const envSchema$1: _alepha_core2.TObject<{
-  REACT_STRICT_MODE: _sinclair_typebox1.TBoolean;
+declare const envSchema$1: _alepha_core12.TObject<{
+  REACT_STRICT_MODE: _sinclair_typebox11.TBoolean;
 }>;
 declare module "@alepha/core" {
   interface Env extends Partial<Static<typeof envSchema$1>> {}
 }
 declare class PageDescriptorProvider {
-  protected readonly log: _alepha_core2.Logger;
+  protected readonly log: _alepha_core12.Logger;
   protected readonly env: {
     REACT_STRICT_MODE: boolean;
   };
@@ -215,7 +179,6 @@ declare class PageDescriptorProvider {
   createLayers(route: PageRoute, request: PageRequest): Promise<CreateLayersResult>;
   protected getErrorHandler(route: PageRoute): ((error: Error) => ReactNode) | undefined;
   protected createElement(page: PageRoute, props: Record<string, any>): Promise<ReactNode>;
-  protected fillHead(page: PageRoute, ctx: PageRequest, props: Record<string, any>): void;
   renderError(error: Error): ReactNode;
   renderEmptyView(): ReactNode;
   href(page: {
@@ -225,7 +188,7 @@ declare class PageDescriptorProvider {
   }, params?: Record<string, any>): string;
   compile(path: string, params?: Record<string, string>): string;
   protected renderView(index: number, path: string, view: ReactNode | undefined, page: PageRoute): ReactNode;
-  protected readonly configure: _alepha_core2.HookDescriptor<"configure">;
+  protected readonly configure: _alepha_core12.HookDescriptor<"configure">;
   protected map(pages: Array<{
     value: {
       [OPTIONS]: PageDescriptorOptions;
@@ -261,6 +224,7 @@ interface Layer {
   element: ReactNode;
   index: number;
   path: string;
+  route?: PageRoute;
 }
 type PreviousLayerData = Omit<Layer, "element" | "index" | "path">;
 interface AnchorProps {
@@ -302,33 +266,10 @@ interface CreateLayersResult extends RouterState {
  */
 interface PageReactContext {
   url: URL;
-  head: Head;
   onError: (error: Error) => ReactNode;
   links?: ApiLinksResponse;
 }
 //#endregion
-//#region src/providers/ServerHeadProvider.d.ts
-interface Head$1 {
-  title?: string;
-  htmlAttributes?: Record<string, string>;
-  bodyAttributes?: Record<string, string>;
-  meta?: Array<{
-    name: string;
-    content: string;
-  }>;
-}
-declare class ServerHeadProvider {
-  renderHead(template: string, head: Head$1): string;
-  mergeAttributes(existing: string, attrs: Record<string, string>): string;
-  parseAttributes(attrStr: string): Record<string, string>;
-  escapeHtml(str: string): string;
-}
-//#endregion
-//#region src/providers/BrowserHeadProvider.d.ts
-declare class BrowserHeadProvider {
-  renderHead(document: Document, head: Head$1): void;
-}
-//#endregion
 //#region src/providers/BrowserRouterProvider.d.ts
 interface BrowserRoute extends Route {
   page: PageRoute;
@@ -345,11 +286,10 @@ declare class BrowserRouterProvider extends RouterProvider<BrowserRoute> {
 //#endregion
 //#region src/providers/ReactBrowserProvider.d.ts
 declare class ReactBrowserProvider {
-  protected readonly log: _alepha_core15.Logger;
-  protected readonly client: HttpClient;
+  protected readonly log: _alepha_core16.Logger;
+  protected readonly client: LinkProvider;
   protected readonly alepha: Alepha;
   protected readonly router: BrowserRouterProvider;
-  protected readonly headProvider: BrowserHeadProvider;
   protected root: Root;
   transitioning?: {
     to: string;
@@ -368,8 +308,7 @@ declare class ReactBrowserProvider {
    * Get embedded layers from the server.
    */
   protected getHydrationState(): ReactHydrationState | undefined;
-  readonly ready: _alepha_core15.HookDescriptor<"ready">;
-  readonly onTransitionEnd: _alepha_core15.HookDescriptor<"react:transition:end">;
+  readonly ready: _alepha_core16.HookDescriptor<"ready">;
 }
 interface RouterGoOptions {
   replace?: boolean;
@@ -426,7 +365,7 @@ interface LinkProps extends AnchorHTMLAttributes<HTMLAnchorElement> {
   to: string | PageDescriptor;
   children?: React.ReactNode;
 }
-declare const Link: (props: LinkProps) => react_jsx_runtime20.JSX.Element | null;
+declare const Link: (props: LinkProps) => react_jsx_runtime22.JSX.Element | null;
 //#endregion
 //#region src/components/NestedView.d.ts
 interface NestedViewProps {
@@ -453,7 +392,7 @@ interface NestedViewProps {
  * }
  * ```
  */
-declare const NestedView: (props: NestedViewProps) => react_jsx_runtime22.JSX.Element;
+declare const NestedView: (props: NestedViewProps) => react_jsx_runtime21.JSX.Element;
 //#endregion
 //#region src/contexts/RouterContext.d.ts
 interface RouterContextValue {
@@ -461,14 +400,14 @@ interface RouterContextValue {
   state: RouterState;
   context: PageReactContext;
 }
-declare const RouterContext: react18.Context<RouterContextValue | undefined>;
+declare const RouterContext: react19.Context<RouterContextValue | undefined>;
 //#endregion
 //#region src/contexts/RouterLayerContext.d.ts
 interface RouterLayerContextValue {
   index: number;
   path: string;
 }
-declare const RouterLayerContext: react21.Context<RouterLayerContextValue | undefined>;
+declare const RouterLayerContext: react20.Context<RouterLayerContextValue | undefined>;
 //#endregion
 //#region src/hooks/RouterHookApi.d.ts
 declare class RouterHookApi {
@@ -578,11 +517,11 @@ declare const useRouterEvents: (opts?: {
 declare const useRouterState: () => RouterState;
 //#endregion
 //#region src/providers/ReactServerProvider.d.ts
-declare const envSchema: _alepha_core11.TObject<{
-  REACT_SERVER_DIST: _sinclair_typebox6.TString;
-  REACT_SERVER_PREFIX: _sinclair_typebox6.TString;
-  REACT_SSR_ENABLED: _sinclair_typebox6.TOptional<_sinclair_typebox6.TBoolean>;
-  REACT_ROOT_ID: _sinclair_typebox6.TString;
+declare const envSchema: _alepha_core6.TObject<{
+  REACT_SERVER_DIST: _sinclair_typebox1.TString;
+  REACT_SERVER_PREFIX: _sinclair_typebox1.TString;
+  REACT_SSR_ENABLED: _sinclair_typebox1.TOptional<_sinclair_typebox1.TBoolean>;
+  REACT_ROOT_ID: _sinclair_typebox1.TString;
 }>;
 declare module "@alepha/core" {
   interface Env extends Partial<Static<typeof envSchema>> {}
@@ -592,12 +531,11 @@ declare module "@alepha/core" {
   }
 }
 declare class ReactServerProvider {
-  protected readonly log: _alepha_core11.Logger;
+  protected readonly log: _alepha_core6.Logger;
   protected readonly alepha: Alepha;
   protected readonly pageDescriptorProvider: PageDescriptorProvider;
   protected readonly serverStaticProvider: ServerStaticProvider;
   protected readonly serverRouterProvider: ServerRouterProvider;
-  protected readonly headProvider: ServerHeadProvider;
   protected readonly serverTimingProvider: ServerTimingProvider;
   protected readonly env: {
     REACT_SSR_ENABLED?: boolean | undefined;
@@ -606,8 +544,8 @@ declare class ReactServerProvider {
     REACT_ROOT_ID: string;
   };
   protected readonly ROOT_DIV_REGEX: RegExp;
-  readonly onConfigure: _alepha_core11.HookDescriptor<"configure">;
-  get template(): string | undefined;
+  readonly onConfigure: _alepha_core6.HookDescriptor<"configure">;
+  get template(): string;
   protected registerPages(templateLoader: TemplateLoader): Promise<void>;
   protected getPublicDirectory(): string;
   protected configureStaticServer(root: string): Promise<void>;
@@ -615,15 +553,16 @@ declare class ReactServerProvider {
   /**
    * For testing purposes, creates a render function that can be used.
    */
-  protected createRenderFunction(name: string, withIndex?: boolean): (options?: {
-    params?: Record<string, string>;
-    query?: Record<string, string>;
-  }) => Promise<{
+  protected createRenderFunction(name: string, withIndex?: boolean): (options?: PageDescriptorRenderOptions) => Promise<{
+    context: PageRequest;
+    state: CreateLayersResult;
+    html: string;
+  } | {
     context: PageRequest;
     html: string;
   }>;
   protected createHandler(page: PageRoute, templateLoader: TemplateLoader): ServerHandler;
-  renderToHtml(template: string, state: RouterState, context: PageReactContext): string;
+  renderToHtml(template: string, state: RouterState, context: PageReactContext, hydration?: boolean): string;
   protected fillTemplate(response: {
     html: string;
   }, app: string, script: string): void;
@@ -633,21 +572,33 @@ type TemplateLoader = () => Promise<string | undefined>;
 //#region src/index.d.ts
 declare module "@alepha/core" {
   interface Hooks {
+    "react:router:createLayers": {
+      request: ServerRequest;
+      context: PageRequest;
+      layers: PageRequest[];
+    };
+    "react:server:render:begin": {
+      request?: ServerRequest;
+      context: PageRequest;
+    };
+    "react:server:render:end": {
+      request?: ServerRequest;
+      context: PageRequest;
+      state: RouterState;
+      html: string;
+    };
     "react:browser:render": {
       state: RouterState;
       context: PageReactContext;
       hydration?: ReactHydrationState;
     };
-    "react:server:render": {
-      request: ServerRequest;
-      pageRequest: PageRequest;
-    };
     "react:transition:begin": {
       state: RouterState;
       context: PageReactContext;
     };
     "react:transition:success": {
       state: RouterState;
+      context: PageReactContext;
     };
     "react:transition:error": {
       error: Error;
@@ -674,5 +625,5 @@ declare class AlephaReact implements Module {
   readonly $services: (alepha: Alepha) => Alepha;
 }
 //#endregion
-export { $page, AlephaReact, AnchorProps, ClientOnly, CreateLayersResult, ErrorBoundary, Head, HrefLike, Layer, Link, NestedView, PageConfigSchema, PageDescriptor, PageDescriptorOptions, PageDescriptorProvider, PageDescriptorRenderOptions, PageDescriptorRenderResult, PageReactContext, PageRequest, PageRequestConfig, PageResolve, PageRoute, PageRouteEntry, PreviousLayerData, ReactBrowserProvider, ReactHydrationState, ReactServerProvider, RedirectionError, RouterContext, RouterContextValue, RouterGoOptions, RouterHookApi, RouterLayerContext, RouterLayerContextValue, RouterRenderResult, RouterStackItem, RouterState, TPropsDefault, TPropsParentDefault, TransitionOptions, UseActiveHook, UseQueryParamsHookOptions, VirtualRouter, isPageRoute, useActive, useAlepha, useClient, useInject, useQueryParams, useRouter, useRouterEvents, useRouterState };
+export { $page, AlephaReact, AnchorProps, ClientOnly, CreateLayersResult, ErrorBoundary, HrefLike, Layer, Link, NestedView, PageConfigSchema, PageDescriptor, PageDescriptorOptions, PageDescriptorProvider, PageDescriptorRenderOptions, PageDescriptorRenderResult, PageReactContext, PageRequest, PageRequestConfig, PageResolve, PageRoute, PageRouteEntry, PreviousLayerData, ReactBrowserProvider, ReactHydrationState, ReactServerProvider, RedirectionError, RouterContext, RouterContextValue, RouterGoOptions, RouterHookApi, RouterLayerContext, RouterLayerContextValue, RouterRenderResult, RouterStackItem, RouterState, TPropsDefault, TPropsParentDefault, TransitionOptions, UseActiveHook, UseQueryParamsHookOptions, VirtualRouter, isPageRoute, useActive, useAlepha, useClient, useInject, useQueryParams, useRouter, useRouterEvents, useRouterState };
 //# sourceMappingURL=index.d.ts.map