Skip to content

Commit 25b578f

Browse files
committed
upgrade trpc/trpc-cli
1 parent 91dc42a commit 25b578f

File tree

13 files changed

+541
-474
lines changed

13 files changed

+541
-474
lines changed

.mcp.json

+46
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
{
2+
"mcpServers": {
3+
"fetch": {
4+
"type": "stdio",
5+
"command": "uvx",
6+
"args": [
7+
"mcp-server-fetch"
8+
],
9+
"env": {}
10+
},
11+
"duckduckgo-web-search": {
12+
"type": "stdio",
13+
"command": "npx",
14+
"args": [
15+
"-y",
16+
"github:mmkal/duck-duck-scrape-mcp"
17+
]
18+
},
19+
"playwright": {
20+
"command": "npx",
21+
"args": [
22+
"@playwright/mcp@latest",
23+
"--headless"
24+
]
25+
},
26+
"sequential-thinking": {
27+
"command": "npx",
28+
"args": [
29+
"-y",
30+
"@modelcontextprotocol/server-sequential-thinking"
31+
]
32+
},
33+
"cli-parser": {
34+
"type": "stdio",
35+
"command": "node",
36+
"args": [
37+
"../vibebot/src/mcp/cli-parser.ts"
38+
]
39+
},
40+
"op": {
41+
"type": "stdio",
42+
"command": "node",
43+
"args": ["./server/mcp/op.ts"]
44+
}
45+
}
46+
}

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"tsx": "^4.19.0",
2727
"turbo": "^2.1.2",
2828
"type-fest": "^4.10.3",
29-
"typescript": "^5.6.2",
29+
"typescript": "^5.8.0",
3030
"util": "^0.12.3"
3131
}
3232
}

packages/admin/package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,10 @@
6060
"@radix-ui/react-switch": "^1.0.3",
6161
"@radix-ui/react-tooltip": "^1.0.7",
6262
"@silevis/reactgrid": "^4.1.3",
63-
"@tanstack/react-query": "^4.35.3",
64-
"@trpc/client": "^10.45.2",
65-
"@trpc/react-query": "^10.45.2",
66-
"@trpc/server": "^10.45.2",
63+
"@tanstack/react-query": "^5.71.1",
64+
"@trpc/client": "^11.0.1",
65+
"@trpc/react-query": "^11.0.1",
66+
"@trpc/server": "^11.0.1",
6767
"@uiw/react-codemirror": "^4.21.24",
6868
"@vitejs/plugin-react": "^4.2.0",
6969
"class-variance-authority": "^0.7.0",
@@ -105,7 +105,7 @@
105105
"strip-indent": "^4.0.0",
106106
"tailwindcss": "^3.4.3",
107107
"tsx": "^4.19.0",
108-
"typescript": "^5.6.2",
108+
"typescript": "^5.8.0",
109109
"typescript-eslint": "^7.1.0",
110110
"vite": "^5.0.0",
111111
"vitest": "^1.2.2",

packages/migra/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
"dependencies": {
2525
"@pgkit/client": "workspace:^",
2626
"@pgkit/schemainspect": "workspace:^",
27-
"@trpc/server": "^10.45.2",
28-
"trpc-cli": "^0.5.0",
27+
"@trpc/server": "^11.0.1",
28+
"trpc-cli": "^0.6.0-9",
2929
"zod": "^3.23.8"
3030
},
3131
"devDependencies": {

packages/migra/src/command.ts

+3-5
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import {Queryable, createClient} from '@pgkit/client'
22
import {PostgreSQL} from '@pgkit/schemainspect'
33
import {initTRPC} from '@trpc/server'
44
import {readFile} from 'fs/promises'
5-
import {trpcCli, TrpcCliMeta} from 'trpc-cli'
5+
import {createCli, TrpcCliMeta} from 'trpc-cli'
66
import {z} from 'zod'
77
import {Migration} from './migra'
88

@@ -129,6 +129,7 @@ const router = t.router({
129129
`migra 'postgresql://postgres:postgres@localhost:5432/migra_test_collations_a' 'postgresql://postgres:postgres@localhost:5432/migra_test_collations_a'`,
130130
`migra 'postgresql://postgres:postgres@localhost:5432/migra_test_collations_a' 'postgresql://postgres:postgres@localhost:5432/migra_test_collations_a' --unsafe`,
131131
],
132+
default: true,
132133
})
133134
.input(MigraRunInput)
134135
.query(async ({input: [dburlFrom, dburlTarget, args]}) => {
@@ -139,9 +140,6 @@ const router = t.router({
139140

140141
if (require.main === module) {
141142
// eslint-disable-next-line unicorn/prefer-top-level-await, no-console
142-
const cli = trpcCli({
143-
router,
144-
default: {procedure: 'run'},
145-
})
143+
const cli = createCli({router})
146144
void cli.run()
147145
}

packages/migrator/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,12 @@
4444
"@pgkit/client": "workspace:^",
4545
"@pgkit/formatter": "workspace:^",
4646
"@pgkit/migra": "workspace:^",
47-
"@trpc/server": "^10.45.2",
47+
"@trpc/server": "^11.0.1",
4848
"cleye": "^1.3.2",
4949
"picocolors": "^1.0.1",
5050
"strip-ansi": "6.0.0",
5151
"tasuku": "^2.0.1",
52-
"trpc-cli": "^0.5.0",
52+
"trpc-cli": "^0.6.0-9",
5353
"umzug": "^3.7.0",
5454
"zod": "^3.23.8",
5555
"zod-to-json-schema": "^3.23.0",

packages/pgkit/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
"@pgkit/typegen": "workspace:^",
4949
"express": "^4.18.2",
5050
"importx": "^0.4.4",
51-
"trpc-cli": "^0.5.0"
51+
"trpc-cli": "^0.6.0-9"
5252
},
5353
"peerDependencies": {
5454
"@pgkit/admin": "workspace:^"

packages/pgkit/src/router.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ export const router = t.router({
3131
}),
3232
),
3333
generate: procedureWithClient
34-
.use(async ({rawInput, ctx, next}) => {
34+
.use(async ({getRawInput, ctx, next}) => {
35+
const rawInput = getRawInput() as {}
3536
const inputObject = typeof rawInput === 'object' ? Object.keys(rawInput || {}) : []
3637
return next({
3738
ctx: {...ctx, inputKeys: new Set(Object.keys(inputObject))},

packages/typegen/package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
"@pgkit/client": "workspace:^",
3333
"@rebundled/execa": "8.0.2-next.0",
3434
"@rebundled/p-memoize": "7.1.2-next.8",
35+
"@trpc/server": "^11.0.1",
3536
"chokidar": "^3.5.3",
3637
"execa": "^5.1.1",
3738
"find-up": "^5.0.0",
@@ -42,7 +43,7 @@
4243
"neverthrow": "^7.1.0",
4344
"pgsql-ast-parser": "^11.1.0",
4445
"pluralize": "^8.0.0",
45-
"trpc-cli": "^0.5.0",
46+
"trpc-cli": "^0.6.0-9",
4647
"zod": "^3.23.8"
4748
},
4849
"devDependencies": {

packages/typegen/src/router.ts

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1+
import * as trpcServer from '@trpc/server'
12
import {existsSync} from 'fs'
23
import * as path from 'path'
3-
import {trpcServer, z, TrpcCliMeta} from 'trpc-cli'
4+
import {z, TrpcCliMeta} from 'trpc-cli'
45
import * as defaults from './defaults'
56
import {generate, Options} from './generate'
67

@@ -71,7 +72,8 @@ export const CliOptions = z
7172

7273
export const router = trpc.router({
7374
generate: trpc.procedure
74-
.use(async ({rawInput, ctx, next}) => {
75+
.use(async ({ctx, next, getRawInput}) => {
76+
const rawInput = getRawInput() as {}
7577
const inputObject = typeof rawInput === 'object' ? Object.keys(rawInput || {}) : []
7678
return next({
7779
ctx: {...ctx, inputKeys: new Set(Object.keys(inputObject))},

0 commit comments

Comments
 (0)