@modernpoacher/hooks 1.0.386 → 1.0.388

package/.eslintignore

@@ -3,5 +3,3 @@
 .husky
 
 node_modules
-
-lib

package/.gitattributes

@@ -0,0 +1,14 @@
+# Default behavior
+* text=auto
+
+# LF line endings
+*.json text eol=lf
+*.mjs text eol=lf
+*.cjs text eol=lf
+*.mts text eol=lf
+.editorconfig text eol=lf
+.eslintignore text eol=lf
+.eslintrc text eol=lf
+.gitattributes text eol=lf
+.gitignore text eol=lf
+.husky/* text eol=lf

package/.husky/post-commit

@@ -1,4 +1,4 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
 
-npm run post-commit
+npx cross-env DEBUG=@sequencemedia/hooks* node .husky/post-commit.mjs

package/.husky/post-commit.mjs

@@ -0,0 +1,3 @@
+import postCommit from '#hooks/post-commit'
+
+export default postCommit()

package/.husky/pre-commit

@@ -1,4 +1,4 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
 
-npm run pre-commit
+npm run lint

package/babel.config.cjs

@@ -0,0 +1,16 @@
+const presets = [
+  [
+    '@babel/env',
+    {
+      targets: {
+        node: 'current'
+      },
+      useBuiltIns: 'usage',
+      corejs: 3
+    }
+  ]
+]
+
+module.exports = {
+  presets
+}

package/index.d.mts

@@ -0,0 +1,22 @@
+declare module '@sequencemedia/hooks' {
+  export function postCommit(): string
+  export const common: {
+    OPTIONS: {
+      maxBuffer: number
+    },
+    BRANCH: string,
+    PACKAGE_VERSION_CHANGES: RegExp,
+    HAS_STAGED_CHANGES: RegExp,
+    NOT_STAGED_CHANGES: RegExp,
+    use (): Promise<void>,
+    trim (): string,
+    getGitRemoteShowOriginHeadBranch (): Promise<void>,
+    hasGitDiffHeadPackageVersionChanges (): Promise<void>,
+    notGitDiffHeadPackageVersionChanges (): Promise<void>,
+    hasStagedChanges (): Promise<void>,
+    notStagedChanges (): Promise<void>,
+    addPackageVersionChanges (): Promise<void>,
+    patchPackageVersion (): Promise<void>,
+    gitTag (a:string, m?:string): Promise<void>
+  }
+}

package/index.mjs

@@ -0,0 +1,7 @@
+import * as common from '#hooks/common'
+import postCommit from '#hooks/post-commit'
+
+export {
+  common,
+  postCommit
+}

package/package.json

@@ -1,12 +1,14 @@
 {
   "name": "@modernpoacher/hooks",
-  "version": "1.0.386",
+  "version": "1.0.388",
   "description": "Git Hooks",
   "keywords": [
     "git",
     "hooks"
   ],
-  "main": "./index.js",
+  "main": "./index.mjs",
+  "type": "module",
+  "types": "./index.d.mts",
   "author": "Jonathan Perry for Modern Poacher Limited <modernpoacher@modernpoacher.com>",
   "license": "MIT",
   "engines": {
@@ -21,22 +23,11 @@
     "url": "https://github.com/modernpoacher/hooks/issues"
   },
   "scripts": {
-    "prepublishOnly": "cross-env NODE_ENV=production npm run build",
-    "prebuild": "npm run clean",
-    "build": "npm run babel",
-    "build:watch": "npm run babel:watch",
-    "clean": "rimraf lib",
-    "babel": "babel src -d lib",
-    "babel:watch": "npm run babel -- -w",
-    "lint": "eslint .",
+    "lint": "eslint . --ext .mjs --ext .cjs",
     "lint:fix": "npm run lint -- --fix",
-    "gulp": "gulp --color",
-    "pre-commit": "npm run lint",
-    "post-commit": "cross-env DEBUG=@modernpoacher/hooks,@modernpoacher/hooks:* npm run gulp -- post-commit",
     "prepare": "husky install"
   },
   "dependencies": {
-    "cross-env": "^7.0.3",
     "debug": "^4.3.4"
   },
   "devDependencies": {
@@ -44,17 +35,15 @@
     "@babel/core": "^7.21.5",
     "@babel/eslint-parser": "^7.21.3",
     "@babel/preset-env": "^7.21.5",
-    "@babel/register": "^7.21.0",
-    "babel-plugin-module-resolver": "^5.0.0",
     "core-js": "^3.30.1",
     "eslint": "^8.39.0",
     "eslint-config-standard": "^17.0.0",
-    "eslint-import-resolver-babel-module": "^5.3.2",
     "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^6.1.1",
-    "gulp": "^4.0.2",
-    "husky": "^8.0.3",
-    "rimraf": "^5.0.0"
+    "husky": "^8.0.3"
+  },
+  "imports": {
+    "#hooks/*": "./src/*.mjs"
   }
 }

package/src/index.mjs

@@ -0,0 +1,7 @@
+import * as common from './common.mjs'
+import postCommit from './post-commit.mjs'
+
+export {
+  common,
+  postCommit
+}

package/src/{post-commit.js → post-commit.mjs}

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

package/babel.config.js

@@ -1,32 +0,0 @@
-const presets = [
-  [
-    '@babel/env',
-    {
-      targets: {
-        node: 'current'
-      },
-      useBuiltIns: 'usage',
-      corejs: 3
-    }
-  ]
-]
-
-const plugins = [
-  [
-    'module-resolver',
-    {
-      root: ['./src'],
-      cwd: 'babelrc',
-      alias: {
-        '@modernpoacher/hooks': './src'
-      }
-    }
-  ]
-]
-
-module.exports = {
-  compact: true,
-  comments: false,
-  presets,
-  plugins
-}

package/gulpfile.js

@@ -1,17 +0,0 @@
-require('@babel/register')({
-  ignore: [
-    /node_modules/
-  ]
-})
-
-const gulp = require('gulp')
-
-const {
-  default: postCommit
-} = require('./lib/post-commit')
-
-gulp
-  .task('post-commit', postCommit)
-
-gulp
-  .task('default', gulp.series('post-commit'))

package/index.js

@@ -1,3 +0,0 @@
-//
-
-module.exports = require('./lib')

package/lib/common.js

@@ -1 +0,0 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:true});exports.PACKAGE_VERSION_CHANGES=exports.OPTIONS=exports.NOT_STAGED_CHANGES=exports.HAS_STAGED_CHANGES=exports.BRANCH=void 0;exports.addPackageVersionChanges=addPackageVersionChanges;exports.getGitRemoteShowOriginHeadBranch=getGitRemoteShowOriginHeadBranch;exports.gitTag=gitTag;exports.hasGitDiffHeadPackageVersionChanges=hasGitDiffHeadPackageVersionChanges;exports.hasStagedChanges=hasStagedChanges;exports.notGitDiffHeadPackageVersionChanges=notGitDiffHeadPackageVersionChanges;exports.notStagedChanges=notStagedChanges;exports.patchPackageVersion=patchPackageVersion;exports.trim=void 0;exports.use=use;var _debug=_interopRequireDefault(require("debug"));var _child_process=require("child_process");function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj};}const log=(0,_debug.default)('@modernpoacher/hooks:common');log('`@modernpoacher/hooks` is awake');const OPTIONS={maxBuffer:1024*500};exports.OPTIONS=OPTIONS;const BRANCH='master';exports.BRANCH=BRANCH;const PACKAGE_VERSION_CHANGES=/\-+\s+"version":\s+"(\d+\.\d+\.\d+)",+\s+\++\s+"version":\s+"(\d+\.\d+\.\d+)",+\s+/;exports.PACKAGE_VERSION_CHANGES=PACKAGE_VERSION_CHANGES;const HAS_STAGED_CHANGES=/Changes to be committed/s;exports.HAS_STAGED_CHANGES=HAS_STAGED_CHANGES;const NOT_STAGED_CHANGES=/Changes not staged for commit/s;exports.NOT_STAGED_CHANGES=NOT_STAGED_CHANGES;const trim=(v='')=>String(v).split('\n').map(v=>v.trimEnd()).join('\n').trim();exports.trim=trim;function use(key){const log=(0,_debug.default)(`@modernpoacher/hooks:${key}`);return function use(v){log(trim(v));};}function getGitRemoteShowOriginHeadBranch(){log('getGitRemoteShowOriginHeadBranch');return new Promise((resolve,reject)=>{const command='git remote show origin | awk \'/HEAD branch/ {print $NF}\'';const{stdout,stderr}=(0,_child_process.exec)(command,OPTIONS,(e,v)=>!e?resolve(trim(v)):reject(e));stdout.on('data',use('git-remote-show-origin-head-branch'));stderr.on('data',use('git-remote-show-origin-head-branch'));});}function hasGitDiffHeadPackageVersionChanges(branch=BRANCH){log('hasGitDiffHeadPackageVersionChanges');return new Promise((resolve,reject)=>{(0,_child_process.exec)(`git diff HEAD~1..HEAD~0 -- origin/${branch} package.json`,OPTIONS,async(e,v)=>!e?resolve(PACKAGE_VERSION_CHANGES.test(v)===true):reject(e));});}function notGitDiffHeadPackageVersionChanges(branch=BRANCH){log('notGitDiffHeadPackageVersionChanges');return new Promise((resolve,reject)=>{(0,_child_process.exec)(`git diff HEAD~1..HEAD~0 -- origin/${branch} package.json`,OPTIONS,async(e,v)=>!e?resolve(PACKAGE_VERSION_CHANGES.test(v)!==true):reject(e));});}function hasStagedChanges(){log('hasStagedChanges');return new Promise((resolve,reject)=>{(0,_child_process.exec)('git status',OPTIONS,(e,v)=>!e?resolve(HAS_STAGED_CHANGES.test(v)):reject(e));});}function notStagedChanges(){log('notStagedChanges');return new Promise((resolve,reject)=>{(0,_child_process.exec)('git status',OPTIONS,(e,v)=>!e?resolve(NOT_STAGED_CHANGES.test(v)):reject(e));});}function addPackageVersionChanges(){log('addPackageVersionChanges');return new Promise((resolve,reject)=>{(0,_child_process.exec)('git add package.json package-lock.json',OPTIONS,e=>!e?resolve():reject(e));});}function patchPackageVersion(){log('patchPackageVersion');return new Promise((resolve,reject)=>{(0,_child_process.exec)('npm version patch -m %s -n',OPTIONS,e=>!e?resolve():reject(e));});}function gitTag(a='0.0.0',m=a){log('gitTag');return new Promise((resolve,reject)=>{(0,_child_process.exec)(`git tag -a v${a} -m "${m}"`,OPTIONS,(e,v)=>!e?resolve(v):reject(e));});}

package/lib/index.js

@@ -1 +0,0 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:true});exports.common=void 0;Object.defineProperty(exports,"postCommit",{enumerable:true,get:function(){return _postCommit.default;}});var common=_interopRequireWildcard(require("./common"));exports.common=common;var _postCommit=_interopRequireDefault(require("./post-commit"));function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj};}function _getRequireWildcardCache(nodeInterop){if(typeof WeakMap!=="function")return null;var cacheBabelInterop=new WeakMap();var cacheNodeInterop=new WeakMap();return(_getRequireWildcardCache=function(nodeInterop){return nodeInterop?cacheNodeInterop:cacheBabelInterop;})(nodeInterop);}function _interopRequireWildcard(obj,nodeInterop){if(!nodeInterop&&obj&&obj.__esModule){return obj;}if(obj===null||typeof obj!=="object"&&typeof obj!=="function"){return{default:obj};}var cache=_getRequireWildcardCache(nodeInterop);if(cache&&cache.has(obj)){return cache.get(obj);}var newObj={};var hasPropertyDescriptor=Object.defineProperty&&Object.getOwnPropertyDescriptor;for(var key in obj){if(key!=="default"&&Object.prototype.hasOwnProperty.call(obj,key)){var desc=hasPropertyDescriptor?Object.getOwnPropertyDescriptor(obj,key):null;if(desc&&(desc.get||desc.set)){Object.defineProperty(newObj,key,desc);}else{newObj[key]=obj[key];}}}newObj.default=obj;if(cache){cache.set(obj,newObj);}return newObj;}

package/lib/post-commit.js

@@ -1 +0,0 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:true});exports.default=postCommit;var _debug=_interopRequireDefault(require("debug"));var _common=require("./common");function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj};}const log=(0,_debug.default)('@modernpoacher/hooks:post-commit');const error=(0,_debug.default)('@modernpoacher/hooks:post-commit:error');log('`@modernpoacher/hooks` is awake');async function postCommit(){log('post-commit');try{if(await(0,_common.hasStagedChanges)())return;if(await(0,_common.hasGitDiffHeadPackageVersionChanges)(await(0,_common.getGitRemoteShowOriginHeadBranch)()))return;await(0,_common.patchPackageVersion)();}catch({code='NONE',message='No error message defined'}){error({code,message});}}

package/src/index.js

@@ -1,7 +0,0 @@
-import * as common from '@modernpoacher/hooks/common'
-import postCommit from '@modernpoacher/hooks/post-commit'
-
-export {
-  common,
-  postCommit
-}