diff --git a/lib/util/check-prefer-global.js b/lib/util/check-prefer-global.js index f204966f..279ca2fa 100644 --- a/lib/util/check-prefer-global.js +++ b/lib/util/check-prefer-global.js @@ -34,9 +34,19 @@ class Verifier { mode: "legacy", }) + const modules = { + ...trackMap.modules, + ...Object.fromEntries( + Object.entries(trackMap.modules).map(([name, value]) => [ + `node:${name}`, + value, + ]) + ), + } + for (const { node } of [ - ...tracker.iterateCjsReferences(trackMap.modules), - ...tracker.iterateEsmReferences(trackMap.modules), + ...tracker.iterateCjsReferences(modules), + ...tracker.iterateEsmReferences(modules), ]) { context.report({ node, messageId: "preferGlobal" }) } diff --git a/tests/lib/rules/prefer-global/buffer.js b/tests/lib/rules/prefer-global/buffer.js index bc1e29d8..aadabb69 100644 --- a/tests/lib/rules/prefer-global/buffer.js +++ b/tests/lib/rules/prefer-global/buffer.js @@ -26,17 +26,30 @@ new RuleTester({ code: "var { Buffer } = require('buffer'); var b = Buffer.alloc(10)", options: ["never"], }, + { + code: "var { Buffer } = require('node:buffer'); var b = Buffer.alloc(10)", + options: ["never"], + }, ], invalid: [ { code: "var { Buffer } = require('buffer'); var b = Buffer.alloc(10)", errors: [{ messageId: "preferGlobal" }], }, + { + code: "var { Buffer } = require('node:buffer'); var b = Buffer.alloc(10)", + errors: [{ messageId: "preferGlobal" }], + }, { code: "var { Buffer } = require('buffer'); var b = Buffer.alloc(10)", options: ["always"], errors: [{ messageId: "preferGlobal" }], }, + { + code: "var { Buffer } = require('node:buffer'); var b = Buffer.alloc(10)", + options: ["always"], + errors: [{ messageId: "preferGlobal" }], + }, { code: "var b = Buffer.alloc(10)", options: ["never"], diff --git a/tests/lib/rules/prefer-global/console.js b/tests/lib/rules/prefer-global/console.js index 2eebdfc7..75c650e8 100644 --- a/tests/lib/rules/prefer-global/console.js +++ b/tests/lib/rules/prefer-global/console.js @@ -26,17 +26,30 @@ new RuleTester({ code: "var console = require('console'); console.log(10)", options: ["never"], }, + { + code: "var console = require('node:console'); console.log(10)", + options: ["never"], + }, ], invalid: [ { code: "var console = require('console'); console.log(10)", errors: [{ messageId: "preferGlobal" }], }, + { + code: "var console = require('node:console'); console.log(10)", + errors: [{ messageId: "preferGlobal" }], + }, { code: "var console = require('console'); console.log(10)", options: ["always"], errors: [{ messageId: "preferGlobal" }], }, + { + code: "var console = require('node:console'); console.log(10)", + options: ["always"], + errors: [{ messageId: "preferGlobal" }], + }, { code: "console.log(10)", options: ["never"], diff --git a/tests/lib/rules/prefer-global/process.js b/tests/lib/rules/prefer-global/process.js index 08c6910d..54bb588a 100644 --- a/tests/lib/rules/prefer-global/process.js +++ b/tests/lib/rules/prefer-global/process.js @@ -26,17 +26,30 @@ new RuleTester({ code: "var process = require('process'); process.exit(0)", options: ["never"], }, + { + code: "var process = require('node:process'); process.exit(0)", + options: ["never"], + }, ], invalid: [ { code: "var process = require('process'); process.exit(0)", errors: [{ messageId: "preferGlobal" }], }, + { + code: "var process = require('node:process'); process.exit(0)", + errors: [{ messageId: "preferGlobal" }], + }, { code: "var process = require('process'); process.exit(0)", options: ["always"], errors: [{ messageId: "preferGlobal" }], }, + { + code: "var process = require('node:process'); process.exit(0)", + options: ["always"], + errors: [{ messageId: "preferGlobal" }], + }, { code: "process.exit(0)", options: ["never"], diff --git a/tests/lib/rules/prefer-global/text-decoder.js b/tests/lib/rules/prefer-global/text-decoder.js index fad92671..23fe0281 100644 --- a/tests/lib/rules/prefer-global/text-decoder.js +++ b/tests/lib/rules/prefer-global/text-decoder.js @@ -26,17 +26,30 @@ new RuleTester({ code: "var { TextDecoder } = require('util'); var b = new TextDecoder(s)", options: ["never"], }, + { + code: "var { TextDecoder } = require('node:util'); var b = new TextDecoder(s)", + options: ["never"], + }, ], invalid: [ { code: "var { TextDecoder } = require('util'); var b = new TextDecoder(s)", errors: [{ messageId: "preferGlobal" }], }, + { + code: "var { TextDecoder } = require('node:util'); var b = new TextDecoder(s)", + errors: [{ messageId: "preferGlobal" }], + }, { code: "var { TextDecoder } = require('util'); var b = new TextDecoder(s)", options: ["always"], errors: [{ messageId: "preferGlobal" }], }, + { + code: "var { TextDecoder } = require('node:util'); var b = new TextDecoder(s)", + options: ["always"], + errors: [{ messageId: "preferGlobal" }], + }, { code: "var b = new TextDecoder(s)", options: ["never"], diff --git a/tests/lib/rules/prefer-global/text-encoder.js b/tests/lib/rules/prefer-global/text-encoder.js index 5f5bfd62..d7293513 100644 --- a/tests/lib/rules/prefer-global/text-encoder.js +++ b/tests/lib/rules/prefer-global/text-encoder.js @@ -26,17 +26,30 @@ new RuleTester({ code: "var { TextEncoder } = require('util'); var b = new TextEncoder(s)", options: ["never"], }, + { + code: "var { TextEncoder } = require('node:util'); var b = new TextEncoder(s)", + options: ["never"], + }, ], invalid: [ { code: "var { TextEncoder } = require('util'); var b = new TextEncoder(s)", errors: [{ messageId: "preferGlobal" }], }, + { + code: "var { TextEncoder } = require('node:util'); var b = new TextEncoder(s)", + errors: [{ messageId: "preferGlobal" }], + }, { code: "var { TextEncoder } = require('util'); var b = new TextEncoder(s)", options: ["always"], errors: [{ messageId: "preferGlobal" }], }, + { + code: "var { TextEncoder } = require('node:util'); var b = new TextEncoder(s)", + options: ["always"], + errors: [{ messageId: "preferGlobal" }], + }, { code: "var b = new TextEncoder(s)", options: ["never"], diff --git a/tests/lib/rules/prefer-global/url-search-params.js b/tests/lib/rules/prefer-global/url-search-params.js index 1952e67e..6da2ecac 100644 --- a/tests/lib/rules/prefer-global/url-search-params.js +++ b/tests/lib/rules/prefer-global/url-search-params.js @@ -26,17 +26,30 @@ new RuleTester({ code: "var { URLSearchParams } = require('url'); var b = new URLSearchParams(s)", options: ["never"], }, + { + code: "var { URLSearchParams } = require('node:url'); var b = new URLSearchParams(s)", + options: ["never"], + }, ], invalid: [ { code: "var { URLSearchParams } = require('url'); var b = new URLSearchParams(s)", errors: [{ messageId: "preferGlobal" }], }, + { + code: "var { URLSearchParams } = require('node:url'); var b = new URLSearchParams(s)", + errors: [{ messageId: "preferGlobal" }], + }, { code: "var { URLSearchParams } = require('url'); var b = new URLSearchParams(s)", options: ["always"], errors: [{ messageId: "preferGlobal" }], }, + { + code: "var { URLSearchParams } = require('node:url'); var b = new URLSearchParams(s)", + options: ["always"], + errors: [{ messageId: "preferGlobal" }], + }, { code: "var b = new URLSearchParams(s)", options: ["never"], diff --git a/tests/lib/rules/prefer-global/url.js b/tests/lib/rules/prefer-global/url.js index ffd631cb..a55e0038 100644 --- a/tests/lib/rules/prefer-global/url.js +++ b/tests/lib/rules/prefer-global/url.js @@ -26,17 +26,30 @@ new RuleTester({ code: "var { URL } = require('url'); var b = new URL(s)", options: ["never"], }, + { + code: "var { URL } = require('node:url'); var b = new URL(s)", + options: ["never"], + }, ], invalid: [ { code: "var { URL } = require('url'); var b = new URL(s)", errors: [{ messageId: "preferGlobal" }], }, + { + code: "var { URL } = require('node:url'); var b = new URL(s)", + errors: [{ messageId: "preferGlobal" }], + }, { code: "var { URL } = require('url'); var b = new URL(s)", options: ["always"], errors: [{ messageId: "preferGlobal" }], }, + { + code: "var { URL } = require('node:url'); var b = new URL(s)", + options: ["always"], + errors: [{ messageId: "preferGlobal" }], + }, { code: "var b = new URL(s)", options: ["never"],