@oj-module/cli 0.2.29 → 0.2.30

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@oj-module/cli",
   "type": "module",
-  "version": "0.2.29",
+  "version": "0.2.30",
   "description": "React Antd 模块工程命令行工具（含预构建宿主 shell-dist）",
   "license": "MIT",
   "exports": {
@@ -49,7 +49,7 @@
   ],
   "dependencies": {
     "@faker-js/faker": "^10.4.0",
-    "@oj-module/runtime": "0.2.29",
+    "@oj-module/runtime": "0.2.30",
     "@redocly/cli": "^2.51.0",
     "@tailwindcss/vite": "^4.3.0",
     "cac": "^6.7.14",

package/shell-dist/assets/{index-CnJsHOe-.js → index-FYt9CjFd.js}

@@ -235,9 +235,54 @@ async function hydrateUser() {
 useAuthStore.subscribe((state, prev) => {
 	if (state.token !== prev.token) hydrateUser().then(() => {
 		useAccessStore.getState().setAccessStore(getRoutes());
+		repatchShellRoutes();
 	});
 });
 /**
+* 宿主路由根 id：patchRoutes 重登记的 parentId（与 runtime 的 ROOT_ROUTE_ID
+* 同名无碍——各自作用于各自 router 实例）。
+*/
+var SHELL_ROOT_ID = "shell-root";
+/** Boot 建表后持有的宿主 router 实例；token 变化时按新角色快照重登记其路由表。 */
+var shellRouter = null;
+/**
+* 宿主路由表 children：index 重定向 + 模块路由（getHostRoutes 同源重写）+
+* catch-all 兜底。Boot 建表与登录后重登记共用同一构建口，保证两处同源。
+*/
+function buildShellChildren() {
+	const hostRoutes = getHostRoutes();
+	return [
+		{
+			index: true,
+			element: /* @__PURE__ */ jsx(Navigate, {
+				to: hostRoutes[0]?.path ?? "/",
+				replace: true
+			})
+		},
+		...hostRoutes,
+		{
+			path: "*",
+			element: /* @__PURE__ */ jsx(CatchAll, {})
+		}
+	];
+}
+/**
+* 按当前角色快照重登记宿主路由表（B16 回归，2026-10-24）。
+*
+* setAccessStore 内部的 router.patchRoutes 打的是 runtime 单例 router，而宿主
+* 渲染的是本文件 Boot 里自建的 router——仅调 setAccessStore 只会更新菜单
+* （access store），路由表保持 Boot 期快照。后果：Boot 期 user-info 失败
+* （后端闪断/过期 token 刷新失败）→ 角色空 → requiredRoles 门禁模块被过滤出
+* 路由表；随后 SPA 登录（不刷新页面）菜单回来了，但 /system/* 仍不在路由表里，
+* 直达恒落 catch-all 404「返回首页」，须硬刷新才恢复。
+*/
+function repatchShellRoutes() {
+	if (!shellRouter) return;
+	shellRouter.patchRoutes(SHELL_ROOT_ID, buildShellChildren());
+	const { pathname, search } = shellRouter.state.location;
+	shellRouter.navigate(`${pathname}${search}`, { replace: true }).catch(() => {});
+}
+/**
 * 直链兜底页（catch-all 路由元素）。无匹配路由时渲染框架 `PageError`，
 * 把 title 设为框架 404 文案（`exception.notFoundTitle` = "404"），
 * 观感与无权限面板同构，替代 React Router 默认的「Unexpected Application Error!」。
@@ -299,27 +344,14 @@ function Boot() {
 				await hydrateUser();
 				await loadAll(manifest);
 				if (cancelled) return;
-				const hostRoutes = getHostRoutes();
-				setRouter(createBrowserRouter([{
+				shellRouter = createBrowserRouter([{
 					path: "/",
+					id: SHELL_ROOT_ID,
 					element: /* @__PURE__ */ jsxs(ErrorBoundary, {
 						FallbackComponent: PageError,
 						children: [/* @__PURE__ */ jsx(LayoutEffects, {}), /* @__PURE__ */ jsx(Outlet, {})]
 					}),
-					children: [
-						{
-							index: true,
-							element: /* @__PURE__ */ jsx(Navigate, {
-								to: hostRoutes[0]?.path ?? "/",
-								replace: true
-							})
-						},
-						...hostRoutes,
-						{
-							path: "*",
-							element: /* @__PURE__ */ jsx(CatchAll, {})
-						}
-					]
+					children: buildShellChildren()
 				}], { 
 				/**
 				* 子路径部署（oj `mounts: [{ prefix: /oj, web: dist, spa: true }]`）：
@@ -330,7 +362,8 @@ function Boot() {
 				*
 				* 浏览器 URL 不受影响：react-router 只是在匹配/生成时剥/补前缀。
 				*/
-basename: base }));
+basename: base });
+				setRouter(shellRouter);
 			} catch (e) {
 				if (!cancelled) setError(e instanceof Error ? e.message : String(e));
 			}

package/shell-dist/assets/runtime.js

@@ -304,10 +304,10 @@ function getAppInfo() {
 	return {
 		"pkg": {
 			"name": "@oj-module/runtime",
-			"version": "0.2.29",
+			"version": "0.2.30",
 			"license": "MIT"
 		},
-		"lastBuildTime": "2026-10-24 20:31:54"
+		"lastBuildTime": "2026-10-24 23:41:26"
 	};
 }
 var init_get_app_info = __esmMin((() => {}));

package/shell-dist/index.html

@@ -5,9 +5,9 @@
 		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
 		<link rel="icon" href="/favicon.ico" />
 		<title>React Antd Admin · Shell</title>
-		<meta http-equiv="Content-Security-Policy" content="default-src 'none'; script-src 'self' https://modules.cdn.example.com 'wasm-unsafe-eval' 'nonce-5zLHUGQHePNQzqOPB7RBQA=='; script-src-attr 'none'; connect-src 'self' data: https://modules.cdn.example.com; style-src 'self' https://modules.cdn.example.com 'unsafe-inline'; img-src 'self' data: https:; font-src 'self' data:; frame-src https://ant.design https://react.dev https://condorheroblog.github.io; form-action 'none'; base-uri 'none'; object-src 'none'; upgrade-insecure-requests" />
+		<meta http-equiv="Content-Security-Policy" content="default-src 'none'; script-src 'self' https://modules.cdn.example.com 'wasm-unsafe-eval' 'nonce-6NpMECPEhWQb/Ob12W+5HQ=='; script-src-attr 'none'; connect-src 'self' data: https://modules.cdn.example.com; style-src 'self' https://modules.cdn.example.com 'unsafe-inline'; img-src 'self' data: https:; font-src 'self' data:; frame-src https://ant.design https://react.dev https://condorheroblog.github.io; form-action 'none'; base-uri 'none'; object-src 'none'; upgrade-insecure-requests" />
 
-		<script type="importmap" nonce="5zLHUGQHePNQzqOPB7RBQA==">{
+		<script type="importmap" nonce="6NpMECPEhWQb/Ob12W+5HQ==">{
   "imports": {
     "react": "/assets/react.js",
     "react/jsx-runtime": "/assets/jsx-runtime.js",
@@ -133,7 +133,7 @@
     "dayjs/locale/zh-cn": "/assets/ojm-dayjs-locale-zh-cn.js"
   }
 }</script>
-		<script type="module" crossorigin src="/assets/index-CnJsHOe-.js"></script>
+		<script type="module" crossorigin src="/assets/index-FYt9CjFd.js"></script>
 	</head>
 	<body>
 		<div id="root"></div>

package/shell-dist/versions.json

@@ -7,9 +7,9 @@
   "react-router": "7.18.2",
   "react-router/dom": "7.18.2",
   "@tanstack/react-query": "5.102.8",
-  "@oj-module/runtime": "0.2.29",
-  "@oj-module/runtime/contract": "0.2.29",
-  "@oj-module/runtime/contract/errors": "0.2.29",
+  "@oj-module/runtime": "0.2.30",
+  "@oj-module/runtime/contract": "0.2.30",
+  "@oj-module/runtime/contract/errors": "0.2.30",
   "@plane/kit": "0.1.20",
   "@plane/editor": "0.1.20",
   "antd": "6.6.1",

package/templates/src/system/web/entry.ts

@@ -73,8 +73,11 @@ export default defineModule({
 	peerRuntime: ">=0.0.0",
 	// 路由级门禁（B16）：非系统管理员不注入 /system 路由、菜单不可见；
 	// API 级 403 由 assertSystemAdmin + service 层硬 enforcement 兜底。
-	// 角色口径对齐后端 assertSystemAdmin（access.ts:90）——superadmin **或**
-	// admin 均可；seed 的 admin 账号只有 superadmin，写 ["admin"] 会把它自己挡在门外。
+	// 角色口径对齐后端 assertSystemAdmin（access.ts:87）——superadmin **或**
+	// admin 均可，两者必须同时保留：D12（2026-10-22）起账号名=角色名，admin 与
+	// superadmin 是两个独立账号（seed.sql），只留 ["admin"] 会把 superadmin 挡在
+	// 门外（注册期过滤 → 路由消失 → 登录后 404 兜底）。改这两个值前先跑
+	// tests/system-guard.regression.spec.ts（只留 ["admin"] 会立刻变红）。
 	config: { requiredRoles: ["admin", "superadmin"] },
 	routes,
 	i18n: {

package/vendor/host-versions.json

@@ -8,9 +8,9 @@
 		"react-router": "7.18.2",
 		"react-router/dom": "7.18.2",
 		"@tanstack/react-query": "5.102.8",
-		"@oj-module/runtime": "0.2.29",
-		"@oj-module/runtime/contract": "0.2.29",
-		"@oj-module/runtime/contract/errors": "0.2.29",
+		"@oj-module/runtime": "0.2.30",
+		"@oj-module/runtime/contract": "0.2.30",
+		"@oj-module/runtime/contract/errors": "0.2.30",
 		"@plane/kit": "0.1.20",
 		"@plane/editor": "0.1.20",
 		"antd": "6.6.1",