From 9e0270e906b99b437e22fea0677aeaecc9280ebf Mon Sep 17 00:00:00 2001
From: Mayuran Visakan <mayuran.k.v@gmail.com>
Date: Wed, 30 Aug 2023 20:34:56 +0100
Subject: [PATCH] Update version fixing

---
 package.json          |  3 ++-
 version-bump.mjs      |  2 +-
 version-rebump.mjs    | 12 ------------
 version-rerelease.mjs |  6 ++++++
 4 files changed, 9 insertions(+), 14 deletions(-)
 delete mode 100644 version-rebump.mjs
 create mode 100644 version-rerelease.mjs

diff --git a/package.json b/package.json
index 3670627..8a1d810 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,8 @@
 		"build": "tsc -noEmit -skipLibCheck && node esbuild.config.mjs production",
 		"update": "ncu -u && npm install && node manual-update.mjs",
 		"lint": "eslint --fix --max-warnings=0 src && stylelint --fix --max-warnings=0 src/styles.css src/css",
-		"version": "node version-bump.mjs"
+		"version": "node version-bump.mjs",
+		"rerelease": "node version-rerelease.mjs"
 	},
 	"keywords": [],
 	"author": "Mayuran Visakan",
diff --git a/version-bump.mjs b/version-bump.mjs
index b7f1e3a..368934b 100644
--- a/version-bump.mjs
+++ b/version-bump.mjs
@@ -28,6 +28,6 @@ writeFileSync("src/settings.ts",settingsText.replace(/(?<=export const DEFAULT_S
 
 
 // Push to origin
-exec(`git add . && git commit -m 'Ready release ${newVersion}' && git push && git tag -a $npm_package_version -F- <<EOF && git push origin $npm_package_version && git push origin $npm_package_version
+exec(`git add . && git commit -m 'Ready release ${newVersion}' && git push && git tag -a $npm_package_version -F- <<EOF && git push origin $npm_package_version
 $release_notes
 EOF`,(error)=>console.log(error));
diff --git a/version-rebump.mjs b/version-rebump.mjs
deleted file mode 100644
index 60a30af..0000000
--- a/version-rebump.mjs
+++ /dev/null
@@ -1,12 +0,0 @@
-import { exec } from "child_process";
-
-// Get new version
-const revertVersion = process.env.npm_package_version;
-
-
-//<!-- Revert a broken release using `git reset --hard commitSHA && git push --force origin commitSHA:master` and `git tag -d x.y.z && git push -d origin x.y.z` -->
-
-// Push to origin
-exec(`git add . && git commit -m 'Ready release ${newVersion}' && git push && git tag -a $npm_package_version -F- <<EOF && git push origin $npm_package_version && git push origin $npm_package_version
-$release_notes
-EOF`,(error)=>console.log(error));
diff --git a/version-rerelease.mjs b/version-rerelease.mjs
new file mode 100644
index 0000000..4091dc8
--- /dev/null
+++ b/version-rerelease.mjs
@@ -0,0 +1,6 @@
+import { exec } from "child_process";
+
+// Remove tag and re-push tag
+exec(`git tag -d $npm_package_version && git push -d origin $npm_package_version && git tag -a $npm_package_version -F- <<EOF && git push origin $npm_package_version
+Add release notes from changelog
+EOF`,(error)=>console.log(error));