@lark-apaas/fullstack-cli 1.1.6-alpha.4 → 1.1.6-alpha.6

package/dist/index.js

@@ -807,23 +807,20 @@ async function installOne(nameWithVersion) {
   const { name, version: requestedVersion } = parsePluginName(nameWithVersion);
   try {
     console.log(`[action-plugin] Installing ${name}@${requestedVersion}...`);
-    if (isPluginInstalled(name) && requestedVersion !== "latest") {
-      const installedVer = getInstalledPluginVersion(name);
-      if (installedVer === requestedVersion) {
+    const actualVersion = getPackageVersion(name);
+    if (actualVersion && requestedVersion !== "latest") {
+      if (actualVersion === requestedVersion) {
         console.log(`[action-plugin] Plugin ${name}@${requestedVersion} is already installed`);
-        return { name, version: installedVer, success: true, skipped: true };
+        return { name, version: actualVersion, success: true, skipped: true };
       }
     }
-    if (isPluginInstalled(name) && requestedVersion === "latest") {
-      const installedVer = getInstalledPluginVersion(name);
-      if (installedVer) {
-        const latestInfo = await getPluginVersion(name, "latest");
-        if (installedVer === latestInfo.version) {
-          console.log(`[action-plugin] Plugin ${name} is already up to date (version: ${installedVer})`);
-          return { name, version: installedVer, success: true, skipped: true };
-        }
-        console.log(`[action-plugin] Found newer version: ${latestInfo.version} (installed: ${installedVer})`);
+    if (actualVersion && requestedVersion === "latest") {
+      const latestInfo = await getPluginVersion(name, "latest");
+      if (actualVersion === latestInfo.version) {
+        console.log(`[action-plugin] Plugin ${name} is already up to date (version: ${actualVersion})`);
+        return { name, version: actualVersion, success: true, skipped: true };
       }
+      console.log(`[action-plugin] Found newer version: ${latestInfo.version} (installed: ${actualVersion})`);
     }
     const downloadResult = await downloadPlugin(name, requestedVersion);
     tgzPath = downloadResult.tgzPath;

package/package.json

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

package/templates/scripts/build.sh

@@ -19,21 +19,28 @@ print_time() {
 }
 
 # ==================== 步骤 0 ====================
-echo "📝 [0/4] 更新 openapi 代码"
+echo "🗑️  [0/5] 安装插件"
 STEP_START=$(node -e "console.log(Date.now())")
-npm run gen:openapi
+npx fullstack-cli action-plugin init
 print_time $STEP_START
 echo ""
 
 # ==================== 步骤 1 ====================
-echo "🗑️  [1/4] 清理 dist 目录"
+echo "📝 [1/5] 更新 openapi 代码"
 STEP_START=$(node -e "console.log(Date.now())")
-rm -rf "$ROOT_DIR/dist"
+npm run gen:openapi
 print_time $STEP_START
 echo ""
 
 # ==================== 步骤 2 ====================
-echo "🔨 [2/4] 并行构建 server 和 client"
+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/5] 并行构建 server 和 client"
 STEP_START=$(node -e "console.log(Date.now())")
 
 # 并行构建
@@ -70,8 +77,8 @@ echo "   ✅ Client 构建完成"
 print_time $STEP_START
 echo ""
 
-# ==================== 步骤 3 ====================
-echo "📦 [3/4] 准备 server 依赖产物"
+# ==================== 步骤 4 ====================
+echo "📦 [4/5] 准备 server 依赖产物"
 STEP_START=$(node -e "console.log(Date.now())")
 
 mkdir -p "$OUT_DIR/dist/client"
@@ -89,8 +96,8 @@ rm -rf "$ROOT_DIR/dist/tsconfig.node.tsbuildinfo"
 print_time $STEP_START
 echo ""
 
-# ==================== 步骤 4 ====================
-echo "✂️  [4/4] 智能依赖裁剪"
+# ==================== 步骤 5 ====================
+echo "✂️  [5/5] 智能依赖裁剪"
 STEP_START=$(node -e "console.log(Date.now())")
 
 # 分析实际依赖、复制并裁剪 node_modules、生成精简的 package.json

package/templates/scripts/prune-smart.js

@@ -178,9 +178,41 @@ async function smartPrune() {
     }
   }
 
-  console.log(`📦 实际需要 ${requiredPackages.size} 个 npm 包\n`);
+  console.log(`📦 静态分析需要 ${requiredPackages.size} 个 npm 包`);
 
-  // 4. 选择性复制包（只复制需要的）
+  // 4. 处理 actionPlugins（动态加载的插件，无法被静态分析追踪）
+  const originalPackage = JSON.parse(fs.readFileSync(ROOT_PACKAGE_JSON, 'utf8'));
+  const actionPlugins = originalPackage.actionPlugins || {};
+  const actionPluginNames = Object.keys(actionPlugins);
+
+  if (actionPluginNames.length > 0) {
+    console.log(`🔌 发现 ${actionPluginNames.length} 个 Action 插件，添加到依赖列表...`);
+
+    for (const pluginName of actionPluginNames) {
+      requiredPackages.add(pluginName);
+
+      // 检查插件的 peerDependencies，也添加进去
+      const pluginPkgPath = path.join(ROOT_NODE_MODULES, pluginName, 'package.json');
+      if (fs.existsSync(pluginPkgPath)) {
+        try {
+          const pluginPkg = JSON.parse(fs.readFileSync(pluginPkgPath, 'utf8'));
+          if (pluginPkg.peerDependencies) {
+            for (const peerDep of Object.keys(pluginPkg.peerDependencies)) {
+              requiredPackages.add(peerDep);
+            }
+          }
+        } catch {
+          // 忽略解析错误
+        }
+      }
+    }
+
+    console.log(`   ✅ 插件: ${actionPluginNames.join(', ')}`);
+  }
+
+  console.log(`📦 总共需要 ${requiredPackages.size} 个 npm 包\n`);
+
+  // 5. 选择性复制包（只复制需要的）
   console.log('📋 选择性复制 node_modules（仅复制需要的包）...');
   const copyStart = Date.now();
 
@@ -192,16 +224,15 @@ async function smartPrune() {
   console.log(`   成功: ${copiedCount.success} 个包，失败: ${copiedCount.failed} 个`);
   console.log(`   硬链接: ${fileStats.hardLinks} 个文件，复制: ${fileStats.copies} 个文件\n`);
 
-  // 5. 读取原始 package.json 并生成精简版本
-  const originalPackage = JSON.parse(fs.readFileSync(ROOT_PACKAGE_JSON, 'utf8'));
-
+  // 6. 生成精简版 package.json
   // 优化：直接构建 dependencies，避免多次对象展开
   const prunedDependencies = {};
   const allDeps = originalPackage.dependencies || {};
   const allDevDeps = originalPackage.devDependencies || {};
 
   for (const pkg of requiredPackages) {
-    const version = allDeps[pkg] || allDevDeps[pkg];
+    // 优先从 dependencies/devDependencies 获取版本，其次从 actionPlugins 获取
+    const version = allDeps[pkg] || allDevDeps[pkg] || actionPlugins[pkg];
     if (version) {
       prunedDependencies[pkg] = version;
     }
@@ -222,11 +253,14 @@ async function smartPrune() {
 
   const totalElapsed = Date.now() - totalStartTime;
 
-  // 6. 输出统计信息
+  // 7. 输出统计信息
   console.log('='.repeat(60));
   console.log('📊 智能裁剪统计:');
   console.log('='.repeat(60));
   console.log(`  需要的包数量:   ${requiredPackages.size}`);
+  if (actionPluginNames.length > 0) {
+    console.log(`  Action 插件:    ${actionPluginNames.length} 个`);
+  }
   console.log(`  成功复制:       ${copiedCount.success} 个包`);
   console.log(`  失败:           ${copiedCount.failed} 个包`);
   console.log(`  硬链接文件:     ${fileStats.hardLinks} 个`);