npm - @nocobase/portal-template-default - Versions diffs - 1.0.9 → 1.0.11 - Mend

@nocobase/portal-template-default 1.0.9 → 1.0.11

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (338) hide show

package/dist/assets/use-dingtalk-sign-in-8WYzJ2jf.js ADDED Viewed

@@ -0,0 +1 @@

+ import{aZ as g,b as t,a_ as d,a$ as i}from"./index-MB-jfQld.js";function w(){return typeof navigator<"u"&&navigator.userAgent.toLowerCase().includes("dingtalk")}function k(n){const[r]=g(),[c,o]=t.useState(!1),[l,s]=t.useState(),u=t.useMemo(()=>{if(r.get("authenticator")!==n.name)return;const e=r.get("error");return e?new Error(e):void 0},[n.name,r]);return{signIn:t.useCallback(async()=>{s(void 0),o(!0);try{const e=d(r.get("to")||r.get("redirect")||"/"),a=await i.action("dingtalk","getAuthUrl",{method:"POST",authenticator:n.name,includeRole:!1,withAclMeta:!1,body:{redirect:e}});if(!(a!=null&&a.url))throw new Error("NocoBase did not return a DingTalk authorization URL.");window.location.replace(i.resolveUrl(a.url))}catch(e){s(e instanceof Error?e:new Error("Unable to start DingTalk sign-in.")),o(!1)}},[n.name,r]),isPending:c,error:l??u}}export{w as i,k as u};

package/dist/assets/use-wecom-sign-in-C9j8wfCD.js ADDED Viewed

@@ -0,0 +1 @@

+ import{aZ as m,b as n,a_ as d,a$ as i}from"./index-MB-jfQld.js";function g(){return typeof navigator<"u"&&navigator.userAgent.toLowerCase().includes("wxwork")}function h(o){const[r]=m(),[c,a]=n.useState(!1),[l,s]=n.useState(),u=n.useMemo(()=>{if(r.get("authenticator")!==o.name)return;const e=r.get("errorMsg");return e?new Error(e):void 0},[o.name,r]);return{signIn:n.useCallback(async()=>{s(void 0),a(!0);try{const e=d(r.get("to")||r.get("redirect")||"/"),t=await i.action("wecom","getAuthUrl",{method:"POST",authenticator:o.name,includeRole:!1,withAclMeta:!1,body:{redirect:e,isWeComBrowser:g()}});if(!(t!=null&&t.url))throw new Error("NocoBase did not return a WeCom authorization URL.");window.location.replace(i.resolveUrl(t.url))}catch(e){s(e instanceof Error?e:new Error("Unable to start WeCom sign-in.")),a(!1)}},[o.name,r]),isPending:c,error:l??u}}export{g as i,h as u};

package/dist/assets/wecom-sign-in-button-mIS1zGSU.js ADDED Viewed

@@ -0,0 +1 @@

+ import{j as s,D as c,b8 as d,r as p,aT as x,aV as m,aW as g,b9 as u,ba as T,bb as j}from"./index-MB-jfQld.js";import{u as b}from"./use-wecom-sign-in-C9j8wfCD.js";function f(e){return typeof e=="string"?e.replace(/<[^>]+>/g," ").replace(/\s+/g," ").trim():""}function W({authenticator:e,onSignIn:i}){var a;const{signIn:o,isPending:t,error:n}=b(e),r=f((a=e.options)==null?void 0:a.btnTooltip),l=s.jsxs(c,{type:"button",variant:"outline",className:"w-full",disabled:!i&&t,onClick:i??o,children:[s.jsx(d,{}),!i&&t?"Redirecting…":p(e.title||e.authTypeTitle||"Sign in via WeCom")]});return s.jsxs("div",{className:"space-y-3",children:[n&&s.jsxs(x,{variant:"destructive",children:[s.jsx(m,{children:"WeCom sign-in failed"}),s.jsx(g,{children:n.message})]}),r?s.jsxs(u,{children:[s.jsx(T,{render:l}),s.jsx(j,{side:"right",className:"max-w-xs",children:r})]}):l]})}export{W as default};

package/dist/index.html CHANGED Viewed

@@ -20,8 +20,8 @@
       content="/logo-mark.png"
     />
     <title>NocoBase</title>
-    <script type="module" crossorigin src="/assets/index-C6xNKxpg.js"></script>
-    <link rel="stylesheet" crossorigin href="/assets/index-YA7-AUO8.css">
+    <script type="module" crossorigin src="/assets/index-MB-jfQld.js"></script>
+    <link rel="stylesheet" crossorigin href="/assets/index-NH3aqqQz.css">
   </head>
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>

package/dist/index.raw.html CHANGED Viewed

@@ -24,10 +24,13 @@
 <script>
   window.NOCOBASE_PORTAL_BASE = "/";
   window.NOCOBASE_API_URL = "/api";
+  window.__nocobase_api_client_storage_prefix__ = window.__nocobase_api_client_storage_prefix__ ?? "NOCOBASE_";
+  window.__nocobase_api_client_storage_type__ = window.__nocobase_api_client_storage_type__ ?? "localStorage";
+  window.__nocobase_api_client_share_token__ = window.__nocobase_api_client_share_token__ ?? false;
 </script>
 <!-- nocobase-runtime-config:end -->
-<script type="module" crossorigin src="/assets/index-C6xNKxpg.js"></script>
-    <link rel="stylesheet" crossorigin href="/assets/index-YA7-AUO8.css">
+<script type="module" crossorigin src="/assets/index-MB-jfQld.js"></script>
+    <link rel="stylesheet" crossorigin href="/assets/index-NH3aqqQz.css">
   </head>
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>

package/package.json CHANGED Viewed

@@ -1,6 +1,7 @@
 {
   "name": "@nocobase/portal-template-default",
-  "version": "1.0.9",
+  "version": "1.0.11",
+  "packageManager": "pnpm@10.28.0",
   "type": "module",
   "devDependencies": {
     "@ai-sdk/react": "2.0.0",
@@ -77,13 +78,10 @@
     "url": "git+https://github.com/nocobase/portal-template-default.git"
   },
   "scripts": {
-    "postinstall": "node ./scripts/registry.mjs install-missing",
     "dev": "vite",
     "build": "tsc && refine build",
     "build:html": "node ./scripts/build-html.mjs",
-    "registry:install": "node ./scripts/registry.mjs install-missing",
-    "registry:preview": "node ./scripts/registry.mjs preview",
-    "registry:build": "node ./scripts/registry.mjs build && shadcn build ./registry.json -o ./public/r",
+    "test:auth": "node tests/auth-session-regression.mjs",
     "test:acl": "node registry/nocobase-acl/tests/acl-regression.mjs",
     "test:i18n": "node registry/nocobase-i18n/tests/i18n-regression.mjs",
     "start": "refine start",

package/scripts/build-html.mjs CHANGED Viewed

@@ -65,6 +65,15 @@ const stripExistingRuntimeConfig = (html) => {
 const portalBase = normalizePortalBase(process.env.NOCOBASE_PORTAL_BASE);
 const apiUrl = String(process.env.NOCOBASE_API_URL || "/api").trim() || "/api";
+const storagePrefix =
+  String(process.env.API_CLIENT_STORAGE_PREFIX || "NOCOBASE_").trim() ||
+  "NOCOBASE_";
+const storageType =
+  String(process.env.API_CLIENT_STORAGE_TYPE || "localStorage").trim() ||
+  "localStorage";
+const shareToken = /^true$/i.test(
+  String(process.env.API_CLIENT_SHARE_TOKEN || "false").trim()
+);
 if (!fs.existsSync(rawIndexPath)) {
   throw new Error(
@@ -76,6 +85,9 @@ const runtimeConfig = `${startMarker}
 <script>
   window.NOCOBASE_PORTAL_BASE = ${JSON.stringify(portalBase)};
   window.NOCOBASE_API_URL = ${JSON.stringify(apiUrl)};
+  window.__nocobase_api_client_storage_prefix__ = ${JSON.stringify(storagePrefix)};
+  window.__nocobase_api_client_storage_type__ = ${JSON.stringify(storageType)};
+  window.__nocobase_api_client_share_token__ = ${JSON.stringify(shareToken)};
 </script>
 ${endMarker}
 `;

package/src/App.css CHANGED Viewed

@@ -1,6 +1,8 @@
 @import "tailwindcss";
 @import "tw-animate-css";
 @import "shadcn/tailwind.css";
+@source "./extensions";
+@source "../registry";
 @custom-variant dark (&:is(.dark *));

package/src/App.tsx CHANGED Viewed

@@ -1,92 +1,32 @@
-import { Refine, Authenticated, type ResourceProps } from "@refinedev/core";
+import { Refine, type ResourceProps } from "@refinedev/core";
-import { BrowserRouter, Route, Routes, Outlet } from "react-router";
+import { BrowserRouter } from "react-router";
 import routerProvider, {
-  CatchAllNavigate,
   UnsavedChangesNotifier,
 } from "@refinedev/react-router";
-import {
-  UserCreate,
-  UserEdit,
-  UserResourceLayout,
-  RoleDetailRoute,
-  userRoutes,
-  UserShow,
-} from "./pages/users";
 import { dataProvider } from "./providers/data";
-import { Login } from "./pages/login";
-import { Register } from "./pages/register";
-import { ForgotPassword } from "./pages/forgot-password";
-import { ErrorComponent } from "./components/app-shell/error-component";
-import { Layout } from "./components/app-shell/layout";
 import { DocumentTitleHandler } from "./components/app-shell/document-title-handler";
 import { useNotificationProvider } from "./components/notifications/use-notification-provider";
 import { Toaster } from "./components/notifications/toaster";
 import { ThemeProvider } from "./components/theme/theme-provider";
 import { TooltipProvider } from "./components/ui/tooltip";
 import { BrandLogo } from "./components/app-shell/brand";
-import {
-  AppExtensionProviders,
-  AppAuthRuntimeProviders,
-  extensionResources,
-  extensionRouteElements,
-} from "./app/extensions";
+import { AppAuthRuntimeProviders, extensionResources } from "./app/extensions";
 import "./App.css";
 import { authProvider } from "./providers/auth";
 import { accessControlProvider } from "./providers/access-control";
-import { AclBootstrap } from "./components/access-control/acl-bootstrap";
-import { ResourceAccessGuard } from "./components/access-control/resource-access-guard";
-import { NavigateToAccessibleResource } from "./components/access-control/navigate-to-accessible-resource";
-import { KeyRound, PanelsTopLeft, UsersRound } from "lucide-react";
 import { i18nProvider } from "./providers/i18n";
 import { SystemSettingsProvider } from "./providers/system-settings";
-import { AuthDemoPage } from "./components/auth/demo";
 import { getPortalBase } from "./providers/runtime-config";
+import { AclStoreProvider, aclStore } from "./lib/nocobase/acl";
+import { AppRoutes } from "./app/routes";
-const coreResources: ResourceProps[] = [
-  {
-    name: "users",
-    list: userRoutes.list,
-    create: userRoutes.create,
-    edit: userRoutes.edit,
-    show: userRoutes.show,
-    meta: {
-      label: "Users",
-      singularLabel: "User",
-      i18nKey: "resources.users",
-      i18nSingularKey: "resources.user",
-      i18nOptions: { ns: "app" },
-      descriptionI18nKey: "resources.users.description",
-      icon: <UsersRound />,
-      description:
-        "Manage the people who can sign in and work in this NocoBase application.",
-      canCreate: true,
-      canDelete: true,
-      acl: {
-        type: "collection",
-      },
-    },
-  },
-  {
-    name: "auth-components",
-    meta: {
-      label: "Authentication",
-      icon: <KeyRound />,
-      description: "NocoBase authentication UI and integration patterns.",
-      acl: { type: "authenticated" },
-    },
-  },
-  {
-    name: "auth-patterns",
-    list: "/auth",
-    meta: {
-      parent: "auth-components",
-      label: "Login composition",
-      icon: <PanelsTopLeft />,
-      acl: { type: "authenticated" },
-    },
-  },
-];
+const getResourcePriority = (resource: ResourceProps) =>
+  typeof resource.meta?.priority === "number" ? resource.meta.priority : 100;
+const appResources = [...extensionResources].sort(
+  (left, right) => getResourcePriority(left) - getResourcePriority(right)
+);
 const basename = getPortalBase().replace(/\/+$/, "");
@@ -97,123 +37,32 @@ function App() {
         <ThemeProvider>
           <TooltipProvider>
             <SystemSettingsProvider>
-            <Refine
-              dataProvider={dataProvider}
-              notificationProvider={useNotificationProvider()}
-              routerProvider={routerProvider}
-              authProvider={authProvider}
-              accessControlProvider={accessControlProvider}
-              i18nProvider={i18nProvider}
-              resources={[...coreResources, ...extensionResources]}
-              options={{
-                syncWithLocation: true,
-                warnWhenUnsavedChanges: true,
-                disableTelemetry: true,
-                title: {
-                  text: "NocoBase",
-                  icon: <BrandLogo className="size-14 rounded-2xl" />,
-                },
-              }}
-            >
-            <Routes>
-              <Route
-                element={
-                  <Authenticated
-                    key="authenticated-inner"
-                    fallback={<CatchAllNavigate to="/login" />}
-                  >
-                    <AclBootstrap>
-                      <AppExtensionProviders>
-                        <Layout>
-                          <Outlet />
-                        </Layout>
-                      </AppExtensionProviders>
-                    </AclBootstrap>
-                  </Authenticated>
-                }
-              >
-                <Route index element={<NavigateToAccessibleResource />} />
-                <Route path="/auth" element={<AuthDemoPage />} />
-                <Route
-                  path="/users"
-                  element={<UserResourceLayout />}
+              <AclStoreProvider store={aclStore}>
+                <Refine
+                  dataProvider={dataProvider}
+                  notificationProvider={useNotificationProvider()}
+                  routerProvider={routerProvider}
+                  authProvider={authProvider}
+                  accessControlProvider={accessControlProvider}
+                  i18nProvider={i18nProvider}
+                  resources={appResources}
+                  options={{
+                    syncWithLocation: true,
+                    warnWhenUnsavedChanges: true,
+                    disableTelemetry: true,
+                    title: {
+                      text: "NocoBase",
+                      icon: <BrandLogo className="size-14 rounded-2xl" />,
+                    },
+                  }}
                 >
-                  <Route
-                    path="create"
-                    element={
-                      <ResourceAccessGuard resource="users" action="create">
-                        <UserCreate />
-                      </ResourceAccessGuard>
-                    }
-                  />
-                  <Route
-                    path="edit/:id"
-                    element={
-                      <ResourceAccessGuard resource="users" action="edit">
-                        <UserEdit />
-                      </ResourceAccessGuard>
-                    }
-                  />
-                  <Route
-                    path="roles/:roleName"
-                    element={
-                      <ResourceAccessGuard resource="roles" action="show">
-                        <RoleDetailRoute returnTo="list" />
-                      </ResourceAccessGuard>
-                    }
-                  />
-                  <Route
-                    path="show/:id"
-                    element={
-                      <ResourceAccessGuard resource="users" action="show">
-                        <UserShow />
-                      </ResourceAccessGuard>
-                    }
-                  >
-                    <Route
-                      path="edit"
-                      element={
-                        <ResourceAccessGuard resource="users" action="edit">
-                          <UserEdit returnTo="show" />
-                        </ResourceAccessGuard>
-                      }
-                    />
-                    <Route
-                      path="roles/:roleName"
-                      element={
-                        <ResourceAccessGuard resource="roles" action="show">
-                          <RoleDetailRoute returnTo="show" />
-                        </ResourceAccessGuard>
-                      }
-                    />
-                  </Route>
-                </Route>
-                {extensionRouteElements}
-                <Route path="*" element={<ErrorComponent />} />
-              </Route>
-              <Route
-                element={
-                  <Authenticated
-                    key="authenticated-outer"
-                    fallback={<Outlet />}
-                  >
-                    <AclBootstrap>
-                      <NavigateToAccessibleResource />
-                    </AclBootstrap>
-                  </Authenticated>
-                }
-              >
-                <Route path="/login" element={<Login />} />
-                <Route path="/signin" element={<Login />} />
-                <Route path="/register" element={<Register />} />
-                <Route path="/forgot-password" element={<ForgotPassword />} />
-              </Route>
-            </Routes>
+                  <AppRoutes />
-            <Toaster />
-            <UnsavedChangesNotifier />
-            <DocumentTitleHandler appName="NocoBase" />
-            </Refine>
+                  <Toaster />
+                  <UnsavedChangesNotifier />
+                  <DocumentTitleHandler appName="NocoBase" />
+                </Refine>
+              </AclStoreProvider>
             </SystemSettingsProvider>
           </TooltipProvider>
         </ThemeProvider>

package/src/app/development.tsx ADDED Viewed

@@ -0,0 +1,154 @@
+import type { ResourceProps, TreeMenuItem } from "@refinedev/core";
+import { KeyRound, PanelsTopLeft } from "lucide-react";
+import type { ReactElement } from "react";
+import { Navigate, Outlet, Route, useLocation } from "react-router";
+import { AuthDemoPage } from "@/components/auth/demo";
+import { Header } from "@/components/app-shell/header";
+import { SidebarNavigation } from "@/components/app-shell/sidebar";
+import { SidebarInset, SidebarProvider } from "@/components/ui/sidebar";
+import { cn } from "@/lib/utils";
+import type { AppExtension } from "./extension";
+const coreDevelopmentResources: ResourceProps[] = [
+  {
+    name: "auth-components",
+    meta: {
+      label: "Authentication",
+      icon: <KeyRound />,
+      description: "NocoBase authentication UI and integration patterns.",
+    },
+  },
+  {
+    name: "auth-patterns",
+    list: "auth",
+    meta: {
+      parent: "auth-components",
+      label: "Login composition",
+      icon: <PanelsTopLeft />,
+      description:
+        "Dynamic login and application-owned customization patterns.",
+    },
+  },
+];
+const toDevelopmentPath = (path: string) =>
+  `/dev/${path.replace(/^\/+/, "")}`.replace(/\/+$/, "");
+function collectDevelopmentMenu(extensions: AppExtension[]) {
+  const resources = [
+    ...coreDevelopmentResources,
+    ...extensions.flatMap((extension) => extension.dev?.resources ?? []),
+  ];
+  const childrenByParent = new Map<string, ResourceProps[]>();
+  const roots: ResourceProps[] = [];
+  for (const resource of resources) {
+    const parent = resource.meta?.parent;
+    if (typeof parent === "string") {
+      const children = childrenByParent.get(parent) ?? [];
+      children.push(resource);
+      childrenByParent.set(parent, children);
+    } else {
+      roots.push(resource);
+    }
+  }
+  const toMenuItem = (
+    resource: ResourceProps,
+    parentKey?: string
+  ): TreeMenuItem => {
+    const key = parentKey ? `${parentKey}/${resource.name}` : resource.name;
+    const children = childrenByParent
+      .get(resource.name)
+      ?.map((child) => toMenuItem(child, key));
+    return {
+      name: resource.name,
+      key,
+      route:
+        typeof resource.list === "string"
+          ? toDevelopmentPath(resource.list)
+          : undefined,
+      meta: resource.meta,
+      children: children ?? [],
+    };
+  };
+  return roots.map((resource) => toMenuItem(resource));
+}
+function findFirstRoute(items: TreeMenuItem[]): string | undefined {
+  for (const item of items) {
+    if (item.route) return item.route;
+    const childRoute = item.children && findFirstRoute(item.children);
+    if (childRoute) return childRoute;
+  }
+}
+function findSelectedKey(items: TreeMenuItem[], pathname: string) {
+  const matches: TreeMenuItem[] = [];
+  const visit = (menuItems: TreeMenuItem[]) => {
+    for (const item of menuItems) {
+      if (
+        item.route &&
+        (pathname === item.route || pathname.startsWith(`${item.route}/`))
+      ) {
+        matches.push(item);
+      }
+      if (item.children) visit(item.children);
+    }
+  };
+  visit(items);
+  return matches.sort(
+    (left, right) => (right.route?.length ?? 0) - (left.route?.length ?? 0)
+  )[0]?.key;
+}
+export function createDevelopmentRoute(
+  extensions: AppExtension[]
+): ReactElement {
+  const menuItems = collectDevelopmentMenu(extensions);
+  const firstRoute = findFirstRoute(menuItems) ?? "/";
+  const routes = extensions
+    .map((extension) => extension.dev?.routes)
+    .filter((route): route is ReactElement => Boolean(route));
+  return (
+    <Route
+      key="registry-development"
+      path="/dev"
+      element={<DevelopmentLayout menuItems={menuItems} />}
+    >
+      <Route index element={<Navigate to={firstRoute} replace />} />
+      <Route path="auth" element={<AuthDemoPage />} />
+      {routes}
+    </Route>
+  );
+}
+function DevelopmentLayout({ menuItems }: { menuItems: TreeMenuItem[] }) {
+  const { pathname } = useLocation();
+  return (
+    <SidebarProvider>
+      <SidebarNavigation
+        menuItems={menuItems}
+        selectedKey={findSelectedKey(menuItems, pathname)}
+      />
+      <SidebarInset className="bg-muted/25">
+        <Header />
+        <main
+          className={cn(
+            "@container/main mx-auto flex w-full max-w-[1600px] flex-1 flex-col",
+            "relative px-4 py-5 md:p-6 lg:px-8 lg:py-7"
+          )}
+        >
+          <Outlet />
+        </main>
+      </SidebarInset>
+    </SidebarProvider>
+  );
+}

package/src/app/extension.ts CHANGED Viewed

@@ -4,8 +4,13 @@ import type { AuthenticatorAdapter } from "@/components/auth/types";
 export type AppExtension = {
   id: string;
+  priority?: number;
   resources?: ResourceProps[];
   routes?: ReactElement;
+  dev?: {
+    resources?: ResourceProps[];
+    routes?: ReactElement;
+  };
   Provider?: ComponentType<PropsWithChildren>;
   AuthRuntimeProvider?: ComponentType<PropsWithChildren>;
   authRuntimePriority?: number;

package/src/app/extensions.tsx CHANGED Viewed

@@ -1,15 +1,25 @@
-import { Suspense, type PropsWithChildren, type ReactNode } from "react";
+import {
+  Suspense,
+  type PropsWithChildren,
+  type ReactElement,
+  type ReactNode,
+} from "react";
 import type { AppExtension } from "./extension";
 import { LoadingState } from "@/components/app-shell/loading-state";
+import { createDevelopmentRoute } from "./development";
 const extensionModules = import.meta.glob<{ default: AppExtension }>(
-  "../extensions/*/extension.tsx",
+  "@/extensions/*/extension.tsx",
   { eager: true }
 );
 export const appExtensions = Object.values(extensionModules)
   .map((module) => module.default)
-  .sort((left, right) => left.id.localeCompare(right.id));
+  .sort(
+    (left, right) =>
+      (left.priority ?? 100) - (right.priority ?? 100) ||
+      left.id.localeCompare(right.id)
+  );
 export const extensionResources = appExtensions.flatMap(
   (extension) => extension.resources ?? []
@@ -17,7 +27,11 @@ export const extensionResources = appExtensions.flatMap(
 export const extensionRouteElements = appExtensions
   .map((extension) => extension.routes)
-  .filter((routes): routes is NonNullable<typeof routes> => Boolean(routes));
+  .filter((routes): routes is ReactElement => Boolean(routes));
+export const extensionStandaloneRouteElements = import.meta.env.DEV
+  ? [createDevelopmentRoute(appExtensions)]
+  : [];
 export const extensionUserMenuItems = appExtensions
   .filter((extension) => extension.UserMenuItems)

package/src/app/routes.tsx ADDED Viewed

@@ -0,0 +1,65 @@
+import { Authenticated } from "@refinedev/core";
+import { CatchAllNavigate } from "@refinedev/react-router";
+import { Outlet, Route, Routes } from "react-router";
+import { AclBootstrap } from "@/components/access-control/acl-bootstrap";
+import { NavigateToAccessibleResource } from "@/components/access-control/navigate-to-accessible-resource";
+import { ErrorComponent } from "@/components/app-shell/error-component";
+import { Layout } from "@/components/app-shell/layout";
+import { ForgotPassword } from "@/pages/forgot-password";
+import { Login } from "@/pages/login";
+import { Register } from "@/pages/register";
+import {
+  AppExtensionProviders,
+  extensionRouteElements,
+  extensionStandaloneRouteElements,
+} from "./extensions";
+export function AppRoutes() {
+  return (
+    <Routes>
+      <Route
+        element={
+          <Authenticated
+            key="authenticated-inner"
+            fallback={<CatchAllNavigate to="/login" />}
+          >
+            <AclBootstrap>
+              <AppExtensionProviders>
+                <Outlet />
+              </AppExtensionProviders>
+            </AclBootstrap>
+          </Authenticated>
+        }
+      >
+        {extensionStandaloneRouteElements}
+        <Route
+          element={
+            <Layout>
+              <Outlet />
+            </Layout>
+          }
+        >
+          <Route index element={<NavigateToAccessibleResource />} />
+          {extensionRouteElements}
+          <Route path="*" element={<ErrorComponent />} />
+        </Route>
+      </Route>
+      <Route
+        element={
+          <Authenticated key="authenticated-outer" fallback={<Outlet />}>
+            <AclBootstrap>
+              <NavigateToAccessibleResource />
+            </AclBootstrap>
+          </Authenticated>
+        }
+      >
+        <Route path="/login" element={<Login />} />
+        <Route path="/signin" element={<Login />} />
+        <Route path="/register" element={<Register />} />
+        <Route path="/forgot-password" element={<ForgotPassword />} />
+      </Route>
+    </Routes>
+  );
+}

package/src/components/access-control/acl-bootstrap.tsx CHANGED Viewed

@@ -1,9 +1,17 @@
-import type { PropsWithChildren } from "react";
+import { useEffect, type PropsWithChildren } from "react";
+import { useAclState, useAclStore } from "@/lib/nocobase/acl";
 import { AclGate } from "./acl-gate";
-import { useAclRuntime } from "./use-acl-runtime";
 export function AclBootstrap({ children }: PropsWithChildren) {
-  useAclRuntime();
+  const store = useAclStore();
+  const state = useAclState();
+  useEffect(() => {
+    if (state.status === "idle") {
+      store.load();
+    }
+  }, [state.status, store]);
   return <AclGate>{children}</AclGate>;
 }