Skip to content

Commit b04d65c

Browse files
UzlopakUzlopak
authored
chore: use 'node:'-prefix for requiring node core modules (#2662)
* chore: use 'node:'-prefix for require * add core modules with underscore in name
1 parent 189e572 commit b04d65c

File tree

181 files changed

+371
-371
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

181 files changed

+371
-371
lines changed

‎benchmarks/benchmark-http2.js

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
'use strict'
22

3-
const { connect } = require('http2')
4-
const { createSecureContext } = require('tls')
5-
const os = require('os')
6-
const path = require('path')
7-
const { readFileSync } = require('fs')
8-
const { Writable } = require('stream')
9-
const { isMainThread } = require('worker_threads')
3+
const { connect } = require('node:http2')
4+
const { createSecureContext } = require('node:tls')
5+
const os = require('node:os')
6+
const path = require('node:path')
7+
const { readFileSync } = require('node:fs')
8+
const { Writable } = require('node:stream')
9+
const { isMainThread } = require('node:worker_threads')
1010

1111
const { Pool, Client, fetch, Agent, setGlobalDispatcher } = require('..')
1212

‎benchmarks/benchmark-https.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
'use strict'
22

3-
const https = require('https')
4-
const os = require('os')
5-
const path = require('path')
6-
const { readFileSync } = require('fs')
7-
const { Writable } = require('stream')
8-
const { isMainThread } = require('worker_threads')
3+
const https = require('node:https')
4+
const os = require('node:os')
5+
const path = require('node:path')
6+
const { readFileSync } = require('node:fs')
7+
const { Writable } = require('node:stream')
8+
const { isMainThread } = require('node:worker_threads')
99

1010
const { Pool, Client, fetch, Agent, setGlobalDispatcher } = require('..')
1111

‎benchmarks/benchmark.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
'use strict'
22

3-
const http = require('http')
4-
const os = require('os')
5-
const path = require('path')
6-
const { Writable } = require('stream')
7-
const { isMainThread } = require('worker_threads')
3+
const http = require('node:http')
4+
const os = require('node:os')
5+
const path = require('node:path')
6+
const { Writable } = require('node:stream')
7+
const { isMainThread } = require('node:worker_threads')
88

99
const { Pool, Client, fetch, Agent, setGlobalDispatcher } = require('..')
1010

1111
let nodeFetch
1212
const axios = require('axios')
1313
let got
1414

15-
const util = require('util')
15+
const util = require('node:util')
1616
const _request = require('request')
1717
const request = util.promisify(_request)
1818

‎benchmarks/server-http2.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
'use strict'
22

3-
const { unlinkSync, readFileSync } = require('fs')
4-
const { createSecureServer } = require('http2')
5-
const os = require('os')
6-
const path = require('path')
7-
const cluster = require('cluster')
3+
const { unlinkSync, readFileSync } = require('node:fs')
4+
const { createSecureServer } = require('node:http2')
5+
const os = require('node:os')
6+
const path = require('node:path')
7+
const cluster = require('node:cluster')
88

99
const key = readFileSync(path.join(__dirname, '..', 'test', 'fixtures', 'key.pem'), 'utf8')
1010
const cert = readFileSync(path.join(__dirname, '..', 'test', 'fixtures', 'cert.pem'), 'utf8')

‎benchmarks/server-https.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
'use strict'
22

3-
const { unlinkSync, readFileSync } = require('fs')
4-
const { createServer } = require('https')
5-
const os = require('os')
6-
const path = require('path')
7-
const cluster = require('cluster')
3+
const { unlinkSync, readFileSync } = require('node:fs')
4+
const { createServer } = require('node:https')
5+
const os = require('node:os')
6+
const path = require('node:path')
7+
const cluster = require('node:cluster')
88

99
const key = readFileSync(path.join(__dirname, '..', 'test', 'fixtures', 'key.pem'), 'utf8')
1010
const cert = readFileSync(path.join(__dirname, '..', 'test', 'fixtures', 'cert.pem'), 'utf8')

‎benchmarks/server.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
'use strict'
22

3-
const { unlinkSync } = require('fs')
4-
const { createServer } = require('http')
5-
const os = require('os')
6-
const path = require('path')
7-
const cluster = require('cluster')
3+
const { unlinkSync } = require('node:fs')
4+
const { createServer } = require('node:http')
5+
const os = require('node:os')
6+
const path = require('node:path')
7+
const cluster = require('node:cluster')
88

99
const socketPath = path.join(os.tmpdir(), 'undici.sock')
1010

‎benchmarks/wait.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use strict'
22

3-
const os = require('os')
4-
const path = require('path')
3+
const os = require('node:os')
4+
const path = require('node:path')
55
const waitOn = require('wait-on')
66

77
const socketPath = path.join(os.tmpdir(), 'undici.sock')

‎build/wasm.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
'use strict'
22

3-
const { execSync } = require('child_process')
4-
const { writeFileSync, readFileSync } = require('fs')
5-
const { join, resolve, basename } = require('path')
3+
const { execSync } = require('node:child_process')
4+
const { writeFileSync, readFileSync } = require('node:fs')
5+
const { join, resolve, basename } = require('node:path')
66

77
const ROOT = resolve(__dirname, '../')
88
const WASM_SRC = resolve(__dirname, '../deps/llhttp')

‎docs/best-practices/client-certificate.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ The server option `rejectUnauthorized: false` allows us to handle any invalid ce
1111
### Client Certificate Authentication
1212

1313
```js
14-
const { readFileSync } = require('fs')
15-
const { join } = require('path')
16-
const { createServer } = require('https')
14+
const { readFileSync } = require('node:fs')
15+
const { join } = require('node:path')
16+
const { createServer } = require('node:https')
1717
const { Client } = require('undici')
1818

1919
const serverOptions = {

‎examples/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ async function postJSONRequest (port = 3001) {
4949
const { request } = require('undici')
5050
async function postFormRequest (port = 3001) {
5151
// Make a URL-encoded form POST request:
52-
const qs = require('querystring')
52+
const qs = require('node:querystring')
5353

5454
const requestBody = {
5555
hello: 'URL Encoded Example body'

‎examples/ca-fingerprint/index.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use strict'
22

3-
const crypto = require('crypto')
4-
const https = require('https')
3+
const crypto = require('node:crypto')
4+
const https = require('node:https')
55
const { Client, buildConnector } = require('../..')
66
const pem = require('https-pem')
77

‎examples/eventsource.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict'
22

3-
const { randomBytes } = require('crypto')
3+
const { randomBytes } = require('node:crypto')
44
const { EventSource } = require('../')
55

66
async function main () {

‎examples/proxy/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const { Pool, Client } = require('../../')
2-
const http = require('http')
2+
const http = require('node:http')
33
const proxy = require('./proxy')
44

55
const pool = new Pool('http://localhost:4001', {

‎examples/proxy/proxy.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
const net = require('net')
2-
const { pipeline } = require('stream')
1+
const net = require('node:net')
2+
const { pipeline } = require('node:stream')
33
const createError = require('http-errors')
44

55
module.exports = async function proxy (ctx, client) {

‎examples/proxy/websocket.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const { Pool, Client } = require('../../')
2-
const http = require('http')
2+
const http = require('node:http')
33
const proxy = require('./proxy')
44
const WebSocket = require('ws')
55

‎examples/request.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ async function postJSONRequest (port = 3001) {
4141

4242
async function postFormRequest (port = 3001) {
4343
// Make a URL-encoded form POST request:
44-
const qs = require('querystring')
44+
const qs = require('node:querystring')
4545

4646
const requestBody = {
4747
hello: 'URL Encoded Example body'

‎lib/api/api-connect.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict'
22

3-
const { AsyncResource } = require('async_hooks')
3+
const { AsyncResource } = require('node:async_hooks')
44
const { InvalidArgumentError, RequestAbortedError, SocketError } = require('../core/errors')
55
const util = require('../core/util')
66
const { addSignal, removeSignal } = require('./abort-signal')

‎lib/api/api-pipeline.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@ const {
44
Readable,
55
Duplex,
66
PassThrough
7-
} = require('stream')
7+
} = require('node:stream')
88
const {
99
InvalidArgumentError,
1010
InvalidReturnValueError,
1111
RequestAbortedError
1212
} = require('../core/errors')
1313
const util = require('../core/util')
14-
const { AsyncResource } = require('async_hooks')
14+
const { AsyncResource } = require('node:async_hooks')
1515
const { addSignal, removeSignal } = require('./abort-signal')
16-
const assert = require('assert')
16+
const assert = require('node:assert')
1717

1818
const kResume = Symbol('resume')
1919

‎lib/api/api-request.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const {
77
} = require('../core/errors')
88
const util = require('../core/util')
99
const { getResolveErrorBodyCallback } = require('./util')
10-
const { AsyncResource } = require('async_hooks')
10+
const { AsyncResource } = require('node:async_hooks')
1111
const { addSignal, removeSignal } = require('./abort-signal')
1212

1313
class RequestHandler extends AsyncResource {

‎lib/api/api-stream.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
'use strict'
22

3-
const { finished, PassThrough } = require('stream')
3+
const { finished, PassThrough } = require('node:stream')
44
const {
55
InvalidArgumentError,
66
InvalidReturnValueError,
77
RequestAbortedError
88
} = require('../core/errors')
99
const util = require('../core/util')
1010
const { getResolveErrorBodyCallback } = require('./util')
11-
const { AsyncResource } = require('async_hooks')
11+
const { AsyncResource } = require('node:async_hooks')
1212
const { addSignal, removeSignal } = require('./abort-signal')
1313

1414
class StreamHandler extends AsyncResource {

‎lib/api/api-upgrade.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
'use strict'
22

33
const { InvalidArgumentError, RequestAbortedError, SocketError } = require('../core/errors')
4-
const { AsyncResource } = require('async_hooks')
4+
const { AsyncResource } = require('node:async_hooks')
55
const util = require('../core/util')
66
const { addSignal, removeSignal } = require('./abort-signal')
7-
const assert = require('assert')
7+
const assert = require('node:assert')
88

99
class UpgradeHandler extends AsyncResource {
1010
constructor (opts, callback) {

‎lib/api/readable.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
'use strict'
44

5-
const assert = require('assert')
6-
const { Readable } = require('stream')
5+
const assert = require('node:assert')
6+
const { Readable } = require('node:stream')
77
const { RequestAbortedError, NotSupportedError, InvalidArgumentError, AbortError } = require('../core/errors')
88
const util = require('../core/util')
99
const { ReadableStreamFrom } = require('../core/util')

‎lib/api/util.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const assert = require('assert')
1+
const assert = require('node:assert')
22
const {
33
ResponseStatusCodeError
44
} = require('../core/errors')

‎lib/cache/cache.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ const { Request, fromInnerRequest } = require('../fetch/request')
99
const { kState } = require('../fetch/symbols')
1010
const { fetching } = require('../fetch/index')
1111
const { urlIsHttpHttpsScheme, createDeferredPromise, readAllBytes } = require('../fetch/util')
12-
const assert = require('assert')
12+
const assert = require('node:assert')
1313
const { getGlobalDispatcher } = require('../global')
1414

1515
/**

‎lib/cache/util.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict'
22

3-
const assert = require('assert')
3+
const assert = require('node:assert')
44
const { URLSerializer } = require('../fetch/dataURL')
55
const { isValidHeaderName } = require('../fetch/util')
66

‎lib/client.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44

55
/* global WebAssembly */
66

7-
const assert = require('assert')
8-
const net = require('net')
9-
const http = require('http')
10-
const { pipeline } = require('stream')
7+
const assert = require('node:assert')
8+
const net = require('node:net')
9+
const http = require('node:http')
10+
const { pipeline } = require('node:stream')
1111
const util = require('./core/util')
1212
const { channels } = require('./core/diagnostics')
1313
const timers = require('./timers')
@@ -84,7 +84,7 @@ const {
8484
/** @type {import('http2')} */
8585
let http2
8686
try {
87-
http2 = require('http2')
87+
http2 = require('node:http2')
8888
} catch {
8989
// @ts-ignore
9090
http2 = { constants: {} }

‎lib/cookies/parse.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
const { maxNameValuePairSize, maxAttributeValueSize } = require('./constants')
44
const { isCTLExcludingHtab } = require('./util')
55
const { collectASequenceOfCodePointsFast } = require('../fetch/dataURL')
6-
const assert = require('assert')
6+
const assert = require('node:assert')
77

88
/**
99
* @description Parses the field-value attributes of a set-cookie header string.

‎lib/cookies/util.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict'
22

3-
const assert = require('assert')
3+
const assert = require('node:assert')
44
const { kHeadersList } = require('../core/symbols')
55

66
function isCTLExcludingHtab (value) {

‎lib/core/connect.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use strict'
22

3-
const net = require('net')
4-
const assert = require('assert')
3+
const net = require('node:net')
4+
const assert = require('node:assert')
55
const util = require('./util')
66
const { InvalidArgumentError, ConnectTimeoutError } = require('./errors')
77

@@ -86,7 +86,7 @@ function buildConnector ({ allowH2, maxCachedSessions, socketPath, timeout, ...o
8686
let socket
8787
if (protocol === 'https:') {
8888
if (!tls) {
89-
tls = require('tls')
89+
tls = require('node:tls')
9090
}
9191
servername = servername || options.servername || util.getServerName(host) || null
9292

‎lib/core/diagnostics.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict'
2-
const diagnosticsChannel = require('diagnostics_channel')
3-
const util = require('util')
2+
const diagnosticsChannel = require('node:diagnostics_channel')
3+
const util = require('node:util')
44

55
const undiciDebugLog = util.debuglog('undici')
66
const fetchDebuglog = util.debuglog('fetch')

‎lib/core/request.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ const {
44
InvalidArgumentError,
55
NotSupportedError
66
} = require('./errors')
7-
const assert = require('assert')
7+
const assert = require('node:assert')
88
const { kHTTP2BuildRequest, kHTTP2CopyHeaders, kHTTP1BuildRequest } = require('./symbols')
99
const util = require('./util')
1010
const { channels } = require('./diagnostics.js')

0 commit comments

Comments
 (0)