@huaiyou/hooks-git 2.2.3 → 2.2.4

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @huaiyou/hooks-git
 
+## 2.2.4
+
+### Patch Changes
+
+- Fix commitmsg hook - properly capture and translate output
+
 ## 2.2.3
 
 ### Patch Changes

package/dist/cli.cjs

@@ -14,7 +14,7 @@ const cac__default = /*#__PURE__*/_interopDefaultCompat(cac);
 const fs__default = /*#__PURE__*/_interopDefaultCompat(fs);
 const picocolors__default = /*#__PURE__*/_interopDefaultCompat(picocolors);
 
-const version = "2.2.3";
+const version = "2.2.4";
 
 const logger = {
   /**
@@ -120,7 +120,7 @@ const init = async () => {
   logger.info("Adding hooks...");
   const huskyDir = node_path.resolve(process.cwd(), ".husky");
   const commitMsgPath = node_path.resolve(huskyDir, "commit-msg");
-  const commitMsgContent = `npx --no -- hy-hooks-commitlint commitlint --edit \${1}
+  const commitMsgContent = `npx --no -- hy-hooks-commitlint --edit \${1}
 `;
   await fs__default.outputFile(commitMsgPath, commitMsgContent, { mode: 493 });
   const preCommitPath = node_path.resolve(huskyDir, "pre-commit");

package/dist/cli.mjs

@@ -6,7 +6,7 @@ import { consola } from 'consola';
 import { execa } from 'execa';
 import picocolors from 'picocolors';
 
-const version = "2.2.3";
+const version = "2.2.4";
 
 const logger = {
   /**
@@ -112,7 +112,7 @@ const init = async () => {
   logger.info("Adding hooks...");
   const huskyDir = resolve(process.cwd(), ".husky");
   const commitMsgPath = resolve(huskyDir, "commit-msg");
-  const commitMsgContent = `npx --no -- hy-hooks-commitlint commitlint --edit \${1}
+  const commitMsgContent = `npx --no -- hy-hooks-commitlint --edit \${1}
 `;
   await fs.outputFile(commitMsgPath, commitMsgContent, { mode: 493 });
   const preCommitPath = resolve(huskyDir, "pre-commit");

package/dist/wrappers/cli.cjs

@@ -1,63 +1,9 @@
 #!/usr/bin/env node
 'use strict';
 
-const cac = require('cac');
 const execa = require('execa');
 
-function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }
-
-const cac__default = /*#__PURE__*/_interopDefaultCompat(cac);
-
 const errorMessages$1 = {
-  // 类型相关
-  "type must be one of": "\u63D0\u4EA4\u7C7B\u578B\u5FC5\u987B\u662F\u4EE5\u4E0B\u4E4B\u4E00",
-  "type must not be empty": "\u63D0\u4EA4\u7C7B\u578B\u4E0D\u80FD\u4E3A\u7A7A",
-  "type must be lower case": "\u63D0\u4EA4\u7C7B\u578B\u5FC5\u987B\u662F\u5C0F\u5199",
-  // 主题相关
-  "subject must not be empty": "\u63D0\u4EA4\u4E3B\u9898\u4E0D\u80FD\u4E3A\u7A7A",
-  "subject must not end with full stop": "\u63D0\u4EA4\u4E3B\u9898\u4E0D\u80FD\u4EE5\u53E5\u53F7\u7ED3\u5C3E",
-  "subject must be lower case": "\u63D0\u4EA4\u4E3B\u9898\u5FC5\u987B\u662F\u5C0F\u5199",
-  // 长度相关
-  "header must not be longer than": "\u63D0\u4EA4\u5934\u957F\u5EA6\u4E0D\u80FD\u8D85\u8FC7",
-  "body lines must not be longer than": "\u63D0\u4EA4\u6B63\u6587\u6BCF\u884C\u957F\u5EA6\u4E0D\u80FD\u8D85\u8FC7",
-  "footer lines must not be longer than": "\u63D0\u4EA4\u811A\u6CE8\u6BCF\u884C\u957F\u5EA6\u4E0D\u80FD\u8D85\u8FC7",
-  // 通用
-  "must match the format": "\u5FC5\u987B\u5339\u914D\u683C\u5F0F",
-  "must be": "\u5FC5\u987B\u662F"
-};
-function translateError$1(message) {
-  for (const [en, zh] of Object.entries(errorMessages$1)) {
-    if (message.includes(en)) {
-      return message.replace(en, zh);
-    }
-  }
-  return message;
-}
-async function runCommitlint(args) {
-  try {
-    await execa.execa("commitlint", args, {
-      stdio: "inherit",
-      reject: false
-    });
-  } catch (error) {
-    const err = error;
-    if (err.stdout) {
-      const translated = translateError$1(err.stdout);
-      process.stderr.write(translated + "\n");
-    }
-    if (err.stderr) {
-      const translated = translateError$1(err.stderr);
-      process.stderr.write(translated + "\n");
-    }
-    if (err.message) {
-      const translated = translateError$1(err.message);
-      process.stderr.write(translated + "\n");
-    }
-    process.exit(1);
-  }
-}
-
-const errorMessages = {
   // 配置相关
   "Failed to read config from file": "\u65E0\u6CD5\u8BFB\u53D6\u914D\u7F6E\u6587\u4EF6",
   "could not find any valid configuration": "\u627E\u4E0D\u5230\u6709\u6548\u7684\u914D\u7F6E",
@@ -78,6 +24,77 @@ const errorMessages = {
   passed: "\u901A\u8FC7",
   skipped: "\u8DF3\u8FC7"
 };
+function translateError$1(message) {
+  let translated = message;
+  for (const [en, zh] of Object.entries(errorMessages$1)) {
+    translated = translated.replace(new RegExp(en, "g"), zh);
+  }
+  return translated;
+}
+function translateLine$1(line) {
+  if (!line.trim() || /^[\s─│┌┐└┘]+$/g.test(line)) {
+    return line;
+  }
+  return translateError$1(line);
+}
+async function runLintStaged() {
+  try {
+    const { stdout, stderr } = await execa.execa("lint-staged", [], {
+      stdio: "pipe"
+    });
+    if (stdout) {
+      const lines = stdout.split("\n");
+      lines.forEach((line) => {
+        process.stdout.write(translateLine$1(line) + "\n");
+      });
+    }
+    if (stderr) {
+      const lines = stderr.split("\n");
+      lines.forEach((line) => {
+        process.stderr.write(translateLine$1(line) + "\n");
+      });
+    }
+  } catch (error) {
+    const err = error;
+    if (err.stdout) {
+      const lines = err.stdout.split("\n");
+      lines.forEach((line) => {
+        process.stdout.write(translateLine$1(line) + "\n");
+      });
+    }
+    if (err.stderr) {
+      const lines = err.stderr.split("\n");
+      lines.forEach((line) => {
+        process.stderr.write(translateLine$1(line) + "\n");
+      });
+    }
+    process.exit(1);
+  }
+}
+
+const errorMessages = {
+  // 类型相关
+  "type must be one of": "\u63D0\u4EA4\u7C7B\u578B\u5FC5\u987B\u662F\u4EE5\u4E0B\u4E4B\u4E00",
+  "type must not be empty": "\u63D0\u4EA4\u7C7B\u578B\u4E0D\u80FD\u4E3A\u7A7A",
+  "type must be lower case": "\u63D0\u4EA4\u7C7B\u578B\u5FC5\u987B\u662F\u5C0F\u5199",
+  "may not be empty": "\u4E0D\u80FD\u4E3A\u7A7A",
+  // 主题相关
+  "subject must not be empty": "\u63D0\u4EA4\u4E3B\u9898\u4E0D\u80FD\u4E3A\u7A7A",
+  "subject must not end with full stop": "\u63D0\u4EA4\u4E3B\u9898\u4E0D\u80FD\u4EE5\u53E5\u53F7\u7ED3\u5C3E",
+  "subject must be lower case": "\u63D0\u4EA4\u4E3B\u9898\u5FC5\u987B\u662F\u5C0F\u5199",
+  // 长度相关
+  "header must not be longer than": "\u63D0\u4EA4\u5934\u957F\u5EA6\u4E0D\u80FD\u8D85\u8FC7",
+  "body lines must not be longer than": "\u63D0\u4EA4\u6B63\u6587\u6BCF\u884C\u957F\u5EA6\u4E0D\u80FD\u8D85\u8FC7",
+  "footer lines must not be longer than": "\u63D0\u4EA4\u811A\u6CE8\u6BCF\u884C\u957F\u5EA6\u4E0D\u80FD\u8D85\u8FC7",
+  // 通用
+  "must match the format": "\u5FC5\u987B\u5339\u914D\u683C\u5F0F",
+  "must be": "\u5FC5\u987B\u662F",
+  "may not": "\u4E0D\u80FD",
+  "found": "\u53D1\u73B0",
+  "problems": "\u4E2A\u95EE\u9898",
+  "warnings": "\u4E2A\u8B66\u544A",
+  "Get help": "\u83B7\u53D6\u5E2E\u52A9"
+};
 function translateError(message) {
   let translated = message;
   for (const [en, zh] of Object.entries(errorMessages)) {
@@ -86,14 +103,14 @@ function translateError(message) {
   return translated;
 }
 function translateLine(line) {
-  if (!line.trim() || /^[\s─│┌┐└┘]+$/g.test(line)) {
+  if (!line.trim() || /^[\s⧗│┌┐└┘✖✓ⓘ]+$/g.test(line)) {
     return line;
   }
   return translateError(line);
 }
-async function runLintStaged() {
+async function runCommitlint(args) {
   try {
-    const { stdout, stderr } = await execa.execa("lint-staged", [], {
+    const { stdout, stderr } = await execa.execa("commitlint", args, {
       stdio: "pipe"
     });
     if (stdout) {
@@ -122,16 +139,19 @@ async function runLintStaged() {
         process.stderr.write(translateLine(line) + "\n");
       });
     }
-    process.exit(1);
+    process.exit(err.exitCode || 1);
   }
 }
 
-const cli = cac__default("hy-hooks-git-wrapper");
-cli.command("commitlint [...args]", "Run commitlint with Chinese error messages").action(async (args) => {
-  await runCommitlint(args);
-});
-cli.command("lint-staged", "Run lint-staged with Chinese error messages").action(async () => {
-  await runLintStaged();
-});
-cli.help();
-cli.parse();
+const args = process.argv.slice(2);
+if (args[0] === "lint-staged") {
+  runLintStaged().catch((error) => {
+    console.error(error);
+    process.exit(1);
+  });
+} else {
+  runCommitlint(args).catch((error) => {
+    console.error(error);
+    process.exit(1);
+  });
+}

package/dist/wrappers/cli.mjs

@@ -1,57 +1,7 @@
 #!/usr/bin/env node
-import cac from 'cac';
 import { execa } from 'execa';
 
 const errorMessages$1 = {
-  // 类型相关
-  "type must be one of": "\u63D0\u4EA4\u7C7B\u578B\u5FC5\u987B\u662F\u4EE5\u4E0B\u4E4B\u4E00",
-  "type must not be empty": "\u63D0\u4EA4\u7C7B\u578B\u4E0D\u80FD\u4E3A\u7A7A",
-  "type must be lower case": "\u63D0\u4EA4\u7C7B\u578B\u5FC5\u987B\u662F\u5C0F\u5199",
-  // 主题相关
-  "subject must not be empty": "\u63D0\u4EA4\u4E3B\u9898\u4E0D\u80FD\u4E3A\u7A7A",
-  "subject must not end with full stop": "\u63D0\u4EA4\u4E3B\u9898\u4E0D\u80FD\u4EE5\u53E5\u53F7\u7ED3\u5C3E",
-  "subject must be lower case": "\u63D0\u4EA4\u4E3B\u9898\u5FC5\u987B\u662F\u5C0F\u5199",
-  // 长度相关
-  "header must not be longer than": "\u63D0\u4EA4\u5934\u957F\u5EA6\u4E0D\u80FD\u8D85\u8FC7",
-  "body lines must not be longer than": "\u63D0\u4EA4\u6B63\u6587\u6BCF\u884C\u957F\u5EA6\u4E0D\u80FD\u8D85\u8FC7",
-  "footer lines must not be longer than": "\u63D0\u4EA4\u811A\u6CE8\u6BCF\u884C\u957F\u5EA6\u4E0D\u80FD\u8D85\u8FC7",
-  // 通用
-  "must match the format": "\u5FC5\u987B\u5339\u914D\u683C\u5F0F",
-  "must be": "\u5FC5\u987B\u662F"
-};
-function translateError$1(message) {
-  for (const [en, zh] of Object.entries(errorMessages$1)) {
-    if (message.includes(en)) {
-      return message.replace(en, zh);
-    }
-  }
-  return message;
-}
-async function runCommitlint(args) {
-  try {
-    await execa("commitlint", args, {
-      stdio: "inherit",
-      reject: false
-    });
-  } catch (error) {
-    const err = error;
-    if (err.stdout) {
-      const translated = translateError$1(err.stdout);
-      process.stderr.write(translated + "\n");
-    }
-    if (err.stderr) {
-      const translated = translateError$1(err.stderr);
-      process.stderr.write(translated + "\n");
-    }
-    if (err.message) {
-      const translated = translateError$1(err.message);
-      process.stderr.write(translated + "\n");
-    }
-    process.exit(1);
-  }
-}
-
-const errorMessages = {
   // 配置相关
   "Failed to read config from file": "\u65E0\u6CD5\u8BFB\u53D6\u914D\u7F6E\u6587\u4EF6",
   "could not find any valid configuration": "\u627E\u4E0D\u5230\u6709\u6548\u7684\u914D\u7F6E",
@@ -72,6 +22,77 @@ const errorMessages = {
   passed: "\u901A\u8FC7",
   skipped: "\u8DF3\u8FC7"
 };
+function translateError$1(message) {
+  let translated = message;
+  for (const [en, zh] of Object.entries(errorMessages$1)) {
+    translated = translated.replace(new RegExp(en, "g"), zh);
+  }
+  return translated;
+}
+function translateLine$1(line) {
+  if (!line.trim() || /^[\s─│┌┐└┘]+$/g.test(line)) {
+    return line;
+  }
+  return translateError$1(line);
+}
+async function runLintStaged() {
+  try {
+    const { stdout, stderr } = await execa("lint-staged", [], {
+      stdio: "pipe"
+    });
+    if (stdout) {
+      const lines = stdout.split("\n");
+      lines.forEach((line) => {
+        process.stdout.write(translateLine$1(line) + "\n");
+      });
+    }
+    if (stderr) {
+      const lines = stderr.split("\n");
+      lines.forEach((line) => {
+        process.stderr.write(translateLine$1(line) + "\n");
+      });
+    }
+  } catch (error) {
+    const err = error;
+    if (err.stdout) {
+      const lines = err.stdout.split("\n");
+      lines.forEach((line) => {
+        process.stdout.write(translateLine$1(line) + "\n");
+      });
+    }
+    if (err.stderr) {
+      const lines = err.stderr.split("\n");
+      lines.forEach((line) => {
+        process.stderr.write(translateLine$1(line) + "\n");
+      });
+    }
+    process.exit(1);
+  }
+}
+
+const errorMessages = {
+  // 类型相关
+  "type must be one of": "\u63D0\u4EA4\u7C7B\u578B\u5FC5\u987B\u662F\u4EE5\u4E0B\u4E4B\u4E00",
+  "type must not be empty": "\u63D0\u4EA4\u7C7B\u578B\u4E0D\u80FD\u4E3A\u7A7A",
+  "type must be lower case": "\u63D0\u4EA4\u7C7B\u578B\u5FC5\u987B\u662F\u5C0F\u5199",
+  "may not be empty": "\u4E0D\u80FD\u4E3A\u7A7A",
+  // 主题相关
+  "subject must not be empty": "\u63D0\u4EA4\u4E3B\u9898\u4E0D\u80FD\u4E3A\u7A7A",
+  "subject must not end with full stop": "\u63D0\u4EA4\u4E3B\u9898\u4E0D\u80FD\u4EE5\u53E5\u53F7\u7ED3\u5C3E",
+  "subject must be lower case": "\u63D0\u4EA4\u4E3B\u9898\u5FC5\u987B\u662F\u5C0F\u5199",
+  // 长度相关
+  "header must not be longer than": "\u63D0\u4EA4\u5934\u957F\u5EA6\u4E0D\u80FD\u8D85\u8FC7",
+  "body lines must not be longer than": "\u63D0\u4EA4\u6B63\u6587\u6BCF\u884C\u957F\u5EA6\u4E0D\u80FD\u8D85\u8FC7",
+  "footer lines must not be longer than": "\u63D0\u4EA4\u811A\u6CE8\u6BCF\u884C\u957F\u5EA6\u4E0D\u80FD\u8D85\u8FC7",
+  // 通用
+  "must match the format": "\u5FC5\u987B\u5339\u914D\u683C\u5F0F",
+  "must be": "\u5FC5\u987B\u662F",
+  "may not": "\u4E0D\u80FD",
+  "found": "\u53D1\u73B0",
+  "problems": "\u4E2A\u95EE\u9898",
+  "warnings": "\u4E2A\u8B66\u544A",
+  "Get help": "\u83B7\u53D6\u5E2E\u52A9"
+};
 function translateError(message) {
   let translated = message;
   for (const [en, zh] of Object.entries(errorMessages)) {
@@ -80,14 +101,14 @@ function translateError(message) {
   return translated;
 }
 function translateLine(line) {
-  if (!line.trim() || /^[\s─│┌┐└┘]+$/g.test(line)) {
+  if (!line.trim() || /^[\s⧗│┌┐└┘✖✓ⓘ]+$/g.test(line)) {
     return line;
   }
   return translateError(line);
 }
-async function runLintStaged() {
+async function runCommitlint(args) {
   try {
-    const { stdout, stderr } = await execa("lint-staged", [], {
+    const { stdout, stderr } = await execa("commitlint", args, {
       stdio: "pipe"
     });
     if (stdout) {
@@ -116,16 +137,19 @@ async function runLintStaged() {
         process.stderr.write(translateLine(line) + "\n");
       });
     }
-    process.exit(1);
+    process.exit(err.exitCode || 1);
   }
 }
 
-const cli = cac("hy-hooks-git-wrapper");
-cli.command("commitlint [...args]", "Run commitlint with Chinese error messages").action(async (args) => {
-  await runCommitlint(args);
-});
-cli.command("lint-staged", "Run lint-staged with Chinese error messages").action(async () => {
-  await runLintStaged();
-});
-cli.help();
-cli.parse();
+const args = process.argv.slice(2);
+if (args[0] === "lint-staged") {
+  runLintStaged().catch((error) => {
+    console.error(error);
+    process.exit(1);
+  });
+} else {
+  runCommitlint(args).catch((error) => {
+    console.error(error);
+    process.exit(1);
+  });
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@huaiyou/hooks-git",
-  "version": "2.2.3",
+  "version": "2.2.4",
   "description": "Git hooks configuration with Husky, Commitlint and Lint-staged",
   "bin": {
     "hy-hooks-git": "./dist/cli.mjs",