Skip to content

Commit 2d1d8d0

Browse files
reggireggi
authored
fix: adds node: specifier to all native node modules (#7559)
1 parent fd6479f commit 2d1d8d0

File tree

189 files changed

+358
-384
lines changed

Some content is hidden

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

189 files changed

+358
-384
lines changed

‎bin/npm-prefix.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// without having to load all of npm first
44
// It does not accept argv params
55

6-
const path = require('path')
6+
const path = require('node:path')
77
const Config = require('@npmcli/config')
88
const { definitions, flatten, shorthands } = require('@npmcli/config/lib/definitions')
99
const config = new Config({

‎lib/cli/entry.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ module.exports = async (process, validateEngines) => {
1212
}
1313

1414
// Patch the global fs module here at the app level
15-
require('graceful-fs').gracefulify(require('fs'))
15+
require('graceful-fs').gracefulify(require('node:fs'))
1616

1717
const satisfies = require('semver/functions/satisfies')
1818
const ExitHandler = require('./exit-handler.js')

‎lib/cli/update-notifier.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ const ciInfo = require('ci-info')
66
const gt = require('semver/functions/gt')
77
const gte = require('semver/functions/gte')
88
const parse = require('semver/functions/parse')
9-
const { stat, writeFile } = require('fs/promises')
10-
const { resolve } = require('path')
9+
const { stat, writeFile } = require('node:fs/promises')
10+
const { resolve } = require('node:path')
1111

1212
// update check frequency
1313
const DAILY = 1000 * 60 * 60 * 24

‎lib/commands/cache.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const cacache = require('cacache')
22
const pacote = require('pacote')
3-
const fs = require('fs/promises')
4-
const { join } = require('path')
3+
const fs = require('node:fs/promises')
4+
const { join } = require('node:path')
55
const semver = require('semver')
66
const BaseCommand = require('../base-cmd.js')
77
const npa = require('npm-package-arg')

‎lib/commands/ci.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const reifyFinish = require('../utils/reify-finish.js')
22
const runScript = require('@npmcli/run-script')
3-
const fs = require('fs/promises')
4-
const path = require('path')
3+
const fs = require('node:fs/promises')
4+
const path = require('node:path')
55
const { log, time } = require('proc-log')
66
const validateLockfile = require('../utils/validate-lockfile.js')
77
const ArboristWorkspaceCmd = require('../arborist-cmd.js')

‎lib/commands/completion.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@
2828
// one per line for the shell completion method to consume in IFS=$'\n' mode
2929
// as an array.
3030

31-
const fs = require('fs/promises')
31+
const fs = require('node:fs/promises')
3232
const nopt = require('nopt')
33-
const { resolve } = require('path')
33+
const { resolve } = require('node:path')
3434
const { output } = require('proc-log')
3535
const Npm = require('../npm.js')
3636
const { definitions, shorthands } = require('@npmcli/config/lib/definitions')

‎lib/commands/diff.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const { resolve } = require('path')
1+
const { resolve } = require('node:path')
22
const semver = require('semver')
33
const libnpmdiff = require('libnpmdiff')
44
const npa = require('npm-package-arg')

‎lib/commands/doctor.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
const cacache = require('cacache')
2-
const { access, lstat, readdir, constants: { R_OK, W_OK, X_OK } } = require('fs/promises')
2+
const { access, lstat, readdir, constants: { R_OK, W_OK, X_OK } } = require('node:fs/promises')
33
const fetch = require('make-fetch-happen')
44
const which = require('which')
55
const pacote = require('pacote')
6-
const { resolve } = require('path')
6+
const { resolve } = require('node:path')
77
const semver = require('semver')
88
const { log, output } = require('proc-log')
99
const ping = require('../utils/ping.js')

‎lib/commands/edit.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
const { resolve } = require('path')
2-
const { lstat } = require('fs/promises')
3-
const cp = require('child_process')
1+
const { resolve } = require('node:path')
2+
const { lstat } = require('node:fs/promises')
3+
const cp = require('node:child_process')
44
const completion = require('../utils/installed-shallow.js')
55
const BaseCommand = require('../base-cmd.js')
66

‎lib/commands/exec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const { resolve } = require('path')
1+
const { resolve } = require('node:path')
22
const libexec = require('libnpmexec')
33
const BaseCommand = require('../base-cmd.js')
44

‎lib/commands/explain.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const { explainNode } = require('../utils/explain-dep.js')
22
const npa = require('npm-package-arg')
33
const semver = require('semver')
4-
const { relative, resolve } = require('path')
4+
const { relative, resolve } = require('node:path')
55
const validName = require('validate-npm-package-name')
66
const { output } = require('proc-log')
77
const ArboristWorkspaceCmd = require('../arborist-cmd.js')

‎lib/commands/explore.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
const pkgJson = require('@npmcli/package-json')
22
const runScript = require('@npmcli/run-script')
3-
const { join, relative } = require('path')
3+
const { join, relative } = require('node:path')
44
const { log, output } = require('proc-log')
55
const completion = require('../utils/installed-shallow.js')
66
const BaseCommand = require('../base-cmd.js')

‎lib/commands/help.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const spawn = require('@npmcli/promise-spawn')
2-
const path = require('path')
2+
const path = require('node:path')
33
const { openUrl } = require('../utils/open-url.js')
44
const { glob } = require('glob')
55
const { output, input } = require('proc-log')

‎lib/commands/init.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
const { statSync } = require('fs')
2-
const { relative, resolve } = require('path')
3-
const { mkdir } = require('fs/promises')
1+
const { statSync } = require('node:fs')
2+
const { relative, resolve } = require('node:path')
3+
const { mkdir } = require('node:fs/promises')
44
const initJson = require('init-package-json')
55
const npa = require('npm-package-arg')
66
const libexec = require('libnpmexec')

‎lib/commands/link.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
const { readdir } = require('fs/promises')
2-
const { resolve } = require('path')
1+
const { readdir } = require('node:fs/promises')
2+
const { resolve } = require('node:path')
33
const npa = require('npm-package-arg')
44
const pkgJson = require('@npmcli/package-json')
55
const semver = require('semver')

‎lib/commands/ls.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const { resolve, relative, sep } = require('path')
1+
const { resolve, relative, sep } = require('node:path')
22
const archy = require('archy')
33
const { breadth } = require('treeverse')
44
const npa = require('npm-package-arg')

‎lib/commands/profile.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
const { inspect } = require('util')
2-
const { URL } = require('url')
1+
const { inspect } = require('node:util')
2+
const { URL } = require('node:url')
33
const { log, output } = require('proc-log')
44
const { get, set, createToken } = require('npm-profile')
55
const qrcodeTerminal = require('qrcode-terminal')

‎lib/commands/rebuild.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const { resolve } = require('path')
1+
const { resolve } = require('node:path')
22
const { output } = require('proc-log')
33
const npa = require('npm-package-arg')
44
const semver = require('semver')

‎lib/commands/repo.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const { URL } = require('url')
1+
const { URL } = require('node:url')
22
const PackageUrlCmd = require('../package-url-cmd.js')
33

44
class Repo extends PackageUrlCmd {

‎lib/commands/shrinkwrap.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
const { resolve, basename } = require('path')
2-
const { unlink } = require('fs/promises')
1+
const { resolve, basename } = require('node:path')
2+
const { unlink } = require('node:fs/promises')
33
const { log } = require('proc-log')
44
const BaseCommand = require('../base-cmd.js')
55

‎lib/commands/uninstall.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const { resolve } = require('path')
1+
const { resolve } = require('node:path')
22
const pkgJson = require('@npmcli/package-json')
33
const reifyFinish = require('../utils/reify-finish.js')
44
const completion = require('../utils/installed-shallow.js')

‎lib/commands/update.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const path = require('path')
1+
const path = require('node:path')
22
const { log } = require('proc-log')
33
const reifyFinish = require('../utils/reify-finish.js')
44
const ArboristWorkspaceCmd = require('../arborist-cmd.js')

‎lib/commands/view.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
const columns = require('cli-columns')
2-
const { readFile } = require('fs/promises')
2+
const { readFile } = require('node:fs/promises')
33
const jsonParse = require('json-parse-even-better-errors')
44
const { log, output, META } = require('proc-log')
55
const npa = require('npm-package-arg')
6-
const { resolve } = require('path')
6+
const { resolve } = require('node:path')
77
const formatBytes = require('../utils/format-bytes.js')
88
const relativeDate = require('tiny-relative-date')
99
const semver = require('semver')
10-
const { inspect } = require('util')
10+
const { inspect } = require('node:util')
1111
const { packument } = require('pacote')
1212
const Queryable = require('../utils/queryable.js')
1313
const BaseCommand = require('../base-cmd.js')

‎lib/utils/error-message.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ const errorMessage = (er, npm) => {
9797
// Check whether we ran into a conflict in our own package.json
9898
if (er.path === resolve(npm.prefix, 'package.json')) {
9999
const { isDiff } = require('parse-conflict-json')
100-
const txt = require('fs').readFileSync(er.path, 'utf8').replace(/\r\n/g, '\n')
100+
const txt = require('node:fs').readFileSync(er.path, 'utf8').replace(/\r\n/g, '\n')
101101
if (isDiff(txt)) {
102102
detail.push(['', [
103103
'Merge conflict detected in your package.json.',

‎lib/utils/format.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const { formatWithOptions: baseFormatWithOptions } = require('util')
1+
const { formatWithOptions: baseFormatWithOptions } = require('node:util')
22

33
// These are most assuredly not a mistake
44
// https://eslint.org/docs/latest/rules/no-control-regex

‎lib/utils/get-workspaces.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const { resolve, relative } = require('path')
1+
const { resolve, relative } = require('node:path')
22
const mapWorkspaces = require('@npmcli/map-workspaces')
33
const { minimatch } = require('minimatch')
44
const pkgJson = require('@npmcli/package-json')

‎lib/utils/installed-deep.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const { resolve } = require('path')
1+
const { resolve } = require('node:path')
22
const localeCompare = require('@isaacs/string-locale-compare')('en')
33

44
const installedDeep = async (npm) => {

‎lib/utils/log-file.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
const os = require('os')
2-
const { join, dirname, basename } = require('path')
1+
const os = require('node:os')
2+
const { join, dirname, basename } = require('node:path')
33
const fsMiniPass = require('fs-minipass')
4-
const fs = require('fs/promises')
4+
const fs = require('node:fs/promises')
55
const { log } = require('proc-log')
66
const { formatWithOptions } = require('./format')
77

‎lib/utils/open-url.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
const { open } = require('@npmcli/promise-spawn')
22
const { output, input } = require('proc-log')
3-
const { URL } = require('url')
3+
const { URL } = require('node:url')
44
const readline = require('node:readline/promises')
55
const { once } = require('node:events')
66

‎lib/utils/queryable.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const util = require('util')
1+
const util = require('node:util')
22
const _delete = Symbol('delete')
33
const _append = Symbol('append')
44

‎lib/utils/reify-finish.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const reifyOutput = require('./reify-output.js')
22
const ini = require('ini')
3-
const { writeFile } = require('fs/promises')
4-
const { resolve } = require('path')
3+
const { writeFile } = require('node:fs/promises')
4+
const { resolve } = require('node:path')
55

66
const reifyFinish = async (npm, arb) => {
77
await saveBuiltinConfig(npm, arb)

‎lib/utils/sbom-cyclonedx.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const crypto = require('crypto')
1+
const crypto = require('node:crypto')
22
const normalizeData = require('normalize-package-data')
33
const parseLicense = require('spdx-expression-parse')
44
const npa = require('npm-package-arg')

‎lib/utils/sbom-spdx.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
const crypto = require('crypto')
2+
const crypto = require('node:crypto')
33
const normalizeData = require('normalize-package-data')
44
const npa = require('npm-package-arg')
55
const ssri = require('ssri')

‎scripts/bundle-and-gitignore-deps.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
const Arborist = require('@npmcli/arborist')
22
const packlist = require('npm-packlist')
3-
const { join, relative } = require('path')
3+
const { join, relative } = require('node:path')
44
const localeCompare = require('@isaacs/string-locale-compare')('en')
55
const PackageJson = require('@npmcli/package-json')
66
const { run, CWD, git, fs, pkg: rootPkg, EOL } = require('./util')

‎scripts/create-node-pr.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
const { join, basename } = require('path')
2-
const fsp = require('fs/promises')
1+
const { join, basename } = require('node:path')
2+
const fsp = require('node:fs/promises')
33
const hgi = require('hosted-git-info')
44
const semver = require('semver')
55
const pacote = require('pacote')

‎scripts/dependency-graph.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const Arborist = require('@npmcli/arborist')
2-
const os = require('os')
3-
const { readFileSync } = require('fs')
4-
const { join } = require('path')
2+
const os = require('node:os')
3+
const { readFileSync } = require('node:fs')
4+
const { join } = require('node:path')
55
const { log } = require('proc-log')
66
const { run, CWD, pkg, fs, EOL } = require('./util.js')
77

‎scripts/fish-completion.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* eslint-disable no-console */
2-
const fs = require('fs/promises')
3-
const { resolve } = require('path')
2+
const fs = require('node:fs/promises')
3+
const { resolve } = require('node:path')
44

55
const { commands, aliases } = require('../lib/utils/cmd-list.js')
66
const { definitions } = require('@npmcli/config/lib/definitions')

‎scripts/resetdeps.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
const { join } = require('path')
2-
const { symlink } = require('fs/promises')
1+
const { join } = require('node:path')
2+
const { symlink } = require('node:fs/promises')
33
const { CWD, run, pkg, fs, git, npm } = require('./util.js')
44

55
const cleanup = async () => {

‎scripts/update-authors.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const { join } = require('path')
1+
const { join } = require('node:path')
22
const { CWD, run, git, fs, EOL } = require('./util.js')
33

44
const main = async () => {

‎scripts/update-cli-repos.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const { join } = require('path')
1+
const { join } = require('node:path')
22
const { fs, gh, run } = require('./util.js')
33

44
const query = `

‎scripts/util.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
const fsp = require('fs/promises')
2-
const { resolve, join, relative } = require('path')
3-
const { formatWithOptions } = require('util')
1+
const fsp = require('node:fs/promises')
2+
const { resolve, join, relative } = require('node:path')
3+
const { formatWithOptions } = require('node:util')
44
const { log } = require('proc-log')
55
const nopt = require('nopt')
66
const npmGit = require('@npmcli/git')

‎smoke-tests/test/fixtures/setup.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
const fs = require('fs/promises')
2-
const { existsSync } = require('fs')
3-
const { join, resolve, sep, extname, relative, delimiter } = require('path')
1+
const fs = require('node:fs/promises')
2+
const { existsSync } = require('node:fs')
3+
const { join, resolve, sep, extname, relative, delimiter } = require('node:path')
44
const which = require('which')
55
const spawn = require('@npmcli/promise-spawn')
66
const MockRegistry = require('@npmcli/mock-registry')
7-
const http = require('http')
7+
const http = require('node:http')
88
const { createProxy } = require('proxy')
99

1010
const { SMOKE_PUBLISH_TARBALL, CI, PATH, Path } = process.env

‎smoke-tests/test/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const { join } = require('path')
1+
const { join } = require('node:path')
22
const t = require('tap')
33
const setup = require('./fixtures/setup.js')
44

‎smoke-tests/test/large-install.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const t = require('tap')
2-
const path = require('path')
2+
const path = require('node:path')
33
const setup = require('./fixtures/setup.js')
44

55
const getFixture = (p) => require(

‎smoke-tests/test/npm-replace-global.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
const t = require('tap')
3-
const { join, dirname, basename, extname } = require('path')
4-
const fs = require('fs/promises')
3+
const { join, dirname, basename, extname } = require('node:path')
4+
const fs = require('node:fs/promises')
55
const _which = require('which')
66
const setup = require('./fixtures/setup.js')
77

‎test/bin/windows-shims.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const t = require('tap')
2-
const { spawnSync } = require('child_process')
3-
const { resolve, join, extname, basename } = require('path')
4-
const { readFileSync, chmodSync, readdirSync, statSync } = require('fs')
2+
const { spawnSync } = require('node:child_process')
3+
const { resolve, join, extname, basename } = require('node:path')
4+
const { readFileSync, chmodSync, readdirSync, statSync } = require('node:fs')
55
const Diff = require('diff')
66
const { moveRemove } = require('rimraf')
77
const { sync: which } = require('which')

‎test/fixtures/clean-snapshot.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const { relative, dirname } = require('path')
1+
const { relative, dirname } = require('node:path')
22

33
// normalize line endings (for ini)
44
const cleanNewlines = (s) => s.replace(/\r\n/g, '\n')

0 commit comments

Comments
 (0)