chore: Resolve merge conflicts

2024-07-31 21:26:54 +08:00
parent 4074a88c13
commit 082847c441
44 changed files with 772 additions and 475 deletions
--- a/internal/node-utils/package.json
+++ b/internal/node-utils/package.json
@@ -30,13 +30,20 @@
  "dependencies": {
    "@changesets/git": "^3.0.0",
    "@manypkg/get-packages": "^2.2.2",
+    "chalk": "^5.3.0",
    "consola": "^3.2.3",
    "dayjs": "^1.11.12",
+    "execa": "^9.3.0",
    "find-up": "^7.0.0",
+    "fs-extra": "^11.2.0",
    "nanoid": "^5.0.7",
+    "ora": "^8.0.1",
    "pkg-types": "^1.1.3",
    "prettier": "^3.3.3",
-    "rimraf": "^6.0.1",
-    "zx": "^8.1.4"
+    "rimraf": "^6.0.1"
+  },
+  "devDependencies": {
+    "@types/chalk": "^2.2.0",
+    "@types/fs-extra": "^11.0.4"
  }
 }