@lark-apaas/fullstack-cli 1.1.63-alpha.20260826101001 → 1.1.63-alpha.20260826101330

package/dist/index.js

@@ -2514,6 +2514,17 @@ function buildDefaultRules(opts) {
       command: "node scripts/hooks/run-precommit.js",
       overwrite: false
     },
+    // 1d. Nest 开发态由平台 launcher 选择 SWC；已有声明保持用户版本/依赖分区。
+    {
+      type: "ensure-dev-dependency",
+      name: "@swc/cli",
+      version: "^0.5.2"
+    },
+    {
+      type: "ensure-dev-dependency",
+      name: "@swc/core",
+      version: "^1.16.1"
+    },
     // 2. 智能合并 nest-cli.json 配置（保留用户自定义的 assets、plugins 等）
     {
       from: "templates/nest-cli.json",
@@ -2588,6 +2599,19 @@ function buildDefaultRules(opts) {
       name: "lint",
       to: "node ./scripts/lint.js",
       ifStartsWith: "concurrently "
+    },
+    // 9a. 只迁移模板生成的精确默认值；用户追加参数或自定义命令保持不动。
+    {
+      type: "patch-script",
+      name: "dev:server",
+      to: "NODE_ENV=development node ./scripts/dev-server.js",
+      ifEquals: "NODE_ENV=development nest start --watch"
+    },
+    {
+      type: "patch-script",
+      name: "dev:server",
+      to: "NODE_ENV=development node ./scripts/dev-server.js",
+      ifEquals: "nest start --watch"
     }
   ];
   if (!opts.disableGenOpenapi) {
@@ -2617,7 +2641,15 @@ function emptyProfile() {
 }
 function viteReactProfile() {
   return {
-    sync: [],
+    sync: [
+      // 覆盖 scripts/build.sh（回溯 public/* → dist/output/ 的修复）
+      {
+        from: "templates/vite-react/build.sh",
+        to: "scripts/build.sh",
+        type: "file",
+        overwrite: true
+      }
+    ],
     permissions: {},
     activateGitHooks: true
   };
@@ -2759,7 +2791,9 @@ async function run2(options) {
   }
   const stack = resolveStack(userProjectRoot);
   try {
-    console.log(`[fullstack-cli] Starting sync${stack ? ` (stack: ${stack})` : ""}...`);
+    console.log(
+      `[fullstack-cli] Starting sync${stack ? ` (stack: ${stack})` : ""}...`
+    );
     const config = genSyncConfig(stack, {
       disableGenOpenapi: options.disableGenOpenapi ?? false
     });
@@ -2778,7 +2812,9 @@ async function run2(options) {
         activateGitHooks(userProjectRoot);
       } catch (error) {
         const message = error instanceof Error ? error.message : String(error);
-        console.warn(`[fullstack-cli] \u26A0 Failed to activate git hooks: ${message}`);
+        console.warn(
+          `[fullstack-cli] \u26A0 Failed to activate git hooks: ${message}`
+        );
       }
     }
     console.log("[fullstack-cli] Sync completed successfully \u2705");
@@ -2798,7 +2834,9 @@ function resolveStack(userProjectRoot) {
     return typeof meta.stack === "string" ? meta.stack : void 0;
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);
-    console.warn(`[fullstack-cli] \u26A0 Failed to read .spark/meta.json, fallback to default sync: ${message}`);
+    console.warn(
+      `[fullstack-cli] \u26A0 Failed to read .spark/meta.json, fallback to default sync: ${message}`
+    );
     return void 0;
   }
 }
@@ -2819,12 +2857,22 @@ async function syncRule(rule, pluginRoot, userProjectRoot) {
   }
   if (rule.type === "add-script") {
     const packageJsonPath = path5.join(userProjectRoot, "package.json");
-    addScript(packageJsonPath, rule.name, rule.command, rule.overwrite ?? false);
+    addScript(
+      packageJsonPath,
+      rule.name,
+      rule.command,
+      rule.overwrite ?? false
+    );
+    return;
+  }
+  if (rule.type === "ensure-dev-dependency") {
+    const packageJsonPath = path5.join(userProjectRoot, "package.json");
+    ensureDevDependency(packageJsonPath, rule.name, rule.version);
     return;
   }
   if (rule.type === "patch-script") {
     const packageJsonPath = path5.join(userProjectRoot, "package.json");
-    patchScript(packageJsonPath, rule.name, rule.to, rule.ifStartsWith);
+    patchScript(packageJsonPath, rule);
     return;
   }
   if (rule.type === "add-line") {
@@ -2852,7 +2900,12 @@ async function syncRule(rule, pluginRoot, userProjectRoot) {
       syncDirectory(srcPath, destPath, rule.overwrite ?? true);
       break;
     case "file":
-      syncFile(srcPath, destPath, rule.overwrite ?? true, rule.onlyIfExists ?? false);
+      syncFile(
+        srcPath,
+        destPath,
+        rule.overwrite ?? true,
+        rule.onlyIfExists ?? false
+      );
       break;
     case "append":
       appendToFile(srcPath, destPath);
@@ -2861,7 +2914,9 @@ async function syncRule(rule, pluginRoot, userProjectRoot) {
 }
 function syncFile(src, dest, overwrite = true, onlyIfExists = false) {
   if (onlyIfExists && !fs7.existsSync(dest)) {
-    console.log(`[fullstack-cli] \u25CB ${path5.basename(dest)} (skipped, target not exists)`);
+    console.log(
+      `[fullstack-cli] \u25CB ${path5.basename(dest)} (skipped, target not exists)`
+    );
     return;
   }
   const destDir = path5.dirname(dest);
@@ -2869,7 +2924,9 @@ function syncFile(src, dest, overwrite = true, onlyIfExists = false) {
     fs7.mkdirSync(destDir, { recursive: true });
   }
   if (fs7.existsSync(dest) && !overwrite) {
-    console.log(`[fullstack-cli] \u25CB ${path5.basename(dest)} (skipped, already exists)`);
+    console.log(
+      `[fullstack-cli] \u25CB ${path5.basename(dest)} (skipped, already exists)`
+    );
     return;
   }
   fs7.copyFileSync(src, dest);
@@ -2896,7 +2953,9 @@ function syncDirectory(src, dest, overwrite = true) {
     }
   });
   if (count > 0) {
-    console.log(`[fullstack-cli] Synced ${count} files to ${path5.basename(dest)}/`);
+    console.log(
+      `[fullstack-cli] Synced ${count} files to ${path5.basename(dest)}/`
+    );
   }
 }
 function appendToFile(src, dest) {
@@ -2906,7 +2965,9 @@ function appendToFile(src, dest) {
     existingContent = fs7.readFileSync(dest, "utf-8");
   }
   if (existingContent.includes(content.trim())) {
-    console.log(`[fullstack-cli] \u25CB ${path5.basename(dest)} (already contains content)`);
+    console.log(
+      `[fullstack-cli] \u25CB ${path5.basename(dest)} (already contains content)`
+    );
     return;
   }
   fs7.appendFileSync(dest, content);
@@ -2964,7 +3025,34 @@ function addScript(packageJsonPath, name, command, overwrite) {
   fs7.writeFileSync(packageJsonPath, JSON.stringify(pkg2, null, 2) + "\n");
   console.log(`[fullstack-cli] \u2713 scripts.${name}`);
 }
-function patchScript(packageJsonPath, name, to, ifStartsWith) {
+function ensureDevDependency(packageJsonPath, name, version) {
+  if (!fs7.existsSync(packageJsonPath)) {
+    console.log("[fullstack-cli] \u25CB package.json (not found)");
+    return;
+  }
+  try {
+    const content = fs7.readFileSync(packageJsonPath, "utf-8");
+    const pkg2 = JSON.parse(content);
+    const existingVersion = pkg2.dependencies?.[name] ?? pkg2.devDependencies?.[name];
+    if (existingVersion !== void 0) {
+      console.log(
+        `[fullstack-cli] \u25CB ${name} (already declared as ${existingVersion})`
+      );
+      return;
+    }
+    pkg2.devDependencies ?? (pkg2.devDependencies = {});
+    pkg2.devDependencies[name] = version;
+    fs7.writeFileSync(packageJsonPath, JSON.stringify(pkg2, null, 2) + "\n");
+    console.log(`[fullstack-cli] \u2713 devDependencies.${name} = ${version}`);
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    console.warn(
+      `[fullstack-cli] \u26A0 Could not ensure dependency ${name}: ${message}`
+    );
+  }
+}
+function patchScript(packageJsonPath, rule) {
+  const { name, to } = rule;
   if (!fs7.existsSync(packageJsonPath)) {
     console.log(`[fullstack-cli] \u25CB package.json (not found)`);
     return;
@@ -2981,7 +3069,8 @@ function patchScript(packageJsonPath, name, to, ifStartsWith) {
       console.log(`[fullstack-cli] \u25CB scripts.${name} (already patched)`);
       return;
     }
-    if (!current.startsWith(ifStartsWith)) {
+    const matches = rule.ifEquals !== void 0 ? current === rule.ifEquals : current.startsWith(rule.ifStartsWith);
+    if (!matches) {
       console.warn(
         `[fullstack-cli] \u26A0 Skipped patching scripts.${name} because it has been customized`
       );
@@ -2992,7 +3081,9 @@ function patchScript(packageJsonPath, name, to, ifStartsWith) {
     console.log(`[fullstack-cli] \u2713 Patched scripts.${name}`);
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);
-    console.warn(`[fullstack-cli] \u26A0 Could not patch scripts.${name}: ${message}`);
+    console.warn(
+      `[fullstack-cli] \u26A0 Could not patch scripts.${name}: ${message}`
+    );
   }
 }
 function addLineToFile(filePath, line) {

package/package.json

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

package/templates/scripts/build.sh

@@ -146,21 +146,14 @@ STEP_START=$(node -e "console.log(Date.now())")
 # 使用 mv 而非 cp：HTML 不能上传到公网 CDN，移走后 dist/client 中不再包含 HTML
 if [ -d "$DIST_DIR/client" ]; then
   mkdir -p "$DIST_DIR/dist/client"
+  # public 先进（顶层 client 打包被排除；server setBaseViewsDir + 中间件同源 serve）
+  if [ -d "$ROOT_DIR/client/public" ]; then
+    cp -R "$ROOT_DIR/client/public/." "$DIST_DIR/dist/client/"
+  fi
+  # 构建产物 HTML 随后 move，覆盖 public 里的同名文件（保证入口页是构建版，不被 public 静默覆盖）
   find "$DIST_DIR/client" -maxdepth 1 -name "*.html" -exec mv {} "$DIST_DIR/dist/client/" \;
 fi
 
-# 拷贝 shared/static → dist/shared/static
-# Nest server 生产从 process.cwd() + shared/static 读 (nestjs-core static.controller.ts:100),
-# 生产 cwd = dist/, 所以目标是 dist/shared/static。coding-preset 的 static-assets plugin
-# 之前 closeBundle 拷贝, 现在删除后交给 build.sh 显式做 (跟 jsPage 的 output_static rsync 对齐)。
-# 排除 .ts/.tsx/.js/.jsx: 避免 shared/static/ 里若有开发脚本被误传到生产。
-if [ -d "$ROOT_DIR/shared/static" ]; then
-  mkdir -p "$DIST_DIR/shared/static"
-  rsync -a --exclude='*.ts' --exclude='*.tsx' --exclude='*.js' --exclude='*.jsx' \
-    "$ROOT_DIR/shared/static/" "$DIST_DIR/shared/static/"
-  echo "   Static → dist/shared/static/"
-fi
-
 # server 相关产物准备（only_frontend_change=true 时跳过）
 if [[ "${only_frontend_change:-false}" == "true" ]]; then
   echo "   [skip] 跳过 run.sh/.env 复制 (only_frontend_change=true)"

package/templates/scripts/dev-server.js

@@ -0,0 +1,139 @@
+'use strict';
+
+const fs = require('node:fs');
+const path = require('node:path');
+const { spawn } = require('node:child_process');
+
+const FORWARDED_SIGNALS = ['SIGINT', 'SIGTERM'];
+
+function resolveBuilder(projectRoot) {
+  const configPath = path.join(projectRoot, 'nest-cli.json');
+  if (!fs.existsSync(configPath)) {
+    return undefined;
+  }
+
+  const config = JSON.parse(fs.readFileSync(configPath, 'utf8'));
+  const builder = config?.compilerOptions?.builder;
+  if (typeof builder === 'string') {
+    return builder;
+  }
+  if (
+    builder &&
+    typeof builder === 'object' &&
+    typeof builder.type === 'string'
+  ) {
+    return builder.type;
+  }
+  return builder === undefined ? undefined : 'custom';
+}
+
+function findMissingSwcDependency(projectRoot) {
+  for (const dependency of ['@swc/cli', '@swc/core']) {
+    try {
+      require.resolve(`${dependency}/package.json`, { paths: [projectRoot] });
+    } catch {
+      return dependency;
+    }
+  }
+  return undefined;
+}
+
+function resolveNestEntrypoint(projectRoot) {
+  return require.resolve('@nestjs/cli/bin/nest.js', { paths: [projectRoot] });
+}
+
+function startNest(projectRoot, nestArgs) {
+  const child = spawn(
+    process.execPath,
+    [resolveNestEntrypoint(projectRoot), ...nestArgs],
+    {
+      cwd: projectRoot,
+      env: process.env,
+      stdio: 'inherit',
+    }
+  );
+
+  const signalHandlers = new Map();
+  for (const signal of FORWARDED_SIGNALS) {
+    const handler = () => child.kill(signal);
+    signalHandlers.set(signal, handler);
+    process.once(signal, handler);
+  }
+
+  function removeSignalHandlers() {
+    for (const [signal, handler] of signalHandlers) {
+      process.removeListener(signal, handler);
+    }
+  }
+
+  child.once('error', error => {
+    removeSignalHandlers();
+    console.error(
+      `[miaoda:nest-compiler] failed to start Nest CLI: ${error.message}`
+    );
+    process.exitCode = 1;
+  });
+
+  child.once('exit', (code, signal) => {
+    removeSignalHandlers();
+    if (signal) {
+      process.kill(process.pid, signal);
+      return;
+    }
+    process.exitCode = code ?? 1;
+  });
+}
+
+function main() {
+  const projectRoot = process.cwd();
+  const forwardedArgs = process.argv.slice(2);
+  let explicitBuilder;
+
+  try {
+    explicitBuilder = resolveBuilder(projectRoot);
+  } catch (error) {
+    console.error(
+      `[miaoda:nest-compiler] MIAODA_NEST_SWC_FALLBACK reason=invalid_nest_cli_config message=${JSON.stringify(error.message)}`
+    );
+    console.log('[miaoda:nest-compiler] MIAODA_NEST_COMPILER=tsc');
+    startNest(projectRoot, ['start', '--watch', ...forwardedArgs]);
+    return;
+  }
+
+  if (explicitBuilder && explicitBuilder !== 'swc') {
+    console.log(
+      `[miaoda:nest-compiler] MIAODA_NEST_COMPILER=${explicitBuilder}`
+    );
+    startNest(projectRoot, ['start', '--watch', ...forwardedArgs]);
+    return;
+  }
+
+  const missingDependency = findMissingSwcDependency(projectRoot);
+  if (missingDependency) {
+    console.error(
+      `[miaoda:nest-compiler] MIAODA_NEST_SWC_FALLBACK reason=missing_dependency dependency=${missingDependency}`
+    );
+    console.log('[miaoda:nest-compiler] MIAODA_NEST_COMPILER=tsc');
+    startNest(projectRoot, ['start', '--watch', ...forwardedArgs]);
+    return;
+  }
+
+  console.log('[miaoda:nest-compiler] MIAODA_NEST_COMPILER=swc');
+  startNest(projectRoot, [
+    'start',
+    '--watch',
+    '--builder',
+    'swc',
+    '--type-check',
+    ...forwardedArgs,
+  ]);
+}
+
+if (require.main === module) {
+  main();
+}
+
+module.exports = {
+  findMissingSwcDependency,
+  resolveBuilder,
+};

package/templates/vite-react/build.sh

@@ -0,0 +1,61 @@
+#!/bin/bash
+set -e
+
+ROOT="$(cd "$(dirname "$0")/.." && pwd)"
+OUTPUT="$ROOT/dist/output"
+OUTPUT_RESOURCE="$ROOT/dist/output_resource"
+OUTPUT_STATIC="$ROOT/dist/output_static"
+
+# 映射平台环境变量到 preset 期望的变量名
+#   MIAODA_APP_ID            → /app/<appId> 作为客户端 base path
+#   MIAODA_RESOURCE_CDN_PREFIX → assets (JS/CSS) 的 CDN 前缀
+# CLI 注入约定见 miaoda-cli src/services/deploy/modern/atoms/build.ts
+export CLIENT_BASE_PATH="${MIAODA_APP_ID:+/app/$MIAODA_APP_ID}"
+export ASSETS_CDN_PATH="${MIAODA_RESOURCE_CDN_PREFIX:-/}"
+export STATIC_ASSETS_BASE_URL="${MIAODA_STATIC_CDN_PREFIX}"
+export NODE_ENV="${NODE_ENV:-production}"
+
+# 清理
+rm -rf "$ROOT/dist"
+
+# 1. Vite 构建 → dist/client/（相对于项目根目录输出）
+npx vite build --outDir "$ROOT/dist/client" --emptyOutDir
+
+# 2. public/ 静态资源 + HTML → dist/output/（模型 B：public = 应用根目录，同源 /app/<appId>/*）
+mkdir -p "$OUTPUT"
+# 2a. public/*：vite copyPublicDir 已把 public/* 平铺进 dist/client，但下面白名单只取
+#     *.html/routes.json，其余（favicon / 图片 / 运行时 fetch 的数据文件）会随 dist/client 被删。
+#     从源 public/ 补拷到 output/（同源根），让 fetch('/x') / resolveAppUrl('/x') 线上可用。
+#     先拷 public、再拷 HTML，保证构建产出的 index.html/routes.json 覆盖 public 里的同名文件（若有）。
+if [ -d "$ROOT/public" ]; then
+  cp -R "$ROOT/public/." "$OUTPUT/"
+fi
+# 2b. HTML + routes.json（构建产物）
+find "$ROOT/dist/client" -maxdepth 1 \( -name '*.html' -o -name 'routes.json' \) -exec cp {} "$OUTPUT/" \;
+
+# 3. assets/ → dist/output_resource/（JS/CSS/字体，上传到 CDN）
+if [ -d "$ROOT/dist/client/assets" ]; then
+  mkdir -p "$OUTPUT_RESOURCE"
+  cp -r "$ROOT/dist/client/assets" "$OUTPUT_RESOURCE/"
+fi
+
+# 4. 私有静态资源 → dist/output_static/（排除代码文件）
+if [ -d "$ROOT/shared/static" ]; then
+  mkdir -p "$OUTPUT_STATIC"
+  rsync -a --exclude='*.ts' --exclude='*.tsx' --exclude='*.js' --exclude='*.jsx' "$ROOT/shared/static/" "$OUTPUT_STATIC/"
+fi
+
+# 5. capability 配置 → dist/output_capabilities/
+if [ -d "$ROOT/shared/capabilities" ]; then
+  mkdir -p "$ROOT/dist/output_capabilities"
+  cp -r "$ROOT/shared/capabilities/." "$ROOT/dist/output_capabilities/"
+fi
+
+# 清理中间产物
+rm -rf "$ROOT/dist/client"
+
+echo "Build complete"
+echo "  HTML         → dist/output/"
+[ -d "$OUTPUT_RESOURCE" ] && echo "  Resource     → dist/output_resource/" || true
+[ -d "$OUTPUT_STATIC" ] && echo "  Static       → dist/output_static/" || true
+[ -d "$ROOT/dist/output_capabilities" ] && echo "  Capabilities → dist/output_capabilities/" || true