@lark-apaas/fullstack-cli 1.1.38 → 1.1.40-alpha.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/fullstack-cli",
-  "version": "1.1.38",
+  "version": "1.1.40-alpha.0",
   "description": "CLI tool for fullstack template management",
   "type": "module",
   "main": "dist/index.js",
@@ -56,6 +56,5 @@
   },
   "peerDependencies": {
     "typescript": "^5.9.2"
-  },
-  "migrationVersion": 1
+  }
 }

package/templates/scripts/build.sh

@@ -19,32 +19,69 @@ print_time() {
 }
 
 # ==================== 步骤 0 ====================
-echo "🗑️  [0/5] 安装插件"
+echo "🗑️  [0/6] 安装插件"
 STEP_START=$(node -e "console.log(Date.now())")
 npx fullstack-cli action-plugin init
 print_time $STEP_START
 echo ""
 
 # ==================== 步骤 1 ====================
-echo "📝 [1/5] 更新 openapi 代码"
+echo "📝 [1/6] 更新 openapi 代码"
 STEP_START=$(node -e "console.log(Date.now())")
 npm run gen:openapi
 print_time $STEP_START
 echo ""
 
 # ==================== 步骤 2 ====================
-echo "🗑️  [2/5] 清理 dist 目录"
+echo "🗑️  [2/6] 清理 dist 目录"
 STEP_START=$(node -e "console.log(Date.now())")
 rm -rf "$ROOT_DIR/dist"
 print_time $STEP_START
 echo ""
 
 # ==================== 步骤 3 ====================
+echo "🗺️  [3/6] 生成路由定义"
+STEP_START=$(node -e "console.log(Date.now())")
+
+# 在 client/server 构建之前生成到 dist/，供 DefinePlugin 注入前端 bundle
+# 注意：nest-cli.json 中 deleteOutDir 必须为 false（模板默认值），否则 nest build 会清掉 dist/
+echo "   ├─ 生成 API 路由定义..."
+npx generate-api-routes --server-dir ./server --out-dir ./dist > /tmp/gen-api-routes.log 2>&1 &
+API_ROUTES_PID=$!
+
+echo "   ├─ 生成页面路由定义..."
+npx generate-page-routes --app-path ./client/src/app.tsx --out-dir ./dist > /tmp/gen-page-routes.log 2>&1 &
+PAGE_ROUTES_PID=$!
+
+API_ROUTES_EXIT=0
+PAGE_ROUTES_EXIT=0
+
+wait $API_ROUTES_PID || API_ROUTES_EXIT=$?
+wait $PAGE_ROUTES_PID || PAGE_ROUTES_EXIT=$?
+
+if [ $API_ROUTES_EXIT -ne 0 ]; then
+  echo "   ⚠️  API 路由生成失败（不影响构建）"
+  cat /tmp/gen-api-routes.log
+else
+  echo "   ✅ API 路由生成完成"
+fi
+
+if [ $PAGE_ROUTES_EXIT -ne 0 ]; then
+  echo "   ⚠️  页面路由生成失败（不影响构建）"
+  cat /tmp/gen-page-routes.log
+else
+  echo "   ✅ 页面路由生成完成"
+fi
+print_time $STEP_START
+echo ""
+
+# ==================== 步骤 4 ====================
+echo "🔨 [4/6] 并行构建 server 和 client"
 STEP_START=$(node -e "console.log(Date.now())")
 
 # 根据 only_frontend_change 决定是否构建 server
 if [[ "${only_frontend_change:-false}" == "true" ]]; then
-  echo "🔨 [3/5] 仅构建 client (only_frontend_change=true)"
+  echo "🔨 [4/6] 仅构建 client (only_frontend_change=true)"
 
   echo "   ├─ 启动 client 构建..."
   npm run build:client > /tmp/build-client.log 2>&1
@@ -58,7 +95,7 @@ if [[ "${only_frontend_change:-false}" == "true" ]]; then
 
   echo "   ✅ Client 构建完成"
 else
-  echo "🔨 [3/5] 并行构建 server 和 client"
+  echo "🔨 [4/6] 并行构建 server 和 client"
 
   # 并行构建
   echo "   ├─ 启动 server 构建..."
@@ -96,15 +133,15 @@ fi
 print_time $STEP_START
 echo ""
 
-# ==================== 步骤 4 ====================
-echo "📦 [4/5] 准备产物"
+# ==================== 步骤 5 ====================
+echo "📦 [5/6] 准备产物"
 STEP_START=$(node -e "console.log(Date.now())")
 
 # 移动 client 下的 HTML 文件到 dist/dist/client，保证 views 路径在 dev/prod 下一致
-# HTML 文件属于前端产物，始终执行
+# 使用 mv 而非 cp：HTML 不能上传到公网 CDN，移走后 dist/client 中不再包含 HTML
 if [ -d "$DIST_DIR/client" ]; then
   mkdir -p "$DIST_DIR/dist/client"
-  find "$DIST_DIR/client" -maxdepth 1 -name "*.html" -exec cp {} "$DIST_DIR/dist/client/" \;
+  find "$DIST_DIR/client" -maxdepth 1 -name "*.html" -exec mv {} "$DIST_DIR/dist/client/" \;
 fi
 
 # server 相关产物准备（only_frontend_change=true 时跳过）
@@ -127,14 +164,15 @@ rm -rf "$DIST_DIR/tsconfig.node.tsbuildinfo"
 print_time $STEP_START
 echo ""
 
-# ==================== 步骤 5 ====================
+# ==================== 步骤 6 ====================
+echo "✂️  [6/6] 智能依赖裁剪"
 STEP_START=$(node -e "console.log(Date.now())")
 
 # 智能依赖裁剪（仅全量构建时执行，纯前端场景不打包 server，无需裁剪）
 if [[ "${only_frontend_change:-false}" == "true" ]]; then
-  echo "✂️  [5/5] 跳过智能依赖裁剪 (only_frontend_change=true)"
+  echo "✂️  [6/6] 跳过智能依赖裁剪 (only_frontend_change=true)"
 else
-  echo "✂️  [5/5] 智能依赖裁剪"
+  echo "✂️  [6/6] 智能依赖裁剪"
 
   # 分析实际依赖、复制并裁剪 node_modules、生成精简的 package.json
   node "$ROOT_DIR/scripts/prune-smart.js"