@ornikar/repo-config 13.1.1 → 13.2.0

package/CHANGELOG.md

@@ -3,6 +3,15 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [13.2.0](https://github.com/ornikar/shared-configs/compare/@ornikar/repo-config@13.1.1...@ornikar/repo-config@13.2.0) (2023-11-17)
+
+
+### Features
+
+* **repo-config:** add husky no push on main prepush hook [no issue] ([#1032](https://github.com/ornikar/shared-configs/issues/1032)) ([390dcce](https://github.com/ornikar/shared-configs/commit/390dcce9fef422bbc6e47ff3911f2400d875dc0a))
+
+
+
 ## [13.1.1](https://github.com/ornikar/shared-configs/compare/@ornikar/repo-config@13.1.0...@ornikar/repo-config@13.1.1) (2023-11-14)
 
 **Note:** Version bump only for package @ornikar/repo-config

package/lib/postinstall/install-husky.js

@@ -6,8 +6,42 @@ const fs = require('node:fs');
 const path = require('node:path');
 const husky = require('husky');
 const { readYarnConfigFile } = require('../yarn');
+const { noPushOnMain } = require('./no-push-on-main');
 const { phrasePrePush } = require('./phrase-pre-push');
 
+function createPrepushHook(commands, prePushHookPostContent) {
+  const script = `
+# get current branch name
+currentBranch=$(git rev-parse --abbrev-ref HEAD)
+
+# get current branch ref
+branch_ref=$(git symbolic-ref HEAD)
+
+# autodetect main branch (usually master or main)
+mainBranch=$(LANG=en_US git remote show origin | grep "HEAD branch" | cut -d' ' -f5)
+
+# z40 is the value matching the empty blob/commit/tree SHA (zero x 40)
+z40=0000000000000000000000000000000000000000
+
+while read local_ref local_sha remote_ref remote_sha
+do
+  if [[ "$local_ref" == "$branch_ref" ]]
+  then
+    ${noPushOnMain.trim().split('\n').join('\n    ')}
+    ${commands.join(' && ')}${
+    (prePushHookPostContent || '') &&
+    `
+    if [ "$?" = 0 ]
+    then
+      ${prePushHookPostContent}
+    fi`
+  }
+  fi
+done
+`;
+  return `${script.trim()}\n`;
+}
+
 const ensureLegacyHuskyConfigDeleted = () => {
   try {
     fs.unlinkSync(path.resolve('husky.config.js'));
@@ -135,39 +169,28 @@ fi
     writeHook('post-rewrite', postHookContent);
   }
 
-  const prePushHookPreCommands = [];
-  const prePushHook = [];
+  const prePushHookCommands = [];
 
   if (shouldRunTest()) {
     if (pkg.scripts.test === 'node --test') {
-      prePushHook.push('CI=true yarn test');
+      prePushHookCommands.push('CI=true yarn test');
     } else {
-      prePushHookPreCommands.push(
-        '# autodetect main branch (usually master or main)',
-        'mainBranch=$(LANG=en_US git remote show origin | grep "HEAD branch" | cut -d\' \' -f5)',
-        '',
-      );
-      prePushHook.push('CI=true yarn test --changedSince=origin/$mainBranch');
+      prePushHookCommands.push('CI=true yarn test --changedSince=origin/$mainBranch');
     }
   }
 
   if (shouldRunChecks()) {
-    prePushHook.push('yarn run checks');
+    prePushHookCommands.push('yarn run checks');
   }
 
-  if (prePushHook.length > 0) {
+  if (prePushHookCommands.length > 0) {
     let prePushHookPostContent = '';
     const phraseConfigPath = '.phrase.yml';
     if (fs.existsSync(phraseConfigPath)) {
       prePushHookPostContent += phrasePrePush;
     }
 
-    writeHook(
-      'pre-push',
-      (prePushHookPreCommands ? [...prePushHookPreCommands, ''].join('\n') : '') +
-        prePushHook.join(' && ') +
-        prePushHookPostContent,
-    );
+    writeHook('pre-push', createPrepushHook(prePushHookCommands, prePushHookPostContent));
   } else {
     ensureHookDeleted('pre-push');
   }

package/lib/postinstall/no-push-on-main.js

@@ -0,0 +1,9 @@
+'use strict';
+
+exports.noPushOnMain = `
+if [[ "$remote_sha" != $z40 && "$remote_ref" == "refs/heads/$mainBranch" ]]
+then
+  echo "Do not push directly on \\"origin/$currentBranch\\""
+  exit 1
+fi
+`;

package/lib/postinstall/phrase-pre-push.js

@@ -1,32 +1,22 @@
 'use strict';
 
 exports.phrasePrePush = `
-# z40 is the value matching the empty blob/commit/tree SHA (zero x 40)
-z40=0000000000000000000000000000000000000000
+if [ "$remote_sha" = $z40 ]
+then
+    # New branch, examine all commits since first commit
+    range="$local_sha"
+else
+    # Update to existing branch, examine new commits
+    range="$remote_sha..$local_sha"
+fi
 
-while read local_ref local_sha remote_ref remote_sha
-do
-    branch_ref=$(git symbolic-ref HEAD)
-    if [ "$local_ref" = "$branch_ref" ]
-    then
-        if [ "$remote_sha" = $z40 ]
-        then
-            # New branch, examine all commits since first commit
-            range="$local_sha"
-        else
-            # Update to existing branch, examine new commits
-            range="$remote_sha..$local_sha"
-        fi
-
-        # Check for Translations in commit
-        translation=\`git --glob-pathspecs diff "$range" -- "@ornikar/*/translations/**" "@ornikar/*/src/translations/**"\`
-        if [ -n "$translation" ]
-        then
-            branch_name=$(git branch --show-current)
-            echo >&2 "🦜 Found translation(s) in commit in $range"
-            echo >&2 "Pushing $branch_name to Phrase"
-            yarn phrase push
-        fi
-    fi
-done
+# Check for Translations in commit
+translation=\`git --glob-pathspecs diff "$range" -- "@ornikar/*/translations/**" "@ornikar/*/src/translations/**"\`
+if [ -n "$translation" ]
+then
+    branch_name=$(git branch --show-current)
+    echo >&2 "🦜 Found translation(s) in commit in $range"
+    echo >&2 "Pushing $branch_name to Phrase"
+    yarn phrase push
+fi
 `;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ornikar/repo-config",
-  "version": "13.1.1",
+  "version": "13.2.0",
   "description": "🔧 repo config",
   "repository": {
     "directory": "@ornikar/repo-config",