From b46aaa66ed9b0c6c2d0391d18aa515eeab9636af Mon Sep 17 00:00:00 2001 From: Anthony Le Courric Date: Thu, 3 Aug 2023 12:08:55 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=A8(packages)=20fix=20eslint=20tsconfi?= =?UTF-8?q?g=20root=20dir?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Eslint extension highlighted some issues with the way we were importing the tsconfig.json file in the .eslintrc.json file. By changing the extension to .cjs, we are now able to set tsconfigRootDir to the root of the package thanks to `dirname`. It helps eslint to find the correct tsconfig.json file. --- packages/eslint-config-custom/.eslintrc.json | 3 ++- packages/react/.eslintrc.cjs | 24 ++++++++++++++++++++ packages/react/.eslintrc.json | 12 ---------- packages/react/tsconfig.eslint.json | 3 ++- packages/tokens/.eslintrc.cjs | 12 ++++++++++ packages/tokens/.eslintrc.json | 13 ----------- packages/tokens/tsconfig.eslint.json | 1 + 7 files changed, 41 insertions(+), 27 deletions(-) create mode 100644 packages/react/.eslintrc.cjs delete mode 100644 packages/react/.eslintrc.json create mode 100644 packages/tokens/.eslintrc.cjs delete mode 100644 packages/tokens/.eslintrc.json diff --git a/packages/eslint-config-custom/.eslintrc.json b/packages/eslint-config-custom/.eslintrc.json index 9a4ec9a..6c2125a 100644 --- a/packages/eslint-config-custom/.eslintrc.json +++ b/packages/eslint-config-custom/.eslintrc.json @@ -87,5 +87,6 @@ "import/resolver": { "typescript": true } - } + }, + "ignorePatterns": ["node_modules/", "dist/"] } diff --git a/packages/react/.eslintrc.cjs b/packages/react/.eslintrc.cjs new file mode 100644 index 0000000..2cbf790 --- /dev/null +++ b/packages/react/.eslintrc.cjs @@ -0,0 +1,24 @@ +module.exports = { + root: true, + extends: ["custom"], + parserOptions: { + tsconfigRootDir: __dirname, + project: ["./tsconfig.eslint.json"], + }, + rules: { + "import/no-extraneous-dependencies": [ + "error", + { + devDependencies: [ + "vite.config.ts", + "vite.icons.config.ts", + "vite.fonts.config.ts", + "cunningham.ts", + "**/*.stories.tsx", + "**/*.spec.tsx", + "src/tests/*", + ], + }, + ], + }, +}; diff --git a/packages/react/.eslintrc.json b/packages/react/.eslintrc.json deleted file mode 100644 index 86885e9..0000000 --- a/packages/react/.eslintrc.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "root": true, - "extends": [ - "custom" - ], - "parserOptions": { - "project": "./tsconfig.eslint.json" - }, - "rules": { - "import/no-extraneous-dependencies": ["error", {"devDependencies": ["vite.config.ts", "vite.icons.config.ts", "vite.fonts.config.ts","cunningham.ts","**/*.stories.tsx", "**/*.spec.tsx", "src/tests/*"]}] - } -} \ No newline at end of file diff --git a/packages/react/tsconfig.eslint.json b/packages/react/tsconfig.eslint.json index 824f560..73f0e5c 100644 --- a/packages/react/tsconfig.eslint.json +++ b/packages/react/tsconfig.eslint.json @@ -3,6 +3,7 @@ "exclude": [], "include": [ "**/*.ts", - "**/*.tsx" + "**/*.tsx", + ".eslintrc.cjs" ] } \ No newline at end of file diff --git a/packages/tokens/.eslintrc.cjs b/packages/tokens/.eslintrc.cjs new file mode 100644 index 0000000..060df5f --- /dev/null +++ b/packages/tokens/.eslintrc.cjs @@ -0,0 +1,12 @@ +module.exports = { + root: true, + extends: ["custom"], + parserOptions: { + tsconfigRootDir: __dirname, + project: ["./tsconfig.eslint.json"], + }, + rules: { + "no-console": "off", + "no-eval": "off", + }, +}; diff --git a/packages/tokens/.eslintrc.json b/packages/tokens/.eslintrc.json deleted file mode 100644 index bee04d5..0000000 --- a/packages/tokens/.eslintrc.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "root": true, - "extends": [ - "custom" - ], - "parserOptions": { - "project": "./tsconfig.eslint.json" - }, - "rules": { - "no-console": "off", - "no-eval": "off" - } -} \ No newline at end of file diff --git a/packages/tokens/tsconfig.eslint.json b/packages/tokens/tsconfig.eslint.json index 95578a8..cddd206 100644 --- a/packages/tokens/tsconfig.eslint.json +++ b/packages/tokens/tsconfig.eslint.json @@ -2,5 +2,6 @@ "include": [ "**/*.ts", "**/*.js", + ".eslintrc.cjs" ] } \ No newline at end of file