remove node:buffer imports

lib/core/util.js

@@ -5,7 +5,6 @@ const { kDestroyed, kBodyUsed, kListeners, kBody } = require('./symbols')
 const { IncomingMessage } = require('node:http')
 const stream = require('node:stream')
 const net = require('node:net')
-const { Blob } = require('node:buffer')
 const { stringify } = require('node:querystring')
 const { EventEmitter: EE } = require('node:events')
 const timers = require('../util/timers')

lib/web/fetch/body.js

@@ -10,7 +10,6 @@ const {
 } = require('./util')
 const { FormData, setFormDataState } = require('./formdata')
 const { webidl } = require('../webidl')
-const { Blob } = require('node:buffer')
 const assert = require('node:assert')
 const { isErrored, isDisturbed } = require('node:stream')
 const { isArrayBuffer } = require('node:util/types')

lib/web/fetch/formdata-parser.js

@@ -6,9 +6,6 @@ const { HTTP_TOKEN_CODEPOINTS, isomorphicDecode } = require('./data-url')
 const { makeEntry } = require('./formdata')
 const { webidl } = require('../webidl')
 const assert = require('node:assert')
-const { File: NodeFile } = require('node:buffer')
-
-const File = globalThis.File ?? NodeFile
 
 const formDataNameBuffer = Buffer.from('form-data; name="')
 const filenameBuffer = Buffer.from('filename')

lib/web/fetch/formdata.js

@@ -3,12 +3,8 @@
 const { iteratorMixin } = require('./util')
 const { kEnumerableProperty } = require('../../core/util')
 const { webidl } = require('../webidl')
-const { File: NativeFile } = require('node:buffer')
 const nodeUtil = require('node:util')
 
-/** @type {globalThis['File']} */
-const File = globalThis.File ?? NativeFile
-
 // https://xhr.spec.whatwg.org/#formdata
 class FormData {
   #state = []

lib/web/webidl/index.js

@@ -509,7 +509,7 @@ webidl.is.USVString = function (value) {
 webidl.is.ReadableStream = webidl.util.MakeTypeAssertion(ReadableStream)
 webidl.is.Blob = webidl.util.MakeTypeAssertion(Blob)
 webidl.is.URLSearchParams = webidl.util.MakeTypeAssertion(URLSearchParams)
-webidl.is.File = webidl.util.MakeTypeAssertion(globalThis.File ?? require('node:buffer').File)
+webidl.is.File = webidl.util.MakeTypeAssertion(File)
 webidl.is.URL = webidl.util.MakeTypeAssertion(URL)
 webidl.is.AbortSignal = webidl.util.MakeTypeAssertion(AbortSignal)
 webidl.is.MessagePort = webidl.util.MakeTypeAssertion(MessagePort)

test/client-post.js

@@ -5,7 +5,6 @@ const { test, after } = require('node:test')
 const { once } = require('node:events')
 const { Client } = require('..')
 const { createServer } = require('node:http')
-const { Blob } = require('node:buffer')
 
 test('request post blob', { skip: !Blob }, async (t) => {
   t = tspl(t, { plan: 3 })

test/client-request.js

@@ -977,7 +977,6 @@ test('request text2', async (t) => {
 
 test('request with FormData body', async (t) => {
   const { FormData } = require('../')
-  const { Blob } = require('node:buffer')
 
   const fd = new FormData()
   fd.set('key', 'value')

test/fetch/blob-uri.js

@@ -3,11 +3,10 @@
 const { test } = require('node:test')
 const assert = require('node:assert')
 const { fetch } = require('../..')
-const { Blob } = require('node:buffer')
 
 test('fetching blob: uris', async (t) => {
   const blobContents = 'hello world'
-  /** @type {import('buffer').Blob} */
+  /** @type {Blob} */
   let blob
   /** @type {string} */
   let objectURL

test/fetch/client-fetch.js

@@ -6,7 +6,6 @@ const { test } = require('node:test')
 const assert = require('node:assert')
 const { tspl } = require('@matteo.collina/tspl')
 const { createServer } = require('node:http')
-const { Blob, File } = require('node:buffer')
 const { fetch, Response, Request, FormData } = require('../..')
 const { Client, setGlobalDispatcher, Agent } = require('../..')
 const nodeFetch = require('../../index-fetch')

test/fetch/content-length.js

@@ -4,7 +4,6 @@ const { test } = require('node:test')
 const assert = require('node:assert')
 const { createServer } = require('node:http')
 const { once } = require('node:events')
-const { Blob } = require('node:buffer')
 const { fetch, FormData } = require('../..')
 const { closeServerAsPromise } = require('../utils/node-http')
 

test/fetch/formdata.js

@@ -4,7 +4,6 @@ const { test } = require('node:test')
 const assert = require('node:assert')
 const { tspl } = require('@matteo.collina/tspl')
 const { FormData, Response, Request } = require('../../')
-const { Blob, File } = require('node:buffer')
 const { isFormDataLike } = require('../../lib/core/util')
 
 test('arg validation', () => {

test/fetch/http2.js

@@ -3,7 +3,6 @@
 const { createSecureServer } = require('node:http2')
 const { createReadStream, readFileSync } = require('node:fs')
 const { once } = require('node:events')
-const { Blob } = require('node:buffer')
 const { Readable } = require('node:stream')
 
 const { test } = require('node:test')

test/fetch/issue-3624.js

@@ -1,7 +1,6 @@
 'use strict'
 
 const assert = require('node:assert')
-const { File } = require('node:buffer')
 const { test } = require('node:test')
 const { once } = require('node:events')
 const { createServer } = require('node:http')

test/http2.js

@@ -5,7 +5,6 @@ const { test, after } = require('node:test')
 const { createSecureServer } = require('node:http2')
 const { createReadStream, readFileSync } = require('node:fs')
 const { once } = require('node:events')
-const { Blob } = require('node:buffer')
 const { Writable, pipeline, PassThrough, Readable } = require('node:stream')
 
 const pem = require('https-pem')

test/issue-2065.js

@@ -5,7 +5,6 @@ const { test, after } = require('node:test')
 const { createServer } = require('node:http')
 const { once } = require('node:events')
 const { FormData, request } = require('..')
-const { File } = require('node:buffer')
 
 test('undici.request with a FormData body should set content-length header', async (t) => {
   t = tspl(t, { plan: 1 })

test/node-fetch/main.js

@@ -8,7 +8,6 @@ const zlib = require('node:zlib')
 const stream = require('node:stream')
 const vm = require('node:vm')
 const crypto = require('node:crypto')
-const { Blob } = require('node:buffer')
 
 const {
   fetch,

test/node-fetch/request.js

@@ -4,7 +4,6 @@ const assert = require('node:assert')
 const { describe, it, before, after } = require('node:test')
 const stream = require('node:stream')
 const http = require('node:http')
-const { Blob } = require('node:buffer')
 
 const { Request } = require('../../index.js')
 const TestServer = require('./utils/server.js')

test/node-fetch/response.js

@@ -5,7 +5,6 @@ const { describe, it, before, after } = require('node:test')
 const stream = require('node:stream')
 const { Response } = require('../../index.js')
 const TestServer = require('./utils/server.js')
-const { Blob } = require('node:buffer')
 
 describe('Response', () => {
   const local = new TestServer()

test/util.js

@@ -3,7 +3,6 @@
 const { strictEqual, throws, doesNotThrow } = require('node:assert')
 const { test, describe } = require('node:test')
 const { isBlobLike, parseURL, isHttpOrHttpsPrefixed, isValidPort } = require('../lib/core/util')
-const { Blob, File } = require('node:buffer')
 const { InvalidArgumentError } = require('../lib/core/errors')
 
 describe('isBlobLike', () => {

test/websocket/send.js

@@ -3,7 +3,6 @@
 const { test, describe } = require('node:test')
 const assert = require('node:assert')
 const { WebSocketServer } = require('ws')
-const { Blob } = require('node:buffer')
 const { WebSocket } = require('../..')
 
 // the following three tests exercise different code paths because of the three