generator-mico-cli 0.2.22 → 0.2.24

package/generators/micro-react/templates/apps/layout/src/common/menu/parser.ts

@@ -341,6 +341,10 @@ export const parseMenuItems = (items: MenuItem[]): ParsedMenuItem[] => {
     });
 };
 
+/** 去除尾部斜杠（根路径 "/" 保持不变） */
+const stripTrailingSlash = (path: string): string =>
+  path.length > 1 && path.endsWith('/') ? path.slice(0, -1) : path;
+
 /**
  * 根据路径查找对应的路由配置
  */
@@ -348,18 +352,19 @@ export const findRouteByPath = (
   routes: ParsedRoute[],
   pathname: string,
 ): ParsedRoute | undefined => {
+  const normalizedPathname = stripTrailingSlash(pathname);
   let exact: ParsedRoute | undefined;
   let bestWildcard: { route: ParsedRoute; basePath: string } | undefined;
 
   for (const route of routes) {
-    if (route.path === pathname) {
+    if (stripTrailingSlash(route.path) === normalizedPathname) {
       exact = route;
       continue;
     }
 
     if (route.path.endsWith('/*')) {
       const basePath = route.path.slice(0, -2);
-      if (pathname === basePath || pathname.startsWith(`${basePath}/`)) {
+      if (normalizedPathname === basePath || normalizedPathname.startsWith(`${basePath}/`)) {
         if (!bestWildcard || basePath.length > bestWildcard.basePath.length) {
           bestWildcard = { route, basePath };
         }

package/generators/micro-react/templates/apps/layout/src/common/request/interceptors.ts

@@ -164,7 +164,7 @@ export const initDefaultInterceptors = (
     return data;
   });
 
-  // 处理业务错误码
+  // 处理业务错误码（{ result: { code, desc } } 格式）
   addResponseInterceptor(async (data: unknown) => {
     if (data && typeof data === 'object' && 'result' in data) {
       const typedData = data as { result?: { code?: number; desc?: string } };
@@ -183,4 +183,32 @@ export const initDefaultInterceptors = (
     }
     return data;
   });
+
+
+  // 处理业务错误码（{ code, msg, data } 格式）
+  addResponseInterceptor(async (data: unknown) => {
+    if (
+      data &&
+      typeof data === 'object' &&
+      'code' in data &&
+      !('result' in data) &&
+      !('success' in data)
+    ) {
+      const typedData = data as { code?: number; msg?: string };
+      if (typeof typedData.code === 'number' && typedData.code !== 200) {
+        const error = new Error(
+          typedData.msg || `请求失败 (${typedData.code})`,
+        ) as Error & {
+          code: number;
+          msg: string;
+          response: unknown;
+        };
+        error.code = typedData.code;
+        error.msg = typedData.msg || '';
+        error.response = data;
+        throw error;
+      }
+    }
+    return data;
+  });
 };

package/generators/micro-react/templates/apps/layout/src/components/MicroAppLoader/index.less

@@ -11,14 +11,10 @@
 }
 
 .micro-app-loading {
-  position: absolute;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
   display: flex;
   align-items: center;
   justify-content: center;
+  min-height: 600px;
   background: var(--color-bg-1);
   z-index: 10;
 }

package/generators/micro-react/templates/apps/layout/src/components/RightContent/AvatarDropdown.tsx

@@ -1,4 +1,5 @@
 import { logout, STORAGE_KEYS } from '@/common/auth';
+import type { IUserInfo } from '@/common/auth/type';
 import {
 	getCurrentTimezone,
 	getTimezoneRegion,
@@ -39,13 +40,10 @@ interface IMenuItem {
 	children?: IMenuItem[];
 }
 
-const DEFAULT_AVATAR =
-	'https://gw.alipayobjects.com/zos/antfincdn/XAosXuNZyF/BiazfanxmamNRoxxVxka.png';
-
 // TODO: 临时假数据，后续接入真实登录态
-const MOCK_USER = {
+const MOCK_USER: Partial<IUserInfo> = {
 	user_name: 'Test User',
-	avatar: DEFAULT_AVATAR,
+	username: 'test@micous.com',
 };
 
 export const AvatarName: React.FC<{ userName?: string }> = ({ userName }) => {
@@ -100,11 +98,11 @@ export const AvatarDropdown: React.FC<GlobalHeaderRightProps> = ({ menu }) => {
 
 	// 管理头像 URL
 	const [avatarSrc, setAvatarSrc] = useState<string>(
-		currentUser?.avatar || DEFAULT_AVATAR,
+		currentUser?.avatar || '',
 	);
 
 	useEffect(() => {
-		setAvatarSrc(currentUser?.avatar || DEFAULT_AVATAR);
+		setAvatarSrc(currentUser?.avatar || '');
 	}, [currentUser?.avatar]);
 
 	// 加载时区列表
@@ -142,10 +140,6 @@ export const AvatarDropdown: React.FC<GlobalHeaderRightProps> = ({ menu }) => {
 		};
 	}, []);
 
-	const handleAvatarError = () => {
-		setAvatarSrc(DEFAULT_AVATAR);
-	};
-
 	const loginOut = async () => {
 		logout();
 		const { search, pathname } = window.location;
@@ -370,11 +364,13 @@ export const AvatarDropdown: React.FC<GlobalHeaderRightProps> = ({ menu }) => {
 			}
 		>
 			<div className="flex items-center avatar-dropdown-trigger">
-				<div className="flex items-center">
-					<Avatar size={24} shape="circle">
-						<img src={avatarSrc} alt="avatar" onError={handleAvatarError} />
-					</Avatar>
-				</div>
+				{avatarSrc && (
+					<div className="flex items-center">
+						<Avatar size={24} shape="circle">
+							<img src={avatarSrc} alt="avatar" />
+						</Avatar>
+					</div>
+				)}
 				<AvatarName userName={currentUser?.user_name} />
 				<IconFont
 					type="webcs-outline_down1"

package/generators/micro-react/templates/apps/layout/src/layouts/components/menu/index.less

@@ -135,11 +135,12 @@
 }
 
 // Sider styles
-.<%= projectName %>-sider {
+.layout-web-sider {
   box-shadow: none;
   background-color: @color-text-5 !important;
   position: fixed !important;
   height: calc(100vh - @header-height) !important;
+  z-index: 999;
 
   .arco-layout-sider-trigger {
     display: flex;

package/generators/micro-react/templates/apps/layout/src/layouts/components/menu/index.tsx

@@ -2,12 +2,12 @@ import type { ParsedMenuItem } from '@/common/menu';
 import { filterMenuItems, parseMenuItems } from '@/common/menu';
 import { getMenus } from '@/common/portal-data';
 import IconFont from '@/components/IconFont';
-import { isAuthDisabled, isNoPermissionRoute } from '@/constants';
+import { isAuthDisabled } from '@/constants';
 import { useMenuState } from '@/hooks/useMenuState';
 import { useTheme } from '@/hooks/useTheme';
 import { Layout, Menu } from '@mico-platform/ui';
 import * as Icons from '@mico-platform/ui/icon';
-import { useLocation, useModel } from '@umijs/max';
+import { useModel } from '@umijs/max';
 import React, { useEffect, useMemo, useRef } from 'react';
 import './index.less';
 
@@ -115,16 +115,15 @@ interface LayoutMenuProps {
 const LayoutMenu: React.FC<LayoutMenuProps> = () => {
   const siderRef = useRef<HTMLDivElement>(null);
   const { isDark } = useTheme();
-  const location = useLocation();
-
   const { initialState } = useModel('@@initialState');
   const currentUser = initialState?.currentUser;
 
   // Parse menu data
-  // disableAuth 或免权限校验路由时不过滤，显示全部菜单
+  // isMenuAllowed 内部已对每个菜单项单独检查 isNoPermissionRoute，
+  // 无需在此按当前页面路径全局跳过过滤，避免菜单可见性随页面变化
   const menuItems = useMemo(() => {
     const menus = getMenus();
-    if (isAuthDisabled() || isNoPermissionRoute(location.pathname)) {
+    if (isAuthDisabled()) {
       return parseMenuItems(menus);
     }
     const filteredMenus = filterMenuItems(menus, {
@@ -132,7 +131,7 @@ const LayoutMenu: React.FC<LayoutMenuProps> = () => {
       sideMenus: (currentUser?.side_menus || []) as string[],
     });
     return parseMenuItems(filteredMenus);
-  }, [currentUser?.is_superuser, currentUser?.side_menus, location.pathname]);
+  }, [currentUser?.is_superuser, currentUser?.side_menus]);
 
   // 使用菜单状态 Hook
   const {
@@ -177,7 +176,7 @@ const LayoutMenu: React.FC<LayoutMenuProps> = () => {
       onCollapse={handleCollapsed}
       collapsible
       breakpoint="xl"
-      className="common-web-sider"
+      className="layout-web-sider"
       trigger={clickTriggerBtn}
       theme={isDark ? 'dark' : 'light'}
     >

package/generators/micro-react/templates/apps/layout/src/services/user.ts

@@ -42,7 +42,11 @@ export async function fetchUserInfo(): Promise<IUserInfo> {
     skipProxy: true,
   });
   if (response.code === 200 && response.data) {
-    return response.data;
+    const data = response.data;
+    if (!data.user_name) {
+      data.user_name = data.username || '';
+    }
+    return data;
   }
   throw new Error(response.msg || '获取用户信息失败');
 }

package/generators/micro-react/templates/package.json

@@ -32,6 +32,8 @@
   "devDependencies": {
     "@commitlint/cli": "^19.5.0",
     "@commitlint/config-conventional": "^19.5.0",
+    "@common-web/sentry": "^0.0.4",
+    "@sentry/webpack-plugin": "^4.9.1",
 		"@typescript-eslint/eslint-plugin": "^8.54.0",
 		"@typescript-eslint/parser": "^8.54.0",
     "dotenv-cli": "^7.4.1",

package/generators/micro-react/templates/scripts/apply-sentry-plugin.ts

@@ -0,0 +1,45 @@
+interface ApplySentryPluginOptions {
+  /** webpack-chain 实例（Umi chainWebpack 的参数） */
+  memo: any;
+  /** 应用名称，用于 urlPrefix 路径 */
+  appName: string;
+  /** Sentry project 名称，默认 '<%= projectName %>' */
+  project?: string;
+}
+
+/**
+ * 往 webpack-chain 配置上挂载 Sentry sourcemap 上传插件
+ */
+export function applySentryPlugin({
+  memo,
+  appName,
+  project = '<%= projectName %>',
+}: ApplySentryPluginOptions) {
+  const version = require('../package.json').version;
+
+  // 使用 Legacy Upload 方式，自托管 Sentry 不支持 Debug ID / Artifact Bundle
+  const { sentryWebpackPlugin } = require('@sentry/webpack-plugin');
+  memo.plugin('sentry').use(
+    class {
+      apply(compiler: any) {
+        sentryWebpackPlugin({
+          url: 'https://sentry.micoworld.net',
+          org: 'micocenter',
+          project,
+          /** @see https://micoworld.feishu.cn/wiki/AmXQwmnEairvQ9k2m9KcgJNcndv#share-OupCdqeeUoESO4x6YKPcrs4nn3c */
+          authToken: process.env.SENTRY_AUTH_TOKEN,
+          release: {
+            name: version,
+            uploadLegacySourcemaps: {
+              paths: ['./dist'],
+              urlPrefix: `~/<%= cdnPrefixPath %><%= projectName %>/${version}/${appName}`,
+            },
+          },
+          sourcemaps: {
+            disable: true,
+          },
+        }).apply(compiler);
+      }
+    },
+  );
+}

package/generators/micro-react/templates/scripts/collect-dist.js

@@ -48,6 +48,16 @@ async function collectDist() {
 
         // 移动 dist 目录到目标位置
         await fs.rename(appDistPath, targetDistPath);
+
+        // 删除 .map 文件（sourcemap 已由 webpack 插件上传到 Sentry，无需部署到 CDN）
+        const files = await fs.readdir(targetDistPath);
+        for (const file of files) {
+          if (file.endsWith('.map')) {
+            await fs.unlink(path.join(targetDistPath, file));
+            console.log(`  🗑 已删除 sourcemap: ${appName}/${file}`);
+          }
+        }
+
         console.log(`✓ ${appName}: apps/${appName}/dist -> dist/${appName}/`);
       } catch (error) {
         if (error.code === 'ENOENT') {

package/generators/micro-react/templates/turbo.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://turbo.build/schema.json",
-  "globalEnv": ["CDN_PUBLIC_PATH"],
+  "globalEnv": ["CDN_PUBLIC_PATH", "SENTRY_AUTH_TOKEN"],
   "tasks": {
     "build": {
       "dependsOn": ["^build"],

package/generators/subapp-react/index.js

@@ -428,9 +428,38 @@ module.exports = class extends Generator {
 
     this.log('');
     this.log('📦 正在安装依赖...');
-    this.spawnCommandSync('pnpm', ['install'], {
-      cwd: this.monorepoRoot
-    });
+    try {
+      this.spawnCommandSync('pnpm', ['install'], {
+        cwd: this.monorepoRoot
+      });
+    } catch (e) {
+      this._installFailed = true;
+      this.log('');
+      this.log('⚠️  依赖安装失败，但子应用文件已全部生成。');
+      this.logger.verbose('Install error:', e.message);
+      return;
+    }
+
+    // 依赖安装成功后，格式化被修改的 layout 文件
+    const layoutDir = path.join(this.monorepoRoot, 'apps/layout');
+    if (fs.existsSync(path.join(layoutDir, '.prettierrc'))) {
+      const filesToFormat = [
+        path.join(layoutDir, 'mock/pages.ts'),
+        path.join(layoutDir, 'config/config.dev.ts'),
+      ].filter((f) => fs.existsSync(f));
+
+      if (filesToFormat.length > 0) {
+        try {
+          this.spawnCommandSync(
+            'pnpm',
+            ['-C', 'apps/layout', 'exec', 'prettier', '--write', ...filesToFormat],
+            { cwd: this.monorepoRoot },
+          );
+        } catch (e) {
+          this.logger.verbose('Formatting failed (non-critical):', e.message);
+        }
+      }
+    }
   }
 
   end() {
@@ -438,7 +467,20 @@ module.exports = class extends Generator {
     if (this._skipInstall) return;
 
     this.log('');
-    this.log('✅ 子应用创建成功！');
+
+    if (this._installFailed) {
+      this.log('⚠️  子应用文件已创建，但依赖安装未完成。');
+      this.log('');
+      this.log('   请手动安装依赖:');
+      this.log('');
+      this.log('   pnpm install');
+      this.log('');
+      this.log('   如果安装仍然失败，可尝试:');
+      this.log('   pnpm install --network-concurrency 4');
+    } else {
+      this.log('✅ 子应用创建成功！');
+    }
+
     this.log('');
     this.log('   后续步骤:');
     this.log('');

package/generators/subapp-react/templates/homepage/config/config.dev.ts

@@ -50,7 +50,6 @@ const config: ReturnType<typeof defineConfig> = {
   // externals: {
   //   react: 'window.React',
   //   'react-dom': 'window.ReactDOM',
-  //   'react-dom/client': 'window.ReactDOMClient',
   //   '@mico-platform/ui': 'window.micoUI',
   // },
   /**

package/generators/subapp-react/templates/homepage/config/config.prod.development.ts

@@ -1,8 +1,13 @@
 // https://umijs.org/config/
 
 import { defineConfig } from '@umijs/max';
+// 开发环境，不上传 sourcemap。调试时如有需要再解开
+// import { applySentryPlugin } from "../../../scripts/apply-sentry-plugin";
 
 const config: ReturnType<typeof defineConfig> = {
+  // 开发环境，不上传 sourcemap。调试时如有需要再解开
+  // devtool: 'hidden-source-map',
+
   // 测试环境：将所有代码打包到一个文件
   extraBabelPlugins: ['babel-plugin-dynamic-import-node'],
 
@@ -12,6 +17,8 @@ const config: ReturnType<typeof defineConfig> = {
     memo.optimization.splitChunks(false);
     // 禁用 runtimeChunk
     memo.optimization.runtimeChunk(false);
+    // 开发环境，不上传 sourcemap。调试时如有需要再解开
+    // applySentryPlugin({ memo, appName: '<%= appName %>' });
     return memo;
   },
 
@@ -21,14 +28,14 @@ const config: ReturnType<typeof defineConfig> = {
    * @doc https://umijs.org/docs/api/config#externals
    *
    * 作为 qiankun 子应用时，这些库由主应用提供：
-   * - react / react-dom / react-dom/client: 主应用已加载，避免多实例问题
+   * - react / react-dom: 主应用已加载，避免多实例问题
    * - @mico-platform/ui: 主应用已加载，复用组件和样式
    */
   externals: {
     react: 'React',
     'react-dom': 'ReactDOM',
-    'react-dom/client': 'ReactDOMClient',
     '@mico-platform/ui': 'micoUI',
+    '@common-web/sentry': 'CommonWebSentry',
   },
 };
 

package/generators/subapp-react/templates/homepage/config/config.prod.testing.ts

@@ -1,8 +1,13 @@
 // https://umijs.org/config/
 
 import { defineConfig } from '@umijs/max';
+// 测试环境，不上传 sourcemap。调试时如有需要再解开
+// import { applySentryPlugin } from "../../../scripts/apply-sentry-plugin";
 
 const config: ReturnType<typeof defineConfig> = {
+  // 测试环境，不上传 sourcemap。调试时如有需要再解开
+  // devtool: 'hidden-source-map',
+
   // 测试环境：将所有代码打包到一个文件
   extraBabelPlugins: ['babel-plugin-dynamic-import-node'],
 
@@ -12,6 +17,8 @@ const config: ReturnType<typeof defineConfig> = {
     memo.optimization.splitChunks(false);
     // 禁用 runtimeChunk
     memo.optimization.runtimeChunk(false);
+    // 测试环境，不上传 sourcemap。调试时如有需要再解开
+    // applySentryPlugin({ memo, appName: '<%= appName %>' });
     return memo;
   },
 
@@ -21,14 +28,14 @@ const config: ReturnType<typeof defineConfig> = {
    * @doc https://umijs.org/docs/api/config#externals
    *
    * 作为 qiankun 子应用时，这些库由主应用提供：
-   * - react / react-dom / react-dom/client: 主应用已加载，避免多实例问题
+   * - react / react-dom: 主应用已加载，避免多实例问题
    * - @mico-platform/ui: 主应用已加载，复用组件和样式
    */
   externals: {
     react: 'React',
     'react-dom': 'ReactDOM',
-    'react-dom/client': 'ReactDOMClient',
     '@mico-platform/ui': 'micoUI',
+    '@common-web/sentry': 'CommonWebSentry',
   },
 };
 

package/generators/subapp-react/templates/homepage/config/config.prod.ts

@@ -1,6 +1,7 @@
 // https://umijs.org/config/
 
 import { defineConfig } from '@umijs/max';
+import { applySentryPlugin } from '../../../scripts/apply-sentry-plugin';
 const { CDN_PUBLIC_PATH } = process.env;
 
 const PUBLIC_PATH: string = CDN_PUBLIC_PATH
@@ -8,6 +9,11 @@ const PUBLIC_PATH: string = CDN_PUBLIC_PATH
   : '/<%= appName %>/';
 
 const config: ReturnType<typeof defineConfig> = {
+  /**
+   * 启用 Source Map（用于 Sentry 错误追踪）
+   * hidden-source-map 会生成 .map 文件但不在 JS 中添加 sourcemap 注释
+   */
+  devtool: 'hidden-source-map',
   // 生产环境：将所有代码打包到一个文件
   extraBabelPlugins: ['babel-plugin-dynamic-import-node'],
 
@@ -17,6 +23,7 @@ const config: ReturnType<typeof defineConfig> = {
     memo.optimization.splitChunks(false);
     // 禁用 runtimeChunk
     memo.optimization.runtimeChunk(false);
+    applySentryPlugin({ memo, appName: '<%= appName %>' });
     return memo;
   },
   publicPath: PUBLIC_PATH,
@@ -27,14 +34,14 @@ const config: ReturnType<typeof defineConfig> = {
    * @doc https://umijs.org/docs/api/config#externals
    *
    * 作为 qiankun 子应用时，这些库由主应用提供：
-   * - react / react-dom / react-dom/client: 主应用已加载，避免多实例问题
+   * - react / react-dom: 主应用已加载，避免多实例问题
    * - @mico-platform/ui: 主应用已加载，复用组件和样式
    */
   externals: {
     react: 'React',
     'react-dom': 'ReactDOM',
-    'react-dom/client': 'ReactDOMClient',
     '@mico-platform/ui': 'micoUI',
+    '@common-web/sentry': 'CommonWebSentry',
   },
 };
 

package/generators/subapp-react/templates/homepage/package.json

@@ -15,6 +15,7 @@
     "start": "npm run dev"
   },
   "dependencies": {
+    "@mico-platform/ui": "<%= micoUiVersion %>",
     "@mico-platform/theme": "<%= themeVersion %>",
     "@umijs/max": "^4.4.8",
     "react": "^18.2.0",

package/generators/subapp-react/templates/homepage/src/app.tsx

@@ -7,7 +7,9 @@
  * 自定义函数请放在 @/common/mainApp.ts 中
  */
 
+import React from 'react';
 import { history } from '@umijs/max';
+import { SentryErrorBoundary } from '@common-web/sentry';
 import { appLogger } from './common/logger';
 import { type IMicroAppProps, setMainAppProps } from './common/mainApp';
 
@@ -95,3 +97,7 @@ export async function getInitialState() {
     name: '<%= appName %>',
   };
 }
+
+export function rootContainer(container: React.ReactNode) {
+  return <SentryErrorBoundary>{container}</SentryErrorBoundary>;
+}

package/generators/subapp-umd/ignore-list.json

@@ -0,0 +1,5 @@
+[
+  "node_modules",
+  "dist",
+  ".turbo"
+]