Merge pull request #37 from nebarf/fix-release

Check if main branch is up to date before releasing

Author: nebarf

.release-it.json

@@ -2,15 +2,19 @@
   "git": {
     "tagName": "v${version}",
     "commitMessage": "Release v${version}",
-    "requireBranch": "main"
+    "requireBranch": "main",
+    "requireCommits": true
   },
   "hooks": {
+    "before:init": [
+      "yarn before-release-init"
+    ],
     "after:bump": [
       "yarn changelog",
       "git add CHANGELOG.md"
     ],
     "before:npm:release": [
-      "rimraf lib",
+      "yarn clean-build",
       "yarn build"
     ]
   },

bin/before-release-init.mjs

@@ -0,0 +1,31 @@
+/* eslint-disable no-console */
+import shell from 'shelljs';
+
+const upstream = '@{u}';
+
+const isUpstreamConfigured =
+  shell.exec(`git rev-parse --abbrev-ref --symbolic-full-name ${upstream}`).code === 0;
+
+if (!isUpstreamConfigured) {
+  console.error('You must configure upstream for the branch.');
+  shell.exit();
+}
+
+const local = shell.exec('git rev-parse @');
+const remote = shell.exec(`git rev-parse ${upstream}`);
+const base = shell.exec(`git merge-base @ ${upstream}`);
+
+// Branch is up to date with or ahead to remote.
+if (local === remote || remote === base) {
+  shell.exit(0);
+}
+
+// The local branch is behind the remote version, a pull is needed.
+if (local === base) {
+  console.error('The local branch is behind the remote version');
+  shell.exit();
+}
+
+// Local and remote diverged.
+console.log('Local branch and remote branch diverged!');
+shell.exit();

package.json

@@ -40,19 +40,21 @@
     "react-dom": "^17.0.2",
     "react-hooks-testing-library": "^0.6.0",
     "release-it": "^14.11.6",
-    "rimraf": "^3.0.2",
+    "shelljs": "^0.8.4",
+    "shx": "^0.3.3",
     "ts-jest": "^27.0.5",
     "typescript": "^4.4.3"
   },
   "scripts": {
-    "rim": "rimraf lib",
+    "before-release-init": "node ./bin/before-release-init.mjs",
     "build": "yarn build:esm && yarn build:cjs",
     "build:prod": "yarn build:prod:esm && yarn build:prod:cjs",
     "build:watch": "yarn build:esm -w && yarn build:cjs -w",
     "build:esm": "tsc",
     "build:cjs": "tsc --module commonjs --outDir lib/cjs",
     "build:prod:esm": "tsc -p tsconfig.prod.json",
     "build:prod:cjs": "tsc -p tsconfig.prod.json --module commonjs --outDir lib/cjs",
+    "clean-build": "shx rm -rf lib",
     "changelog": "auto-changelog -p --template ./changelog.template.hbs",
     "prepare": "husky install",
     "pre-commit": "lint-staged",

yarn.lock

@@ -3816,7 +3816,7 @@ minimatch@^3.0.4:
   dependencies:
     brace-expansion "^1.1.7"
 
-minimist@^1.2.0, minimist@^1.2.5:
+minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
   integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
@@ -4663,7 +4663,7 @@ shebang-regex@^3.0.0:
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
   integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
 
-shelljs@0.8.4:
+shelljs@0.8.4, shelljs@^0.8.4:
   version "0.8.4"
   resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.4.tgz#de7684feeb767f8716b326078a8a00875890e3c2"
   integrity sha512-7gk3UZ9kOfPLIAbslLzyWeGiEqx9e3rxwZM0KE6EL8GlGwjym9Mrlx5/p33bWTu9YG6vcS4MBxYZDHYr5lr8BQ==
@@ -4672,6 +4672,14 @@ shelljs@0.8.4:
     interpret "^1.0.0"
     rechoir "^0.6.2"
 
+shx@^0.3.3:
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/shx/-/shx-0.3.3.tgz#681a88c7c10db15abe18525349ed474f0f1e7b9f"
+  integrity sha512-nZJ3HFWVoTSyyB+evEKjJ1STiixGztlqwKLTUNV5KqMWtGey9fTd4KU1gdZ1X9BV6215pswQ/Jew9NsuS/fNDA==
+  dependencies:
+    minimist "^1.2.3"
+    shelljs "^0.8.4"
+
 side-channel@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf"