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

package/dist/index.js

@@ -2380,27 +2380,22 @@ var syncConfig = {
       type: "directory",
       overwrite: true
     },
-    // 1a. 同步 .husky 目录（hook 入口，单行 `npm run precommit`）
+    // 1a. 同步 .husky 目录（hook 入口，可执行 sh 脚本）
     {
       from: "templates/.husky",
       to: ".husky",
       type: "directory",
       overwrite: true
     },
-    // 1b. 合并 husky devDep 到 package.json
-    {
-      from: "templates/package.husky-patch.json",
-      to: "package.json",
-      type: "merge-json"
-    },
-    // 1c. scripts.prepare = husky（npm install 时自动跑，等价于 husky install）
+    // 1b. scripts.prepare：npm install 后自动激活 git hooks（不依赖 husky 库）
+    //     直接写 core.hooksPath，并保底给 pre-commit 加执行位；非 git 仓库下静默退出
     {
       type: "add-script",
       name: "prepare",
-      command: "husky",
+      command: "chmod +x .husky/pre-commit 2>/dev/null; git config core.hooksPath .husky 2>/dev/null || true",
       overwrite: false
     },
-    // 1d. scripts.precommit = pre-commit 真正的执行体（npm run lint + read-logs ×5）
+    // 1c. scripts.precommit = pre-commit 真正的执行体（npm run lint + read-logs ×5）
     {
       type: "add-script",
       name: "precommit",
@@ -2633,28 +2628,24 @@ function cleanupPackageJson(cwd = process.cwd()) {
 import fs7 from "fs";
 import path5 from "path";
 import { spawnSync as spawnSync2 } from "child_process";
-function ensureHuskyInstalled(userProjectRoot) {
+function activateGitHooks(userProjectRoot) {
   if (!fs7.existsSync(path5.join(userProjectRoot, ".git"))) {
     return { action: "skipped-no-git" };
   }
-  const huskyBin = path5.join(userProjectRoot, "node_modules", "husky", "bin.js");
-  if (!fs7.existsSync(huskyBin)) {
-    console.log("[fullstack-cli] \u25CB husky not installed yet; will activate after next `npm install`");
-    return { action: "skipped-no-husky" };
+  const hookFile = path5.join(userProjectRoot, ".husky", "pre-commit");
+  if (!fs7.existsSync(hookFile)) {
+    return { action: "skipped-no-hook-file" };
   }
-  const huskyDir = path5.join(userProjectRoot, ".husky", "_");
-  if (fs7.existsSync(huskyDir)) {
-    return { action: "already-initialized" };
-  }
-  const res = spawnSync2("node", [huskyBin], {
+  fs7.chmodSync(hookFile, 493);
+  const res = spawnSync2("git", ["config", "core.hooksPath", ".husky"], {
     cwd: userProjectRoot,
     stdio: ["ignore", "inherit", "inherit"]
   });
   if (res.status !== 0) {
-    throw new Error(`husky bootstrap exited with ${String(res.status)}`);
+    throw new Error(`git config core.hooksPath exited with ${String(res.status)}`);
   }
-  console.log("[fullstack-cli] \u2713 husky initialized (core.hooksPath set to .husky/)");
-  return { action: "bootstrapped" };
+  console.log("[fullstack-cli] \u2713 git hooks activated (core.hooksPath -> .husky)");
+  return { action: "activated" };
 }
 
 // src/commands/sync/run.handler.ts
@@ -2689,10 +2680,10 @@ async function run2(options) {
       setPermissions(config.permissions, userProjectRoot);
     }
     try {
-      ensureHuskyInstalled(userProjectRoot);
+      activateGitHooks(userProjectRoot);
     } catch (error) {
       const message = error instanceof Error ? error.message : String(error);
-      console.warn(`[fullstack-cli] \u26A0 Failed to bootstrap husky: ${message}`);
+      console.warn(`[fullstack-cli] \u26A0 Failed to activate git hooks: ${message}`);
     }
     console.log("[fullstack-cli] Sync completed successfully \u2705");
   } catch (error) {
@@ -2705,25 +2696,48 @@ function patchUserPackageJson(userProjectRoot) {
   try {
     const pkg2 = readPackageJson(userProjectRoot);
     const lintPatchResult = patchLintScriptForFilesSupport(pkg2);
+    const huskyMigrated = migrateLegacyHuskySetup(pkg2);
+    let needsWrite = false;
+    let logMessage = "";
     if (lintPatchResult === "patched") {
-      writePackageJson(pkg2, userProjectRoot);
-      console.log("[fullstack-cli] \u2713 Patched scripts.lint to support --files");
-      return;
-    }
-    if (lintPatchResult === "already-patched") {
+      needsWrite = true;
+      logMessage = "[fullstack-cli] \u2713 Patched scripts.lint to support --files";
+    } else if (lintPatchResult === "already-patched") {
       console.log("[fullstack-cli] \u25CB scripts.lint already supports --files");
-      return;
-    }
-    if (lintPatchResult === "skipped-custom") {
+    } else 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.1",
+  "version": "1.1.45-alpha.3",
   "description": "CLI tool for fullstack template management",
   "type": "module",
   "main": "dist/index.js",

package/templates/.husky/pre-commit

@@ -1 +1,4 @@
+#!/usr/bin/env sh
+[ "$HUSKY" = "0" ] && exit 0
+export PATH="node_modules/.bin:$PATH"
 npm run precommit

package/templates/package.husky-patch.json

@@ -1,5 +0,0 @@
-{
-  "devDependencies": {
-    "husky": "^9.1.7"
-  }
-}