| author | |
| committer | |
| log | 7e5cd01d26b21093947cb9b988f5963b8ed6ce26 |
| tree | dce76e8cd26c8b8a3e476e89beb7cfce73dfa2a7 |
| parent | 01c3e8266b1cf6b008972c86c8a0fb4b35220935 |
- 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>6 files changed, 21 insertions(+), 31 deletions(-)
apps/desktop/scripts/dev-electron.mjs+1-1| ... | @@ -10,7 +10,7 @@ await waitOn({ | ... | @@ -10,7 +10,7 @@ await waitOn({ |
| 10 | `tcp:${port}`, | 10 | `tcp:${port}`, |
| 11 | "file:dist-electron/main.js", | 11 | "file:dist-electron/main.js", |
| 12 | "file:dist-electron/preload.js", | 12 | "file:dist-electron/preload.js", |
| 13 | // "file:../server/dist/index.cjs", | 13 | "file:../server/dist/index.mjs", |
| 14 | ], | 14 | ], |
| 15 | }); | 15 | }); |
| 16 | 16 |
apps/desktop/turbo.jsonc+8-8| ... | @@ -1,24 +1,24 @@ | ... | @@ -1,24 +1,24 @@ |
| 1 | { | 1 | { |
| 2 | "$schema": "https://turborepo.com/schema.json", | 2 | "$schema": "https://turbo.build/schema.json", |
| 3 | "extends": ["//"], | 3 | "extends": ["//"], |
| 4 | "tasks": { | 4 | "tasks": { |
| 5 | "build": { | 5 | "build": { |
| 6 | "dependsOn": ["^build"], | 6 | "dependsOn": ["^build"], |
| 7 | "outputs": ["dist-electron/**"], | 7 | "outputs": ["dist-electron/**"] |
| 8 | }, | 8 | }, |
| 9 | "dev": { | 9 | "dev": { |
| 10 | "dependsOn": ["@t3tools/contracts#build", "t3#build"], | 10 | "dependsOn": ["t3#build"], |
| 11 | "persistent": true, | 11 | "persistent": true |
| 12 | }, | 12 | }, |
| 13 | "start": { | 13 | "start": { |
| 14 | "dependsOn": ["build", "@t3tools/web#build", "t3#build"], | 14 | "dependsOn": ["build", "@t3tools/web#build", "t3#build"], |
| 15 | "cache": false, | 15 | "cache": false, |
| 16 | "persistent": true, | 16 | "persistent": true |
| 17 | }, | 17 | }, |
| 18 | "smoke-test": { | 18 | "smoke-test": { |
| 19 | "dependsOn": ["build", "@t3tools/web#build", "t3#build"], | 19 | "dependsOn": ["build", "@t3tools/web#build", "t3#build"], |
| 20 | "cache": false, | 20 | "cache": false, |
| 21 | "outputs": [], | 21 | "outputs": [] |
| 22 | }, | 22 | } |
| 23 | }, | 23 | } |
| 24 | } | 24 | } |
apps/server/turbo.jsonc-5| ... | @@ -2,11 +2,6 @@ | ... | @@ -2,11 +2,6 @@ |
| 2 | "$schema": "https://turbo.build/schema.json", | 2 | "$schema": "https://turbo.build/schema.json", |
| 3 | "extends": ["//"], | 3 | "extends": ["//"], |
| 4 | "tasks": { | 4 | "tasks": { |
| 5 | "dev": { | ||
| 6 | "dependsOn": ["@t3tools/contracts#dev"], | ||
| 7 | "persistent": true, | ||
| 8 | "interruptible": true | ||
| 9 | }, | ||
| 10 | "start": { | 5 | "start": { |
| 11 | "dependsOn": ["build"], | 6 | "dependsOn": ["build"], |
| 12 | "cache": false, | 7 | "cache": false, |
package.json+4-4| ... | @@ -6,10 +6,10 @@ | ... | @@ -6,10 +6,10 @@ |
| 6 | "packages/*" | 6 | "packages/*" |
| 7 | ], | 7 | ], |
| 8 | "scripts": { | 8 | "scripts": { |
| 9 | "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", | 9 | "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", |
| 10 | "dev:server": "turbo watch dev --filter=t3", | 10 | "dev:server": "turbo run dev --filter=t3", |
| 11 | "dev:web": "VITE_WS_URL=ws://localhost:3773 turbo watch dev --filter=@t3tools/web", | 11 | "dev:web": "VITE_WS_URL=ws://localhost:3773 turbo run dev --filter=@t3tools/web", |
| 12 | "dev:desktop": "turbo watch dev --filter=@t3tools/desktop --filter=@t3tools/web", | 12 | "dev:desktop": "turbo run dev --filter=@t3tools/desktop --filter=@t3tools/web --parallel", |
| 13 | "start": "turbo run start --filter=t3", | 13 | "start": "turbo run start --filter=t3", |
| 14 | "start:desktop": "turbo run start --filter=@t3tools/desktop", | 14 | "start:desktop": "turbo run start --filter=@t3tools/desktop", |
| 15 | "build": "turbo run build", | 15 | "build": "turbo run build", |
packages/contracts/package.json+5-10| ... | @@ -8,21 +8,16 @@ | ... | @@ -8,21 +8,16 @@ |
| 8 | "type": "module", | 8 | "type": "module", |
| 9 | "main": "./dist/index.cjs", | 9 | "main": "./dist/index.cjs", |
| 10 | "module": "./dist/index.mjs", | 10 | "module": "./dist/index.mjs", |
| 11 | "types": "./src/index.d.cts", | 11 | "types": "./src/index.ts", |
| 12 | "exports": { | 12 | "exports": { |
| 13 | ".": { | 13 | ".": { |
| 14 | "import": { | 14 | "types": "./src/index.ts", |
| 15 | "types": "./src/index.d.mts", | 15 | "import": "./dist/index.mjs", |
| 16 | "default": "./dist/index.mjs" | 16 | "require": "./dist/index.cjs" |
| 17 | }, | ||
| 18 | "require": { | ||
| 19 | "types": "./src/index.d.cts", | ||
| 20 | "default": "./dist/index.cjs" | ||
| 21 | } | ||
| 22 | } | 17 | } |
| 23 | }, | 18 | }, |
| 24 | "scripts": { | 19 | "scripts": { |
| 25 | "dev": "tsdown src/index.ts --format esm,cjs --dts", | 20 | "dev": "tsdown src/index.ts --format esm,cjs --dts --watch --clean", |
| 26 | "build": "tsdown src/index.ts --format esm,cjs --dts --clean", | 21 | "build": "tsdown src/index.ts --format esm,cjs --dts --clean", |
| 27 | "typecheck": "tsc --noEmit", | 22 | "typecheck": "tsc --noEmit", |
| 28 | "test": "vitest run" | 23 | "test": "vitest run" |
turbo.json+3-3| ... | @@ -18,12 +18,12 @@ | ... | @@ -18,12 +18,12 @@ |
| 18 | "outputs": ["dist/**", "dist-electron/**"] | 18 | "outputs": ["dist/**", "dist-electron/**"] |
| 19 | }, | 19 | }, |
| 20 | "dev": { | 20 | "dev": { |
| 21 | "dependsOn": ["^dev"], | 21 | "dependsOn": ["@t3tools/contracts#build"], |
| 22 | "cache": false, | 22 | "cache": false, |
| 23 | "persistent": false | 23 | "persistent": true |
| 24 | }, | 24 | }, |
| 25 | "typecheck": { | 25 | "typecheck": { |
| 26 | "dependsOn": ["^build"], | 26 | "dependsOn": ["^typecheck"], |
| 27 | "outputs": [] | 27 | "outputs": [] |
| 28 | }, | 28 | }, |
| 29 | "test": { | 29 | "test": { |