@itcase/config 1.6.64 → 1.6.66

package/README.md

@@ -87,13 +87,13 @@ npm install --save-dev commitizen @commitlint/cz-commitlint
 
 В репозитории остаются файлы, на которые опираются git и husky. Логика лежит в `@itcase/config/husky-hooks`. При установке пакета npm кладёт бинарь `itcase-config-husky-hooks` в `node_modules/.bin` — husky уже добавляет этот путь в `PATH`.
 
-При `npm i` пакет сам копирует `.husky/_run.sh` (git его не вызывает). Добавьте в `.gitignore`:
+При `npm i` пакет копирует `.husky/_run.sh` и создаёт недостающие обёртки хуков. Свои полные хуки не перезаписывает. Добавьте в `.gitignore`:
 
 ```gitignore
 .husky/_run.sh
 ```
 
-Скрипт не трогает `.husky` самого `@itcase/config` и репы без обёрток. `npm i --ignore-scripts` файл не создаст.
+Репы без обёрток и без одного только `.husky/config` скрипт не трогает. `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.js

@@ -0,0 +1,100 @@
+#!/usr/bin/env node
+/**
+ * Copies husky-hooks/_run.sh into the project .husky/ on install
+ * and creates missing git-hook wrappers. Does not overwrite custom hooks.
+ */
+import fs from 'node:fs'
+import path from 'node:path'
+
+const GIT_HOOKS = [
+  'pre-commit',
+  'commit-msg',
+  'prepare-commit-msg',
+  'pre-push',
+  'post-merge',
+  'post-commit',
+  'set-release-message',
+]
+
+const WRAPPER = `#!/usr/bin/env sh
+. "$(dirname "$0")/_run.sh"
+`
+
+function projectRoot() {
+  const initCwd = process.env.INIT_CWD
+  if (
+    initCwd &&
+    path.isAbsolute(initCwd) &&
+    !initCwd.includes(`${path.sep}node_modules${path.sep}`)
+  ) {
+    return initCwd
+  }
+
+  const cwd = process.cwd()
+  const marker = `${path.sep}node_modules${path.sep}@itcase${path.sep}config`
+  const index = cwd.lastIndexOf(marker)
+  if (index !== -1) {
+    return cwd.slice(0, index)
+  }
+
+  return cwd
+}
+
+function readHook(huskyDir, name) {
+  try {
+    return fs.readFileSync(path.join(huskyDir, name), 'utf8')
+  } catch {
+    return null
+  }
+}
+
+function isItcaseHuskyDir(huskyDir) {
+  if (fs.existsSync(path.join(huskyDir, '_run.sh'))) {
+    return true
+  }
+
+  const hookContents = GIT_HOOKS.map((name) => readHook(huskyDir, name))
+  if (hookContents.some((text) => text?.includes('_run.sh'))) {
+    return true
+  }
+
+  const hasCustomHooks = hookContents.some(
+    (text) => text !== null && !text.includes('_run.sh'),
+  )
+  if (hasCustomHooks) {
+    return false
+  }
+
+  return fs.existsSync(path.join(huskyDir, 'config'))
+}
+
+function writeWrapper(huskyDir, name) {
+  const dest = path.join(huskyDir, name)
+  fs.writeFileSync(dest, WRAPPER)
+  try {
+    fs.chmodSync(dest, 0o755)
+  } catch {
+    // Windows may not support chmod; Git Bash still runs the file via sh.
+  }
+}
+
+const root = projectRoot()
+const huskyDir = path.join(root, '.husky')
+if (!fs.existsSync(huskyDir) || !isItcaseHuskyDir(huskyDir)) {
+  process.exit(0)
+}
+
+const src = path.join(import.meta.dirname, '_run.sh')
+fs.copyFileSync(src, path.join(huskyDir, '_run.sh'))
+try {
+  fs.chmodSync(path.join(huskyDir, '_run.sh'), 0o755)
+} catch {
+  // Windows may not support chmod; Git Bash still runs the file via sh.
+}
+
+for (const name of GIT_HOOKS) {
+  const text = readHook(huskyDir, name)
+  if (text === null || text.includes('_run.sh')) {
+    writeWrapper(huskyDir, name)
+  }
+}

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.66",
   "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",
@@ -60,7 +60,7 @@
     "autoprefixer": "^10.5.4",
     "chokidar-cli": "^3.0.0",
     "commitizen": "^4.3.2",
-    "conventional-changelog-conventionalcommits": "^10.3.0",
+    "conventional-changelog-conventionalcommits": "9.3.1",
     "cssnano": "^8.0.5",
     "cssnano-preset-default": "^8.0.5",
     "inquirer": "^14.0.2",
@@ -105,7 +105,7 @@
     "semantic-release-lerna": "^3.6.1"
   },
   "devDependencies": {
-    "@itcase/lint": "^1.1.121",
+    "@itcase/lint": "^1.1.122",
     "eslint": "9.39.2",
     "husky": "^9.1.7",
     "inquirer": "^14.0.2",
@@ -113,6 +113,6 @@
     "prettier": "^3.9.6",
     "storybook": "^10.5.8",
     "stylelint": "^17.14.1",
-    "typescript": "^6.0.2"
+    "typescript": "^6.0.3"
   }
 }

package/husky-hooks/install-launcher.cjs

@@ -1,79 +0,0 @@
-#!/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.
- */
-const fs = require('node:fs')
-const path = require('node:path')
-
-const GIT_HOOKS = [
-  'pre-commit',
-  'commit-msg',
-  'prepare-commit-msg',
-  'pre-push',
-  'post-merge',
-  'post-commit',
-  'set-release-message',
-]
-
-function projectRoot() {
-  const initCwd = process.env.INIT_CWD
-  if (
-    initCwd &&
-    path.isAbsolute(initCwd) &&
-    !initCwd.includes(`${path.sep}node_modules${path.sep}`)
-  ) {
-    return initCwd
-  }
-
-  const cwd = process.cwd()
-  const marker = `${path.sep}node_modules${path.sep}@itcase${path.sep}config`
-  const index = cwd.lastIndexOf(marker)
-  if (index !== -1) {
-    return cwd.slice(0, index)
-  }
-
-  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
-  }
-
-  return GIT_HOOKS.some((name) => {
-    try {
-      const text = fs.readFileSync(path.join(huskyDir, name), 'utf8')
-      return text.includes('_run.sh')
-    } catch {
-      return false
-    }
-  })
-}
-
-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 dest = path.join(huskyDir, '_run.sh')
-fs.copyFileSync(src, dest)
-try {
-  fs.chmodSync(dest, 0o755)
-} catch {
-  // Windows may not support chmod; Git Bash still runs the file via sh.
-}