Skip to content

Commit 336a1bb

Browse files
committed
chore: fix type issues, run on node 22
1 parent 48160ec commit 336a1bb

File tree

13 files changed

+22
-19
lines changed

13 files changed

+22
-19
lines changed

.github/workflows/ci.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: Set up Node.js
2323
uses: actions/setup-node@v4
2424
with:
25-
node-version: 20
25+
node-version: 22
2626
cache: 'pnpm'
2727

2828
- name: Install dependencies
@@ -93,7 +93,7 @@ jobs:
9393
- name: Set up Node.js
9494
uses: actions/setup-node@v4
9595
with:
96-
node-version: 20
96+
node-version: 22
9797
cache: 'pnpm'
9898

9999
- name: Restore build cache
@@ -129,7 +129,7 @@ jobs:
129129
- name: Set up Node.js
130130
uses: actions/setup-node@v4
131131
with:
132-
node-version: 20
132+
node-version: 22
133133
cache: 'pnpm'
134134

135135
- name: Restore build cache
@@ -195,7 +195,7 @@ jobs:
195195
- name: Set up Node.js
196196
uses: actions/setup-node@v4
197197
with:
198-
node-version: 20
198+
node-version: 22
199199
cache: 'pnpm'
200200

201201
- name: Install dependencies
@@ -220,7 +220,7 @@ jobs:
220220
- name: Set up Node.js
221221
uses: actions/setup-node@v4
222222
with:
223-
node-version: 20
223+
node-version: 22
224224
cache: 'pnpm'
225225

226226
- name: Restore build cache
@@ -263,7 +263,7 @@ jobs:
263263
- name: Set up Node.js
264264
uses: actions/setup-node@v4
265265
with:
266-
node-version: 20
266+
node-version: 22
267267
cache: 'pnpm'
268268

269269
- name: Restore build cache

.github/workflows/compat.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- name: Set up Node.js
1818
uses: actions/setup-node@v4
1919
with:
20-
node-version: 20
20+
node-version: 22
2121

2222
- name: Set up pnpm
2323
uses: pnpm/action-setup@v4
@@ -62,7 +62,7 @@ jobs:
6262
- name: Setup Node.js
6363
uses: actions/setup-node@v4
6464
with:
65-
node-version: 20
65+
node-version: 22
6666

6767
- uses: pnpm/action-setup@v4
6868
with:

.github/workflows/release-preview.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: Set up Node.js
1919
uses: actions/setup-node@v4
2020
with:
21-
node-version: 20
21+
node-version: 22
2222

2323
- name: Set up pnpm
2424
uses: pnpm/action-setup@v4

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- name: Set up Node.js
2222
uses: actions/setup-node@v4
2323
with:
24-
node-version: 20
24+
node-version: 22
2525
always-auth: true
2626
registry-url: https://registry.npmjs.org
2727

.github/workflows/smoke-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- name: Set up Node.js
2121
uses: actions/setup-node@v4
2222
with:
23-
node-version: 20
23+
node-version: 22
2424

2525
- name: Set up pnpm
2626
uses: pnpm/action-setup@v4

.github/workflows/typescript-nightly.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- name: Set up Node.js
1414
uses: actions/setup-node@v4
1515
with:
16-
node-version: 20
16+
node-version: 22
1717

1818
- name: Get latest TypeScript version
1919
id: get-versions
@@ -42,7 +42,7 @@ jobs:
4242
- name: Set up Node.js
4343
uses: actions/setup-node@v4
4444
with:
45-
node-version: 20
45+
node-version: 22
4646

4747
- name: Set up pnpm
4848
uses: pnpm/action-setup@v4

src/core/new/handlers-controller.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
import { invariant } from 'outvariant'
22
import { type HttpHandler } from '../handlers/HttpHandler'
3+
import { type GraphQLHandler } from '../handlers/GraphQLHandler'
34
import { type WebSocketHandler } from '../handlers/WebSocketHandler'
45
import { devUtils } from '../utils/internal/devUtils'
56

6-
export type AnyHandler = HttpHandler | WebSocketHandler
7+
export type AnyHandler = HttpHandler | GraphQLHandler | WebSocketHandler
78

89
function validateHandlers(handlers: Array<AnyHandler>): boolean {
910
return handlers.every((handler) => !Array.isArray(handler))

src/core/utils/cookieStore.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import {
44
Cookie,
55
CookieJar,
66
MemoryCookieStore,
7+
SerializedCookie,
78
type MemoryCookieStoreIndex,
89
} from 'tough-cookie'
910
import { jsonParse } from './internal/jsonParse'
@@ -76,7 +77,7 @@ class CookieStore {
7677
return
7778
}
7879

79-
const data = []
80+
const data: Array<SerializedCookie> = []
8081
const { idx } = this.#memoryStore
8182

8283
for (const domain in idx) {

src/tsconfig.node.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
}
99
],
1010
"compilerOptions": {
11-
"types": ["node"]
11+
"types": ["@types/node"]
1212
}
1313
}

test/tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"esModuleInterop": true,
1515
"declaration": false,
1616
"noEmit": true,
17-
"types": ["node", "vitest/globals"]
17+
"types": ["@types/node", "vitest/globals"]
1818
},
1919
"include": ["**/*.ts"]
2020
}

0 commit comments

Comments
 (0)