@pubinfo/commitlint 2.1.8 → 2.1.10-beta.1

package/dist/index.d.mts

@@ -20,9 +20,33 @@ declare function createGitMessage(rootPath?: string): boolean;
 declare function runGitMessage(rootPath?: string): boolean;
 //#endregion
 //#region src/init/simple.git.hook.d.ts
+/**
+ * 配置 simple-git-hooks 到 package.json
+ * 注意：此函数只写入配置，不会删除配置
+ */
 declare function runSimpleGitHooks(script?: string, cwd?: string, enabled?: boolean): boolean;
+/**
+ * 执行 npx simple-git-hooks
+ * 会根据 package.json 中的配置安装 hooks 到 .git/hooks/
+ */
 declare function runNpx(cwd?: string): boolean;
-declare function configureGitHooksPath(enabled?: boolean, cwd?: string): boolean;
+/**
+ * 清理已安装的 git hooks 文件
+ * 只删除 .git/hooks 下的 hook 文件，不会修改 package.json
+ */
+declare function removeGitHooks(cwd?: string): boolean;
+/**
+ * 禁用 git hooks（不修改 package.json 配置）
+ * 1. 清理已安装的 hooks 文件
+ * 2. 清除 core.hooksPath 配置（如果有）
+ */
+declare function disableCommitlint(cwd?: string): boolean;
+/**
+ * 启用 git hooks
+ * 1. 清除残留的 hooksPath 配置
+ * 2. 执行 npx simple-git-hooks 重新安装 hooks
+ */
+declare function enableCommitlint(cwd?: string): boolean;
 //#endregion
 //#region src/prompt/index.d.ts
 interface PromptResult {
@@ -40,4 +64,4 @@ declare function isInsideGitRepo(): boolean;
 declare function lintMessage(message: string): Promise<boolean>;
 declare function lintAndReturn(message: string): Promise<string>;
 //#endregion
-export { commitPreset, configureGitHooksPath, createCzConfig, createGitMessage, isCommitlintEnabled, isInsideGitRepo, lintAndReturn, lintMessage, loadCommitConfig, runCzConfig, runGitMessage, runNpx, runPrompt, runSimpleGitHooks };
+export { commitPreset, createCzConfig, createGitMessage, disableCommitlint, enableCommitlint, isCommitlintEnabled, isInsideGitRepo, lintAndReturn, lintMessage, loadCommitConfig, removeGitHooks, runCzConfig, runGitMessage, runNpx, runPrompt, runSimpleGitHooks };

package/dist/index.mjs

@@ -1,3 +1,3 @@
-import { a as configureGitHooksPath, c as createGitMessage, d as runCzConfig, f as isCommitlintEnabled, i as runPrompt, l as runGitMessage, m as loadCommitConfig, n as lintMessage, o as runNpx, p as commitPreset, r as isInsideGitRepo, s as runSimpleGitHooks, t as lintAndReturn, u as createCzConfig } from "./lint.message.mjs";
+import { a as disableCommitlint, c as runNpx, d as runGitMessage, f as createCzConfig, g as loadCommitConfig, h as commitPreset, i as runPrompt, l as runSimpleGitHooks, m as isCommitlintEnabled, n as lintMessage, o as enableCommitlint, p as runCzConfig, r as isInsideGitRepo, s as removeGitHooks, t as lintAndReturn, u as createGitMessage } from "./lint.message.mjs";
 
-export { commitPreset, configureGitHooksPath, createCzConfig, createGitMessage, isCommitlintEnabled, isInsideGitRepo, lintAndReturn, lintMessage, loadCommitConfig, runCzConfig, runGitMessage, runNpx, runPrompt, runSimpleGitHooks };
+export { commitPreset, createCzConfig, createGitMessage, disableCommitlint, enableCommitlint, isCommitlintEnabled, isInsideGitRepo, lintAndReturn, lintMessage, loadCommitConfig, removeGitHooks, runCzConfig, runGitMessage, runNpx, runPrompt, runSimpleGitHooks };

package/dist/lint.message.mjs

@@ -337,6 +337,10 @@ function runGitMessage(rootPath = process.cwd()) {
 
 //#endregion
 //#region src/init/simple.git.hook.ts
+/**
+* 配置 simple-git-hooks 到 package.json
+* 注意：此函数只写入配置，不会删除配置
+*/
 function runSimpleGitHooks(script = "pubinfo-commit", cwd = process.cwd(), enabled = true) {
 	if (!enabled) return false;
 	const pkgPath = resolve(cwd, "package.json");
@@ -347,7 +351,6 @@ function runSimpleGitHooks(script = "pubinfo-commit", cwd = process.cwd(), enabl
 		const hooks = json["simple-git-hooks"] || {};
 		const desiredPre = "pnpm lint-staged";
 		const desiredCommitMsg = `pnpm exec ${script} --edit $1`;
-		json["simple-git-hooks"] = hooks;
 		if (hooks["pre-commit"] !== desiredPre) hooks["pre-commit"] = desiredPre;
 		if (hooks["commit-msg"] !== desiredCommitMsg) hooks["commit-msg"] = desiredCommitMsg;
 		json["simple-git-hooks"] = hooks;
@@ -357,6 +360,10 @@ function runSimpleGitHooks(script = "pubinfo-commit", cwd = process.cwd(), enabl
 		return false;
 	}
 }
+/**
+* 执行 npx simple-git-hooks
+* 会根据 package.json 中的配置安装 hooks 到 .git/hooks/
+*/
 function runNpx(cwd = process.cwd()) {
 	try {
 		execSync("npx simple-git-hooks", {
@@ -368,22 +375,58 @@ function runNpx(cwd = process.cwd()) {
 		return false;
 	}
 }
-function configureGitHooksPath(enabled = true, cwd = process.cwd()) {
+/**
+* 清理已安装的 git hooks 文件
+* 只删除 .git/hooks 下的 hook 文件，不会修改 package.json
+*/
+function removeGitHooks(cwd = process.cwd()) {
+	try {
+		const hooksDir = resolve(cwd, ".git", "hooks");
+		const preCommit = resolve(hooksDir, "pre-commit");
+		const commitMsg = resolve(hooksDir, "commit-msg");
+		if (fs.existsSync(preCommit)) fs.removeSync(preCommit);
+		if (fs.existsSync(commitMsg)) fs.removeSync(commitMsg);
+		return true;
+	} catch {
+		return false;
+	}
+}
+/**
+* 禁用 git hooks（不修改 package.json 配置）
+* 1. 清理已安装的 hooks 文件
+* 2. 清除 core.hooksPath 配置（如果有）
+*/
+function disableCommitlint(cwd = process.cwd()) {
 	try {
-		if (enabled) {
+		removeGitHooks(cwd);
+		try {
 			execSync("git config --unset core.hooksPath", {
 				cwd,
 				stdio: "ignore"
 			});
-			return true;
-		}
-		execSync("git config core.hooksPath /dev/null", {
-			cwd,
-			stdio: "ignore"
-		});
+		} catch {}
+		return true;
+	} catch {
+		return false;
+	}
+}
+/**
+* 启用 git hooks
+* 1. 清除残留的 hooksPath 配置
+* 2. 执行 npx simple-git-hooks 重新安装 hooks
+*/
+function enableCommitlint(cwd = process.cwd()) {
+	try {
+		try {
+			execSync("git config --unset core.hooksPath", {
+				cwd,
+				stdio: "ignore"
+			});
+		} catch {}
+		runNpx(cwd);
 		return true;
 	} catch {
-		return enabled;
+		return false;
 	}
 }
 
@@ -464,4 +507,4 @@ async function lintAndReturn(message) {
 }
 
 //#endregion
-export { configureGitHooksPath as a, createGitMessage as c, runCzConfig as d, isCommitlintEnabled as f, runPrompt as i, runGitMessage as l, loadCommitConfig as m, lintMessage as n, runNpx as o, commitPreset as p, isInsideGitRepo as r, runSimpleGitHooks as s, lintAndReturn as t, createCzConfig as u };
+export { disableCommitlint as a, runNpx as c, runGitMessage as d, createCzConfig as f, loadCommitConfig as g, commitPreset as h, runPrompt as i, runSimpleGitHooks as l, isCommitlintEnabled as m, lintMessage as n, enableCommitlint as o, runCzConfig as p, isInsideGitRepo as r, removeGitHooks as s, lintAndReturn as t, createGitMessage as u };

package/dist/run.mjs

@@ -1,4 +1,4 @@
-import { a as configureGitHooksPath, c as createGitMessage, d as runCzConfig, f as isCommitlintEnabled, i as runPrompt, l as runGitMessage, n as lintMessage, o as runNpx, r as isInsideGitRepo, s as runSimpleGitHooks, u as createCzConfig } from "./lint.message.mjs";
+import { a as disableCommitlint, c as runNpx, d as runGitMessage, f as createCzConfig, i as runPrompt, l as runSimpleGitHooks, m as isCommitlintEnabled, n as lintMessage, p as runCzConfig, r as isInsideGitRepo, u as createGitMessage } from "./lint.message.mjs";
 import { spawnSync } from "node:child_process";
 import process from "node:process";
 import fs from "node:fs";
@@ -6,7 +6,7 @@ import { defineCommand, runMain as runMain$1 } from "citty";
 
 //#region package.json
 var name = "@pubinfo/commitlint";
-var version = "2.1.8";
+var version = "2.1.10-beta.1";
 var description = "commitlint config for Pubinfo projects";
 
 //#endregion
@@ -51,14 +51,10 @@ const main = defineCommand({
 			if (init) {
 				const cwd = process.cwd();
 				if (!enabled) {
-					const removedDefault = runSimpleGitHooks("pubinfo-commit", cwd, false);
-					const removedCli = runSimpleGitHooks("pubinfo commit", cwd, false);
-					const disabledHooks = configureGitHooksPath(false, cwd);
-					if (removedDefault || removedCli || disabledHooks) console.log("[pubinfo-commit] 检测到 pubinfo.config 中已关闭 commitlint，已停用 git hooks。");
+					if (disableCommitlint(cwd)) console.log("[pubinfo-commit] 检测到 pubinfo.config 中已关闭 commitlint，已停用 git hooks。");
 					else console.log("[pubinfo-commit] 检测到 pubinfo.config 中已关闭 commitlint，跳过初始化。");
 					return;
 				}
-				configureGitHooksPath(true, cwd);
 				const pubinfoDir = `${cwd}/.pubinfo`;
 				if (!fs.existsSync(pubinfoDir)) fs.mkdirSync(pubinfoDir);
 				const gitMessageStatus = createGitMessage();
@@ -78,7 +74,7 @@ const main = defineCommand({
 			}
 			if (edit) {
 				if (!enabled) {
-					configureGitHooksPath(false, process.cwd());
+					disableCommitlint(process.cwd());
 					return;
 				}
 				try {
@@ -95,7 +91,7 @@ const main = defineCommand({
 			}
 			if (!enabled) {
 				console.log("[pubinfo-commit] commitlint 已关闭，交互模式不可用。");
-				configureGitHooksPath(false, process.cwd());
+				disableCommitlint(process.cwd());
 				return;
 			}
 			const result = await runPrompt();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pubinfo/commitlint",
   "type": "module",
-  "version": "2.1.8",
+  "version": "2.1.10-beta.1",
   "description": "commitlint config for Pubinfo projects",
   "exports": {
     ".": "./dist/index.mjs"