From d53233ba987163708ee0688a53b2084b2fefb716 Mon Sep 17 00:00:00 2001 From: Lachlan Collins <1667261+lachlancollins@users.noreply.github.com> Date: Thu, 20 Jul 2023 08:49:52 +1000 Subject: [PATCH] Merge tsconfig.json and tsconfig.eslint.json --- packages/codemods/.eslintrc.cjs | 2 +- packages/codemods/tsconfig.eslint.json | 7 ------- packages/codemods/tsconfig.json | 5 +---- packages/eslint-plugin-query/.eslintrc.cjs | 2 +- packages/eslint-plugin-query/package.json | 2 +- packages/eslint-plugin-query/tsconfig.eslint.json | 7 ------- packages/eslint-plugin-query/tsconfig.json | 3 +-- packages/query-async-storage-persister/.eslintrc.cjs | 2 +- packages/query-async-storage-persister/package.json | 2 +- .../query-async-storage-persister/tsconfig.eslint.json | 7 ------- packages/query-async-storage-persister/tsconfig.json | 3 +-- packages/query-broadcast-client-experimental/.eslintrc.cjs | 2 +- packages/query-broadcast-client-experimental/package.json | 2 +- .../tsconfig.eslint.json | 7 ------- packages/query-broadcast-client-experimental/tsconfig.json | 5 +---- packages/query-core/.eslintrc.cjs | 2 +- packages/query-core/package.json | 2 +- packages/query-core/tsconfig.eslint.json | 7 ------- packages/query-core/tsconfig.json | 3 +-- packages/query-devtools/.eslintrc.cjs | 2 +- packages/query-devtools/package.json | 2 +- packages/query-devtools/tsconfig.eslint.json | 7 ------- packages/query-devtools/tsconfig.json | 3 +-- packages/query-persist-client-core/.eslintrc.cjs | 2 +- packages/query-persist-client-core/package.json | 2 +- packages/query-persist-client-core/tsconfig.eslint.json | 7 ------- packages/query-persist-client-core/tsconfig.json | 3 +-- packages/query-sync-storage-persister/.eslintrc.cjs | 2 +- packages/query-sync-storage-persister/package.json | 2 +- packages/query-sync-storage-persister/tsconfig.eslint.json | 7 ------- packages/query-sync-storage-persister/tsconfig.json | 3 +-- packages/react-query-devtools/.eslintrc.cjs | 2 +- packages/react-query-devtools/package.json | 2 +- packages/react-query-devtools/tsconfig.eslint.json | 7 ------- packages/react-query-devtools/tsconfig.json | 3 +-- packages/react-query-next-experimental/.eslintrc.cjs | 2 +- packages/react-query-next-experimental/package.json | 2 +- .../react-query-next-experimental/tsconfig.eslint.json | 7 ------- packages/react-query-next-experimental/tsconfig.json | 3 +-- packages/react-query-persist-client/.eslintrc.cjs | 2 +- packages/react-query-persist-client/package.json | 2 +- packages/react-query-persist-client/tsconfig.eslint.json | 7 ------- packages/react-query-persist-client/tsconfig.json | 3 +-- packages/react-query/.eslintrc.cjs | 2 +- packages/react-query/package.json | 2 +- packages/react-query/tsconfig.eslint.json | 7 ------- packages/react-query/tsconfig.json | 3 +-- packages/solid-query/.eslintrc.cjs | 2 +- packages/solid-query/package.json | 2 +- packages/solid-query/tsconfig.eslint.json | 7 ------- packages/solid-query/tsconfig.json | 3 +-- packages/svelte-query-devtools/tsconfig.json | 3 --- packages/svelte-query/tsconfig.json | 4 ---- packages/vue-query/.eslintrc.cjs | 2 +- packages/vue-query/package.json | 2 +- packages/vue-query/tsconfig.eslint.json | 7 ------- packages/vue-query/tsconfig.json | 3 +-- tsconfig.json | 3 ++- 58 files changed, 43 insertions(+), 165 deletions(-) delete mode 100644 packages/codemods/tsconfig.eslint.json delete mode 100644 packages/eslint-plugin-query/tsconfig.eslint.json delete mode 100644 packages/query-async-storage-persister/tsconfig.eslint.json delete mode 100644 packages/query-broadcast-client-experimental/tsconfig.eslint.json delete mode 100644 packages/query-core/tsconfig.eslint.json delete mode 100644 packages/query-devtools/tsconfig.eslint.json delete mode 100644 packages/query-persist-client-core/tsconfig.eslint.json delete mode 100644 packages/query-sync-storage-persister/tsconfig.eslint.json delete mode 100644 packages/react-query-devtools/tsconfig.eslint.json delete mode 100644 packages/react-query-next-experimental/tsconfig.eslint.json delete mode 100644 packages/react-query-persist-client/tsconfig.eslint.json delete mode 100644 packages/react-query/tsconfig.eslint.json delete mode 100644 packages/solid-query/tsconfig.eslint.json delete mode 100644 packages/vue-query/tsconfig.eslint.json diff --git a/packages/codemods/.eslintrc.cjs b/packages/codemods/.eslintrc.cjs index 6907d4b634..37758a00b1 100644 --- a/packages/codemods/.eslintrc.cjs +++ b/packages/codemods/.eslintrc.cjs @@ -4,7 +4,7 @@ const config = { parserOptions: { tsconfigRootDir: __dirname, - project: './tsconfig.eslint.json', + project: './tsconfig.json', }, overrides: [ { diff --git a/packages/codemods/tsconfig.eslint.json b/packages/codemods/tsconfig.eslint.json deleted file mode 100644 index 39d19a84fb..0000000000 --- a/packages/codemods/tsconfig.eslint.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "noEmit": true - }, - "include": ["**/*.ts", "**/*.tsx", ".eslintrc.cjs"] -} diff --git a/packages/codemods/tsconfig.json b/packages/codemods/tsconfig.json index c8d996a92c..be558c4fe9 100644 --- a/packages/codemods/tsconfig.json +++ b/packages/codemods/tsconfig.json @@ -1,7 +1,4 @@ { "extends": "../../tsconfig.json", - "compilerOptions": { - "outDir": "./build/lib" - }, - "include": ["src"] + "include": ["**/*.ts", "**/*.tsx", ".eslintrc.cjs"] } diff --git a/packages/eslint-plugin-query/.eslintrc.cjs b/packages/eslint-plugin-query/.eslintrc.cjs index 52b44816b8..5dd105c9d8 100644 --- a/packages/eslint-plugin-query/.eslintrc.cjs +++ b/packages/eslint-plugin-query/.eslintrc.cjs @@ -4,7 +4,7 @@ const config = { parserOptions: { tsconfigRootDir: __dirname, - project: './tsconfig.eslint.json', + project: './tsconfig.json', }, } diff --git a/packages/eslint-plugin-query/package.json b/packages/eslint-plugin-query/package.json index ba255bb0e2..f9915f89c8 100644 --- a/packages/eslint-plugin-query/package.json +++ b/packages/eslint-plugin-query/package.json @@ -31,7 +31,7 @@ "clean": "rimraf ./build && rimraf ./coverage", "dev": "tsup --watch --sourcemap", "test:eslint": "eslint --ext .ts,.tsx ./src", - "test:types": "tsc --noEmit", + "test:types": "tsc", "test:lib": "vitest run --coverage", "test:lib:dev": "pnpm run test:lib --watch", "test:build": "publint --strict && attw --pack", diff --git a/packages/eslint-plugin-query/tsconfig.eslint.json b/packages/eslint-plugin-query/tsconfig.eslint.json deleted file mode 100644 index e3d7964355..0000000000 --- a/packages/eslint-plugin-query/tsconfig.eslint.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "noEmit": true - }, - "include": ["**/*.ts", "**/*.tsx", ".eslintrc.cjs", "tsup.config.js"] -} diff --git a/packages/eslint-plugin-query/tsconfig.json b/packages/eslint-plugin-query/tsconfig.json index 1777264462..d79fe01863 100644 --- a/packages/eslint-plugin-query/tsconfig.json +++ b/packages/eslint-plugin-query/tsconfig.json @@ -1,8 +1,7 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - "outDir": "./build/lib", "types": ["vitest/globals"] }, - "include": ["src"] + "include": ["**/*.ts", "**/*.tsx", ".eslintrc.cjs", "tsup.config.js"] } diff --git a/packages/query-async-storage-persister/.eslintrc.cjs b/packages/query-async-storage-persister/.eslintrc.cjs index 52b44816b8..5dd105c9d8 100644 --- a/packages/query-async-storage-persister/.eslintrc.cjs +++ b/packages/query-async-storage-persister/.eslintrc.cjs @@ -4,7 +4,7 @@ const config = { parserOptions: { tsconfigRootDir: __dirname, - project: './tsconfig.eslint.json', + project: './tsconfig.json', }, } diff --git a/packages/query-async-storage-persister/package.json b/packages/query-async-storage-persister/package.json index 7c632ba82c..b873aa9a32 100644 --- a/packages/query-async-storage-persister/package.json +++ b/packages/query-async-storage-persister/package.json @@ -35,7 +35,7 @@ "scripts": { "clean": "rimraf ./build && rimraf ./coverage", "test:eslint": "eslint --ext .ts,.tsx ./src", - "test:types": "tsc --noEmit", + "test:types": "tsc", "test:lib": "vitest run --coverage", "test:lib:dev": "pnpm run test:lib --watch", "test:build": "publint --strict && attw --pack", diff --git a/packages/query-async-storage-persister/tsconfig.eslint.json b/packages/query-async-storage-persister/tsconfig.eslint.json deleted file mode 100644 index e3d7964355..0000000000 --- a/packages/query-async-storage-persister/tsconfig.eslint.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "noEmit": true - }, - "include": ["**/*.ts", "**/*.tsx", ".eslintrc.cjs", "tsup.config.js"] -} diff --git a/packages/query-async-storage-persister/tsconfig.json b/packages/query-async-storage-persister/tsconfig.json index 1777264462..d79fe01863 100644 --- a/packages/query-async-storage-persister/tsconfig.json +++ b/packages/query-async-storage-persister/tsconfig.json @@ -1,8 +1,7 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - "outDir": "./build/lib", "types": ["vitest/globals"] }, - "include": ["src"] + "include": ["**/*.ts", "**/*.tsx", ".eslintrc.cjs", "tsup.config.js"] } diff --git a/packages/query-broadcast-client-experimental/.eslintrc.cjs b/packages/query-broadcast-client-experimental/.eslintrc.cjs index 52b44816b8..5dd105c9d8 100644 --- a/packages/query-broadcast-client-experimental/.eslintrc.cjs +++ b/packages/query-broadcast-client-experimental/.eslintrc.cjs @@ -4,7 +4,7 @@ const config = { parserOptions: { tsconfigRootDir: __dirname, - project: './tsconfig.eslint.json', + project: './tsconfig.json', }, } diff --git a/packages/query-broadcast-client-experimental/package.json b/packages/query-broadcast-client-experimental/package.json index 7b0c1829aa..891dd262f9 100644 --- a/packages/query-broadcast-client-experimental/package.json +++ b/packages/query-broadcast-client-experimental/package.json @@ -35,7 +35,7 @@ "scripts": { "clean": "rimraf ./build && rimraf ./coverage", "test:eslint": "eslint --ext .ts,.tsx ./src", - "test:types": "tsc --noEmit", + "test:types": "tsc", "test:build": "publint --strict && attw --pack", "build": "tsup" }, diff --git a/packages/query-broadcast-client-experimental/tsconfig.eslint.json b/packages/query-broadcast-client-experimental/tsconfig.eslint.json deleted file mode 100644 index e3d7964355..0000000000 --- a/packages/query-broadcast-client-experimental/tsconfig.eslint.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "noEmit": true - }, - "include": ["**/*.ts", "**/*.tsx", ".eslintrc.cjs", "tsup.config.js"] -} diff --git a/packages/query-broadcast-client-experimental/tsconfig.json b/packages/query-broadcast-client-experimental/tsconfig.json index c8d996a92c..68069b753a 100644 --- a/packages/query-broadcast-client-experimental/tsconfig.json +++ b/packages/query-broadcast-client-experimental/tsconfig.json @@ -1,7 +1,4 @@ { "extends": "../../tsconfig.json", - "compilerOptions": { - "outDir": "./build/lib" - }, - "include": ["src"] + "include": ["**/*.ts", "**/*.tsx", ".eslintrc.cjs", "tsup.config.js"] } diff --git a/packages/query-core/.eslintrc.cjs b/packages/query-core/.eslintrc.cjs index 52b44816b8..5dd105c9d8 100644 --- a/packages/query-core/.eslintrc.cjs +++ b/packages/query-core/.eslintrc.cjs @@ -4,7 +4,7 @@ const config = { parserOptions: { tsconfigRootDir: __dirname, - project: './tsconfig.eslint.json', + project: './tsconfig.json', }, } diff --git a/packages/query-core/package.json b/packages/query-core/package.json index dd82173357..47473ea266 100644 --- a/packages/query-core/package.json +++ b/packages/query-core/package.json @@ -35,7 +35,7 @@ "scripts": { "clean": "rimraf ./build && rimraf ./coverage", "test:eslint": "eslint --ext .ts,.tsx ./src", - "test:types": "tsc --noEmit", + "test:types": "tsc", "test:lib": "vitest run --coverage", "test:lib:dev": "pnpm run test:lib --watch", "test:build": "publint --strict && attw --pack", diff --git a/packages/query-core/tsconfig.eslint.json b/packages/query-core/tsconfig.eslint.json deleted file mode 100644 index e3d7964355..0000000000 --- a/packages/query-core/tsconfig.eslint.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "noEmit": true - }, - "include": ["**/*.ts", "**/*.tsx", ".eslintrc.cjs", "tsup.config.js"] -} diff --git a/packages/query-core/tsconfig.json b/packages/query-core/tsconfig.json index 1777264462..d79fe01863 100644 --- a/packages/query-core/tsconfig.json +++ b/packages/query-core/tsconfig.json @@ -1,8 +1,7 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - "outDir": "./build/lib", "types": ["vitest/globals"] }, - "include": ["src"] + "include": ["**/*.ts", "**/*.tsx", ".eslintrc.cjs", "tsup.config.js"] } diff --git a/packages/query-devtools/.eslintrc.cjs b/packages/query-devtools/.eslintrc.cjs index 52b44816b8..5dd105c9d8 100644 --- a/packages/query-devtools/.eslintrc.cjs +++ b/packages/query-devtools/.eslintrc.cjs @@ -4,7 +4,7 @@ const config = { parserOptions: { tsconfigRootDir: __dirname, - project: './tsconfig.eslint.json', + project: './tsconfig.json', }, } diff --git a/packages/query-devtools/package.json b/packages/query-devtools/package.json index 4fec785330..7f0fc34a00 100644 --- a/packages/query-devtools/package.json +++ b/packages/query-devtools/package.json @@ -36,7 +36,7 @@ "scripts": { "clean": "rimraf ./build && rimraf ./coverage", "test:eslint": "eslint --ext .ts,.tsx ./src", - "test:types": "tsc --noEmit", + "test:types": "tsc", "test:lib": "vitest run --coverage", "test:lib:dev": "pnpm run test:lib --watch", "test:build": "publint --strict", diff --git a/packages/query-devtools/tsconfig.eslint.json b/packages/query-devtools/tsconfig.eslint.json deleted file mode 100644 index b15f4d23ab..0000000000 --- a/packages/query-devtools/tsconfig.eslint.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "noEmit": true - }, - "include": ["**/*.ts", "**/*.tsx", ".eslintrc.cjs", "rollup.config.js"] -} diff --git a/packages/query-devtools/tsconfig.json b/packages/query-devtools/tsconfig.json index 43908c0dde..ea7376030b 100644 --- a/packages/query-devtools/tsconfig.json +++ b/packages/query-devtools/tsconfig.json @@ -3,8 +3,7 @@ "compilerOptions": { "jsx": "preserve", "jsxImportSource": "solid-js", - "outDir": "./dist", "types": ["vitest/globals"] }, - "include": ["src"] + "include": ["**/*.ts", "**/*.tsx", ".eslintrc.cjs", "tsup.config.js"] } diff --git a/packages/query-persist-client-core/.eslintrc.cjs b/packages/query-persist-client-core/.eslintrc.cjs index 52b44816b8..5dd105c9d8 100644 --- a/packages/query-persist-client-core/.eslintrc.cjs +++ b/packages/query-persist-client-core/.eslintrc.cjs @@ -4,7 +4,7 @@ const config = { parserOptions: { tsconfigRootDir: __dirname, - project: './tsconfig.eslint.json', + project: './tsconfig.json', }, } diff --git a/packages/query-persist-client-core/package.json b/packages/query-persist-client-core/package.json index 63db15d2e7..9d2954fe5d 100644 --- a/packages/query-persist-client-core/package.json +++ b/packages/query-persist-client-core/package.json @@ -35,7 +35,7 @@ "scripts": { "clean": "rimraf ./build && rimraf ./coverage", "test:eslint": "eslint --ext .ts,.tsx ./src", - "test:types": "tsc --noEmit", + "test:types": "tsc", "test:lib": "vitest run --coverage", "test:lib:dev": "pnpm run test:lib --watch", "test:build": "publint --strict && attw --pack", diff --git a/packages/query-persist-client-core/tsconfig.eslint.json b/packages/query-persist-client-core/tsconfig.eslint.json deleted file mode 100644 index e3d7964355..0000000000 --- a/packages/query-persist-client-core/tsconfig.eslint.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "noEmit": true - }, - "include": ["**/*.ts", "**/*.tsx", ".eslintrc.cjs", "tsup.config.js"] -} diff --git a/packages/query-persist-client-core/tsconfig.json b/packages/query-persist-client-core/tsconfig.json index 1777264462..d79fe01863 100644 --- a/packages/query-persist-client-core/tsconfig.json +++ b/packages/query-persist-client-core/tsconfig.json @@ -1,8 +1,7 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - "outDir": "./build/lib", "types": ["vitest/globals"] }, - "include": ["src"] + "include": ["**/*.ts", "**/*.tsx", ".eslintrc.cjs", "tsup.config.js"] } diff --git a/packages/query-sync-storage-persister/.eslintrc.cjs b/packages/query-sync-storage-persister/.eslintrc.cjs index 52b44816b8..5dd105c9d8 100644 --- a/packages/query-sync-storage-persister/.eslintrc.cjs +++ b/packages/query-sync-storage-persister/.eslintrc.cjs @@ -4,7 +4,7 @@ const config = { parserOptions: { tsconfigRootDir: __dirname, - project: './tsconfig.eslint.json', + project: './tsconfig.json', }, } diff --git a/packages/query-sync-storage-persister/package.json b/packages/query-sync-storage-persister/package.json index c2f91866f4..872e8ecb02 100644 --- a/packages/query-sync-storage-persister/package.json +++ b/packages/query-sync-storage-persister/package.json @@ -35,7 +35,7 @@ "scripts": { "clean": "rimraf ./build && rimraf ./coverage", "test:eslint": "eslint --ext .ts,.tsx ./src", - "test:types": "tsc --noEmit", + "test:types": "tsc", "test:lib": "vitest run --coverage", "test:lib:dev": "pnpm run test:lib --watch", "test:build": "publint --strict && attw --pack", diff --git a/packages/query-sync-storage-persister/tsconfig.eslint.json b/packages/query-sync-storage-persister/tsconfig.eslint.json deleted file mode 100644 index e3d7964355..0000000000 --- a/packages/query-sync-storage-persister/tsconfig.eslint.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "noEmit": true - }, - "include": ["**/*.ts", "**/*.tsx", ".eslintrc.cjs", "tsup.config.js"] -} diff --git a/packages/query-sync-storage-persister/tsconfig.json b/packages/query-sync-storage-persister/tsconfig.json index 1777264462..d79fe01863 100644 --- a/packages/query-sync-storage-persister/tsconfig.json +++ b/packages/query-sync-storage-persister/tsconfig.json @@ -1,8 +1,7 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - "outDir": "./build/lib", "types": ["vitest/globals"] }, - "include": ["src"] + "include": ["**/*.ts", "**/*.tsx", ".eslintrc.cjs", "tsup.config.js"] } diff --git a/packages/react-query-devtools/.eslintrc.cjs b/packages/react-query-devtools/.eslintrc.cjs index a9fa6e620d..49d60f4a8a 100644 --- a/packages/react-query-devtools/.eslintrc.cjs +++ b/packages/react-query-devtools/.eslintrc.cjs @@ -5,7 +5,7 @@ const config = { extends: ['plugin:react/recommended', 'plugin:react-hooks/recommended'], parserOptions: { tsconfigRootDir: __dirname, - project: './tsconfig.eslint.json', + project: './tsconfig.json', }, rules: { 'react/jsx-key': ['error', { checkFragmentShorthand: true }], diff --git a/packages/react-query-devtools/package.json b/packages/react-query-devtools/package.json index 644827c228..3ce06ba7d7 100644 --- a/packages/react-query-devtools/package.json +++ b/packages/react-query-devtools/package.json @@ -45,7 +45,7 @@ "scripts": { "clean": "rimraf ./build && rimraf ./coverage", "test:eslint": "eslint --ext .ts,.tsx ./src", - "test:types": "tsc --noEmit", + "test:types": "tsc", "test:lib": "vitest run --coverage", "test:lib:dev": "pnpm run test:lib --watch", "test:build": "publint --strict && attw --pack --ignore-rules no-resolution", diff --git a/packages/react-query-devtools/tsconfig.eslint.json b/packages/react-query-devtools/tsconfig.eslint.json deleted file mode 100644 index e3d7964355..0000000000 --- a/packages/react-query-devtools/tsconfig.eslint.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "noEmit": true - }, - "include": ["**/*.ts", "**/*.tsx", ".eslintrc.cjs", "tsup.config.js"] -} diff --git a/packages/react-query-devtools/tsconfig.json b/packages/react-query-devtools/tsconfig.json index 355947674b..0eaeee7456 100644 --- a/packages/react-query-devtools/tsconfig.json +++ b/packages/react-query-devtools/tsconfig.json @@ -2,8 +2,7 @@ "extends": "../../tsconfig.json", "compilerOptions": { "jsx": "react", - "outDir": "./build/lib", "types": ["vitest/globals"] }, - "include": ["src"] + "include": ["**/*.ts", "**/*.tsx", ".eslintrc.cjs", "tsup.config.js"] } diff --git a/packages/react-query-next-experimental/.eslintrc.cjs b/packages/react-query-next-experimental/.eslintrc.cjs index a9fa6e620d..49d60f4a8a 100644 --- a/packages/react-query-next-experimental/.eslintrc.cjs +++ b/packages/react-query-next-experimental/.eslintrc.cjs @@ -5,7 +5,7 @@ const config = { extends: ['plugin:react/recommended', 'plugin:react-hooks/recommended'], parserOptions: { tsconfigRootDir: __dirname, - project: './tsconfig.eslint.json', + project: './tsconfig.json', }, rules: { 'react/jsx-key': ['error', { checkFragmentShorthand: true }], diff --git a/packages/react-query-next-experimental/package.json b/packages/react-query-next-experimental/package.json index 503253ceb2..6ed71da082 100644 --- a/packages/react-query-next-experimental/package.json +++ b/packages/react-query-next-experimental/package.json @@ -35,7 +35,7 @@ "scripts": { "clean": "rimraf ./build && rimraf ./coverage", "test:eslint": "eslint --ext .ts,.tsx ./src", - "test:types": "tsc --noEmit", + "test:types": "tsc", "test:lib": "vitest run --coverage --passWithNoTests", "test:lib:dev": "pnpm run test:lib --watch", "test:build": "publint --strict && attw --pack", diff --git a/packages/react-query-next-experimental/tsconfig.eslint.json b/packages/react-query-next-experimental/tsconfig.eslint.json deleted file mode 100644 index e3d7964355..0000000000 --- a/packages/react-query-next-experimental/tsconfig.eslint.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "noEmit": true - }, - "include": ["**/*.ts", "**/*.tsx", ".eslintrc.cjs", "tsup.config.js"] -} diff --git a/packages/react-query-next-experimental/tsconfig.json b/packages/react-query-next-experimental/tsconfig.json index 355947674b..0eaeee7456 100644 --- a/packages/react-query-next-experimental/tsconfig.json +++ b/packages/react-query-next-experimental/tsconfig.json @@ -2,8 +2,7 @@ "extends": "../../tsconfig.json", "compilerOptions": { "jsx": "react", - "outDir": "./build/lib", "types": ["vitest/globals"] }, - "include": ["src"] + "include": ["**/*.ts", "**/*.tsx", ".eslintrc.cjs", "tsup.config.js"] } diff --git a/packages/react-query-persist-client/.eslintrc.cjs b/packages/react-query-persist-client/.eslintrc.cjs index a9fa6e620d..49d60f4a8a 100644 --- a/packages/react-query-persist-client/.eslintrc.cjs +++ b/packages/react-query-persist-client/.eslintrc.cjs @@ -5,7 +5,7 @@ const config = { extends: ['plugin:react/recommended', 'plugin:react-hooks/recommended'], parserOptions: { tsconfigRootDir: __dirname, - project: './tsconfig.eslint.json', + project: './tsconfig.json', }, rules: { 'react/jsx-key': ['error', { checkFragmentShorthand: true }], diff --git a/packages/react-query-persist-client/package.json b/packages/react-query-persist-client/package.json index 0432a26654..6bb37d909b 100644 --- a/packages/react-query-persist-client/package.json +++ b/packages/react-query-persist-client/package.json @@ -35,7 +35,7 @@ "scripts": { "clean": "rimraf ./build && rimraf ./coverage", "test:eslint": "eslint --ext .ts,.tsx ./src", - "test:types": "tsc --noEmit", + "test:types": "tsc", "test:lib": "vitest run --coverage", "test:lib:dev": "pnpm run test:lib --watch", "test:build": "publint --strict && attw --pack", diff --git a/packages/react-query-persist-client/tsconfig.eslint.json b/packages/react-query-persist-client/tsconfig.eslint.json deleted file mode 100644 index e3d7964355..0000000000 --- a/packages/react-query-persist-client/tsconfig.eslint.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "noEmit": true - }, - "include": ["**/*.ts", "**/*.tsx", ".eslintrc.cjs", "tsup.config.js"] -} diff --git a/packages/react-query-persist-client/tsconfig.json b/packages/react-query-persist-client/tsconfig.json index 355947674b..0eaeee7456 100644 --- a/packages/react-query-persist-client/tsconfig.json +++ b/packages/react-query-persist-client/tsconfig.json @@ -2,8 +2,7 @@ "extends": "../../tsconfig.json", "compilerOptions": { "jsx": "react", - "outDir": "./build/lib", "types": ["vitest/globals"] }, - "include": ["src"] + "include": ["**/*.ts", "**/*.tsx", ".eslintrc.cjs", "tsup.config.js"] } diff --git a/packages/react-query/.eslintrc.cjs b/packages/react-query/.eslintrc.cjs index a9fa6e620d..49d60f4a8a 100644 --- a/packages/react-query/.eslintrc.cjs +++ b/packages/react-query/.eslintrc.cjs @@ -5,7 +5,7 @@ const config = { extends: ['plugin:react/recommended', 'plugin:react-hooks/recommended'], parserOptions: { tsconfigRootDir: __dirname, - project: './tsconfig.eslint.json', + project: './tsconfig.json', }, rules: { 'react/jsx-key': ['error', { checkFragmentShorthand: true }], diff --git a/packages/react-query/package.json b/packages/react-query/package.json index f77e5562b9..e436a0da1a 100644 --- a/packages/react-query/package.json +++ b/packages/react-query/package.json @@ -31,7 +31,7 @@ "scripts": { "clean": "rimraf ./build && rimraf ./coverage", "test:eslint": "eslint --ext .ts,.tsx ./src", - "test:types": "tsc --noEmit", + "test:types": "tsc", "test:lib": "vitest run --coverage", "test:lib:dev": "pnpm run test:lib --watch", "test:build": "publint --strict && attw --pack", diff --git a/packages/react-query/tsconfig.eslint.json b/packages/react-query/tsconfig.eslint.json deleted file mode 100644 index e3d7964355..0000000000 --- a/packages/react-query/tsconfig.eslint.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "noEmit": true - }, - "include": ["**/*.ts", "**/*.tsx", ".eslintrc.cjs", "tsup.config.js"] -} diff --git a/packages/react-query/tsconfig.json b/packages/react-query/tsconfig.json index 355947674b..0eaeee7456 100644 --- a/packages/react-query/tsconfig.json +++ b/packages/react-query/tsconfig.json @@ -2,8 +2,7 @@ "extends": "../../tsconfig.json", "compilerOptions": { "jsx": "react", - "outDir": "./build/lib", "types": ["vitest/globals"] }, - "include": ["src"] + "include": ["**/*.ts", "**/*.tsx", ".eslintrc.cjs", "tsup.config.js"] } diff --git a/packages/solid-query/.eslintrc.cjs b/packages/solid-query/.eslintrc.cjs index 52b44816b8..5dd105c9d8 100644 --- a/packages/solid-query/.eslintrc.cjs +++ b/packages/solid-query/.eslintrc.cjs @@ -4,7 +4,7 @@ const config = { parserOptions: { tsconfigRootDir: __dirname, - project: './tsconfig.eslint.json', + project: './tsconfig.json', }, } diff --git a/packages/solid-query/package.json b/packages/solid-query/package.json index 49f9421313..b00c0563e8 100644 --- a/packages/solid-query/package.json +++ b/packages/solid-query/package.json @@ -39,7 +39,7 @@ "scripts": { "clean": "rimraf ./build && rimraf ./coverage", "test:eslint": "eslint --ext .ts,.tsx ./src", - "test:types": "tsc --noEmit", + "test:types": "tsc", "test:lib": "vitest run --coverage", "test:lib:dev": "pnpm run test:lib --watch", "test:build": "publint --strict", diff --git a/packages/solid-query/tsconfig.eslint.json b/packages/solid-query/tsconfig.eslint.json deleted file mode 100644 index b15f4d23ab..0000000000 --- a/packages/solid-query/tsconfig.eslint.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "noEmit": true - }, - "include": ["**/*.ts", "**/*.tsx", ".eslintrc.cjs", "rollup.config.js"] -} diff --git a/packages/solid-query/tsconfig.json b/packages/solid-query/tsconfig.json index 43908c0dde..ea7376030b 100644 --- a/packages/solid-query/tsconfig.json +++ b/packages/solid-query/tsconfig.json @@ -3,8 +3,7 @@ "compilerOptions": { "jsx": "preserve", "jsxImportSource": "solid-js", - "outDir": "./dist", "types": ["vitest/globals"] }, - "include": ["src"] + "include": ["**/*.ts", "**/*.tsx", ".eslintrc.cjs", "tsup.config.js"] } diff --git a/packages/svelte-query-devtools/tsconfig.json b/packages/svelte-query-devtools/tsconfig.json index 8e1f095104..f66c3c7586 100644 --- a/packages/svelte-query-devtools/tsconfig.json +++ b/packages/svelte-query-devtools/tsconfig.json @@ -1,8 +1,5 @@ { "extends": "../../tsconfig.json", - "compilerOptions": { - "noEmit": true - }, "include": [ "src/**/*.js", "src/**/*.ts", diff --git a/packages/svelte-query/tsconfig.json b/packages/svelte-query/tsconfig.json index e5f7d215b9..f66c3c7586 100644 --- a/packages/svelte-query/tsconfig.json +++ b/packages/svelte-query/tsconfig.json @@ -1,9 +1,5 @@ { "extends": "../../tsconfig.json", - "compilerOptions": { - "noEmit": true, - "types": ["vitest/globals", "@testing-library/jest-dom"] - }, "include": [ "src/**/*.js", "src/**/*.ts", diff --git a/packages/vue-query/.eslintrc.cjs b/packages/vue-query/.eslintrc.cjs index 52b44816b8..5dd105c9d8 100644 --- a/packages/vue-query/.eslintrc.cjs +++ b/packages/vue-query/.eslintrc.cjs @@ -4,7 +4,7 @@ const config = { parserOptions: { tsconfigRootDir: __dirname, - project: './tsconfig.eslint.json', + project: './tsconfig.json', }, } diff --git a/packages/vue-query/package.json b/packages/vue-query/package.json index 21aa6817dd..635e6074d6 100644 --- a/packages/vue-query/package.json +++ b/packages/vue-query/package.json @@ -35,7 +35,7 @@ "scripts": { "clean": "rimraf ./build && rimraf ./coverage", "test:eslint": "eslint --ext .ts,.tsx ./src", - "test:types": "tsc --noEmit", + "test:types": "tsc", "test:lib": "pnpm run test:2 && pnpm run test:2.7 && pnpm run test:3", "test:2": "vue-demi-switch 2 vue2 && vitest", "test:2.7": "vue-demi-switch 2.7 vue2.7 && vitest", diff --git a/packages/vue-query/tsconfig.eslint.json b/packages/vue-query/tsconfig.eslint.json deleted file mode 100644 index e3d7964355..0000000000 --- a/packages/vue-query/tsconfig.eslint.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "noEmit": true - }, - "include": ["**/*.ts", "**/*.tsx", ".eslintrc.cjs", "tsup.config.js"] -} diff --git a/packages/vue-query/tsconfig.json b/packages/vue-query/tsconfig.json index 1777264462..d79fe01863 100644 --- a/packages/vue-query/tsconfig.json +++ b/packages/vue-query/tsconfig.json @@ -1,8 +1,7 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - "outDir": "./build/lib", "types": ["vitest/globals"] }, - "include": ["src"] + "include": ["**/*.ts", "**/*.tsx", ".eslintrc.cjs", "tsup.config.js"] } diff --git a/tsconfig.json b/tsconfig.json index 449ccd1fc3..69420e158f 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -14,7 +14,8 @@ "isolatedModules": true, "lib": ["DOM", "DOM.Iterable", "ES2020"], "module": "ES2020", - "moduleResolution": "node", + "moduleResolution": "Node", // TODO change this to Node16 or Bundler + "noEmit": true, "noImplicitAny": true, "noImplicitReturns": true, "noImplicitThis": true,