Skip to content

Commit 177ca1b

Browse files
authored
remove node:buffer imports (#4362)
1 parent c9655f0 commit 177ca1b

20 files changed

+2
-26
lines changed

lib/core/util.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ const { kDestroyed, kBodyUsed, kListeners, kBody } = require('./symbols')
55
const { IncomingMessage } = require('node:http')
66
const stream = require('node:stream')
77
const net = require('node:net')
8-
const { Blob } = require('node:buffer')
98
const { stringify } = require('node:querystring')
109
const { EventEmitter: EE } = require('node:events')
1110
const timers = require('../util/timers')

lib/web/fetch/body.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ const {
1010
} = require('./util')
1111
const { FormData, setFormDataState } = require('./formdata')
1212
const { webidl } = require('../webidl')
13-
const { Blob } = require('node:buffer')
1413
const assert = require('node:assert')
1514
const { isErrored, isDisturbed } = require('node:stream')
1615
const { isArrayBuffer } = require('node:util/types')

lib/web/fetch/formdata-parser.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@ const { HTTP_TOKEN_CODEPOINTS, isomorphicDecode } = require('./data-url')
66
const { makeEntry } = require('./formdata')
77
const { webidl } = require('../webidl')
88
const assert = require('node:assert')
9-
const { File: NodeFile } = require('node:buffer')
10-
11-
const File = globalThis.File ?? NodeFile
129

1310
const formDataNameBuffer = Buffer.from('form-data; name="')
1411
const filenameBuffer = Buffer.from('filename')

lib/web/fetch/formdata.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,8 @@
33
const { iteratorMixin } = require('./util')
44
const { kEnumerableProperty } = require('../../core/util')
55
const { webidl } = require('../webidl')
6-
const { File: NativeFile } = require('node:buffer')
76
const nodeUtil = require('node:util')
87

9-
/** @type {globalThis['File']} */
10-
const File = globalThis.File ?? NativeFile
11-
128
// https://xhr.spec.whatwg.org/#formdata
139
class FormData {
1410
#state = []

lib/web/webidl/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -509,7 +509,7 @@ webidl.is.USVString = function (value) {
509509
webidl.is.ReadableStream = webidl.util.MakeTypeAssertion(ReadableStream)
510510
webidl.is.Blob = webidl.util.MakeTypeAssertion(Blob)
511511
webidl.is.URLSearchParams = webidl.util.MakeTypeAssertion(URLSearchParams)
512-
webidl.is.File = webidl.util.MakeTypeAssertion(globalThis.File ?? require('node:buffer').File)
512+
webidl.is.File = webidl.util.MakeTypeAssertion(File)
513513
webidl.is.URL = webidl.util.MakeTypeAssertion(URL)
514514
webidl.is.AbortSignal = webidl.util.MakeTypeAssertion(AbortSignal)
515515
webidl.is.MessagePort = webidl.util.MakeTypeAssertion(MessagePort)

test/client-post.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ const { test, after } = require('node:test')
55
const { once } = require('node:events')
66
const { Client } = require('..')
77
const { createServer } = require('node:http')
8-
const { Blob } = require('node:buffer')
98

109
test('request post blob', { skip: !Blob }, async (t) => {
1110
t = tspl(t, { plan: 3 })

test/client-request.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -977,7 +977,6 @@ test('request text2', async (t) => {
977977

978978
test('request with FormData body', async (t) => {
979979
const { FormData } = require('../')
980-
const { Blob } = require('node:buffer')
981980

982981
const fd = new FormData()
983982
fd.set('key', 'value')

test/fetch/blob-uri.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,10 @@
33
const { test } = require('node:test')
44
const assert = require('node:assert')
55
const { fetch } = require('../..')
6-
const { Blob } = require('node:buffer')
76

87
test('fetching blob: uris', async (t) => {
98
const blobContents = 'hello world'
10-
/** @type {import('buffer').Blob} */
9+
/** @type {Blob} */
1110
let blob
1211
/** @type {string} */
1312
let objectURL

test/fetch/client-fetch.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ const { test } = require('node:test')
66
const assert = require('node:assert')
77
const { tspl } = require('@matteo.collina/tspl')
88
const { createServer } = require('node:http')
9-
const { Blob, File } = require('node:buffer')
109
const { fetch, Response, Request, FormData } = require('../..')
1110
const { Client, setGlobalDispatcher, Agent } = require('../..')
1211
const nodeFetch = require('../../index-fetch')

test/fetch/content-length.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ const { test } = require('node:test')
44
const assert = require('node:assert')
55
const { createServer } = require('node:http')
66
const { once } = require('node:events')
7-
const { Blob } = require('node:buffer')
87
const { fetch, FormData } = require('../..')
98
const { closeServerAsPromise } = require('../utils/node-http')
109

0 commit comments

Comments
 (0)