@modernpoacher/hooks 1.0.399 → 1.0.401

package/.eslintignore

@@ -1,5 +1,3 @@
 .circleci
 .github
-.husky
-
 node_modules

package/.eslintrc

@@ -2,12 +2,11 @@
   "root": true,
   "extends": "standard",
   "env": {
-    "node": true,
-    "es2020": true
+    "node": true
   },
   "parser": "@babel/eslint-parser",
   "parserOptions": {
-    "ecmaVersion": 2020,
+    "ecmaVersion": "latest",
     "sourceType": "module"
   }
 }

package/.gitattributes

@@ -2,13 +2,22 @@
 * text=auto
 
 # LF line endings
+*.yaml text eol=lf
+*.yml text eol=lf
 *.json text eol=lf
 *.mjs text eol=lf
 *.cjs text eol=lf
+*.jsx text eol=lf
 *.mts text eol=lf
+*.cts text eol=lf
+*.sh text eol=lf
 .editorconfig text eol=lf
 .eslintignore text eol=lf
 .eslintrc text eol=lf
 .gitattributes text eol=lf
 .gitignore text eol=lf
+.npmignore text eol=lf
+.npmrc text eol=lf
+.eslintrc text eol=lf
+.babelrc text eol=lf
 .husky/* text eol=lf

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modernpoacher/hooks",
-  "version": "1.0.399",
+  "version": "1.0.401",
   "description": "Git Hooks",
   "keywords": [
     "git",

package/src/common.mjs

@@ -4,7 +4,7 @@ import {
   exec
 } from 'child_process'
 
-const log = debug('@modernpoacher/hooks:common')
+const log = debug('@modernpoacher/hooks/common')
 
 log('`@modernpoacher/hooks` is awake')
 
@@ -23,7 +23,7 @@ export const NOT_STAGED_CHANGES = /Changes not staged for commit/s
 export const trim = (v = '') => String(v).split('\n').map((v) => v.trimEnd()).join('\n').trim()
 
 export function use (key) {
-  const log = debug(`@modernpoacher/hooks:${key}`)
+  const log = debug(`@modernpoacher/hooks/${key}`)
 
   return function use (v) {
     log(trim(v))
@@ -48,6 +48,24 @@ export function getGitRemoteShowOriginHeadBranch () {
   )
 }
 
+export function getGitRevParseAbbrevRefHead () {
+  log('getGitRevParseAbbrevRefHead')
+
+  return (
+    new Promise((resolve, reject) => {
+      const command = 'git rev-parse --abbrev-ref HEAD'
+
+      const {
+        stdout,
+        stderr
+      } = exec(command, OPTIONS, (e, v) => (!e) ? resolve(trim(v)) : reject(e))
+
+      stdout.on('data', use('git-rev-parse-head'))
+      stderr.on('data', use('git-rev-parse-head'))
+    })
+  )
+}
+
 export function hasGitDiffHeadPackageVersionChanges (branch = BRANCH) {
   log('hasGitDiffHeadPackageVersionChanges')
 

package/src/post-commit.mjs

@@ -3,12 +3,13 @@ import debug from 'debug'
 import {
   hasStagedChanges,
   getGitRemoteShowOriginHeadBranch,
+  getGitRevParseAbbrevRefHead,
   hasGitDiffHeadPackageVersionChanges,
   patchPackageVersion
 } from '#hooks/common'
 
-const log = debug('@modernpoacher/hooks:post-commit')
-const error = debug('@modernpoacher/hooks:post-commit:error')
+const log = debug('@modernpoacher/hooks/post-commit')
+const error = debug('@modernpoacher/hooks/post-commit:error')
 
 log('`@modernpoacher/hooks` is awake')
 
@@ -18,9 +19,12 @@ export default async function postCommit () {
   try {
     if (await hasStagedChanges()) return
 
-    if (await hasGitDiffHeadPackageVersionChanges(await getGitRemoteShowOriginHeadBranch())) return
+    const originHeadBranch = await getGitRemoteShowOriginHeadBranch()
+    if (originHeadBranch === await getGitRevParseAbbrevRefHead()) {
+      if (await hasGitDiffHeadPackageVersionChanges(originHeadBranch)) return
 
-    await patchPackageVersion()
+      await patchPackageVersion()
+    }
   } catch ({
     code = 'NONE',
     message = 'No error message defined'