Skip to content

Commit fa5528e

Browse files
committed
chore: remove "enhanced-resolve" from "no-hide-core-modules"
1 parent 8202c24 commit fa5528e

File tree

2 files changed

+21
-22
lines changed

2 files changed

+21
-22
lines changed

lib/rules/no-hide-core-modules.js

Lines changed: 16 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
"use strict"
1010

1111
const path = require("path")
12-
const resolver = require("enhanced-resolve")
1312
const getPackageJson = require("../util/get-package-json")
1413
const mergeVisitorsInPlace = require("../util/merge-visitors-in-place")
1514
const visitImport = require("../util/visit-import")
@@ -25,15 +24,17 @@ const CORE_MODULES = new Set([
2524
"crypto",
2625
"dgram",
2726
"dns",
28-
/* "domain", */ "events",
27+
/* "domain", */
28+
"events",
2929
"fs",
3030
"http",
3131
"https",
3232
"module",
3333
"net",
3434
"os",
3535
"path",
36-
/* "punycode", */ "querystring",
36+
/* "punycode", */
37+
"querystring",
3738
"readline",
3839
"repl",
3940
"stream",
@@ -112,10 +113,6 @@ module.exports = {
112113
),
113114
{
114115
"Program:exit"() {
115-
const requireResolve = resolver.create.sync({
116-
conditionNames: ["node", "import", "require"],
117-
})
118-
119116
for (const target of targets.filter(
120117
t =>
121118
CORE_MODULES.has(t.moduleName) &&
@@ -131,22 +128,20 @@ module.exports = {
131128
continue
132129
}
133130

134-
try {
135-
const resolved = requireResolve(dirPath, `${name}/`)
136-
137-
context.report({
138-
node: target.node,
139-
loc: target.node.loc,
140-
messageId: "unexpectedImport",
141-
data: {
142-
name: path
143-
.relative(dirPath, resolved)
144-
.replace(BACK_SLASH, "/"),
145-
},
146-
})
147-
} catch {
131+
if (target.filePath == null) {
148132
continue
149133
}
134+
135+
context.report({
136+
node: target.node,
137+
loc: target.node.loc,
138+
messageId: "unexpectedImport",
139+
data: {
140+
name: path
141+
.relative(dirPath, target.filePath)
142+
.replace(BACK_SLASH, "/"),
143+
},
144+
})
150145
}
151146
},
152147
},

lib/util/import-target.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,11 @@ function getFilePath(id, options, moduleType, moduleStyle) {
4141
conditionNames.push("import", "types")
4242
}
4343

44-
if (moduleStyle === "require" || moduleType === "npm") {
44+
if (
45+
moduleStyle === "require" ||
46+
moduleType === "npm" ||
47+
moduleType === "node"
48+
) {
4549
mainFields.push("main")
4650
mainFiles.push("index")
4751
}

0 commit comments

Comments
 (0)