Skip to content

fix: remove node-fetch from edge-bundler package #6381

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 27, 2025
Merged

fix: remove node-fetch from edge-bundler package #6381

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
67c632f
fix: remove node-fetch from edge-bundler package
mrstork May 23, 2025
86cb11d
chore: upgrade nock so that native fetch can be mocked
mrstork May 23, 2025
d55d55a
Merge branch 'main' into edge-bundler-remove-node-fetch
mrstork May 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
82 changes: 80 additions & 2 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions packages/edge-bundler/node/downloader.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { createWriteStream, promises as fs } from 'fs'
import { Readable } from 'node:stream'
import path from 'path'
import { promisify } from 'util'

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

return res.body
return Readable.from(res.body)
}

const extractBinaryFromZip = async (zipPath: string, binaryPath: string, binaryName: string) => {
Expand Down
1 change: 0 additions & 1 deletion packages/edge-bundler/node/server/server.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import { join } from 'path'
import process from 'process'

import getPort from 'get-port'
import fetch from 'node-fetch'
import tmp from 'tmp-promise'
import { v4 as uuidv4 } from 'uuid'
import { test, expect } from 'vitest'
Expand Down
1 change: 0 additions & 1 deletion packages/edge-bundler/node/server/util.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { platform } from 'os'

import { ExecaChildProcess } from 'execa'
import fetch from 'node-fetch'
import waitFor from 'p-wait-for'
import { satisfies } from 'semver'

Expand Down
2 changes: 0 additions & 2 deletions packages/edge-bundler/node/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import { promises as fs } from 'fs'
import { join } from 'path'

import fetch from 'node-fetch'

import type { DenoBridge } from './bridge.js'
import type { Logger } from './logger.js'

Expand Down
3 changes: 1 addition & 2 deletions packages/edge-bundler/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"@vitest/coverage-v8": "^0.34.0",
"archiver": "^7.0.0",
"chalk": "^5.4.0",
"nock": "^13.2.4",
"nock": "^14.0.0",
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Allows us to mock out native fetch calls

"tar": "^6.1.11",
"typescript": "^5.0.0",
"vitest": "^0.34.0"
Expand All @@ -69,7 +69,6 @@
"get-package-name": "^2.2.0",
"get-port": "^7.0.0",
"is-path-inside": "^4.0.0",
"node-fetch": "^3.1.1",
"node-stream-zip": "^1.15.0",
"p-retry": "^6.0.0",
"p-wait-for": "^5.0.0",
Expand Down
Loading