@itcase/config 1.6.64 → 1.6.65

package/README.md

@@ -93,7 +93,7 @@ npm install --save-dev commitizen @commitlint/cz-commitlint
 .husky/_run.sh
 ```
 
-Скрипт не трогает `.husky` самого `@itcase/config` и репы без обёрток. `npm i --ignore-scripts` файл не создаст.
+Репы без обёрток скрипт не трогает. `npm i --ignore-scripts` файл не создаст.
 
 В каждом git-hook оставьте обёртку:
 

package/husky-hooks/_lib.sh

@@ -41,10 +41,10 @@ itcase_export_release_branch_env() {
   fi
 }
 
-itcase_has_conflict_markers() {
-  git grep -I --untracked --exclude-standard \
+itcase_conflict_marker_files() {
+  git grep -lI --untracked --exclude-standard \
     -e '^<<<<<<< ' -e '^=======$' -e '^>>>>>>> ' \
-    -- . ':!node_modules' ':!dist' >/dev/null 2>&1
+    -- . ':!node_modules' ':!dist' 2>/dev/null
 }
 
 itcase_run_lint_staged() {

package/husky-hooks/_run.sh

@@ -9,8 +9,9 @@ fi
 
 ROOT="$(CDPATH= cd -- "$HUSKY_DIR/.." && pwd)"
 for candidate in \
-  "$ROOT/node_modules/@itcase/config/husky-hooks/run.cjs" \
-  "$ROOT/../itcase-config/husky-hooks/run.cjs"
+  "$ROOT/husky-hooks/run.js" \
+  "$ROOT/node_modules/@itcase/config/husky-hooks/run.js" \
+  "$ROOT/../itcase-config/husky-hooks/run.js"
 do
   if [ -f "$candidate" ]; then
     exec node "$candidate" "$HOOK_NAME" "$@"

package/husky-hooks/{install-launcher.cjs → install-launcher.js}

@@ -1,10 +1,10 @@
 #!/usr/bin/env node
 /**
- * Copies husky-hooks/_run.sh into the consumer .husky/ on install.
- * Skips @itcase/config itself and repos that do not use the wrappers.
+ * Copies husky-hooks/_run.sh into the project .husky/ on install.
+ * Skips repos that do not use the wrappers.
  */
-const fs = require('node:fs')
-const path = require('node:path')
+import fs from 'node:fs'
+import path from 'node:path'
 
 const GIT_HOOKS = [
   'pre-commit',
@@ -36,14 +36,6 @@ function projectRoot() {
   return cwd
 }
 
-function packageName(root) {
-  try {
-    return JSON.parse(fs.readFileSync(path.join(root, 'package.json'), 'utf8')).name
-  } catch {
-    return ''
-  }
-}
-
 function usesItcaseHooks(huskyDir) {
   if (fs.existsSync(path.join(huskyDir, '_run.sh'))) {
     return true
@@ -60,16 +52,12 @@ function usesItcaseHooks(huskyDir) {
 }
 
 const root = projectRoot()
-if (packageName(root) === '@itcase/config') {
-  process.exit(0)
-}
-
 const huskyDir = path.join(root, '.husky')
 if (!fs.existsSync(huskyDir) || !usesItcaseHooks(huskyDir)) {
   process.exit(0)
 }
 
-const src = path.join(__dirname, '_run.sh')
+const src = path.join(import.meta.dirname, '_run.sh')
 const dest = path.join(huskyDir, '_run.sh')
 fs.copyFileSync(src, dest)
 try {

package/husky-hooks/pre-commit

@@ -28,8 +28,9 @@ if [ -n "${PROTECTED_BRANCHES:-}" ]; then
 fi
 
 # Проверка на конфликты слияния
-if itcase_has_conflict_markers; then
+if conflict_files="$(itcase_conflict_marker_files)"; then
   echo 'Fix conflicts'
+  printf '%s\n' "$conflict_files" | sed 's/^/  /'
   exit 1
 fi
 

package/husky-hooks/{run.cjs → run.js}

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
-const { spawnSync } = require('node:child_process')
-const fs = require('node:fs')
-const path = require('node:path')
+import { spawnSync } from 'node:child_process'
+import fs from 'node:fs'
+import path from 'node:path'
 
 const ALLOWED_HOOKS = new Set([
   'pre-commit',
@@ -17,14 +17,18 @@ const hookName = process.argv[2]
 const hookArgs = process.argv.slice(3)
 
 if (!hookName || !ALLOWED_HOOKS.has(hookName)) {
-  process.stderr.write('Usage: itcase-config-husky-hooks <hook-name> [args...]\n')
+  process.stderr.write(
+    'Usage: itcase-config-husky-hooks <hook-name> [args...]\n',
+  )
   process.exit(1)
 }
 
-const hookScript = path.join(__dirname, hookName)
+const hookScript = path.join(import.meta.dirname, hookName)
 
 if (!fs.existsSync(hookScript)) {
-  process.stderr.write(`❌ Husky hook '${hookName}' not found in @itcase/config.\n`)
+  process.stderr.write(
+    `❌ Husky hook '${hookName}' not found in @itcase/config.\n`,
+  )
   process.stderr.write(`   Expected: ${hookScript}\n`)
   process.exit(1)
 }
@@ -35,7 +39,8 @@ function resolveBash() {
   }
 
   const candidates = [
-    process.env.PROGRAMFILES && path.join(process.env.PROGRAMFILES, 'Git', 'bin', 'bash.exe'),
+    process.env.PROGRAMFILES &&
+      path.join(process.env.PROGRAMFILES, 'Git', 'bin', 'bash.exe'),
     process.env['PROGRAMFILES(X86)'] &&
       path.join(process.env['PROGRAMFILES(X86)'], 'Git', 'bin', 'bash.exe'),
     'C:\\Program Files\\Git\\bin\\bash.exe',
@@ -51,8 +56,8 @@ function resolveBash() {
 }
 
 const result = spawnSync(resolveBash(), [hookScript, ...hookArgs], {
-  stdio: 'inherit',
   env: { ...process.env, HUSKY_DIR: process.env.HUSKY_DIR || '' },
+  stdio: 'inherit',
 })
 
 if (result.error) {

package/lint-staged/index.js

@@ -10,7 +10,7 @@ export default {
     // Проверяем, есть ли package.json в корне репозитория
     const rootPackageJson = resolve(process.cwd(), 'package.json')
     if (existsSync(rootPackageJson) && files.includes(rootPackageJson)) {
-      return ['npm install --package-lock-only', 'git add package-lock.json']
+      return 'npm install --package-lock-only'
     }
     return 'true' // Пропускаем, если не найден
   },

package/lint-staged-ts/index.js

@@ -18,7 +18,7 @@ export default {
     // Проверяем, есть ли package.json в корне репозитория
     const rootPackageJson = resolve(process.cwd(), 'package.json')
     if (existsSync(rootPackageJson) && files.includes(rootPackageJson)) {
-      return ['npm install --package-lock-only', 'git add package-lock.json']
+      return 'npm install --package-lock-only'
     }
     return 'true' // Пропускаем, если не найден
   },

package/package.json

@@ -1,17 +1,17 @@
 {
   "name": "@itcase/config",
-  "version": "1.6.64",
+  "version": "1.6.65",
   "author": "ITCase",
   "description": "ITCase Config",
   "engines": {
     "node": ">=22.0.0"
   },
   "bin": {
-    "itcase-config-husky-hooks": "./husky-hooks/run.cjs"
+    "itcase-config-husky-hooks": "./husky-hooks/run.js"
   },
   "scripts": {
     "prepare": "husky",
-    "postinstall": "node ./husky-hooks/install-launcher.cjs",
+    "postinstall": "node ./husky-hooks/install-launcher.js",
     "semantic-release": "semantic-release"
   },
   "type": "module",