@cedarjs/router 7.0.1-next.467 → 7.1.0-rc.32

package/dist/Route.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import type { ReactElement } from 'react';
 import type { PageType } from './page.js';
 export type RenderMode = 'stream' | 'html';
@@ -27,7 +26,7 @@ export type InternalRouteProps = Partial<RouteProps & RedirectRouteProps & NotFo
  * it is actually never rendered. All the page loading logic happens in active-route-loader
  * and all the validation happens within utility functions called from the Router
  */
-export declare function Route(props: RouteProps): React.JSX.Element;
-export declare function Route(props: RedirectRouteProps): React.JSX.Element;
-export declare function Route(props: NotFoundRouteProps): React.JSX.Element;
+export declare function Route(props: RouteProps): JSX.Element;
+export declare function Route(props: RedirectRouteProps): JSX.Element;
+export declare function Route(props: NotFoundRouteProps): JSX.Element;
 //# sourceMappingURL=Route.d.ts.map

package/dist/Route.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Route.d.ts","sourceRoot":"","sources":["../src/Route.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,OAAO,CAAA;AAEzC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAA;AAEzC,MAAM,MAAM,UAAU,GAAG,QAAQ,GAAG,MAAM,CAAA;AAE1C,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,MAAM,CAAA;IAChB,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,CAAC,EAAE,MAAM,CAAA;CACd;AAED,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,OAAO,CAAA;IACjB,IAAI,EAAE,QAAQ,CAAA;IACd,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,UAAU,CAAC,EAAE,UAAU,CAAA;CACxB;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,QAAQ,CAAA;IACd,IAAI,EAAE,MAAM,CAAA;IACZ,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,UAAU,CAAC,EAAE,UAAU,CAAA;IACvB,gBAAgB,CAAC,EAAE,MAAM,YAAY,GAAG,IAAI,CAAA;CAC7C;AAED,MAAM,MAAM,kBAAkB,GAAG,OAAO,CACtC,UAAU,GAAG,kBAAkB,GAAG,kBAAkB,CACrD,CAAA;AAED;;;;GAIG;AACH,wBAAgB,KAAK,CAAC,KAAK,EAAE,UAAU,GAAG,KAAK,CAAC,GAAG,CAAC,OAAO,CAAA;AAC3D,wBAAgB,KAAK,CAAC,KAAK,EAAE,kBAAkB,GAAG,KAAK,CAAC,GAAG,CAAC,OAAO,CAAA;AACnE,wBAAgB,KAAK,CAAC,KAAK,EAAE,kBAAkB,GAAG,KAAK,CAAC,GAAG,CAAC,OAAO,CAAA"}
+{"version":3,"file":"Route.d.ts","sourceRoot":"","sources":["../src/Route.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,OAAO,CAAA;AAEzC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAA;AAEzC,MAAM,MAAM,UAAU,GAAG,QAAQ,GAAG,MAAM,CAAA;AAE1C,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,MAAM,CAAA;IAChB,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,CAAC,EAAE,MAAM,CAAA;CACd;AAED,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,OAAO,CAAA;IACjB,IAAI,EAAE,QAAQ,CAAA;IACd,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,UAAU,CAAC,EAAE,UAAU,CAAA;CACxB;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,QAAQ,CAAA;IACd,IAAI,EAAE,MAAM,CAAA;IACZ,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,UAAU,CAAC,EAAE,UAAU,CAAA;IACvB,gBAAgB,CAAC,EAAE,MAAM,YAAY,GAAG,IAAI,CAAA;CAC7C;AAED,MAAM,MAAM,kBAAkB,GAAG,OAAO,CACtC,UAAU,GAAG,kBAAkB,GAAG,kBAAkB,CACrD,CAAA;AAED;;;;GAIG;AACH,wBAAgB,KAAK,CAAC,KAAK,EAAE,UAAU,GAAG,GAAG,CAAC,OAAO,CAAA;AACrD,wBAAgB,KAAK,CAAC,KAAK,EAAE,kBAAkB,GAAG,GAAG,CAAC,OAAO,CAAA;AAC7D,wBAAgB,KAAK,CAAC,KAAK,EAAE,kBAAkB,GAAG,GAAG,CAAC,OAAO,CAAA"}

package/dist/Set.d.ts

@@ -1,35 +1,29 @@
-import type { ComponentType, ReactElement, ReactNode } from 'react';
+import type { ReactElement, ReactNode } from 'react';
 import React from 'react';
 /**
- * The props `<Set>` gives each component in its `wrap` prop: the wrapped
- * routes as `children`, and nothing else
- */
-export interface WrapperProps {
-    children: ReactNode;
-}
-/**
- * A component in a `<Set wrap>` prop, like a layout. The router renders it
- * with {@link WrapperProps}, so it can't have any other required props.
- * Optional props are fine.
+ * The props of a layout or other component in a `<Set wrap>` prop that only
+ * needs the wrapped routes, which it gets as `children`:
  *
- * To render a layout with props, create a component that renders it with
- * those props, and use that component in `wrap`:
- *
- *   function PostsScaffoldLayout({ children }: WrapperProps) {
- *     return <ScaffoldLayout title="Posts" titleTo="posts">{children}</ScaffoldLayout>
+ *   function MainLayout({ children }: WrapperProps) {
+ *     return <main>{children}</main>
  *   }
  *
- *   <Set wrap={PostsScaffoldLayout}>
+ *   <Set wrap={MainLayout}>
  */
-export type WrapperType = ComponentType<WrapperProps>;
-interface SetProps {
+export interface WrapperProps {
+    children: ReactNode;
+}
+export type WrapperType<WTProps> = (props: Omit<WTProps, 'wrap' | 'children'> & {
+    children: ReactNode;
+}) => ReactElement | null;
+type SetProps<P> = P & {
     /**
-     * Components to wrap all routes in this set with, like layouts. The first
-     * one in an array is the outermost one.
-     *
-     *   <Set wrap={[MainLayout, DarkThemeLayout]}>
+     * P is the interface for the props that are forwarded to the wrapper
+     * components. TypeScript will most likely infer this for you, but if you
+     * need to you can specify it yourself in your JSX like so:
+     *   <Set<{theme: string}> wrap={ThemableLayout} theme="dark">
      */
-    wrap?: WrapperType | readonly WrapperType[];
+    wrap?: WrapperType<P> | WrapperType<P>[];
     /**
      *`Routes` nested in a `<Set>` with `private` specified require
      * authentication. When a user is not authenticated and attempts to visit
@@ -55,22 +49,20 @@ interface SetProps {
     /** Loading state for auth to distinguish with whileLoading */
     whileLoadingAuth?: () => ReactElement | null;
     whileLoadingPage?: () => ReactElement | null;
-}
+};
 /**
- * Groups routes, to wrap them all in the same layouts or other components, or
- * to give them all the same `whileLoadingPage` or `prerender` setting.
- *
- *   <Set wrap={MainLayout}>
- *     <Route path="/" page={HomePage} name="home" />
- *   </Set>
+ * TypeScript will often infer the type of the props you can forward to the
+ * wrappers for you, but if you need to you can specify it yourself in your
+ * JSX like so:
+ *   <Set<{theme: string}> wrap={ThemeableLayout} theme="dark">
  */
-export declare function Set(props: SetProps): React.JSX.Element;
-type PrivateSetProps = Omit<SetProps, 'private' | 'unauthenticated'> & {
+export declare function Set<WrapperProps>(props: SetProps<WrapperProps>): React.JSX.Element;
+type PrivateSetProps<P> = P & Omit<SetProps<P>, 'private' | 'unauthenticated'> & {
     /** The page name where a user will be redirected when not authenticated */
     unauthenticated: string;
 };
 /** @deprecated Please use `<PrivateSet>` instead */
-export declare function Private(props: PrivateSetProps): React.JSX.Element;
+export declare function Private<WrapperProps>(props: PrivateSetProps<WrapperProps>): React.JSX.Element;
 /**
  * Wraps a set of routes that require the user to be authenticated before
  * rendering. Unauthenticated users are redirected to the route named by
@@ -79,17 +71,9 @@ export declare function Private(props: PrivateSetProps): React.JSX.Element;
  * Coming from React Router or a similar library and looking for something
  * like `RequireAuth` or `ProtectedRoute`? This is the Cedar equivalent.
  */
-export declare function PrivateSet(props: PrivateSetProps): React.JSX.Element;
-export declare const isSetNode: (node: ReactNode) => node is ReactElement<SetProps>;
-export declare const isPrivateSetNode: (node: ReactNode) => node is ReactElement<PrivateSetProps>;
-export declare const isPrivateNode: (node: ReactNode) => node is ReactElement<PrivateSetProps>;
-/**
- * Wraps `children` in all `wrappers`, with the first wrapper as the outermost
- * one. Every wrapper gets `children` as its only prop.
- *
- *   wrapWithSetWrappers([A, B], '1', <Page />)
- *   // => <A><B><Page /></B></A>
- */
-export declare function wrapWithSetWrappers(wrappers: readonly WrapperType[], setId: string, children: ReactNode): ReactNode;
+export declare function PrivateSet<WrapperProps>(props: PrivateSetProps<WrapperProps>): React.JSX.Element;
+export declare const isSetNode: (node: ReactNode) => node is ReactElement<SetProps<any>>;
+export declare const isPrivateSetNode: (node: ReactNode) => node is ReactElement<PrivateSetProps<unknown>>;
+export declare const isPrivateNode: (node: ReactNode) => node is ReactElement<SetProps<any>>;
 export {};
 //# sourceMappingURL=Set.d.ts.map

package/dist/Set.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Set.d.ts","sourceRoot":"","sources":["../src/Set.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AACnE,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB;;;GAGG;AACH,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,SAAS,CAAA;CACpB;AAED;;;;;;;;;;;;;GAaG;AACH,MAAM,MAAM,WAAW,GAAG,aAAa,CAAC,YAAY,CAAC,CAAA;AAErD,UAAU,QAAQ;IAChB;;;;;OAKG;IACH,IAAI,CAAC,EAAE,WAAW,GAAG,SAAS,WAAW,EAAE,CAAA;IAC3C;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB;;;;OAIG;IACH,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;IACzB,qCAAqC;IACrC,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,QAAQ,EAAE,SAAS,CAAA;IACnB,8DAA8D;IAC9D,gBAAgB,CAAC,EAAE,MAAM,YAAY,GAAG,IAAI,CAAA;IAC5C,gBAAgB,CAAC,EAAE,MAAM,YAAY,GAAG,IAAI,CAAA;CAC7C;AAED;;;;;;;GAOG;AACH,wBAAgB,GAAG,CAAC,KAAK,EAAE,QAAQ,qBAIlC;AAED,KAAK,eAAe,GAAG,IAAI,CAAC,QAAQ,EAAE,SAAS,GAAG,iBAAiB,CAAC,GAAG;IACrE,2EAA2E;IAC3E,eAAe,EAAE,MAAM,CAAA;CACxB,CAAA;AAED,oDAAoD;AACpD,wBAAgB,OAAO,CAAC,KAAK,EAAE,eAAe,qBAI7C;AAED;;;;;;;GAOG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE,eAAe,qBAIhD;AAED,eAAO,MAAM,SAAS,GAAI,MAAM,SAAS,KAAG,IAAI,IAAI,YAAY,CAAC,QAAQ,CAOxE,CAAA;AAED,eAAO,MAAM,gBAAgB,GAC3B,MAAM,SAAS,KACd,IAAI,IAAI,YAAY,CAAC,eAAe,CAEtC,CAAA;AAGD,eAAO,MAAM,aAAa,GACxB,MAAM,SAAS,KACd,IAAI,IAAI,YAAY,CAAC,eAAe,CAEtC,CAAA;AAED;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,SAAS,WAAW,EAAE,EAChC,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,SAAS,aAKpB"}
+{"version":3,"file":"Set.d.ts","sourceRoot":"","sources":["../src/Set.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AACpD,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB;;;;;;;;;GASG;AACH,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,SAAS,CAAA;CACpB;AAED,MAAM,MAAM,WAAW,CAAC,OAAO,IAAI,CACjC,KAAK,EAAE,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,UAAU,CAAC,GAAG;IAC1C,QAAQ,EAAE,SAAS,CAAA;CACpB,KACE,YAAY,GAAG,IAAI,CAAA;AAExB,KAAK,QAAQ,CAAC,CAAC,IAAI,CAAC,GAAG;IACrB;;;;;OAKG;IACH,IAAI,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,EAAE,CAAA;IACxC;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB;;;;OAIG;IACH,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;IACzB,qCAAqC;IACrC,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,QAAQ,EAAE,SAAS,CAAA;IACnB,8DAA8D;IAC9D,gBAAgB,CAAC,EAAE,MAAM,YAAY,GAAG,IAAI,CAAA;IAC5C,gBAAgB,CAAC,EAAE,MAAM,YAAY,GAAG,IAAI,CAAA;CAC7C,CAAA;AAED;;;;;GAKG;AACH,wBAAgB,GAAG,CAAC,YAAY,EAAE,KAAK,EAAE,QAAQ,CAAC,YAAY,CAAC,qBAI9D;AAED,KAAK,eAAe,CAAC,CAAC,IAAI,CAAC,GACzB,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,SAAS,GAAG,iBAAiB,CAAC,GAAG;IACjD,2EAA2E;IAC3E,eAAe,EAAE,MAAM,CAAA;CACxB,CAAA;AAEH,oDAAoD;AACpD,wBAAgB,OAAO,CAAC,YAAY,EAAE,KAAK,EAAE,eAAe,CAAC,YAAY,CAAC,qBAIzE;AAED;;;;;;;GAOG;AACH,wBAAgB,UAAU,CAAC,YAAY,EAAE,KAAK,EAAE,eAAe,CAAC,YAAY,CAAC,qBAI5E;AAED,eAAO,MAAM,SAAS,GACpB,MAAM,SAAS,KACd,IAAI,IAAI,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC,CAOpC,CAAA;AAED,eAAO,MAAM,gBAAgB,GAC3B,MAAM,SAAS,KACd,IAAI,IAAI,YAAY,CAAC,eAAe,CAAC,OAAO,CAAC,CAE/C,CAAA;AAGD,eAAO,MAAM,aAAa,GACxB,MAAM,SAAS,KACd,IAAI,IAAI,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC,CAEpC,CAAA"}

package/dist/Set.js

@@ -10,7 +10,7 @@ function PrivateSet(props) {
 }
 const isSetNode = (node) => {
   return React.isValidElement(node) && (node.type === Set || node.type === PrivateSet || node.type === Private) && // Don't even bother including Sets without children. They're useless.
-  !!node.props.children;
+  node.props.children;
 };
 const isPrivateSetNode = (node) => {
   return React.isValidElement(node) && node.type === PrivateSet;
@@ -18,17 +18,11 @@ const isPrivateSetNode = (node) => {
 const isPrivateNode = (node) => {
   return React.isValidElement(node) && node.type === Private;
 };
-function wrapWithSetWrappers(wrappers, setId, children) {
-  return wrappers.reduceRight((acc, Wrapper, index) => {
-    return /* @__PURE__ */ React.createElement(Wrapper, { key: setId + "-" + index }, acc);
-  }, children);
-}
 export {
   Private,
   PrivateSet,
   Set,
   isPrivateNode,
   isPrivateSetNode,
-  isSetNode,
-  wrapWithSetWrappers
+  isSetNode
 };

package/dist/analyzeRoutes.d.ts

@@ -1,27 +1,19 @@
 import type { ReactElement, ReactNode } from 'react';
 import type { PageType } from './page.js';
-import type { WrapperType } from './Set.js';
 import { type ParamType } from './util.js';
 type WhileLoadingPage = () => ReactElement | null;
 export type GeneratedRoutesMap = {
     [key: string]: (args?: Record<string | number, string | number | boolean>) => string;
 };
-export type Wrappers = readonly WrapperType[];
-/**
- * The props of a `<Set>`, `<PrivateSet>` or `<Private>` that the router needs
- * when rendering a route in it
- */
-interface SetRenderProps {
-    private?: boolean;
-    unauthenticated?: string;
-    roles?: string | string[];
-    whileLoadingAuth?: () => ReactElement | null;
-}
+export type Wrappers = ((props: any) => ReactNode)[];
 interface Set {
     id: string;
     wrappers: Wrappers;
     isPrivate: boolean;
-    props: SetRenderProps;
+    props: {
+        private?: boolean;
+        [key: string]: unknown;
+    };
 }
 type RoutePath = string;
 /**

package/dist/analyzeRoutes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"analyzeRoutes.d.ts","sourceRoot":"","sources":["../src/analyzeRoutes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AAGpD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAA;AAQzC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAA;AAC3C,OAAO,EAIL,KAAK,SAAS,EACf,MAAM,WAAW,CAAA;AAElB,KAAK,gBAAgB,GAAG,MAAM,YAAY,GAAG,IAAI,CAAA;AAIjD,MAAM,MAAM,kBAAkB,GAAG;IAC/B,CAAC,GAAG,EAAE,MAAM,GAAG,CACb,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,GAAG,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,KACtD,MAAM,CAAA;CACZ,CAAA;AAED,MAAM,MAAM,QAAQ,GAAG,SAAS,WAAW,EAAE,CAAA;AAE7C;;;GAGG;AACH,UAAU,cAAc;IACtB,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;IACzB,gBAAgB,CAAC,EAAE,MAAM,YAAY,GAAG,IAAI,CAAA;CAC7C;AAED,UAAU,GAAG;IACX,EAAE,EAAE,MAAM,CAAA;IACV,QAAQ,EAAE,QAAQ,CAAA;IAClB,SAAS,EAAE,OAAO,CAAA;IAClB,KAAK,EAAE,cAAc,CAAA;CACtB;AAuCD,KAAK,SAAS,GAAG,MAAM,CAAA;AAEvB;;;;GAIG;AACH,UAAU,aAAa;IACrB,IAAI,EAAE,SAAS,CAAA;IACf,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;IACnB,gBAAgB,CAAC,EAAE,gBAAgB,CAAA;IACnC,IAAI,EAAE,QAAQ,GAAG,IAAI,CAAA;IACrB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAA;IACvB,IAAI,EAAE,GAAG,EAAE,CAAA;CACZ;AAED,UAAU,oBAAoB;IAC5B,eAAe,EAAE,MAAM,CAAA;IACvB,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA;CAC3C;AAED,wBAAgB,aAAa,CAC3B,QAAQ,EAAE,SAAS,EACnB,EAAE,eAAe,EAAE,cAAc,EAAE,EAAE,oBAAoB;;;;;;EAqK1D"}
+{"version":3,"file":"analyzeRoutes.d.ts","sourceRoot":"","sources":["../src/analyzeRoutes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AAGpD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAA;AAQzC,OAAO,EAIL,KAAK,SAAS,EACf,MAAM,WAAW,CAAA;AAElB,KAAK,gBAAgB,GAAG,MAAM,YAAY,GAAG,IAAI,CAAA;AAIjD,MAAM,MAAM,kBAAkB,GAAG;IAC/B,CAAC,GAAG,EAAE,MAAM,GAAG,CACb,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,GAAG,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,KACtD,MAAM,CAAA;CACZ,CAAA;AAED,MAAM,MAAM,QAAQ,GAAG,CAAC,CAAC,KAAK,EAAE,GAAG,KAAK,SAAS,CAAC,EAAE,CAAA;AAEpD,UAAU,GAAG;IACX,EAAE,EAAE,MAAM,CAAA;IACV,QAAQ,EAAE,QAAQ,CAAA;IAClB,SAAS,EAAE,OAAO,CAAA;IAClB,KAAK,EAAE;QACL,OAAO,CAAC,EAAE,OAAO,CAAA;QACjB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;KACvB,CAAA;CACF;AAED,KAAK,SAAS,GAAG,MAAM,CAAA;AAEvB;;;;GAIG;AACH,UAAU,aAAa;IACrB,IAAI,EAAE,SAAS,CAAA;IACf,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;IACnB,gBAAgB,CAAC,EAAE,gBAAgB,CAAA;IACnC,IAAI,EAAE,QAAQ,GAAG,IAAI,CAAA;IACrB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAA;IACvB,IAAI,EAAE,GAAG,EAAE,CAAA;CACZ;AAED,UAAU,oBAAoB;IAC5B,eAAe,EAAE,MAAM,CAAA;IACvB,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA;CAC3C;AAED,wBAAgB,aAAa,CAC3B,QAAQ,EAAE,SAAS,EACnB,EAAE,eAAe,EAAE,cAAc,EAAE,EAAE,oBAAoB;;;;;;EA6K1D"}

package/dist/analyzeRoutes.js

@@ -11,31 +11,6 @@ import {
   replaceParams,
   validatePath
 } from "./util.js";
-function pickSetRenderProps(props) {
-  const picked = {};
-  if (props.private !== void 0) {
-    picked.private = props.private;
-  }
-  if (props.unauthenticated !== void 0) {
-    picked.unauthenticated = props.unauthenticated;
-  }
-  if (props.roles !== void 0) {
-    picked.roles = props.roles;
-  }
-  if (props.whileLoadingAuth !== void 0) {
-    picked.whileLoadingAuth = props.whileLoadingAuth;
-  }
-  return picked;
-}
-function toWrappersArray(wrap) {
-  if (!wrap) {
-    return [];
-  }
-  return isSingleWrapper(wrap) ? [wrap] : wrap;
-}
-function isSingleWrapper(wrap) {
-  return !Array.isArray(wrap);
-}
 function analyzeRoutes(children, { currentPathName, userParamTypes }) {
   const pathRouteMap = {};
   const namedRoutesMap = {};
@@ -103,8 +78,13 @@ function analyzeRoutes(children, { currentPathName, userParamTypes }) {
         const {
           children: children2,
           whileLoadingPage: whileLoadingPageFromCurrentSet,
-          wrap: wrapFromCurrentSet
+          wrap: wrapFromCurrentSet,
+          ...otherPropsFromCurrentSet
         } = node.props;
+        let wrapperComponentsArray = [];
+        if (wrapFromCurrentSet) {
+          wrapperComponentsArray = Array.isArray(wrapFromCurrentSet) ? wrapFromCurrentSet : [wrapFromCurrentSet];
+        }
         nextSetId = nextSetId + 1;
         recurseThroughRouter({
           nodes: Children.toArray(children2),
@@ -116,11 +96,11 @@ function analyzeRoutes(children, { currentPathName, userParamTypes }) {
             ...previousSets,
             {
               id: createSetId(nextSetId, previousSets),
-              wrappers: toWrappersArray(wrapFromCurrentSet),
+              wrappers: wrapperComponentsArray,
               isPrivate: isPrivateSetNode(node) || // The following two conditions can be removed when we remove
               // the deprecated private prop
-              isPrivateNode(node) || !!node.props.private,
-              props: pickSetRenderProps(node.props)
+              isPrivateNode(node) || !!otherPropsFromCurrentSet.private,
+              props: otherPropsFromCurrentSet
             }
           ]
         });

package/dist/page.d.ts

@@ -24,5 +24,5 @@ export declare function isSpec(specOrPage: Spec | React.ComponentType): specOrPa
  * imported version into a spec.
  */
 export declare function normalizePage(specOrPage: Spec | React.ComponentType<unknown>): Spec;
-export type PageType = Spec | React.ComponentType<any> | ((props: any) => React.JSX.Element);
+export type PageType = Spec | React.ComponentType<any> | ((props: any) => JSX.Element);
 //# sourceMappingURL=page.d.ts.map

package/dist/page.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"page.d.ts","sourceRoot":"","sources":["../src/page.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,IAAI;IACnB,IAAI,EAAE,MAAM,CAAA;IACZ,eAAe,EAAE,CAAC,IAAI,CAAC,EAAE,MAAM,KAAK;QAAE,OAAO,EAAE,KAAK,CAAC,aAAa,CAAC,OAAO,CAAC,CAAA;KAAE,CAAA;IAC7E,aAAa,EACT,KAAK,CAAC,mBAAmB,CAAC,KAAK,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,GACvD,KAAK,CAAC,aAAa,CAAC,OAAO,CAAC,CAAA;CACjC;AAED,wBAAgB,MAAM,CACpB,UAAU,EAAE,IAAI,GAAG,KAAK,CAAC,aAAa,GACrC,UAAU,IAAI,IAAI,CAEpB;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,aAAa,CAC3B,UAAU,EAAE,IAAI,GAAG,KAAK,CAAC,aAAa,CAAC,OAAO,CAAC,GAC9C,IAAI,CAaN;AAED,MAAM,MAAM,QAAQ,GAClB,IAAI,GAAG,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,GAAG,KAAK,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA"}
+{"version":3,"file":"page.d.ts","sourceRoot":"","sources":["../src/page.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,IAAI;IACnB,IAAI,EAAE,MAAM,CAAA;IACZ,eAAe,EAAE,CAAC,IAAI,CAAC,EAAE,MAAM,KAAK;QAAE,OAAO,EAAE,KAAK,CAAC,aAAa,CAAC,OAAO,CAAC,CAAA;KAAE,CAAA;IAC7E,aAAa,EACT,KAAK,CAAC,mBAAmB,CAAC,KAAK,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,GACvD,KAAK,CAAC,aAAa,CAAC,OAAO,CAAC,CAAA;CACjC;AAED,wBAAgB,MAAM,CACpB,UAAU,EAAE,IAAI,GAAG,KAAK,CAAC,aAAa,GACrC,UAAU,IAAI,IAAI,CAEpB;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,aAAa,CAC3B,UAAU,EAAE,IAAI,GAAG,KAAK,CAAC,aAAa,CAAC,OAAO,CAAC,GAC9C,IAAI,CAaN;AAED,MAAM,MAAM,QAAQ,GAClB,IAAI,GAAG,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,GAAG,KAAK,GAAG,CAAC,OAAO,CAAC,CAAA"}

package/dist/react-util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"react-util.d.ts","sourceRoot":"","sources":["../src/react-util.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AAGtC,wBAAgB,UAAU,CAAC,QAAQ,EAAE,SAAS,GAAG,SAAS,EAAE,CAa3D"}
+{"version":3,"file":"react-util.d.ts","sourceRoot":"","sources":["../src/react-util.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AAGtC,wBAAgB,UAAU,CAAC,QAAQ,EAAE,SAAS,GAAG,SAAS,EAAE,CAU3D"}

package/dist/router.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../src/router.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAgB,SAAS,EAAE,MAAM,OAAO,CAAA;AACpD,OAAO,KAAwB,MAAM,OAAO,CAAA;AAY5C,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,qBAAqB,CAAA;AAKrE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAA;AAErD,MAAM,WAAW,WAAY,SAAQ,IAAI,CACvC,0BAA0B,EAC1B,QAAQ,GAAG,iBAAiB,CAC7B;IACC,eAAe,CAAC,EAAE,oBAAoB,CAAA;IACtC,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,QAAQ,EAAE,SAAS,CAAA;CACpB;AAED,eAAO,MAAM,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,WAAW,CAoBxC,CAAA"}
+{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../src/router.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AACtC,OAAO,KAAwB,MAAM,OAAO,CAAA;AAY5C,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,qBAAqB,CAAA;AAIrE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAA;AAErD,MAAM,WAAW,WAAY,SAAQ,IAAI,CACvC,0BAA0B,EAC1B,QAAQ,GAAG,iBAAiB,CAC7B;IACC,eAAe,CAAC,EAAE,oBAAoB,CAAA;IACtC,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,QAAQ,EAAE,SAAS,CAAA;CACpB;AAED,eAAO,MAAM,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,WAAW,CAoBxC,CAAA"}

package/dist/router.js

@@ -9,7 +9,6 @@ import { PageLoadingContextProvider } from "./PageLoadingContext.js";
 import { ParamsProvider } from "./params.js";
 import { Redirect } from "./redirect.js";
 import { RouterContextProvider } from "./router-context.js";
-import { wrapWithSetWrappers } from "./Set.js";
 import { SplashPage } from "./splash-page.js";
 import { matchPath, parseSearch, replaceParams, validatePath } from "./util.js";
 const Router = ({
@@ -142,7 +141,13 @@ const WrappedPage = memo(({ sets, children }) => {
     return children;
   }
   return sets.reduceRight((acc, set) => {
-    let wrapped = wrapWithSetWrappers(set.wrappers, set.id, acc);
+    let wrapped = set.wrappers.reduceRight((acc2, Wrapper, index) => {
+      return React.createElement(
+        Wrapper,
+        { ...set.props, key: set.id + "-" + index },
+        acc2
+      );
+    }, acc);
     if (set.isPrivate) {
       const unauthenticated = set.props.unauthenticated;
       if (!unauthenticated || typeof unauthenticated !== "string") {
@@ -150,15 +155,7 @@ const WrappedPage = memo(({ sets, children }) => {
           "You must specify an `unauthenticated` route when using PrivateSet"
         );
       }
-      wrapped = /* @__PURE__ */ React.createElement(
-        AuthenticatedRoute,
-        {
-          unauthenticated,
-          roles: set.props.roles,
-          whileLoadingAuth: set.props.whileLoadingAuth
-        },
-        wrapped
-      );
+      wrapped = /* @__PURE__ */ React.createElement(AuthenticatedRoute, { ...set.props, unauthenticated }, wrapped);
     }
     return wrapped;
   }, children);

package/dist/rsc/RscRoutes.d.ts

@@ -2,6 +2,6 @@ interface Props {
     pathname: string;
     search: string;
 }
-export declare const RscRoutes: ({ pathname, search }: Props) => import("react").ReactElement<unknown, string | import("react").JSXElementConstructor<any>>;
+export declare const RscRoutes: ({ pathname, search }: Props) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>;
 export {};
 //# sourceMappingURL=RscRoutes.d.ts.map

package/dist/rsc/RscRoutes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RscRoutes.d.ts","sourceRoot":"","sources":["../../src/rsc/RscRoutes.tsx"],"names":[],"mappings":"AAiIA,UAAU,KAAK;IACb,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,MAAM,CAAA;CACf;AAED,eAAO,MAAM,SAAS,GAAI,sBAAsB,KAAK,+FAkCpD,CAAA"}
+{"version":3,"file":"RscRoutes.d.ts","sourceRoot":"","sources":["../../src/rsc/RscRoutes.tsx"],"names":[],"mappings":"AAiIA,UAAU,KAAK;IACb,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,MAAM,CAAA;CACf;AAED,eAAO,MAAM,SAAS,GAAI,sBAAsB,KAAK,2FAkCpD,CAAA"}

package/dist/rsc/ServerRouter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ServerRouter.d.ts","sourceRoot":"","sources":["../../src/rsc/ServerRouter.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAgB,SAAS,EAAE,MAAM,OAAO,CAAA;AACpD,OAAO,KAAK,MAAM,OAAO,CAAA;AAQzB,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,sBAAsB,CAAA;AAGtE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAA;AAKtD,MAAM,WAAW,WAAY,SAAQ,IAAI,CACvC,0BAA0B,EAC1B,QAAQ,GAAG,iBAAiB,CAC7B;IACC,eAAe,CAAC,EAAE,oBAAoB,CAAA;IACtC,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,QAAQ,EAAE,SAAS,CAAA;CACpB;AAED,eAAO,MAAM,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,WAAW,CA4GxC,CAAA"}
+{"version":3,"file":"ServerRouter.d.ts","sourceRoot":"","sources":["../../src/rsc/ServerRouter.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AACtC,OAAO,KAAK,MAAM,OAAO,CAAA;AAQzB,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,sBAAsB,CAAA;AAEtE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAA;AAKtD,MAAM,WAAW,WAAY,SAAQ,IAAI,CACvC,0BAA0B,EAC1B,QAAQ,GAAG,iBAAiB,CAC7B;IACC,eAAe,CAAC,EAAE,oBAAoB,CAAA;IACtC,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,QAAQ,EAAE,SAAS,CAAA;CACpB;AAED,eAAO,MAAM,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,WAAW,CA4GxC,CAAA"}

package/dist/rsc/ServerRouter.js

@@ -3,7 +3,6 @@ import { getAuthState, getLocation } from "@cedarjs/server-store";
 import { analyzeRoutes } from "../analyzeRoutes.js";
 import { namedRoutes } from "../namedRoutes.js";
 import { normalizePage } from "../page.js";
-import { wrapWithSetWrappers } from "../Set.js";
 import { SplashPage } from "../splash-page.js";
 import { matchPath, parseSearch, replaceParams, validatePath } from "../util.js";
 import { ServerRouteLoader } from "./ServerRouteLoader.js";
@@ -113,7 +112,13 @@ const WrappedPage = ({ routeLoaderElement, sets }) => {
     return routeLoaderElement;
   }
   return sets.reduceRight((acc, set) => {
-    let wrapped = wrapWithSetWrappers(set.wrappers, set.id, acc);
+    let wrapped = set.wrappers.reduceRight((acc2, Wrapper, index) => {
+      return React.createElement(
+        Wrapper,
+        { ...set.props, key: set.id + "-" + index },
+        acc2
+      );
+    }, acc);
     if (set.isPrivate) {
       const unauthenticated = set.props.unauthenticated;
       if (!unauthenticated || typeof unauthenticated !== "string") {
@@ -121,15 +126,7 @@ const WrappedPage = ({ routeLoaderElement, sets }) => {
           "You must specify an `unauthenticated` route when using PrivateSet"
         );
       }
-      wrapped = /* @__PURE__ */ React.createElement(
-        AuthenticatedRoute,
-        {
-          unauthenticated,
-          roles: set.props.roles,
-          whileLoadingAuth: set.props.whileLoadingAuth
-        },
-        wrapped
-      );
+      wrapped = /* @__PURE__ */ React.createElement(AuthenticatedRoute, { ...set.props, unauthenticated }, wrapped);
     }
     return wrapped;
   }, routeLoaderElement);

package/dist/skipNav.d.ts

@@ -5,10 +5,10 @@ type ForwardRefExoticComponent<E, OwnProps> = React.ForwardRefExoticComponent<Me
 }>>;
 interface ForwardRefComponent<IntrinsicElementString, OwnProps = object> extends ForwardRefExoticComponent<IntrinsicElementString, OwnProps> {
     <As = IntrinsicElementString>(props: As extends '' ? {
-        as: keyof React.JSX.IntrinsicElements;
+        as: keyof JSX.IntrinsicElements;
     } : As extends React.ComponentType<infer P> ? Merge<P, OwnProps & {
         as: As;
-    }> : As extends keyof React.JSX.IntrinsicElements ? Merge<React.JSX.IntrinsicElements[As], OwnProps & {
+    }> : As extends keyof JSX.IntrinsicElements ? Merge<JSX.IntrinsicElements[As], OwnProps & {
         as: As;
     }> : never): React.ReactElement | null;
 }

package/dist/skipNav.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"skipNav.d.ts","sourceRoot":"","sources":["../src/skipNav.tsx"],"names":[],"mappings":"AAKA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAQ9B,KAAK,KAAK,CAAC,EAAE,GAAG,MAAM,EAAE,EAAE,GAAG,MAAM,IAAI,IAAI,CAAC,EAAE,EAAE,MAAM,EAAE,CAAC,GAAG,EAAE,CAAA;AAE9D,KAAK,yBAAyB,CAAC,CAAC,EAAE,QAAQ,IAAI,KAAK,CAAC,yBAAyB,CAC3E,KAAK,CACH,CAAC,SAAS,KAAK,CAAC,WAAW,GAAG,KAAK,CAAC,qBAAqB,CAAC,CAAC,CAAC,GAAG,KAAK,EACpE,QAAQ,GAAG;IAAE,EAAE,CAAC,EAAE,CAAC,CAAA;CAAE,CACtB,CACF,CAAA;AAED,UAAU,mBAAmB,CAC3B,sBAAsB,EACtB,QAAQ,GAAG,MAAM,CAKjB,SAAQ,yBAAyB,CAAC,sBAAsB,EAAE,QAAQ,CAAC;IASnE,CAAC,EAAE,GAAG,sBAAsB,EAC1B,KAAK,EAAE,EAAE,SAAS,EAAE,GAChB;QAAE,EAAE,EAAE,MAAM,KAAK,CAAC,GAAG,CAAC,iBAAiB,CAAA;KAAE,GACzC,EAAE,SAAS,KAAK,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,GACrC,KAAK,CAAC,CAAC,EAAE,QAAQ,GAAG;QAAE,EAAE,EAAE,EAAE,CAAA;KAAE,CAAC,GAC/B,EAAE,SAAS,MAAM,KAAK,CAAC,GAAG,CAAC,iBAAiB,GAC1C,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,iBAAiB,CAAC,EAAE,CAAC,EAAE,QAAQ,GAAG;QAAE,EAAE,EAAE,EAAE,CAAA;KAAE,CAAC,GAC7D,KAAK,GACZ,KAAK,CAAC,YAAY,GAAG,IAAI,CAAA;CAC7B;AAWD;;;;;;GAMG;AACH,QAAA,MAAM,WAAW,EAiBX,mBAAmB,CAAC,GAAG,EAAE,gBAAgB,CAAC,CAAA;AAEhD;;GAEG;AACH,UAAU,gBAAgB;IACxB;;;;OAIG;IACH,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC1B;;;;;OAKG;IACH,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB;AAMD;;;;;;GAMG;AACH,QAAA,MAAM,cAAc,EAad,mBAAmB,CAAC,KAAK,EAAE,mBAAmB,CAAC,CAAA;AAErD;;GAEG;AACH,UAAU,mBAAmB;IAC3B;;;;;;;;;;;;;;;;OAgBG;IACH,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC1B;;;;;OAKG;IACH,EAAE,CAAC,EAAE,MAAM,CAAA;CACZ;AAOD,YAAY,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,CAAA;AACrD,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,CAAA"}
+{"version":3,"file":"skipNav.d.ts","sourceRoot":"","sources":["../src/skipNav.tsx"],"names":[],"mappings":"AAKA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAQ9B,KAAK,KAAK,CAAC,EAAE,GAAG,MAAM,EAAE,EAAE,GAAG,MAAM,IAAI,IAAI,CAAC,EAAE,EAAE,MAAM,EAAE,CAAC,GAAG,EAAE,CAAA;AAE9D,KAAK,yBAAyB,CAAC,CAAC,EAAE,QAAQ,IAAI,KAAK,CAAC,yBAAyB,CAC3E,KAAK,CACH,CAAC,SAAS,KAAK,CAAC,WAAW,GAAG,KAAK,CAAC,qBAAqB,CAAC,CAAC,CAAC,GAAG,KAAK,EACpE,QAAQ,GAAG;IAAE,EAAE,CAAC,EAAE,CAAC,CAAA;CAAE,CACtB,CACF,CAAA;AAED,UAAU,mBAAmB,CAC3B,sBAAsB,EACtB,QAAQ,GAAG,MAAM,CAKjB,SAAQ,yBAAyB,CAAC,sBAAsB,EAAE,QAAQ,CAAC;IASnE,CAAC,EAAE,GAAG,sBAAsB,EAC1B,KAAK,EAAE,EAAE,SAAS,EAAE,GAChB;QAAE,EAAE,EAAE,MAAM,GAAG,CAAC,iBAAiB,CAAA;KAAE,GACnC,EAAE,SAAS,KAAK,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,GACrC,KAAK,CAAC,CAAC,EAAE,QAAQ,GAAG;QAAE,EAAE,EAAE,EAAE,CAAA;KAAE,CAAC,GAC/B,EAAE,SAAS,MAAM,GAAG,CAAC,iBAAiB,GACpC,KAAK,CAAC,GAAG,CAAC,iBAAiB,CAAC,EAAE,CAAC,EAAE,QAAQ,GAAG;QAAE,EAAE,EAAE,EAAE,CAAA;KAAE,CAAC,GACvD,KAAK,GACZ,KAAK,CAAC,YAAY,GAAG,IAAI,CAAA;CAC7B;AAWD;;;;;;GAMG;AACH,QAAA,MAAM,WAAW,EAiBX,mBAAmB,CAAC,GAAG,EAAE,gBAAgB,CAAC,CAAA;AAEhD;;GAEG;AACH,UAAU,gBAAgB;IACxB;;;;OAIG;IACH,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC1B;;;;;OAKG;IACH,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB;AAMD;;;;;;GAMG;AACH,QAAA,MAAM,cAAc,EAad,mBAAmB,CAAC,KAAK,EAAE,mBAAmB,CAAC,CAAA;AAErD;;GAEG;AACH,UAAU,mBAAmB;IAC3B;;;;;;;;;;;;;;;;OAgBG;IACH,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC1B;;;;;OAKG;IACH,EAAE,CAAC,EAAE,MAAM,CAAA;CACZ;AAOD,YAAY,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,CAAA;AACrD,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/router",
-  "version": "7.0.1-next.467",
+  "version": "7.1.0-rc.32",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/cedarjs/cedar.git",
@@ -52,31 +52,31 @@
     "test:watch": "vitest watch"
   },
   "dependencies": {
-    "@cedarjs/project-config": "7.0.1-next.467",
-    "@cedarjs/server-store": "7.0.1-next.467",
-    "react-server-dom-webpack": "19.3.0",
+    "@cedarjs/project-config": "7.1.0-rc.32",
+    "@cedarjs/server-store": "7.1.0-rc.32",
+    "react-server-dom-webpack": "19.2.8",
     "ts-toolbelt": "9.6.0"
   },
   "devDependencies": {
     "@arethetypeswrong/cli": "0.18.5",
-    "@cedarjs/auth": "7.0.1-next.467",
-    "@cedarjs/framework-tools": "7.0.1-next.467",
+    "@cedarjs/auth": "7.1.0-rc.32",
+    "@cedarjs/framework-tools": "7.1.0-rc.32",
     "@testing-library/jest-dom": "6.9.1",
-    "@types/react": "^19.2.0",
-    "@types/react-dom": "^19.2.0",
-    "concurrently": "9.2.5",
-    "publint": "0.3.25",
-    "react": "19.3.0",
-    "react-dom": "19.3.0",
+    "@types/react": "^18.2.55",
+    "@types/react-dom": "^18.2.19",
+    "concurrently": "9.2.4",
+    "publint": "0.3.24",
+    "react": "18.3.1",
+    "react-dom": "18.3.1",
     "tstyche": "5.0.2",
     "typescript": "5.9.3",
-    "vite": "7.3.7",
+    "vite": "7.3.6",
     "vitest": "4.1.11"
   },
   "peerDependencies": {
-    "@cedarjs/auth": "7.0.1-next.467",
-    "react": "19.3.0",
-    "react-dom": "19.3.0"
+    "@cedarjs/auth": "7.1.0-rc.32",
+    "react": "18.3.1",
+    "react-dom": "18.3.1"
   },
   "engines": {
     "node": ">=24"