@lark-apaas/fullstack-cli 1.1.45-alpha.3 → 1.1.45-alpha.4

package/dist/index.js

@@ -2636,16 +2636,32 @@ function activateGitHooks(userProjectRoot) {
   if (!fs7.existsSync(hookFile)) {
     return { action: "skipped-no-hook-file" };
   }
-  fs7.chmodSync(hookFile, 493);
-  const res = spawnSync2("git", ["config", "core.hooksPath", ".husky"], {
+  let changed = false;
+  const currentMode = fs7.statSync(hookFile).mode & 511;
+  if ((currentMode & 73) !== 73) {
+    fs7.chmodSync(hookFile, 493);
+    changed = true;
+  }
+  const probe = spawnSync2("git", ["config", "--get", "core.hooksPath"], {
     cwd: userProjectRoot,
-    stdio: ["ignore", "inherit", "inherit"]
+    stdio: ["ignore", "pipe", "ignore"]
   });
-  if (res.status !== 0) {
-    throw new Error(`git config core.hooksPath exited with ${String(res.status)}`);
+  const currentHooksPath = probe.stdout ? probe.stdout.toString().trim() : "";
+  if (currentHooksPath !== ".husky") {
+    const res = spawnSync2("git", ["config", "core.hooksPath", ".husky"], {
+      cwd: userProjectRoot,
+      stdio: ["ignore", "inherit", "inherit"]
+    });
+    if (res.status !== 0) {
+      throw new Error(`git config core.hooksPath exited with ${String(res.status)}`);
+    }
+    changed = true;
   }
-  console.log("[fullstack-cli] \u2713 git hooks activated (core.hooksPath -> .husky)");
-  return { action: "activated" };
+  if (changed) {
+    console.log("[fullstack-cli] \u2713 git hooks activated (core.hooksPath -> .husky)");
+    return { action: "activated" };
+  }
+  return { action: "already-active" };
 }
 
 // src/commands/sync/run.handler.ts
@@ -2696,48 +2712,25 @@ function patchUserPackageJson(userProjectRoot) {
   try {
     const pkg2 = readPackageJson(userProjectRoot);
     const lintPatchResult = patchLintScriptForFilesSupport(pkg2);
-    const huskyMigrated = migrateLegacyHuskySetup(pkg2);
-    let needsWrite = false;
-    let logMessage = "";
     if (lintPatchResult === "patched") {
-      needsWrite = true;
-      logMessage = "[fullstack-cli] \u2713 Patched scripts.lint to support --files";
-    } else if (lintPatchResult === "already-patched") {
+      writePackageJson(pkg2, userProjectRoot);
+      console.log("[fullstack-cli] \u2713 Patched scripts.lint to support --files");
+      return;
+    }
+    if (lintPatchResult === "already-patched") {
       console.log("[fullstack-cli] \u25CB scripts.lint already supports --files");
-    } else if (lintPatchResult === "skipped-custom") {
+      return;
+    }
+    if (lintPatchResult === "skipped-custom") {
       console.warn(
         "[fullstack-cli] \u26A0 Skipped patching scripts.lint because it has been customized"
       );
     }
-    if (huskyMigrated) {
-      needsWrite = true;
-    }
-    if (needsWrite) {
-      writePackageJson(pkg2, userProjectRoot);
-      if (logMessage) console.log(logMessage);
-    }
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);
     console.warn(`[fullstack-cli] \u26A0 Could not patch package.json: ${message}`);
   }
 }
-function migrateLegacyHuskySetup(pkg2) {
-  let changed = false;
-  const newPrepare = "chmod +x .husky/pre-commit 2>/dev/null; git config core.hooksPath .husky 2>/dev/null || true";
-  const scripts = pkg2.scripts;
-  if (scripts && scripts.prepare === "husky") {
-    scripts.prepare = newPrepare;
-    console.log("[fullstack-cli] \u2713 Migrated scripts.prepare from husky to native git config");
-    changed = true;
-  }
-  const devDeps = pkg2.devDependencies;
-  if (devDeps && devDeps.husky) {
-    delete devDeps.husky;
-    console.log("[fullstack-cli] \u2713 Removed legacy husky devDependency");
-    changed = true;
-  }
-  return changed;
-}
 async function syncRule(rule, pluginRoot, userProjectRoot) {
   if (rule.type === "delete-file" || rule.type === "delete-directory") {
     const destPath2 = path6.join(userProjectRoot, rule.to);

package/package.json

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

package/templates/scripts/hooks/run-precommit.js

@@ -3,26 +3,16 @@
 'use strict';
 
 const { spawnSync } = require('node:child_process');
-const path = require('node:path');
 
 const SEP = '  ' + '─'.repeat(36);
-const LOG_DIR = process.env.FULLSTACK_LOG_DIR || '/tmp';
-const READ_LOG_TYPES = ['server-std', 'client-std'];
 
-function logFileFor(type) {
-  return type.endsWith('-std') ? type.slice(0, -4) + '.std.log' : type + '.log';
-}
-
-function failAndExit(step, body, extraTip) {
+function failAndExit(step, body) {
   process.stderr.write('\n✗ pre-commit failed: ' + step + '\n');
   process.stderr.write(SEP + '\n');
   if (body && body.length > 0) {
     process.stderr.write(body.replace(/\s+$/, '') + '\n');
   }
   process.stderr.write(SEP + '\n');
-  if (extraTip) {
-    process.stderr.write('  tip: ' + extraTip + '\n');
-  }
   process.stderr.write('  bypass: git commit --no-verify\n');
   process.exit(1);
 }
@@ -44,43 +34,4 @@ function runLint() {
   }
 }
 
-function runReadLogsCheck() {
-  for (const type of READ_LOG_TYPES) {
-    const res = spawnSync(
-      'npx',
-      ['--no-install', 'fullstack-cli', 'read-logs', '--dir', LOG_DIR, '--type', type, '--max-lines', '200'],
-      { stdio: ['ignore', 'pipe', 'pipe'], env: process.env }
-    );
-
-    // 读不到日志文件、CLI 不存在或其他执行错误都不阻断 commit
-    if (res.error) continue;
-    if (res.status !== 0) continue;
-
-    const stdout = res.stdout ? res.stdout.toString() : '';
-    const lines = stdout.split('\n').map((s) => s.trim()).filter(Boolean);
-    if (lines.length === 0) continue;
-
-    let parsed;
-    try {
-      parsed = JSON.parse(lines[lines.length - 1]);
-    } catch (_) {
-      continue;
-    }
-
-    if (parsed && parsed.hasError === true) {
-      const logs = Array.isArray(parsed.logs) ? parsed.logs : [];
-      const preview = logs
-        .slice(-10)
-        .map((entry) => (typeof entry === 'string' ? entry : JSON.stringify(entry)))
-        .join('\n');
-      failAndExit(
-        'read-logs[' + type + ']',
-        preview,
-        '若为历史 session 残留，可 rm ' + path.join(LOG_DIR, logFileFor(type)) + ' 后重试'
-      );
-    }
-  }
-}
-
 runLint();
-runReadLogsCheck();