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

package/dist/index.js

@@ -1,6 +1,6 @@
 // src/index.ts
-import fs26 from "fs";
-import path22 from "path";
+import fs25 from "fs";
+import path21 from "path";
 import { fileURLToPath as fileURLToPath5 } from "url";
 import { config as dotenvConfig } from "dotenv";
 
@@ -4285,7 +4285,7 @@ var PROMPT_PATTERNS = [
   { pattern: /proceed\?/i, answer: "y\n" }
 ];
 async function executeShadcnAdd(registryItemPath) {
-  return new Promise((resolve2) => {
+  return new Promise((resolve) => {
     let output = "";
     const args = ["--yes", "shadcn@3.8.2", "add", registryItemPath];
     const ptyProcess = pty.spawn("npx", args, {
@@ -4311,7 +4311,7 @@ async function executeShadcnAdd(registryItemPath) {
     });
     const timeoutId = setTimeout(() => {
       ptyProcess.kill();
-      resolve2({
+      resolve({
         success: false,
         files: [],
         error: "\u6267\u884C\u8D85\u65F6"
@@ -4322,7 +4322,7 @@ async function executeShadcnAdd(registryItemPath) {
       const success = exitCode === 0;
       const filePaths = parseOutput(output);
       const files = filePaths.map(toFileInfo);
-      resolve2({
+      resolve({
         success,
         files,
         error: success ? void 0 : output || `Process exited with code ${exitCode}`
@@ -4333,12 +4333,12 @@ async function executeShadcnAdd(registryItemPath) {
 
 // src/commands/component/add.handler.ts
 function runActionPluginInit() {
-  return new Promise((resolve2) => {
+  return new Promise((resolve) => {
     execFile("fullstack-cli", ["action-plugin", "init"], { cwd: process.cwd(), stdio: "ignore" }, (error) => {
       if (error) {
         debug("action-plugin init \u5931\u8D25: %s", error.message);
       }
-      resolve2();
+      resolve();
     });
   });
 }
@@ -7174,45 +7174,7 @@ async function genArtifactUploadCredential(appId, body) {
   const response = await client.post(url, body);
   if (!response.ok || response.status !== 200) {
     throw new Error(
-      `gen_artifact_upload_credential \u8BF7\u6C42\u5931\u8D25: ${response.status} ${response.statusText}`
-    );
-  }
-  return response.json();
-}
-async function getDefaultBucketId(appId) {
-  const client = getHttpClient();
-  const url = `/b/${appId}/get_published_v2`;
-  const response = await client.get(url);
-  if (!response.ok || response.status !== 200) {
-    throw new Error(
-      `get_published_v2 \u8BF7\u6C42\u5931\u8D25: ${response.status} ${response.statusText}`
-    );
-  }
-  const data = await response.json();
-  const bucketId = data?.data?.app_runtime_extra?.bucket?.default_bucket_id;
-  if (!bucketId) {
-    throw new Error(`\u672A\u627E\u5230\u5E94\u7528 ${appId} \u7684\u9ED8\u8BA4\u5B58\u50A8\u6876`);
-  }
-  return bucketId;
-}
-async function preUploadStaticAttachment(appId, bucketId) {
-  const client = getHttpClient();
-  const url = `/v1/app/${appId}/storage/bucket/${bucketId}/preUploadStatic`;
-  const response = await client.post(url, {});
-  if (!response.ok || response.status !== 200) {
-    throw new Error(
-      `preUploadStatic \u8BF7\u6C42\u5931\u8D25: ${response.status} ${response.statusText}`
-    );
-  }
-  return response.json();
-}
-async function uploadStaticAttachmentCallback(appId, bucketId, body) {
-  const client = getHttpClient();
-  const url = `/v1/app/${appId}/storage/bucket/${bucketId}/object/callbackStatic`;
-  const response = await client.post(url, body);
-  if (!response.ok || response.status !== 200) {
-    throw new Error(
-      `callbackStatic \u8BF7\u6C42\u5931\u8D25: ${response.status} ${response.statusText}`
+      `API request failed: ${response.status} ${response.statusText}`
     );
   }
   return response.json();
@@ -7250,165 +7212,6 @@ function camelToKebab(str) {
   return str.replace(/([a-z])([A-Z])/g, "$1-$2").toLowerCase();
 }
 
-// src/commands/build/upload-static.handler.ts
-import * as fs25 from "fs";
-import * as path21 from "path";
-import { execSync as execSync3 } from "child_process";
-function readCredentialsFromEnv() {
-  const uploadPrefix = process.env.STATIC_UPLOAD_PREFIX;
-  const uploadID = process.env.STATIC_UPLOAD_ID;
-  const bucketId = process.env.STATIC_UPLOAD_BUCKET_ID;
-  const accessKeyID = process.env.STATIC_UPLOAD_AK;
-  const secretAccessKey = process.env.STATIC_UPLOAD_SK;
-  const sessionToken = process.env.STATIC_UPLOAD_TOKEN;
-  if (!uploadPrefix || !uploadID || !bucketId || !accessKeyID || !secretAccessKey || !sessionToken) {
-    return null;
-  }
-  return { uploadPrefix, uploadID, bucketId, accessKeyID, secretAccessKey, sessionToken };
-}
-var LOG_PREFIX = "[upload-static]";
-async function uploadStatic(options) {
-  try {
-    const {
-      appId,
-      staticDir = "shared/static",
-      tosutilPath = "/workspace/tosutil",
-      endpoint = "tos-cn-beijing.volces.com",
-      region = "cn-beijing"
-    } = options;
-    const resolvedStaticDir = path21.resolve(staticDir);
-    if (!fs25.existsSync(resolvedStaticDir)) {
-      console.error(`${LOG_PREFIX} \u76EE\u5F55\u4E0D\u5B58\u5728: ${resolvedStaticDir}\uFF0C\u8DF3\u8FC7\u4E0A\u4F20`);
-      return;
-    }
-    if (isDirEmpty(resolvedStaticDir)) {
-      console.error(`${LOG_PREFIX} \u76EE\u5F55\u4E3A\u7A7A: ${resolvedStaticDir}\uFF0C\u8DF3\u8FC7\u4E0A\u4F20`);
-      return;
-    }
-    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`
-      );
-    }
-    let uploadPrefix;
-    let uploadID;
-    let bucketId;
-    let accessKeyID;
-    let secretAccessKey;
-    let sessionToken;
-    const envCredentials = readCredentialsFromEnv();
-    if (envCredentials) {
-      console.error(`${LOG_PREFIX} \u4F7F\u7528\u73AF\u5883\u53D8\u91CF\u4E2D\u7684\u4E0A\u4F20\u51ED\u8BC1`);
-      ({ uploadPrefix, uploadID, bucketId, accessKeyID, secretAccessKey, sessionToken } = envCredentials);
-    } else {
-      console.error(`${LOG_PREFIX} \u73AF\u5883\u53D8\u91CF\u672A\u8BBE\u7F6E\uFF0C\u8C03\u7528 preUploadStatic...`);
-      bucketId = await resolveBucketId(appId);
-      const preUploadResp = await fetchPreUpload(appId, bucketId);
-      const { uploadCredential } = preUploadResp.data;
-      ({ uploadPrefix, uploadID } = preUploadResp.data);
-      ({ AccessKeyID: accessKeyID, SecretAccessKey: secretAccessKey, SessionToken: sessionToken } = uploadCredential);
-    }
-    console.error(`${LOG_PREFIX} \u4E0A\u4F20\u76EE\u6807: ${uploadPrefix}`);
-    console.error(`${LOG_PREFIX} \u914D\u7F6E tosutil...`);
-    configureTosutil(tosutilPath, {
-      endpoint,
-      region,
-      accessKeyID,
-      secretAccessKey,
-      sessionToken
-    });
-    console.error(`${LOG_PREFIX} \u4E0A\u4F20 ${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 });
-    if (callbackResp.status_code !== "0") {
-      throw new Error(`callbackStatic \u8FD4\u56DE\u5F02\u5E38, status_code: ${callbackResp.status_code}`);
-    }
-    const attachments = callbackResp.data?.attachments || [];
-    console.error(`${LOG_PREFIX} \u4E0A\u4F20\u5B8C\u6210\uFF0C\u5171 ${attachments.length} \u4E2A\u6587\u4EF6`);
-    console.log(JSON.stringify(callbackResp));
-  } catch (error) {
-    const message = error instanceof Error ? error.message : String(error);
-    console.error(`${LOG_PREFIX} Error: ${message}`);
-    process.exit(1);
-  }
-}
-async function fetchPreUpload(appId, bucketId) {
-  const response = await preUploadStaticAttachment(appId, bucketId);
-  if (response.status_code !== "0") {
-    throw new Error(`preUploadStatic \u8FD4\u56DE\u5F02\u5E38, status_code: ${response.status_code}`);
-  }
-  const { uploadPrefix, uploadID, uploadCredential } = response.data || {};
-  if (!uploadPrefix || !uploadID) {
-    throw new Error("preUploadStatic \u8FD4\u56DE\u6570\u636E\u4E0D\u5B8C\u6574\uFF0C\u7F3A\u5C11 uploadPrefix \u6216 uploadID");
-  }
-  if (!uploadCredential?.AccessKeyID || !uploadCredential?.SecretAccessKey || !uploadCredential?.SessionToken) {
-    throw new Error("preUploadStatic \u8FD4\u56DE\u7684\u51ED\u8BC1\u5B57\u6BB5\u4E0D\u5B8C\u6574");
-  }
-  return response;
-}
-function configureTosutil(tosutilPath, config) {
-  const { endpoint, region, accessKeyID, secretAccessKey, sessionToken } = config;
-  execSync3(
-    `${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`,
-    { stdio: "inherit" }
-  );
-}
-async function resolveBucketId(appId) {
-  console.error(`${LOG_PREFIX} \u83B7\u53D6\u9ED8\u8BA4\u5B58\u50A8\u6876...`);
-  const bucketId = await getDefaultBucketId(appId);
-  console.error(`${LOG_PREFIX} \u9ED8\u8BA4\u5B58\u50A8\u6876: ${bucketId}`);
-  return bucketId;
-}
-function isDirEmpty(dirPath) {
-  const entries = fs25.readdirSync(dirPath);
-  return entries.length === 0;
-}
-
-// src/commands/build/pre-upload-static.handler.ts
-var LOG_PREFIX2 = "[pre-upload-static]";
-async function preUploadStatic(options) {
-  try {
-    const { appId } = options;
-    console.error(`${LOG_PREFIX2} \u83B7\u53D6\u9ED8\u8BA4\u5B58\u50A8\u6876...`);
-    const bucketId = await getDefaultBucketId(appId);
-    console.error(`${LOG_PREFIX2} \u9ED8\u8BA4\u5B58\u50A8\u6876: ${bucketId}`);
-    console.error(`${LOG_PREFIX2} \u8C03\u7528 preUploadStatic...`);
-    const response = await preUploadStaticAttachment(appId, bucketId);
-    if (response.status_code !== "0") {
-      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) {
-      console.error(`${LOG_PREFIX2} preUploadStatic \u8FD4\u56DE\u6570\u636E\u4E0D\u5B8C\u6574`);
-      return;
-    }
-    if (!uploadCredential?.AccessKeyID || !uploadCredential?.SecretAccessKey || !uploadCredential?.SessionToken) {
-      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.error(`${LOG_PREFIX2} \u73AF\u5883\u53D8\u91CF\u5DF2\u8F93\u51FA`);
-  } catch (error) {
-    const message = error instanceof Error ? error.message : String(error);
-    console.error(`${LOG_PREFIX2} Warning: ${message}`);
-  }
-}
-
 // src/commands/build/index.ts
 var getTokenCommand = {
   name: "get-token",
@@ -7419,28 +7222,10 @@ var getTokenCommand = {
     });
   }
 };
-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("--endpoint <endpoint>", "TOS endpoint", "tos-cn-beijing.volces.com").option("--region <region>", "TOS region", "cn-beijing").action(async (options) => {
-      await uploadStatic(options);
-    });
-  }
-};
-var preUploadStaticCommand = {
-  name: "pre-upload-static",
-  description: "Get TOS upload info and output as env vars for build.sh eval",
-  register(program) {
-    program.command(this.name).description(this.description).requiredOption("--app-id <id>", "Application ID").action(async (options) => {
-      await preUploadStatic(options);
-    });
-  }
-};
 var buildCommandGroup = {
   name: "build",
   description: "Build related commands",
-  commands: [getTokenCommand, uploadStaticCommand, preUploadStaticCommand]
+  commands: [getTokenCommand]
 };
 
 // src/commands/index.ts
@@ -7457,12 +7242,12 @@ var commands = [
 ];
 
 // src/index.ts
-var envPath = path22.join(process.cwd(), ".env");
-if (fs26.existsSync(envPath)) {
+var envPath = path21.join(process.cwd(), ".env");
+if (fs25.existsSync(envPath)) {
   dotenvConfig({ path: envPath });
 }
-var __dirname = path22.dirname(fileURLToPath5(import.meta.url));
-var pkg = JSON.parse(fs26.readFileSync(path22.join(__dirname, "../package.json"), "utf-8"));
+var __dirname = path21.dirname(fileURLToPath5(import.meta.url));
+var pkg = JSON.parse(fs25.readFileSync(path21.join(__dirname, "../package.json"), "utf-8"));
 var cli = new FullstackCLI(pkg.version);
 cli.useAll(commands);
 cli.run();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/fullstack-cli",
-  "version": "1.1.28-alpha.1",
+  "version": "1.1.28",
   "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