From 7e5cd01d26b21093947cb9b988f5963b8ed6ce26 Mon Sep 17 00:00:00 2001
From: Julius Marminge <julius0216@outlook.com>
Date: Wed, 11 Feb 2026 12:54:19 -0800
Subject: [PATCH] Polish turbo task graph and dev scripts

- Switch from turbo watch to turbo run --parallel for dev scripts
- Simplify contracts exports to use ./src/index.ts for types directly
- Add --watch --clean to contracts dev script
- Root dev task depends on contracts#build, is persistent
- Revert typecheck to depend on ^typecheck (contracts types from source)
- Remove redundant server dev task override
- Desktop dev depends only on t3#build (contracts implied)
- Uncomment server dist wait in dev-electron.mjs

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 apps/desktop/scripts/dev-electron.mjs |  2 +-
 apps/desktop/turbo.jsonc              | 16 ++++++++--------
 apps/server/turbo.jsonc               |  5 -----
 package.json                          |  8 ++++----
 packages/contracts/package.json       | 15 +++++----------
 turbo.json                            |  6 +++---
 6 files changed, 21 insertions(+), 31 deletions(-)

diff --git a/apps/desktop/scripts/dev-electron.mjs b/apps/desktop/scripts/dev-electron.mjs
index 2a6153a7da7c6549ec75106f99601025de575079..dacbb99c668b2205762b5955a5486d725778b5b2 100644
--- a/apps/desktop/scripts/dev-electron.mjs
+++ b/apps/desktop/scripts/dev-electron.mjs
@@ -10,7 +10,7 @@ await waitOn({
     `tcp:${port}`,
     "file:dist-electron/main.js",
     "file:dist-electron/preload.js",
-    // "file:../server/dist/index.cjs",
+    "file:../server/dist/index.mjs",
   ],
 });
 
diff --git a/apps/desktop/turbo.jsonc b/apps/desktop/turbo.jsonc
index c99c47cbfc2547f54e4df3dc10aa31e3c9e3cbd1..8994c7806266b3b8ca989f4f66d9020593509d6c 100644
--- a/apps/desktop/turbo.jsonc
+++ b/apps/desktop/turbo.jsonc
@@ -1,24 +1,24 @@
 {
-  "$schema": "https://turborepo.com/schema.json",
+  "$schema": "https://turbo.build/schema.json",
   "extends": ["//"],
   "tasks": {
     "build": {
       "dependsOn": ["^build"],
-      "outputs": ["dist-electron/**"],
+      "outputs": ["dist-electron/**"]
     },
     "dev": {
-      "dependsOn": ["@t3tools/contracts#build", "t3#build"],
-      "persistent": true,
+      "dependsOn": ["t3#build"],
+      "persistent": true
     },
     "start": {
       "dependsOn": ["build", "@t3tools/web#build", "t3#build"],
       "cache": false,
-      "persistent": true,
+      "persistent": true
     },
     "smoke-test": {
       "dependsOn": ["build", "@t3tools/web#build", "t3#build"],
       "cache": false,
-      "outputs": [],
-    },
-  },
+      "outputs": []
+    }
+  }
 }
diff --git a/apps/server/turbo.jsonc b/apps/server/turbo.jsonc
index 348412533d8f0f503992d5773e7b4ba78eabfb21..c466a3a0251b38bf9a65ddcf7b5b9dad99adc544 100644
--- a/apps/server/turbo.jsonc
+++ b/apps/server/turbo.jsonc
@@ -2,11 +2,6 @@
   "$schema": "https://turbo.build/schema.json",
   "extends": ["//"],
   "tasks": {
-    "dev": {
-      "dependsOn": ["@t3tools/contracts#dev"],
-      "persistent": true,
-      "interruptible": true
-    },
     "start": {
       "dependsOn": ["build"],
       "cache": false,
diff --git a/package.json b/package.json
index 2d5c5da546e17b5c6438a971e864b64ddbd214cd..106d67ba2300d65e227b6f04300412d161e267db 100644
--- a/package.json
+++ b/package.json
@@ -6,10 +6,10 @@
     "packages/*"
   ],
   "scripts": {
-    "dev": "T3CODE_LOG_WS_EVENTS=1 VITE_WS_URL=ws://localhost:3773 turbo watch dev --ui=tui --filter=@t3tools/contracts --filter=@t3tools/web --filter=t3",
-    "dev:server": "turbo watch dev --filter=t3",
-    "dev:web": "VITE_WS_URL=ws://localhost:3773 turbo watch dev --filter=@t3tools/web",
-    "dev:desktop": "turbo watch dev --filter=@t3tools/desktop --filter=@t3tools/web",
+    "dev": "T3CODE_LOG_WS_EVENTS=1 VITE_WS_URL=ws://localhost:3773 turbo run dev --ui=tui --filter=@t3tools/contracts --filter=@t3tools/web --filter=t3 --parallel",
+    "dev:server": "turbo run dev --filter=t3",
+    "dev:web": "VITE_WS_URL=ws://localhost:3773 turbo run dev --filter=@t3tools/web",
+    "dev:desktop": "turbo run dev --filter=@t3tools/desktop --filter=@t3tools/web --parallel",
     "start": "turbo run start --filter=t3",
     "start:desktop": "turbo run start --filter=@t3tools/desktop",
     "build": "turbo run build",
diff --git a/packages/contracts/package.json b/packages/contracts/package.json
index d4216fd398057583d0dc8d17ed16a4cdbd382536..a2e4a1f71b5e8ea719731dfaab039568821d4f40 100644
--- a/packages/contracts/package.json
+++ b/packages/contracts/package.json
@@ -8,21 +8,16 @@
   "type": "module",
   "main": "./dist/index.cjs",
   "module": "./dist/index.mjs",
-  "types": "./src/index.d.cts",
+  "types": "./src/index.ts",
   "exports": {
     ".": {
-      "import": {
-        "types": "./src/index.d.mts",
-        "default": "./dist/index.mjs"
-      },
-      "require": {
-        "types": "./src/index.d.cts",
-        "default": "./dist/index.cjs"
-      }
+      "types": "./src/index.ts",
+      "import": "./dist/index.mjs",
+      "require": "./dist/index.cjs"
     }
   },
   "scripts": {
-    "dev": "tsdown src/index.ts --format esm,cjs --dts",
+    "dev": "tsdown src/index.ts --format esm,cjs --dts --watch --clean",
     "build": "tsdown src/index.ts --format esm,cjs --dts --clean",
     "typecheck": "tsc --noEmit",
     "test": "vitest run"
diff --git a/turbo.json b/turbo.json
index fd290124b898acd2666b852ffa7a025d36fc6279..6d0970bf95c71911f22da3f4118c33ffe6205bda 100644
--- a/turbo.json
+++ b/turbo.json
@@ -18,12 +18,12 @@
       "outputs": ["dist/**", "dist-electron/**"]
     },
     "dev": {
-      "dependsOn": ["^dev"],
+      "dependsOn": ["@t3tools/contracts#build"],
       "cache": false,
-      "persistent": false
+      "persistent": true
     },
     "typecheck": {
-      "dependsOn": ["^build"],
+      "dependsOn": ["^typecheck"],
       "outputs": []
     },
     "test": {
-- 
2.54.0