From 3a6dee283910a08123bf079374d4a87a060c02c7 Mon Sep 17 00:00:00 2001 From: SukkaW Date: Mon, 1 Jul 2024 22:44:59 +0800 Subject: [PATCH 1/3] fix: allow incorrect file path in extraneous deps check --- src/rules/no-extraneous-dependencies.ts | 17 +++++++++++------ test/rules/no-extraneous-dependencies.spec.ts | 11 +++++++++++ 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/src/rules/no-extraneous-dependencies.ts b/src/rules/no-extraneous-dependencies.ts index 9d9c167cb..eada81bfa 100644 --- a/src/rules/no-extraneous-dependencies.ts +++ b/src/rules/no-extraneous-dependencies.ts @@ -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(packageJsonPath, throwAtRead); + if (packageJson) { + const depFields = extractDepFields(packageJson); + depFieldCache.set(packageJsonPath, depFields); + } } return depFieldCache.get(packageJsonPath) } @@ -83,10 +86,12 @@ 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 { diff --git a/test/rules/no-extraneous-dependencies.spec.ts b/test/rules/no-extraneous-dependencies.spec.ts index 98299b487..179df81c7 100644 --- a/test/rules/no-extraneous-dependencies.spec.ts +++ b/test/rules/no-extraneous-dependencies.spec.ts @@ -48,6 +48,9 @@ const packageDirBundledDepsAsObject = testFilePath( const packageDirBundledDepsRaceCondition = testFilePath( 'bundled-dependencies/race-condition', ) +const emptyPackageDir = testFilePath( + 'empty-folder', +) ruleTester.run('no-extraneous-dependencies', rule, { valid: [ @@ -130,6 +133,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: [ From b26f04e91a52ad244b33baec613b70243feef08a Mon Sep 17 00:00:00 2001 From: SukkaW Date: Mon, 1 Jul 2024 22:46:22 +0800 Subject: [PATCH 2/3] chore: changeset --- .changeset/bright-taxis-smell.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/bright-taxis-smell.md diff --git a/.changeset/bright-taxis-smell.md b/.changeset/bright-taxis-smell.md new file mode 100644 index 000000000..be8ed24ef --- /dev/null +++ b/.changeset/bright-taxis-smell.md @@ -0,0 +1,5 @@ +--- +"eslint-plugin-import-x": minor +--- + +Allow incorrect file path in extraneous deps check From 6c3648fb30b0b56cc9e77757d6660587d0f48a30 Mon Sep 17 00:00:00 2001 From: SukkaW Date: Mon, 1 Jul 2024 22:46:48 +0800 Subject: [PATCH 3/3] chore: make eslint happy --- src/rules/no-extraneous-dependencies.ts | 11 +++++++---- test/rules/no-extraneous-dependencies.spec.ts | 4 +--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/rules/no-extraneous-dependencies.ts b/src/rules/no-extraneous-dependencies.ts index eada81bfa..f91324bae 100644 --- a/src/rules/no-extraneous-dependencies.ts +++ b/src/rules/no-extraneous-dependencies.ts @@ -55,10 +55,10 @@ function extractDepFields(pkg: PackageJson) { function getPackageDepFields(packageJsonPath: string, throwAtRead: boolean) { if (!depFieldCache.has(packageJsonPath)) { - const packageJson = readJSON(packageJsonPath, throwAtRead); + const packageJson = readJSON(packageJsonPath, throwAtRead) if (packageJson) { - const depFields = extractDepFields(packageJson); - depFieldCache.set(packageJsonPath, depFields); + const depFields = extractDepFields(packageJson) + depFieldCache.set(packageJsonPath, depFields) } } return depFieldCache.get(packageJsonPath) @@ -86,7 +86,10 @@ 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, paths.length === 1) + const packageContent_ = getPackageDepFields( + packageJsonPath, + paths.length === 1, + ) if (packageContent_) { for (const depsKey of Object.keys(packageContent)) { const key = depsKey as keyof PackageDeps diff --git a/test/rules/no-extraneous-dependencies.spec.ts b/test/rules/no-extraneous-dependencies.spec.ts index 179df81c7..610005b9a 100644 --- a/test/rules/no-extraneous-dependencies.spec.ts +++ b/test/rules/no-extraneous-dependencies.spec.ts @@ -48,9 +48,7 @@ const packageDirBundledDepsAsObject = testFilePath( const packageDirBundledDepsRaceCondition = testFilePath( 'bundled-dependencies/race-condition', ) -const emptyPackageDir = testFilePath( - 'empty-folder', -) +const emptyPackageDir = testFilePath('empty-folder') ruleTester.run('no-extraneous-dependencies', rule, { valid: [