Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: allow incorrect file path in extraneous deps check #101

Merged
merged 3 commits into from
Jul 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/bright-taxis-smell.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"eslint-plugin-import-x": minor
---

Allow incorrect file path in extraneous deps check
20 changes: 14 additions & 6 deletions src/rules/no-extraneous-dependencies.ts
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,11 @@ function extractDepFields(pkg: PackageJson) {

function getPackageDepFields(packageJsonPath: string, throwAtRead: boolean) {
if (!depFieldCache.has(packageJsonPath)) {
const depFields = extractDepFields(readJSON(packageJsonPath, throwAtRead)!)
depFieldCache.set(packageJsonPath, depFields)
const packageJson = readJSON<PackageJson>(packageJsonPath, throwAtRead)
if (packageJson) {
const depFields = extractDepFields(packageJson)
depFieldCache.set(packageJsonPath, depFields)
}
}
return depFieldCache.get(packageJsonPath)
}
Expand All @@ -83,10 +86,15 @@ function getDependencies(context: RuleContext, packageDir?: string | string[]) {
// use rule config to find package.json
for (const dir of paths) {
const packageJsonPath = path.resolve(dir, 'package.json')
const packageContent_ = getPackageDepFields(packageJsonPath, true)!
for (const depsKey of Object.keys(packageContent)) {
const key = depsKey as keyof PackageDeps
Object.assign(packageContent[key], packageContent_[key])
const packageContent_ = getPackageDepFields(
packageJsonPath,
paths.length === 1,
)
if (packageContent_) {
for (const depsKey of Object.keys(packageContent)) {
const key = depsKey as keyof PackageDeps
Object.assign(packageContent[key], packageContent_[key])
}
}
}
} else {
Expand Down
9 changes: 9 additions & 0 deletions test/rules/no-extraneous-dependencies.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ const packageDirBundledDepsAsObject = testFilePath(
const packageDirBundledDepsRaceCondition = testFilePath(
'bundled-dependencies/race-condition',
)
const emptyPackageDir = testFilePath('empty-folder')

ruleTester.run('no-extraneous-dependencies', rule, {
valid: [
Expand Down Expand Up @@ -130,6 +131,14 @@ ruleTester.run('no-extraneous-dependencies', rule, {
code: 'import leftpad from "left-pad";',
options: [{ packageDir: packageDirMonoRepoRoot }],
}),
test({
code: 'import leftpad from "left-pad";',
options: [{ packageDir: [emptyPackageDir, packageDirMonoRepoRoot] }],
}),
test({
code: 'import leftpad from "left-pad";',
options: [{ packageDir: [packageDirMonoRepoRoot, emptyPackageDir] }],
}),
test({
code: 'import react from "react";',
options: [
Expand Down
Loading