Skip to content

Commit 354f1b1

Browse files
authored
fix: remove node-fetch from edge-bundler package (#6381)
* fix: remove node-fetch from edge-bundler package * chore: upgrade nock so that native fetch can be mocked
1 parent f85f7e9 commit 354f1b1

File tree

6 files changed

+83
-10
lines changed

6 files changed

+83
-10
lines changed

package-lock.json

Lines changed: 80 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/edge-bundler/node/downloader.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { createWriteStream, promises as fs } from 'fs'
2+
import { Readable } from 'node:stream'
23
import path from 'path'
34
import { promisify } from 'util'
45

5-
import fetch from 'node-fetch'
66
import StreamZip from 'node-stream-zip'
77
import pRetry from 'p-retry'
88
import semver from 'semver'
@@ -56,7 +56,7 @@ const downloadVersion = async (versionRange: string) => {
5656
throw new Error(`Download failed with status code ${res.status}`)
5757
}
5858

59-
return res.body
59+
return Readable.from(res.body)
6060
}
6161

6262
const extractBinaryFromZip = async (zipPath: string, binaryPath: string, binaryName: string) => {

packages/edge-bundler/node/server/server.test.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import { join } from 'path'
44
import process from 'process'
55

66
import getPort from 'get-port'
7-
import fetch from 'node-fetch'
87
import tmp from 'tmp-promise'
98
import { v4 as uuidv4 } from 'uuid'
109
import { test, expect } from 'vitest'

packages/edge-bundler/node/server/util.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { platform } from 'os'
22

33
import { ExecaChildProcess } from 'execa'
4-
import fetch from 'node-fetch'
54
import waitFor from 'p-wait-for'
65
import { satisfies } from 'semver'
76

packages/edge-bundler/node/types.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
import { promises as fs } from 'fs'
22
import { join } from 'path'
33

4-
import fetch from 'node-fetch'
5-
64
import type { DenoBridge } from './bridge.js'
75
import type { Logger } from './logger.js'
86

packages/edge-bundler/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
"@vitest/coverage-v8": "^0.34.0",
4949
"archiver": "^7.0.0",
5050
"chalk": "^5.4.0",
51-
"nock": "^13.2.4",
51+
"nock": "^14.0.0",
5252
"tar": "^6.1.11",
5353
"typescript": "^5.0.0",
5454
"vitest": "^0.34.0"
@@ -69,7 +69,6 @@
6969
"get-package-name": "^2.2.0",
7070
"get-port": "^7.0.0",
7171
"is-path-inside": "^4.0.0",
72-
"node-fetch": "^3.1.1",
7372
"node-stream-zip": "^1.15.0",
7473
"p-retry": "^6.0.0",
7574
"p-wait-for": "^5.0.0",

0 commit comments

Comments
 (0)