From 024fbe375fde2906a0227da47587fc91f7f9e1fa Mon Sep 17 00:00:00 2001
From: Jonathan Ho <heiheiho000@gmail.com>
Date: Fri, 20 Jan 2023 10:27:41 -0800
Subject: [PATCH] chore: fix deps and script (#2733)

---
 package.json                     |  6 ++----
 packages/client/package.json     |  2 +-
 packages/discordeno/package.json |  2 +-
 packages/gateway/package.json    |  2 +-
 packages/rest/package.json       |  2 +-
 packages/utils/package.json      |  8 ++++----
 scripts/bumpVersionByCommit.js   | 25 +++++++++----------------
 7 files changed, 19 insertions(+), 28 deletions(-)

diff --git a/package.json b/package.json
index 00626562e..63db46512 100644
--- a/package.json
+++ b/package.json
@@ -29,6 +29,7 @@
     "husky": "^8.0.2",
     "lint-staged": "^13.0.4",
     "prettier": "^2.8.0",
+    "turbo": "^1.6.3",
     "typedoc": "^0.23.21",
     "typedoc-plugin-markdown": "^3.13.6",
     "typescript": "^4.9.3"
@@ -42,8 +43,5 @@
       "eslint --fix --config ./packages/eslint-config-discordeno/index.js --resolve-plugins-relative-to ."
     ]
   },
-  "packageManager": "yarn@3.3.0",
-  "dependencies": {
-    "turbo": "^1.6.3"
-  }
+  "packageManager": "yarn@3.3.0"
 }
diff --git a/packages/client/package.json b/packages/client/package.json
index c4c38a7f6..6ae716d24 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -25,10 +25,10 @@
   "dependencies": {
     "@discordeno/gateway": "19.0.0-alpha.1",
     "@discordeno/rest": "19.0.0-alpha.1",
+    "@discordeno/types": "19.0.0-alpha.1",
     "@discordeno/utils": "19.0.0-alpha.1"
   },
   "devDependencies": {
-    "@discordeno/types": "19.0.0-alpha.1",
     "@swc/cli": "^0.1.57",
     "@swc/core": "^1.3.21",
     "@types/chai": "^4",
diff --git a/packages/discordeno/package.json b/packages/discordeno/package.json
index 5bb9710f6..54e9f3d49 100644
--- a/packages/discordeno/package.json
+++ b/packages/discordeno/package.json
@@ -25,10 +25,10 @@
   "dependencies": {
     "@discordeno/gateway": "19.0.0-alpha.1",
     "@discordeno/rest": "19.0.0-alpha.1",
+    "@discordeno/types": "19.0.0-alpha.1",
     "@discordeno/utils": "19.0.0-alpha.1"
   },
   "devDependencies": {
-    "@discordeno/types": "19.0.0-alpha.1",
     "@swc/cli": "^0.1.57",
     "@swc/core": "^1.3.21",
     "@types/chai": "^4",
diff --git a/packages/gateway/package.json b/packages/gateway/package.json
index 88cdc7d6d..76e58af88 100644
--- a/packages/gateway/package.json
+++ b/packages/gateway/package.json
@@ -23,11 +23,11 @@
     "test:test-type": "tsc --project tsconfig.test.json"
   },
   "dependencies": {
+    "@discordeno/types": "19.0.0-alpha.1",
     "@discordeno/utils": "19.0.0-alpha.1",
     "ws": "^8.11.0"
   },
   "devDependencies": {
-    "@discordeno/types": "19.0.0-alpha.1",
     "@swc/cli": "^0.1.57",
     "@swc/core": "^1.3.21",
     "@types/chai": "^4",
diff --git a/packages/rest/package.json b/packages/rest/package.json
index f229c0cb2..ea8272c29 100644
--- a/packages/rest/package.json
+++ b/packages/rest/package.json
@@ -24,11 +24,11 @@
     "test:test-type": "tsc --project tsconfig.test.json"
   },
   "dependencies": {
+    "@discordeno/types": "19.0.0-alpha.1",
     "@discordeno/utils": "19.0.0-alpha.1",
     "dotenv": "^16.0.3"
   },
   "devDependencies": {
-    "@discordeno/types": "19.0.0-alpha.1",
     "@swc/cli": "^0.1.57",
     "@swc/core": "^1.3.21",
     "@types/chai": "^4",
diff --git a/packages/utils/package.json b/packages/utils/package.json
index f3c47cadf..25c4a269d 100644
--- a/packages/utils/package.json
+++ b/packages/utils/package.json
@@ -22,8 +22,11 @@
     "test:type": "tsc --noEmit",
     "test:test-type": "tsc --project tsconfig.test.json"
   },
-  "devDependencies": {
+  "dependencies": {
     "@discordeno/types": "19.0.0-alpha.1",
+    "tweetnacl": "^1.0.3"
+  },
+  "devDependencies": {
     "@swc/cli": "^0.1.57",
     "@swc/core": "^1.3.21",
     "@types/chai": "^4",
@@ -39,8 +42,5 @@
     "ts-node": "^10.9.1",
     "tsconfig": "*",
     "typescript": "^4.9.3"
-  },
-  "dependencies": {
-    "tweetnacl": "^1.0.3"
   }
 }
diff --git a/scripts/bumpVersionByCommit.js b/scripts/bumpVersionByCommit.js
index 5c37a55b4..ddc8b9920 100644
--- a/scripts/bumpVersionByCommit.js
+++ b/scripts/bumpVersionByCommit.js
@@ -8,21 +8,14 @@ if (!packageName) {
   throw new Error('No package name specified')
 }
 
-const commitHash = childProcess
-  .execSync('git rev-parse HEAD')
-  .toString()
-  .trim()
-  .slice(0, 7)
+const commitHash = childProcess.execSync('git rev-parse HEAD').toString().trim().slice(0, 7)
 
-const file = JSON.parse(
-  await fs.readFile(`packages/${packageName}/package.json`, 'utf-8')
-)
-file.version = `${file.version.split('-')[0]}-next.${commitHash}`
-await fs.writeFile(
-  `packages/${packageName}/package.json`,
-  JSON.stringify(file, null, 2)
-)
+const file = JSON.parse(await fs.readFile(`packages/${packageName}/package.json`, 'utf-8'))
+const oldVersion = file.version
+file.version = `${oldVersion.split('-')[0]}-next.${commitHash}`
+Object.keys(file.dependencies).forEach((dependency) => {
+  if (file.dependencies[dependency] === oldVersion) file.dependencies[dependency] = file.version
+})
+await fs.writeFile(`packages/${packageName}/package.json`, JSON.stringify(file, null, 2))
 
-console.log(
-  `Bumped ${packageName} to ${file.version.split('-')[0]}-next.${commitHash}`
-)
+console.log(`Bumped ${packageName} to ${file.version.split('-')[0]}-next.${commitHash}`)