diff --git a/packages/components/package.json b/packages/components/package.json
index dd701c7b..98c858f5 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -6,7 +6,8 @@
     "types": "dist/src/index.d.ts",
     "scripts": {
         "build": "tsc && gulp",
-        "dev": "tsc --watch",
+        "dev:gulp": "gulp",
+        "dev": "tsc-watch --noClear -p ./tsconfig.json --onSuccess \"pnpm dev:gulp\"",
         "lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
         "clean": "rimraf dist",
         "nuke": "rimraf dist node_modules"
@@ -103,8 +104,8 @@
         "eslint-plugin-react-hooks": "^4.6.0",
         "gulp": "^4.0.2",
         "rimraf": "^5.0.5",
+        "tsc-watch": "^6.0.4",
         "tslib": "^2.6.2",
-        "tsup": "^8.0.1",
         "typescript": "^4.8.4"
     }
 }
diff --git a/packages/server/nodemon.json b/packages/server/nodemon.json
index 6d4e901f..d4688a54 100644
--- a/packages/server/nodemon.json
+++ b/packages/server/nodemon.json
@@ -1,6 +1,6 @@
 {
     "ignore": ["**/*.spec.ts", ".git", "node_modules"],
     "watch": ["commands", "index.ts", "src", "../components/nodes", "../components/src"],
-    "exec": "npm start",
+    "exec": "pnpm start",
     "ext": "ts"
 }
diff --git a/packages/server/package.json b/packages/server/package.json
index ffdba302..366343c2 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -26,7 +26,7 @@
         "nuke": "rimraf dist node_modules",
         "start:windows": "cd bin && run start",
         "start:default": "cd bin && ./run start",
-        "dev": "tsc-watch --noClear -p ./tsconfig.json",
+        "dev": "tsc-watch --noClear -p ./tsconfig.json --onSuccess \"pnpm start\"",
         "oclif-dev": "run-script-os",
         "oclif-dev:windows": "cd bin && dev start",
         "oclif-dev:default": "cd bin && ./dev start",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3b957c31..a8f9470c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -327,6 +327,9 @@ importers:
       rimraf:
         specifier: ^5.0.5
         version: 5.0.5
+      tsc-watch:
+        specifier: ^6.0.4
+        version: 6.0.4(typescript@4.9.5)
       tslib:
         specifier: ^2.6.2
         version: 2.6.2