chore: use 'node:'-prefix for requiring node core modules (nodejs#2662)

* chore: use 'node:'-prefix for require * add core modules with underscore in name
crysmags · Feb 27, 2024 · 7c92abc · 7c92abc
1 parent 7c1e991
commit 7c92abc
Show file tree

Hide file tree

Showing 181 changed files with 371 additions and 371 deletions.
diff --git a/benchmarks/benchmark-http2.js b/benchmarks/benchmark-http2.js
@@ -1,12 +1,12 @@
 'use strict'
 
-const { connect } = require('http2')
-const { createSecureContext } = require('tls')
-const os = require('os')
-const path = require('path')
-const { readFileSync } = require('fs')
-const { Writable } = require('stream')
-const { isMainThread } = require('worker_threads')
+const { connect } = require('node:http2')
+const { createSecureContext } = require('node:tls')
+const os = require('node:os')
+const path = require('node:path')
+const { readFileSync } = require('node:fs')
+const { Writable } = require('node:stream')
+const { isMainThread } = require('node:worker_threads')
 
 const { Pool, Client, fetch, Agent, setGlobalDispatcher } = require('..')
 

diff --git a/benchmarks/benchmark-https.js b/benchmarks/benchmark-https.js
@@ -1,11 +1,11 @@
 'use strict'
 
-const https = require('https')
-const os = require('os')
-const path = require('path')
-const { readFileSync } = require('fs')
-const { Writable } = require('stream')
-const { isMainThread } = require('worker_threads')
+const https = require('node:https')
+const os = require('node:os')
+const path = require('node:path')
+const { readFileSync } = require('node:fs')
+const { Writable } = require('node:stream')
+const { isMainThread } = require('node:worker_threads')
 
 const { Pool, Client, fetch, Agent, setGlobalDispatcher } = require('..')
 

diff --git a/benchmarks/benchmark.js b/benchmarks/benchmark.js
@@ -1,18 +1,18 @@
 'use strict'
 
-const http = require('http')
-const os = require('os')
-const path = require('path')
-const { Writable } = require('stream')
-const { isMainThread } = require('worker_threads')
+const http = require('node:http')
+const os = require('node:os')
+const path = require('node:path')
+const { Writable } = require('node:stream')
+const { isMainThread } = require('node:worker_threads')
 
 const { Pool, Client, fetch, Agent, setGlobalDispatcher } = require('..')
 
 let nodeFetch
 const axios = require('axios')
 let got
 
-const util = require('util')
+const util = require('node:util')
 const _request = require('request')
 const request = util.promisify(_request)
 

diff --git a/benchmarks/server-http2.js b/benchmarks/server-http2.js
@@ -1,10 +1,10 @@
 'use strict'
 
-const { unlinkSync, readFileSync } = require('fs')
-const { createSecureServer } = require('http2')
-const os = require('os')
-const path = require('path')
-const cluster = require('cluster')
+const { unlinkSync, readFileSync } = require('node:fs')
+const { createSecureServer } = require('node:http2')
+const os = require('node:os')
+const path = require('node:path')
+const cluster = require('node:cluster')
 
 const key = readFileSync(path.join(__dirname, '..', 'test', 'fixtures', 'key.pem'), 'utf8')
 const cert = readFileSync(path.join(__dirname, '..', 'test', 'fixtures', 'cert.pem'), 'utf8')

diff --git a/benchmarks/server-https.js b/benchmarks/server-https.js
@@ -1,10 +1,10 @@
 'use strict'
 
-const { unlinkSync, readFileSync } = require('fs')
-const { createServer } = require('https')
-const os = require('os')
-const path = require('path')
-const cluster = require('cluster')
+const { unlinkSync, readFileSync } = require('node:fs')
+const { createServer } = require('node:https')
+const os = require('node:os')
+const path = require('node:path')
+const cluster = require('node:cluster')
 
 const key = readFileSync(path.join(__dirname, '..', 'test', 'fixtures', 'key.pem'), 'utf8')
 const cert = readFileSync(path.join(__dirname, '..', 'test', 'fixtures', 'cert.pem'), 'utf8')

diff --git a/benchmarks/server.js b/benchmarks/server.js
@@ -1,10 +1,10 @@
 'use strict'
 
-const { unlinkSync } = require('fs')
-const { createServer } = require('http')
-const os = require('os')
-const path = require('path')
-const cluster = require('cluster')
+const { unlinkSync } = require('node:fs')
+const { createServer } = require('node:http')
+const os = require('node:os')
+const path = require('node:path')
+const cluster = require('node:cluster')
 
 const socketPath = path.join(os.tmpdir(), 'undici.sock')
 

diff --git a/benchmarks/wait.js b/benchmarks/wait.js
@@ -1,7 +1,7 @@
 'use strict'
 
-const os = require('os')
-const path = require('path')
+const os = require('node:os')
+const path = require('node:path')
 const waitOn = require('wait-on')
 
 const socketPath = path.join(os.tmpdir(), 'undici.sock')

diff --git a/build/wasm.js b/build/wasm.js
@@ -1,8 +1,8 @@
 'use strict'
 
-const { execSync } = require('child_process')
-const { writeFileSync, readFileSync } = require('fs')
-const { join, resolve, basename } = require('path')
+const { execSync } = require('node:child_process')
+const { writeFileSync, readFileSync } = require('node:fs')
+const { join, resolve, basename } = require('node:path')
 
 const ROOT = resolve(__dirname, '../')
 const WASM_SRC = resolve(__dirname, '../deps/llhttp')

diff --git a/docs/best-practices/client-certificate.md b/docs/best-practices/client-certificate.md
@@ -11,9 +11,9 @@ The server option `rejectUnauthorized: false` allows us to handle any invalid ce
 ### Client Certificate Authentication
 
 ```js
-const { readFileSync } = require('fs')
-const { join } = require('path')
-const { createServer } = require('https')
+const { readFileSync } = require('node:fs')
+const { join } = require('node:path')
+const { createServer } = require('node:https')
 const { Client } = require('undici')
 
 const serverOptions = {

diff --git a/examples/README.md b/examples/README.md
@@ -49,7 +49,7 @@ async function postJSONRequest (port = 3001) {
 const { request } = require('undici')
 async function postFormRequest (port = 3001) {
   // Make a URL-encoded form POST request:
-  const qs = require('querystring')
+  const qs = require('node:querystring')
 
   const requestBody = {
     hello: 'URL Encoded Example body'

diff --git a/examples/ca-fingerprint/index.js b/examples/ca-fingerprint/index.js
@@ -1,7 +1,7 @@
 'use strict'
 
-const crypto = require('crypto')
-const https = require('https')
+const crypto = require('node:crypto')
+const https = require('node:https')
 const { Client, buildConnector } = require('../..')
 const pem = require('https-pem')
 

diff --git a/examples/eventsource.js b/examples/eventsource.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const { randomBytes } = require('crypto')
+const { randomBytes } = require('node:crypto')
 const { EventSource } = require('../')
 
 async function main () {

diff --git a/examples/proxy/index.js b/examples/proxy/index.js
@@ -1,5 +1,5 @@
 const { Pool, Client } = require('../../')
-const http = require('http')
+const http = require('node:http')
 const proxy = require('./proxy')
 
 const pool = new Pool('http://localhost:4001', {

diff --git a/examples/proxy/proxy.js b/examples/proxy/proxy.js
@@ -1,5 +1,5 @@
-const net = require('net')
-const { pipeline } = require('stream')
+const net = require('node:net')
+const { pipeline } = require('node:stream')
 const createError = require('http-errors')
 
 module.exports = async function proxy (ctx, client) {

diff --git a/examples/proxy/websocket.js b/examples/proxy/websocket.js
@@ -1,5 +1,5 @@
 const { Pool, Client } = require('../../')
-const http = require('http')
+const http = require('node:http')
 const proxy = require('./proxy')
 const WebSocket = require('ws')
 

diff --git a/examples/request.js b/examples/request.js
@@ -41,7 +41,7 @@ async function postJSONRequest (port = 3001) {
 
 async function postFormRequest (port = 3001) {
   // Make a URL-encoded form POST request:
-  const qs = require('querystring')
+  const qs = require('node:querystring')
 
   const requestBody = {
     hello: 'URL Encoded Example body'

diff --git a/lib/api/api-connect.js b/lib/api/api-connect.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const { AsyncResource } = require('async_hooks')
+const { AsyncResource } = require('node:async_hooks')
 const { InvalidArgumentError, RequestAbortedError, SocketError } = require('../core/errors')
 const util = require('../core/util')
 const { addSignal, removeSignal } = require('./abort-signal')

diff --git a/lib/api/api-pipeline.js b/lib/api/api-pipeline.js
@@ -4,16 +4,16 @@ const {
   Readable,
   Duplex,
   PassThrough
-} = require('stream')
+} = require('node:stream')
 const {
   InvalidArgumentError,
   InvalidReturnValueError,
   RequestAbortedError
 } = require('../core/errors')
 const util = require('../core/util')
-const { AsyncResource } = require('async_hooks')
+const { AsyncResource } = require('node:async_hooks')
 const { addSignal, removeSignal } = require('./abort-signal')
-const assert = require('assert')
+const assert = require('node:assert')
 
 const kResume = Symbol('resume')
 

diff --git a/lib/api/api-request.js b/lib/api/api-request.js
@@ -7,7 +7,7 @@ const {
 } = require('../core/errors')
 const util = require('../core/util')
 const { getResolveErrorBodyCallback } = require('./util')
-const { AsyncResource } = require('async_hooks')
+const { AsyncResource } = require('node:async_hooks')
 const { addSignal, removeSignal } = require('./abort-signal')
 
 class RequestHandler extends AsyncResource {

diff --git a/lib/api/api-stream.js b/lib/api/api-stream.js
@@ -1,14 +1,14 @@
 'use strict'
 
-const { finished, PassThrough } = require('stream')
+const { finished, PassThrough } = require('node:stream')
 const {
   InvalidArgumentError,
   InvalidReturnValueError,
   RequestAbortedError
 } = require('../core/errors')
 const util = require('../core/util')
 const { getResolveErrorBodyCallback } = require('./util')
-const { AsyncResource } = require('async_hooks')
+const { AsyncResource } = require('node:async_hooks')
 const { addSignal, removeSignal } = require('./abort-signal')
 
 class StreamHandler extends AsyncResource {

diff --git a/lib/api/api-upgrade.js b/lib/api/api-upgrade.js
@@ -1,10 +1,10 @@
 'use strict'
 
 const { InvalidArgumentError, RequestAbortedError, SocketError } = require('../core/errors')
-const { AsyncResource } = require('async_hooks')
+const { AsyncResource } = require('node:async_hooks')
 const util = require('../core/util')
 const { addSignal, removeSignal } = require('./abort-signal')
-const assert = require('assert')
+const assert = require('node:assert')
 
 class UpgradeHandler extends AsyncResource {
   constructor (opts, callback) {

diff --git a/lib/api/readable.js b/lib/api/readable.js
@@ -2,8 +2,8 @@
 
 'use strict'
 
-const assert = require('assert')
-const { Readable } = require('stream')
+const assert = require('node:assert')
+const { Readable } = require('node:stream')
 const { RequestAbortedError, NotSupportedError, InvalidArgumentError, AbortError } = require('../core/errors')
 const util = require('../core/util')
 const { ReadableStreamFrom } = require('../core/util')

diff --git a/lib/api/util.js b/lib/api/util.js
@@ -1,4 +1,4 @@
-const assert = require('assert')
+const assert = require('node:assert')
 const {
   ResponseStatusCodeError
 } = require('../core/errors')

diff --git a/lib/cache/cache.js b/lib/cache/cache.js
@@ -9,7 +9,7 @@ const { Request, fromInnerRequest } = require('../fetch/request')
 const { kState } = require('../fetch/symbols')
 const { fetching } = require('../fetch/index')
 const { urlIsHttpHttpsScheme, createDeferredPromise, readAllBytes } = require('../fetch/util')
-const assert = require('assert')
+const assert = require('node:assert')
 const { getGlobalDispatcher } = require('../global')
 
 /**

diff --git a/lib/cache/util.js b/lib/cache/util.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const assert = require('assert')
+const assert = require('node:assert')
 const { URLSerializer } = require('../fetch/dataURL')
 const { isValidHeaderName } = require('../fetch/util')
 

diff --git a/lib/client.js b/lib/client.js
@@ -4,10 +4,10 @@
 
 /* global WebAssembly */
 
-const assert = require('assert')
-const net = require('net')
-const http = require('http')
-const { pipeline } = require('stream')
+const assert = require('node:assert')
+const net = require('node:net')
+const http = require('node:http')
+const { pipeline } = require('node:stream')
 const util = require('./core/util')
 const { channels } = require('./core/diagnostics')
 const timers = require('./timers')
@@ -84,7 +84,7 @@ const {
 /** @type {import('http2')} */
 let http2
 try {
-  http2 = require('http2')
+  http2 = require('node:http2')
 } catch {
   // @ts-ignore
   http2 = { constants: {} }

diff --git a/lib/cookies/parse.js b/lib/cookies/parse.js
@@ -3,7 +3,7 @@
 const { maxNameValuePairSize, maxAttributeValueSize } = require('./constants')
 const { isCTLExcludingHtab } = require('./util')
 const { collectASequenceOfCodePointsFast } = require('../fetch/dataURL')
-const assert = require('assert')
+const assert = require('node:assert')
 
 /**
  * @description Parses the field-value attributes of a set-cookie header string.

diff --git a/lib/cookies/util.js b/lib/cookies/util.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const assert = require('assert')
+const assert = require('node:assert')
 const { kHeadersList } = require('../core/symbols')
 
 function isCTLExcludingHtab (value) {

diff --git a/lib/core/connect.js b/lib/core/connect.js
@@ -1,7 +1,7 @@
 'use strict'
 
-const net = require('net')
-const assert = require('assert')
+const net = require('node:net')
+const assert = require('node:assert')
 const util = require('./util')
 const { InvalidArgumentError, ConnectTimeoutError } = require('./errors')
 
@@ -86,7 +86,7 @@ function buildConnector ({ allowH2, maxCachedSessions, socketPath, timeout, ...o
     let socket
     if (protocol === 'https:') {
       if (!tls) {
-        tls = require('tls')
+        tls = require('node:tls')
       }
       servername = servername || options.servername || util.getServerName(host) || null
 

diff --git a/lib/core/diagnostics.js b/lib/core/diagnostics.js
@@ -1,6 +1,6 @@
 'use strict'
-const diagnosticsChannel = require('diagnostics_channel')
-const util = require('util')
+const diagnosticsChannel = require('node:diagnostics_channel')
+const util = require('node:util')
 
 const undiciDebugLog = util.debuglog('undici')
 const fetchDebuglog = util.debuglog('fetch')

diff --git a/lib/core/request.js b/lib/core/request.js
@@ -4,7 +4,7 @@ const {
   InvalidArgumentError,
   NotSupportedError
 } = require('./errors')
-const assert = require('assert')
+const assert = require('node:assert')
 const { kHTTP2BuildRequest, kHTTP2CopyHeaders, kHTTP1BuildRequest } = require('./symbols')
 const util = require('./util')
 const { channels } = require('./diagnostics.js')