generator-mico-cli 0.2.23 → 0.2.24

package/generators/micro-react/templates/CICD/start_dev.sh

@@ -34,11 +34,21 @@ fi
 export CDN_PUBLIC_PATH="https://cdn-portal-dev.micoplatform.com/<%= cdnPrefixPath %><%= projectName %>/${VERSION}/"
 echo "CDN_PUBLIC_PATH: $CDN_PUBLIC_PATH"
 
+# 开发环境，不上传 sourcemap。调试时如有需要再解开
+# # ========== Sentry Auth Token ==========
+# # SENTRY_AUTH_TOKEN 从 Jenkins 服务器文件读取（敏感信息，不写在脚本中）
+# SENTRY_TOKEN_FILE="/var/lib/jenkins/.portal_sentry_auth_token"
+# if [ -f "$SENTRY_TOKEN_FILE" ]; then
+#   export SENTRY_AUTH_TOKEN=$(cat "$SENTRY_TOKEN_FILE")
+# fi
+
+# if [ -z "$SENTRY_AUTH_TOKEN" ]; then
+#   echo "警告：SENTRY_AUTH_TOKEN 未设置（文件 $SENTRY_TOKEN_FILE 不存在），跳过 sourcemap 上传"
+# fi
+
 pnpm run build:development
 
 # 只有在 CI 环境时才写入版本号文件（覆盖写入）
 if [ "${CI}" = "true" ]; then
   echo "VERSION=$VERSION" > .env_x_<%= projectName %>
 fi
-
-

package/generators/micro-react/templates/CICD/start_prod.sh

@@ -34,10 +34,20 @@ fi
 export CDN_PUBLIC_PATH="https://cdn-portal.micoplatform.com/<%= cdnPrefixPath %><%= projectName %>/${VERSION}/"
 echo "CDN_PUBLIC_PATH: $CDN_PUBLIC_PATH"
 
+# ========== Sentry Auth Token ==========
+# SENTRY_AUTH_TOKEN 从 Jenkins 服务器文件读取（敏感信息，不写在脚本中）
+SENTRY_TOKEN_FILE="/var/lib/jenkins/.portal_sentry_auth_token"
+if [ -f "$SENTRY_TOKEN_FILE" ]; then
+  export SENTRY_AUTH_TOKEN=$(cat "$SENTRY_TOKEN_FILE")
+fi
+
+if [ -z "$SENTRY_AUTH_TOKEN" ]; then
+  echo "警告：SENTRY_AUTH_TOKEN 未设置（文件 $SENTRY_TOKEN_FILE 不存在），跳过 sourcemap 上传"
+fi
+
 pnpm run build:production
 
 # 只有在 CI 环境时才写入版本号文件（覆盖写入）
 if [ "${CI}" = "true" ]; then
   echo "VERSION=$VERSION" > .env_x_<%= projectName %>
 fi
-

package/generators/micro-react/templates/CICD/start_test.sh

@@ -35,10 +35,21 @@ fi
 export CDN_PUBLIC_PATH="https://cdn-portal-test.micoplatform.com/<%= cdnPrefixPath %><%= projectName %>/${VERSION}/"
 echo "CDN_PUBLIC_PATH: $CDN_PUBLIC_PATH"
 
+# 测试环境，不上传 sourcemap。调试时如有需要再解开
+# # ========== Sentry Auth Token ==========
+# # SENTRY_AUTH_TOKEN 从 Jenkins 服务器文件读取（敏感信息，不写在脚本中）
+# SENTRY_TOKEN_FILE="/var/lib/jenkins/.portal_sentry_auth_token"
+# if [ -f "$SENTRY_TOKEN_FILE" ]; then
+#   export SENTRY_AUTH_TOKEN=$(cat "$SENTRY_TOKEN_FILE")
+# fi
+
+# if [ -z "$SENTRY_AUTH_TOKEN" ]; then
+#   echo "警告：SENTRY_AUTH_TOKEN 未设置（文件 $SENTRY_TOKEN_FILE 不存在），跳过 sourcemap 上传"
+# fi
+
 pnpm run build:testing
 
 # 只有在 CI 环境时才写入版本号文件（覆盖写入）
 if [ "${CI}" = "true" ]; then
   echo "VERSION=$VERSION" > .env_x_<%= projectName %>
 fi
-

package/generators/micro-react/templates/apps/layout/config/config.prod.development.ts

@@ -1,8 +1,19 @@
 // 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',
+
+  // chainWebpack(memo) {
+  //   // 开发环境，不上传 sourcemap。调试时如有需要再解开
+  //   applySentryPlugin({ memo, appName: 'layout' });
+  //   return memo;
+  // },
+
   externals: {
     react: 'React',
     'react-dom': 'ReactDOM',

package/generators/micro-react/templates/apps/layout/config/config.prod.testing.ts

@@ -1,8 +1,19 @@
 // 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',
+
+  // chainWebpack(memo) {
+  //   // 测试环境，不上传 sourcemap。调试时如有需要再解开
+  //   applySentryPlugin({ memo, appName: 'layout' });
+  //   return memo;
+  // },
+
   externals: {
     react: 'React',
     'react-dom': 'ReactDOM',

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

@@ -32,7 +32,6 @@
     "spark-md5": "^3.0.2"
   },
   "devDependencies": {
-    "@common-web/sentry": "^0.0.3",
     "@types/react": "^18.0.33",
     "@types/react-dom": "^18.0.11",
     "@types/spark-md5": "^3.0.5",

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/package.json

@@ -32,6 +32,7 @@
   "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",

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

@@ -32,7 +32,7 @@ export function applySentryPlugin({
             name: version,
             uploadLegacySourcemaps: {
               paths: ['./dist'],
-              urlPrefix: `~/portal-center/<%= projectName %>/${version}/${appName}`,
+              urlPrefix: `~/<%= cdnPrefixPath %><%= projectName %>/${version}/${appName}`,
             },
           },
           sourcemaps: {

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/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;
   },
 

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;
   },
 

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

@@ -15,13 +15,13 @@
     "start": "npm run dev"
   },
   "dependencies": {
+    "@mico-platform/ui": "<%= micoUiVersion %>",
     "@mico-platform/theme": "<%= themeVersion %>",
     "@umijs/max": "^4.4.8",
     "react": "^18.2.0",
     "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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "generator-mico-cli",
-  "version": "0.2.23",
+  "version": "0.2.24",
   "description": "Yeoman generator for Mico CLI projects",
   "keywords": ["yeoman-generator", "generator", "cli"],
   "license": "MIT",