@lark-apaas/fullstack-cli 1.1.22-alpha.26 → 1.1.22-alpha.28

package/dist/index.js

@@ -7261,7 +7261,6 @@ async function uploadStatic(options) {
       appId,
       staticDir = "shared/static",
       tosutilPath = "/workspace/tosutil",
-      tosutilUrl,
       endpoint = "tos-cn-beijing.volces.com",
       region = "cn-beijing"
     } = options;
@@ -7274,14 +7273,18 @@ async function uploadStatic(options) {
       console.error(`${LOG_PREFIX} \u76EE\u5F55\u4E3A\u7A7A: ${resolvedStaticDir}\uFF0C\u8DF3\u8FC7\u4E0A\u4F20`);
       return;
     }
-    const resolvedTosutilPath = ensureTosutil(tosutilPath, tosutilUrl);
+    if (!fs25.existsSync(tosutilPath)) {
+      throw new Error(
+        `tosutil \u4E0D\u5B58\u5728: ${tosutilPath}\u3002\u8BF7\u786E\u4FDD\u6D41\u6C34\u7EBF\u5DF2\u5728"\u4EA7\u7269\u6253\u5305\u4E0A\u4F20"\u6B65\u9AA4\u4E2D\u4E0B\u8F7D tosutil\u3002`
+      );
+    }
     const bucketId = await resolveBucketId(appId);
     console.error(`${LOG_PREFIX} \u8C03\u7528 preUploadStatic...`);
     const preUploadResp = await fetchPreUpload(appId, bucketId);
     const { uploadPrefix, uploadID, uploadCredential } = preUploadResp.data;
     console.error(`${LOG_PREFIX} \u4E0A\u4F20\u76EE\u6807: ${uploadPrefix}`);
     console.error(`${LOG_PREFIX} \u914D\u7F6E tosutil...`);
-    configureTosutil(resolvedTosutilPath, {
+    configureTosutil(tosutilPath, {
       endpoint,
       region,
       accessKeyID: uploadCredential.accessKeyID,
@@ -7289,7 +7292,7 @@ async function uploadStatic(options) {
       sessionToken: uploadCredential.sessionToken
     });
     console.error(`${LOG_PREFIX} \u4E0A\u4F20 ${resolvedStaticDir} -> ${uploadPrefix}`);
-    uploadToTos(resolvedTosutilPath, resolvedStaticDir, uploadPrefix);
+    uploadToTos(tosutilPath, resolvedStaticDir, uploadPrefix);
     console.error(`${LOG_PREFIX} tosutil \u4E0A\u4F20\u5B8C\u6210`);
     console.error(`${LOG_PREFIX} \u8C03\u7528 callbackStatic (uploadID: ${uploadID})...`);
     const callbackResp = await uploadStaticAttachmentCallback(appId, bucketId, { uploadID });
@@ -7314,45 +7317,12 @@ async function fetchPreUpload(appId, bucketId) {
   if (!uploadPrefix || !uploadID) {
     throw new Error("preUploadStatic \u8FD4\u56DE\u6570\u636E\u4E0D\u5B8C\u6574\uFF0C\u7F3A\u5C11 uploadPrefix \u6216 uploadID");
   }
+  console.log("!!!!!!!!!!!response:", response.data);
   if (!uploadCredential?.accessKeyID || !uploadCredential?.secretAccessKey || !uploadCredential?.sessionToken) {
     throw new Error("preUploadStatic \u8FD4\u56DE\u7684\u51ED\u8BC1\u5B57\u6BB5\u4E0D\u5B8C\u6574");
   }
   return response;
 }
-function ensureTosutil(tosutilPath, tosutilUrl) {
-  if (isTosutilAvailable(tosutilPath)) {
-    console.error(`${LOG_PREFIX} tosutil \u5DF2\u5C31\u7EEA: ${tosutilPath}`);
-    return tosutilPath;
-  }
-  if (!tosutilUrl) {
-    throw new Error(
-      `tosutil \u4E0D\u53EF\u7528 (\u8DEF\u5F84: ${tosutilPath})\uFF0C\u4E14\u672A\u63D0\u4F9B --tosutil-url \u4E0B\u8F7D\u5730\u5740\u3002\u8BF7\u786E\u4FDD tosutil \u5DF2\u5B58\u5728\uFF0C\u6216\u901A\u8FC7 --tosutil-url \u6307\u5B9A\u4E0B\u8F7D\u5730\u5740\u3002`
-    );
-  }
-  console.error(`${LOG_PREFIX} tosutil \u4E0D\u5B58\u5728\uFF0C\u4ECE ${tosutilUrl} \u4E0B\u8F7D...`);
-  downloadTosutil(tosutilUrl, tosutilPath);
-  if (!isTosutilAvailable(tosutilPath)) {
-    throw new Error(`tosutil \u4E0B\u8F7D\u540E\u4ECD\u4E0D\u53EF\u7528 (\u8DEF\u5F84: ${tosutilPath})`);
-  }
-  console.error(`${LOG_PREFIX} tosutil \u4E0B\u8F7D\u5B8C\u6210: ${tosutilPath}`);
-  return tosutilPath;
-}
-function isTosutilAvailable(tosutilPath) {
-  try {
-    execSync3(`${tosutilPath} --version`, { stdio: "pipe" });
-    return true;
-  } catch {
-    return false;
-  }
-}
-function downloadTosutil(url, destPath) {
-  const destDir = path21.dirname(destPath);
-  if (!fs25.existsSync(destDir)) {
-    fs25.mkdirSync(destDir, { recursive: true });
-  }
-  execSync3(`curl -L --fail -o "${destPath}" "${url}"`, { stdio: "pipe" });
-  execSync3(`chmod +x "${destPath}"`, { stdio: "pipe" });
-}
 function configureTosutil(tosutilPath, config) {
   const { endpoint, region, accessKeyID, secretAccessKey, sessionToken } = config;
   execSync3(
@@ -7391,7 +7361,7 @@ var uploadStaticCommand = {
   name: "upload-static",
   description: "Upload shared/static files to TOS",
   register(program) {
-    program.command(this.name).description(this.description).requiredOption("--app-id <id>", "Application ID").option("--static-dir <dir>", "Static files directory", "shared/static").option("--tosutil-path <path>", "Path to tosutil binary", "/workspace/tosutil").option("--tosutil-url <url>", "URL to download tosutil if not present").option("--endpoint <endpoint>", "TOS endpoint", "tos-cn-beijing.volces.com").option("--region <region>", "TOS region", "cn-beijing").action(async (options) => {
+    program.command(this.name).description(this.description).requiredOption("--app-id <id>", "Application ID").option("--static-dir <dir>", "Static files directory", "shared/static").option("--tosutil-path <path>", "Path to tosutil binary", "/workspace/tosutil").option("--endpoint <endpoint>", "TOS endpoint", "tos-cn-beijing.volces.com").option("--region <region>", "TOS region", "cn-beijing").action(async (options) => {
       await uploadStatic(options);
     });
   }

package/package.json

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

package/templates/scripts/build.sh

@@ -19,28 +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] 并行构建 server 和 client"
+echo "🔨 [3/5] 并行构建 server 和 client"
 STEP_START=$(node -e "console.log(Date.now())")
 
 # 并行构建
@@ -78,7 +78,7 @@ print_time $STEP_START
 echo ""
 
 # ==================== 步骤 4 ====================
-echo "📦 [4/6] 准备 server 依赖产物"
+echo "📦 [4/5] 准备 server 依赖产物"
 STEP_START=$(node -e "console.log(Date.now())")
 
 mkdir -p "$OUT_DIR/dist/client"
@@ -97,7 +97,7 @@ print_time $STEP_START
 echo ""
 
 # ==================== 步骤 5 ====================
-echo "✂️  [5/6] 智能依赖裁剪"
+echo "✂️  [5/5] 智能依赖裁剪"
 STEP_START=$(node -e "console.log(Date.now())")
 
 # 分析实际依赖、复制并裁剪 node_modules、生成精简的 package.json
@@ -106,25 +106,6 @@ node "$ROOT_DIR/scripts/prune-smart.js"
 print_time $STEP_START
 echo ""
 
-# ==================== 步骤 6 ====================
-echo "☁️  [6/6] 上传静态资源到 TOS"
-STEP_START=$(node -e "console.log(Date.now())")
-
-# 环境变量（与产物上传脚本共享同一 CI 环境）：
-#   app_id      - 应用 ID
-#   tosutil_url - tosutil 下载地址
-# bucket_id 由 CLI 自动通过 get_published_v2 获取，也可通过 --bucket-id 显式指定
-if [ -d "$ROOT_DIR/shared/static" ] && [ "$(ls -A "$ROOT_DIR/shared/static" 2>/dev/null)" ]; then
-  npx fullstack-cli build upload-static \
-    --app-id "${app_id}" \
-    --tosutil-url "${tosutil_url}"
-else
-  echo "   ⏭️  shared/static 目录为空或不存在，跳过上传"
-fi
-
-print_time $STEP_START
-echo ""
-
 # 总耗时
 echo "构建完成"
 print_time $TOTAL_START