@lark-apaas/fullstack-cli 1.1.28-alpha.12 → 1.1.28-alpha.14

package/package.json

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

package/templates/scripts/build.sh

@@ -3,7 +3,7 @@
 set -euo pipefail
 
 ROOT_DIR="$(pwd)"
-DIST_DIR="$ROOT_DIR/dist"
+OUT_DIR="$ROOT_DIR/dist/server"
 
 # 记录总开始时间
 TOTAL_START=$(node -e "console.log(Date.now())")
@@ -78,26 +78,25 @@ print_time $STEP_START
 echo ""
 
 # ==================== 步骤 4 ====================
-echo "📦 [4/5] 准备产物"
+echo "📦 [4/5] 准备 server 依赖产物"
 STEP_START=$(node -e "console.log(Date.now())")
 
-# 拷贝 run.sh 到 dist/（prod 从 dist/ 启动，确保 cwd 一致性）
-cp "$ROOT_DIR/scripts/run.sh" "$DIST_DIR/"
+mkdir -p "$OUT_DIR/dist/client"
+
+# 移动 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" "$DIST_DIR/"
-fi
-
-# 移动 client 下的 HTML 文件到 dist/dist/client，保证 views 路径在 dev/prod 下一致
-if [ -d "$DIST_DIR/client" ]; then
-  mkdir -p "$DIST_DIR/dist/client"
-  find "$DIST_DIR/client" -maxdepth 1 -name "*.html" -exec mv {} "$DIST_DIR/dist/client/" \;
+  cp "$ROOT_DIR/.env" "$OUT_DIR/"
 fi
 
 # 清理无用文件
-rm -rf "$DIST_DIR/scripts"
-rm -rf "$DIST_DIR/tsconfig.node.tsbuildinfo"
+rm -rf "$ROOT_DIR/dist/scripts"
+rm -rf "$ROOT_DIR/dist/tsconfig.node.tsbuildinfo"
 
 print_time $STEP_START
 echo ""
@@ -117,8 +116,8 @@ echo "构建完成"
 print_time $TOTAL_START
 
 # 输出产物信息
-DIST_SIZE=$(du -sh "$DIST_DIR" | cut -f1)
-NODE_MODULES_SIZE=$(du -sh "$DIST_DIR/node_modules" | cut -f1)
+DIST_SIZE=$(du -sh "$OUT_DIR" | cut -f1)
+NODE_MODULES_SIZE=$(du -sh "$ROOT_DIR/dist/node_modules" | cut -f1)
 echo ""
 echo "📊 构建产物统计:"
 echo "   产物大小:        $DIST_SIZE"

package/templates/scripts/prune-smart.js

@@ -6,12 +6,11 @@ const fs = require('fs');
 const path = require('path');
 
 const ROOT_DIR = path.resolve(__dirname, '..');
-const DIST_DIR = path.join(ROOT_DIR, 'dist');
-const DIST_SERVER_DIR = path.join(DIST_DIR, 'server');
+const DIST_SERVER_DIR = path.join(ROOT_DIR, 'dist/server');
 const ROOT_PACKAGE_JSON = path.join(ROOT_DIR, 'package.json');
 const ROOT_NODE_MODULES = path.join(ROOT_DIR, 'node_modules');
-const OUT_NODE_MODULES = path.join(DIST_DIR, 'node_modules');
-const OUT_PACKAGE_JSON = path.join(DIST_DIR, 'package.json');
+const OUT_NODE_MODULES = path.join(ROOT_DIR, 'dist/node_modules');
+const OUT_PACKAGE_JSON = path.join(DIST_SERVER_DIR, 'package.json');
 
 // Server 入口文件
 const SERVER_ENTRY = path.join(DIST_SERVER_DIR, 'main.js');
@@ -295,6 +294,9 @@ async function smartPrune() {
     version: originalPackage.version,
     private: true,
     dependencies: prunedDependencies,
+    scripts: {
+      start: originalPackage.scripts?.start || 'node main.js'
+    },
     engines: originalPackage.engines
   };
 

package/templates/scripts/run.sh

@@ -2,7 +2,4 @@
 # This file is auto-generated by @lark-apaas/fullstack-cli
 
 # 生产环境下，启动服务
-# 从 dist/ 根目录执行，确保 process.cwd() 与 dev 模式一致
-# dev: cwd = 项目根, shared/ client/ 可达
-# prod: cwd = dist/,  shared/ client/ 可达
-NODE_ENV=production node server/main.js
+npm run start