From cbbfc61361ab046e979ef140ad7997fb55dc4d99 Mon Sep 17 00:00:00 2001 From: Tyler <26290074+tylersayshi@users.noreply.github.com> Date: Tue, 1 Apr 2025 20:01:56 -0700 Subject: [PATCH 1/9] fix(paths): use customConditions to define internal imports --- packages/query-core/package.json | 1 + tsconfig.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/query-core/package.json b/packages/query-core/package.json index c9cb7383bd9..ae76281f376 100644 --- a/packages/query-core/package.json +++ b/packages/query-core/package.json @@ -41,6 +41,7 @@ "exports": { ".": { "import": { + "tanstack-internal": "./src/index.ts", "types": "./build/modern/index.d.ts", "default": "./build/modern/index.js" }, diff --git a/tsconfig.json b/tsconfig.json index 8c4eebe8586..2f1c05108e6 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -7,6 +7,7 @@ "allowUnusedLabels": false, "checkJs": true, "composite": true, + "customConditions": ["tanstack-internal"], "declaration": true, "declarationMap": true, "emitDeclarationOnly": true, @@ -42,7 +43,6 @@ "@tanstack/query-broadcast-client-experimental": [ "../../packages/query-broadcast-client-experimental/src" ], - "@tanstack/query-core": ["../../packages/query-core/src"], "@tanstack/query-devtools": ["../../packages/query-devtools/src"], "@tanstack/query-persist-client-core": [ "../../packages/query-persist-client-core/src" From 263779dc105cac0527c7085c3920bf8355924bb4 Mon Sep 17 00:00:00 2001 From: Tyler <26290074+tylersayshi@users.noreply.github.com> Date: Tue, 1 Apr 2025 20:37:45 -0700 Subject: [PATCH 2/9] the rest of the changes --- .../package.json | 1 + .../angular-query-experimental/package.json | 1 + packages/eslint-plugin-query/package.json | 1 + .../package.json | 1 + .../package.json | 1 + packages/query-devtools/package.json | 3 ++ .../query-persist-client-core/package.json | 1 + .../query-sync-storage-persister/package.json | 1 + packages/react-query-devtools/package.json | 3 ++ .../package.json | 1 + .../react-query-persist-client/package.json | 1 + packages/react-query/package.json | 1 + packages/solid-query-devtools/package.json | 3 ++ .../solid-query-persist-client/package.json | 2 + packages/solid-query/package.json | 2 + packages/svelte-query-devtools/package.json | 1 + .../svelte-query-persist-client/package.json | 1 + packages/svelte-query/package.json | 1 + packages/vue-query-devtools/package.json | 3 ++ packages/vue-query/package.json | 1 + tsconfig.json | 52 +------------------ 21 files changed, 31 insertions(+), 51 deletions(-) diff --git a/packages/angular-query-devtools-experimental/package.json b/packages/angular-query-devtools-experimental/package.json index c2c3451308d..32100ae10d3 100644 --- a/packages/angular-query-devtools-experimental/package.json +++ b/packages/angular-query-devtools-experimental/package.json @@ -36,6 +36,7 @@ "module": "build/index.mjs", "exports": { ".": { + "tanstack-internal": "./src/index.ts", "types": "./build/index.d.ts", "default": "./build/index.mjs" }, diff --git a/packages/angular-query-experimental/package.json b/packages/angular-query-experimental/package.json index e06dc41b0b9..98307d344ce 100644 --- a/packages/angular-query-experimental/package.json +++ b/packages/angular-query-experimental/package.json @@ -51,6 +51,7 @@ "module": "build/index.mjs", "exports": { ".": { + "tanstack-internal": "./src/index.ts", "types": "./build/index.d.ts", "default": "./build/index.mjs" }, diff --git a/packages/eslint-plugin-query/package.json b/packages/eslint-plugin-query/package.json index 31ecdb59ddd..4e250c36b4b 100644 --- a/packages/eslint-plugin-query/package.json +++ b/packages/eslint-plugin-query/package.json @@ -40,6 +40,7 @@ "exports": { ".": { "import": { + "tanstack-internal": "./src/index.ts", "types": "./dist/esm/index.d.ts", "default": "./dist/esm/index.js" }, diff --git a/packages/query-async-storage-persister/package.json b/packages/query-async-storage-persister/package.json index 02015dc10fe..6e925c7cc0c 100644 --- a/packages/query-async-storage-persister/package.json +++ b/packages/query-async-storage-persister/package.json @@ -41,6 +41,7 @@ "exports": { ".": { "import": { + "tanstack-internal": "./src/index.ts", "types": "./build/modern/index.d.ts", "default": "./build/modern/index.js" }, diff --git a/packages/query-broadcast-client-experimental/package.json b/packages/query-broadcast-client-experimental/package.json index 5137024e58b..c9851184720 100644 --- a/packages/query-broadcast-client-experimental/package.json +++ b/packages/query-broadcast-client-experimental/package.json @@ -38,6 +38,7 @@ "exports": { ".": { "import": { + "tanstack-internal": "./src/index.ts", "types": "./build/modern/index.d.ts", "default": "./build/modern/index.js" }, diff --git a/packages/query-devtools/package.json b/packages/query-devtools/package.json index 0ab1c883bcf..0c46cc3e451 100644 --- a/packages/query-devtools/package.json +++ b/packages/query-devtools/package.json @@ -41,17 +41,20 @@ "browser": {}, "exports": { "solid": { + "tanstack-internal": "./src/index.ts", "development": "./build/index.js", "import": "./build/index.js" }, "development": { "import": { + "tanstack-internal": "./src/index.ts", "types": "./build/index.d.ts", "default": "./build/dev.js" }, "require": "./build/dev.cjs" }, "import": { + "tanstack-internal": "./src/index.ts", "types": "./build/index.d.ts", "default": "./build/index.js" }, diff --git a/packages/query-persist-client-core/package.json b/packages/query-persist-client-core/package.json index 961e6f2b218..f13c605ed8a 100644 --- a/packages/query-persist-client-core/package.json +++ b/packages/query-persist-client-core/package.json @@ -41,6 +41,7 @@ "exports": { ".": { "import": { + "tanstack-internal": "./src/index.ts", "types": "./build/modern/index.d.ts", "default": "./build/modern/index.js" }, diff --git a/packages/query-sync-storage-persister/package.json b/packages/query-sync-storage-persister/package.json index 87f1810657d..1320d0cc6f0 100644 --- a/packages/query-sync-storage-persister/package.json +++ b/packages/query-sync-storage-persister/package.json @@ -41,6 +41,7 @@ "exports": { ".": { "import": { + "tanstack-internal": "./src/index.ts", "types": "./build/modern/index.d.ts", "default": "./build/modern/index.js" }, diff --git a/packages/react-query-devtools/package.json b/packages/react-query-devtools/package.json index 6ce7d44e307..49b6925c302 100644 --- a/packages/react-query-devtools/package.json +++ b/packages/react-query-devtools/package.json @@ -41,6 +41,7 @@ "exports": { ".": { "import": { + "tanstack-internal": "./src/index.ts", "types": "./build/modern/index.d.ts", "default": "./build/modern/index.js" }, @@ -51,6 +52,7 @@ }, "./production": { "import": { + "tanstack-internal": "./src/production.ts", "types": "./build/modern/production.d.ts", "default": "./build/modern/production.js" }, @@ -61,6 +63,7 @@ }, "./build/modern/production.js": { "import": { + "tanstack-internal": "./src/production.ts", "types": "./build/modern/production.d.ts", "default": "./build/modern/production.js" }, diff --git a/packages/react-query-next-experimental/package.json b/packages/react-query-next-experimental/package.json index 1be41aab52a..a5561382c2b 100644 --- a/packages/react-query-next-experimental/package.json +++ b/packages/react-query-next-experimental/package.json @@ -38,6 +38,7 @@ "exports": { ".": { "import": { + "tanstack-internal": "./src/index.ts", "types": "./build/modern/index.d.ts", "default": "./build/modern/index.js" }, diff --git a/packages/react-query-persist-client/package.json b/packages/react-query-persist-client/package.json index ae7941aa874..c58797c4d3e 100644 --- a/packages/react-query-persist-client/package.json +++ b/packages/react-query-persist-client/package.json @@ -41,6 +41,7 @@ "exports": { ".": { "import": { + "tanstack-internal": "./src/index.ts", "types": "./build/modern/index.d.ts", "default": "./build/modern/index.js" }, diff --git a/packages/react-query/package.json b/packages/react-query/package.json index 60f23d81d01..1c07e8eba1c 100644 --- a/packages/react-query/package.json +++ b/packages/react-query/package.json @@ -43,6 +43,7 @@ "exports": { ".": { "import": { + "tanstack-internal": "./src/index.ts", "types": "./build/modern/index.d.ts", "default": "./build/modern/index.js" }, diff --git a/packages/solid-query-devtools/package.json b/packages/solid-query-devtools/package.json index 11259ffa79a..69fc5881d41 100644 --- a/packages/solid-query-devtools/package.json +++ b/packages/solid-query-devtools/package.json @@ -38,17 +38,20 @@ "browser": {}, "exports": { "solid": { + "tanstack-internal": "./src/index.ts", "development": "./build/dev.jsx", "import": "./build/index.jsx" }, "development": { "import": { + "tanstack-internal": "./src/index.ts", "types": "./build/index.d.ts", "default": "./build/dev.js" }, "require": "./build/dev.cjs" }, "import": { + "tanstack-internal": "./src/index.ts", "types": "./build/index.d.ts", "default": "./build/index.js" }, diff --git a/packages/solid-query-persist-client/package.json b/packages/solid-query-persist-client/package.json index 855c5dcee0d..77db080f11f 100644 --- a/packages/solid-query-persist-client/package.json +++ b/packages/solid-query-persist-client/package.json @@ -39,6 +39,7 @@ "exports": { "development": { "import": { + "tanstack-internal": "./src/index.ts", "types": "./build/index.d.ts", "default": "./build/dev.js" }, @@ -48,6 +49,7 @@ } }, "import": { + "tanstack-internal": "./src/index.ts", "types": "./build/index.d.ts", "default": "./build/index.js" }, diff --git a/packages/solid-query/package.json b/packages/solid-query/package.json index b0b3bda4428..2438dd43957 100644 --- a/packages/solid-query/package.json +++ b/packages/solid-query/package.json @@ -42,6 +42,7 @@ "exports": { "development": { "import": { + "tanstack-internal": "./src/index.ts", "types": "./build/index.d.ts", "default": "./build/dev.js" }, @@ -51,6 +52,7 @@ } }, "import": { + "tanstack-internal": "./src/index.ts", "types": "./build/index.d.ts", "default": "./build/index.js" }, diff --git a/packages/svelte-query-devtools/package.json b/packages/svelte-query-devtools/package.json index d28d657f571..270cc9a2483 100644 --- a/packages/svelte-query-devtools/package.json +++ b/packages/svelte-query-devtools/package.json @@ -28,6 +28,7 @@ "svelte": "./dist/index.js", "exports": { ".": { + "tanstack-internal": "./src/index.ts", "types": "./dist/index.d.ts", "svelte": "./dist/index.js", "import": "./dist/index.js" diff --git a/packages/svelte-query-persist-client/package.json b/packages/svelte-query-persist-client/package.json index 05bbb9669d6..418f7475079 100644 --- a/packages/svelte-query-persist-client/package.json +++ b/packages/svelte-query-persist-client/package.json @@ -30,6 +30,7 @@ "svelte": "./dist/index.js", "exports": { ".": { + "tanstack-internal": "./src/index.ts", "types": "./dist/index.d.ts", "svelte": "./dist/index.js", "import": "./dist/index.js" diff --git a/packages/svelte-query/package.json b/packages/svelte-query/package.json index 2b17f2b21ff..6bfa0f3758f 100644 --- a/packages/svelte-query/package.json +++ b/packages/svelte-query/package.json @@ -30,6 +30,7 @@ "svelte": "./dist/index.js", "exports": { ".": { + "tanstack-internal": "./src/index.ts", "types": "./dist/index.d.ts", "svelte": "./dist/index.js", "import": "./dist/index.js" diff --git a/packages/vue-query-devtools/package.json b/packages/vue-query-devtools/package.json index a6aca74ab2b..d67173ff8bf 100644 --- a/packages/vue-query-devtools/package.json +++ b/packages/vue-query-devtools/package.json @@ -28,14 +28,17 @@ "main": "dist/esm/index.js", "exports": { ".": { + "tanstack-internal": "./src/index.ts", "types": "./dist/esm/index.d.ts", "default": "./dist/esm/index.js" }, "./production": { + "tanstack-internal": "./src/production.ts", "types": "./dist/esm/production.d.ts", "default": "./dist/esm/production.js" }, "./dist/production.js": { + "tanstack-internal": "./src/production.ts", "types": "./dist/esm/production.d.ts", "default": "./dist/esm/production.js" }, diff --git a/packages/vue-query/package.json b/packages/vue-query/package.json index c12faffe7c6..deb61752bf4 100644 --- a/packages/vue-query/package.json +++ b/packages/vue-query/package.json @@ -43,6 +43,7 @@ "exports": { ".": { "import": { + "tanstack-internal": "./src/index.ts", "types": "./build/modern/index.d.ts", "default": "./build/modern/index.js" }, diff --git a/tsconfig.json b/tsconfig.json index 2f1c05108e6..a07c52efb18 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -26,57 +26,7 @@ "resolveJsonModule": true, "skipLibCheck": true, "strict": true, - "target": "ES2020", - "paths": { - "@tanstack/angular-query-devtools-experimental": [ - "../../packages/angular-query-devtools-experimental/src" - ], - "@tanstack/angular-query-experimental": [ - "../../packages/angular-query-experimental/src" - ], - "@tanstack/eslint-plugin-query": [ - "../../packages/eslint-plugin-query/src" - ], - "@tanstack/query-async-storage-persister": [ - "../../packages/query-async-storage-persister/src" - ], - "@tanstack/query-broadcast-client-experimental": [ - "../../packages/query-broadcast-client-experimental/src" - ], - "@tanstack/query-devtools": ["../../packages/query-devtools/src"], - "@tanstack/query-persist-client-core": [ - "../../packages/query-persist-client-core/src" - ], - "@tanstack/query-sync-storage-persister": [ - "../../packages/query-sync-storage-persister/src" - ], - "@tanstack/react-query": ["../../packages/react-query/src"], - "@tanstack/react-query-devtools": [ - "../../packages/react-query-devtools/src" - ], - "@tanstack/react-query-next-experimental": [ - "../../packages/react-query-next-experimental/src" - ], - "@tanstack/react-query-persist-client": [ - "../../packages/react-query-persist-client/src" - ], - "@tanstack/solid-query": ["../../packages/solid-query/src"], - "@tanstack/solid-query-devtools": [ - "../../packages/solid-query-devtools/src" - ], - "@tanstack/solid-query-persist-client": [ - "../../packages/solid-query-persist-client/src" - ], - "@tanstack/svelte-query": ["../../packages/svelte-query/src"], - "@tanstack/svelte-query-devtools": [ - "../../packages/svelte-query-devtools/src" - ], - "@tanstack/svelte-query-persist-client": [ - "../../packages/svelte-query-persist-client/src" - ], - "@tanstack/vue-query": ["../../packages/vue-query/src"], - "@tanstack/vue-query-devtools": ["../../packages/vue-query-devtools/src"] - } + "target": "ES2020" }, "include": ["eslint.config.js", "prettier.config.js"] } From d850647618d8a9034c5cb8200c27bb7f05b9cba6 Mon Sep 17 00:00:00 2001 From: Tyler <26290074+tylersayshi@users.noreply.github.com> Date: Wed, 2 Apr 2025 15:52:48 -0700 Subject: [PATCH 3/9] publint and vitest fixes --- package.json | 1 - packages/angular-query-devtools-experimental/package.json | 2 +- .../angular-query-devtools-experimental/vite.config.ts | 3 +-- packages/angular-query-experimental/package.json | 2 +- packages/angular-query-experimental/vite.config.ts | 3 +-- packages/eslint-plugin-query/package.json | 2 +- packages/eslint-plugin-query/vite.config.ts | 3 +-- packages/query-async-storage-persister/package.json | 2 +- packages/query-async-storage-persister/vite.config.ts | 3 +-- packages/query-broadcast-client-experimental/package.json | 2 +- packages/query-codemods/vite.config.ts | 3 +-- packages/query-core/package.json | 2 +- packages/query-core/vite.config.ts | 3 +-- packages/query-devtools/package.json | 6 +++--- packages/query-devtools/vite.config.ts | 4 ++-- packages/query-persist-client-core/package.json | 2 +- packages/query-persist-client-core/vite.config.ts | 3 +-- packages/query-sync-storage-persister/package.json | 2 +- packages/query-sync-storage-persister/vite.config.ts | 3 +-- packages/react-query-devtools/package.json | 6 +++--- packages/react-query-devtools/vite.config.ts | 4 ++-- packages/react-query-next-experimental/package.json | 2 +- packages/react-query-next-experimental/vite.config.ts | 4 ++-- packages/react-query-persist-client/package.json | 2 +- packages/react-query-persist-client/vite.config.ts | 4 ++-- packages/react-query/package.json | 2 +- packages/react-query/vite.config.ts | 4 ++-- packages/solid-query-devtools/package.json | 6 +++--- packages/solid-query-devtools/vite.config.ts | 4 ++-- packages/solid-query-persist-client/package.json | 4 ++-- packages/solid-query-persist-client/vite.config.ts | 4 ++-- packages/solid-query/package.json | 4 ++-- packages/solid-query/vite.config.ts | 4 ++-- packages/svelte-query-devtools/package.json | 2 +- packages/svelte-query-devtools/vite.config.ts | 4 ++-- packages/svelte-query-persist-client/package.json | 2 +- packages/svelte-query-persist-client/vite.config.ts | 8 ++------ packages/svelte-query/package.json | 2 +- packages/svelte-query/vite.config.ts | 8 ++------ packages/vue-query-devtools/package.json | 6 +++--- packages/vue-query-devtools/vite.config.ts | 4 ++-- packages/vue-query/package.json | 2 +- packages/vue-query/vite.config.ts | 4 ++-- pnpm-lock.yaml | 3 --- 44 files changed, 65 insertions(+), 85 deletions(-) diff --git a/package.json b/package.json index 5ae0f2e1dd7..5b91fcfb82d 100644 --- a/package.json +++ b/package.json @@ -73,7 +73,6 @@ "typescript56": "npm:typescript@5.6", "typescript57": "npm:typescript@5.7", "vite": "^5.3.5", - "vite-tsconfig-paths": "^5.1.4", "vitest": "^2.1.9" }, "pnpm": { diff --git a/packages/angular-query-devtools-experimental/package.json b/packages/angular-query-devtools-experimental/package.json index 6883d5b05ac..16a3b8cfb0b 100644 --- a/packages/angular-query-devtools-experimental/package.json +++ b/packages/angular-query-devtools-experimental/package.json @@ -36,8 +36,8 @@ "module": "build/index.mjs", "exports": { ".": { - "tanstack-internal": "./src/index.ts", "types": "./build/index.d.ts", + "tanstack-internal": "./src/index.ts", "default": "./build/index.mjs" }, "./package.json": { diff --git a/packages/angular-query-devtools-experimental/vite.config.ts b/packages/angular-query-devtools-experimental/vite.config.ts index e822fd87c6d..951581c391e 100644 --- a/packages/angular-query-devtools-experimental/vite.config.ts +++ b/packages/angular-query-devtools-experimental/vite.config.ts @@ -1,13 +1,12 @@ import { defineConfig } from 'vitest/config' -import tsconfigPaths from 'vite-tsconfig-paths' import { dynamicAliases } from './root.vite.config' import packageJson from './package.json' export default defineConfig({ - plugins: [tsconfigPaths({ ignoreConfigErrors: true })], resolve: { alias: dynamicAliases, + conditions: ['tanstack-internal'], }, test: { name: packageJson.name, diff --git a/packages/angular-query-experimental/package.json b/packages/angular-query-experimental/package.json index 1cd2c7f73dc..e04041761fc 100644 --- a/packages/angular-query-experimental/package.json +++ b/packages/angular-query-experimental/package.json @@ -51,8 +51,8 @@ "module": "build/index.mjs", "exports": { ".": { - "tanstack-internal": "./src/index.ts", "types": "./build/index.d.ts", + "tanstack-internal": "./src/index.ts", "default": "./build/index.mjs" }, "./package.json": { diff --git a/packages/angular-query-experimental/vite.config.ts b/packages/angular-query-experimental/vite.config.ts index e822fd87c6d..951581c391e 100644 --- a/packages/angular-query-experimental/vite.config.ts +++ b/packages/angular-query-experimental/vite.config.ts @@ -1,13 +1,12 @@ import { defineConfig } from 'vitest/config' -import tsconfigPaths from 'vite-tsconfig-paths' import { dynamicAliases } from './root.vite.config' import packageJson from './package.json' export default defineConfig({ - plugins: [tsconfigPaths({ ignoreConfigErrors: true })], resolve: { alias: dynamicAliases, + conditions: ['tanstack-internal'], }, test: { name: packageJson.name, diff --git a/packages/eslint-plugin-query/package.json b/packages/eslint-plugin-query/package.json index 4e250c36b4b..80e249a3d75 100644 --- a/packages/eslint-plugin-query/package.json +++ b/packages/eslint-plugin-query/package.json @@ -40,8 +40,8 @@ "exports": { ".": { "import": { - "tanstack-internal": "./src/index.ts", "types": "./dist/esm/index.d.ts", + "tanstack-internal": "./src/index.ts", "default": "./dist/esm/index.js" }, "require": { diff --git a/packages/eslint-plugin-query/vite.config.ts b/packages/eslint-plugin-query/vite.config.ts index 085e7d77aeb..f13c7ec63d3 100644 --- a/packages/eslint-plugin-query/vite.config.ts +++ b/packages/eslint-plugin-query/vite.config.ts @@ -1,14 +1,13 @@ import { defineConfig, mergeConfig } from 'vitest/config' import { tanstackViteConfig } from '@tanstack/config/vite' -import tsconfigPaths from 'vite-tsconfig-paths' import { dynamicAliases } from './root.vite.config' import packageJson from './package.json' const config = defineConfig({ - plugins: [tsconfigPaths({ ignoreConfigErrors: true })], resolve: { alias: dynamicAliases, + conditions: ['tanstack-internal'], }, test: { name: packageJson.name, diff --git a/packages/query-async-storage-persister/package.json b/packages/query-async-storage-persister/package.json index e6595ce03be..8fc2a37e384 100644 --- a/packages/query-async-storage-persister/package.json +++ b/packages/query-async-storage-persister/package.json @@ -41,8 +41,8 @@ "exports": { ".": { "import": { - "tanstack-internal": "./src/index.ts", "types": "./build/modern/index.d.ts", + "tanstack-internal": "./src/index.ts", "default": "./build/modern/index.js" }, "require": { diff --git a/packages/query-async-storage-persister/vite.config.ts b/packages/query-async-storage-persister/vite.config.ts index 119946da201..6f50d26e6ae 100644 --- a/packages/query-async-storage-persister/vite.config.ts +++ b/packages/query-async-storage-persister/vite.config.ts @@ -1,13 +1,12 @@ import { defineConfig } from 'vitest/config' -import tsconfigPaths from 'vite-tsconfig-paths' import { dynamicAliases } from './root.vite.config' import packageJson from './package.json' export default defineConfig({ - plugins: [tsconfigPaths({ ignoreConfigErrors: true })], resolve: { alias: dynamicAliases, + conditions: ['tanstack-internal'], }, test: { name: packageJson.name, diff --git a/packages/query-broadcast-client-experimental/package.json b/packages/query-broadcast-client-experimental/package.json index 0a1360d3a81..120d70edca4 100644 --- a/packages/query-broadcast-client-experimental/package.json +++ b/packages/query-broadcast-client-experimental/package.json @@ -38,8 +38,8 @@ "exports": { ".": { "import": { - "tanstack-internal": "./src/index.ts", "types": "./build/modern/index.d.ts", + "tanstack-internal": "./src/index.ts", "default": "./build/modern/index.js" }, "require": { diff --git a/packages/query-codemods/vite.config.ts b/packages/query-codemods/vite.config.ts index 09fc57319ca..077fc28e1f3 100644 --- a/packages/query-codemods/vite.config.ts +++ b/packages/query-codemods/vite.config.ts @@ -1,13 +1,12 @@ import { defineConfig } from 'vitest/config' -import tsconfigPaths from 'vite-tsconfig-paths' import { dynamicAliases } from './root.vite.config' import packageJson from './package.json' export default defineConfig({ - plugins: [tsconfigPaths({ ignoreConfigErrors: true })], resolve: { alias: dynamicAliases, + conditions: ['tanstack-internal'], }, test: { name: packageJson.name, diff --git a/packages/query-core/package.json b/packages/query-core/package.json index e4a5dd84a4c..c8b114394da 100644 --- a/packages/query-core/package.json +++ b/packages/query-core/package.json @@ -41,8 +41,8 @@ "exports": { ".": { "import": { - "tanstack-internal": "./src/index.ts", "types": "./build/modern/index.d.ts", + "tanstack-internal": "./src/index.ts", "default": "./build/modern/index.js" }, "require": { diff --git a/packages/query-core/vite.config.ts b/packages/query-core/vite.config.ts index a87b97763cc..0ed88e7df91 100644 --- a/packages/query-core/vite.config.ts +++ b/packages/query-core/vite.config.ts @@ -1,13 +1,12 @@ import { defineConfig } from 'vitest/config' -import tsconfigPaths from 'vite-tsconfig-paths' import { dynamicAliases } from './root.vite.config' import packageJson from './package.json' export default defineConfig({ - plugins: [tsconfigPaths({ ignoreConfigErrors: true })], resolve: { alias: dynamicAliases, + conditions: ['tanstack-internal'], }, test: { name: packageJson.name, diff --git a/packages/query-devtools/package.json b/packages/query-devtools/package.json index f302fa0492a..8914436cb95 100644 --- a/packages/query-devtools/package.json +++ b/packages/query-devtools/package.json @@ -41,21 +41,21 @@ "browser": {}, "exports": { "solid": { - "tanstack-internal": "./src/index.ts", "development": "./build/index.js", + "tanstack-internal": "./src/index.ts", "import": "./build/index.js" }, "development": { "import": { - "tanstack-internal": "./src/index.ts", "types": "./build/index.d.ts", + "tanstack-internal": "./src/index.ts", "default": "./build/dev.js" }, "require": "./build/dev.cjs" }, "import": { - "tanstack-internal": "./src/index.ts", "types": "./build/index.d.ts", + "tanstack-internal": "./src/index.ts", "default": "./build/index.js" }, "require": "./build/index.cjs" diff --git a/packages/query-devtools/vite.config.ts b/packages/query-devtools/vite.config.ts index d0a7ac4d42d..24dd9811a6e 100644 --- a/packages/query-devtools/vite.config.ts +++ b/packages/query-devtools/vite.config.ts @@ -1,14 +1,14 @@ import solid from 'vite-plugin-solid' import { defineConfig } from 'vitest/config' -import tsconfigPaths from 'vite-tsconfig-paths' import { dynamicAliases } from './root.vite.config' import packageJson from './package.json' export default defineConfig({ - plugins: [solid(), tsconfigPaths({ ignoreConfigErrors: true })], + plugins: [solid()], resolve: { alias: dynamicAliases, + conditions: ['tanstack-internal'], }, test: { name: packageJson.name, diff --git a/packages/query-persist-client-core/package.json b/packages/query-persist-client-core/package.json index 98229a1920f..6960387937a 100644 --- a/packages/query-persist-client-core/package.json +++ b/packages/query-persist-client-core/package.json @@ -41,8 +41,8 @@ "exports": { ".": { "import": { - "tanstack-internal": "./src/index.ts", "types": "./build/modern/index.d.ts", + "tanstack-internal": "./src/index.ts", "default": "./build/modern/index.js" }, "require": { diff --git a/packages/query-persist-client-core/vite.config.ts b/packages/query-persist-client-core/vite.config.ts index 119946da201..6f50d26e6ae 100644 --- a/packages/query-persist-client-core/vite.config.ts +++ b/packages/query-persist-client-core/vite.config.ts @@ -1,13 +1,12 @@ import { defineConfig } from 'vitest/config' -import tsconfigPaths from 'vite-tsconfig-paths' import { dynamicAliases } from './root.vite.config' import packageJson from './package.json' export default defineConfig({ - plugins: [tsconfigPaths({ ignoreConfigErrors: true })], resolve: { alias: dynamicAliases, + conditions: ['tanstack-internal'], }, test: { name: packageJson.name, diff --git a/packages/query-sync-storage-persister/package.json b/packages/query-sync-storage-persister/package.json index 121ab2d13a0..4177ecd88f3 100644 --- a/packages/query-sync-storage-persister/package.json +++ b/packages/query-sync-storage-persister/package.json @@ -41,8 +41,8 @@ "exports": { ".": { "import": { - "tanstack-internal": "./src/index.ts", "types": "./build/modern/index.d.ts", + "tanstack-internal": "./src/index.ts", "default": "./build/modern/index.js" }, "require": { diff --git a/packages/query-sync-storage-persister/vite.config.ts b/packages/query-sync-storage-persister/vite.config.ts index 119946da201..6f50d26e6ae 100644 --- a/packages/query-sync-storage-persister/vite.config.ts +++ b/packages/query-sync-storage-persister/vite.config.ts @@ -1,13 +1,12 @@ import { defineConfig } from 'vitest/config' -import tsconfigPaths from 'vite-tsconfig-paths' import { dynamicAliases } from './root.vite.config' import packageJson from './package.json' export default defineConfig({ - plugins: [tsconfigPaths({ ignoreConfigErrors: true })], resolve: { alias: dynamicAliases, + conditions: ['tanstack-internal'], }, test: { name: packageJson.name, diff --git a/packages/react-query-devtools/package.json b/packages/react-query-devtools/package.json index 2000639b581..40bc22e2843 100644 --- a/packages/react-query-devtools/package.json +++ b/packages/react-query-devtools/package.json @@ -41,8 +41,8 @@ "exports": { ".": { "import": { - "tanstack-internal": "./src/index.ts", "types": "./build/modern/index.d.ts", + "tanstack-internal": "./src/index.ts", "default": "./build/modern/index.js" }, "require": { @@ -52,8 +52,8 @@ }, "./production": { "import": { - "tanstack-internal": "./src/production.ts", "types": "./build/modern/production.d.ts", + "tanstack-internal": "./src/production.ts", "default": "./build/modern/production.js" }, "require": { @@ -63,8 +63,8 @@ }, "./build/modern/production.js": { "import": { - "tanstack-internal": "./src/production.ts", "types": "./build/modern/production.d.ts", + "tanstack-internal": "./src/production.ts", "default": "./build/modern/production.js" }, "require": { diff --git a/packages/react-query-devtools/vite.config.ts b/packages/react-query-devtools/vite.config.ts index 848ae5e8824..8dff05ef84a 100644 --- a/packages/react-query-devtools/vite.config.ts +++ b/packages/react-query-devtools/vite.config.ts @@ -1,14 +1,14 @@ import { defineConfig } from 'vitest/config' import react from '@vitejs/plugin-react' -import tsconfigPaths from 'vite-tsconfig-paths' import { dynamicAliases } from './root.vite.config' import packageJson from './package.json' export default defineConfig({ - plugins: [react(), tsconfigPaths({ ignoreConfigErrors: true })], + plugins: [react()], resolve: { alias: dynamicAliases, + conditions: ['tanstack-internal'], }, test: { name: packageJson.name, diff --git a/packages/react-query-next-experimental/package.json b/packages/react-query-next-experimental/package.json index 44e0312d9dd..948fe8960e1 100644 --- a/packages/react-query-next-experimental/package.json +++ b/packages/react-query-next-experimental/package.json @@ -38,8 +38,8 @@ "exports": { ".": { "import": { - "tanstack-internal": "./src/index.ts", "types": "./build/modern/index.d.ts", + "tanstack-internal": "./src/index.ts", "default": "./build/modern/index.js" }, "require": { diff --git a/packages/react-query-next-experimental/vite.config.ts b/packages/react-query-next-experimental/vite.config.ts index 4a87bc676d7..27a0c40abf5 100644 --- a/packages/react-query-next-experimental/vite.config.ts +++ b/packages/react-query-next-experimental/vite.config.ts @@ -1,12 +1,12 @@ import { defineConfig } from 'vite' import react from '@vitejs/plugin-react' -import tsconfigPaths from 'vite-tsconfig-paths' import { dynamicAliases } from './root.vite.config' export default defineConfig({ - plugins: [react(), tsconfigPaths({ ignoreConfigErrors: true })], + plugins: [react()], resolve: { alias: dynamicAliases, + conditions: ['tanstack-internal'], }, }) diff --git a/packages/react-query-persist-client/package.json b/packages/react-query-persist-client/package.json index de63a1d413a..c1e295e3a50 100644 --- a/packages/react-query-persist-client/package.json +++ b/packages/react-query-persist-client/package.json @@ -41,8 +41,8 @@ "exports": { ".": { "import": { - "tanstack-internal": "./src/index.ts", "types": "./build/modern/index.d.ts", + "tanstack-internal": "./src/index.ts", "default": "./build/modern/index.js" }, "require": { diff --git a/packages/react-query-persist-client/vite.config.ts b/packages/react-query-persist-client/vite.config.ts index 848ae5e8824..8dff05ef84a 100644 --- a/packages/react-query-persist-client/vite.config.ts +++ b/packages/react-query-persist-client/vite.config.ts @@ -1,14 +1,14 @@ import { defineConfig } from 'vitest/config' import react from '@vitejs/plugin-react' -import tsconfigPaths from 'vite-tsconfig-paths' import { dynamicAliases } from './root.vite.config' import packageJson from './package.json' export default defineConfig({ - plugins: [react(), tsconfigPaths({ ignoreConfigErrors: true })], + plugins: [react()], resolve: { alias: dynamicAliases, + conditions: ['tanstack-internal'], }, test: { name: packageJson.name, diff --git a/packages/react-query/package.json b/packages/react-query/package.json index 4f7d6da7cb6..1e442549922 100644 --- a/packages/react-query/package.json +++ b/packages/react-query/package.json @@ -43,8 +43,8 @@ "exports": { ".": { "import": { - "tanstack-internal": "./src/index.ts", "types": "./build/modern/index.d.ts", + "tanstack-internal": "./src/index.ts", "default": "./build/modern/index.js" }, "require": { diff --git a/packages/react-query/vite.config.ts b/packages/react-query/vite.config.ts index 4c4570617a1..7b457b1a129 100644 --- a/packages/react-query/vite.config.ts +++ b/packages/react-query/vite.config.ts @@ -1,14 +1,14 @@ import { defineConfig } from 'vitest/config' import react from '@vitejs/plugin-react' -import tsconfigPaths from 'vite-tsconfig-paths' import { dynamicAliases } from './root.vite.config' import packageJson from './package.json' export default defineConfig({ - plugins: [react(), tsconfigPaths({ ignoreConfigErrors: true })], + plugins: [react()], resolve: { alias: dynamicAliases, + conditions: ['tanstack-internal'], }, test: { name: packageJson.name, diff --git a/packages/solid-query-devtools/package.json b/packages/solid-query-devtools/package.json index 9f2a9232a88..ed942b2c186 100644 --- a/packages/solid-query-devtools/package.json +++ b/packages/solid-query-devtools/package.json @@ -38,21 +38,21 @@ "browser": {}, "exports": { "solid": { - "tanstack-internal": "./src/index.ts", "development": "./build/dev.jsx", + "tanstack-internal": "./src/index.tsx", "import": "./build/index.jsx" }, "development": { "import": { - "tanstack-internal": "./src/index.ts", "types": "./build/index.d.ts", + "tanstack-internal": "./src/index.tsx", "default": "./build/dev.js" }, "require": "./build/dev.cjs" }, "import": { - "tanstack-internal": "./src/index.ts", "types": "./build/index.d.ts", + "tanstack-internal": "./src/index.tsx", "default": "./build/index.js" }, "require": "./build/index.cjs" diff --git a/packages/solid-query-devtools/vite.config.ts b/packages/solid-query-devtools/vite.config.ts index 99a13ed566a..3b77d94c085 100644 --- a/packages/solid-query-devtools/vite.config.ts +++ b/packages/solid-query-devtools/vite.config.ts @@ -1,12 +1,12 @@ import { defineConfig } from 'vite' import solid from 'vite-plugin-solid' -import tsconfigPaths from 'vite-tsconfig-paths' import { dynamicAliases } from './root.vite.config' export default defineConfig({ - plugins: [solid(), tsconfigPaths({ ignoreConfigErrors: true })], + plugins: [solid()], resolve: { alias: dynamicAliases, + conditions: ['tanstack-internal'], }, }) diff --git a/packages/solid-query-persist-client/package.json b/packages/solid-query-persist-client/package.json index 4264b8f8c8f..4d67c081365 100644 --- a/packages/solid-query-persist-client/package.json +++ b/packages/solid-query-persist-client/package.json @@ -39,8 +39,8 @@ "exports": { "development": { "import": { - "tanstack-internal": "./src/index.ts", "types": "./build/index.d.ts", + "tanstack-internal": "./src/index.ts", "default": "./build/dev.js" }, "require": { @@ -49,8 +49,8 @@ } }, "import": { - "tanstack-internal": "./src/index.ts", "types": "./build/index.d.ts", + "tanstack-internal": "./src/index.ts", "default": "./build/index.js" }, "require": { diff --git a/packages/solid-query-persist-client/vite.config.ts b/packages/solid-query-persist-client/vite.config.ts index 5f86decaa7d..afab5c9a642 100644 --- a/packages/solid-query-persist-client/vite.config.ts +++ b/packages/solid-query-persist-client/vite.config.ts @@ -1,14 +1,14 @@ import { defineConfig } from 'vitest/config' import solid from 'vite-plugin-solid' -import tsconfigPaths from 'vite-tsconfig-paths' import { dynamicAliases } from './root.vite.config' import packageJson from './package.json' export default defineConfig({ - plugins: [solid(), tsconfigPaths({ ignoreConfigErrors: true })], + plugins: [solid()], resolve: { alias: dynamicAliases, + conditions: ['tanstack-internal'], }, test: { name: packageJson.name, diff --git a/packages/solid-query/package.json b/packages/solid-query/package.json index e2c7cac0d83..049afd2137b 100644 --- a/packages/solid-query/package.json +++ b/packages/solid-query/package.json @@ -42,8 +42,8 @@ "exports": { "development": { "import": { - "tanstack-internal": "./src/index.ts", "types": "./build/index.d.ts", + "tanstack-internal": "./src/index.ts", "default": "./build/dev.js" }, "require": { @@ -52,8 +52,8 @@ } }, "import": { - "tanstack-internal": "./src/index.ts", "types": "./build/index.d.ts", + "tanstack-internal": "./src/index.ts", "default": "./build/index.js" }, "require": { diff --git a/packages/solid-query/vite.config.ts b/packages/solid-query/vite.config.ts index 5f86decaa7d..afab5c9a642 100644 --- a/packages/solid-query/vite.config.ts +++ b/packages/solid-query/vite.config.ts @@ -1,14 +1,14 @@ import { defineConfig } from 'vitest/config' import solid from 'vite-plugin-solid' -import tsconfigPaths from 'vite-tsconfig-paths' import { dynamicAliases } from './root.vite.config' import packageJson from './package.json' export default defineConfig({ - plugins: [solid(), tsconfigPaths({ ignoreConfigErrors: true })], + plugins: [solid()], resolve: { alias: dynamicAliases, + conditions: ['tanstack-internal'], }, test: { name: packageJson.name, diff --git a/packages/svelte-query-devtools/package.json b/packages/svelte-query-devtools/package.json index b786ccf43e4..11ad5f95039 100644 --- a/packages/svelte-query-devtools/package.json +++ b/packages/svelte-query-devtools/package.json @@ -28,9 +28,9 @@ "svelte": "./dist/index.js", "exports": { ".": { - "tanstack-internal": "./src/index.ts", "types": "./dist/index.d.ts", "svelte": "./dist/index.js", + "tanstack-internal": "./src/index.ts", "import": "./dist/index.js" }, "./package.json": "./package.json" diff --git a/packages/svelte-query-devtools/vite.config.ts b/packages/svelte-query-devtools/vite.config.ts index 27b0dacb2b0..d64d35a8f39 100644 --- a/packages/svelte-query-devtools/vite.config.ts +++ b/packages/svelte-query-devtools/vite.config.ts @@ -1,12 +1,12 @@ import { svelte } from '@sveltejs/vite-plugin-svelte' import { defineConfig } from 'vite' -import tsconfigPaths from 'vite-tsconfig-paths' import { dynamicAliases } from './root.vite.config' export default defineConfig({ - plugins: [svelte(), tsconfigPaths({ ignoreConfigErrors: true })], + plugins: [svelte()], resolve: { alias: dynamicAliases, + conditions: ['tanstack-internal'], }, }) diff --git a/packages/svelte-query-persist-client/package.json b/packages/svelte-query-persist-client/package.json index 5adced97139..2b18c465abe 100644 --- a/packages/svelte-query-persist-client/package.json +++ b/packages/svelte-query-persist-client/package.json @@ -30,9 +30,9 @@ "svelte": "./dist/index.js", "exports": { ".": { - "tanstack-internal": "./src/index.ts", "types": "./dist/index.d.ts", "svelte": "./dist/index.js", + "tanstack-internal": "./src/index.ts", "import": "./dist/index.js" }, "./package.json": "./package.json" diff --git a/packages/svelte-query-persist-client/vite.config.ts b/packages/svelte-query-persist-client/vite.config.ts index 54e9cf7efe3..10b20662dd2 100644 --- a/packages/svelte-query-persist-client/vite.config.ts +++ b/packages/svelte-query-persist-client/vite.config.ts @@ -1,19 +1,15 @@ import { svelte } from '@sveltejs/vite-plugin-svelte' import { defineConfig } from 'vitest/config' import { svelteTesting } from '@testing-library/svelte/vite' -import tsconfigPaths from 'vite-tsconfig-paths' import { dynamicAliases } from './root.vite.config' import packageJson from './package.json' export default defineConfig({ - plugins: [ - svelte(), - svelteTesting(), - tsconfigPaths({ ignoreConfigErrors: true }), - ], + plugins: [svelte(), svelteTesting()], resolve: { alias: dynamicAliases, + conditions: ['tanstack-internal'], }, test: { name: packageJson.name, diff --git a/packages/svelte-query/package.json b/packages/svelte-query/package.json index 0527492eae9..e2ffbf1f898 100644 --- a/packages/svelte-query/package.json +++ b/packages/svelte-query/package.json @@ -30,9 +30,9 @@ "svelte": "./dist/index.js", "exports": { ".": { - "tanstack-internal": "./src/index.ts", "types": "./dist/index.d.ts", "svelte": "./dist/index.js", + "tanstack-internal": "./src/index.ts", "import": "./dist/index.js" }, "./package.json": "./package.json" diff --git a/packages/svelte-query/vite.config.ts b/packages/svelte-query/vite.config.ts index 54e9cf7efe3..10b20662dd2 100644 --- a/packages/svelte-query/vite.config.ts +++ b/packages/svelte-query/vite.config.ts @@ -1,19 +1,15 @@ import { svelte } from '@sveltejs/vite-plugin-svelte' import { defineConfig } from 'vitest/config' import { svelteTesting } from '@testing-library/svelte/vite' -import tsconfigPaths from 'vite-tsconfig-paths' import { dynamicAliases } from './root.vite.config' import packageJson from './package.json' export default defineConfig({ - plugins: [ - svelte(), - svelteTesting(), - tsconfigPaths({ ignoreConfigErrors: true }), - ], + plugins: [svelte(), svelteTesting()], resolve: { alias: dynamicAliases, + conditions: ['tanstack-internal'], }, test: { name: packageJson.name, diff --git a/packages/vue-query-devtools/package.json b/packages/vue-query-devtools/package.json index 4c721920f3c..266d6168a44 100644 --- a/packages/vue-query-devtools/package.json +++ b/packages/vue-query-devtools/package.json @@ -28,18 +28,18 @@ "main": "dist/esm/index.js", "exports": { ".": { - "tanstack-internal": "./src/index.ts", "types": "./dist/esm/index.d.ts", + "tanstack-internal": "./src/index.ts", "default": "./dist/esm/index.js" }, "./production": { - "tanstack-internal": "./src/production.ts", "types": "./dist/esm/production.d.ts", + "tanstack-internal": "./src/production.ts", "default": "./dist/esm/production.js" }, "./dist/production.js": { - "tanstack-internal": "./src/production.ts", "types": "./dist/esm/production.d.ts", + "tanstack-internal": "./src/production.ts", "default": "./dist/esm/production.js" }, "./package.json": "./package.json" diff --git a/packages/vue-query-devtools/vite.config.ts b/packages/vue-query-devtools/vite.config.ts index f36254ba321..e8da69b0424 100644 --- a/packages/vue-query-devtools/vite.config.ts +++ b/packages/vue-query-devtools/vite.config.ts @@ -1,14 +1,14 @@ import { defineConfig, mergeConfig } from 'vite' import vue from '@vitejs/plugin-vue' import { tanstackViteConfig } from '@tanstack/config/vite' -import tsconfigPaths from 'vite-tsconfig-paths' import { dynamicAliases } from './root.vite.config' const config = defineConfig({ - plugins: [vue(), tsconfigPaths({ ignoreConfigErrors: true })], + plugins: [vue()], resolve: { alias: dynamicAliases, + conditions: ['tanstack-internal'], }, }) diff --git a/packages/vue-query/package.json b/packages/vue-query/package.json index b32775eec94..e5c2703de6d 100644 --- a/packages/vue-query/package.json +++ b/packages/vue-query/package.json @@ -43,8 +43,8 @@ "exports": { ".": { "import": { - "tanstack-internal": "./src/index.ts", "types": "./build/modern/index.d.ts", + "tanstack-internal": "./src/index.ts", "default": "./build/modern/index.js" }, "require": { diff --git a/packages/vue-query/vite.config.ts b/packages/vue-query/vite.config.ts index 620915c6dfb..8b55e3e7349 100644 --- a/packages/vue-query/vite.config.ts +++ b/packages/vue-query/vite.config.ts @@ -1,14 +1,14 @@ import { defineConfig } from 'vitest/config' import vue from '@vitejs/plugin-vue' -import tsconfigPaths from 'vite-tsconfig-paths' import { dynamicAliases } from './root.vite.config' import packageJson from './package.json' export default defineConfig({ - plugins: [vue(), tsconfigPaths({ ignoreConfigErrors: true })], + plugins: [vue()], resolve: { alias: dynamicAliases, + conditions: ['tanstack-internal'], }, test: { name: packageJson.name, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 81f45b8b707..9e2f33fa2cf 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -143,9 +143,6 @@ importers: vite: specifier: ^5.3.5 version: 5.4.16(@types/node@22.13.14)(less@4.2.2)(lightningcss@1.29.2)(sass@1.86.0)(terser@5.31.6) - vite-tsconfig-paths: - specifier: ^5.1.4 - version: 5.1.4(typescript@5.8.2)(vite@5.4.16(@types/node@22.13.14)(less@4.2.2)(lightningcss@1.29.2)(sass@1.86.0)(terser@5.31.6)) vitest: specifier: ^2.1.9 version: 2.1.9(@types/node@22.13.14)(jsdom@25.0.1)(less@4.2.2)(lightningcss@1.29.2)(msw@2.6.6(@types/node@22.13.14)(typescript@5.8.2))(sass@1.86.0)(terser@5.31.6) From 1566189fe17cd03e56894a36f31c74d06aaa1693 Mon Sep 17 00:00:00 2001 From: Tyler <26290074+tylersayshi@users.noreply.github.com> Date: Wed, 2 Apr 2025 17:28:54 -0700 Subject: [PATCH 4/9] order matters! thanks https://colinhacks.com/essays/live-types-typescript-monorepo --- packages/angular-query-devtools-experimental/package.json | 2 +- packages/angular-query-devtools-experimental/vite.config.ts | 2 +- packages/angular-query-experimental/package.json | 2 +- packages/angular-query-experimental/vite.config.ts | 2 +- packages/eslint-plugin-query/package.json | 2 +- packages/eslint-plugin-query/vite.config.ts | 2 +- packages/query-async-storage-persister/package.json | 2 +- packages/query-async-storage-persister/vite.config.ts | 2 +- packages/query-broadcast-client-experimental/package.json | 2 +- packages/query-codemods/vite.config.ts | 2 +- packages/query-core/package.json | 2 +- packages/query-core/vite.config.ts | 2 +- packages/query-devtools/package.json | 6 +++--- packages/query-devtools/vite.config.ts | 2 +- packages/query-persist-client-core/package.json | 2 +- packages/query-persist-client-core/vite.config.ts | 2 +- packages/query-sync-storage-persister/package.json | 2 +- packages/query-sync-storage-persister/vite.config.ts | 2 +- packages/react-query-devtools/package.json | 6 +++--- packages/react-query-devtools/vite.config.ts | 2 +- packages/react-query-next-experimental/package.json | 2 +- packages/react-query-next-experimental/vite.config.ts | 2 +- packages/react-query-persist-client/package.json | 2 +- packages/react-query-persist-client/vite.config.ts | 2 +- packages/react-query/package.json | 2 +- packages/react-query/vite.config.ts | 2 +- packages/solid-query-devtools/package.json | 6 +++--- packages/solid-query-devtools/vite.config.ts | 2 +- packages/solid-query-persist-client/package.json | 4 ++-- packages/solid-query-persist-client/vite.config.ts | 2 +- packages/solid-query/package.json | 4 ++-- packages/solid-query/vite.config.ts | 2 +- packages/svelte-query-devtools/package.json | 2 +- packages/svelte-query-devtools/vite.config.ts | 2 +- packages/svelte-query-persist-client/package.json | 2 +- packages/svelte-query-persist-client/vite.config.ts | 2 +- packages/svelte-query/package.json | 2 +- packages/svelte-query/vite.config.ts | 2 +- packages/vue-query-devtools/package.json | 6 +++--- packages/vue-query-devtools/vite.config.ts | 2 +- packages/vue-query/package.json | 2 +- packages/vue-query/vite.config.ts | 2 +- tsconfig.json | 2 +- 43 files changed, 53 insertions(+), 53 deletions(-) diff --git a/packages/angular-query-devtools-experimental/package.json b/packages/angular-query-devtools-experimental/package.json index 3b24bc336fd..00d14a49af6 100644 --- a/packages/angular-query-devtools-experimental/package.json +++ b/packages/angular-query-devtools-experimental/package.json @@ -36,8 +36,8 @@ "module": "build/index.mjs", "exports": { ".": { + "@tanstack/custom-condition": "./src/index.ts", "types": "./build/index.d.ts", - "tanstack-internal": "./src/index.ts", "default": "./build/index.mjs" }, "./package.json": { diff --git a/packages/angular-query-devtools-experimental/vite.config.ts b/packages/angular-query-devtools-experimental/vite.config.ts index 951581c391e..ade5453b3b4 100644 --- a/packages/angular-query-devtools-experimental/vite.config.ts +++ b/packages/angular-query-devtools-experimental/vite.config.ts @@ -6,7 +6,7 @@ import packageJson from './package.json' export default defineConfig({ resolve: { alias: dynamicAliases, - conditions: ['tanstack-internal'], + conditions: ['@tanstack/custom-condition'], }, test: { name: packageJson.name, diff --git a/packages/angular-query-experimental/package.json b/packages/angular-query-experimental/package.json index a43d522b9aa..35ca8267f29 100644 --- a/packages/angular-query-experimental/package.json +++ b/packages/angular-query-experimental/package.json @@ -51,8 +51,8 @@ "module": "build/index.mjs", "exports": { ".": { + "@tanstack/custom-condition": "./src/index.ts", "types": "./build/index.d.ts", - "tanstack-internal": "./src/index.ts", "default": "./build/index.mjs" }, "./package.json": { diff --git a/packages/angular-query-experimental/vite.config.ts b/packages/angular-query-experimental/vite.config.ts index 951581c391e..ade5453b3b4 100644 --- a/packages/angular-query-experimental/vite.config.ts +++ b/packages/angular-query-experimental/vite.config.ts @@ -6,7 +6,7 @@ import packageJson from './package.json' export default defineConfig({ resolve: { alias: dynamicAliases, - conditions: ['tanstack-internal'], + conditions: ['@tanstack/custom-condition'], }, test: { name: packageJson.name, diff --git a/packages/eslint-plugin-query/package.json b/packages/eslint-plugin-query/package.json index 1bd06306bd7..0ea1ba50297 100644 --- a/packages/eslint-plugin-query/package.json +++ b/packages/eslint-plugin-query/package.json @@ -40,8 +40,8 @@ "exports": { ".": { "import": { + "@tanstack/custom-condition": "./src/index.ts", "types": "./dist/esm/index.d.ts", - "tanstack-internal": "./src/index.ts", "default": "./dist/esm/index.js" }, "require": { diff --git a/packages/eslint-plugin-query/vite.config.ts b/packages/eslint-plugin-query/vite.config.ts index f13c7ec63d3..bc32fed3ff7 100644 --- a/packages/eslint-plugin-query/vite.config.ts +++ b/packages/eslint-plugin-query/vite.config.ts @@ -7,7 +7,7 @@ import packageJson from './package.json' const config = defineConfig({ resolve: { alias: dynamicAliases, - conditions: ['tanstack-internal'], + conditions: ['@tanstack/custom-condition'], }, test: { name: packageJson.name, diff --git a/packages/query-async-storage-persister/package.json b/packages/query-async-storage-persister/package.json index 66b3ad25ba3..643a405db21 100644 --- a/packages/query-async-storage-persister/package.json +++ b/packages/query-async-storage-persister/package.json @@ -41,8 +41,8 @@ "exports": { ".": { "import": { + "@tanstack/custom-condition": "./src/index.ts", "types": "./build/modern/index.d.ts", - "tanstack-internal": "./src/index.ts", "default": "./build/modern/index.js" }, "require": { diff --git a/packages/query-async-storage-persister/vite.config.ts b/packages/query-async-storage-persister/vite.config.ts index 6f50d26e6ae..c07556e0f0e 100644 --- a/packages/query-async-storage-persister/vite.config.ts +++ b/packages/query-async-storage-persister/vite.config.ts @@ -6,7 +6,7 @@ import packageJson from './package.json' export default defineConfig({ resolve: { alias: dynamicAliases, - conditions: ['tanstack-internal'], + conditions: ['@tanstack/custom-condition'], }, test: { name: packageJson.name, diff --git a/packages/query-broadcast-client-experimental/package.json b/packages/query-broadcast-client-experimental/package.json index 411550a6708..711208b8e31 100644 --- a/packages/query-broadcast-client-experimental/package.json +++ b/packages/query-broadcast-client-experimental/package.json @@ -38,8 +38,8 @@ "exports": { ".": { "import": { + "@tanstack/custom-condition": "./src/index.ts", "types": "./build/modern/index.d.ts", - "tanstack-internal": "./src/index.ts", "default": "./build/modern/index.js" }, "require": { diff --git a/packages/query-codemods/vite.config.ts b/packages/query-codemods/vite.config.ts index 077fc28e1f3..84412c470ad 100644 --- a/packages/query-codemods/vite.config.ts +++ b/packages/query-codemods/vite.config.ts @@ -6,7 +6,7 @@ import packageJson from './package.json' export default defineConfig({ resolve: { alias: dynamicAliases, - conditions: ['tanstack-internal'], + conditions: ['@tanstack/custom-condition'], }, test: { name: packageJson.name, diff --git a/packages/query-core/package.json b/packages/query-core/package.json index 81658a74a2f..83aac452a7d 100644 --- a/packages/query-core/package.json +++ b/packages/query-core/package.json @@ -41,8 +41,8 @@ "exports": { ".": { "import": { + "@tanstack/custom-condition": "./src/index.ts", "types": "./build/modern/index.d.ts", - "tanstack-internal": "./src/index.ts", "default": "./build/modern/index.js" }, "require": { diff --git a/packages/query-core/vite.config.ts b/packages/query-core/vite.config.ts index 0ed88e7df91..f0b0e42cb3d 100644 --- a/packages/query-core/vite.config.ts +++ b/packages/query-core/vite.config.ts @@ -6,7 +6,7 @@ import packageJson from './package.json' export default defineConfig({ resolve: { alias: dynamicAliases, - conditions: ['tanstack-internal'], + conditions: ['@tanstack/custom-condition'], }, test: { name: packageJson.name, diff --git a/packages/query-devtools/package.json b/packages/query-devtools/package.json index 1134e9c59dc..c85f84a8208 100644 --- a/packages/query-devtools/package.json +++ b/packages/query-devtools/package.json @@ -41,21 +41,21 @@ "browser": {}, "exports": { "solid": { + "@tanstack/custom-condition": "./src/index.ts", "development": "./build/index.js", - "tanstack-internal": "./src/index.ts", "import": "./build/index.js" }, "development": { "import": { + "@tanstack/custom-condition": "./src/index.ts", "types": "./build/index.d.ts", - "tanstack-internal": "./src/index.ts", "default": "./build/dev.js" }, "require": "./build/dev.cjs" }, "import": { + "@tanstack/custom-condition": "./src/index.ts", "types": "./build/index.d.ts", - "tanstack-internal": "./src/index.ts", "default": "./build/index.js" }, "require": "./build/index.cjs" diff --git a/packages/query-devtools/vite.config.ts b/packages/query-devtools/vite.config.ts index 24dd9811a6e..381f6931a54 100644 --- a/packages/query-devtools/vite.config.ts +++ b/packages/query-devtools/vite.config.ts @@ -8,7 +8,7 @@ export default defineConfig({ plugins: [solid()], resolve: { alias: dynamicAliases, - conditions: ['tanstack-internal'], + conditions: ['@tanstack/custom-condition'], }, test: { name: packageJson.name, diff --git a/packages/query-persist-client-core/package.json b/packages/query-persist-client-core/package.json index 31a6ead456c..d137190cdc3 100644 --- a/packages/query-persist-client-core/package.json +++ b/packages/query-persist-client-core/package.json @@ -41,8 +41,8 @@ "exports": { ".": { "import": { + "@tanstack/custom-condition": "./src/index.ts", "types": "./build/modern/index.d.ts", - "tanstack-internal": "./src/index.ts", "default": "./build/modern/index.js" }, "require": { diff --git a/packages/query-persist-client-core/vite.config.ts b/packages/query-persist-client-core/vite.config.ts index 6f50d26e6ae..c07556e0f0e 100644 --- a/packages/query-persist-client-core/vite.config.ts +++ b/packages/query-persist-client-core/vite.config.ts @@ -6,7 +6,7 @@ import packageJson from './package.json' export default defineConfig({ resolve: { alias: dynamicAliases, - conditions: ['tanstack-internal'], + conditions: ['@tanstack/custom-condition'], }, test: { name: packageJson.name, diff --git a/packages/query-sync-storage-persister/package.json b/packages/query-sync-storage-persister/package.json index 930de0bce67..be898229983 100644 --- a/packages/query-sync-storage-persister/package.json +++ b/packages/query-sync-storage-persister/package.json @@ -41,8 +41,8 @@ "exports": { ".": { "import": { + "@tanstack/custom-condition": "./src/index.ts", "types": "./build/modern/index.d.ts", - "tanstack-internal": "./src/index.ts", "default": "./build/modern/index.js" }, "require": { diff --git a/packages/query-sync-storage-persister/vite.config.ts b/packages/query-sync-storage-persister/vite.config.ts index 6f50d26e6ae..c07556e0f0e 100644 --- a/packages/query-sync-storage-persister/vite.config.ts +++ b/packages/query-sync-storage-persister/vite.config.ts @@ -6,7 +6,7 @@ import packageJson from './package.json' export default defineConfig({ resolve: { alias: dynamicAliases, - conditions: ['tanstack-internal'], + conditions: ['@tanstack/custom-condition'], }, test: { name: packageJson.name, diff --git a/packages/react-query-devtools/package.json b/packages/react-query-devtools/package.json index 6c1ac7b2ac6..6551c143c84 100644 --- a/packages/react-query-devtools/package.json +++ b/packages/react-query-devtools/package.json @@ -41,8 +41,8 @@ "exports": { ".": { "import": { + "@tanstack/custom-condition": "./src/index.ts", "types": "./build/modern/index.d.ts", - "tanstack-internal": "./src/index.ts", "default": "./build/modern/index.js" }, "require": { @@ -52,8 +52,8 @@ }, "./production": { "import": { + "@tanstack/custom-condition": "./src/production.ts", "types": "./build/modern/production.d.ts", - "tanstack-internal": "./src/production.ts", "default": "./build/modern/production.js" }, "require": { @@ -63,8 +63,8 @@ }, "./build/modern/production.js": { "import": { + "@tanstack/custom-condition": "./src/production.ts", "types": "./build/modern/production.d.ts", - "tanstack-internal": "./src/production.ts", "default": "./build/modern/production.js" }, "require": { diff --git a/packages/react-query-devtools/vite.config.ts b/packages/react-query-devtools/vite.config.ts index 8dff05ef84a..dd879ca85c0 100644 --- a/packages/react-query-devtools/vite.config.ts +++ b/packages/react-query-devtools/vite.config.ts @@ -8,7 +8,7 @@ export default defineConfig({ plugins: [react()], resolve: { alias: dynamicAliases, - conditions: ['tanstack-internal'], + conditions: ['@tanstack/custom-condition'], }, test: { name: packageJson.name, diff --git a/packages/react-query-next-experimental/package.json b/packages/react-query-next-experimental/package.json index b7608dd4896..2eae0a11a69 100644 --- a/packages/react-query-next-experimental/package.json +++ b/packages/react-query-next-experimental/package.json @@ -38,8 +38,8 @@ "exports": { ".": { "import": { + "@tanstack/custom-condition": "./src/index.ts", "types": "./build/modern/index.d.ts", - "tanstack-internal": "./src/index.ts", "default": "./build/modern/index.js" }, "require": { diff --git a/packages/react-query-next-experimental/vite.config.ts b/packages/react-query-next-experimental/vite.config.ts index 27a0c40abf5..9683c5f01d1 100644 --- a/packages/react-query-next-experimental/vite.config.ts +++ b/packages/react-query-next-experimental/vite.config.ts @@ -7,6 +7,6 @@ export default defineConfig({ plugins: [react()], resolve: { alias: dynamicAliases, - conditions: ['tanstack-internal'], + conditions: ['@tanstack/custom-condition'], }, }) diff --git a/packages/react-query-persist-client/package.json b/packages/react-query-persist-client/package.json index c6206e87421..6461111b035 100644 --- a/packages/react-query-persist-client/package.json +++ b/packages/react-query-persist-client/package.json @@ -41,8 +41,8 @@ "exports": { ".": { "import": { + "@tanstack/custom-condition": "./src/index.ts", "types": "./build/modern/index.d.ts", - "tanstack-internal": "./src/index.ts", "default": "./build/modern/index.js" }, "require": { diff --git a/packages/react-query-persist-client/vite.config.ts b/packages/react-query-persist-client/vite.config.ts index 8dff05ef84a..dd879ca85c0 100644 --- a/packages/react-query-persist-client/vite.config.ts +++ b/packages/react-query-persist-client/vite.config.ts @@ -8,7 +8,7 @@ export default defineConfig({ plugins: [react()], resolve: { alias: dynamicAliases, - conditions: ['tanstack-internal'], + conditions: ['@tanstack/custom-condition'], }, test: { name: packageJson.name, diff --git a/packages/react-query/package.json b/packages/react-query/package.json index 3e4c3e89abe..199d83d1e89 100644 --- a/packages/react-query/package.json +++ b/packages/react-query/package.json @@ -43,8 +43,8 @@ "exports": { ".": { "import": { + "@tanstack/custom-condition": "./src/index.ts", "types": "./build/modern/index.d.ts", - "tanstack-internal": "./src/index.ts", "default": "./build/modern/index.js" }, "require": { diff --git a/packages/react-query/vite.config.ts b/packages/react-query/vite.config.ts index 7b457b1a129..52510bdcd68 100644 --- a/packages/react-query/vite.config.ts +++ b/packages/react-query/vite.config.ts @@ -8,7 +8,7 @@ export default defineConfig({ plugins: [react()], resolve: { alias: dynamicAliases, - conditions: ['tanstack-internal'], + conditions: ['@tanstack/custom-condition'], }, test: { name: packageJson.name, diff --git a/packages/solid-query-devtools/package.json b/packages/solid-query-devtools/package.json index 95fef1433b1..bd680e129bd 100644 --- a/packages/solid-query-devtools/package.json +++ b/packages/solid-query-devtools/package.json @@ -38,21 +38,21 @@ "browser": {}, "exports": { "solid": { + "@tanstack/custom-condition": "./src/index.tsx", "development": "./build/dev.jsx", - "tanstack-internal": "./src/index.tsx", "import": "./build/index.jsx" }, "development": { "import": { + "@tanstack/custom-condition": "./src/index.tsx", "types": "./build/index.d.ts", - "tanstack-internal": "./src/index.tsx", "default": "./build/dev.js" }, "require": "./build/dev.cjs" }, "import": { + "@tanstack/custom-condition": "./src/index.tsx", "types": "./build/index.d.ts", - "tanstack-internal": "./src/index.tsx", "default": "./build/index.js" }, "require": "./build/index.cjs" diff --git a/packages/solid-query-devtools/vite.config.ts b/packages/solid-query-devtools/vite.config.ts index 3b77d94c085..f44423d336d 100644 --- a/packages/solid-query-devtools/vite.config.ts +++ b/packages/solid-query-devtools/vite.config.ts @@ -7,6 +7,6 @@ export default defineConfig({ plugins: [solid()], resolve: { alias: dynamicAliases, - conditions: ['tanstack-internal'], + conditions: ['@tanstack/custom-condition'], }, }) diff --git a/packages/solid-query-persist-client/package.json b/packages/solid-query-persist-client/package.json index b932d66b819..2cf251ca644 100644 --- a/packages/solid-query-persist-client/package.json +++ b/packages/solid-query-persist-client/package.json @@ -39,8 +39,8 @@ "exports": { "development": { "import": { + "@tanstack/custom-condition": "./src/index.ts", "types": "./build/index.d.ts", - "tanstack-internal": "./src/index.ts", "default": "./build/dev.js" }, "require": { @@ -49,8 +49,8 @@ } }, "import": { + "@tanstack/custom-condition": "./src/index.ts", "types": "./build/index.d.ts", - "tanstack-internal": "./src/index.ts", "default": "./build/index.js" }, "require": { diff --git a/packages/solid-query-persist-client/vite.config.ts b/packages/solid-query-persist-client/vite.config.ts index afab5c9a642..7bfb46dd8a2 100644 --- a/packages/solid-query-persist-client/vite.config.ts +++ b/packages/solid-query-persist-client/vite.config.ts @@ -8,7 +8,7 @@ export default defineConfig({ plugins: [solid()], resolve: { alias: dynamicAliases, - conditions: ['tanstack-internal'], + conditions: ['@tanstack/custom-condition'], }, test: { name: packageJson.name, diff --git a/packages/solid-query/package.json b/packages/solid-query/package.json index fbbdcea7575..2f26ad36ea7 100644 --- a/packages/solid-query/package.json +++ b/packages/solid-query/package.json @@ -42,8 +42,8 @@ "exports": { "development": { "import": { + "@tanstack/custom-condition": "./src/index.ts", "types": "./build/index.d.ts", - "tanstack-internal": "./src/index.ts", "default": "./build/dev.js" }, "require": { @@ -52,8 +52,8 @@ } }, "import": { + "@tanstack/custom-condition": "./src/index.ts", "types": "./build/index.d.ts", - "tanstack-internal": "./src/index.ts", "default": "./build/index.js" }, "require": { diff --git a/packages/solid-query/vite.config.ts b/packages/solid-query/vite.config.ts index afab5c9a642..7bfb46dd8a2 100644 --- a/packages/solid-query/vite.config.ts +++ b/packages/solid-query/vite.config.ts @@ -8,7 +8,7 @@ export default defineConfig({ plugins: [solid()], resolve: { alias: dynamicAliases, - conditions: ['tanstack-internal'], + conditions: ['@tanstack/custom-condition'], }, test: { name: packageJson.name, diff --git a/packages/svelte-query-devtools/package.json b/packages/svelte-query-devtools/package.json index c9d0743fa1c..c8f7306d70b 100644 --- a/packages/svelte-query-devtools/package.json +++ b/packages/svelte-query-devtools/package.json @@ -28,9 +28,9 @@ "svelte": "./dist/index.js", "exports": { ".": { + "@tanstack/custom-condition": "./src/index.ts", "types": "./dist/index.d.ts", "svelte": "./dist/index.js", - "tanstack-internal": "./src/index.ts", "import": "./dist/index.js" }, "./package.json": "./package.json" diff --git a/packages/svelte-query-devtools/vite.config.ts b/packages/svelte-query-devtools/vite.config.ts index d64d35a8f39..3def8de64f4 100644 --- a/packages/svelte-query-devtools/vite.config.ts +++ b/packages/svelte-query-devtools/vite.config.ts @@ -7,6 +7,6 @@ export default defineConfig({ plugins: [svelte()], resolve: { alias: dynamicAliases, - conditions: ['tanstack-internal'], + conditions: ['@tanstack/custom-condition'], }, }) diff --git a/packages/svelte-query-persist-client/package.json b/packages/svelte-query-persist-client/package.json index 9584d625202..efc9b0b6ea8 100644 --- a/packages/svelte-query-persist-client/package.json +++ b/packages/svelte-query-persist-client/package.json @@ -30,9 +30,9 @@ "svelte": "./dist/index.js", "exports": { ".": { + "@tanstack/custom-condition": "./src/index.ts", "types": "./dist/index.d.ts", "svelte": "./dist/index.js", - "tanstack-internal": "./src/index.ts", "import": "./dist/index.js" }, "./package.json": "./package.json" diff --git a/packages/svelte-query-persist-client/vite.config.ts b/packages/svelte-query-persist-client/vite.config.ts index 10b20662dd2..e0326d24c66 100644 --- a/packages/svelte-query-persist-client/vite.config.ts +++ b/packages/svelte-query-persist-client/vite.config.ts @@ -9,7 +9,7 @@ export default defineConfig({ plugins: [svelte(), svelteTesting()], resolve: { alias: dynamicAliases, - conditions: ['tanstack-internal'], + conditions: ['@tanstack/custom-condition'], }, test: { name: packageJson.name, diff --git a/packages/svelte-query/package.json b/packages/svelte-query/package.json index 7313ab91f5a..0d037050a0d 100644 --- a/packages/svelte-query/package.json +++ b/packages/svelte-query/package.json @@ -30,9 +30,9 @@ "svelte": "./dist/index.js", "exports": { ".": { + "@tanstack/custom-condition": "./src/index.ts", "types": "./dist/index.d.ts", "svelte": "./dist/index.js", - "tanstack-internal": "./src/index.ts", "import": "./dist/index.js" }, "./package.json": "./package.json" diff --git a/packages/svelte-query/vite.config.ts b/packages/svelte-query/vite.config.ts index 10b20662dd2..e0326d24c66 100644 --- a/packages/svelte-query/vite.config.ts +++ b/packages/svelte-query/vite.config.ts @@ -9,7 +9,7 @@ export default defineConfig({ plugins: [svelte(), svelteTesting()], resolve: { alias: dynamicAliases, - conditions: ['tanstack-internal'], + conditions: ['@tanstack/custom-condition'], }, test: { name: packageJson.name, diff --git a/packages/vue-query-devtools/package.json b/packages/vue-query-devtools/package.json index 9fe051e6b0c..bd3a19e5e0d 100644 --- a/packages/vue-query-devtools/package.json +++ b/packages/vue-query-devtools/package.json @@ -28,18 +28,18 @@ "main": "dist/esm/index.js", "exports": { ".": { + "@tanstack/custom-condition": "./src/index.ts", "types": "./dist/esm/index.d.ts", - "tanstack-internal": "./src/index.ts", "default": "./dist/esm/index.js" }, "./production": { + "@tanstack/custom-condition": "./src/production.ts", "types": "./dist/esm/production.d.ts", - "tanstack-internal": "./src/production.ts", "default": "./dist/esm/production.js" }, "./dist/production.js": { + "@tanstack/custom-condition": "./src/production.ts", "types": "./dist/esm/production.d.ts", - "tanstack-internal": "./src/production.ts", "default": "./dist/esm/production.js" }, "./package.json": "./package.json" diff --git a/packages/vue-query-devtools/vite.config.ts b/packages/vue-query-devtools/vite.config.ts index e8da69b0424..16f56cba438 100644 --- a/packages/vue-query-devtools/vite.config.ts +++ b/packages/vue-query-devtools/vite.config.ts @@ -8,7 +8,7 @@ const config = defineConfig({ plugins: [vue()], resolve: { alias: dynamicAliases, - conditions: ['tanstack-internal'], + conditions: ['@tanstack/custom-condition'], }, }) diff --git a/packages/vue-query/package.json b/packages/vue-query/package.json index 098ec2fac35..9fa193d7aee 100644 --- a/packages/vue-query/package.json +++ b/packages/vue-query/package.json @@ -43,8 +43,8 @@ "exports": { ".": { "import": { + "@tanstack/custom-condition": "./src/index.ts", "types": "./build/modern/index.d.ts", - "tanstack-internal": "./src/index.ts", "default": "./build/modern/index.js" }, "require": { diff --git a/packages/vue-query/vite.config.ts b/packages/vue-query/vite.config.ts index 8b55e3e7349..e428c9ead4c 100644 --- a/packages/vue-query/vite.config.ts +++ b/packages/vue-query/vite.config.ts @@ -8,7 +8,7 @@ export default defineConfig({ plugins: [vue()], resolve: { alias: dynamicAliases, - conditions: ['tanstack-internal'], + conditions: ['@tanstack/custom-condition'], }, test: { name: packageJson.name, diff --git a/tsconfig.json b/tsconfig.json index a07c52efb18..4a784907bea 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -7,7 +7,7 @@ "allowUnusedLabels": false, "checkJs": true, "composite": true, - "customConditions": ["tanstack-internal"], + "customConditions": ["@tanstack/custom-condition"], "declaration": true, "declarationMap": true, "emitDeclarationOnly": true, From 12c35e2fe490ab03317dcdeb0df24a8ae54e7a7c Mon Sep 17 00:00:00 2001 From: Tyler <26290074+tylersayshi@users.noreply.github.com> Date: Wed, 2 Apr 2025 19:49:25 -0700 Subject: [PATCH 5/9] upgrade publint to get customCondition support added here: https://github.com/publint/publint/commit/b34ea9433fb7457ac7f5f8ade972e1589ca9c89e --- package.json | 2 +- pnpm-lock.yaml | 68 +++++++++++--------------------------------------- 2 files changed, 15 insertions(+), 55 deletions(-) diff --git a/package.json b/package.json index 3f1fc8bd298..44c3cb9d00e 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,7 @@ "premove": "^4.0.0", "prettier": "^3.4.2", "prettier-plugin-svelte": "^3.3.2", - "publint": "^0.2.12", + "publint": "^0.3.10", "react": "^19.0.0", "react-dom": "^19.0.0", "sherif": "^1.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 02da8f4a40f..dd8fb9a0de7 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -99,8 +99,8 @@ importers: specifier: ^3.3.2 version: 3.3.2(prettier@3.4.2)(svelte@5.25.6) publint: - specifier: ^0.2.12 - version: 0.2.12 + specifier: ^0.3.10 + version: 0.3.10 react: specifier: ^19.0.0 version: 19.0.0 @@ -5709,6 +5709,10 @@ packages: resolution: {integrity: sha512-aQypoot0HPSJa6gDPEPTntc1GT6QINrSbgRlRhadGW2WaYqUK3tK4Bw9SBMZXhmxd3GeAlZjVcODHgiu+THY7A==} engines: {node: '>=18'} + '@publint/pack@0.1.2': + resolution: {integrity: sha512-S+9ANAvUmjutrshV4jZjaiG8XQyuJIZ8a4utWmN/vW1sgQ9IfBnPndwkmQYw53QmouOIytT874u65HEmu6H5jw==} + engines: {node: '>=18'} + '@react-native-community/cli-debugger-ui@13.6.9': resolution: {integrity: sha512-TkN7IdFmGPPvTpAo3nCAH9uwGCPxWBEAwpqEZDrq0NWllI7Tdie8vDpGdrcuCcKalmhq6OYnkXzeBah7O1Ztpw==} @@ -9776,11 +9780,6 @@ packages: resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==} deprecated: Glob versions prior to v9 are no longer supported - glob@8.1.0: - resolution: {integrity: sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==} - engines: {node: '>=12'} - deprecated: Glob versions prior to v9 are no longer supported - global-directory@4.0.1: resolution: {integrity: sha512-wHTUcDUoZ1H5/0iVqEudYW4/kAlN5cZ3j/bXn0Dpbizl9iaUVeWSHqiOjsgk6OW2bkLclbBjzewBz6weQ1zA2Q==} engines: {node: '>=18'} @@ -10160,10 +10159,6 @@ packages: iferr@0.1.5: resolution: {integrity: sha512-DUNFN5j7Tln0D+TxzloUjKB+CtVu6myn0JEFak6dG18mNt9YkQ6lzGCdafwofISZ1lLF3xRHJ98VKy9ynkcFaA==} - ignore-walk@5.0.1: - resolution: {integrity: sha512-yemi4pMf51WKT7khInJqAvsIGzoqYXblnsz0ql8tM+yi1EKYTY1evX4NAbJrLL/Aanr2HyZeluqU+Oi7MGHokw==} - engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0} - ignore-walk@7.0.0: resolution: {integrity: sha512-T4gbf83A4NH95zvhVYZc+qWocBBGlpzUXLPGurJggw/WIOwicfXJChLDP/iBZnN5WqROSu5Bm3hhle4z8a8YGQ==} engines: {node: ^18.17.0 || >=20.5.0} @@ -11946,10 +11941,6 @@ packages: resolution: {integrity: sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==} engines: {node: '>=0.10.0'} - npm-bundled@2.0.1: - resolution: {integrity: sha512-gZLxXdjEzE/+mOstGDqR6b0EkhJ+kM6fxM6vUuckuctuVPh80Q6pw/rSZj9s4Gex9GxWtIicO1pc8DB9KZWudw==} - engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0} - npm-bundled@4.0.0: resolution: {integrity: sha512-IxaQZDMsqfQ2Lz37VvyyEtKLe8FsRZuysmedy/N06TU1RyVppYKXrO4xIhR0F+7ubIBox6Q7nir6fQI3ej39iA==} engines: {node: ^18.17.0 || >=20.5.0} @@ -11958,10 +11949,6 @@ packages: resolution: {integrity: sha512-u6DCwbow5ynAX5BdiHQ9qvexme4U3qHW3MWe5NqH+NeBm0LbiH6zvGjNNew1fY+AZZUtVHbOPF3j7mJxbUzpXg==} engines: {node: ^18.17.0 || >=20.5.0} - npm-normalize-package-bin@2.0.0: - resolution: {integrity: sha512-awzfKUO7v0FscrSpRoogyNm0sajikhBWpU0QMrW09AMi9n1PoKU6WaIqUzuJSQnpciZZmJ/jMZ2Egfmb/9LiWQ==} - engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0} - npm-normalize-package-bin@4.0.0: resolution: {integrity: sha512-TZKxPvItzai9kN9H/TkmCtx/ZN/hvr3vUycjlfmH0ootY9yFBzNOpiXAdIn1Iteqsvk4lQn6B5PTrt+n6h8k/w==} engines: {node: ^18.17.0 || >=20.5.0} @@ -11977,11 +11964,6 @@ packages: npm-package-arg@7.0.0: resolution: {integrity: sha512-xXxr8y5U0kl8dVkz2oK7yZjPBvqM2fwaO5l3Yg13p03v8+E3qQcD0JNhHzjL1vyGgxcKkD0cco+NLR72iuPk3g==} - npm-packlist@5.1.3: - resolution: {integrity: sha512-263/0NGrn32YFYi4J533qzrQ/krmmrWwhKkzwTuM4f/07ug51odoaNjUexxO4vxlzURHcmYMH1QjvHjsNDKLVg==} - engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0} - hasBin: true - npm-packlist@9.0.0: resolution: {integrity: sha512-8qSayfmHJQTx3nJWYbbUmflpyarbLMBc6LCAjYsiGtXxDB68HaZpb8re6zeaLGxZzDuMdhsg70jryJe+RrItVQ==} engines: {node: ^18.17.0 || >=20.5.0} @@ -12802,9 +12784,9 @@ packages: public-encrypt@4.0.3: resolution: {integrity: sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==} - publint@0.2.12: - resolution: {integrity: sha512-YNeUtCVeM4j9nDiTT2OPczmlyzOkIXNtdDZnSuajAxS/nZ6j3t7Vs9SUB4euQNddiltIwu7Tdd3s+hr08fAsMw==} - engines: {node: '>=16'} + publint@0.3.10: + resolution: {integrity: sha512-xl9X9x0iyOURsAD7IPQJAQ5TgGpozs5K8KUtqzQBSxJqtKH74ReeCpjr2jw9MFOsY9q/EbXSJNkSFM2mgyu38g==} + engines: {node: '>=18'} hasBin: true pump@2.0.1: @@ -19320,6 +19302,8 @@ snapshots: '@poppinss/exception@1.2.1': {} + '@publint/pack@0.1.2': {} + '@react-native-community/cli-debugger-ui@13.6.9': dependencies: serve-static: 1.16.2 @@ -24512,14 +24496,6 @@ snapshots: once: 1.4.0 path-is-absolute: 1.0.1 - glob@8.1.0: - dependencies: - fs.realpath: 1.0.0 - inflight: 1.0.6 - inherits: 2.0.4 - minimatch: 5.1.6 - once: 1.4.0 - global-directory@4.0.1: dependencies: ini: 4.1.1 @@ -25022,10 +24998,6 @@ snapshots: iferr@0.1.5: {} - ignore-walk@5.0.1: - dependencies: - minimatch: 5.1.6 - ignore-walk@7.0.0: dependencies: minimatch: 9.0.5 @@ -27391,10 +27363,6 @@ snapshots: normalize-range@0.1.2: {} - npm-bundled@2.0.1: - dependencies: - npm-normalize-package-bin: 2.0.0 - npm-bundled@4.0.0: dependencies: npm-normalize-package-bin: 4.0.0 @@ -27403,8 +27371,6 @@ snapshots: dependencies: semver: 7.7.1 - npm-normalize-package-bin@2.0.0: {} - npm-normalize-package-bin@4.0.0: {} npm-package-arg@11.0.3: @@ -27428,13 +27394,6 @@ snapshots: semver: 5.7.2 validate-npm-package-name: 3.0.0 - npm-packlist@5.1.3: - dependencies: - glob: 8.1.0 - ignore-walk: 5.0.1 - npm-bundled: 2.0.1 - npm-normalize-package-bin: 2.0.0 - npm-packlist@9.0.0: dependencies: ignore-walk: 7.0.0 @@ -28299,9 +28258,10 @@ snapshots: randombytes: 2.1.0 safe-buffer: 5.2.1 - publint@0.2.12: + publint@0.3.10: dependencies: - npm-packlist: 5.1.3 + '@publint/pack': 0.1.2 + package-manager-detector: 1.1.0 picocolors: 1.1.1 sade: 1.8.1 From f8f949635243ab6ca751431d24055421fdfee305 Mon Sep 17 00:00:00 2001 From: Tyler <26290074+tylersayshi@users.noreply.github.com> Date: Thu, 3 Apr 2025 12:41:26 -0700 Subject: [PATCH 6/9] remove dynamicAliases --- .../angular-query-devtools-experimental/root.vite.config.js | 1 - packages/angular-query-devtools-experimental/vite.config.ts | 2 -- packages/angular-query-experimental/root.vite.config.js | 1 - packages/angular-query-experimental/vite.config.ts | 2 -- packages/eslint-plugin-query/root.vite.config.js | 1 - packages/eslint-plugin-query/vite.config.ts | 2 -- packages/query-async-storage-persister/root.vite.config.js | 1 - packages/query-async-storage-persister/vite.config.ts | 2 -- packages/query-codemods/root.vite.config.js | 1 - packages/query-codemods/vite.config.ts | 2 -- packages/query-core/root.vite.config.js | 1 - packages/query-core/vite.config.ts | 2 -- packages/query-devtools/root.vite.config.js | 1 - packages/query-devtools/vite.config.ts | 2 -- packages/query-persist-client-core/root.vite.config.js | 1 - packages/query-persist-client-core/vite.config.ts | 2 -- packages/query-sync-storage-persister/root.vite.config.js | 1 - packages/query-sync-storage-persister/vite.config.ts | 2 -- packages/react-query-devtools/root.vite.config.js | 1 - packages/react-query-devtools/vite.config.ts | 2 -- packages/react-query-next-experimental/root.vite.config.js | 1 - packages/react-query-next-experimental/vite.config.ts | 3 --- packages/react-query-persist-client/root.vite.config.js | 1 - packages/react-query-persist-client/vite.config.ts | 2 -- packages/react-query/root.vite.config.js | 1 - packages/react-query/vite.config.ts | 2 -- packages/solid-query-devtools/root.vite.config.js | 1 - packages/solid-query-devtools/vite.config.ts | 3 --- packages/solid-query-persist-client/root.vite.config.js | 1 - packages/solid-query-persist-client/vite.config.ts | 2 -- packages/solid-query/root.vite.config.js | 1 - packages/solid-query/vite.config.ts | 2 -- packages/svelte-query-devtools/root.vite.config.js | 1 - packages/svelte-query-devtools/vite.config.ts | 3 --- packages/svelte-query-persist-client/root.vite.config.js | 1 - packages/svelte-query-persist-client/vite.config.ts | 2 -- packages/svelte-query/root.vite.config.js | 1 - packages/svelte-query/vite.config.ts | 2 -- packages/vue-query-devtools/root.vite.config.js | 1 - packages/vue-query-devtools/vite.config.ts | 3 --- packages/vue-query/root.vite.config.js | 1 - packages/vue-query/vite.config.ts | 2 -- 42 files changed, 67 deletions(-) delete mode 120000 packages/angular-query-devtools-experimental/root.vite.config.js delete mode 120000 packages/angular-query-experimental/root.vite.config.js delete mode 120000 packages/eslint-plugin-query/root.vite.config.js delete mode 120000 packages/query-async-storage-persister/root.vite.config.js delete mode 120000 packages/query-codemods/root.vite.config.js delete mode 120000 packages/query-core/root.vite.config.js delete mode 120000 packages/query-devtools/root.vite.config.js delete mode 120000 packages/query-persist-client-core/root.vite.config.js delete mode 120000 packages/query-sync-storage-persister/root.vite.config.js delete mode 120000 packages/react-query-devtools/root.vite.config.js delete mode 120000 packages/react-query-next-experimental/root.vite.config.js delete mode 120000 packages/react-query-persist-client/root.vite.config.js delete mode 120000 packages/react-query/root.vite.config.js delete mode 120000 packages/solid-query-devtools/root.vite.config.js delete mode 120000 packages/solid-query-persist-client/root.vite.config.js delete mode 120000 packages/solid-query/root.vite.config.js delete mode 120000 packages/svelte-query-devtools/root.vite.config.js delete mode 120000 packages/svelte-query-persist-client/root.vite.config.js delete mode 120000 packages/svelte-query/root.vite.config.js delete mode 120000 packages/vue-query-devtools/root.vite.config.js delete mode 120000 packages/vue-query/root.vite.config.js diff --git a/packages/angular-query-devtools-experimental/root.vite.config.js b/packages/angular-query-devtools-experimental/root.vite.config.js deleted file mode 120000 index 1faec0e8745..00000000000 --- a/packages/angular-query-devtools-experimental/root.vite.config.js +++ /dev/null @@ -1 +0,0 @@ -../../scripts/getViteAliases.js \ No newline at end of file diff --git a/packages/angular-query-devtools-experimental/vite.config.ts b/packages/angular-query-devtools-experimental/vite.config.ts index ade5453b3b4..cca65ad25ea 100644 --- a/packages/angular-query-devtools-experimental/vite.config.ts +++ b/packages/angular-query-devtools-experimental/vite.config.ts @@ -1,11 +1,9 @@ import { defineConfig } from 'vitest/config' -import { dynamicAliases } from './root.vite.config' import packageJson from './package.json' export default defineConfig({ resolve: { - alias: dynamicAliases, conditions: ['@tanstack/custom-condition'], }, test: { diff --git a/packages/angular-query-experimental/root.vite.config.js b/packages/angular-query-experimental/root.vite.config.js deleted file mode 120000 index 1faec0e8745..00000000000 --- a/packages/angular-query-experimental/root.vite.config.js +++ /dev/null @@ -1 +0,0 @@ -../../scripts/getViteAliases.js \ No newline at end of file diff --git a/packages/angular-query-experimental/vite.config.ts b/packages/angular-query-experimental/vite.config.ts index ade5453b3b4..cca65ad25ea 100644 --- a/packages/angular-query-experimental/vite.config.ts +++ b/packages/angular-query-experimental/vite.config.ts @@ -1,11 +1,9 @@ import { defineConfig } from 'vitest/config' -import { dynamicAliases } from './root.vite.config' import packageJson from './package.json' export default defineConfig({ resolve: { - alias: dynamicAliases, conditions: ['@tanstack/custom-condition'], }, test: { diff --git a/packages/eslint-plugin-query/root.vite.config.js b/packages/eslint-plugin-query/root.vite.config.js deleted file mode 120000 index 1faec0e8745..00000000000 --- a/packages/eslint-plugin-query/root.vite.config.js +++ /dev/null @@ -1 +0,0 @@ -../../scripts/getViteAliases.js \ No newline at end of file diff --git a/packages/eslint-plugin-query/vite.config.ts b/packages/eslint-plugin-query/vite.config.ts index bc32fed3ff7..ebca4f35f42 100644 --- a/packages/eslint-plugin-query/vite.config.ts +++ b/packages/eslint-plugin-query/vite.config.ts @@ -1,12 +1,10 @@ import { defineConfig, mergeConfig } from 'vitest/config' import { tanstackViteConfig } from '@tanstack/config/vite' -import { dynamicAliases } from './root.vite.config' import packageJson from './package.json' const config = defineConfig({ resolve: { - alias: dynamicAliases, conditions: ['@tanstack/custom-condition'], }, test: { diff --git a/packages/query-async-storage-persister/root.vite.config.js b/packages/query-async-storage-persister/root.vite.config.js deleted file mode 120000 index 1faec0e8745..00000000000 --- a/packages/query-async-storage-persister/root.vite.config.js +++ /dev/null @@ -1 +0,0 @@ -../../scripts/getViteAliases.js \ No newline at end of file diff --git a/packages/query-async-storage-persister/vite.config.ts b/packages/query-async-storage-persister/vite.config.ts index c07556e0f0e..c596db99e1f 100644 --- a/packages/query-async-storage-persister/vite.config.ts +++ b/packages/query-async-storage-persister/vite.config.ts @@ -1,11 +1,9 @@ import { defineConfig } from 'vitest/config' -import { dynamicAliases } from './root.vite.config' import packageJson from './package.json' export default defineConfig({ resolve: { - alias: dynamicAliases, conditions: ['@tanstack/custom-condition'], }, test: { diff --git a/packages/query-codemods/root.vite.config.js b/packages/query-codemods/root.vite.config.js deleted file mode 120000 index 1faec0e8745..00000000000 --- a/packages/query-codemods/root.vite.config.js +++ /dev/null @@ -1 +0,0 @@ -../../scripts/getViteAliases.js \ No newline at end of file diff --git a/packages/query-codemods/vite.config.ts b/packages/query-codemods/vite.config.ts index 84412c470ad..974c2f1ef38 100644 --- a/packages/query-codemods/vite.config.ts +++ b/packages/query-codemods/vite.config.ts @@ -1,11 +1,9 @@ import { defineConfig } from 'vitest/config' -import { dynamicAliases } from './root.vite.config' import packageJson from './package.json' export default defineConfig({ resolve: { - alias: dynamicAliases, conditions: ['@tanstack/custom-condition'], }, test: { diff --git a/packages/query-core/root.vite.config.js b/packages/query-core/root.vite.config.js deleted file mode 120000 index 1faec0e8745..00000000000 --- a/packages/query-core/root.vite.config.js +++ /dev/null @@ -1 +0,0 @@ -../../scripts/getViteAliases.js \ No newline at end of file diff --git a/packages/query-core/vite.config.ts b/packages/query-core/vite.config.ts index f0b0e42cb3d..2775eda5e30 100644 --- a/packages/query-core/vite.config.ts +++ b/packages/query-core/vite.config.ts @@ -1,11 +1,9 @@ import { defineConfig } from 'vitest/config' -import { dynamicAliases } from './root.vite.config' import packageJson from './package.json' export default defineConfig({ resolve: { - alias: dynamicAliases, conditions: ['@tanstack/custom-condition'], }, test: { diff --git a/packages/query-devtools/root.vite.config.js b/packages/query-devtools/root.vite.config.js deleted file mode 120000 index 1faec0e8745..00000000000 --- a/packages/query-devtools/root.vite.config.js +++ /dev/null @@ -1 +0,0 @@ -../../scripts/getViteAliases.js \ No newline at end of file diff --git a/packages/query-devtools/vite.config.ts b/packages/query-devtools/vite.config.ts index 381f6931a54..4e5c3451b72 100644 --- a/packages/query-devtools/vite.config.ts +++ b/packages/query-devtools/vite.config.ts @@ -1,13 +1,11 @@ import solid from 'vite-plugin-solid' import { defineConfig } from 'vitest/config' -import { dynamicAliases } from './root.vite.config' import packageJson from './package.json' export default defineConfig({ plugins: [solid()], resolve: { - alias: dynamicAliases, conditions: ['@tanstack/custom-condition'], }, test: { diff --git a/packages/query-persist-client-core/root.vite.config.js b/packages/query-persist-client-core/root.vite.config.js deleted file mode 120000 index 1faec0e8745..00000000000 --- a/packages/query-persist-client-core/root.vite.config.js +++ /dev/null @@ -1 +0,0 @@ -../../scripts/getViteAliases.js \ No newline at end of file diff --git a/packages/query-persist-client-core/vite.config.ts b/packages/query-persist-client-core/vite.config.ts index c07556e0f0e..c596db99e1f 100644 --- a/packages/query-persist-client-core/vite.config.ts +++ b/packages/query-persist-client-core/vite.config.ts @@ -1,11 +1,9 @@ import { defineConfig } from 'vitest/config' -import { dynamicAliases } from './root.vite.config' import packageJson from './package.json' export default defineConfig({ resolve: { - alias: dynamicAliases, conditions: ['@tanstack/custom-condition'], }, test: { diff --git a/packages/query-sync-storage-persister/root.vite.config.js b/packages/query-sync-storage-persister/root.vite.config.js deleted file mode 120000 index 1faec0e8745..00000000000 --- a/packages/query-sync-storage-persister/root.vite.config.js +++ /dev/null @@ -1 +0,0 @@ -../../scripts/getViteAliases.js \ No newline at end of file diff --git a/packages/query-sync-storage-persister/vite.config.ts b/packages/query-sync-storage-persister/vite.config.ts index c07556e0f0e..c596db99e1f 100644 --- a/packages/query-sync-storage-persister/vite.config.ts +++ b/packages/query-sync-storage-persister/vite.config.ts @@ -1,11 +1,9 @@ import { defineConfig } from 'vitest/config' -import { dynamicAliases } from './root.vite.config' import packageJson from './package.json' export default defineConfig({ resolve: { - alias: dynamicAliases, conditions: ['@tanstack/custom-condition'], }, test: { diff --git a/packages/react-query-devtools/root.vite.config.js b/packages/react-query-devtools/root.vite.config.js deleted file mode 120000 index 1faec0e8745..00000000000 --- a/packages/react-query-devtools/root.vite.config.js +++ /dev/null @@ -1 +0,0 @@ -../../scripts/getViteAliases.js \ No newline at end of file diff --git a/packages/react-query-devtools/vite.config.ts b/packages/react-query-devtools/vite.config.ts index dd879ca85c0..cfd349f205e 100644 --- a/packages/react-query-devtools/vite.config.ts +++ b/packages/react-query-devtools/vite.config.ts @@ -1,13 +1,11 @@ import { defineConfig } from 'vitest/config' import react from '@vitejs/plugin-react' -import { dynamicAliases } from './root.vite.config' import packageJson from './package.json' export default defineConfig({ plugins: [react()], resolve: { - alias: dynamicAliases, conditions: ['@tanstack/custom-condition'], }, test: { diff --git a/packages/react-query-next-experimental/root.vite.config.js b/packages/react-query-next-experimental/root.vite.config.js deleted file mode 120000 index 1faec0e8745..00000000000 --- a/packages/react-query-next-experimental/root.vite.config.js +++ /dev/null @@ -1 +0,0 @@ -../../scripts/getViteAliases.js \ No newline at end of file diff --git a/packages/react-query-next-experimental/vite.config.ts b/packages/react-query-next-experimental/vite.config.ts index 9683c5f01d1..1bb9fc39188 100644 --- a/packages/react-query-next-experimental/vite.config.ts +++ b/packages/react-query-next-experimental/vite.config.ts @@ -1,12 +1,9 @@ import { defineConfig } from 'vite' import react from '@vitejs/plugin-react' -import { dynamicAliases } from './root.vite.config' - export default defineConfig({ plugins: [react()], resolve: { - alias: dynamicAliases, conditions: ['@tanstack/custom-condition'], }, }) diff --git a/packages/react-query-persist-client/root.vite.config.js b/packages/react-query-persist-client/root.vite.config.js deleted file mode 120000 index 1faec0e8745..00000000000 --- a/packages/react-query-persist-client/root.vite.config.js +++ /dev/null @@ -1 +0,0 @@ -../../scripts/getViteAliases.js \ No newline at end of file diff --git a/packages/react-query-persist-client/vite.config.ts b/packages/react-query-persist-client/vite.config.ts index dd879ca85c0..cfd349f205e 100644 --- a/packages/react-query-persist-client/vite.config.ts +++ b/packages/react-query-persist-client/vite.config.ts @@ -1,13 +1,11 @@ import { defineConfig } from 'vitest/config' import react from '@vitejs/plugin-react' -import { dynamicAliases } from './root.vite.config' import packageJson from './package.json' export default defineConfig({ plugins: [react()], resolve: { - alias: dynamicAliases, conditions: ['@tanstack/custom-condition'], }, test: { diff --git a/packages/react-query/root.vite.config.js b/packages/react-query/root.vite.config.js deleted file mode 120000 index 1faec0e8745..00000000000 --- a/packages/react-query/root.vite.config.js +++ /dev/null @@ -1 +0,0 @@ -../../scripts/getViteAliases.js \ No newline at end of file diff --git a/packages/react-query/vite.config.ts b/packages/react-query/vite.config.ts index 52510bdcd68..fef7d34eeb8 100644 --- a/packages/react-query/vite.config.ts +++ b/packages/react-query/vite.config.ts @@ -1,13 +1,11 @@ import { defineConfig } from 'vitest/config' import react from '@vitejs/plugin-react' -import { dynamicAliases } from './root.vite.config' import packageJson from './package.json' export default defineConfig({ plugins: [react()], resolve: { - alias: dynamicAliases, conditions: ['@tanstack/custom-condition'], }, test: { diff --git a/packages/solid-query-devtools/root.vite.config.js b/packages/solid-query-devtools/root.vite.config.js deleted file mode 120000 index 1faec0e8745..00000000000 --- a/packages/solid-query-devtools/root.vite.config.js +++ /dev/null @@ -1 +0,0 @@ -../../scripts/getViteAliases.js \ No newline at end of file diff --git a/packages/solid-query-devtools/vite.config.ts b/packages/solid-query-devtools/vite.config.ts index f44423d336d..6a11e8a1ce0 100644 --- a/packages/solid-query-devtools/vite.config.ts +++ b/packages/solid-query-devtools/vite.config.ts @@ -1,12 +1,9 @@ import { defineConfig } from 'vite' import solid from 'vite-plugin-solid' -import { dynamicAliases } from './root.vite.config' - export default defineConfig({ plugins: [solid()], resolve: { - alias: dynamicAliases, conditions: ['@tanstack/custom-condition'], }, }) diff --git a/packages/solid-query-persist-client/root.vite.config.js b/packages/solid-query-persist-client/root.vite.config.js deleted file mode 120000 index 1faec0e8745..00000000000 --- a/packages/solid-query-persist-client/root.vite.config.js +++ /dev/null @@ -1 +0,0 @@ -../../scripts/getViteAliases.js \ No newline at end of file diff --git a/packages/solid-query-persist-client/vite.config.ts b/packages/solid-query-persist-client/vite.config.ts index 7bfb46dd8a2..ec478a66cf1 100644 --- a/packages/solid-query-persist-client/vite.config.ts +++ b/packages/solid-query-persist-client/vite.config.ts @@ -1,13 +1,11 @@ import { defineConfig } from 'vitest/config' import solid from 'vite-plugin-solid' -import { dynamicAliases } from './root.vite.config' import packageJson from './package.json' export default defineConfig({ plugins: [solid()], resolve: { - alias: dynamicAliases, conditions: ['@tanstack/custom-condition'], }, test: { diff --git a/packages/solid-query/root.vite.config.js b/packages/solid-query/root.vite.config.js deleted file mode 120000 index 1faec0e8745..00000000000 --- a/packages/solid-query/root.vite.config.js +++ /dev/null @@ -1 +0,0 @@ -../../scripts/getViteAliases.js \ No newline at end of file diff --git a/packages/solid-query/vite.config.ts b/packages/solid-query/vite.config.ts index 7bfb46dd8a2..ec478a66cf1 100644 --- a/packages/solid-query/vite.config.ts +++ b/packages/solid-query/vite.config.ts @@ -1,13 +1,11 @@ import { defineConfig } from 'vitest/config' import solid from 'vite-plugin-solid' -import { dynamicAliases } from './root.vite.config' import packageJson from './package.json' export default defineConfig({ plugins: [solid()], resolve: { - alias: dynamicAliases, conditions: ['@tanstack/custom-condition'], }, test: { diff --git a/packages/svelte-query-devtools/root.vite.config.js b/packages/svelte-query-devtools/root.vite.config.js deleted file mode 120000 index 1faec0e8745..00000000000 --- a/packages/svelte-query-devtools/root.vite.config.js +++ /dev/null @@ -1 +0,0 @@ -../../scripts/getViteAliases.js \ No newline at end of file diff --git a/packages/svelte-query-devtools/vite.config.ts b/packages/svelte-query-devtools/vite.config.ts index 3def8de64f4..0f59a6fcbb7 100644 --- a/packages/svelte-query-devtools/vite.config.ts +++ b/packages/svelte-query-devtools/vite.config.ts @@ -1,12 +1,9 @@ import { svelte } from '@sveltejs/vite-plugin-svelte' import { defineConfig } from 'vite' -import { dynamicAliases } from './root.vite.config' - export default defineConfig({ plugins: [svelte()], resolve: { - alias: dynamicAliases, conditions: ['@tanstack/custom-condition'], }, }) diff --git a/packages/svelte-query-persist-client/root.vite.config.js b/packages/svelte-query-persist-client/root.vite.config.js deleted file mode 120000 index 1faec0e8745..00000000000 --- a/packages/svelte-query-persist-client/root.vite.config.js +++ /dev/null @@ -1 +0,0 @@ -../../scripts/getViteAliases.js \ No newline at end of file diff --git a/packages/svelte-query-persist-client/vite.config.ts b/packages/svelte-query-persist-client/vite.config.ts index e0326d24c66..a88b0d6cde3 100644 --- a/packages/svelte-query-persist-client/vite.config.ts +++ b/packages/svelte-query-persist-client/vite.config.ts @@ -2,13 +2,11 @@ import { svelte } from '@sveltejs/vite-plugin-svelte' import { defineConfig } from 'vitest/config' import { svelteTesting } from '@testing-library/svelte/vite' -import { dynamicAliases } from './root.vite.config' import packageJson from './package.json' export default defineConfig({ plugins: [svelte(), svelteTesting()], resolve: { - alias: dynamicAliases, conditions: ['@tanstack/custom-condition'], }, test: { diff --git a/packages/svelte-query/root.vite.config.js b/packages/svelte-query/root.vite.config.js deleted file mode 120000 index 1faec0e8745..00000000000 --- a/packages/svelte-query/root.vite.config.js +++ /dev/null @@ -1 +0,0 @@ -../../scripts/getViteAliases.js \ No newline at end of file diff --git a/packages/svelte-query/vite.config.ts b/packages/svelte-query/vite.config.ts index e0326d24c66..a88b0d6cde3 100644 --- a/packages/svelte-query/vite.config.ts +++ b/packages/svelte-query/vite.config.ts @@ -2,13 +2,11 @@ import { svelte } from '@sveltejs/vite-plugin-svelte' import { defineConfig } from 'vitest/config' import { svelteTesting } from '@testing-library/svelte/vite' -import { dynamicAliases } from './root.vite.config' import packageJson from './package.json' export default defineConfig({ plugins: [svelte(), svelteTesting()], resolve: { - alias: dynamicAliases, conditions: ['@tanstack/custom-condition'], }, test: { diff --git a/packages/vue-query-devtools/root.vite.config.js b/packages/vue-query-devtools/root.vite.config.js deleted file mode 120000 index 1faec0e8745..00000000000 --- a/packages/vue-query-devtools/root.vite.config.js +++ /dev/null @@ -1 +0,0 @@ -../../scripts/getViteAliases.js \ No newline at end of file diff --git a/packages/vue-query-devtools/vite.config.ts b/packages/vue-query-devtools/vite.config.ts index 16f56cba438..a8aadb37139 100644 --- a/packages/vue-query-devtools/vite.config.ts +++ b/packages/vue-query-devtools/vite.config.ts @@ -2,12 +2,9 @@ import { defineConfig, mergeConfig } from 'vite' import vue from '@vitejs/plugin-vue' import { tanstackViteConfig } from '@tanstack/config/vite' -import { dynamicAliases } from './root.vite.config' - const config = defineConfig({ plugins: [vue()], resolve: { - alias: dynamicAliases, conditions: ['@tanstack/custom-condition'], }, }) diff --git a/packages/vue-query/root.vite.config.js b/packages/vue-query/root.vite.config.js deleted file mode 120000 index 1faec0e8745..00000000000 --- a/packages/vue-query/root.vite.config.js +++ /dev/null @@ -1 +0,0 @@ -../../scripts/getViteAliases.js \ No newline at end of file diff --git a/packages/vue-query/vite.config.ts b/packages/vue-query/vite.config.ts index e428c9ead4c..409a93094f8 100644 --- a/packages/vue-query/vite.config.ts +++ b/packages/vue-query/vite.config.ts @@ -1,13 +1,11 @@ import { defineConfig } from 'vitest/config' import vue from '@vitejs/plugin-vue' -import { dynamicAliases } from './root.vite.config' import packageJson from './package.json' export default defineConfig({ plugins: [vue()], resolve: { - alias: dynamicAliases, conditions: ['@tanstack/custom-condition'], }, test: { From e0d16c2d2c97de6ae4dc07be25bc4ea9290dc487 Mon Sep 17 00:00:00 2001 From: Tyler <26290074+tylersayshi@users.noreply.github.com> Date: Thu, 3 Apr 2025 12:47:32 -0700 Subject: [PATCH 7/9] remove getViteAliases --- scripts/getViteAliases.js | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 scripts/getViteAliases.js diff --git a/scripts/getViteAliases.js b/scripts/getViteAliases.js deleted file mode 100644 index 9b93db89a02..00000000000 --- a/scripts/getViteAliases.js +++ /dev/null @@ -1,17 +0,0 @@ -// @ts-check - -import path from 'node:path' -import ts from 'typescript' - -const tsconfig = ts.readConfigFile( - path.resolve(__dirname, '..', 'tsconfig.json'), - ts.sys.readFile, -).config - -export const dynamicAliases = Object.entries( - tsconfig.compilerOptions.paths || {}, -).reduce((aliases, [key, [value]]) => { - const aliasKey = key.replace('/*', '') - aliases[aliasKey] = path.resolve(value.replace('/*', '')) - return aliases -}, /** @type {Record} */ ({})) From b18bc946e8b3c8cb231abc9af1a3a18e93ad9302 Mon Sep 17 00:00:00 2001 From: Tyler <26290074+tylersayshi@users.noreply.github.com> Date: Thu, 3 Apr 2025 13:29:47 -0700 Subject: [PATCH 8/9] try without references? --- packages/angular-query-experimental/tsconfig.json | 3 +-- packages/query-sync-storage-persister/tsconfig.json | 6 +----- packages/react-query-persist-client/tsconfig.json | 4 ---- packages/solid-query-persist-client/tsconfig.json | 4 ---- packages/solid-query/tsconfig.json | 3 +-- packages/svelte-query-persist-client/tsconfig.json | 4 ---- packages/svelte-query/tsconfig.json | 3 +-- packages/vue-query/tsconfig.json | 3 +-- 8 files changed, 5 insertions(+), 25 deletions(-) diff --git a/packages/angular-query-experimental/tsconfig.json b/packages/angular-query-experimental/tsconfig.json index df87ab1cf7f..0162191b014 100644 --- a/packages/angular-query-experimental/tsconfig.json +++ b/packages/angular-query-experimental/tsconfig.json @@ -12,6 +12,5 @@ "target": "ES2022", "types": ["vitest/globals"] }, - "include": ["src", "*.config.js", "*.config.ts", "package.json"], - "references": [{ "path": "../query-core" }, { "path": "../query-devtools" }] + "include": ["src", "*.config.js", "*.config.ts", "package.json"] } diff --git a/packages/query-sync-storage-persister/tsconfig.json b/packages/query-sync-storage-persister/tsconfig.json index fa0bdcc53eb..de9f8a50094 100644 --- a/packages/query-sync-storage-persister/tsconfig.json +++ b/packages/query-sync-storage-persister/tsconfig.json @@ -6,9 +6,5 @@ "baseUrl": ".", "moduleResolution": "Bundler" }, - "include": ["src", "*.config.js", "*.config.ts", "package.json"], - "references": [ - { "path": "../query-core" }, - { "path": "../query-persist-client-core" } - ] + "include": ["src", "*.config.js", "*.config.ts", "package.json"] } diff --git a/packages/react-query-persist-client/tsconfig.json b/packages/react-query-persist-client/tsconfig.json index 081b65296b1..997999b07b4 100644 --- a/packages/react-query-persist-client/tsconfig.json +++ b/packages/react-query-persist-client/tsconfig.json @@ -13,9 +13,5 @@ "*.config.js", "*.config.ts", "package.json" - ], - "references": [ - { "path": "../query-persist-client-core" }, - { "path": "../react-query" } ] } diff --git a/packages/solid-query-persist-client/tsconfig.json b/packages/solid-query-persist-client/tsconfig.json index 67a80d97685..fc54452ad91 100644 --- a/packages/solid-query-persist-client/tsconfig.json +++ b/packages/solid-query-persist-client/tsconfig.json @@ -14,9 +14,5 @@ "*.config.js", "*.config.ts", "package.json" - ], - "references": [ - { "path": "../query-persist-client-core" }, - { "path": "../solid-query" } ] } diff --git a/packages/solid-query/tsconfig.json b/packages/solid-query/tsconfig.json index ff57a65d66c..fc54452ad91 100644 --- a/packages/solid-query/tsconfig.json +++ b/packages/solid-query/tsconfig.json @@ -14,6 +14,5 @@ "*.config.js", "*.config.ts", "package.json" - ], - "references": [{ "path": "../query-core" }] + ] } diff --git a/packages/svelte-query-persist-client/tsconfig.json b/packages/svelte-query-persist-client/tsconfig.json index 287b6abd708..50f884d1baf 100644 --- a/packages/svelte-query-persist-client/tsconfig.json +++ b/packages/svelte-query-persist-client/tsconfig.json @@ -16,9 +16,5 @@ "*.config.js", "*.config.ts", "package.json" - ], - "references": [ - { "path": "../query-persist-client-core" }, - { "path": "../svelte-query" } ] } diff --git a/packages/svelte-query/tsconfig.json b/packages/svelte-query/tsconfig.json index 8b4a221de09..50f884d1baf 100644 --- a/packages/svelte-query/tsconfig.json +++ b/packages/svelte-query/tsconfig.json @@ -16,6 +16,5 @@ "*.config.js", "*.config.ts", "package.json" - ], - "references": [{ "path": "../query-core" }] + ] } diff --git a/packages/vue-query/tsconfig.json b/packages/vue-query/tsconfig.json index bdb9ac5093a..b807c69334f 100644 --- a/packages/vue-query/tsconfig.json +++ b/packages/vue-query/tsconfig.json @@ -12,6 +12,5 @@ "*.config.js", "*.config.ts", "package.json" - ], - "references": [{ "path": "../query-core" }] + ] } From 599f3e6125f63fbc711df1ba55c9068f0cb4206a Mon Sep 17 00:00:00 2001 From: Tyler <26290074+tylersayshi@users.noreply.github.com> Date: Thu, 3 Apr 2025 13:47:31 -0700 Subject: [PATCH 9/9] Revert "try without references?" This reverts commit b18bc946e8b3c8cb231abc9af1a3a18e93ad9302. --- packages/angular-query-experimental/tsconfig.json | 3 ++- packages/query-sync-storage-persister/tsconfig.json | 6 +++++- packages/react-query-persist-client/tsconfig.json | 4 ++++ packages/solid-query-persist-client/tsconfig.json | 4 ++++ packages/solid-query/tsconfig.json | 3 ++- packages/svelte-query-persist-client/tsconfig.json | 4 ++++ packages/svelte-query/tsconfig.json | 3 ++- packages/vue-query/tsconfig.json | 3 ++- 8 files changed, 25 insertions(+), 5 deletions(-) diff --git a/packages/angular-query-experimental/tsconfig.json b/packages/angular-query-experimental/tsconfig.json index 0162191b014..df87ab1cf7f 100644 --- a/packages/angular-query-experimental/tsconfig.json +++ b/packages/angular-query-experimental/tsconfig.json @@ -12,5 +12,6 @@ "target": "ES2022", "types": ["vitest/globals"] }, - "include": ["src", "*.config.js", "*.config.ts", "package.json"] + "include": ["src", "*.config.js", "*.config.ts", "package.json"], + "references": [{ "path": "../query-core" }, { "path": "../query-devtools" }] } diff --git a/packages/query-sync-storage-persister/tsconfig.json b/packages/query-sync-storage-persister/tsconfig.json index de9f8a50094..fa0bdcc53eb 100644 --- a/packages/query-sync-storage-persister/tsconfig.json +++ b/packages/query-sync-storage-persister/tsconfig.json @@ -6,5 +6,9 @@ "baseUrl": ".", "moduleResolution": "Bundler" }, - "include": ["src", "*.config.js", "*.config.ts", "package.json"] + "include": ["src", "*.config.js", "*.config.ts", "package.json"], + "references": [ + { "path": "../query-core" }, + { "path": "../query-persist-client-core" } + ] } diff --git a/packages/react-query-persist-client/tsconfig.json b/packages/react-query-persist-client/tsconfig.json index 997999b07b4..081b65296b1 100644 --- a/packages/react-query-persist-client/tsconfig.json +++ b/packages/react-query-persist-client/tsconfig.json @@ -13,5 +13,9 @@ "*.config.js", "*.config.ts", "package.json" + ], + "references": [ + { "path": "../query-persist-client-core" }, + { "path": "../react-query" } ] } diff --git a/packages/solid-query-persist-client/tsconfig.json b/packages/solid-query-persist-client/tsconfig.json index fc54452ad91..67a80d97685 100644 --- a/packages/solid-query-persist-client/tsconfig.json +++ b/packages/solid-query-persist-client/tsconfig.json @@ -14,5 +14,9 @@ "*.config.js", "*.config.ts", "package.json" + ], + "references": [ + { "path": "../query-persist-client-core" }, + { "path": "../solid-query" } ] } diff --git a/packages/solid-query/tsconfig.json b/packages/solid-query/tsconfig.json index fc54452ad91..ff57a65d66c 100644 --- a/packages/solid-query/tsconfig.json +++ b/packages/solid-query/tsconfig.json @@ -14,5 +14,6 @@ "*.config.js", "*.config.ts", "package.json" - ] + ], + "references": [{ "path": "../query-core" }] } diff --git a/packages/svelte-query-persist-client/tsconfig.json b/packages/svelte-query-persist-client/tsconfig.json index 50f884d1baf..287b6abd708 100644 --- a/packages/svelte-query-persist-client/tsconfig.json +++ b/packages/svelte-query-persist-client/tsconfig.json @@ -16,5 +16,9 @@ "*.config.js", "*.config.ts", "package.json" + ], + "references": [ + { "path": "../query-persist-client-core" }, + { "path": "../svelte-query" } ] } diff --git a/packages/svelte-query/tsconfig.json b/packages/svelte-query/tsconfig.json index 50f884d1baf..8b4a221de09 100644 --- a/packages/svelte-query/tsconfig.json +++ b/packages/svelte-query/tsconfig.json @@ -16,5 +16,6 @@ "*.config.js", "*.config.ts", "package.json" - ] + ], + "references": [{ "path": "../query-core" }] } diff --git a/packages/vue-query/tsconfig.json b/packages/vue-query/tsconfig.json index b807c69334f..bdb9ac5093a 100644 --- a/packages/vue-query/tsconfig.json +++ b/packages/vue-query/tsconfig.json @@ -12,5 +12,6 @@ "*.config.js", "*.config.ts", "package.json" - ] + ], + "references": [{ "path": "../query-core" }] }