@lark-apaas/coding-template-nestjs-react-fullstack 0.1.42-alpha.20260917142620 → 0.1.42

package/template/package.json

@@ -20,16 +20,15 @@
     "start": "NODE_ENV=production node main.js",
     "eslint": "eslint . --quiet",
     "stylelint": "stylelint client/src/**/*.css --quiet",
-    "type:check": "concurrently -n \"server,client,mcp-ui\" -c \"blue,green,magenta\" \"npm run type:check:server\" \"npm run type:check:client\" \"npm run type:check:mcp-ui\"",
+    "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/typecheck-mcp-ui.js"
+    "upgrade": "npx -y @lark-apaas/fullstack-cli sync --disable-gen-openapi"
   },
   "dependencies": {
-    "@lark-apaas/fullstack-nestjs-core": "1.1.62-alpha.20260917134431",
+    "@lark-apaas/fullstack-nestjs-core": "^1.1.62",
     "@nestjs/axios": "^4.0.1",
     "@nestjs/cache-manager": "^3.1.3",
     "@nestjs/common": "^10.4.20",
@@ -53,9 +52,9 @@
   },
   "devDependencies": {
     "@hookform/resolvers": "^5.2.2",
-    "@lark-apaas/client-toolkit": "^1.2.70",
-    "@lark-apaas/coding-preset-vite-react": "1.0.24-alpha.20260917134427",
-    "@lark-apaas/fullstack-presets": "1.1.24-alpha.20260917134434",
+    "@lark-apaas/client-toolkit": "^1.2.71",
+    "@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",
     "@radix-ui/react-alert-dialog": "^1.1.15",

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

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 
 const path = require('node:path');
-const fs = require('node:fs');
 const { spawn } = require('node:child_process');
+const fs = require('node:fs');
 
 const cwd = process.cwd();
 
@@ -11,50 +11,30 @@ function getBinName(name) {
 }
 
 function runCommand(command, args) {
-  return new Promise(resolve => {
+  return new Promise((resolve) => {
     const child = spawn(command, args, {
       cwd,
       stdio: 'inherit',
       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, checkDeleted = false) {
+function normalizeProjectFile(filePath) {
   const absolutePath = path.isAbsolute(filePath)
     ? filePath
     : path.resolve(cwd, filePath);
 
   if (!fs.existsSync(absolutePath)) {
-    if (!checkDeleted) {
-      console.warn(`[lint] Skip missing file: ${filePath}`);
-      return null;
-    }
-    console.log(`[lint] Deleted file: ${filePath}; checking affected projects`);
+    console.warn(`[lint] Skip missing file: ${filePath}`);
+    return null;
   }
 
   const relativePath = path.relative(cwd, absolutePath);
-  if (
-    relativePath === '..' ||
-    relativePath.startsWith(`..${path.sep}`) ||
-    path.isAbsolute(relativePath)
-  ) {
+  if (relativePath.startsWith('..')) {
     console.warn(`[lint] Skip file outside project: ${filePath}`);
     return null;
   }
@@ -111,106 +91,25 @@ function canRunStylelint() {
 
   if (!pkg.scripts || !pkg.scripts.stylelint) return false;
 
-  return STYLELINT_CONFIG_FILES.some(file =>
-    fs.existsSync(path.join(cwd, file))
-  );
-}
-
-const UI_DIR = 'server/mcp/ui';
-
-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, aggregate = false } = {}) {
-  const sources = uiSourceFiles();
-  if (!sources.length) return [];
-  const tasks = [];
-  // 只在有 UI 源码时读取聚合命令；普通应用不依赖 MCP 配置或脚本。
-  if (types && aggregate) {
-    const scripts = JSON.parse(fs.readFileSync(path.join(cwd, 'package.json'), 'utf8')).scripts || {};
-    types = !/\bnpm\s+run\s+type:check:mcp-ui(?=[\s"';&|)]|$)/.test(scripts['type:check'] || '');
-  }
-  if (types) tasks.push([getBinName('npm'), ['run', 'type:check:mcp-ui']]);
-  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)));
-    let resolvedConfig = config;
-    if (!resolvedConfig) {
-      try {
-        resolvedConfig =
-          require.resolve('@lark-apaas/fullstack-presets/lib/mcp/eslint-ui.js');
-      } catch {
-        throw new Error(
-          '请升级 @lark-apaas/fullstack-presets 以使用 MCP UI 默认 ESLint 配置，或提供 eslint.mcp-ui.config.cjs'
-        );
-      }
-    }
-    tasks.push([
-      getBinName('npx'),
-      [
-        '--no-install',
-        'eslint',
-        '--config',
-        resolvedConfig,
-        '--quiet',
-        '--max-warnings',
-        '0',
-        ...sources,
-      ],
-    ]);
-  }
-  return tasks;
-}
-
-function isUiFile(file) {
-  return file.startsWith('server/mcp/ui/');
+  return STYLELINT_CONFIG_FILES.some(file => fs.existsSync(path.join(cwd, file)));
 }
 
 async function runDefaultLint() {
-  const taskSpecs = [
-    [getBinName('npm'), ['run', 'eslint']],
-    [getBinName('npm'), ['run', 'type:check']],
-  ];
-
-  taskSpecs.push(...uiTasks({ aggregate: true }));
+  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'
-    );
+    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) {
-  const hasUiSources = uiSourceFiles().length > 0;
   const normalizedFiles = Array.from(
-    new Set(inputFiles.map(file => normalizeProjectFile(file, hasUiSources)).filter(Boolean))
+    new Set(inputFiles.map(normalizeProjectFile).filter(Boolean)),
   );
 
   if (normalizedFiles.length === 0) {
@@ -218,40 +117,15 @@ async function runSelectiveLint(inputFiles) {
     process.exit(0);
   }
 
-  const eslintFiles = normalizedFiles.filter(
-    file =>
-      fs.existsSync(path.join(cwd, file)) &&
-      isEslintTarget(file) &&
-      (!hasUiSources || (!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 = hasUiSources && 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.') ||
-        file === 'package.json'
-    );
 
   for (const filePath of typeCheckFiles) {
-    if (hasUiSources && isUiFile(filePath)) {
-      checkUi = true;
-    } else if (filePath.startsWith('client/')) {
+    if (filePath.startsWith('client/')) {
       clientTypeFiles.push(filePath);
     } else if (filePath.startsWith('server/')) {
       serverTypeFiles.push(filePath);
@@ -261,52 +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'
-    );
+    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);
-  if (args.length === 1 && args[0] === '--eslint-mcp-ui') {
-    process.exit(await runTasksSerially(uiTasks({ types: false })));
-    return;
-  }
-  if (args.length && !(args[0] === '--files' && args.length > 1)) {
-    throw new Error('用法: lint.js [--files <paths...>]');
-  }
-  if (args[0] === '--files' && args.slice(1).some(arg => arg.startsWith('--')))
-    throw new Error('--files 不可与其他检查模式混用');
   const files = parseFilesArg(process.argv.slice(2));
   if (files === null) {
     await runDefaultLint();
@@ -321,7 +179,7 @@ async function main() {
   await runSelectiveLint(files);
 }
 
-main().catch(error => {
+main().catch((error) => {
   const message = error instanceof Error ? error.message : String(error);
   console.error(`[lint] Failed to run lint: ${message}`);
   process.exit(1);

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"],
 }

package/template/scripts/typecheck-mcp-ui.js

@@ -1,32 +0,0 @@
-// MCP UI 是可选浏览器工程；没有源码时跳过，否则直接交给 tsc。
-const fs = require('node:fs');
-const path = require('node:path');
-const { spawnSync } = require('node:child_process');
-
-function hasSource(dir) {
-  if (!fs.existsSync(dir)) return false;
-  return fs.readdirSync(dir, { withFileTypes: true }).some(entry => {
-    if (['node_modules', 'dist'].includes(entry.name)) return false;
-    if (entry.isDirectory()) return hasSource(path.join(dir, entry.name));
-    return entry.isFile() && /\.(?:[cm]?[jt]sx?)$/.test(entry.name);
-  });
-}
-
-if (hasSource('server/mcp/ui')) {
-  // 已有应用的独立 UI 配置继续生效，避免升级覆盖自定义 paths/types。
-  const config = fs.existsSync('server/mcp/ui/tsconfig.json')
-    ? 'server/mcp/ui/tsconfig.json'
-    : 'tsconfig.mcp-ui.json';
-  const result = spawnSync(
-    process.execPath,
-    [
-      require.resolve('typescript/bin/tsc'),
-      '--noEmit',
-      '--project',
-      config,
-    ],
-    { stdio: 'inherit' }
-  );
-  if (result.error) console.error(result.error.message);
-  process.exitCode = result.status ?? 1;
-}

package/template/tsconfig.mcp-ui.json

@@ -1,33 +0,0 @@
-{
-  "compilerOptions": {
-    "target": "ES2020",
-    "module": "ESNext",
-    "moduleResolution": "Bundler",
-    "jsx": "react-jsx",
-    "types": [],
-    "strict": true,
-    "checkJs": true,
-    "lib": [
-      "ES2020",
-      "DOM",
-      "DOM.Iterable"
-    ],
-    "allowJs": true,
-    "skipLibCheck": true,
-    "esModuleInterop": true,
-    "noEmit": true,
-    "baseUrl": ".",
-    "paths": {
-      "@shared/*": [
-        "shared/*"
-      ]
-    }
-  },
-  "include": [
-    "server/mcp/ui/**/*"
-  ],
-  "exclude": [
-    "node_modules",
-    "dist"
-  ]
-}