Merge tsconfig.json and tsconfig.eslint.json

TanStack · Jul 19, 2023 · d53233b · d53233b
1 parent b3d7d55
commit d53233b
Show file tree

Hide file tree

Showing 58 changed files with 43 additions and 165 deletions.
diff --git 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
diff --git 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
@@ -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
@@ -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
diff --git 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
@@ -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
@@ -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
diff --git 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
@@ -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
@@ -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
diff --git 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
@@ -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
@@ -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
diff --git 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
@@ -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
@@ -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
diff --git 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
@@ -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
@@ -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
diff --git 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
@@ -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
@@ -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
diff --git 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
@@ -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
@@ -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
diff --git 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
@@ -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
@@ -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
diff --git 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
@@ -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
@@ -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
diff --git 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
@@ -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 }],