@lark-apaas/fullstack-cli 1.1.63-alpha.20260826190313 → 1.1.63-alpha.20260827022254

package/dist/index.js

@@ -2514,17 +2514,6 @@ 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",
@@ -2599,19 +2588,6 @@ 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) {
@@ -2791,9 +2767,7 @@ 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
     });
@@ -2812,9 +2786,7 @@ 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");
@@ -2834,9 +2806,7 @@ 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;
   }
 }
@@ -2857,22 +2827,12 @@ 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
-    );
-    return;
-  }
-  if (rule.type === "ensure-dev-dependency") {
-    const packageJsonPath = path5.join(userProjectRoot, "package.json");
-    ensureDevDependency(packageJsonPath, rule.name, rule.version);
+    addScript(packageJsonPath, rule.name, rule.command, rule.overwrite ?? false);
     return;
   }
   if (rule.type === "patch-script") {
     const packageJsonPath = path5.join(userProjectRoot, "package.json");
-    patchScript(packageJsonPath, rule);
+    patchScript(packageJsonPath, rule.name, rule.to, rule.ifStartsWith);
     return;
   }
   if (rule.type === "add-line") {
@@ -2900,12 +2860,7 @@ 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);
@@ -2914,9 +2869,7 @@ 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);
@@ -2924,9 +2877,7 @@ 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);
@@ -2953,9 +2904,7 @@ 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) {
@@ -2965,9 +2914,7 @@ 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);
@@ -3025,34 +2972,7 @@ function addScript(packageJsonPath, name, command, overwrite) {
   fs7.writeFileSync(packageJsonPath, JSON.stringify(pkg2, null, 2) + "\n");
   console.log(`[fullstack-cli] \u2713 scripts.${name}`);
 }
-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;
+function patchScript(packageJsonPath, name, to, ifStartsWith) {
   if (!fs7.existsSync(packageJsonPath)) {
     console.log(`[fullstack-cli] \u25CB package.json (not found)`);
     return;
@@ -3069,8 +2989,7 @@ function patchScript(packageJsonPath, rule) {
       console.log(`[fullstack-cli] \u25CB scripts.${name} (already patched)`);
       return;
     }
-    const matches = rule.ifEquals !== void 0 ? current === rule.ifEquals : current.startsWith(rule.ifStartsWith);
-    if (!matches) {
+    if (!current.startsWith(ifStartsWith)) {
       console.warn(
         `[fullstack-cli] \u26A0 Skipped patching scripts.${name} because it has been customized`
       );
@@ -3081,9 +3000,7 @@ function patchScript(packageJsonPath, rule) {
     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.20260826190313",
+  "version": "1.1.63-alpha.20260827022254",
   "description": "CLI tool for fullstack template management",
   "type": "module",
   "main": "dist/index.js",

package/templates/scripts/build.sh

@@ -154,6 +154,18 @@ if [ -d "$DIST_DIR/client" ]; then
   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

@@ -1,285 +0,0 @@
-'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 resolveInsideProject(projectRoot, configuredPath) {
-  const resolvedPath = path.resolve(projectRoot, configuredPath);
-  const relativePath = path.relative(projectRoot, resolvedPath);
-  if (
-    relativePath === '..' ||
-    relativePath.startsWith(`..${path.sep}`) ||
-    path.isAbsolute(relativePath)
-  ) {
-    return undefined;
-  }
-  return resolvedPath;
-}
-
-function readJsonStringProperty(filePath, propertyName, fallback) {
-  if (!fs.existsSync(filePath)) {
-    return fallback;
-  }
-  const content = fs.readFileSync(filePath, 'utf8');
-  const match = content.match(
-    new RegExp(`"${propertyName}"\\s*:\\s*"([^"\\r\\n]+)"`)
-  );
-  return match?.[1] ?? fallback;
-}
-
-function cleanStaleSwcOutputs(projectRoot) {
-  const nestConfigPath = path.join(projectRoot, 'nest-cli.json');
-  const nestConfig = JSON.parse(fs.readFileSync(nestConfigPath, 'utf8'));
-  const sourceRootName =
-    typeof nestConfig.sourceRoot === 'string' ? nestConfig.sourceRoot : 'src';
-  const tsConfigName =
-    typeof nestConfig.compilerOptions?.tsConfigPath === 'string'
-      ? nestConfig.compilerOptions.tsConfigPath
-      : 'tsconfig.json';
-  const tsConfigPath = resolveInsideProject(projectRoot, tsConfigName);
-  const sourceRoot = resolveInsideProject(projectRoot, sourceRootName);
-  if (!tsConfigPath || !sourceRoot || !fs.existsSync(sourceRoot)) {
-    return 0;
-  }
-
-  const outDirName = readJsonStringProperty(tsConfigPath, 'outDir', 'dist');
-  const rootDirName = readJsonStringProperty(
-    tsConfigPath,
-    'rootDir',
-    sourceRootName
-  );
-  const outDir = resolveInsideProject(projectRoot, outDirName);
-  const rootDir = resolveInsideProject(projectRoot, rootDirName);
-  if (!outDir) {
-    return 0;
-  }
-  const emitRoots = [sourceRoot];
-  if (rootDir && rootDir !== sourceRoot) {
-    emitRoots.push(rootDir);
-  }
-
-  let removed = 0;
-  const pendingDirectories = [sourceRoot];
-  while (pendingDirectories.length > 0) {
-    const currentDirectory = pendingDirectories.pop();
-    for (const entry of fs.readdirSync(currentDirectory, {
-      withFileTypes: true,
-    })) {
-      const sourcePath = path.join(currentDirectory, entry.name);
-      if (entry.isDirectory()) {
-        pendingDirectories.push(sourcePath);
-        continue;
-      }
-      if (!entry.isFile() || entry.name.endsWith('.d.ts')) {
-        continue;
-      }
-
-      const sourceExtension = ['.tsx', '.mts', '.cts', '.ts'].find(extension =>
-        entry.name.endsWith(extension)
-      );
-      if (!sourceExtension) {
-        continue;
-      }
-      const outputExtension =
-        sourceExtension === '.mts'
-          ? '.mjs'
-          : sourceExtension === '.cts'
-            ? '.cjs'
-            : '.js';
-      const declarationExtension =
-        sourceExtension === '.mts'
-          ? '.d.mts'
-          : sourceExtension === '.cts'
-            ? '.d.cts'
-            : '.d.ts';
-      const sourceBasePath = sourcePath.slice(0, -sourceExtension.length);
-      for (const suffix of [
-        outputExtension,
-        `${outputExtension}.map`,
-        declarationExtension,
-        `${declarationExtension}.map`,
-      ]) {
-        const generatedSourceSibling = `${sourceBasePath}${suffix}`;
-        if (fs.existsSync(generatedSourceSibling)) {
-          fs.rmSync(generatedSourceSibling, { force: true });
-          removed += 1;
-        }
-      }
-
-      for (const emitRoot of emitRoots) {
-        const relativeSourcePath = path.relative(emitRoot, sourcePath);
-        if (
-          relativeSourcePath === '..' ||
-          relativeSourcePath.startsWith(`..${path.sep}`) ||
-          path.isAbsolute(relativeSourcePath)
-        ) {
-          continue;
-        }
-
-        const outputBasePath = path.join(
-          outDir,
-          relativeSourcePath.slice(0, -sourceExtension.length)
-        );
-        for (const suffix of [
-          outputExtension,
-          `${outputExtension}.map`,
-          declarationExtension,
-          `${declarationExtension}.map`,
-        ]) {
-          const outputPath = `${outputBasePath}${suffix}`;
-          if (fs.existsSync(outputPath)) {
-            fs.rmSync(outputPath, { force: true });
-            removed += 1;
-          }
-        }
-      }
-    }
-  }
-  return removed;
-}
-
-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;
-  }
-
-  try {
-    const removed = cleanStaleSwcOutputs(projectRoot);
-    console.log(
-      `[miaoda:nest-compiler] MIAODA_NEST_SWC_CLEANUP removed=${removed}`
-    );
-  } catch (error) {
-    console.error(
-      `[miaoda:nest-compiler] MIAODA_NEST_SWC_CLEANUP_FAILED message=${JSON.stringify(error.message)}`
-    );
-  }
-  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 = {
-  cleanStaleSwcOutputs,
-  findMissingSwcDependency,
-  resolveBuilder,
-};