@lark-apaas/coding-template-nestjs-react-fullstack 0.1.40-alpha.20260916135942 → 0.1.40

package/template/package.json

@@ -18,19 +18,17 @@
     "build:server": "NODE_ENV=production nest build",
     "build:client": "NODE_ENV=production vite build --config vite.config.ts",
     "start": "NODE_ENV=production node main.js",
-    "eslint": "eslint . --quiet --ignore-pattern \"server/mcp/ui/**\"",
+    "eslint": "eslint . --quiet",
     "stylelint": "stylelint client/src/**/*.css --quiet",
-    "type:check": "node ./scripts/lint.js --typecheck",
+    "type:check": "concurrently -n \"server,client\" -c \"blue,green\" \"npm run type:check:server\" \"npm run type:check:client\"",
     "type:check:client": "tsc --noEmit --project tsconfig.app.json",
     "type:check:server": "tsc --noEmit --project tsconfig.node.json",
     "lint": "node ./scripts/lint.js",
     "precommit": "node scripts/hooks/run-precommit.js",
-    "upgrade": "npx -y @lark-apaas/fullstack-cli sync --disable-gen-openapi",
-    "type:check:mcp-ui": "node ./scripts/lint.js --typecheck-mcp-ui",
-    "eslint:mcp-ui": "node ./scripts/lint.js --eslint-mcp-ui"
+    "upgrade": "npx -y @lark-apaas/fullstack-cli sync --disable-gen-openapi"
   },
   "dependencies": {
-    "@lark-apaas/fullstack-nestjs-core": "1.1.62-alpha.20260916134018",
+    "@lark-apaas/fullstack-nestjs-core": "^1.1.61",
     "@nestjs/axios": "^4.0.1",
     "@nestjs/cache-manager": "^3.1.3",
     "@nestjs/common": "^10.4.20",
@@ -55,7 +53,7 @@
   "devDependencies": {
     "@hookform/resolvers": "^5.2.2",
     "@lark-apaas/client-toolkit": "^1.2.70",
-    "@lark-apaas/coding-preset-vite-react": "1.0.23-alpha.20260915164951",
+    "@lark-apaas/coding-preset-vite-react": "^1.0.23",
     "@lark-apaas/fullstack-presets": "^1.1.0",
     "@nestjs/cli": "^10.4.9",
     "@radix-ui/react-accordion": "^1.2.12",

package/template/scripts/build.sh

@@ -43,43 +43,37 @@ echo ""
 echo "🔨 [3/5] 并行构建 server 和 client"
 STEP_START=$(node -e "console.log(Date.now())")
 
-# server/mcp（含 UI/Skill）变更必须由平台判定为全构建。
-if [[ "${only_frontend_change:-false}" == "true" ]]; then
-  echo "   ├─ 仅构建 client (only_frontend_change=true)"
-  npm run build:client > /tmp/build-client.log 2>&1
-else
-  # 并行构建
-  echo "   ├─ 启动 server 构建..."
-  npm run build:server > /tmp/build-server.log 2>&1 &
-  SERVER_PID=$!
-
-  echo "   ├─ 启动 client 构建..."
-  npm run build:client > /tmp/build-client.log 2>&1 &
-  CLIENT_PID=$!
-
-  # 等待两个构建完成
-  SERVER_EXIT=0
-  CLIENT_EXIT=0
-
-  wait $SERVER_PID || SERVER_EXIT=$?
-  wait $CLIENT_PID || CLIENT_EXIT=$?
-
-  # 检查构建结果
-  if [ $SERVER_EXIT -ne 0 ]; then
-    echo "   ❌ Server 构建失败"
-    cat /tmp/build-server.log
-    exit 1
-  fi
-
-  if [ $CLIENT_EXIT -ne 0 ]; then
-    echo "   ❌ Client 构建失败"
-    cat /tmp/build-client.log
-    exit 1
-  fi
-
-  echo "   ✅ Server 构建完成"
-  echo "   ✅ Client 构建完成"
+# 并行构建
+echo "   ├─ 启动 server 构建..."
+npm run build:server > /tmp/build-server.log 2>&1 &
+SERVER_PID=$!
+
+echo "   ├─ 启动 client 构建..."
+npm run build:client > /tmp/build-client.log 2>&1 &
+CLIENT_PID=$!
+
+# 等待两个构建完成
+SERVER_EXIT=0
+CLIENT_EXIT=0
+
+wait $SERVER_PID || SERVER_EXIT=$?
+wait $CLIENT_PID || CLIENT_EXIT=$?
+
+# 检查构建结果
+if [ $SERVER_EXIT -ne 0 ]; then
+  echo "   ❌ Server 构建失败"
+  cat /tmp/build-server.log
+  exit 1
 fi
+
+if [ $CLIENT_EXIT -ne 0 ]; then
+  echo "   ❌ Client 构建失败"
+  cat /tmp/build-client.log
+  exit 1
+fi
+
+echo "   ✅ Server 构建完成"
+echo "   ✅ Client 构建完成"
 print_time $STEP_START
 echo ""
 
@@ -87,21 +81,18 @@ echo ""
 echo "📦 [4/5] 准备 server 依赖产物"
 STEP_START=$(node -e "console.log(Date.now())")
 
-if [[ "${only_frontend_change:-false}" != "true" ]]; then
-  mkdir -p "$OUT_DIR/dist/client"
+mkdir -p "$OUT_DIR/dist/client"
 
-  # public 先进（server setBaseViewsDir + nestjs-core 中间件同源 serve）
-  if [ -d "$ROOT_DIR/client/public" ]; then
-    cp -R "$ROOT_DIR/client/public/." "$OUT_DIR/dist/client/"
-  fi
-
-  # 构建产物 HTML 随后拷，覆盖 public 里的同名文件（保证入口页是构建版，不被 public 静默覆盖）
-  cp "$ROOT_DIR/dist/client/"*.html "$OUT_DIR/dist/client/" || true
+# public 先进（server setBaseViewsDir + nestjs-core 中间件同源 serve）
+if [ -d "$ROOT_DIR/client/public" ]; then
+  cp -R "$ROOT_DIR/client/public/." "$OUT_DIR/dist/client/"
+fi
 
-  # 拷贝 run.sh 文件
-  cp "$ROOT_DIR/scripts/run.sh" "$OUT_DIR/"
+# 构建产物 HTML 随后拷，覆盖 public 里的同名文件（保证入口页是构建版，不被 public 静默覆盖）
+cp "$ROOT_DIR/dist/client/"*.html "$OUT_DIR/dist/client/" || true
 
-fi
+# 拷贝 run.sh 文件
+cp "$ROOT_DIR/scripts/run.sh" "$OUT_DIR/"
 
 # 清理无用文件
 rm -rf "$ROOT_DIR/dist/scripts"
@@ -115,9 +106,7 @@ echo "✂️  [5/5] 智能依赖裁剪"
 STEP_START=$(node -e "console.log(Date.now())")
 
 # 分析实际依赖、复制并裁剪 node_modules、生成精简的 package.json
-if [[ "${only_frontend_change:-false}" != "true" ]]; then
-  node "$ROOT_DIR/scripts/prune-smart.js"
-fi
+node "$ROOT_DIR/scripts/prune-smart.js"
 
 print_time $STEP_START
 echo ""
@@ -127,37 +116,10 @@ echo "构建完成"
 print_time $TOTAL_START
 
 # 输出产物信息
-DIST_SIZE=$(du -sh "$ROOT_DIR/dist" | cut -f1)
+DIST_SIZE=$(du -sh "$OUT_DIR" | cut -f1)
+NODE_MODULES_SIZE=$(du -sh "$OUT_DIR/node_modules" | cut -f1)
 echo ""
 echo "📊 构建产物统计:"
 echo "   总大小:        $DIST_SIZE"
-if [[ "${only_frontend_change:-false}" != "true" ]]; then
-  NODE_MODULES_SIZE=$(du -sh "$OUT_DIR/node_modules" | cut -f1)
-  echo "   node_modules: $NODE_MODULES_SIZE"
-fi
+echo "   node_modules: $NODE_MODULES_SIZE"
 echo ""
-
-# 仅成功的全构建生成 backendBuildID；必须在构建、产物准备和依赖裁剪之后。
-# UI/Skill 内容由 SDK 独立计入总 hash；纯前端发布不替换已部署的 backendBuildID。
-if [[ "${only_frontend_change:-false}" != "true" ]]; then
-  node - "$ROOT_DIR/dist" <<'NODE'
-const fs = require('node:fs');
-const path = require('node:path');
-const { randomUUID } = require('node:crypto');
-const dist = process.argv[2];
-// 防止 build:server 空跑成功、却没有可交付的服务端入口。
-if (!fs.statSync(path.join(dist, 'server/main.js')).isFile()) {
-  throw new Error('Missing server build output: dist/server/main.js');
-}
-// runtime cwd 分别为工程根、dist/（或整包解压到 dist-server/）、旧版 dist/server/。
-// 与 MCP UI/Skill 的交付布局一致：复制产物时保留同一个 UUID，不在启动时生成。
-const files = [
-  path.join(dist, 'mcp-build-id'),
-  path.join(dist, 'dist/mcp-build-id'),
-  path.join(dist, 'server/dist/mcp-build-id'),
-];
-for (const file of files) fs.mkdirSync(path.dirname(file), { recursive: true });
-const buildID = randomUUID();
-for (const file of files) fs.writeFileSync(file, buildID, 'utf8');
-NODE
-fi

package/template/scripts/lint.js

@@ -18,31 +18,19 @@ function runCommand(command, args) {
       shell: false,
     });
 
-    child.on('close', (code) => resolve(code ?? 1));
+    child.on('close', (code) => resolve(code || 0));
     child.on('error', () => resolve(1));
   });
 }
 
-// 串行依次执行每个任务，全部跑完后再聚合退出码：
-// 降低并发资源占用、让各任务输出按顺序清晰可读，同时保留“一次暴露所有 lint 问题”的行为。
-async function runTasksSerially(taskSpecs) {
-  let exitCode = 0;
-  for (const [command, args] of taskSpecs) {
-    const code = await runCommand(command, args);
-    if (code !== 0) {
-      exitCode = 1;
-    }
-  }
-  return exitCode;
-}
-
 function normalizeProjectFile(filePath) {
   const absolutePath = path.isAbsolute(filePath)
     ? filePath
     : path.resolve(cwd, filePath);
 
   if (!fs.existsSync(absolutePath)) {
-    console.log(`[lint] Deleted file: ${filePath}; checking affected projects`);
+    console.warn(`[lint] Skip missing file: ${filePath}`);
+    return null;
   }
 
   const relativePath = path.relative(cwd, absolutePath);
@@ -106,92 +94,17 @@ function canRunStylelint() {
   return STYLELINT_CONFIG_FILES.some(file => fs.existsSync(path.join(cwd, file)));
 }
 
-const UI_DIR = 'server/mcp/ui';
-const UI_TYPECHECK = 'node ./scripts/lint.js --typecheck';
-
-function isUiFile(file) {
-  return file.startsWith(`${UI_DIR}/`);
-}
-
-function uiSourceFiles() {
-  const files = [];
-  function visit(relative) {
-    const absolute = path.join(cwd, relative);
-    if (!fs.existsSync(absolute)) return;
-    if (fs.lstatSync(absolute).isSymbolicLink()) {
-      throw new Error(`MCP UI 检查不支持符号链接: ${relative}`);
-    }
-    for (const entry of fs.readdirSync(absolute, { withFileTypes: true })) {
-      if (['node_modules', 'dist', '.git'].includes(entry.name)) continue;
-      const file = `${relative}/${entry.name}`;
-      if (entry.isSymbolicLink()) throw new Error(`MCP UI 检查不支持符号链接: ${file}`);
-      if (entry.isDirectory()) visit(file);
-      else if (isEslintTarget(file) && !/\.d\.(?:ts|mts|cts)$/.test(file)) files.push(file);
-    }
-  }
-  visit(UI_DIR);
-  return files.sort();
-}
-
-function uiTasks({ types = true, eslint = true } = {}) {
-  const sources = uiSourceFiles();
-  if (!sources.length) return [];
-  const tasks = [];
-  if (types) {
-    const config = `${UI_DIR}/tsconfig.json`;
-    if (!fs.existsSync(path.join(cwd, config))) {
-      throw new Error(`MCP UI 缺少 ${config}，请按 mcp-guide 补齐独立浏览器 TypeScript 配置。`);
-    }
-    const ts = require('typescript');
-    const parsed = ts.getParsedCommandLineOfConfigFile(path.join(cwd, config), {}, {
-      ...ts.sys,
-      onUnRecoverableConfigFileDiagnostic: d => { throw new Error(ts.flattenDiagnosticMessageText(d.messageText, '\n')); },
-    });
-    if (!parsed || parsed.errors.length) throw new Error(`MCP UI TypeScript 配置无效: ${config}`);
-    const included = new Set(parsed.fileNames.map(file => path.resolve(file)));
-    const missing = sources.filter(file => !included.has(path.resolve(cwd, file)));
-    if (missing.length) throw new Error(`MCP UI TypeScript 配置未覆盖源码: ${missing.join(', ')}；请检查 include/exclude，JS 源码需开启 allowJs。`);
-    tasks.push([getBinName('npx'), ['--no-install', 'tsc', '--noEmit', '-p', config]]);
-  }
-  if (eslint) {
-    const config = ['eslint.mcp-ui.config.js', 'eslint.mcp-ui.config.cjs', 'eslint.mcp-ui.config.mjs']
-      .find(file => fs.existsSync(path.join(cwd, file)));
-    if (!config) throw new Error('MCP UI 缺少独立 ESLint 配置，请按 mcp-guide 创建 eslint.mcp-ui.config.cjs。');
-    tasks.push([getBinName('npx'), ['--no-install', 'eslint', '--config', config, '--quiet', '--max-warnings', '0', ...sources]]);
-  }
-  return tasks;
-}
-
-function packageScripts() {
-  return JSON.parse(fs.readFileSync(path.join(cwd, 'package.json'), 'utf8')).scripts || {};
-}
-
-async function runTypeCheck() {
-  const scripts = packageScripts();
-  const tasks = ['type:check:server', 'type:check:client'].map(name => {
-    if (!scripts[name]) throw new Error(`缺少 scripts.${name}，请保留应用原有类型检查命令。`);
-    return [getBinName('npm'), ['run', name]];
-  });
-  tasks.push(...uiTasks({ eslint: false }));
-  process.exit(await runTasksSerially(tasks));
-}
-
 async function runDefaultLint() {
-  const taskSpecs = [
-    [getBinName('npm'), ['run', 'eslint']],
-    [getBinName('npm'), ['run', 'type:check']],
-  ];
-
-  // Customized type:check remains untouched; ensure full lint still checks UI.
-  taskSpecs.push(...uiTasks({ types: packageScripts()['type:check'] !== UI_TYPECHECK }));
+  const commands = ['npm run eslint', 'npm run type:check'];
 
   if (canRunStylelint()) {
-    taskSpecs.push([getBinName('npm'), ['run', 'stylelint']]);
+    commands.push('npm run stylelint');
   } else {
     console.warn('[lint] Skip stylelint: missing scripts.stylelint or stylelint config');
   }
 
-  process.exit(await runTasksSerially(taskSpecs));
+  const code = await runCommand(getBinName('npx'), ['concurrently', ...commands]);
+  process.exit(code);
 }
 
 async function runSelectiveLint(inputFiles) {
@@ -204,20 +117,15 @@ async function runSelectiveLint(inputFiles) {
     process.exit(0);
   }
 
-  const eslintFiles = normalizedFiles.filter(file => fs.existsSync(path.join(cwd, file)) && isEslintTarget(file) && !isUiFile(file) && !file.startsWith('eslint.mcp-ui.config.'));
-  const stylelintFiles = normalizedFiles.filter(file => fs.existsSync(path.join(cwd, file)) && isStylelintTarget(file));
+  const eslintFiles = normalizedFiles.filter(isEslintTarget);
+  const stylelintFiles = normalizedFiles.filter(isStylelintTarget);
   const typeCheckFiles = normalizedFiles.filter(isTypeCheckTarget);
 
   const clientTypeFiles = [];
   const serverTypeFiles = [];
-  const rootConfigChanged = normalizedFiles.some(file => /^tsconfig(?:\.[^/]*)?\.json$/.test(file));
-  if (rootConfigChanged) { clientTypeFiles.push('config'); serverTypeFiles.push('config'); }
-  let checkUi = rootConfigChanged || normalizedFiles.some(file => isUiFile(file) || file.startsWith('shared/') || file.startsWith('eslint.mcp-ui.config.'));
 
   for (const filePath of typeCheckFiles) {
-    if (isUiFile(filePath)) {
-      checkUi = true;
-    } else if (filePath.startsWith('client/')) {
+    if (filePath.startsWith('client/')) {
       clientTypeFiles.push(filePath);
     } else if (filePath.startsWith('server/')) {
       serverTypeFiles.push(filePath);
@@ -227,46 +135,36 @@ async function runSelectiveLint(inputFiles) {
     }
   }
 
-  const taskSpecs = [];
+  const tasks = [];
 
   if (eslintFiles.length > 0) {
-    taskSpecs.push([getBinName('npx'), ['eslint', '--quiet', ...eslintFiles]]);
+    tasks.push(runCommand(getBinName('npx'), ['eslint', '--quiet', ...eslintFiles]));
   }
 
   if (stylelintFiles.length > 0 && !canRunStylelint()) {
     console.warn('[lint] Skip stylelint: missing scripts.stylelint or stylelint config');
   } else if (stylelintFiles.length > 0) {
-    taskSpecs.push([getBinName('npx'), ['stylelint', '--quiet', ...stylelintFiles]]);
+    tasks.push(runCommand(getBinName('npx'), ['stylelint', '--quiet', ...stylelintFiles]));
   }
 
   if (clientTypeFiles.length > 0) {
-    taskSpecs.push([getBinName('npm'), ['run', 'type:check:client']]);
+    tasks.push(runCommand(getBinName('npm'), ['run', 'type:check:client']));
   }
 
   if (serverTypeFiles.length > 0) {
-    taskSpecs.push([getBinName('npm'), ['run', 'type:check:server']]);
+    tasks.push(runCommand(getBinName('npm'), ['run', 'type:check:server']));
   }
 
-  if (checkUi) taskSpecs.push(...uiTasks());
-
-  if (taskSpecs.length === 0) {
+  if (tasks.length === 0) {
     console.log('[lint] No supported files matched for lint');
     process.exit(0);
   }
 
-  process.exit(await runTasksSerially(taskSpecs));
+  const results = await Promise.all(tasks);
+  process.exit(results.some(code => code !== 0) ? 1 : 0);
 }
 
 async function main() {
-  const args = process.argv.slice(2);
-  const modes = ['--typecheck', '--typecheck-mcp-ui', '--eslint-mcp-ui'];
-  if (args.length && !(args[0] === '--files' && args.length > 1) && !(args.length === 1 && modes.includes(args[0]))) {
-    throw new Error('用法: lint.js [--files <paths...> | --typecheck | --typecheck-mcp-ui | --eslint-mcp-ui]');
-  }
-  if (args[0] === '--files' && args.slice(1).some(arg => arg.startsWith('--'))) throw new Error('--files 不可与其他检查模式混用');
-  if (args.includes('--typecheck')) return runTypeCheck();
-  if (args.includes('--typecheck-mcp-ui')) return process.exit(await runTasksSerially(uiTasks({ eslint: false })));
-  if (args.includes('--eslint-mcp-ui')) return process.exit(await runTasksSerially(uiTasks({ types: false })));
   const files = parseFilesArg(process.argv.slice(2));
   if (files === null) {
     await runDefaultLint();

package/template/tsconfig.node.json

@@ -13,6 +13,5 @@
     "excludeDirectories": ["node_modules/**"]
   },
   "include": ["server/**/*", "shared/**/*.ts"],
-  // MCP UI 是独立浏览器工程，不使用服务端的 TypeScript 配置。
-  "exclude": ["server/mcp/ui", "node_modules", "dist", "client", "source_package", "**/*.spec.ts", "**/*.e2e-spec.ts"],
+  "exclude": ["node_modules", "dist", "client", "source_package", "**/*.spec.ts", "**/*.e2e-spec.ts"],
 }