fix: Improve workspace tsconfig (#5497)

TanStack · May 31, 2023 · c5d38bc · c5d38bc
1 parent 163be78
commit c5d38bc
Show file tree

Hide file tree

Showing 51 changed files with 311 additions and 226 deletions.
diff --git a/.eslintrc.cjs b/.eslintrc.cjs
@@ -15,10 +15,11 @@ const config = {
   ],
   env: {
     browser: true,
+    es2020: true,
   },
   parserOptions: {
     tsconfigRootDir: __dirname,
-    project: './tsconfig.base.json',
+    project: './tsconfig.json',
     sourceType: 'module',
     ecmaVersion: 2020,
   },

diff --git a/nx.json b/nx.json
@@ -1,4 +1,5 @@
 {
+  "$schema": "./node_modules/nx/schemas/nx-schema.json",
   "tasksRunnerOptions": {
     "default": {
       "runner": "nx-cloud",
@@ -13,6 +14,7 @@
           "build:codemods",
           "build:types"
         ],
+        "parallel": 5,
         "accessToken": "ZDdkNDA4MGEtYjNmYi00MWI4LWE1N2QtYTdlNmYxMGJlZWM2fHJlYWQ="
       }
     }
@@ -29,8 +31,7 @@
       "{workspaceRoot}/babel.config.js",
       "{workspaceRoot}/package.json",
       "{workspaceRoot}/scripts/getRollupConfig.mjs",
-      "{workspaceRoot}/tsconfig.json",
-      "{workspaceRoot}/tsconfig.base.json"
+      "{workspaceRoot}/tsconfig.json"
     ],
     "globalNonBuildAffectingConfig": ["{workspaceRoot}/.eslintrc.cjs"],
     "default": [
@@ -54,7 +55,8 @@
       "inputs": ["default", "^public"]
     },
     "test:eslint": {
-      "inputs": ["default", "^public"]
+      "inputs": ["default", "^public"],
+      "dependsOn": ["^build"]
     },
     "test:types": {
       "outputs": [

diff --git a/package.json b/package.json
@@ -7,14 +7,14 @@
     "preinstall": "node -e \"if(process.env.CI == 'true') {console.log('Skipping preinstall...'); process.exit(1)}\" || npx -y only-allow pnpm",
     "install:csb": "corepack enable && pnpm install --frozen-lockfile",
     "test": "pnpm run test:ci",
-    "test:ci": "nx affected --targets=test:format,test:lib,test:types,test:eslint --parallel=5",
-    "test:eslint": "nx affected --target=test:eslint --parallel=5",
+    "test:ci": "nx affected --targets=test:format,test:lib,test:types,test:eslint",
+    "test:eslint": "nx affected --target=test:eslint",
     "test:format": "pnpm run prettier --check",
-    "test:lib": "nx affected --target=test:lib --parallel=5",
+    "test:lib": "nx affected --target=test:lib",
     "test:lib:dev": "pnpm --filter \"./packages/**\" run test:lib:dev",
     "test:build": "nx run-many --target=test:build --projects=root",
-    "test:types": "nx affected --target=test:types --parallel=5",
-    "build": "nx run-many --target=build --projects=root --parallel=5",
+    "test:types": "nx affected --target=test:types",
+    "build": "nx run-many --target=build --projects=root",
     "watch": "concurrently --kill-others \"pnpm -r build:rollup -w\" \"pnpm -r build:types --watch\"",
     "dev": "pnpm run watch",
     "prettier": "prettier --plugin-search-dir . \"{packages,examples,scripts}/**/*.{md,js,jsx,cjs,mjs,ts,tsx,json,vue,svelte}\"",
@@ -79,7 +79,7 @@
     "publint": "^0.1.12",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "rimraf": "^4.1.2",
+    "rimraf": "^5.0.1",
     "rollup": "^3.23.0",
     "rollup-plugin-preserve-directives": "^0.2.0",
     "rollup-plugin-size": "^0.3.1",

diff --git a/packages/codemods/tsconfig.json b/packages/codemods/tsconfig.json
@@ -1,9 +1,9 @@
 {
-  "extends": "../../tsconfig.base.json",
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
     "composite": true,
-    "rootDir": "./src",
     "outDir": "./build/lib",
+    "rootDir": "./src",
     "tsBuildInfoFile": "./build/.tsbuildinfo"
   },
   "include": ["src"]

diff --git a/packages/codemods/vitest.config.ts b/packages/codemods/vitest.config.ts
@@ -3,6 +3,7 @@ import { defineConfig } from 'vitest/config'
 export default defineConfig({
   test: {
     name: 'codemods',
+    dir: './src',
     watch: false,
     globals: true,
     coverage: { provider: 'istanbul' },

diff --git a/packages/eslint-plugin-query/package.json b/packages/eslint-plugin-query/package.json
@@ -19,10 +19,10 @@
     "./package.json": "./package.json"
   },
   "scripts": {
-    "clean": "rimraf ./build",
+    "clean": "rimraf ./build && rimraf ./coverage",
     "dev": "tsup --watch --sourcemap",
     "test:eslint": "eslint --ext .ts,.tsx ./src",
-    "test:types": "tsc",
+    "test:types": "tsc --emitDeclarationOnly",
     "test:lib": "vitest run --coverage",
     "test:lib:dev": "pnpm run test:lib --watch",
     "build": "tsup --minify"

diff --git a/packages/eslint-plugin-query/tsconfig.json b/packages/eslint-plugin-query/tsconfig.json
@@ -1,9 +1,9 @@
 {
-  "extends": "../../tsconfig.base.json",
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
     "composite": true,
-    "rootDir": "./src",
     "outDir": "./build/lib",
+    "rootDir": "./src",
     "tsBuildInfoFile": "./build/.tsbuildinfo",
     "types": ["vitest/globals"]
   },

diff --git a/packages/eslint-plugin-query/vitest.config.ts b/packages/eslint-plugin-query/vitest.config.ts
@@ -3,6 +3,7 @@ import { defineConfig } from 'vitest/config'
 export default defineConfig({
   test: {
     name: 'eslint-plugin-query',
+    dir: './src',
     watch: false,
     globals: true,
     coverage: { provider: 'istanbul' },

diff --git a/packages/query-async-storage-persister/package.json b/packages/query-async-storage-persister/package.json
@@ -28,16 +28,16 @@
     "src"
   ],
   "scripts": {
-    "clean": "rimraf ./build",
+    "clean": "rimraf ./build && rimraf ./coverage",
     "test:eslint": "eslint --ext .ts,.tsx ./src",
-    "test:types": "tsc",
+    "test:types": "pnpm build:types",
     "test:lib": "vitest run --coverage",
     "test:lib:dev": "pnpm run test:lib --watch",
     "build": "pnpm build:rollup && pnpm build:types",
     "build:rollup": "rollup --config rollup.config.mjs",
-    "build:types": "tsc --build"
+    "build:types": "tsc --emitDeclarationOnly"
   },
   "dependencies": {
-    "@tanstack/query-persist-client-core": "workspace:*"
+    "@tanstack/query-persist-client-core": "^5.0.0-alpha.43"
   }
 }
diff --git a/packages/query-async-storage-persister/tsconfig.json b/packages/query-async-storage-persister/tsconfig.json
@@ -1,12 +1,11 @@
 {
-  "extends": "../../tsconfig.base.json",
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
     "composite": true,
-    "rootDir": "./src",
     "outDir": "./build/lib",
+    "rootDir": "./src",
     "tsBuildInfoFile": "./build/.tsbuildinfo",
     "types": ["vitest/globals"]
   },
-  "include": ["src"],
-  "references": [{ "path": "../query-persist-client-core" }]
+  "include": ["src"]
 }
diff --git a/packages/query-async-storage-persister/vitest.config.ts b/packages/query-async-storage-persister/vitest.config.ts
@@ -3,6 +3,7 @@ import { defineConfig } from 'vitest/config'
 export default defineConfig({
   test: {
     name: 'query-async-storage-persister',
+    dir: './src',
     watch: false,
     globals: true,
     coverage: { provider: 'istanbul' },

diff --git a/packages/query-broadcast-client-experimental/package.json b/packages/query-broadcast-client-experimental/package.json
@@ -28,15 +28,15 @@
     "src"
   ],
   "scripts": {
-    "clean": "rimraf ./build",
+    "clean": "rimraf ./build && rimraf ./coverage",
     "test:eslint": "eslint --ext .ts,.tsx ./src",
-    "test:types": "tsc",
+    "test:types": "pnpm build:types",
     "build": "pnpm build:rollup && pnpm build:types",
     "build:rollup": "rollup --config rollup.config.mjs",
-    "build:types": "tsc --build"
+    "build:types": "tsc --emitDeclarationOnly"
   },
   "dependencies": {
-    "@tanstack/query-core": "workspace:*",
+    "@tanstack/query-core": "^5.0.0-alpha.43",
     "broadcast-channel": "^5.1.0"
   }
 }
diff --git a/packages/query-broadcast-client-experimental/tsconfig.json b/packages/query-broadcast-client-experimental/tsconfig.json
@@ -1,11 +1,10 @@
 {
-  "extends": "../../tsconfig.base.json",
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
     "composite": true,
-    "rootDir": "./src",
     "outDir": "./build/lib",
+    "rootDir": "./src",
     "tsBuildInfoFile": "./build/.tsbuildinfo"
   },
-  "include": ["src"],
-  "references": [{ "path": "../query-core" }]
+  "include": ["src"]
 }
diff --git a/packages/query-core/package.json b/packages/query-core/package.json
@@ -28,13 +28,13 @@
     "src"
   ],
   "scripts": {
-    "clean": "rimraf ./build",
+    "clean": "rimraf ./build && rimraf ./coverage",
     "test:eslint": "eslint --ext .ts,.tsx ./src",
-    "test:types": "tsc",
+    "test:types": "pnpm build:types",
     "test:lib": "vitest run --coverage",
     "test:lib:dev": "pnpm run test:lib --watch",
     "build": "pnpm build:rollup && pnpm build:types",
     "build:rollup": "rollup --config rollup.config.mjs",
-    "build:types": "tsc --build"
+    "build:types": "tsc --emitDeclarationOnly"
   }
 }
diff --git a/packages/query-core/tsconfig.json b/packages/query-core/tsconfig.json
@@ -1,9 +1,9 @@
 {
-  "extends": "../../tsconfig.base.json",
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
     "composite": true,
-    "rootDir": "./src",
     "outDir": "./build/lib",
+    "rootDir": "./src",
     "tsBuildInfoFile": "./build/.tsbuildinfo",
     "types": ["vitest/globals"]
   },

diff --git a/packages/query-core/vitest.config.ts b/packages/query-core/vitest.config.ts
@@ -3,6 +3,7 @@ import { defineConfig } from 'vitest/config'
 export default defineConfig({
   test: {
     name: 'query-core',
+    dir: './src',
     watch: false,
     environment: 'jsdom',
     globals: true,

diff --git a/packages/query-devtools/package.json b/packages/query-devtools/package.json
@@ -23,14 +23,14 @@
     "./package.json": "./package.json"
   },
   "scripts": {
-    "clean": "rimraf ./build",
+    "clean": "rimraf ./build && rimraf ./coverage",
     "test:eslint": "eslint --ext .ts,.tsx ./src",
-    "test:types": "tsc",
+    "test:types": "pnpm build:types",
     "test:lib": "vitest run --coverage",
     "test:lib:dev": "pnpm run test:lib --watch",
     "build": "pnpm build:rollup && pnpm build:types",
     "build:rollup": "rollup --config rollup.config.mjs",
-    "build:types": "tsc --build"
+    "build:types": "tsc"
   },
   "files": [
     "build",
@@ -47,11 +47,11 @@
     "superjson": "^1.12.1"
   },
   "devDependencies": {
-    "@tanstack/query-core": "workspace:*",
+    "@tanstack/query-core": "^5.0.0-alpha.43",
     "vite-plugin-solid": "^2.5.0"
   },
   "peerDependencies": {
-    "@tanstack/query-core": "workspace:*"
+    "@tanstack/query-core": "^5.0.0-alpha.43"
   },
   "peerDependenciesMeta": {}
 }
diff --git a/packages/query-devtools/tsconfig.json b/packages/query-devtools/tsconfig.json
@@ -1,17 +1,14 @@
 {
-  "extends": "../../tsconfig.base.json",
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
     "composite": true,
-    "rootDir": "./src",
-    "outDir": "./build/source",
     "declarationDir": "./build/types",
-    "tsBuildInfoFile": "./build/.tsbuildinfo",
     "jsx": "preserve",
     "jsxImportSource": "solid-js",
-    "emitDeclarationOnly": false,
+    "outDir": "./build/source",
+    "rootDir": "./src",
+    "tsBuildInfoFile": "./build/.tsbuildinfo",
     "types": ["vitest/globals"]
   },
-  "include": ["src"],
-  "exclude": ["node_modules", "build"],
-  "references": [{ "path": "../query-core" }]
+  "include": ["src"]
 }
diff --git a/packages/query-devtools/vitest.config.ts b/packages/query-devtools/vitest.config.ts
@@ -5,11 +5,11 @@ import { defineConfig } from 'vitest/config'
 export default defineConfig({
   test: {
     name: 'solid-query',
+    dir: './src',
     watch: false,
     setupFiles: [],
     environment: 'jsdom',
     globals: true,
-    dir: 'src/__tests__',
     coverage: { provider: 'istanbul' },
   },
   resolve: {

diff --git a/packages/query-persist-client-core/package.json b/packages/query-persist-client-core/package.json
@@ -28,16 +28,16 @@
     "src"
   ],
   "scripts": {
-    "clean": "rimraf ./build",
+    "clean": "rimraf ./build && rimraf ./coverage",
     "test:eslint": "eslint --ext .ts,.tsx ./src",
-    "test:types": "tsc",
+    "test:types": "pnpm build:types",
     "test:lib": "vitest run --coverage",
     "test:lib:dev": "pnpm run test:lib --watch",
     "build": "pnpm build:rollup && pnpm build:types",
     "build:rollup": "rollup --config rollup.config.mjs",
-    "build:types": "tsc --build"
+    "build:types": "tsc --emitDeclarationOnly"
   },
   "dependencies": {
-    "@tanstack/query-core": "workspace:*"
+    "@tanstack/query-core": "^5.0.0-alpha.43"
   }
 }
diff --git a/packages/query-persist-client-core/src/__tests__/utils.ts b/packages/query-persist-client-core/src/__tests__/utils.ts
@@ -1,9 +1,6 @@
 import type { QueryClientConfig } from '@tanstack/query-core'
 import { QueryClient } from '@tanstack/query-core'
-import type {
-  Persister,
-  PersistedClient,
-} from '@tanstack/query-persist-client-core'
+import type { Persister, PersistedClient } from '../persist'
 import { vi } from 'vitest'
 
 export function createQueryClient(config?: QueryClientConfig): QueryClient {

diff --git a/packages/query-persist-client-core/src/retryStrategies.ts b/packages/query-persist-client-core/src/retryStrategies.ts
@@ -1,4 +1,4 @@
-import type { PersistedClient } from '@tanstack/query-persist-client-core'
+import type { PersistedClient } from './persist'
 
 export type PersistRetryer = (props: {
   persistedClient: PersistedClient

diff --git a/packages/query-persist-client-core/tsconfig.json b/packages/query-persist-client-core/tsconfig.json
@@ -1,12 +1,11 @@
 {
-  "extends": "../../tsconfig.base.json",
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
     "composite": true,
-    "rootDir": "./src",
     "outDir": "./build/lib",
+    "rootDir": "./src",
     "tsBuildInfoFile": "./build/.tsbuildinfo",
     "types": ["vitest/globals"]
   },
-  "include": ["src"],
-  "references": [{ "path": "../query-core" }]
+  "include": ["src"]
 }
diff --git a/packages/query-persist-client-core/vitest.config.ts b/packages/query-persist-client-core/vitest.config.ts
@@ -4,6 +4,7 @@ import { defineConfig } from 'vitest/config'
 export default defineConfig({
   test: {
     name: 'query-persist-client-core',
+    dir: './src',
     watch: false,
     globals: true,
     coverage: { provider: 'istanbul' },

diff --git a/packages/query-sync-storage-persister/package.json b/packages/query-sync-storage-persister/package.json
@@ -28,16 +28,17 @@
     "src"
   ],
   "scripts": {
-    "clean": "rimraf ./build",
+    "clean": "rimraf ./build && rimraf ./coverage",
     "test:eslint": "eslint --ext .ts,.tsx ./src",
-    "test:types": "tsc",
+    "test:types": "pnpm build:types",
     "test:lib": "vitest run --coverage",
     "test:lib:dev": "pnpm run test:lib --watch",
     "build": "pnpm build:rollup && pnpm build:types",
     "build:rollup": "rollup --config rollup.config.mjs",
-    "build:types": "tsc --build"
+    "build:types": "tsc --emitDeclarationOnly"
   },
   "dependencies": {
-    "@tanstack/query-persist-client-core": "workspace:*"
+    "@tanstack/query-core": "^5.0.0-alpha.43",
+    "@tanstack/query-persist-client-core": "^5.0.0-alpha.43"
   }
 }