@lark-apaas/fullstack-cli 1.1.28-alpha.1 → 1.1.28-alpha.10

package/dist/index.js

@@ -7253,7 +7253,7 @@ function camelToKebab(str) {
 // src/commands/build/upload-static.handler.ts
 import * as fs25 from "fs";
 import * as path21 from "path";
-import { execSync as execSync3 } from "child_process";
+import { execFileSync } from "child_process";
 function readCredentialsFromEnv() {
   const uploadPrefix = process.env.STATIC_UPLOAD_PREFIX;
   const uploadID = process.env.STATIC_UPLOAD_ID;
@@ -7350,14 +7350,16 @@ async function fetchPreUpload(appId, bucketId) {
 }
 function configureTosutil(tosutilPath, config) {
   const { endpoint, region, accessKeyID, secretAccessKey, sessionToken } = config;
-  execSync3(
-    `${tosutilPath} config -e ${endpoint} -i ${accessKeyID} -k ${secretAccessKey} -t ${sessionToken} -re ${region}`,
+  execFileSync(
+    tosutilPath,
+    ["config", "-e", endpoint, "-i", accessKeyID, "-k", secretAccessKey, "-t", sessionToken, "-re", region],
     { stdio: "pipe" }
   );
 }
 function uploadToTos(tosutilPath, sourceDir, destUrl) {
-  execSync3(
-    `${tosutilPath} cp "${sourceDir}" "${destUrl}" -r -flat -j 5 -p 3 -ps 10485760 -f`,
+  execFileSync(
+    tosutilPath,
+    ["cp", sourceDir, destUrl, "-r", "-flat", "-j", "5", "-p", "3", "-ps", "10485760", "-f"],
     { stdio: "inherit" }
   );
 }
@@ -7374,6 +7376,9 @@ function isDirEmpty(dirPath) {
 
 // src/commands/build/pre-upload-static.handler.ts
 var LOG_PREFIX2 = "[pre-upload-static]";
+function shellEscape(value) {
+  return value.replace(/["\\`$]/g, "\\$&");
+}
 async function preUploadStatic(options) {
   try {
     const { appId } = options;
@@ -7386,8 +7391,8 @@ async function preUploadStatic(options) {
       console.error(`${LOG_PREFIX2} preUploadStatic \u8FD4\u56DE\u5F02\u5E38, status_code: ${response.status_code}`);
       return;
     }
-    const { downloadUrlPrefix, uploadPrefix, uploadID, uploadCredential } = response.data || {};
-    if (!downloadUrlPrefix || !uploadPrefix || !uploadID) {
+    const { downloadURLPrefix, uploadPrefix, uploadID, uploadCredential } = response.data || {};
+    if (!downloadURLPrefix || !uploadPrefix || !uploadID) {
       console.error(`${LOG_PREFIX2} preUploadStatic \u8FD4\u56DE\u6570\u636E\u4E0D\u5B8C\u6574`);
       return;
     }
@@ -7395,13 +7400,13 @@ async function preUploadStatic(options) {
       console.error(`${LOG_PREFIX2} preUploadStatic \u8FD4\u56DE\u7684\u51ED\u8BC1\u5B57\u6BB5\u4E0D\u5B8C\u6574`);
       return;
     }
-    console.log(`export STATIC_ASSETS_BASE_URL="${downloadUrlPrefix}"`);
-    console.log(`export STATIC_UPLOAD_PREFIX="${uploadPrefix}"`);
-    console.log(`export STATIC_UPLOAD_ID="${uploadID}"`);
-    console.log(`export STATIC_UPLOAD_AK="${uploadCredential.AccessKeyID}"`);
-    console.log(`export STATIC_UPLOAD_SK="${uploadCredential.SecretAccessKey}"`);
-    console.log(`export STATIC_UPLOAD_TOKEN="${uploadCredential.SessionToken}"`);
-    console.log(`export STATIC_UPLOAD_BUCKET_ID="${bucketId}"`);
+    console.log(`export STATIC_ASSETS_BASE_URL="${shellEscape(downloadURLPrefix)}"`);
+    console.log(`export STATIC_UPLOAD_PREFIX="${shellEscape(uploadPrefix)}"`);
+    console.log(`export STATIC_UPLOAD_ID="${shellEscape(uploadID)}"`);
+    console.log(`export STATIC_UPLOAD_AK="${shellEscape(uploadCredential.AccessKeyID)}"`);
+    console.log(`export STATIC_UPLOAD_SK="${shellEscape(uploadCredential.SecretAccessKey)}"`);
+    console.log(`export STATIC_UPLOAD_TOKEN="${shellEscape(uploadCredential.SessionToken)}"`);
+    console.log(`export STATIC_UPLOAD_BUCKET_ID="${shellEscape(bucketId)}"`);
     console.error(`${LOG_PREFIX2} \u73AF\u5883\u53D8\u91CF\u5DF2\u8F93\u51FA`);
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/fullstack-cli",
-  "version": "1.1.28-alpha.1",
+  "version": "1.1.28-alpha.10",
   "description": "CLI tool for fullstack template management",
   "type": "module",
   "main": "dist/index.js",

package/templates/scripts/build.sh

@@ -19,46 +19,28 @@ print_time() {
 }
 
 # ==================== 步骤 0 ====================
-echo "🗑️  [0/6] 安装插件"
+echo "🗑️  [0/5] 安装插件"
 STEP_START=$(node -e "console.log(Date.now())")
 npx fullstack-cli action-plugin init
 print_time $STEP_START
 echo ""
 
 # ==================== 步骤 1 ====================
-echo "📝 [1/6] 更新 openapi 代码"
+echo "📝 [1/5] 更新 openapi 代码"
 STEP_START=$(node -e "console.log(Date.now())")
 npm run gen:openapi
 print_time $STEP_START
 echo ""
 
 # ==================== 步骤 2 ====================
-echo "🗑️  [2/6] 清理 dist 目录"
+echo "🗑️  [2/5] 清理 dist 目录"
 STEP_START=$(node -e "console.log(Date.now())")
 rm -rf "$ROOT_DIR/dist"
 print_time $STEP_START
 echo ""
 
 # ==================== 步骤 3 ====================
-echo "🔗 [3/6] 预上传：获取 TOS 信息并注入环境变量"
-STEP_START=$(node -e "console.log(Date.now())")
-
-if [ -d "$ROOT_DIR/shared/static" ] && [ "$(ls -A "$ROOT_DIR/shared/static" 2>/dev/null)" ]; then
-  eval "$(npx fullstack-cli build pre-upload-static --app-id "${app_id}")"
-  if [ -n "$STATIC_ASSETS_BASE_URL" ]; then
-    echo "   STATIC_ASSETS_BASE_URL=$STATIC_ASSETS_BASE_URL"
-  else
-    echo "   ⚠️  未获取到 TOS URL 前缀，将使用默认路径"
-  fi
-else
-  echo "   跳过：shared/static 目录不存在或为空"
-fi
-
-print_time $STEP_START
-echo ""
-
-# ==================== 步骤 4 ====================
-echo "🔨 [4/6] 并行构建 server 和 client"
+echo "🔨 [3/5] 并行构建 server 和 client"
 STEP_START=$(node -e "console.log(Date.now())")
 
 # 并行构建
@@ -95,18 +77,23 @@ echo "   ✅ Client 构建完成"
 print_time $STEP_START
 echo ""
 
-# ==================== 步骤 5 ====================
-echo "📦 [5/6] 准备 server 依赖产物"
+# ==================== 步骤 4 ====================
+echo "📦 [4/5] 准备 server 依赖产物"
 STEP_START=$(node -e "console.log(Date.now())")
 
 mkdir -p "$OUT_DIR/dist/client"
 
-# 拷贝 HTML
-cp "$ROOT_DIR/dist/client/"*.html "$OUT_DIR/dist/client/" || true
+# 移动 HTML（从 dist/client 移走，避免残留）
+mv "$ROOT_DIR/dist/client/"*.html "$OUT_DIR/dist/client/" || true
 
 # 拷贝 run.sh 文件
 cp "$ROOT_DIR/scripts/run.sh" "$OUT_DIR/"
 
+# 拷贝 .env 文件（如果存在）
+if [ -f "$ROOT_DIR/.env" ]; then
+  cp "$ROOT_DIR/.env" "$OUT_DIR/"
+fi
+
 # 清理无用文件
 rm -rf "$ROOT_DIR/dist/scripts"
 rm -rf "$ROOT_DIR/dist/tsconfig.node.tsbuildinfo"
@@ -114,8 +101,8 @@ rm -rf "$ROOT_DIR/dist/tsconfig.node.tsbuildinfo"
 print_time $STEP_START
 echo ""
 
-# ==================== 步骤 6 ====================
-echo "✂️  [6/6] 智能依赖裁剪"
+# ==================== 步骤 5 ====================
+echo "✂️  [5/5] 智能依赖裁剪"
 STEP_START=$(node -e "console.log(Date.now())")
 
 # 分析实际依赖、复制并裁剪 node_modules、生成精简的 package.json