diff --git a/package.json b/package.json index 4fde18e0e86..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", @@ -73,7 +73,6 @@ "typescript56": "npm:typescript@5.6", "typescript57": "npm:typescript@5.7", "vite": "^6.2.4", - "vite-tsconfig-paths": "^5.1.4", "vitest": "^3.1.1" }, "pnpm": { diff --git a/packages/angular-query-devtools-experimental/package.json b/packages/angular-query-devtools-experimental/package.json index 165179dea53..495a7e7a48f 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/custom-condition": "./src/index.ts", "types": "./build/index.d.ts", "default": "./build/index.mjs" }, 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 e822fd87c6d..cca65ad25ea 100644 --- a/packages/angular-query-devtools-experimental/vite.config.ts +++ b/packages/angular-query-devtools-experimental/vite.config.ts @@ -1,13 +1,10 @@ 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/custom-condition'], }, test: { name: packageJson.name, diff --git a/packages/angular-query-experimental/package.json b/packages/angular-query-experimental/package.json index eba1b10b182..e38b3e0c219 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/custom-condition": "./src/index.ts", "types": "./build/index.d.ts", "default": "./build/index.mjs" }, 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 e822fd87c6d..cca65ad25ea 100644 --- a/packages/angular-query-experimental/vite.config.ts +++ b/packages/angular-query-experimental/vite.config.ts @@ -1,13 +1,10 @@ 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/custom-condition'], }, test: { name: packageJson.name, diff --git a/packages/eslint-plugin-query/package.json b/packages/eslint-plugin-query/package.json index 58f486ca6cc..0ea1ba50297 100644 --- a/packages/eslint-plugin-query/package.json +++ b/packages/eslint-plugin-query/package.json @@ -40,6 +40,7 @@ "exports": { ".": { "import": { + "@tanstack/custom-condition": "./src/index.ts", "types": "./dist/esm/index.d.ts", "default": "./dist/esm/index.js" }, 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 085e7d77aeb..ebca4f35f42 100644 --- a/packages/eslint-plugin-query/vite.config.ts +++ b/packages/eslint-plugin-query/vite.config.ts @@ -1,14 +1,11 @@ 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/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 a865fef0304..56e7ee06e14 100644 --- a/packages/query-async-storage-persister/package.json +++ b/packages/query-async-storage-persister/package.json @@ -41,6 +41,7 @@ "exports": { ".": { "import": { + "@tanstack/custom-condition": "./src/index.ts", "types": "./build/modern/index.d.ts", "default": "./build/modern/index.js" }, 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 119946da201..c596db99e1f 100644 --- a/packages/query-async-storage-persister/vite.config.ts +++ b/packages/query-async-storage-persister/vite.config.ts @@ -1,13 +1,10 @@ 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/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 25bb6f6fa99..604e0cdf3b7 100644 --- a/packages/query-broadcast-client-experimental/package.json +++ b/packages/query-broadcast-client-experimental/package.json @@ -38,6 +38,7 @@ "exports": { ".": { "import": { + "@tanstack/custom-condition": "./src/index.ts", "types": "./build/modern/index.d.ts", "default": "./build/modern/index.js" }, 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 09fc57319ca..974c2f1ef38 100644 --- a/packages/query-codemods/vite.config.ts +++ b/packages/query-codemods/vite.config.ts @@ -1,13 +1,10 @@ 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/custom-condition'], }, test: { name: packageJson.name, diff --git a/packages/query-core/package.json b/packages/query-core/package.json index 003b92f28cd..b1f2488af47 100644 --- a/packages/query-core/package.json +++ b/packages/query-core/package.json @@ -41,6 +41,7 @@ "exports": { ".": { "import": { + "@tanstack/custom-condition": "./src/index.ts", "types": "./build/modern/index.d.ts", "default": "./build/modern/index.js" }, 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 a87b97763cc..2775eda5e30 100644 --- a/packages/query-core/vite.config.ts +++ b/packages/query-core/vite.config.ts @@ -1,13 +1,10 @@ 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/custom-condition'], }, test: { name: packageJson.name, diff --git a/packages/query-devtools/package.json b/packages/query-devtools/package.json index 757a4bd10d2..c85f84a8208 100644 --- a/packages/query-devtools/package.json +++ b/packages/query-devtools/package.json @@ -41,17 +41,20 @@ "browser": {}, "exports": { "solid": { + "@tanstack/custom-condition": "./src/index.ts", "development": "./build/index.js", "import": "./build/index.js" }, "development": { "import": { + "@tanstack/custom-condition": "./src/index.ts", "types": "./build/index.d.ts", "default": "./build/dev.js" }, "require": "./build/dev.cjs" }, "import": { + "@tanstack/custom-condition": "./src/index.ts", "types": "./build/index.d.ts", "default": "./build/index.js" }, 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 d0a7ac4d42d..4e5c3451b72 100644 --- a/packages/query-devtools/vite.config.ts +++ b/packages/query-devtools/vite.config.ts @@ -1,14 +1,12 @@ 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/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 cbc33c7b0eb..02c90970a42 100644 --- a/packages/query-persist-client-core/package.json +++ b/packages/query-persist-client-core/package.json @@ -41,6 +41,7 @@ "exports": { ".": { "import": { + "@tanstack/custom-condition": "./src/index.ts", "types": "./build/modern/index.d.ts", "default": "./build/modern/index.js" }, 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 119946da201..c596db99e1f 100644 --- a/packages/query-persist-client-core/vite.config.ts +++ b/packages/query-persist-client-core/vite.config.ts @@ -1,13 +1,10 @@ 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/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 4570db4099f..02cfa9d1094 100644 --- a/packages/query-sync-storage-persister/package.json +++ b/packages/query-sync-storage-persister/package.json @@ -41,6 +41,7 @@ "exports": { ".": { "import": { + "@tanstack/custom-condition": "./src/index.ts", "types": "./build/modern/index.d.ts", "default": "./build/modern/index.js" }, 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 119946da201..c596db99e1f 100644 --- a/packages/query-sync-storage-persister/vite.config.ts +++ b/packages/query-sync-storage-persister/vite.config.ts @@ -1,13 +1,10 @@ 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/custom-condition'], }, test: { name: packageJson.name, diff --git a/packages/react-query-devtools/package.json b/packages/react-query-devtools/package.json index 10b6c4200ef..3f224e0e959 100644 --- a/packages/react-query-devtools/package.json +++ b/packages/react-query-devtools/package.json @@ -41,6 +41,7 @@ "exports": { ".": { "import": { + "@tanstack/custom-condition": "./src/index.ts", "types": "./build/modern/index.d.ts", "default": "./build/modern/index.js" }, @@ -51,6 +52,7 @@ }, "./production": { "import": { + "@tanstack/custom-condition": "./src/production.ts", "types": "./build/modern/production.d.ts", "default": "./build/modern/production.js" }, @@ -61,6 +63,7 @@ }, "./build/modern/production.js": { "import": { + "@tanstack/custom-condition": "./src/production.ts", "types": "./build/modern/production.d.ts", "default": "./build/modern/production.js" }, 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 848ae5e8824..cfd349f205e 100644 --- a/packages/react-query-devtools/vite.config.ts +++ b/packages/react-query-devtools/vite.config.ts @@ -1,14 +1,12 @@ 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/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 0993691e83b..94a00f6d7cc 100644 --- a/packages/react-query-next-experimental/package.json +++ b/packages/react-query-next-experimental/package.json @@ -38,6 +38,7 @@ "exports": { ".": { "import": { + "@tanstack/custom-condition": "./src/index.ts", "types": "./build/modern/index.d.ts", "default": "./build/modern/index.js" }, 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 4a87bc676d7..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 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/custom-condition'], }, }) diff --git a/packages/react-query-persist-client/package.json b/packages/react-query-persist-client/package.json index 8b9af68e734..e2e987a8b22 100644 --- a/packages/react-query-persist-client/package.json +++ b/packages/react-query-persist-client/package.json @@ -41,6 +41,7 @@ "exports": { ".": { "import": { + "@tanstack/custom-condition": "./src/index.ts", "types": "./build/modern/index.d.ts", "default": "./build/modern/index.js" }, 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 848ae5e8824..cfd349f205e 100644 --- a/packages/react-query-persist-client/vite.config.ts +++ b/packages/react-query-persist-client/vite.config.ts @@ -1,14 +1,12 @@ 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/custom-condition'], }, test: { name: packageJson.name, diff --git a/packages/react-query/package.json b/packages/react-query/package.json index 6f995702b41..fb8b329c775 100644 --- a/packages/react-query/package.json +++ b/packages/react-query/package.json @@ -43,6 +43,7 @@ "exports": { ".": { "import": { + "@tanstack/custom-condition": "./src/index.ts", "types": "./build/modern/index.d.ts", "default": "./build/modern/index.js" }, 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 4c4570617a1..fef7d34eeb8 100644 --- a/packages/react-query/vite.config.ts +++ b/packages/react-query/vite.config.ts @@ -1,14 +1,12 @@ 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/custom-condition'], }, test: { name: packageJson.name, diff --git a/packages/solid-query-devtools/package.json b/packages/solid-query-devtools/package.json index 584dfef95f6..fbb1d482e3c 100644 --- a/packages/solid-query-devtools/package.json +++ b/packages/solid-query-devtools/package.json @@ -38,17 +38,20 @@ "browser": {}, "exports": { "solid": { + "@tanstack/custom-condition": "./src/index.tsx", "development": "./build/dev.jsx", "import": "./build/index.jsx" }, "development": { "import": { + "@tanstack/custom-condition": "./src/index.tsx", "types": "./build/index.d.ts", "default": "./build/dev.js" }, "require": "./build/dev.cjs" }, "import": { + "@tanstack/custom-condition": "./src/index.tsx", "types": "./build/index.d.ts", "default": "./build/index.js" }, 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 99a13ed566a..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 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/custom-condition'], }, }) diff --git a/packages/solid-query-persist-client/package.json b/packages/solid-query-persist-client/package.json index 8751ee807a8..afa09eded8a 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/custom-condition": "./src/index.ts", "types": "./build/index.d.ts", "default": "./build/dev.js" }, @@ -48,6 +49,7 @@ } }, "import": { + "@tanstack/custom-condition": "./src/index.ts", "types": "./build/index.d.ts", "default": "./build/index.js" }, 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 5f86decaa7d..ec478a66cf1 100644 --- a/packages/solid-query-persist-client/vite.config.ts +++ b/packages/solid-query-persist-client/vite.config.ts @@ -1,14 +1,12 @@ 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/custom-condition'], }, test: { name: packageJson.name, diff --git a/packages/solid-query/package.json b/packages/solid-query/package.json index 745d6281e28..a3b6b63dd5f 100644 --- a/packages/solid-query/package.json +++ b/packages/solid-query/package.json @@ -42,6 +42,7 @@ "exports": { "development": { "import": { + "@tanstack/custom-condition": "./src/index.ts", "types": "./build/index.d.ts", "default": "./build/dev.js" }, @@ -51,6 +52,7 @@ } }, "import": { + "@tanstack/custom-condition": "./src/index.ts", "types": "./build/index.d.ts", "default": "./build/index.js" }, 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 5f86decaa7d..ec478a66cf1 100644 --- a/packages/solid-query/vite.config.ts +++ b/packages/solid-query/vite.config.ts @@ -1,14 +1,12 @@ 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/custom-condition'], }, test: { name: packageJson.name, diff --git a/packages/svelte-query-devtools/package.json b/packages/svelte-query-devtools/package.json index a1b572884bb..0b50cc808aa 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/custom-condition": "./src/index.ts", "types": "./dist/index.d.ts", "svelte": "./dist/index.js", "import": "./dist/index.js" 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 27b0dacb2b0..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 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/custom-condition'], }, }) diff --git a/packages/svelte-query-persist-client/package.json b/packages/svelte-query-persist-client/package.json index 1b30712ef35..ef63d8288db 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/custom-condition": "./src/index.ts", "types": "./dist/index.d.ts", "svelte": "./dist/index.js", "import": "./dist/index.js" 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 54e9cf7efe3..a88b0d6cde3 100644 --- a/packages/svelte-query-persist-client/vite.config.ts +++ b/packages/svelte-query-persist-client/vite.config.ts @@ -1,19 +1,13 @@ 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/custom-condition'], }, test: { name: packageJson.name, diff --git a/packages/svelte-query/package.json b/packages/svelte-query/package.json index 5f51944d24d..66ae8ec5876 100644 --- a/packages/svelte-query/package.json +++ b/packages/svelte-query/package.json @@ -30,6 +30,7 @@ "svelte": "./dist/index.js", "exports": { ".": { + "@tanstack/custom-condition": "./src/index.ts", "types": "./dist/index.d.ts", "svelte": "./dist/index.js", "import": "./dist/index.js" 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 54e9cf7efe3..a88b0d6cde3 100644 --- a/packages/svelte-query/vite.config.ts +++ b/packages/svelte-query/vite.config.ts @@ -1,19 +1,13 @@ 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/custom-condition'], }, test: { name: packageJson.name, diff --git a/packages/vue-query-devtools/package.json b/packages/vue-query-devtools/package.json index dd09af6a369..5e8504ff13b 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/custom-condition": "./src/index.ts", "types": "./dist/esm/index.d.ts", "default": "./dist/esm/index.js" }, "./production": { + "@tanstack/custom-condition": "./src/production.ts", "types": "./dist/esm/production.d.ts", "default": "./dist/esm/production.js" }, "./dist/production.js": { + "@tanstack/custom-condition": "./src/production.ts", "types": "./dist/esm/production.d.ts", "default": "./dist/esm/production.js" }, 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 f36254ba321..a8aadb37139 100644 --- a/packages/vue-query-devtools/vite.config.ts +++ b/packages/vue-query-devtools/vite.config.ts @@ -1,14 +1,11 @@ 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/custom-condition'], }, }) diff --git a/packages/vue-query/package.json b/packages/vue-query/package.json index f21beed745e..ff20958a73d 100644 --- a/packages/vue-query/package.json +++ b/packages/vue-query/package.json @@ -43,6 +43,7 @@ "exports": { ".": { "import": { + "@tanstack/custom-condition": "./src/index.ts", "types": "./build/modern/index.d.ts", "default": "./build/modern/index.js" }, 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 620915c6dfb..409a93094f8 100644 --- a/packages/vue-query/vite.config.ts +++ b/packages/vue-query/vite.config.ts @@ -1,14 +1,12 @@ 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/custom-condition'], }, test: { name: packageJson.name, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index cc4ede903ee..cc644862bc3 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 @@ -143,9 +143,6 @@ importers: vite: specifier: ^6.2.4 version: 6.2.4(@types/node@22.14.0)(jiti@2.4.2)(less@4.2.2)(lightningcss@1.29.2)(sass@1.86.0)(terser@5.39.0)(yaml@2.6.1) - vite-tsconfig-paths: - specifier: ^5.1.4 - version: 5.1.4(typescript@5.8.2)(vite@6.2.4(@types/node@22.14.0)(jiti@2.4.2)(less@4.2.2)(lightningcss@1.29.2)(sass@1.86.0)(terser@5.39.0)(yaml@2.6.1)) vitest: specifier: ^3.1.1 version: 3.1.1(@types/debug@4.1.12)(@types/node@22.14.0)(jiti@2.4.2)(jsdom@25.0.1)(less@4.2.2)(lightningcss@1.29.2)(msw@2.6.6(@types/node@22.14.0)(typescript@5.8.2))(sass@1.86.0)(terser@5.39.0)(yaml@2.6.1) @@ -5655,6 +5652,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==} @@ -9719,11 +9720,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'} @@ -10103,10 +10099,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} @@ -11871,10 +11863,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} @@ -11883,10 +11871,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} @@ -11902,11 +11886,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} @@ -12727,9 +12706,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: @@ -19203,6 +19182,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 @@ -24390,14 +24371,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 @@ -24900,10 +24873,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 @@ -27244,10 +27213,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 @@ -27256,8 +27221,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: @@ -27281,13 +27244,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 @@ -28152,9 +28108,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 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} */ ({})) diff --git a/tsconfig.json b/tsconfig.json index 8c4eebe8586..4a784907bea 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -7,6 +7,7 @@ "allowUnusedLabels": false, "checkJs": true, "composite": true, + "customConditions": ["@tanstack/custom-condition"], "declaration": true, "declarationMap": true, "emitDeclarationOnly": true, @@ -25,58 +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-core": ["../../packages/query-core/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"] }