Skip to content

Commit b3091b5

Browse files
kettanaitokettanaito
authored
feat: use tsdown for bundling (#759)
1 parent af69a35 commit b3091b5

File tree

20 files changed

+739
-1163
lines changed

20 files changed

+739
-1163
lines changed

‎.github/workflows/compat.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
cache: 'pnpm'
2626

2727
- name: Install dependencies

‎ClientRequest/package.json‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
{
2-
"main": "../lib/node/interceptors/ClientRequest/index.js",
2+
"main": "../lib/node/interceptors/ClientRequest/index.cjs",
33
"module": "../lib/node/interceptors/ClientRequest/index.mjs",
44
"browser": null,
5-
"types": "../lib/node/interceptors/ClientRequest/index.d.ts"
5+
"exports": {
6+
".": {
7+
"import": "./../lib/node/interceptors/ClientRequest/index.mjs",
8+
"default": "./../lib/node/interceptors/ClientRequest/index.cjs"
9+
}
10+
}
611
}

‎RemoteHttpInterceptor/package.json‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
{
2-
"main": "../lib/node/RemoteHttpInterceptor.js",
2+
"main": "../lib/node/RemoteHttpInterceptor.cjs",
33
"module": "../lib/node/RemoteHttpInterceptor.mjs",
44
"browser": null,
5-
"types": "../lib/node/RemoteHttpInterceptor.d.ts"
5+
"exports": {
6+
".": {
7+
"import": "./../lib/node/RemoteHttpInterceptor.mjs",
8+
"default": "./../lib/node/RemoteHttpInterceptor.cjs"
9+
}
10+
}
611
}

‎WebSocket/package.json‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
{
2-
"main": "../lib/browser/interceptors/WebSocket/index.js",
2+
"main": "../lib/browser/interceptors/WebSocket/index.cjs",
33
"module": "../lib/browser/interceptors/WebSocket/index.mjs",
4-
"types": "../lib/browser/interceptors/WebSocket/index.d.ts"
4+
"browser": "../lib/browser/interceptors/WebSocket/index.mjs",
5+
"exports": {
6+
".": {
7+
"browser": "./../lib/browser/interceptors/WebSocket/index.mjs",
8+
"import": "./../lib/browser/interceptors/WebSocket/index.mjs",
9+
"default": "./../lib/browser/interceptors/WebSocket/index.cjs"
10+
}
11+
}
512
}

‎XMLHttpRequest/package.json‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
{
2-
"main": "../lib/node/interceptors/XMLHttpRequest/index.js",
2+
"main": "../lib/node/interceptors/XMLHttpRequest/index.cjs",
33
"module": "../lib/node/interceptors/XMLHttpRequest/index.mjs",
4-
"browser": "../lib/browser/interceptors/XMLHttpRequest/index.js",
5-
"types": "../lib/node/interceptors/XMLHttpRequest/index.d.ts"
4+
"browser": "../lib/browser/interceptors/XMLHttpRequest/index.mjs",
5+
"exports": {
6+
".": {
7+
"browser": "./../lib/browser/interceptors/XMLHttpRequest/index.mjs",
8+
"import": "./../lib/node/interceptors/XMLHttpRequest/index.mjs",
9+
"default": "./../lib/node/interceptors/XMLHttpRequest/index.cjs"
10+
}
11+
}
612
}

‎fetch/package.json‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
{
2-
"main": "../lib/node/interceptors/fetch/index.js",
2+
"main": "../lib/node/interceptors/fetch/index.cjs",
33
"module": "../lib/node/interceptors/fetch/index.mjs",
4-
"browser": "../lib/browser/interceptors/fetch/index.js",
5-
"types": "../lib/node/interceptors/fetch/index.d.ts"
4+
"browser": "../lib/browser/interceptors/fetch/index.mjs",
5+
"exports": {
6+
".": {
7+
"browser": "./../lib/browser/interceptors/fetch/index.mjs",
8+
"import": "./../lib/node/interceptors/fetch/index.mjs",
9+
"default": "./../lib/node/interceptors/fetch/index.cjs"
10+
}
11+
}
612
}

‎package.json‎

Lines changed: 31 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,104 +1,80 @@
11
{
2+
"type": "commonjs",
23
"name": "@mswjs/interceptors",
34
"description": "Low-level HTTP/HTTPS/XHR/fetch request interception library.",
45
"version": "0.40.0",
5-
"main": "./lib/node/index.js",
6+
"main": "./lib/node/index.cjs",
67
"module": "./lib/node/index.mjs",
7-
"types": "./lib/node/index.d.ts",
8+
"types": "./lib/node/index.d.cts",
89
"exports": {
910
".": {
10-
"types": "./lib/node/index.d.ts",
1111
"browser": {
12-
"types": "./lib/browser/index.d.ts",
13-
"require": "./lib/browser/index.js",
1412
"import": "./lib/browser/index.mjs",
15-
"default": "./lib/browser/index.js"
13+
"default": "./lib/browser/index.cjs"
1614
},
17-
"require": "./lib/node/index.js",
1815
"import": "./lib/node/index.mjs",
19-
"default": "./lib/node/index.js"
16+
"default": "./lib/node/index.cjs"
2017
},
2118
"./ClientRequest": {
22-
"types": "./lib/node/interceptors/ClientRequest/index.d.ts",
2319
"node": {
24-
"require": "./lib/node/interceptors/ClientRequest/index.js",
20+
"require": "./lib/node/interceptors/ClientRequest/index.cjs",
2521
"import": "./lib/node/interceptors/ClientRequest/index.mjs"
2622
},
2723
"browser": null,
28-
"require": "./lib/node/interceptors/ClientRequest/index.js",
24+
"require": "./lib/node/interceptors/ClientRequest/index.cjs",
2925
"import": "./lib/node/interceptors/ClientRequest/index.mjs",
30-
"default": "./lib/node/interceptors/ClientRequest/index.js"
26+
"default": "./lib/node/interceptors/ClientRequest/index.cjs"
3127
},
3228
"./XMLHttpRequest": {
33-
"browser": {
34-
"types": "./lib/browser/interceptors/XMLHttpRequest/index.d.ts",
35-
"require": "./lib/browser/interceptors/XMLHttpRequest/index.js",
36-
"import": "./lib/browser/interceptors/XMLHttpRequest/index.mjs",
37-
"default": "./lib/browser/interceptors/XMLHttpRequest/index.js"
38-
},
39-
"types": "./lib/node/interceptors/XMLHttpRequest/index.d.ts",
40-
"require": "./lib/node/interceptors/XMLHttpRequest/index.js",
29+
"browser": "./lib/browser/interceptors/XMLHttpRequest/index.mjs",
30+
"require": "./lib/node/interceptors/XMLHttpRequest/index.cjs",
4131
"import": "./lib/node/interceptors/XMLHttpRequest/index.mjs",
42-
"default": "./lib/node/interceptors/XMLHttpRequest/index.js"
32+
"default": "./lib/node/interceptors/XMLHttpRequest/index.cjs"
4333
},
4434
"./fetch": {
45-
"browser": {
46-
"types": "./lib/browser/interceptors/fetch/index.d.ts",
47-
"require": "./lib/browser/interceptors/fetch/index.js",
48-
"import": "./lib/browser/interceptors/fetch/index.mjs",
49-
"default": "./lib/browser/interceptors/fetch/index.js"
50-
},
51-
"types": "./lib/node/interceptors/fetch/index.d.ts",
52-
"require": "./lib/node/interceptors/fetch/index.js",
35+
"browser": "./lib/browser/interceptors/fetch/index.mjs",
36+
"require": "./lib/node/interceptors/fetch/index.cjs",
5337
"import": "./lib/node/interceptors/fetch/index.mjs",
54-
"default": "./lib/node/interceptors/fetch/index.js"
38+
"default": "./lib/node/interceptors/fetch/index.cjs"
5539
},
5640
"./WebSocket": {
57-
"types": "./lib/browser/interceptors/WebSocket/index.d.ts",
58-
"require": "./lib/browser/interceptors/WebSocket/index.js",
41+
"require": "./lib/browser/interceptors/WebSocket/index.cjs",
5942
"import": "./lib/browser/interceptors/WebSocket/index.mjs",
60-
"default": "./lib/browser/interceptors/WebSocket/index.js"
43+
"default": "./lib/browser/interceptors/WebSocket/index.cjs"
6144
},
6245
"./RemoteHttpInterceptor": {
63-
"types": "./lib/node/RemoteHttpInterceptor.d.ts",
6446
"node": {
65-
"require": "./lib/node/RemoteHttpInterceptor.js",
47+
"require": "./lib/node/RemoteHttpInterceptor.cjs",
6648
"import": "./lib/node/RemoteHttpInterceptor.mjs"
6749
},
6850
"browser": null,
69-
"require": "./lib/node/RemoteHttpInterceptor.js",
51+
"require": "./lib/node/RemoteHttpInterceptor.cjs",
7052
"import": "./lib/node/RemoteHttpInterceptor.mjs",
71-
"default": "./lib/node/RemoteHttpInterceptor.js"
53+
"default": "./lib/node/RemoteHttpInterceptor.cjs"
7254
},
7355
"./presets/node": {
74-
"types": "./lib/node/presets/node.d.ts",
7556
"node": {
76-
"require": "./lib/node/presets/node.js",
57+
"require": "./lib/node/presets/node.cjs",
7758
"import": "./lib/node/presets/node.mjs"
7859
},
7960
"browser": null,
80-
"require": "./lib/node/presets/node.js",
61+
"require": "./lib/node/presets/node.cjs",
8162
"import": "./lib/node/presets/node.mjs",
82-
"default": "./lib/node/presets/node.js"
63+
"default": "./lib/node/presets/node.cjs"
8364
},
8465
"./presets/browser": {
85-
"browser": {
86-
"types": "./lib/browser/presets/browser.d.ts",
87-
"require": "./lib/browser/presets/browser.js",
88-
"import": "./lib/browser/presets/browser.mjs",
89-
"default": "./lib/browser/presets/browser.js"
90-
}
66+
"browser": "./lib/browser/presets/browser.mjs",
67+
"node": null
9168
},
9269
"./utils/node": {
93-
"types": "./lib/node/utils/node/index.d.ts",
9470
"node": {
95-
"require": "./lib/node/utils/node/index.js",
71+
"require": "./lib/node/utils/node/index.cjs",
9672
"import": "./lib/node/utils/node/index.mjs"
9773
},
9874
"browser": null,
99-
"require": "./lib/node/utils/node/index.js",
75+
"require": "./lib/node/utils/node/index.cjs",
10076
"import": "./lib/node/utils/node/index.mjs",
101-
"default": "./lib/node/utils/node/index.js"
77+
"default": "./lib/node/utils/node/index.cjs"
10278
}
10379
},
10480
"author": "Artem Zakharchenko",
@@ -107,15 +83,14 @@
10783
"node": ">=18"
10884
},
10985
"scripts": {
110-
"start": "tsc --build -w",
86+
"start": "tsdown --watch",
11187
"test": "pnpm test:unit && pnpm test:integration",
11288
"test:unit": "vitest",
11389
"test:integration": "pnpm test:node && pnpm test:browser",
11490
"test:node": "vitest -c test/vitest.config.js",
11591
"test:browser": "pnpm playwright test -c test/playwright.config.ts",
11692
"test:nock": "./test/third-party/nock.sh",
117-
"clean": "rimraf lib",
118-
"build": "pnpm clean && cross-env NODE_ENV=production tsup --splitting",
93+
"build": "tsdown",
11994
"prepare": "pnpm simple-git-hooks init",
12095
"release": "release publish"
12196
},
@@ -163,20 +138,20 @@
163138
"happy-dom": "^17.3.0",
164139
"jsdom": "^26.1.0",
165140
"node-fetch": "3.3.2",
166-
"rimraf": "^6.0.1",
167141
"simple-git-hooks": "^2.7.0",
168142
"socket.io": "^4.7.4",
169143
"socket.io-client": "^4.7.4",
170144
"socket.io-parser": "^4.2.4",
171145
"superagent": "^10.1.1",
172146
"supertest": "^7.0.0",
173-
"tsup": "^6.5.0",
147+
"tsdown": "^0.18.1",
174148
"typescript": "^5.8.2",
175149
"undici": "^7.4.0",
176150
"vitest": "^3.0.8",
177151
"vitest-environment-miniflare": "^2.14.1",
178152
"wait-for-expect": "^3.0.2",
179153
"web-encoding": "^1.1.5",
154+
"webpack": "^5.105.0",
180155
"webpack-http-server": "^0.5.0",
181156
"ws": "^8.18.1"
182157
},

0 commit comments

Comments
 (0)