From 13fdd2b31289dbc80316cbdb5aa32edbe596bad4 Mon Sep 17 00:00:00 2001 From: doug-martin Date: Tue, 13 Oct 2020 22:48:37 -0500 Subject: [PATCH] fix(eslint): Fix eslint to recognize sub packages --- .eslintignore | 2 ++ .eslintrc.js | 6 +++++- examples/.eslintrc.js | 3 --- examples/tsconfig.json | 4 ++-- packages/core/.eslintrc.js | 5 +---- packages/core/tsconfig.json | 4 ++++ packages/query-graphql/.eslintrc.js | 3 --- packages/query-graphql/tsconfig.json | 4 ++-- packages/query-mongoose/.eslintrc.js | 3 --- packages/query-mongoose/tsconfig.json | 4 ++++ packages/query-sequelize/.eslintrc.js | 3 --- packages/query-sequelize/tsconfig.json | 4 ++++ packages/query-typeorm/.eslintrc.js | 3 --- packages/query-typeorm/tsconfig.json | 4 ++++ 14 files changed, 28 insertions(+), 24 deletions(-) create mode 100644 .eslintignore diff --git a/.eslintignore b/.eslintignore new file mode 100644 index 000000000..a99edb6a8 --- /dev/null +++ b/.eslintignore @@ -0,0 +1,2 @@ +**/dist +**/node_modules diff --git a/.eslintrc.js b/.eslintrc.js index 6294d971d..b19f411a6 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,4 +1,5 @@ module.exports = { + root: true, env: { node: true, jest: true, @@ -6,7 +7,10 @@ module.exports = { parser: '@typescript-eslint/parser', parserOptions: { - project: './tsconfig.build.json', + sourceType: 'module', + project: ['./packages/*/tsconfig.json', './examples/tsconfig.json'], + tsconfigRootDir: __dirname, + }, plugins: ['@typescript-eslint', 'prettier', 'import', 'jest', 'eslint-plugin-tsdoc'], extends: [ diff --git a/examples/.eslintrc.js b/examples/.eslintrc.js index 72e667555..0224d314f 100644 --- a/examples/.eslintrc.js +++ b/examples/.eslintrc.js @@ -1,7 +1,4 @@ module.exports = { - parserOptions: { - project: './tsconfig.build.json', - }, rules: { 'jest/expect-expect': ['error', { assertFunctionNames: ['expect', 'request.**.expect'] }], }, diff --git a/examples/tsconfig.json b/examples/tsconfig.json index b7f1906fd..139357459 100644 --- a/examples/tsconfig.json +++ b/examples/tsconfig.json @@ -7,11 +7,11 @@ "include": [ "./helpers", "**/src", + "**/e2e", "**/ormconfig.json" ], "exclude": [ "node_modules", - "dist", - "**/*spec.ts" + "dist" ] } diff --git a/packages/core/.eslintrc.js b/packages/core/.eslintrc.js index eb38465f9..7be35b6b6 100644 --- a/packages/core/.eslintrc.js +++ b/packages/core/.eslintrc.js @@ -1,5 +1,2 @@ module.exports = { - parserOptions: { - project: "./tsconfig.build.json" - }, -}; \ No newline at end of file +}; diff --git a/packages/core/tsconfig.json b/packages/core/tsconfig.json index 0a6e60a60..178a41e76 100644 --- a/packages/core/tsconfig.json +++ b/packages/core/tsconfig.json @@ -4,6 +4,10 @@ "outDir": "./dist", "rootDir": "." }, + "include": [ + "./src", + "./__tests__" + ], "exclude": [ "node_modules", "dist" diff --git a/packages/query-graphql/.eslintrc.js b/packages/query-graphql/.eslintrc.js index b3ee9be80..47c68e528 100644 --- a/packages/query-graphql/.eslintrc.js +++ b/packages/query-graphql/.eslintrc.js @@ -1,7 +1,4 @@ module.exports = { - parserOptions: { - project: './tsconfig.build.json', - }, rules: { 'jest/expect-expect': [ 'error', diff --git a/packages/query-graphql/tsconfig.json b/packages/query-graphql/tsconfig.json index eaa5080ae..ad0977a41 100644 --- a/packages/query-graphql/tsconfig.json +++ b/packages/query-graphql/tsconfig.json @@ -5,8 +5,8 @@ "rootDir": "." }, "include": [ - "src", - "__tests__" + "./src", + "./__tests__" ], "exclude": [ "node_modules", diff --git a/packages/query-mongoose/.eslintrc.js b/packages/query-mongoose/.eslintrc.js index de68ee560..5ade24c1d 100644 --- a/packages/query-mongoose/.eslintrc.js +++ b/packages/query-mongoose/.eslintrc.js @@ -1,7 +1,4 @@ module.exports = { - parserOptions: { - project: './tsconfig.build.json', - }, rules: { 'jest/expect-expect': [ 'error', diff --git a/packages/query-mongoose/tsconfig.json b/packages/query-mongoose/tsconfig.json index 4a2bfa403..ad0977a41 100644 --- a/packages/query-mongoose/tsconfig.json +++ b/packages/query-mongoose/tsconfig.json @@ -4,6 +4,10 @@ "outDir": "./dist", "rootDir": "." }, + "include": [ + "./src", + "./__tests__" + ], "exclude": [ "node_modules", "dist" diff --git a/packages/query-sequelize/.eslintrc.js b/packages/query-sequelize/.eslintrc.js index 80bd05870..8766788dd 100644 --- a/packages/query-sequelize/.eslintrc.js +++ b/packages/query-sequelize/.eslintrc.js @@ -1,7 +1,4 @@ module.exports = { - parserOptions: { - project: "./tsconfig.build.json" - }, rules: { "jest/expect-expect": [ "error", diff --git a/packages/query-sequelize/tsconfig.json b/packages/query-sequelize/tsconfig.json index 4a2bfa403..ad0977a41 100644 --- a/packages/query-sequelize/tsconfig.json +++ b/packages/query-sequelize/tsconfig.json @@ -4,6 +4,10 @@ "outDir": "./dist", "rootDir": "." }, + "include": [ + "./src", + "./__tests__" + ], "exclude": [ "node_modules", "dist" diff --git a/packages/query-typeorm/.eslintrc.js b/packages/query-typeorm/.eslintrc.js index d625d1781..71a355a3a 100644 --- a/packages/query-typeorm/.eslintrc.js +++ b/packages/query-typeorm/.eslintrc.js @@ -1,7 +1,4 @@ module.exports = { - parserOptions: { - project: './tsconfig.build.json', - }, rules: { 'jest/expect-expect': [ 'error', diff --git a/packages/query-typeorm/tsconfig.json b/packages/query-typeorm/tsconfig.json index 4a2bfa403..ad0977a41 100644 --- a/packages/query-typeorm/tsconfig.json +++ b/packages/query-typeorm/tsconfig.json @@ -4,6 +4,10 @@ "outDir": "./dist", "rootDir": "." }, + "include": [ + "./src", + "./__tests__" + ], "exclude": [ "node_modules", "dist"