From ee4131447a3b01d3a0463e2d2794df0302b6e711 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Linus=20Unneb=C3=A4ck?= Date: Fri, 3 Dec 2021 13:02:16 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=A4=96=20Merge=20PR=20#57498=20node:=20Ad?= =?UTF-8?q?d=20support=20for=20node:=20prefix=20on=20v14=20by=20@LinusU?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- types/node/v14/assert.d.ts | 4 ++++ types/node/v14/async_hooks.d.ts | 3 +++ types/node/v14/buffer.d.ts | 3 +++ types/node/v14/child_process.d.ts | 3 +++ types/node/v14/cluster.d.ts | 3 +++ types/node/v14/console.d.ts | 4 ++++ types/node/v14/constants.d.ts | 5 +++++ types/node/v14/crypto.d.ts | 3 +++ types/node/v14/dgram.d.ts | 3 +++ types/node/v14/dns.d.ts | 3 +++ types/node/v14/domain.d.ts | 3 +++ types/node/v14/events.d.ts | 4 ++++ types/node/v14/fs.d.ts | 3 +++ types/node/v14/fs/promises.d.ts | 3 +++ types/node/v14/http.d.ts | 3 +++ types/node/v14/http2.d.ts | 3 +++ types/node/v14/https.d.ts | 3 +++ types/node/v14/index.d.ts | 3 ++- types/node/v14/inspector.d.ts | 4 ++++ types/node/v14/module.d.ts | 4 ++++ types/node/v14/net.d.ts | 3 +++ types/node/v14/os.d.ts | 3 +++ types/node/v14/path.d.ts | 4 ++++ types/node/v14/perf_hooks.d.ts | 3 +++ types/node/v14/process.d.ts | 4 ++++ types/node/v14/punycode.d.ts | 3 +++ types/node/v14/querystring.d.ts | 3 +++ types/node/v14/readline.d.ts | 3 +++ types/node/v14/repl.d.ts | 3 +++ types/node/v14/stream.d.ts | 4 ++++ types/node/v14/string_decoder.d.ts | 3 +++ types/node/v14/test/assert.ts | 2 +- types/node/v14/test/async_hooks.ts | 2 +- types/node/v14/test/buffer.ts | 2 +- types/node/v14/test/child_process.ts | 12 ++++++------ types/node/v14/test/cluster.ts | 2 +- types/node/v14/test/constants.ts | 2 +- types/node/v14/test/crypto.ts | 6 +++--- types/node/v14/test/dgram.ts | 6 +++--- types/node/v14/test/dns.ts | 2 +- types/node/v14/test/events.ts | 2 +- types/node/v14/test/fs.ts | 8 ++++---- types/node/v14/test/global.ts | 2 +- types/node/v14/test/http.ts | 10 +++++----- types/node/v14/test/http2.ts | 14 +++++++------- types/node/v14/test/https.ts | 14 +++++++------- types/node/v14/test/module.ts | 4 ++-- types/node/v14/test/net.ts | 4 ++-- types/node/v14/test/os.ts | 2 +- types/node/v14/test/path.ts | 2 +- types/node/v14/test/perf_hooks.ts | 2 +- types/node/v14/test/process.ts | 6 +++--- types/node/v14/test/querystring.ts | 2 +- types/node/v14/test/readline.ts | 6 +++--- types/node/v14/test/repl.ts | 4 ++-- types/node/v14/test/stream.ts | 12 ++++++------ types/node/v14/test/string_decoder.ts | 2 +- types/node/v14/test/tls.ts | 4 ++-- types/node/v14/test/tty.ts | 4 ++-- types/node/v14/test/url.ts | 4 ++-- types/node/v14/test/util.ts | 6 +++--- types/node/v14/test/v8.ts | 4 ++-- types/node/v14/test/vm.ts | 4 ++-- types/node/v14/test/wasi.ts | 4 ++-- types/node/v14/test/worker_threads.ts | 10 +++++----- types/node/v14/test/zlib.ts | 4 ++-- types/node/v14/timers.d.ts | 3 +++ types/node/v14/tls.d.ts | 3 +++ types/node/v14/trace_events.d.ts | 3 +++ types/node/v14/tty.d.ts | 3 +++ types/node/v14/url.d.ts | 3 +++ types/node/v14/util.d.ts | 3 +++ types/node/v14/v8.d.ts | 3 +++ types/node/v14/vm.d.ts | 3 +++ types/node/v14/wasi.d.ts | 3 +++ types/node/v14/worker_threads.d.ts | 3 +++ types/node/v14/zlib.d.ts | 3 +++ 77 files changed, 223 insertions(+), 89 deletions(-) diff --git a/types/node/v14/assert.d.ts b/types/node/v14/assert.d.ts index fd35f638f9acc2..90e413dcd45733 100644 --- a/types/node/v14/assert.d.ts +++ b/types/node/v14/assert.d.ts @@ -122,3 +122,7 @@ declare module 'assert' { export = assert; } +declare module 'node:assert' { + import assert = require('assert'); + export = assert; +} diff --git a/types/node/v14/async_hooks.d.ts b/types/node/v14/async_hooks.d.ts index a9fd8f75650035..4067d61a9a5fd0 100644 --- a/types/node/v14/async_hooks.d.ts +++ b/types/node/v14/async_hooks.d.ts @@ -224,3 +224,6 @@ declare module 'async_hooks' { enterWith(store: T): void; } } +declare module 'node:async_hooks' { + export * from 'async_hooks'; +} diff --git a/types/node/v14/buffer.d.ts b/types/node/v14/buffer.d.ts index 0aa039c56a2ee5..927f278d8e7b0d 100644 --- a/types/node/v14/buffer.d.ts +++ b/types/node/v14/buffer.d.ts @@ -20,3 +20,6 @@ declare module 'buffer' { export { BuffType as Buffer }; } +declare module 'node:buffer' { + export * from 'buffer'; +} diff --git a/types/node/v14/child_process.d.ts b/types/node/v14/child_process.d.ts index cea7f89c6d7dea..ed34d31d3d143e 100644 --- a/types/node/v14/child_process.d.ts +++ b/types/node/v14/child_process.d.ts @@ -509,3 +509,6 @@ declare module 'child_process' { function execFileSync(command: string, args: ReadonlyArray, options: ExecFileSyncOptionsWithBufferEncoding): Buffer; function execFileSync(command: string, args?: ReadonlyArray, options?: ExecFileSyncOptions): string | Buffer; } +declare module 'node:child_process' { + export * from 'child_process'; +} diff --git a/types/node/v14/cluster.d.ts b/types/node/v14/cluster.d.ts index 6c51f49cbc011e..19fcad4a4f425c 100644 --- a/types/node/v14/cluster.d.ts +++ b/types/node/v14/cluster.d.ts @@ -260,3 +260,6 @@ declare module 'cluster' { function eventNames(): string[]; } +declare module 'node:cluster' { + export * from 'cluster'; +} diff --git a/types/node/v14/console.d.ts b/types/node/v14/console.d.ts index 39e16d20605f45..c20106e0f8a06f 100644 --- a/types/node/v14/console.d.ts +++ b/types/node/v14/console.d.ts @@ -1,4 +1,8 @@ declare module 'console' { + import console = require('node:console'); + export = console; +} +declare module 'node:console' { import { InspectOptions } from 'util'; global { diff --git a/types/node/v14/constants.d.ts b/types/node/v14/constants.d.ts index 98ff97602b78c1..4c5c8813c8770f 100644 --- a/types/node/v14/constants.d.ts +++ b/types/node/v14/constants.d.ts @@ -11,3 +11,8 @@ declare module 'constants' { typeof fsConstants; export = exp; } + +declare module 'node:constants' { + import constants = require('constants'); + export = constants; +} diff --git a/types/node/v14/crypto.d.ts b/types/node/v14/crypto.d.ts index 853b5f845b6af5..f08a9fdf8eda10 100644 --- a/types/node/v14/crypto.d.ts +++ b/types/node/v14/crypto.d.ts @@ -1184,3 +1184,6 @@ declare module 'crypto' { */ function diffieHellman(options: { privateKey: KeyObject; publicKey: KeyObject }): Buffer; } +declare module 'node:crypto' { + export * from 'crypto'; +} diff --git a/types/node/v14/dgram.d.ts b/types/node/v14/dgram.d.ts index 88c8c87c31dcd2..041cc51f21d118 100644 --- a/types/node/v14/dgram.d.ts +++ b/types/node/v14/dgram.d.ts @@ -139,3 +139,6 @@ declare module 'dgram' { prependOnceListener(event: "message", listener: (msg: Buffer, rinfo: RemoteInfo) => void): this; } } +declare module 'node:dgram' { + export * from 'dgram'; +} diff --git a/types/node/v14/dns.d.ts b/types/node/v14/dns.d.ts index 412a0936067d8b..d142626a03db2d 100644 --- a/types/node/v14/dns.d.ts +++ b/types/node/v14/dns.d.ts @@ -382,3 +382,6 @@ declare module 'dns' { } } } +declare module 'node:dns' { + export * from 'dns'; +} diff --git a/types/node/v14/domain.d.ts b/types/node/v14/domain.d.ts index 6423ebfce17256..daefff33acb28b 100644 --- a/types/node/v14/domain.d.ts +++ b/types/node/v14/domain.d.ts @@ -22,3 +22,6 @@ declare module 'domain' { function create(): Domain; } +declare module 'node:domain' { + export * from 'domain'; +} diff --git a/types/node/v14/events.d.ts b/types/node/v14/events.d.ts index feb2b41d3f111c..a0856b04a224ae 100644 --- a/types/node/v14/events.d.ts +++ b/types/node/v14/events.d.ts @@ -76,3 +76,7 @@ declare module 'events' { export = EventEmitter; } +declare module 'node:events' { + import events = require('events'); + export = events; +} diff --git a/types/node/v14/fs.d.ts b/types/node/v14/fs.d.ts index 89528f4a1fe8b2..a249f9de26c1aa 100644 --- a/types/node/v14/fs.d.ts +++ b/types/node/v14/fs.d.ts @@ -2268,3 +2268,6 @@ declare module 'fs' { bigint?: boolean | undefined; } } +declare module 'node:fs' { + export * from 'fs'; +} diff --git a/types/node/v14/fs/promises.d.ts b/types/node/v14/fs/promises.d.ts index 1133977da41c62..a3ee359006888a 100644 --- a/types/node/v14/fs/promises.d.ts +++ b/types/node/v14/fs/promises.d.ts @@ -563,3 +563,6 @@ declare module 'fs/promises' { function opendir(path: PathLike, options?: OpenDirOptions): Promise; } +declare module 'node:fs/promises' { + export * from 'fs/promises'; +} diff --git a/types/node/v14/http.d.ts b/types/node/v14/http.d.ts index f288ea33a9c57b..b6f838bc79c8f0 100644 --- a/types/node/v14/http.d.ts +++ b/types/node/v14/http.d.ts @@ -485,3 +485,6 @@ declare module 'http' { */ const maxHeaderSize: number; } +declare module 'node:http' { + export * from 'http'; +} diff --git a/types/node/v14/http2.d.ts b/types/node/v14/http2.d.ts index 22c0487956cd22..aeb9bf3a438a73 100644 --- a/types/node/v14/http2.d.ts +++ b/types/node/v14/http2.d.ts @@ -956,3 +956,6 @@ declare module 'http2' { listener?: (session: ClientHttp2Session, socket: net.Socket | tls.TLSSocket) => void ): ClientHttp2Session; } +declare module 'node:http2' { + export * from 'http2'; +} diff --git a/types/node/v14/https.d.ts b/types/node/v14/https.d.ts index 0d516a8161dc2c..74eb2d3196653a 100644 --- a/types/node/v14/https.d.ts +++ b/types/node/v14/https.d.ts @@ -137,3 +137,6 @@ declare module 'https' { function get(url: string | URL, options: RequestOptions, callback?: (res: http.IncomingMessage) => void): http.ClientRequest; let globalAgent: Agent; } +declare module 'node:https' { + export * from 'https'; +} diff --git a/types/node/v14/index.d.ts b/types/node/v14/index.d.ts index 427d09591458ad..853342e4483401 100644 --- a/types/node/v14/index.d.ts +++ b/types/node/v14/index.d.ts @@ -1,4 +1,4 @@ -// Type definitions for non-npm package Node.js 14.17 +// Type definitions for non-npm package Node.js 14.18 // Project: https://nodejs.org/ // Definitions by: Microsoft TypeScript // DefinitelyTyped @@ -41,6 +41,7 @@ // Victor Perin // Yongsheng Zhang // Bond +// Linus Unnebäck // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped // NOTE: These definitions support NodeJS and TypeScript 3.7+ diff --git a/types/node/v14/inspector.d.ts b/types/node/v14/inspector.d.ts index 22eb7b52a98062..a2498811ebcf7a 100644 --- a/types/node/v14/inspector.d.ts +++ b/types/node/v14/inspector.d.ts @@ -3045,3 +3045,7 @@ declare module 'inspector' { */ function waitForDebugger(): void; } +declare module 'node:inspector' { + import EventEmitter = require('inspector'); + export = EventEmitter; +} diff --git a/types/node/v14/module.d.ts b/types/node/v14/module.d.ts index 787955a562194d..ab3c54199be995 100644 --- a/types/node/v14/module.d.ts +++ b/types/node/v14/module.d.ts @@ -50,3 +50,7 @@ declare module 'module' { } export = Module; } +declare module 'node:module' { + import module = require('module'); + export = module; +} diff --git a/types/node/v14/net.d.ts b/types/node/v14/net.d.ts index ed6a6e178ad9a6..0edfcd3ecb3df5 100644 --- a/types/node/v14/net.d.ts +++ b/types/node/v14/net.d.ts @@ -291,3 +291,6 @@ declare module 'net' { function isIPv4(input: string): boolean; function isIPv6(input: string): boolean; } +declare module 'node:net' { + export * from 'net'; +} diff --git a/types/node/v14/os.d.ts b/types/node/v14/os.d.ts index 6c92907b72a042..1112ed83f4cf2f 100644 --- a/types/node/v14/os.d.ts +++ b/types/node/v14/os.d.ts @@ -237,3 +237,6 @@ declare module 'os' { */ function setPriority(pid: number, priority: number): void; } +declare module 'node:os' { + export * from 'os'; +} diff --git a/types/node/v14/path.d.ts b/types/node/v14/path.d.ts index 05469ba849814b..9b9d001d356e3f 100644 --- a/types/node/v14/path.d.ts +++ b/types/node/v14/path.d.ts @@ -151,3 +151,7 @@ declare module 'path' { const path: path.PlatformPath; export = path; } +declare module 'node:path' { + import path = require('path'); + export = path; +} diff --git a/types/node/v14/perf_hooks.d.ts b/types/node/v14/perf_hooks.d.ts index b12eff70e1431b..82babc63958b76 100644 --- a/types/node/v14/perf_hooks.d.ts +++ b/types/node/v14/perf_hooks.d.ts @@ -269,3 +269,6 @@ declare module 'perf_hooks' { function monitorEventLoopDelay(options?: EventLoopMonitorOptions): EventLoopDelayMonitor; } +declare module 'node:perf_hooks' { + export * from 'perf_hooks'; +} diff --git a/types/node/v14/process.d.ts b/types/node/v14/process.d.ts index ef201b4e743f4d..de27bca5a34b3f 100644 --- a/types/node/v14/process.d.ts +++ b/types/node/v14/process.d.ts @@ -407,3 +407,7 @@ declare module 'process' { export = process; } +declare module 'node:process' { + import process = require('process'); + export = process; +} diff --git a/types/node/v14/punycode.d.ts b/types/node/v14/punycode.d.ts index b21ee8ec0ce3fc..25680d8e080b52 100644 --- a/types/node/v14/punycode.d.ts +++ b/types/node/v14/punycode.d.ts @@ -73,3 +73,6 @@ declare module 'punycode' { */ const version: string; } +declare module 'node:punycode' { + export * from 'punycode'; +} diff --git a/types/node/v14/querystring.d.ts b/types/node/v14/querystring.d.ts index 3d2c4f0031c1b0..fb0a5dcf37b6db 100644 --- a/types/node/v14/querystring.d.ts +++ b/types/node/v14/querystring.d.ts @@ -26,3 +26,6 @@ declare module 'querystring' { function escape(str: string): string; function unescape(str: string): string; } +declare module 'node:querystring' { + export * from 'querystring'; +} diff --git a/types/node/v14/readline.d.ts b/types/node/v14/readline.d.ts index af2b3c9e36c353..ba3f257cf61943 100644 --- a/types/node/v14/readline.d.ts +++ b/types/node/v14/readline.d.ts @@ -169,3 +169,6 @@ declare module 'readline' { */ function moveCursor(stream: NodeJS.WritableStream, dx: number, dy: number, callback?: () => void): boolean; } +declare module 'node:readline' { + export * from 'readline'; +} diff --git a/types/node/v14/repl.d.ts b/types/node/v14/repl.d.ts index 06f8b64a162dd4..54fc9ef2e0136d 100644 --- a/types/node/v14/repl.d.ts +++ b/types/node/v14/repl.d.ts @@ -393,3 +393,6 @@ declare module 'repl' { constructor(err: Error); } } +declare module 'node:repl' { + export * from 'repl'; +} diff --git a/types/node/v14/stream.d.ts b/types/node/v14/stream.d.ts index 083bc2fe1edd67..8d34d7a3a13cc7 100644 --- a/types/node/v14/stream.d.ts +++ b/types/node/v14/stream.d.ts @@ -353,3 +353,7 @@ declare module 'stream' { export = internal; } +declare module 'node:stream' { + import stream = require('stream'); + export = stream; +} diff --git a/types/node/v14/string_decoder.d.ts b/types/node/v14/string_decoder.d.ts index c7ace1c129cd9a..7da4a5159003ee 100644 --- a/types/node/v14/string_decoder.d.ts +++ b/types/node/v14/string_decoder.d.ts @@ -5,3 +5,6 @@ declare module 'string_decoder' { end(buffer?: Buffer): string; } } +declare module 'node:string_decoder' { + export * from 'string_decoder'; +} diff --git a/types/node/v14/test/assert.ts b/types/node/v14/test/assert.ts index 06bbfcb82acb6f..ca74d4a8b38d95 100644 --- a/types/node/v14/test/assert.ts +++ b/types/node/v14/test/assert.ts @@ -1,4 +1,4 @@ -import assert = require('assert'); +import assert = require('node:assert'); { const { stack } = new assert.AssertionError({}); diff --git a/types/node/v14/test/async_hooks.ts b/types/node/v14/test/async_hooks.ts index aa519c94b05cc1..ed04908ac90544 100644 --- a/types/node/v14/test/async_hooks.ts +++ b/types/node/v14/test/async_hooks.ts @@ -6,7 +6,7 @@ import { executionAsyncResource, HookCallbacks, AsyncLocalStorage, -} from 'async_hooks'; +} from 'node:async_hooks'; { const hooks: HookCallbacks = { diff --git a/types/node/v14/test/buffer.ts b/types/node/v14/test/buffer.ts index d1230ec2c6b0dd..d8997b8bf89d29 100644 --- a/types/node/v14/test/buffer.ts +++ b/types/node/v14/test/buffer.ts @@ -7,7 +7,7 @@ import { constants, kMaxLength, kStringMaxLength, -} from 'buffer'; +} from 'node:buffer'; const utf8Buffer = new Buffer('test'); const base64Buffer = new Buffer('', 'base64'); diff --git a/types/node/v14/test/child_process.ts b/types/node/v14/test/child_process.ts index eeca03e5836f09..2986ac66eb20d7 100644 --- a/types/node/v14/test/child_process.ts +++ b/types/node/v14/test/child_process.ts @@ -1,9 +1,9 @@ -import * as childProcess from 'child_process'; -import * as net from 'net'; -import * as fs from 'fs'; -import assert = require('assert'); -import { promisify } from 'util'; -import { Writable, Readable, Pipe } from 'stream'; +import * as childProcess from 'node:child_process'; +import * as net from 'node:net'; +import * as fs from 'node:fs'; +import assert = require('node:assert'); +import { promisify } from 'node:util'; +import { Writable, Readable, Pipe } from 'node:stream'; { childProcess.exec("echo test"); diff --git a/types/node/v14/test/cluster.ts b/types/node/v14/test/cluster.ts index 0a23a5636b4ecf..65160ef1da9c8a 100644 --- a/types/node/v14/test/cluster.ts +++ b/types/node/v14/test/cluster.ts @@ -1,4 +1,4 @@ -import * as cluster from 'cluster'; +import * as cluster from 'node:cluster'; cluster.fork(); Object.keys(cluster.workers).forEach(key => { diff --git a/types/node/v14/test/constants.ts b/types/node/v14/test/constants.ts index 95403fed2772be..07d304ce618637 100644 --- a/types/node/v14/test/constants.ts +++ b/types/node/v14/test/constants.ts @@ -1,4 +1,4 @@ -import * as constants from 'constants'; +import * as constants from 'node:constants'; { let str: string; let num: number; diff --git a/types/node/v14/test/crypto.ts b/types/node/v14/test/crypto.ts index a4b8b39f1cbb66..adc7d24555d05b 100644 --- a/types/node/v14/test/crypto.ts +++ b/types/node/v14/test/crypto.ts @@ -1,6 +1,6 @@ -import * as crypto from 'crypto'; -import assert = require('assert'); -import { promisify } from 'util'; +import * as crypto from 'node:crypto'; +import assert = require('node:assert'); +import { promisify } from 'node:util'; { const copied: crypto.Hash = crypto.createHash('md5').copy(); diff --git a/types/node/v14/test/dgram.ts b/types/node/v14/test/dgram.ts index 06ff2e0b1d3b77..6949a2c785cc10 100644 --- a/types/node/v14/test/dgram.ts +++ b/types/node/v14/test/dgram.ts @@ -1,6 +1,6 @@ -import * as dgram from 'dgram'; -import * as net from 'net'; -import * as dns from 'dns'; +import * as dgram from 'node:dgram'; +import * as net from 'node:net'; +import * as dns from 'node:dns'; { let ds: dgram.Socket = dgram.createSocket("udp4", (msg: Buffer, rinfo: dgram.RemoteInfo): void => { diff --git a/types/node/v14/test/dns.ts b/types/node/v14/test/dns.ts index e7c696695e35b4..24ee8ef2917e24 100644 --- a/types/node/v14/test/dns.ts +++ b/types/node/v14/test/dns.ts @@ -14,7 +14,7 @@ import { ALL, promises, setDefaultResultOrder, -} from 'dns'; +} from 'node:dns'; lookup("nodejs.org", (err, address, family) => { const _err: NodeJS.ErrnoException | null = err; diff --git a/types/node/v14/test/events.ts b/types/node/v14/test/events.ts index 3fb86d456f4565..60535675a5370d 100644 --- a/types/node/v14/test/events.ts +++ b/types/node/v14/test/events.ts @@ -1,4 +1,4 @@ -import events = require('events'); +import events = require('node:events'); const emitter: events = new events.EventEmitter(); declare const listener: (...args: any[]) => void; diff --git a/types/node/v14/test/fs.ts b/types/node/v14/test/fs.ts index 2a54879e86e8e4..4bca909aeeff75 100644 --- a/types/node/v14/test/fs.ts +++ b/types/node/v14/test/fs.ts @@ -1,7 +1,7 @@ -import * as fs from 'fs'; -import assert = require('assert'); -import * as util from 'util'; -import * as url from 'url'; +import * as fs from 'node:fs'; +import assert = require('node:assert'); +import * as util from 'node:util'; +import * as url from 'node:url'; { fs.writeFile("thebible.txt", diff --git a/types/node/v14/test/global.ts b/types/node/v14/test/global.ts index 6090816b10e1e4..9ad40cda912821 100644 --- a/types/node/v14/test/global.ts +++ b/types/node/v14/test/global.ts @@ -1,4 +1,4 @@ -import { Readable, Writable } from 'stream'; +import { Readable, Writable } from 'node:stream'; { const x: NodeModule = {} as any; diff --git a/types/node/v14/test/http.ts b/types/node/v14/test/http.ts index 4a2efd4a5b1987..4a22a1a5cef6b6 100644 --- a/types/node/v14/test/http.ts +++ b/types/node/v14/test/http.ts @@ -1,8 +1,8 @@ -import * as http from 'http'; -import * as stream from 'stream'; -import * as url from 'url'; -import * as net from 'net'; -import * as dns from 'dns'; +import * as http from 'node:http'; +import * as stream from 'node:stream'; +import * as url from 'node:url'; +import * as net from 'node:net'; +import * as dns from 'node:dns'; // http Server { diff --git a/types/node/v14/test/http2.ts b/types/node/v14/test/http2.ts index a8c474551a51e4..23ce592e415d90 100644 --- a/types/node/v14/test/http2.ts +++ b/types/node/v14/test/http2.ts @@ -31,13 +31,13 @@ import { createServer, constants, ServerOptions, -} from 'http2'; -import EventEmitter = require('events'); -import { Stats } from 'fs'; -import { Socket, Server } from 'net'; -import { TLSSocket } from 'tls'; -import { Duplex, Readable } from 'stream'; -import { URL } from 'url'; +} from 'node:http2'; +import EventEmitter = require('node:events'); +import { Stats } from 'node:fs'; +import { Socket, Server } from 'node:net'; +import { TLSSocket } from 'node:tls'; +import { Duplex, Readable } from 'node:stream'; +import { URL } from 'node:url'; // Headers & Settings { diff --git a/types/node/v14/test/https.ts b/types/node/v14/test/https.ts index f2c88c4ff13442..60b74ace464316 100644 --- a/types/node/v14/test/https.ts +++ b/types/node/v14/test/https.ts @@ -1,10 +1,10 @@ -import * as http from "http"; -import * as https from 'https'; -import * as net from 'net'; -import * as stream from 'stream'; -import * as tls from 'tls'; -import * as url from 'url'; -import * as dns from 'dns'; +import * as http from 'node:http'; +import * as https from 'node:https'; +import * as net from 'node:net'; +import * as stream from 'node:stream'; +import * as tls from 'node:tls'; +import * as url from 'node:url'; +import * as dns from 'node:dns'; // https tests { diff --git a/types/node/v14/test/module.ts b/types/node/v14/test/module.ts index 39c78f51f1fee3..1fe2f51f052c8d 100644 --- a/types/node/v14/test/module.ts +++ b/types/node/v14/test/module.ts @@ -1,5 +1,5 @@ -import Module = require('module'); -import { URL } from 'url'; +import Module = require('node:module'); +import { URL } from 'node:url'; require.extensions[".ts"] = () => ""; Module.runMain(); diff --git a/types/node/v14/test/net.ts b/types/node/v14/test/net.ts index 7bc17777695824..204030ee24078b 100644 --- a/types/node/v14/test/net.ts +++ b/types/node/v14/test/net.ts @@ -1,5 +1,5 @@ -import * as net from 'net'; -import { LookupOneOptions } from 'dns'; +import * as net from 'node:net'; +import { LookupOneOptions } from 'node:dns'; { const connectOpts: net.NetConnectOpts = { diff --git a/types/node/v14/test/os.ts b/types/node/v14/test/os.ts index 82604ba9cba8cb..94932c8d96f737 100644 --- a/types/node/v14/test/os.ts +++ b/types/node/v14/test/os.ts @@ -1,4 +1,4 @@ -import * as os from 'os'; +import * as os from 'node:os'; { let result: string; diff --git a/types/node/v14/test/path.ts b/types/node/v14/test/path.ts index 92b6b426e7ec41..d1a3a9e7abd664 100644 --- a/types/node/v14/test/path.ts +++ b/types/node/v14/test/path.ts @@ -1,4 +1,4 @@ -import * as path from 'path'; +import * as path from 'node:path'; path.normalize('/foo/bar//baz/asdf/quux/..'); diff --git a/types/node/v14/test/perf_hooks.ts b/types/node/v14/test/perf_hooks.ts index 3b36e15b9dc95a..9115d6762b7be5 100644 --- a/types/node/v14/test/perf_hooks.ts +++ b/types/node/v14/test/perf_hooks.ts @@ -7,7 +7,7 @@ import { EntryType, constants, EventLoopUtilization, -} from 'perf_hooks'; +} from 'node:perf_hooks'; performance.mark('start'); ( diff --git a/types/node/v14/test/process.ts b/types/node/v14/test/process.ts index abed6a5b41f866..af797ec125f46c 100644 --- a/types/node/v14/test/process.ts +++ b/types/node/v14/test/process.ts @@ -1,6 +1,6 @@ -import * as p from 'process'; -import assert = require('assert'); -import EventEmitter = require('events'); +import * as p from 'node:process'; +import assert = require('node:assert'); +import EventEmitter = require('node:events'); { let eventEmitter: EventEmitter; diff --git a/types/node/v14/test/querystring.ts b/types/node/v14/test/querystring.ts index f1301a5ae00481..55024f4230b539 100644 --- a/types/node/v14/test/querystring.ts +++ b/types/node/v14/test/querystring.ts @@ -1,4 +1,4 @@ -import * as querystring from 'querystring'; +import * as querystring from 'node:querystring'; interface SampleObject { [key: string]: string; } diff --git a/types/node/v14/test/readline.ts b/types/node/v14/test/readline.ts index f412109fc2c8f9..516c4976539d78 100644 --- a/types/node/v14/test/readline.ts +++ b/types/node/v14/test/readline.ts @@ -1,6 +1,6 @@ -import * as readline from 'readline'; -import * as stream from 'stream'; -import * as fs from 'fs'; +import * as readline from 'node:readline'; +import * as stream from 'node:stream'; +import * as fs from 'node:fs'; const rl: readline.ReadLine = readline.createInterface(new stream.Readable()); diff --git a/types/node/v14/test/repl.ts b/types/node/v14/test/repl.ts index 6d54ed4dfafba1..6a36931e582161 100644 --- a/types/node/v14/test/repl.ts +++ b/types/node/v14/test/repl.ts @@ -1,5 +1,5 @@ -import { start, Recoverable } from 'repl'; -import { Context } from 'vm'; +import { start, Recoverable } from 'node:repl'; +import { Context } from 'node:vm'; { let server = start({ diff --git a/types/node/v14/test/stream.ts b/types/node/v14/test/stream.ts index 54c33a6a0a2544..fb237146ff51f4 100644 --- a/types/node/v14/test/stream.ts +++ b/types/node/v14/test/stream.ts @@ -1,9 +1,9 @@ -import { Readable, Writable, Transform, finished, pipeline, Duplex } from 'stream'; -import { promisify } from 'util'; -import { createReadStream, createWriteStream } from 'fs'; -import { createGzip, constants } from 'zlib'; -import assert = require('assert'); -import { Http2ServerResponse } from 'http2'; +import { Readable, Writable, Transform, finished, pipeline, Duplex } from 'node:stream'; +import { promisify } from 'node:util'; +import { createReadStream, createWriteStream } from 'node:fs'; +import { createGzip, constants } from 'node:zlib'; +import assert = require('node:assert'); +import { Http2ServerResponse } from 'node:http2'; // Simplified constructors function simplified_stream_ctor_test() { diff --git a/types/node/v14/test/string_decoder.ts b/types/node/v14/test/string_decoder.ts index 7216f3829676ef..1a5e2edde29167 100644 --- a/types/node/v14/test/string_decoder.ts +++ b/types/node/v14/test/string_decoder.ts @@ -1,4 +1,4 @@ -import { StringDecoder } from 'string_decoder'; +import { StringDecoder } from 'node:string_decoder'; const buffer = new Buffer('test'); const decoder1 = new StringDecoder(); diff --git a/types/node/v14/test/tls.ts b/types/node/v14/test/tls.ts index 3b8ae30b43f780..21fec669f42446 100644 --- a/types/node/v14/test/tls.ts +++ b/types/node/v14/test/tls.ts @@ -14,8 +14,8 @@ import { rootCertificates, Server, TlsOptions, -} from 'tls'; -import * as fs from 'fs'; +} from 'node:tls'; +import * as fs from 'node:fs'; { const ctx: SecureContext = createSecureContext({ diff --git a/types/node/v14/test/tty.ts b/types/node/v14/test/tty.ts index c44f5c964703a2..8cbb53113a8fca 100644 --- a/types/node/v14/test/tty.ts +++ b/types/node/v14/test/tty.ts @@ -1,5 +1,5 @@ -import * as tty from 'tty'; -import { Readable } from 'stream'; +import * as tty from 'node:tty'; +import { Readable } from 'node:stream'; const rs: tty.ReadStream = new tty.ReadStream(0); const ws: tty.WriteStream = new tty.WriteStream(1); diff --git a/types/node/v14/test/url.ts b/types/node/v14/test/url.ts index a6356547b3e7ef..5e863db2c22929 100644 --- a/types/node/v14/test/url.ts +++ b/types/node/v14/test/url.ts @@ -1,5 +1,5 @@ -import assert = require('assert'); -import * as url from 'url'; +import assert = require('node:assert'); +import * as url from 'node:url'; { url.format(url.parse('http://www.example.com/xyz')); diff --git a/types/node/v14/test/util.ts b/types/node/v14/test/util.ts index 64729a6ca51773..9961664f01efca 100644 --- a/types/node/v14/test/util.ts +++ b/types/node/v14/test/util.ts @@ -1,6 +1,6 @@ -import * as util from 'util'; -import assert = require('assert'); -import { access, readFile } from 'fs'; +import * as util from 'node:util'; +import assert = require('node:assert'); +import { access, readFile } from 'node:fs'; { // Old and new util.inspect APIs diff --git a/types/node/v14/test/v8.ts b/types/node/v14/test/v8.ts index 0dadd078cb143f..f3533fc21c1e66 100644 --- a/types/node/v14/test/v8.ts +++ b/types/node/v14/test/v8.ts @@ -1,5 +1,5 @@ -import * as v8 from 'v8'; -import { Readable } from 'stream'; +import * as v8 from 'node:v8'; +import { Readable } from 'node:stream'; const heapStats = v8.getHeapStatistics(); const numOfDetached = heapStats.number_of_detached_contexts; diff --git a/types/node/v14/test/vm.ts b/types/node/v14/test/vm.ts index 02b6abe1a80522..04df79cc90dabf 100644 --- a/types/node/v14/test/vm.ts +++ b/types/node/v14/test/vm.ts @@ -7,8 +7,8 @@ import { compileFunction, measureMemory, MemoryMeasurement, -} from 'vm'; -import { inspect } from 'util'; +} from 'node:vm'; +import { inspect } from 'node:util'; { const sandbox = { diff --git a/types/node/v14/test/wasi.ts b/types/node/v14/test/wasi.ts index 4e90f6eaca725e..e8583c9ab69d19 100644 --- a/types/node/v14/test/wasi.ts +++ b/types/node/v14/test/wasi.ts @@ -1,5 +1,5 @@ -import { WASI } from 'wasi'; -import * as fs from 'fs'; +import { WASI } from 'node:wasi'; +import * as fs from 'node:fs'; { const wasi = new WASI({ diff --git a/types/node/v14/test/worker_threads.ts b/types/node/v14/test/worker_threads.ts index 42947ed12381e5..00bb0b78f68a63 100644 --- a/types/node/v14/test/worker_threads.ts +++ b/types/node/v14/test/worker_threads.ts @@ -1,8 +1,8 @@ -import * as workerThreads from 'worker_threads'; -import assert = require('assert'); -import { createContext } from 'vm'; -import { Readable } from 'stream'; -import * as fs from 'fs'; +import * as workerThreads from 'node:worker_threads'; +import assert = require('node:assert'); +import { createContext } from 'node:vm'; +import { Readable } from 'node:stream'; +import * as fs from 'node:fs'; { if (workerThreads.isMainThread) { diff --git a/types/node/v14/test/zlib.ts b/types/node/v14/test/zlib.ts index 5d5d1dc2b34f9d..2056712fb66006 100644 --- a/types/node/v14/test/zlib.ts +++ b/types/node/v14/test/zlib.ts @@ -22,8 +22,8 @@ import { brotliCompress, brotliDecompressSync, brotliDecompress, -} from 'zlib'; -import { promisify } from 'util'; +} from 'node:zlib'; +import { promisify } from 'node:util'; const compressMe = new Buffer("some data"); const compressMeString = "compress me!"; diff --git a/types/node/v14/timers.d.ts b/types/node/v14/timers.d.ts index df0157be13b464..4b964963d2ce50 100644 --- a/types/node/v14/timers.d.ts +++ b/types/node/v14/timers.d.ts @@ -14,3 +14,6 @@ declare module 'timers' { } function clearImmediate(immediateId: NodeJS.Immediate): void; } +declare module 'node:timers' { + export * from 'timers'; +} diff --git a/types/node/v14/tls.d.ts b/types/node/v14/tls.d.ts index 8e29da3ee2f7c8..afc87143d58b4d 100644 --- a/types/node/v14/tls.d.ts +++ b/types/node/v14/tls.d.ts @@ -778,3 +778,6 @@ declare module 'tls' { */ const rootCertificates: ReadonlyArray; } +declare module 'node:tls' { + export * from 'tls'; +} diff --git a/types/node/v14/trace_events.d.ts b/types/node/v14/trace_events.d.ts index 1bf65345819c8d..b8281bd34e6b09 100644 --- a/types/node/v14/trace_events.d.ts +++ b/types/node/v14/trace_events.d.ts @@ -59,3 +59,6 @@ declare module 'trace_events' { */ function getEnabledCategories(): string | undefined; } +declare module 'node:trace_events' { + export * from 'trace_events'; +} diff --git a/types/node/v14/tty.d.ts b/types/node/v14/tty.d.ts index 093552413f3298..40c4fc467444a8 100644 --- a/types/node/v14/tty.d.ts +++ b/types/node/v14/tty.d.ts @@ -64,3 +64,6 @@ declare module 'tty' { isTTY: boolean; } } +declare module 'node:tty' { + export * from 'tty'; +} diff --git a/types/node/v14/url.d.ts b/types/node/v14/url.d.ts index 3fc9206352fcc8..715dc7df8131f3 100644 --- a/types/node/v14/url.d.ts +++ b/types/node/v14/url.d.ts @@ -114,3 +114,6 @@ declare module 'url' { [Symbol.iterator](): IterableIterator<[string, string]>; } } +declare module 'node:url' { + export * from 'url'; +} diff --git a/types/node/v14/util.d.ts b/types/node/v14/util.d.ts index c6d4224b3cd417..77c68b01926b63 100644 --- a/types/node/v14/util.d.ts +++ b/types/node/v14/util.d.ts @@ -211,3 +211,6 @@ declare module 'util' { encodeInto(input: string, output: Uint8Array): EncodeIntoResult; } } +declare module 'node:util' { + export * from 'util'; +} diff --git a/types/node/v14/v8.d.ts b/types/node/v14/v8.d.ts index b497dcbf6d3d8a..744e7df5485958 100644 --- a/types/node/v14/v8.d.ts +++ b/types/node/v14/v8.d.ts @@ -185,3 +185,6 @@ declare module 'v8' { */ function deserialize(data: NodeJS.TypedArray): any; } +declare module 'node:v8' { + export * from 'v8'; +} diff --git a/types/node/v14/vm.d.ts b/types/node/v14/vm.d.ts index 1b1390abf8abf4..30fc9b3da1e1db 100644 --- a/types/node/v14/vm.d.ts +++ b/types/node/v14/vm.d.ts @@ -150,3 +150,6 @@ declare module 'vm' { */ function measureMemory(options?: MeasureMemoryOptions): Promise; } +declare module 'node:vm' { + export * from 'vm'; +} diff --git a/types/node/v14/wasi.d.ts b/types/node/v14/wasi.d.ts index f01fd1e2c92517..c466ba1da68855 100644 --- a/types/node/v14/wasi.d.ts +++ b/types/node/v14/wasi.d.ts @@ -84,3 +84,6 @@ declare module 'wasi' { readonly wasiImport: NodeJS.Dict; // TODO: Narrow to DOM types } } +declare module 'node:wasi' { + export * from 'wasi'; +} diff --git a/types/node/v14/worker_threads.d.ts b/types/node/v14/worker_threads.d.ts index e1bd54dd6f6bf7..7621729a921dda 100644 --- a/types/node/v14/worker_threads.d.ts +++ b/types/node/v14/worker_threads.d.ts @@ -236,3 +236,6 @@ declare module 'worker_threads' { */ function receiveMessageOnPort(port: MessagePort): { message: any } | undefined; } +declare module 'node:worker_threads' { + export * from 'worker_threads'; +} diff --git a/types/node/v14/zlib.d.ts b/types/node/v14/zlib.d.ts index 4def68a7b94c9e..8779cb26806716 100644 --- a/types/node/v14/zlib.d.ts +++ b/types/node/v14/zlib.d.ts @@ -359,3 +359,6 @@ declare module 'zlib' { /** @deprecated */ const Z_DEFLATED: number; } +declare module 'node:zlib' { + export * from 'zlib'; +}