@alepha/react 0.7.3 → 0.7.5

package/dist/index.browser.cjs

@@ -1,7 +1,7 @@
 'use strict';
 
 var core = require('@alepha/core');
-var useRouterState = require('./useRouterState-C2uo0jXu.cjs');
+var useRouterState = require('./useRouterState-BTmuHxkM.cjs');
 var client = require('react-dom/client');
 require('react/jsx-runtime');
 require('react');
@@ -45,24 +45,25 @@ class ReactBrowserRenderer {
   });
 }
 
-class ReactModule {
-  alepha = core.$inject(core.Alepha);
-  constructor() {
-    this.alepha.with(useRouterState.PageDescriptorProvider).with(useRouterState.ReactBrowserProvider).with(useRouterState.BrowserRouterProvider).with(ReactBrowserRenderer);
-  }
+class AlephaReact {
+  name = "alepha.react";
+  $services = (alepha) => alepha.with(useRouterState.PageDescriptorProvider).with(useRouterState.ReactBrowserProvider).with(useRouterState.BrowserRouterProvider).with(ReactBrowserRenderer);
 }
-core.__bind(useRouterState.$page, ReactModule);
+core.__bind(useRouterState.$page, AlephaReact);
 
 exports.$page = useRouterState.$page;
+exports.BrowserRouterProvider = useRouterState.BrowserRouterProvider;
 exports.ClientOnly = useRouterState.ClientOnly;
 exports.ErrorBoundary = useRouterState.ErrorBoundary;
 exports.Link = useRouterState.Link;
 exports.NestedView = useRouterState.NestedView;
+exports.PageDescriptorProvider = useRouterState.PageDescriptorProvider;
 exports.ReactBrowserProvider = useRouterState.ReactBrowserProvider;
 exports.RedirectionError = useRouterState.RedirectionError;
 exports.RouterContext = useRouterState.RouterContext;
 exports.RouterHookApi = useRouterState.RouterHookApi;
 exports.RouterLayerContext = useRouterState.RouterLayerContext;
+exports.isPageRoute = useRouterState.isPageRoute;
 exports.useActive = useRouterState.useActive;
 exports.useAlepha = useRouterState.useAlepha;
 exports.useClient = useRouterState.useClient;
@@ -71,4 +72,4 @@ exports.useQueryParams = useRouterState.useQueryParams;
 exports.useRouter = useRouterState.useRouter;
 exports.useRouterEvents = useRouterState.useRouterEvents;
 exports.useRouterState = useRouterState.useRouterState;
-exports.ReactModule = ReactModule;
+exports.AlephaReact = AlephaReact;

package/dist/index.browser.js

@@ -1,6 +1,6 @@
-import { t, $inject, $logger, $hook, __bind, Alepha } from '@alepha/core';
-import { l as ReactBrowserProvider, B as BrowserRouterProvider, $ as $page, P as PageDescriptorProvider } from './useRouterState-D5__ZcUV.js';
-export { C as ClientOnly, E as ErrorBoundary, L as Link, N as NestedView, R as RedirectionError, a as RouterContext, c as RouterHookApi, b as RouterLayerContext, u as useActive, d as useAlepha, e as useClient, f as useInject, g as useQueryParams, h as useRouter, i as useRouterEvents, j as useRouterState } from './useRouterState-D5__ZcUV.js';
+import { t, $inject, $logger, $hook, __bind } from '@alepha/core';
+import { l as ReactBrowserProvider, B as BrowserRouterProvider, $ as $page, P as PageDescriptorProvider } from './useRouterState-cCucJfTC.js';
+export { C as ClientOnly, E as ErrorBoundary, L as Link, N as NestedView, b as RedirectionError, R as RouterContext, c as RouterHookApi, a as RouterLayerContext, k as isPageRoute, u as useActive, d as useAlepha, e as useClient, f as useInject, g as useQueryParams, h as useRouter, i as useRouterEvents, j as useRouterState } from './useRouterState-cCucJfTC.js';
 import { hydrateRoot, createRoot } from 'react-dom/client';
 import 'react/jsx-runtime';
 import 'react';
@@ -44,12 +44,10 @@ class ReactBrowserRenderer {
   });
 }
 
-class ReactModule {
-  alepha = $inject(Alepha);
-  constructor() {
-    this.alepha.with(PageDescriptorProvider).with(ReactBrowserProvider).with(BrowserRouterProvider).with(ReactBrowserRenderer);
-  }
+class AlephaReact {
+  name = "alepha.react";
+  $services = (alepha) => alepha.with(PageDescriptorProvider).with(ReactBrowserProvider).with(BrowserRouterProvider).with(ReactBrowserRenderer);
 }
-__bind($page, ReactModule);
+__bind($page, AlephaReact);
 
-export { $page, ReactBrowserProvider, ReactModule };
+export { $page, AlephaReact, BrowserRouterProvider, PageDescriptorProvider, ReactBrowserProvider };

package/dist/index.cjs

@@ -3,7 +3,7 @@
 var core = require('@alepha/core');
 var server = require('@alepha/server');
 var serverCache = require('@alepha/server-cache');
-var useRouterState = require('./useRouterState-C2uo0jXu.cjs');
+var useRouterState = require('./useRouterState-BTmuHxkM.cjs');
 var node_fs = require('node:fs');
 var node_path = require('node:path');
 var serverStatic = require('@alepha/server-static');
@@ -354,13 +354,11 @@ class ReactServerProvider {
   }
 }
 
-class ReactModule {
-  alepha = core.$inject(core.Alepha);
-  constructor() {
-    this.alepha.with(server.ServerModule).with(serverCache.ServerCacheModule).with(server.ServerLinksProvider).with(useRouterState.PageDescriptorProvider).with(ReactServerProvider);
-  }
+class AlephaReact {
+  name = "alepha.react";
+  $services = (alepha) => alepha.with(server.AlephaServer).with(serverCache.AlephaServerCache).with(ReactServerProvider).with(useRouterState.PageDescriptorProvider);
 }
-core.__bind(useRouterState.$page, ReactModule);
+core.__bind(useRouterState.$page, AlephaReact);
 
 exports.$page = useRouterState.$page;
 exports.ClientOnly = useRouterState.ClientOnly;
@@ -382,6 +380,5 @@ exports.useQueryParams = useRouterState.useQueryParams;
 exports.useRouter = useRouterState.useRouter;
 exports.useRouterEvents = useRouterState.useRouterEvents;
 exports.useRouterState = useRouterState.useRouterState;
-exports.ReactModule = ReactModule;
+exports.AlephaReact = AlephaReact;
 exports.ReactServerProvider = ReactServerProvider;
-exports.envSchema = envSchema;

package/dist/index.d.ts

@@ -1,8 +1,9 @@
 import * as _alepha_core from '@alepha/core';
-import { TSchema as TSchema$1, KIND, OPTIONS, Static as Static$1, Async, Alepha, Service, TObject as TObject$1 } from '@alepha/core';
-import { ServerRoute, ServerRequest, ApiLinksResponse, HttpClient, ClientScope, HttpVirtualClient, ServerRouterProvider, ServerTimingProvider, ServerHandler } from '@alepha/server';
+import { TSchema as TSchema$1, KIND, OPTIONS, Static, Async, Alepha, Service, TObject, Module } from '@alepha/core';
+import { ServerRequest, ApiLinksResponse, HttpClient, ClientScope, HttpVirtualClient, ServerRouterProvider, ServerTimingProvider, ServerHandler } from '@alepha/server';
 import * as React from 'react';
 import React__default, { PropsWithChildren, ReactNode, FC, ErrorInfo, AnchorHTMLAttributes } from 'react';
+import { ServerRouteCache } from '@alepha/server-cache';
 import { Root } from 'react-dom/client';
 import { RouterProvider, Route } from '@alepha/router';
 import * as react_jsx_runtime from 'react/jsx-runtime';
@@ -17,10 +18,6 @@ declare const Hint: unique symbol;
 /** Symbol key applied to types */
 declare const Kind: unique symbol;
 
-type TReadonly<T extends TSchema> = T & {
-    [ReadonlyKind]: 'Readonly';
-};
-
 type StringFormatOption = 'date-time' | 'time' | 'date' | 'email' | 'idn-email' | 'hostname' | 'idn-hostname' | 'ipv4' | 'ipv6' | 'uri' | 'uri-reference' | 'iri' | 'uuid' | 'iri-reference' | 'uri-template' | 'json-pointer' | 'relative-json-pointer' | 'regex' | ({} & string);
 type StringContentEncodingOption = '7bit' | '8bit' | 'binary' | 'quoted-printable' | 'base64' | ({} & string);
 interface StringOptions extends SchemaOptions {
@@ -53,49 +50,6 @@ type TOptional<T extends TSchema> = T & {
     [OptionalKind]: 'Optional';
 };
 
-/** Creates a static type from a TypeBox type */
-type Static<Type extends TSchema, Params extends unknown[] = [], Result = (Type & {
-    params: Params;
-})['static']> = Result;
-
-type ReadonlyOptionalPropertyKeys<T extends TProperties> = {
-    [K in keyof T]: T[K] extends TReadonly<TSchema> ? (T[K] extends TOptional<T[K]> ? K : never) : never;
-}[keyof T];
-type ReadonlyPropertyKeys<T extends TProperties> = {
-    [K in keyof T]: T[K] extends TReadonly<TSchema> ? (T[K] extends TOptional<T[K]> ? never : K) : never;
-}[keyof T];
-type OptionalPropertyKeys<T extends TProperties> = {
-    [K in keyof T]: T[K] extends TOptional<TSchema> ? (T[K] extends TReadonly<T[K]> ? never : K) : never;
-}[keyof T];
-type RequiredPropertyKeys<T extends TProperties> = keyof Omit<T, ReadonlyOptionalPropertyKeys<T> | ReadonlyPropertyKeys<T> | OptionalPropertyKeys<T>>;
-type ObjectStaticProperties<T extends TProperties, R extends Record<keyof any, unknown>> = Evaluate<(Readonly<Partial<Pick<R, ReadonlyOptionalPropertyKeys<T>>>> & Readonly<Pick<R, ReadonlyPropertyKeys<T>>> & Partial<Pick<R, OptionalPropertyKeys<T>>> & Required<Pick<R, RequiredPropertyKeys<T>>>)>;
-type ObjectStatic<T extends TProperties, P extends unknown[]> = ObjectStaticProperties<T, {
-    [K in keyof T]: Static<T[K], P>;
-}>;
-type TPropertyKey = string | number;
-type TProperties = Record<TPropertyKey, TSchema>;
-type TAdditionalProperties = undefined | TSchema | boolean;
-interface ObjectOptions extends SchemaOptions {
-    /** Additional property constraints for this object */
-    additionalProperties?: TAdditionalProperties;
-    /** The minimum number of properties allowed on this object */
-    minProperties?: number;
-    /** The maximum number of properties allowed on this object */
-    maxProperties?: number;
-}
-interface TObject<T extends TProperties = TProperties> extends TSchema, ObjectOptions {
-    [Kind]: 'Object';
-    static: ObjectStatic<T, this['params']>;
-    additionalProperties?: TAdditionalProperties;
-    type: 'object';
-    properties: T;
-    required?: string[];
-}
-
-type Evaluate<T> = T extends infer O ? {
-    [K in keyof O]: O[K];
-} : never;
-
 interface SchemaOptions {
     $schema?: string;
     /** Id for this schema */
@@ -148,7 +102,7 @@ interface PageConfigSchema {
 }
 type TPropsDefault = any;
 type TPropsParentDefault = {};
-interface PageDescriptorOptions<TConfig extends PageConfigSchema = PageConfigSchema, TProps extends object = TPropsDefault, TPropsParent extends object = TPropsParentDefault> extends Pick<ServerRoute, "cache"> {
+interface PageDescriptorOptions<TConfig extends PageConfigSchema = PageConfigSchema, TProps extends object = TPropsDefault, TPropsParent extends object = TPropsParentDefault> {
     /**
      * Name your page.
      *
@@ -228,6 +182,7 @@ interface PageDescriptorOptions<TConfig extends PageConfigSchema = PageConfigSch
      */
     client?: boolean | ClientOnlyProps;
     afterHandler?: (request: ServerRequest) => any;
+    cache?: ServerRouteCache;
 }
 interface PageDescriptor<TConfig extends PageConfigSchema = PageConfigSchema, TProps extends object = TPropsDefault, TPropsParent extends object = TPropsParentDefault> {
     [KIND]: typeof KEY;
@@ -292,8 +247,8 @@ interface Head$1 {
     };
 }
 interface PageRequestConfig<TConfig extends PageConfigSchema = PageConfigSchema> {
-    params: TConfig["params"] extends TSchema$1 ? Static$1<TConfig["params"]> : Record<string, string>;
-    query: TConfig["query"] extends TSchema$1 ? Static$1<TConfig["query"]> : Record<string, string>;
+    params: TConfig["params"] extends TSchema$1 ? Static<TConfig["params"]> : Record<string, string>;
+    query: TConfig["query"] extends TSchema$1 ? Static<TConfig["query"]> : Record<string, string>;
 }
 type PageResolve<TConfig extends PageConfigSchema = PageConfigSchema, TPropsParent extends object = TPropsParentDefault> = PageRequestConfig<TConfig> & TPropsParent & PageReactContext;
 
@@ -301,7 +256,7 @@ declare const envSchema$1: _alepha_core.TObject<{
     REACT_STRICT_MODE: TBoolean;
 }>;
 declare module "@alepha/core" {
-    interface Env extends Partial<Static$1<typeof envSchema$1>> {
+    interface Env extends Partial<Static<typeof envSchema$1>> {
     }
 }
 declare class PageDescriptorProvider {
@@ -483,6 +438,51 @@ interface ReactHydrationState {
     links?: ApiLinksResponse;
 }
 
+/**
+ * Props for the ErrorBoundary component.
+ */
+interface ErrorBoundaryProps {
+    /**
+     * Fallback React node to render when an error is caught.
+     * If not provided, a default error message will be shown.
+     */
+    fallback: (error: Error) => ReactNode;
+    /**
+     * Optional callback that receives the error and error info.
+     * Use this to log errors to a monitoring service.
+     */
+    onError?: (error: Error, info: ErrorInfo) => void;
+}
+/**
+ * State of the ErrorBoundary component.
+ */
+interface ErrorBoundaryState {
+    error?: Error;
+}
+/**
+ * A reusable error boundary for catching rendering errors
+ * in any part of the React component tree.
+ */
+declare class ErrorBoundary extends React__default.Component<PropsWithChildren<ErrorBoundaryProps>, ErrorBoundaryState> {
+    constructor(props: ErrorBoundaryProps);
+    /**
+     * Update state so the next render shows the fallback UI.
+     */
+    static getDerivedStateFromError(error: Error): ErrorBoundaryState;
+    /**
+     * Lifecycle method called when an error is caught.
+     * You can log the error or perform side effects here.
+     */
+    componentDidCatch(error: Error, info: ErrorInfo): void;
+    render(): ReactNode;
+}
+
+interface LinkProps extends AnchorHTMLAttributes<HTMLAnchorElement> {
+    to: string | PageDescriptor;
+    children?: React__default.ReactNode;
+}
+declare const Link: (props: LinkProps) => react_jsx_runtime.JSX.Element | null;
+
 interface NestedViewProps {
     children?: ReactNode;
 }
@@ -509,6 +509,19 @@ interface NestedViewProps {
  */
 declare const NestedView: (props: NestedViewProps) => react_jsx_runtime.JSX.Element;
 
+interface RouterContextValue {
+    alepha: Alepha;
+    state: RouterState;
+    context: PageReactContext;
+}
+declare const RouterContext: React.Context<RouterContextValue | undefined>;
+
+interface RouterLayerContextValue {
+    index: number;
+    path: string;
+}
+declare const RouterLayerContext: React.Context<RouterLayerContextValue | undefined>;
+
 declare class RouterHookApi {
     private readonly pages;
     private readonly state;
@@ -570,64 +583,6 @@ declare class RedirectionError extends Error {
     constructor(page: HrefLike);
 }
 
-/**
- * Props for the ErrorBoundary component.
- */
-interface ErrorBoundaryProps {
-    /**
-     * Fallback React node to render when an error is caught.
-     * If not provided, a default error message will be shown.
-     */
-    fallback: (error: Error) => ReactNode;
-    /**
-     * Optional callback that receives the error and error info.
-     * Use this to log errors to a monitoring service.
-     */
-    onError?: (error: Error, info: ErrorInfo) => void;
-}
-/**
- * State of the ErrorBoundary component.
- */
-interface ErrorBoundaryState {
-    error?: Error;
-}
-/**
- * A reusable error boundary for catching rendering errors
- * in any part of the React component tree.
- */
-declare class ErrorBoundary extends React__default.Component<PropsWithChildren<ErrorBoundaryProps>, ErrorBoundaryState> {
-    constructor(props: ErrorBoundaryProps);
-    /**
-     * Update state so the next render shows the fallback UI.
-     */
-    static getDerivedStateFromError(error: Error): ErrorBoundaryState;
-    /**
-     * Lifecycle method called when an error is caught.
-     * You can log the error or perform side effects here.
-     */
-    componentDidCatch(error: Error, info: ErrorInfo): void;
-    render(): ReactNode;
-}
-
-interface LinkProps extends AnchorHTMLAttributes<HTMLAnchorElement> {
-    to: string | PageDescriptor;
-    children?: React__default.ReactNode;
-}
-declare const Link: (props: LinkProps) => react_jsx_runtime.JSX.Element | null;
-
-interface RouterContextValue {
-    alepha: Alepha;
-    state: RouterState;
-    context: PageReactContext;
-}
-declare const RouterContext: React.Context<RouterContextValue | undefined>;
-
-interface RouterLayerContextValue {
-    index: number;
-    path: string;
-}
-declare const RouterLayerContext: React.Context<RouterLayerContextValue | undefined>;
-
 declare const useActive: (path: HrefLike) => UseActiveHook;
 interface UseActiveHook {
     isActive: boolean;
@@ -647,7 +602,7 @@ interface UseQueryParamsHookOptions {
     key?: string;
     push?: boolean;
 }
-declare const useQueryParams: <T extends TObject$1>(schema: T, options?: UseQueryParamsHookOptions) => [Static$1<T>, (data: Static$1<T>) => void];
+declare const useQueryParams: <T extends TObject>(schema: T, options?: UseQueryParamsHookOptions) => [Static<T>, (data: Static<T>) => void];
 
 declare const useRouter: () => RouterHookApi;
 
@@ -666,14 +621,14 @@ declare const useRouterEvents: (opts?: {
 
 declare const useRouterState: () => RouterState;
 
-declare const envSchema: TObject<{
+declare const envSchema: _alepha_core.TObject<{
     REACT_SERVER_DIST: TString;
     REACT_SERVER_PREFIX: TString;
     REACT_SSR_ENABLED: TOptional<TBoolean>;
     REACT_ROOT_ID: TString;
 }>;
 declare module "@alepha/core" {
-    interface Env extends Partial<Static$1<typeof envSchema>> {
+    interface Env extends Partial<Static<typeof envSchema>> {
     }
     interface State {
         "ReactServerProvider.template"?: string;
@@ -748,9 +703,18 @@ declare module "@alepha/core" {
         };
     }
 }
-declare class ReactModule {
-    protected readonly alepha: Alepha;
-    constructor();
+/**
+ * Alepha React Module
+ *
+ * Alepha React Module contains a router for client-side navigation and server-side rendering.
+ * Routes can be defined using the `$page` descriptor.
+ *
+ * @see {@link $page}
+ * @module alepha.react
+ */
+declare class AlephaReact implements Module {
+    readonly name = "alepha.react";
+    readonly $services: (alepha: Alepha) => Alepha;
 }
 
-export { $page, type AnchorProps, ClientOnly, type CreateLayersResult, ErrorBoundary, type Head$1 as Head, type HrefLike, type Layer, Link, NestedView, type PageConfigSchema, type PageDescriptor, type PageDescriptorOptions, PageDescriptorProvider, type PageDescriptorRenderOptions, type PageDescriptorRenderResult, type PageReactContext, type PageRequest, type PageRequestConfig, type PageResolve, type PageRoute, type PageRouteEntry, type PreviousLayerData, ReactBrowserProvider, type ReactHydrationState, ReactModule, ReactServerProvider, RedirectionError, RouterContext, type RouterContextValue, type RouterGoOptions, RouterHookApi, RouterLayerContext, type RouterLayerContextValue, type RouterRenderResult, type RouterStackItem, type RouterState, type TPropsDefault, type TPropsParentDefault, type TransitionOptions, type UseActiveHook, type UseQueryParamsHookOptions, type VirtualRouter, envSchema, isPageRoute, useActive, useAlepha, useClient, useInject, useQueryParams, useRouter, useRouterEvents, useRouterState };
+export { $page, AlephaReact, type AnchorProps, ClientOnly, type CreateLayersResult, ErrorBoundary, type Head$1 as Head, type HrefLike, type Layer, Link, NestedView, type PageConfigSchema, type PageDescriptor, type PageDescriptorOptions, PageDescriptorProvider, type PageDescriptorRenderOptions, type PageDescriptorRenderResult, type PageReactContext, type PageRequest, type PageRequestConfig, type PageResolve, type PageRoute, type PageRouteEntry, type PreviousLayerData, ReactBrowserProvider, type ReactHydrationState, ReactServerProvider, RedirectionError, RouterContext, type RouterContextValue, type RouterGoOptions, RouterHookApi, RouterLayerContext, type RouterLayerContextValue, type RouterRenderResult, type RouterStackItem, type RouterState, type TPropsDefault, type TPropsParentDefault, type TransitionOptions, type UseActiveHook, type UseQueryParamsHookOptions, type VirtualRouter, isPageRoute, useActive, useAlepha, useClient, useInject, useQueryParams, useRouter, useRouterEvents, useRouterState };

package/dist/index.js

@@ -1,8 +1,8 @@
 import { t, $logger, $inject, Alepha, $hook, OPTIONS, __bind } from '@alepha/core';
-import { ServerRouterProvider, ServerTimingProvider, ServerLinksProvider, apiLinksResponseSchema, ServerModule } from '@alepha/server';
-import { ServerCacheModule } from '@alepha/server-cache';
-import { P as PageDescriptorProvider, $ as $page } from './useRouterState-D5__ZcUV.js';
-export { C as ClientOnly, E as ErrorBoundary, L as Link, N as NestedView, l as ReactBrowserProvider, R as RedirectionError, a as RouterContext, c as RouterHookApi, b as RouterLayerContext, k as isPageRoute, u as useActive, d as useAlepha, e as useClient, f as useInject, g as useQueryParams, h as useRouter, i as useRouterEvents, j as useRouterState } from './useRouterState-D5__ZcUV.js';
+import { ServerRouterProvider, ServerTimingProvider, ServerLinksProvider, apiLinksResponseSchema, AlephaServer } from '@alepha/server';
+import { AlephaServerCache } from '@alepha/server-cache';
+import { P as PageDescriptorProvider, $ as $page } from './useRouterState-cCucJfTC.js';
+export { C as ClientOnly, E as ErrorBoundary, L as Link, N as NestedView, l as ReactBrowserProvider, b as RedirectionError, R as RouterContext, c as RouterHookApi, a as RouterLayerContext, k as isPageRoute, u as useActive, d as useAlepha, e as useClient, f as useInject, g as useQueryParams, h as useRouter, i as useRouterEvents, j as useRouterState } from './useRouterState-cCucJfTC.js';
 import { existsSync } from 'node:fs';
 import { join } from 'node:path';
 import { ServerStaticProvider } from '@alepha/server-static';
@@ -353,12 +353,10 @@ class ReactServerProvider {
   }
 }
 
-class ReactModule {
-  alepha = $inject(Alepha);
-  constructor() {
-    this.alepha.with(ServerModule).with(ServerCacheModule).with(ServerLinksProvider).with(PageDescriptorProvider).with(ReactServerProvider);
-  }
+class AlephaReact {
+  name = "alepha.react";
+  $services = (alepha) => alepha.with(AlephaServer).with(AlephaServerCache).with(ReactServerProvider).with(PageDescriptorProvider);
 }
-__bind($page, ReactModule);
+__bind($page, AlephaReact);
 
-export { $page, PageDescriptorProvider, ReactModule, ReactServerProvider, envSchema };
+export { $page, AlephaReact, PageDescriptorProvider, ReactServerProvider };

package/dist/{useRouterState-C2uo0jXu.cjs → useRouterState-BTmuHxkM.cjs}

@@ -279,7 +279,7 @@ const NestedView = (props) => {
 };
 
 function NotFoundPage() {
-  return /* @__PURE__ */ jsxRuntime.jsxs(
+  return /* @__PURE__ */ jsxRuntime.jsx(
     "div",
     {
       style: {
@@ -292,21 +292,7 @@ function NotFoundPage() {
         fontFamily: "sans-serif",
         padding: "1rem"
       },
-      children: [
-        /* @__PURE__ */ jsxRuntime.jsx("h1", { style: { fontSize: "1rem", marginBottom: "0.5rem" }, children: "This page does not exist" }),
-        /* @__PURE__ */ jsxRuntime.jsx(
-          "a",
-          {
-            href: "/",
-            style: {
-              fontSize: "0.7rem",
-              color: "#007bff",
-              textDecoration: "none"
-            },
-            children: "\u2190 Back to home"
-          }
-        )
-      ]
+      children: /* @__PURE__ */ jsxRuntime.jsx("h1", { style: { fontSize: "1rem", marginBottom: "0.5rem" }, children: "This page does not exist" })
     }
   );
 }

package/dist/{useRouterState-D5__ZcUV.js → useRouterState-cCucJfTC.js}

@@ -277,7 +277,7 @@ const NestedView = (props) => {
 };
 
 function NotFoundPage() {
-  return /* @__PURE__ */ jsxs(
+  return /* @__PURE__ */ jsx(
     "div",
     {
       style: {
@@ -290,21 +290,7 @@ function NotFoundPage() {
         fontFamily: "sans-serif",
         padding: "1rem"
       },
-      children: [
-        /* @__PURE__ */ jsx("h1", { style: { fontSize: "1rem", marginBottom: "0.5rem" }, children: "This page does not exist" }),
-        /* @__PURE__ */ jsx(
-          "a",
-          {
-            href: "/",
-            style: {
-              fontSize: "0.7rem",
-              color: "#007bff",
-              textDecoration: "none"
-            },
-            children: "\u2190 Back to home"
-          }
-        )
-      ]
+      children: /* @__PURE__ */ jsx("h1", { style: { fontSize: "1rem", marginBottom: "0.5rem" }, children: "This page does not exist" })
     }
   );
 }
@@ -1172,4 +1158,4 @@ const useRouterState = () => {
   return state;
 };
 
-export { $page as $, BrowserRouterProvider as B, ClientOnly as C, ErrorBoundary as E, Link as L, NestedView as N, PageDescriptorProvider as P, RedirectionError as R, RouterContext as a, RouterLayerContext as b, RouterHookApi as c, useAlepha as d, useClient as e, useInject as f, useQueryParams as g, useRouter as h, useRouterEvents as i, useRouterState as j, isPageRoute as k, ReactBrowserProvider as l, useActive as u };
+export { $page as $, BrowserRouterProvider as B, ClientOnly as C, ErrorBoundary as E, Link as L, NestedView as N, PageDescriptorProvider as P, RouterContext as R, RouterLayerContext as a, RedirectionError as b, RouterHookApi as c, useAlepha as d, useClient as e, useInject as f, useQueryParams as g, useRouter as h, useRouterEvents as i, useRouterState as j, isPageRoute as k, ReactBrowserProvider as l, useActive as u };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@alepha/react",
-	"version": "0.7.3",
+	"version": "0.7.5",
 	"type": "module",
 	"license": "MIT",
 	"main": "./dist/index.js",
@@ -13,11 +13,11 @@
 		"src"
 	],
 	"dependencies": {
-		"@alepha/core": "0.7.3",
-		"@alepha/router": "0.7.3",
-		"@alepha/server": "0.7.3",
-		"@alepha/server-cache": "0.7.3",
-		"@alepha/server-static": "0.7.3",
+		"@alepha/core": "0.7.5",
+		"@alepha/router": "0.7.5",
+		"@alepha/server": "0.7.5",
+		"@alepha/server-cache": "0.7.5",
+		"@alepha/server-static": "0.7.5",
 		"react-dom": "^19.1.0"
 	},
 	"devDependencies": {

package/src/components/NotFound.tsx

@@ -15,16 +15,6 @@ export default function NotFoundPage() {
 			<h1 style={{ fontSize: "1rem", marginBottom: "0.5rem" }}>
 				This page does not exist
 			</h1>
-			<a
-				href="/"
-				style={{
-					fontSize: "0.7rem",
-					color: "#007bff",
-					textDecoration: "none",
-				}}
-			>
-				← Back to home
-			</a>
 		</div>
 	);
 }

package/src/descriptors/$page.ts

@@ -7,7 +7,8 @@ import {
 	type Static,
 	type TSchema,
 } from "@alepha/core";
-import type { ServerRequest, ServerRoute } from "@alepha/server";
+import type { ServerRequest } from "@alepha/server";
+import type { ServerRouteCache } from "@alepha/server-cache";
 import type { FC, ReactNode } from "react";
 import type { ClientOnlyProps } from "../components/ClientOnly.tsx";
 import type { PageReactContext } from "../providers/PageDescriptorProvider.ts";
@@ -27,7 +28,7 @@ export interface PageDescriptorOptions<
 	TConfig extends PageConfigSchema = PageConfigSchema,
 	TProps extends object = TPropsDefault,
 	TPropsParent extends object = TPropsParentDefault,
-> extends Pick<ServerRoute, "cache"> {
+> {
 	/**
 	 * Name your page.
 	 *
@@ -117,6 +118,8 @@ export interface PageDescriptorOptions<
 	client?: boolean | ClientOnlyProps;
 
 	afterHandler?: (request: ServerRequest) => any;
+
+	cache?: ServerRouteCache;
 }
 
 export interface PageDescriptor<

package/src/index.browser.ts

@@ -1,23 +1,27 @@
-import { __bind, $inject, Alepha } from "@alepha/core";
+import { __bind, type Alepha, type Module } from "@alepha/core";
 import { $page } from "./descriptors/$page.ts";
 import { BrowserRouterProvider } from "./providers/BrowserRouterProvider.ts";
 import { PageDescriptorProvider } from "./providers/PageDescriptorProvider.ts";
 import { ReactBrowserProvider } from "./providers/ReactBrowserProvider.ts";
 import { ReactBrowserRenderer } from "./providers/ReactBrowserRenderer.ts";
 
-export * from "./index.shared";
+// ---------------------------------------------------------------------------------------------------------------------
+
+export * from "./index.shared.ts";
+export * from "./providers/BrowserRouterProvider.ts";
+export * from "./providers/PageDescriptorProvider.ts";
 export * from "./providers/ReactBrowserProvider.ts";
 
-export class ReactModule {
-	protected readonly alepha = $inject(Alepha);
+// ---------------------------------------------------------------------------------------------------------------------
 
-	constructor() {
-		this.alepha //
+export class AlephaReact implements Module {
+	public readonly name = "alepha.react";
+	public readonly $services = (alepha: Alepha) =>
+		alepha
 			.with(PageDescriptorProvider)
 			.with(ReactBrowserProvider)
 			.with(BrowserRouterProvider)
 			.with(ReactBrowserRenderer);
-	}
 }
 
-__bind($page, ReactModule);
+__bind($page, AlephaReact);

package/src/index.shared.ts

@@ -3,14 +3,10 @@ export { default as ErrorBoundary } from "./components/ErrorBoundary.tsx";
 export * from "./components/ErrorViewer.tsx";
 export { default as Link } from "./components/Link.tsx";
 export { default as NestedView } from "./components/NestedView.tsx";
-
 export * from "./contexts/RouterContext.ts";
 export * from "./contexts/RouterLayerContext.ts";
-
 export * from "./descriptors/$page.ts";
-
 export * from "./errors/RedirectionError.ts";
-
 export * from "./hooks/RouterHookApi.ts";
 export * from "./hooks/useActive.ts";
 export * from "./hooks/useAlepha.ts";

package/src/index.ts

@@ -1,10 +1,6 @@
-import { __bind, $inject, Alepha } from "@alepha/core";
-import {
-	ServerLinksProvider,
-	ServerModule,
-	type ServerRequest,
-} from "@alepha/server";
-import { ServerCacheModule } from "@alepha/server-cache";
+import { __bind, type Alepha, type Module } from "@alepha/core";
+import { AlephaServer, type ServerRequest } from "@alepha/server";
+import { AlephaServerCache } from "@alepha/server-cache";
 import { $page } from "./descriptors/$page.ts";
 import {
 	PageDescriptorProvider,
@@ -15,13 +11,15 @@ import {
 import type { ReactHydrationState } from "./providers/ReactBrowserProvider.ts";
 import { ReactServerProvider } from "./providers/ReactServerProvider.ts";
 
-export { default as NestedView } from "./components/NestedView.tsx";
-export * from "./errors/RedirectionError.ts";
+// ---------------------------------------------------------------------------------------------------------------------
+
 export * from "./index.shared.ts";
 export * from "./providers/PageDescriptorProvider.ts";
 export * from "./providers/ReactBrowserProvider.ts";
 export * from "./providers/ReactServerProvider.ts";
 
+// ---------------------------------------------------------------------------------------------------------------------
+
 declare module "@alepha/core" {
 	interface Hooks {
 		"react:browser:render": {
@@ -52,17 +50,25 @@ declare module "@alepha/core" {
 	}
 }
 
-export class ReactModule {
-	protected readonly alepha = $inject(Alepha);
+// ---------------------------------------------------------------------------------------------------------------------
 
-	constructor() {
-		this.alepha //
-			.with(ServerModule)
-			.with(ServerCacheModule)
-			.with(ServerLinksProvider)
-			.with(PageDescriptorProvider)
-			.with(ReactServerProvider);
-	}
+/**
+ * Alepha React Module
+ *
+ * Alepha React Module contains a router for client-side navigation and server-side rendering.
+ * Routes can be defined using the `$page` descriptor.
+ *
+ * @see {@link $page}
+ * @module alepha.react
+ */
+export class AlephaReact implements Module {
+	public readonly name = "alepha.react";
+	public readonly $services = (alepha: Alepha) =>
+		alepha
+			.with(AlephaServer)
+			.with(AlephaServerCache)
+			.with(ReactServerProvider)
+			.with(PageDescriptorProvider);
 }
 
-__bind($page, ReactModule);
+__bind($page, AlephaReact);

package/src/providers/ReactBrowserRenderer.ts

@@ -17,6 +17,7 @@ declare module "@alepha/core" {
 	interface Env extends Partial<Static<typeof envSchema>> {}
 }
 
+// TODO: move to ReactBrowserProvider when it will be removed from server-side imports
 export class ReactBrowserRenderer {
 	protected readonly browserProvider = $inject(ReactBrowserProvider);
 	protected readonly browserRouterProvider = $inject(BrowserRouterProvider);

package/src/providers/ReactServerProvider.ts

@@ -29,7 +29,7 @@ import {
 import type { ReactHydrationState } from "./ReactBrowserProvider.ts";
 import { ServerHeadProvider } from "./ServerHeadProvider.ts";
 
-export const envSchema = t.object({
+const envSchema = t.object({
 	REACT_SERVER_DIST: t.string({ default: "public" }),
 	REACT_SERVER_PREFIX: t.string({ default: "" }),
 	REACT_SSR_ENABLED: t.optional(t.boolean()),