generator-mico-cli 0.2.22 → 0.2.23

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,7 @@
   "devDependencies": {
     "@commitlint/cli": "^19.5.0",
     "@commitlint/config-conventional": "^19.5.0",
+    "@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: `~/portal-center/<%= projectName %>/${version}/${appName}`,
+            },
+          },
+          sourcemaps: {
+            disable: true,
+          },
+        }).apply(compiler);
+      }
+    },
+  );
+}

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

@@ -21,14 +21,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

@@ -21,14 +21,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

@@ -21,6 +21,7 @@
     "react-dom": "^18.2.0"
   },
   "devDependencies": {
+    "@common-web/sentry": "^0.0.3",
     "@mico-platform/ui": "<%= micoUiVersion %>",
     "@types/react": "^18.0.33",
     "@types/react-dom": "^18.0.11",

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"
+]

package/generators/subapp-umd/index.js

@@ -0,0 +1,325 @@
+'use strict';
+
+const Generator = require('yeoman-generator');
+const fs = require('node:fs');
+const path = require('node:path');
+const {
+  toKebab,
+  toPascal,
+  toCamel,
+  collectFiles,
+  transformDestPath,
+  isTemplateFile,
+  setupErrorHandlers,
+  createLogger,
+  loadMicorc,
+} = require('../../lib/utils');
+
+const IGNORE_LIST = require('./ignore-list.json');
+
+setupErrorHandlers();
+
+module.exports = class extends Generator {
+  initializing() {
+    this.monorepoRoot = process.cwd();
+    this.logger = createLogger(this);
+
+    this.isDryRun = this.options.dryRun || process.env.MICO_DRY_RUN === '1';
+
+    const { config: rcConfig, configPath } = loadMicorc(this.monorepoRoot);
+    this.rcConfig = rcConfig;
+    if (configPath) {
+      this.logger.verbose('Loaded config from:', configPath);
+    }
+
+    const packagesDir = path.join(this.monorepoRoot, 'packages');
+    const workspaceFile = path.join(this.monorepoRoot, 'pnpm-workspace.yaml');
+
+    if (!fs.existsSync(packagesDir)) {
+      console.error('');
+      console.error('❌ Error: packages directory not found.');
+      console.error('');
+      console.error('   This generator must be run from a monorepo root that contains a "packages" directory.');
+      console.error(`   Current directory: ${this.monorepoRoot}`);
+      console.error('');
+      process.exit(1);
+    }
+
+    if (!fs.existsSync(workspaceFile)) {
+      console.warn('');
+      console.warn('⚠️  Warning: pnpm-workspace.yaml not found.');
+      console.warn('   Make sure you are in the correct monorepo.');
+      console.warn('');
+    }
+  }
+
+  _detectPackageScope() {
+    const rootPkgPath = path.join(this.monorepoRoot, 'package.json');
+    if (fs.existsSync(rootPkgPath)) {
+      try {
+        const pkg = JSON.parse(fs.readFileSync(rootPkgPath, 'utf-8'));
+        if (pkg.name) {
+          return pkg.name.startsWith('@')
+            ? pkg.name.replace(/^(@[^/]+)\/.*/, '$1')
+            : `@${pkg.name}`;
+        }
+      } catch (e) {
+        // ignore
+      }
+    }
+    return null;
+  }
+
+  async prompting() {
+    try {
+      const detectedScope = this._detectPackageScope();
+      const rc = this.rcConfig || {};
+
+      this.answers = await this.prompt([
+        {
+          type: 'input',
+          name: 'appName',
+          message: 'Package name (e.g. my-widget)',
+          default: rc.defaultUmdName || 'my-widget',
+          filter: (input) => toKebab(input),
+          validate: (input) => {
+            const value = toKebab(input);
+            if (!value) return 'Package name is required';
+            const destDir = path.join(this.monorepoRoot, 'packages', value);
+            if (fs.existsSync(destDir)) {
+              return `Target already exists: packages/${value}`;
+            }
+            return true;
+          },
+        },
+        {
+          type: 'input',
+          name: 'umdGlobalName',
+          message: 'UMD global variable name (e.g. MyWidget)',
+          default: (answers) => toPascal(answers.appName),
+          validate: (input) => {
+            if (!input) return 'UMD global name is required';
+            if (!/^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(input)) {
+              return 'Must be a valid JavaScript identifier';
+            }
+            return true;
+          },
+        },
+        {
+          type: 'input',
+          name: 'packageScope',
+          message: 'Package scope',
+          default: rc.packageScope || detectedScope || '@my-project',
+          validate: (input) => {
+            if (!input) return 'Package scope is required';
+            if (!input.startsWith('@')) return 'Package scope must start with @';
+            return true;
+          },
+        },
+        {
+          type: 'input',
+          name: 'devPort',
+          message: 'Dev server port',
+          default: rc.umdDevPort || '9100',
+          validate: (input) => {
+            const port = Number(input);
+            if (!Number.isInteger(port) || port < 1024 || port > 65535) {
+              return 'Port must be an integer between 1024 and 65535';
+            }
+            return true;
+          },
+        },
+      ]);
+
+      this.appName = toKebab(this.answers.appName);
+      this.appNamePascal = toPascal(this.appName);
+      this.appNameCamel = toCamel(this.appName);
+      this.umdGlobalName = this.answers.umdGlobalName;
+      this.packageScope = this.answers.packageScope;
+      this.devPort = this.answers.devPort;
+      this.templateDir = this.templatePath();
+      this.destDir = path.join(this.monorepoRoot, 'packages', this.appName);
+    } catch (error) {
+      console.error('');
+      console.error('❌ Error during prompting:');
+      console.error(`   ${error.message}`);
+      console.error('');
+      process.exit(1);
+    }
+  }
+
+  async writing() {
+    try {
+      if (!fs.existsSync(this.templateDir)) {
+        console.error('');
+        console.error('❌ Error: Template directory not found.');
+        console.error(`   Expected: ${this.templateDir}`);
+        console.error('');
+        process.exit(1);
+      }
+
+      this.logger.verbose('Template directory:', this.templateDir);
+      this.logger.verbose('Destination directory:', this.destDir);
+
+      const templateData = {
+        appName: this.appName,
+        AppName: this.appNamePascal,
+        appNameCamel: this.appNameCamel,
+        umdGlobalName: this.umdGlobalName,
+        packageScope: this.packageScope,
+        devPort: this.devPort,
+      };
+
+      this.logger.verbose('Template data:', JSON.stringify(templateData, null, 2));
+
+      const files = collectFiles(this.templateDir, this.templateDir, IGNORE_LIST);
+
+      if (files.length === 0) {
+        console.error('');
+        console.error('❌ Error: No template files found.');
+        console.error(`   Template directory: ${this.templateDir}`);
+        console.error('');
+        process.exit(1);
+      }
+
+      if (this.isDryRun) {
+        this.log('');
+        this.log('\x1b[33m📋 Dry run mode - no files will be created\x1b[0m');
+        this.log('');
+        this.log(`   Package: ${this.appName}`);
+        this.log(`   UMD global: ${this.umdGlobalName}`);
+        this.log(`   Scope: ${this.packageScope}`);
+        this.log(`   Dev port: ${this.devPort}`);
+        this.log(`   Destination: packages/${this.appName}`);
+        this.log('');
+        this.log('   Would create the following files:');
+        this.log('');
+
+        let templateCount = 0;
+        let copyCount = 0;
+
+        for (const relPath of files) {
+          const destRelPath = transformDestPath(relPath);
+          const isTemplate = isTemplateFile(relPath);
+          const tag = isTemplate ? '\x1b[32m[tpl]\x1b[0m' : '\x1b[36m[cpy]\x1b[0m';
+          this.log(`   ${tag} packages/${this.appName}/${destRelPath}`);
+
+          if (isTemplate) {
+            templateCount++;
+          } else {
+            copyCount++;
+          }
+        }
+
+        this.log('');
+        this.log(`   Total: ${files.length} files (${templateCount} templates, ${copyCount} static)`);
+        this.log('');
+        this.log('   Run without --dry-run to actually create these files.');
+        this.log('');
+
+        this._skipInstall = true;
+        return;
+      }
+
+      this.log('');
+      this.log(`📦 Creating UMD package: ${this.appName}`);
+      this.log(`   UMD global: ${this.umdGlobalName}`);
+      this.log(`   Destination: packages/${this.appName}`);
+      this.log('');
+
+      let templateCount = 0;
+      let copyCount = 0;
+
+      for (const relPath of files) {
+        const srcPath = path.join(this.templateDir, relPath);
+        const destRelPath = transformDestPath(relPath);
+        const destPath = path.join(this.destDir, destRelPath);
+
+        if (isTemplateFile(relPath)) {
+          this.logger.file('template', destRelPath);
+          this.fs.copyTpl(srcPath, destPath, templateData);
+          templateCount++;
+        } else {
+          this.logger.file('copy', destRelPath);
+          this.fs.copy(srcPath, destPath);
+          copyCount++;
+        }
+      }
+
+      this.logger.verbose(`Processed: ${templateCount} templates, ${copyCount} copied`);
+    } catch (error) {
+      console.error('');
+      console.error('❌ Error during file generation:');
+      console.error(`   ${error.message}`);
+      console.error('');
+      process.exit(1);
+    }
+  }
+
+  install() {
+    if (this._skipInstall) return;
+
+    this.log('');
+    this.log('📦 正在安装依赖...');
+    try {
+      this.spawnCommandSync('pnpm', ['install'], {
+        cwd: this.monorepoRoot,
+      });
+    } catch (e) {
+      this._installFailed = true;
+      this.log('');
+      this.log('⚠️  依赖安装失败，但 UMD 包文件已全部生成。');
+      this.logger.verbose('Install error:', e.message);
+      return;
+    }
+
+    // 依赖安装成功后，格式化生成的文件
+    const prettierConfig = path.join(this.monorepoRoot, 'apps/layout/.prettierrc');
+    if (fs.existsSync(prettierConfig)) {
+      try {
+        this.spawnCommandSync(
+          'pnpm',
+          [
+            '-C', 'apps/layout', 'exec', 'prettier',
+            '--config', prettierConfig,
+            '--write',
+            `${this.destDir}/**/*.{ts,tsx,js,jsx,json,less,md}`,
+          ],
+          { cwd: this.monorepoRoot },
+        );
+      } catch (e) {
+        this.logger.verbose('Formatting failed (non-critical):', e.message);
+      }
+    }
+  }
+
+  end() {
+    if (this._skipInstall) return;
+
+    this.log('');
+
+    if (this._installFailed) {
+      this.log('⚠️  UMD 包文件已创建，但依赖安装未完成。');
+      this.log('');
+      this.log('   请手动安装依赖:');
+      this.log('');
+      this.log('   pnpm install');
+      this.log('');
+      this.log('   如果安装仍然失败，可尝试:');
+      this.log('   pnpm install --network-concurrency 4');
+    } else {
+      this.log('✅ UMD 包创建成功！');
+    }
+
+    this.log('');
+    this.log('   后续步骤:');
+    this.log('');
+    this.log(`   cd packages/${this.appName}`);
+    this.log('   pnpm dev');
+    this.log('');
+    this.log('   开发模式:');
+    this.log(`   • 预览页面: http://localhost:${this.devPort}/`);
+    this.log(`   • UMD 文件: http://localhost:${this.devPort}/${this.appName}.umd.js`);
+    this.log('');
+  }
+};

package/generators/subapp-umd/meta.json

@@ -0,0 +1,11 @@
+{
+  "name": "subapp-umd",
+  "description": "在现有 Monorepo 中创建 UMD 组件包（Webpack 构建）",
+  "usage": "cd <monorepo-root> && mico create subapp-umd",
+  "features": [
+    "Webpack UMD 构建",
+    "React 18 + TypeScript",
+    "dev server 同时提供 HTML 预览和 UMD JS",
+    "Source Map 源码调试"
+  ]
+}