generator-mico-cli 0.2.12 → 0.2.13

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

@@ -0,0 +1,76 @@
+#!/bin/bash
+
+# 计算当前构建分支的 BASE_REF，并为 Turbo 增量构建准备 TURBO_FILTER
+# 该脚本会被其他脚本 source 调用，不要在这里直接 exit 1
+
+set -e
+
+# 获取项目根目录（如果调用方已设置 PROJECT_ROOT，则使用；否则使用当前工作目录）
+PROJECT_ROOT="${PROJECT_ROOT:-$(pwd)}"
+
+# 获取当前构建的分支（去掉 origin/ 前缀，用于比较）
+# 优先使用环境变量 CURRENT_BRANCH（Jenkins 传入，格式可能是 origin/main、origin/feat/xxx）
+# 其次使用 BRANCH_OR_TAG，最后从 git 获取
+if [ -n "${CURRENT_BRANCH}" ]; then
+  CURRENT_BRANCH_NAME="${CURRENT_BRANCH#origin/}"  # 去掉 origin/ 前缀
+elif [ -n "${BRANCH_OR_TAG}" ]; then
+  CURRENT_BRANCH_NAME="${BRANCH_OR_TAG#origin/}"  # 去掉 origin/ 前缀
+else
+  CURRENT_BRANCH_NAME="$(git rev-parse --abbrev-ref HEAD)"
+fi
+
+echo "[before_build] Current branch (without origin/): ${CURRENT_BRANCH_NAME}"
+
+# 比较当前分支和上次成功构建的分支是否一致
+# LAST_SUCCESS_BRANCH 由 Jenkins 在构建时设置（从上次构建的结果中获取，格式可能是 origin/main、origin/feat/xxx）
+if [ -n "${LAST_SUCCESS_BRANCH}" ]; then
+  # 去掉 LAST_SUCCESS_BRANCH 的 origin/ 前缀，用于比较
+  LAST_SUCCESS_BRANCH_NAME="${LAST_SUCCESS_BRANCH#origin/}"
+  echo "[before_build] Last success branch (without origin/): ${LAST_SUCCESS_BRANCH_NAME}"
+  
+  if [ "${CURRENT_BRANCH_NAME}" != "${LAST_SUCCESS_BRANCH_NAME}" ]; then
+    # 分支不一致，需要全量构建
+    echo "[before_build] Branch changed: ${LAST_SUCCESS_BRANCH_NAME} -> ${CURRENT_BRANCH_NAME}, will perform full build (no filter)"
+    unset TURBO_FILTER
+  else
+    # 分支一致，尝试使用 PREVIOUS_COMMIT 进行增量构建
+    echo "[before_build] Branch unchanged: ${CURRENT_BRANCH_NAME}, checking PREVIOUS_COMMIT for incremental build"
+    if [ -n "${PREVIOUS_COMMIT}" ]; then
+      # 验证 commit 是否存在且有效
+      if git rev-parse --verify "${PREVIOUS_COMMIT}" >/dev/null 2>&1; then
+        # 关键检查：验证 PREVIOUS_COMMIT 是否是当前 HEAD 的祖先
+        # 这可以避免以下问题：
+        # 1. Rebase/Force push：PREVIOUS_COMMIT 不再是当前分支的祖先
+        # 2. Tag 被其他分支更新：PREVIOUS_COMMIT 不是当前分支的祖先
+        CURRENT_HEAD="$(git rev-parse HEAD)"
+        if git merge-base --is-ancestor "${PREVIOUS_COMMIT}" "${CURRENT_HEAD}" 2>/dev/null; then
+          # PREVIOUS_COMMIT 是当前 HEAD 的祖先，可以安全使用
+          BASE_REF="${PREVIOUS_COMMIT}"
+          echo "[before_build] Use PREVIOUS_COMMIT as BASE_REF: ${BASE_REF} (ancestor check passed)"
+          # 为 turbo --filter 准备语法形如 ...[<BASE_REF>]
+          TURBO_FILTER="...[${BASE_REF}]"
+          export TURBO_FILTER
+          echo "[before_build] TURBO_FILTER=${TURBO_FILTER} (incremental build)"
+        else
+          # PREVIOUS_COMMIT 不是当前 HEAD 的祖先，降级为全量构建
+          echo "[before_build] Warning: PREVIOUS_COMMIT=${PREVIOUS_COMMIT} is not an ancestor of HEAD=${CURRENT_HEAD}"
+          echo "[before_build] Possible reasons: rebase/force-push, tag updated by another branch, or shallow clone issue"
+          echo "[before_build] Falling back to full build (no filter)"
+          unset TURBO_FILTER
+        fi
+      else
+        echo "[before_build] Warning: PREVIOUS_COMMIT=${PREVIOUS_COMMIT} is not a valid commit, will perform full build"
+        unset TURBO_FILTER
+      fi
+    else
+      # PREVIOUS_COMMIT 未设置，进行全量构建
+      echo "[before_build] PREVIOUS_COMMIT not set, will perform full build (no filter)"
+      unset TURBO_FILTER
+    fi
+  fi
+else
+  # LAST_SUCCESS_BRANCH 未设置，说明是第一次构建或 Jenkins 未配置该环境变量
+  echo "[before_build] LAST_SUCCESS_BRANCH not set, will perform full build (no filter)"
+  # 不设置 TURBO_FILTER，这样 package.json 中的 ${TURBO_FILTER:+--filter=${TURBO_FILTER}} 不会生效
+  unset TURBO_FILTER
+fi

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

@@ -20,11 +20,24 @@ echo "项目版本: $VERSION"
 # 切换到项目根目录，确保后续命令在根目录下运行
 cd "$PROJECT_ROOT"
 
+# 导出 PROJECT_ROOT 供 before_build.sh 使用
+export PROJECT_ROOT
+
+# 在执行构建前，计算 BASE_REF / TURBO_FILTER 等增量构建信息
+if [ -f "$PROJECT_ROOT/CICD/before_build.sh" ]; then
+  # shellcheck disable=SC1090
+  source "$PROJECT_ROOT/CICD/before_build.sh"
+fi
+
 # 设置子应用的 CDN 公共路径（开发环境）
 export CDN_PUBLIC_PATH="https://cdn-portal-dev.micoplatform.com/<%= projectName %>/${VERSION}/"
 echo "CDN_PUBLIC_PATH: $CDN_PUBLIC_PATH"
 
 pnpm run build:development
 
-echo "VERSION=$VERSION" > .env_x_<%= projectName %>
+# 只有在 CI 环境时才写入版本号文件（覆盖写入）
+if [ "${CI}" = "true" ]; then
+  echo "VERSION=$VERSION" > .env_x_portal-web
+fi
+
 

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

@@ -20,11 +20,23 @@ echo "项目版本: $VERSION"
 # 切换到项目根目录，确保后续命令在根目录下运行
 cd "$PROJECT_ROOT"
 
+# 导出 PROJECT_ROOT 供 before_build.sh 使用
+export PROJECT_ROOT
+
+# 在执行构建前，计算 BASE_REF / TURBO_FILTER 等增量构建信息（用于增量构建）
+if [ -f "$PROJECT_ROOT/CICD/before_build.sh" ]; then
+  # shellcheck disable=SC1090
+  source "$PROJECT_ROOT/CICD/before_build.sh"
+fi
+
 # 设置子应用的 CDN 公共路径（生产环境）
 export CDN_PUBLIC_PATH="https://cdn-portal.micoplatform.com/<%= projectName %>/${VERSION}/"
 echo "CDN_PUBLIC_PATH: $CDN_PUBLIC_PATH"
 
 pnpm run build:production
 
-echo "VERSION=$VERSION" > .env_x_<%= projectName %>
+# 只有在 CI 环境时才写入版本号文件（覆盖写入）
+if [ "${CI}" = "true" ]; then
+  echo "VERSION=$VERSION" > .env_x_portal-web
+fi
 

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

@@ -20,11 +20,24 @@ echo "项目版本: $VERSION"
 # 切换到项目根目录，确保后续命令在根目录下运行
 cd "$PROJECT_ROOT"
 
+# 导出 PROJECT_ROOT 供 before_build.sh 使用
+export PROJECT_ROOT
+
+# 在执行构建前，计算 BASE_REF / TURBO_FILTER 等增量构建信息
+if [ -f "$PROJECT_ROOT/CICD/before_build.sh" ]; then
+  # shellcheck disable=SC1090
+  source "$PROJECT_ROOT/CICD/before_build.sh"
+fi
+
+
 # 设置子应用的 CDN 公共路径（测试环境）
 export CDN_PUBLIC_PATH="https://cdn-portal-test.micoplatform.com/<%= projectName %>/${VERSION}/"
 echo "CDN_PUBLIC_PATH: $CDN_PUBLIC_PATH"
 
 pnpm run build:testing
 
-echo "VERSION=$VERSION" > .env_x_<%= projectName %>
+# 只有在 CI 环境时才写入版本号文件（覆盖写入）
+if [ "${CI}" = "true" ]; then
+  echo "VERSION=$VERSION" > .env_x_portal-web
+fi
 

package/generators/micro-react/templates/apps/layout/src/common/route-guard.ts

@@ -298,7 +298,7 @@ if (typeof window !== 'undefined') {
         return;
       }
 
-      log('用户交互开始:', event.type);
+      // log('用户交互开始:', event.type);
       isInUserInteraction = true;
       // 记录交互开始时间，用于判断意图是否在当前交互期间设置的
       currentInteractionStartTime = Date.now();
@@ -308,7 +308,7 @@ if (typeof window !== 'undefined') {
       setTimeout(() => {
         isInUserInteraction = false;
         interactionEndTime = Date.now();
-        log('用户交互结束');
+        // log('用户交互结束');
       }, 0);
     }
   };

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

@@ -12,9 +12,9 @@
   "scripts": {
     "dev": "node scripts/dev.js",
     "build": "dotenv -e .env -e .env.local -e .env.production -e .env.production.local -- turbo run build && node scripts/collect-dist.js",
-    "build:development": "dotenv -e .env -e .env.local -e .env.development -e .env.development.local -- turbo run build:development && node scripts/collect-dist.js",
-    "build:testing": "dotenv -e .env -e .env.local -e .env.testing -e .env.testing.local -- turbo run build:testing && node scripts/collect-dist.js",
-    "build:production": "dotenv -e .env -e .env.local -e .env.production -e .env.production.local -- turbo run build:production && node scripts/collect-dist.js",
+    "build:development": "dotenv -e .env -e .env.local -e .env.development -e .env.development.local -- turbo run build:development ${TURBO_FILTER:+--filter=${TURBO_FILTER}} && node scripts/collect-dist.js",
+    "build:testing": "dotenv -e .env -e .env.local -e .env.testing -e .env.testing.local -- turbo run build:testing ${TURBO_FILTER:+--filter=${TURBO_FILTER}} && node scripts/collect-dist.js",
+    "build:production": "dotenv -e .env -e .env.local -e .env.production -e .env.production.local -- turbo run build:production ${TURBO_FILTER:+--filter=${TURBO_FILTER}} && node scripts/collect-dist.js",
     "build:local": "dotenv -e .env -e .env.local -- turbo run build:local && node scripts/collect-dist.js",
     "lint": "eslint . --ext .js,.jsx,.ts,.tsx && turbo run lint",
     "lint:fix": "eslint . --ext .js,.jsx,.ts,.tsx --fix && turbo run lint:fix",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "generator-mico-cli",
-  "version": "0.2.12",
+  "version": "0.2.13",
   "description": "Yeoman generator for Mico CLI projects",
   "keywords": [
     "yeoman-generator",