@pubinfo/commitlint 2.0.8-beta.2 → 2.0.8

package/dist/index.d.ts

@@ -22,6 +22,7 @@ declare function runGitMessage(rootPath?: string): boolean;
 //#region src/init/simple.git.hook.d.ts
 declare function runSimpleGitHooks(script?: string, cwd?: string, enabled?: boolean): boolean;
 declare function runNpx(cwd?: string): boolean;
+declare function configureGitHooksPath(enabled?: boolean, cwd?: string): boolean;
 //#endregion
 //#region src/prompt/index.d.ts
 interface PromptResult {
@@ -39,4 +40,4 @@ declare function isInsideGitRepo(): boolean;
 declare function lintMessage(message: string): Promise<boolean>;
 declare function lintAndReturn(message: string): Promise<string>;
 //#endregion
-export { commitPreset, createCzConfig, createGitMessage, isCommitlintEnabled, isInsideGitRepo, lintAndReturn, lintMessage, loadCommitConfig, runCzConfig, runGitMessage, runNpx, runPrompt, runSimpleGitHooks };
+export { commitPreset, configureGitHooksPath, createCzConfig, createGitMessage, isCommitlintEnabled, isInsideGitRepo, lintAndReturn, lintMessage, loadCommitConfig, runCzConfig, runGitMessage, runNpx, runPrompt, runSimpleGitHooks };

package/dist/index.js

@@ -1,3 +1,3 @@
-import { commitPreset, createCzConfig, createGitMessage, isCommitlintEnabled, isInsideGitRepo, lintAndReturn, lintMessage, loadCommitConfig, runCzConfig, runGitMessage, runNpx, runPrompt, runSimpleGitHooks } from "./lint.message-qcqvSiOT.js";
+import { commitPreset, configureGitHooksPath, createCzConfig, createGitMessage, isCommitlintEnabled, isInsideGitRepo, lintAndReturn, lintMessage, loadCommitConfig, runCzConfig, runGitMessage, runNpx, runPrompt, runSimpleGitHooks } from "./lint.message-CLvOoZVL.js";
 
-export { commitPreset, createCzConfig, createGitMessage, isCommitlintEnabled, isInsideGitRepo, lintAndReturn, lintMessage, loadCommitConfig, runCzConfig, runGitMessage, runNpx, runPrompt, runSimpleGitHooks };
+export { commitPreset, configureGitHooksPath, createCzConfig, createGitMessage, isCommitlintEnabled, isInsideGitRepo, lintAndReturn, lintMessage, loadCommitConfig, runCzConfig, runGitMessage, runNpx, runPrompt, runSimpleGitHooks };

package/dist/{lint.message-qcqvSiOT.js → lint.message-CLvOoZVL.js}

@@ -2287,6 +2287,7 @@ function runGitMessage(rootPath = process$1.cwd()) {
 //#region src/init/simple.git.hook.ts
 var import_lib = /* @__PURE__ */ __toESM(require_lib(), 1);
 function runSimpleGitHooks(script = "pubinfo-commit", cwd$1 = process$1.cwd(), enabled = true) {
+	if (!enabled) return false;
 	const pkgPath = resolve(cwd$1, "package.json");
 	if (!import_lib.default.existsSync(pkgPath)) return false;
 	try {
@@ -2295,23 +2296,6 @@ function runSimpleGitHooks(script = "pubinfo-commit", cwd$1 = process$1.cwd(), e
 		const hooks = json["simple-git-hooks"] || {};
 		const desiredPre = "pnpm lint-staged";
 		const desiredCommitMsg = `pnpm exec ${script} --edit $1`;
-		if (!enabled) {
-			let changed = false;
-			if (hooks["pre-commit"] === desiredPre) {
-				delete hooks["pre-commit"];
-				changed = true;
-			}
-			if (hooks["commit-msg"] === desiredCommitMsg) {
-				delete hooks["commit-msg"];
-				changed = true;
-			}
-			if (!Object.keys(hooks).length && json["simple-git-hooks"]) {
-				delete json["simple-git-hooks"];
-				changed = true;
-			} else if (changed) json["simple-git-hooks"] = hooks;
-			if (changed) import_lib.default.writeFileSync(pkgPath, `${JSON.stringify(json, null, 2)}\n`, "utf8");
-			return changed;
-		}
 		json["simple-git-hooks"] = hooks;
 		if (hooks["pre-commit"] !== desiredPre) hooks["pre-commit"] = desiredPre;
 		if (hooks["commit-msg"] !== desiredCommitMsg) hooks["commit-msg"] = desiredCommitMsg;
@@ -2333,6 +2317,24 @@ function runNpx(cwd$1 = process$1.cwd()) {
 		return false;
 	}
 }
+function configureGitHooksPath(enabled = true, cwd$1 = process$1.cwd()) {
+	try {
+		if (enabled) {
+			execSync("git config --unset core.hooksPath", {
+				cwd: cwd$1,
+				stdio: "ignore"
+			});
+			return true;
+		}
+		execSync("git config core.hooksPath /dev/null", {
+			cwd: cwd$1,
+			stdio: "ignore"
+		});
+		return true;
+	} catch {
+		return enabled;
+	}
+}
 
 //#endregion
 //#region src/prompt/index.ts
@@ -2402,4 +2404,4 @@ async function lintAndReturn(message) {
 }
 
 //#endregion
-export { commitPreset, createCzConfig, createGitMessage, isCommitlintEnabled, isInsideGitRepo, lintAndReturn, lintMessage, loadCommitConfig, runCzConfig, runGitMessage, runNpx, runPrompt, runSimpleGitHooks };
+export { commitPreset, configureGitHooksPath, createCzConfig, createGitMessage, isCommitlintEnabled, isInsideGitRepo, lintAndReturn, lintMessage, loadCommitConfig, runCzConfig, runGitMessage, runNpx, runPrompt, runSimpleGitHooks };

package/dist/run.js

@@ -1,4 +1,4 @@
-import { createCzConfig, createGitMessage, isCommitlintEnabled, isInsideGitRepo, lintMessage, runCzConfig, runGitMessage, runNpx, runPrompt, runSimpleGitHooks } from "./lint.message-qcqvSiOT.js";
+import { configureGitHooksPath, createCzConfig, createGitMessage, isCommitlintEnabled, isInsideGitRepo, lintMessage, runCzConfig, runGitMessage, runNpx, runPrompt, runSimpleGitHooks } from "./lint.message-CLvOoZVL.js";
 import process from "node:process";
 import fs from "node:fs";
 import { defineCommand, runMain as runMain$1 } from "citty";
@@ -6,7 +6,7 @@ import { defineCommand, runMain as runMain$1 } from "citty";
 //#region package.json
 var name = "@pubinfo/commitlint";
 var type = "module";
-var version = "2.0.8-beta.2";
+var version = "2.0.8";
 var description = "commitlint config for Pubinfo projects";
 var exports = { ".": "./dist/index.js" };
 var main$1 = "./dist/index.js";
@@ -84,12 +84,12 @@ const main = defineCommand({
 			if (!enabled) {
 				const removedDefault = runSimpleGitHooks("pubinfo-commit", cwd, false);
 				const removedCli = runSimpleGitHooks("pubinfo commit", cwd, false);
-				if (removedDefault || removedCli) {
-					runNpx(cwd);
-					console.log("[pubinfo-commit] 检测到 pubinfo.config 中已关闭 commitlint，已清理 simple-git-hooks 配置。");
-				} else console.log("[pubinfo-commit] 检测到 pubinfo.config 中已关闭 commitlint，跳过初始化。");
+				const disabledHooks = configureGitHooksPath(false, cwd);
+				if (removedDefault || removedCli || disabledHooks) 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();
@@ -108,7 +108,10 @@ const main = defineCommand({
 			return;
 		}
 		if (edit) {
-			if (!enabled) return;
+			if (!enabled) {
+				configureGitHooksPath(false, process.cwd());
+				return;
+			}
 			try {
 				const raw = fs.readFileSync(String(edit), "utf8").trim();
 				if (!raw) {
@@ -121,6 +124,11 @@ const main = defineCommand({
 			}
 			return;
 		}
+		if (!enabled) {
+			console.log("[pubinfo-commit] commitlint 已关闭，交互模式不可用。");
+			configureGitHooksPath(false, process.cwd());
+			return;
+		}
 		const result = await runPrompt();
 		if (!result) {
 			console.error("[pubinfo-commit] 未找到 cz-git 或交互被中断");

package/package.json

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