From 0880a461b553faa0c8a19a5b09e29c74736edbed Mon Sep 17 00:00:00 2001 From: Tyler <26290074+tylersayshi@users.noreply.github.com> Date: Mon, 7 Apr 2025 18:22:28 -0700 Subject: [PATCH 1/3] Revert "chore(paths): use customConditions to define internal imports (#8935)" This reverts commit 8e0c6b7639732a6d846d8ec134ac34c0bd5aeb28. --- package.json | 3 +- .../package.json | 1 - .../root.vite.config.js | 1 + .../vite.config.ts | 5 +- .../angular-query-experimental/package.json | 1 - .../root.vite.config.js | 1 + .../angular-query-experimental/vite.config.ts | 5 +- packages/eslint-plugin-query/package.json | 5 +- .../eslint-plugin-query/root.vite.config.js | 1 + packages/eslint-plugin-query/vite.config.ts | 5 +- .../package.json | 1 - .../root.vite.config.js | 1 + .../vite.config.ts | 5 +- .../package.json | 1 - packages/query-codemods/root.vite.config.js | 1 + packages/query-codemods/vite.config.ts | 5 +- packages/query-core/package.json | 1 - packages/query-core/root.vite.config.js | 1 + packages/query-core/vite.config.ts | 5 +- packages/query-devtools/package.json | 3 - packages/query-devtools/root.vite.config.js | 1 + packages/query-devtools/vite.config.ts | 6 +- .../query-persist-client-core/package.json | 1 - .../root.vite.config.js | 1 + .../query-persist-client-core/vite.config.ts | 5 +- .../query-sync-storage-persister/package.json | 1 - .../root.vite.config.js | 1 + .../vite.config.ts | 5 +- packages/react-query-devtools/package.json | 3 - .../react-query-devtools/root.vite.config.js | 1 + packages/react-query-devtools/vite.config.ts | 6 +- .../package.json | 1 - .../root.vite.config.js | 1 + .../vite.config.ts | 7 +- .../react-query-persist-client/package.json | 1 - .../root.vite.config.js | 1 + .../react-query-persist-client/vite.config.ts | 6 +- packages/react-query/package.json | 1 - packages/react-query/root.vite.config.js | 1 + packages/react-query/vite.config.ts | 6 +- packages/solid-query-devtools/package.json | 3 - .../solid-query-devtools/root.vite.config.js | 1 + packages/solid-query-devtools/vite.config.ts | 7 +- .../solid-query-persist-client/package.json | 2 - .../root.vite.config.js | 1 + .../solid-query-persist-client/vite.config.ts | 6 +- packages/solid-query/package.json | 2 - packages/solid-query/root.vite.config.js | 1 + packages/solid-query/vite.config.ts | 6 +- packages/svelte-query-devtools/package.json | 1 - .../svelte-query-devtools/root.vite.config.js | 1 + packages/svelte-query-devtools/vite.config.ts | 7 +- .../svelte-query-persist-client/package.json | 1 - .../root.vite.config.js | 1 + .../vite.config.ts | 10 ++- packages/svelte-query/package.json | 1 - packages/svelte-query/root.vite.config.js | 1 + packages/svelte-query/vite.config.ts | 10 ++- packages/vue-query-devtools/package.json | 3 - .../vue-query-devtools/root.vite.config.js | 1 + packages/vue-query-devtools/vite.config.ts | 7 +- packages/vue-query/package.json | 1 - packages/vue-query/root.vite.config.js | 1 + packages/vue-query/vite.config.ts | 6 +- pnpm-lock.yaml | 75 +++++++++++++++---- scripts/getViteAliases.js | 17 +++++ tsconfig.json | 54 ++++++++++++- 67 files changed, 249 insertions(+), 86 deletions(-) create mode 120000 packages/angular-query-devtools-experimental/root.vite.config.js create mode 120000 packages/angular-query-experimental/root.vite.config.js create mode 120000 packages/eslint-plugin-query/root.vite.config.js create mode 120000 packages/query-async-storage-persister/root.vite.config.js create mode 120000 packages/query-codemods/root.vite.config.js create mode 120000 packages/query-core/root.vite.config.js create mode 120000 packages/query-devtools/root.vite.config.js create mode 120000 packages/query-persist-client-core/root.vite.config.js create mode 120000 packages/query-sync-storage-persister/root.vite.config.js create mode 120000 packages/react-query-devtools/root.vite.config.js create mode 120000 packages/react-query-next-experimental/root.vite.config.js create mode 120000 packages/react-query-persist-client/root.vite.config.js create mode 120000 packages/react-query/root.vite.config.js create mode 120000 packages/solid-query-devtools/root.vite.config.js create mode 120000 packages/solid-query-persist-client/root.vite.config.js create mode 120000 packages/solid-query/root.vite.config.js create mode 120000 packages/svelte-query-devtools/root.vite.config.js create mode 120000 packages/svelte-query-persist-client/root.vite.config.js create mode 120000 packages/svelte-query/root.vite.config.js create mode 120000 packages/vue-query-devtools/root.vite.config.js create mode 120000 packages/vue-query/root.vite.config.js create mode 100644 scripts/getViteAliases.js diff --git a/package.json b/package.json index 44c3cb9d00e..4fde18e0e86 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.3.10", + "publint": "^0.2.12", "react": "^19.0.0", "react-dom": "^19.0.0", "sherif": "^1.0.0", @@ -73,6 +73,7 @@ "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 5ce471fbd66..c62a8030bf6 100644 --- a/packages/angular-query-devtools-experimental/package.json +++ b/packages/angular-query-devtools-experimental/package.json @@ -36,7 +36,6 @@ "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 new file mode 120000 index 00000000000..1faec0e8745 --- /dev/null +++ b/packages/angular-query-devtools-experimental/root.vite.config.js @@ -0,0 +1 @@ +../../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 cca65ad25ea..e822fd87c6d 100644 --- a/packages/angular-query-devtools-experimental/vite.config.ts +++ b/packages/angular-query-devtools-experimental/vite.config.ts @@ -1,10 +1,13 @@ 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: { - conditions: ['@tanstack/custom-condition'], + alias: dynamicAliases, }, test: { name: packageJson.name, diff --git a/packages/angular-query-experimental/package.json b/packages/angular-query-experimental/package.json index bc10d35dd82..409c539e8fa 100644 --- a/packages/angular-query-experimental/package.json +++ b/packages/angular-query-experimental/package.json @@ -51,7 +51,6 @@ "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 new file mode 120000 index 00000000000..1faec0e8745 --- /dev/null +++ b/packages/angular-query-experimental/root.vite.config.js @@ -0,0 +1 @@ +../../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 cca65ad25ea..e822fd87c6d 100644 --- a/packages/angular-query-experimental/vite.config.ts +++ b/packages/angular-query-experimental/vite.config.ts @@ -1,10 +1,13 @@ 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: { - conditions: ['@tanstack/custom-condition'], + alias: dynamicAliases, }, test: { name: packageJson.name, diff --git a/packages/eslint-plugin-query/package.json b/packages/eslint-plugin-query/package.json index c2d698a4bcc..512abaa0186 100644 --- a/packages/eslint-plugin-query/package.json +++ b/packages/eslint-plugin-query/package.json @@ -40,9 +40,8 @@ "exports": { ".": { "import": { - "@tanstack/custom-condition": "./src/index.ts", - "types": "./dist/index.d.ts", - "default": "./dist/index.js" + "types": "./dist/esm/index.d.ts", + "default": "./dist/esm/index.js" }, "require": { "types": "./dist/index.d.cts", diff --git a/packages/eslint-plugin-query/root.vite.config.js b/packages/eslint-plugin-query/root.vite.config.js new file mode 120000 index 00000000000..1faec0e8745 --- /dev/null +++ b/packages/eslint-plugin-query/root.vite.config.js @@ -0,0 +1 @@ +../../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 ebca4f35f42..085e7d77aeb 100644 --- a/packages/eslint-plugin-query/vite.config.ts +++ b/packages/eslint-plugin-query/vite.config.ts @@ -1,11 +1,14 @@ 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: { - conditions: ['@tanstack/custom-condition'], + alias: dynamicAliases, }, test: { name: packageJson.name, diff --git a/packages/query-async-storage-persister/package.json b/packages/query-async-storage-persister/package.json index e5a301b311d..395a0d557fd 100644 --- a/packages/query-async-storage-persister/package.json +++ b/packages/query-async-storage-persister/package.json @@ -41,7 +41,6 @@ "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 new file mode 120000 index 00000000000..1faec0e8745 --- /dev/null +++ b/packages/query-async-storage-persister/root.vite.config.js @@ -0,0 +1 @@ +../../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 c596db99e1f..119946da201 100644 --- a/packages/query-async-storage-persister/vite.config.ts +++ b/packages/query-async-storage-persister/vite.config.ts @@ -1,10 +1,13 @@ 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: { - conditions: ['@tanstack/custom-condition'], + alias: dynamicAliases, }, test: { name: packageJson.name, diff --git a/packages/query-broadcast-client-experimental/package.json b/packages/query-broadcast-client-experimental/package.json index cde7abc6772..33df0ced810 100644 --- a/packages/query-broadcast-client-experimental/package.json +++ b/packages/query-broadcast-client-experimental/package.json @@ -38,7 +38,6 @@ "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 new file mode 120000 index 00000000000..1faec0e8745 --- /dev/null +++ b/packages/query-codemods/root.vite.config.js @@ -0,0 +1 @@ +../../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 974c2f1ef38..09fc57319ca 100644 --- a/packages/query-codemods/vite.config.ts +++ b/packages/query-codemods/vite.config.ts @@ -1,10 +1,13 @@ 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: { - conditions: ['@tanstack/custom-condition'], + alias: dynamicAliases, }, test: { name: packageJson.name, diff --git a/packages/query-core/package.json b/packages/query-core/package.json index e6f1d76b033..495d5197395 100644 --- a/packages/query-core/package.json +++ b/packages/query-core/package.json @@ -41,7 +41,6 @@ "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 new file mode 120000 index 00000000000..1faec0e8745 --- /dev/null +++ b/packages/query-core/root.vite.config.js @@ -0,0 +1 @@ +../../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 2775eda5e30..a87b97763cc 100644 --- a/packages/query-core/vite.config.ts +++ b/packages/query-core/vite.config.ts @@ -1,10 +1,13 @@ 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: { - conditions: ['@tanstack/custom-condition'], + alias: dynamicAliases, }, test: { name: packageJson.name, diff --git a/packages/query-devtools/package.json b/packages/query-devtools/package.json index 1992766a63a..95a6b3136c2 100644 --- a/packages/query-devtools/package.json +++ b/packages/query-devtools/package.json @@ -41,20 +41,17 @@ "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 new file mode 120000 index 00000000000..1faec0e8745 --- /dev/null +++ b/packages/query-devtools/root.vite.config.js @@ -0,0 +1 @@ +../../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 4e5c3451b72..d0a7ac4d42d 100644 --- a/packages/query-devtools/vite.config.ts +++ b/packages/query-devtools/vite.config.ts @@ -1,12 +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()], + plugins: [solid(), tsconfigPaths({ ignoreConfigErrors: true })], resolve: { - conditions: ['@tanstack/custom-condition'], + alias: dynamicAliases, }, test: { name: packageJson.name, diff --git a/packages/query-persist-client-core/package.json b/packages/query-persist-client-core/package.json index 3d2ca2b5250..d05817bb703 100644 --- a/packages/query-persist-client-core/package.json +++ b/packages/query-persist-client-core/package.json @@ -41,7 +41,6 @@ "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 new file mode 120000 index 00000000000..1faec0e8745 --- /dev/null +++ b/packages/query-persist-client-core/root.vite.config.js @@ -0,0 +1 @@ +../../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 c596db99e1f..119946da201 100644 --- a/packages/query-persist-client-core/vite.config.ts +++ b/packages/query-persist-client-core/vite.config.ts @@ -1,10 +1,13 @@ 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: { - conditions: ['@tanstack/custom-condition'], + alias: dynamicAliases, }, test: { name: packageJson.name, diff --git a/packages/query-sync-storage-persister/package.json b/packages/query-sync-storage-persister/package.json index b95ec6b8b22..a6491fa60e8 100644 --- a/packages/query-sync-storage-persister/package.json +++ b/packages/query-sync-storage-persister/package.json @@ -41,7 +41,6 @@ "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 new file mode 120000 index 00000000000..1faec0e8745 --- /dev/null +++ b/packages/query-sync-storage-persister/root.vite.config.js @@ -0,0 +1 @@ +../../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 c596db99e1f..119946da201 100644 --- a/packages/query-sync-storage-persister/vite.config.ts +++ b/packages/query-sync-storage-persister/vite.config.ts @@ -1,10 +1,13 @@ 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: { - conditions: ['@tanstack/custom-condition'], + alias: dynamicAliases, }, test: { name: packageJson.name, diff --git a/packages/react-query-devtools/package.json b/packages/react-query-devtools/package.json index e8030bf6fb9..f3b46949580 100644 --- a/packages/react-query-devtools/package.json +++ b/packages/react-query-devtools/package.json @@ -41,7 +41,6 @@ "exports": { ".": { "import": { - "@tanstack/custom-condition": "./src/index.ts", "types": "./build/modern/index.d.ts", "default": "./build/modern/index.js" }, @@ -52,7 +51,6 @@ }, "./production": { "import": { - "@tanstack/custom-condition": "./src/production.ts", "types": "./build/modern/production.d.ts", "default": "./build/modern/production.js" }, @@ -63,7 +61,6 @@ }, "./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 new file mode 120000 index 00000000000..1faec0e8745 --- /dev/null +++ b/packages/react-query-devtools/root.vite.config.js @@ -0,0 +1 @@ +../../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 cfd349f205e..848ae5e8824 100644 --- a/packages/react-query-devtools/vite.config.ts +++ b/packages/react-query-devtools/vite.config.ts @@ -1,12 +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()], + plugins: [react(), tsconfigPaths({ ignoreConfigErrors: true })], resolve: { - conditions: ['@tanstack/custom-condition'], + alias: dynamicAliases, }, test: { name: packageJson.name, diff --git a/packages/react-query-next-experimental/package.json b/packages/react-query-next-experimental/package.json index 035a3969e87..0d50eff914d 100644 --- a/packages/react-query-next-experimental/package.json +++ b/packages/react-query-next-experimental/package.json @@ -38,7 +38,6 @@ "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 new file mode 120000 index 00000000000..1faec0e8745 --- /dev/null +++ b/packages/react-query-next-experimental/root.vite.config.js @@ -0,0 +1 @@ +../../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 1bb9fc39188..4a87bc676d7 100644 --- a/packages/react-query-next-experimental/vite.config.ts +++ b/packages/react-query-next-experimental/vite.config.ts @@ -1,9 +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()], + plugins: [react(), tsconfigPaths({ ignoreConfigErrors: true })], resolve: { - conditions: ['@tanstack/custom-condition'], + alias: dynamicAliases, }, }) diff --git a/packages/react-query-persist-client/package.json b/packages/react-query-persist-client/package.json index a319cdb5468..82e6fd517d3 100644 --- a/packages/react-query-persist-client/package.json +++ b/packages/react-query-persist-client/package.json @@ -41,7 +41,6 @@ "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 new file mode 120000 index 00000000000..1faec0e8745 --- /dev/null +++ b/packages/react-query-persist-client/root.vite.config.js @@ -0,0 +1 @@ +../../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 cfd349f205e..848ae5e8824 100644 --- a/packages/react-query-persist-client/vite.config.ts +++ b/packages/react-query-persist-client/vite.config.ts @@ -1,12 +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()], + plugins: [react(), tsconfigPaths({ ignoreConfigErrors: true })], resolve: { - conditions: ['@tanstack/custom-condition'], + alias: dynamicAliases, }, test: { name: packageJson.name, diff --git a/packages/react-query/package.json b/packages/react-query/package.json index b9a57c80022..069f7ef553b 100644 --- a/packages/react-query/package.json +++ b/packages/react-query/package.json @@ -43,7 +43,6 @@ "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 new file mode 120000 index 00000000000..1faec0e8745 --- /dev/null +++ b/packages/react-query/root.vite.config.js @@ -0,0 +1 @@ +../../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 fef7d34eeb8..4c4570617a1 100644 --- a/packages/react-query/vite.config.ts +++ b/packages/react-query/vite.config.ts @@ -1,12 +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()], + plugins: [react(), tsconfigPaths({ ignoreConfigErrors: true })], resolve: { - conditions: ['@tanstack/custom-condition'], + alias: dynamicAliases, }, test: { name: packageJson.name, diff --git a/packages/solid-query-devtools/package.json b/packages/solid-query-devtools/package.json index 1a81af1ab8a..3b394e43155 100644 --- a/packages/solid-query-devtools/package.json +++ b/packages/solid-query-devtools/package.json @@ -38,20 +38,17 @@ "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 new file mode 120000 index 00000000000..1faec0e8745 --- /dev/null +++ b/packages/solid-query-devtools/root.vite.config.js @@ -0,0 +1 @@ +../../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 6a11e8a1ce0..99a13ed566a 100644 --- a/packages/solid-query-devtools/vite.config.ts +++ b/packages/solid-query-devtools/vite.config.ts @@ -1,9 +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()], + plugins: [solid(), tsconfigPaths({ ignoreConfigErrors: true })], resolve: { - conditions: ['@tanstack/custom-condition'], + alias: dynamicAliases, }, }) diff --git a/packages/solid-query-persist-client/package.json b/packages/solid-query-persist-client/package.json index 8b16c965648..1fdf20a9a8d 100644 --- a/packages/solid-query-persist-client/package.json +++ b/packages/solid-query-persist-client/package.json @@ -39,7 +39,6 @@ "exports": { "development": { "import": { - "@tanstack/custom-condition": "./src/index.ts", "types": "./build/index.d.ts", "default": "./build/dev.js" }, @@ -49,7 +48,6 @@ } }, "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 new file mode 120000 index 00000000000..1faec0e8745 --- /dev/null +++ b/packages/solid-query-persist-client/root.vite.config.js @@ -0,0 +1 @@ +../../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 ec478a66cf1..5f86decaa7d 100644 --- a/packages/solid-query-persist-client/vite.config.ts +++ b/packages/solid-query-persist-client/vite.config.ts @@ -1,12 +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()], + plugins: [solid(), tsconfigPaths({ ignoreConfigErrors: true })], resolve: { - conditions: ['@tanstack/custom-condition'], + alias: dynamicAliases, }, test: { name: packageJson.name, diff --git a/packages/solid-query/package.json b/packages/solid-query/package.json index cd2da1c4aea..25a4bbc3c4a 100644 --- a/packages/solid-query/package.json +++ b/packages/solid-query/package.json @@ -42,7 +42,6 @@ "exports": { "development": { "import": { - "@tanstack/custom-condition": "./src/index.ts", "types": "./build/index.d.ts", "default": "./build/dev.js" }, @@ -52,7 +51,6 @@ } }, "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 new file mode 120000 index 00000000000..1faec0e8745 --- /dev/null +++ b/packages/solid-query/root.vite.config.js @@ -0,0 +1 @@ +../../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 ec478a66cf1..5f86decaa7d 100644 --- a/packages/solid-query/vite.config.ts +++ b/packages/solid-query/vite.config.ts @@ -1,12 +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()], + plugins: [solid(), tsconfigPaths({ ignoreConfigErrors: true })], resolve: { - conditions: ['@tanstack/custom-condition'], + alias: dynamicAliases, }, test: { name: packageJson.name, diff --git a/packages/svelte-query-devtools/package.json b/packages/svelte-query-devtools/package.json index 2ef14d40784..87b95a580cb 100644 --- a/packages/svelte-query-devtools/package.json +++ b/packages/svelte-query-devtools/package.json @@ -28,7 +28,6 @@ "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 new file mode 120000 index 00000000000..1faec0e8745 --- /dev/null +++ b/packages/svelte-query-devtools/root.vite.config.js @@ -0,0 +1 @@ +../../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 0f59a6fcbb7..27b0dacb2b0 100644 --- a/packages/svelte-query-devtools/vite.config.ts +++ b/packages/svelte-query-devtools/vite.config.ts @@ -1,9 +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()], + plugins: [svelte(), tsconfigPaths({ ignoreConfigErrors: true })], resolve: { - conditions: ['@tanstack/custom-condition'], + alias: dynamicAliases, }, }) diff --git a/packages/svelte-query-persist-client/package.json b/packages/svelte-query-persist-client/package.json index 86c967e83fa..2949a1f78c7 100644 --- a/packages/svelte-query-persist-client/package.json +++ b/packages/svelte-query-persist-client/package.json @@ -30,7 +30,6 @@ "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 new file mode 120000 index 00000000000..1faec0e8745 --- /dev/null +++ b/packages/svelte-query-persist-client/root.vite.config.js @@ -0,0 +1 @@ +../../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 a88b0d6cde3..54e9cf7efe3 100644 --- a/packages/svelte-query-persist-client/vite.config.ts +++ b/packages/svelte-query-persist-client/vite.config.ts @@ -1,13 +1,19 @@ 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()], + plugins: [ + svelte(), + svelteTesting(), + tsconfigPaths({ ignoreConfigErrors: true }), + ], resolve: { - conditions: ['@tanstack/custom-condition'], + alias: dynamicAliases, }, test: { name: packageJson.name, diff --git a/packages/svelte-query/package.json b/packages/svelte-query/package.json index eb13747ec8d..cadbb06501d 100644 --- a/packages/svelte-query/package.json +++ b/packages/svelte-query/package.json @@ -30,7 +30,6 @@ "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 new file mode 120000 index 00000000000..1faec0e8745 --- /dev/null +++ b/packages/svelte-query/root.vite.config.js @@ -0,0 +1 @@ +../../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 a88b0d6cde3..54e9cf7efe3 100644 --- a/packages/svelte-query/vite.config.ts +++ b/packages/svelte-query/vite.config.ts @@ -1,13 +1,19 @@ 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()], + plugins: [ + svelte(), + svelteTesting(), + tsconfigPaths({ ignoreConfigErrors: true }), + ], resolve: { - conditions: ['@tanstack/custom-condition'], + alias: dynamicAliases, }, test: { name: packageJson.name, diff --git a/packages/vue-query-devtools/package.json b/packages/vue-query-devtools/package.json index a7dc7ef19fe..fdb3a53f26a 100644 --- a/packages/vue-query-devtools/package.json +++ b/packages/vue-query-devtools/package.json @@ -28,17 +28,14 @@ "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 new file mode 120000 index 00000000000..1faec0e8745 --- /dev/null +++ b/packages/vue-query-devtools/root.vite.config.js @@ -0,0 +1 @@ +../../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 a8aadb37139..f36254ba321 100644 --- a/packages/vue-query-devtools/vite.config.ts +++ b/packages/vue-query-devtools/vite.config.ts @@ -1,11 +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()], + plugins: [vue(), tsconfigPaths({ ignoreConfigErrors: true })], resolve: { - conditions: ['@tanstack/custom-condition'], + alias: dynamicAliases, }, }) diff --git a/packages/vue-query/package.json b/packages/vue-query/package.json index b678e975af2..7391e5d83be 100644 --- a/packages/vue-query/package.json +++ b/packages/vue-query/package.json @@ -43,7 +43,6 @@ "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 new file mode 120000 index 00000000000..1faec0e8745 --- /dev/null +++ b/packages/vue-query/root.vite.config.js @@ -0,0 +1 @@ +../../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 409a93094f8..620915c6dfb 100644 --- a/packages/vue-query/vite.config.ts +++ b/packages/vue-query/vite.config.ts @@ -1,12 +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()], + plugins: [vue(), tsconfigPaths({ ignoreConfigErrors: true })], resolve: { - conditions: ['@tanstack/custom-condition'], + alias: dynamicAliases, }, test: { name: packageJson.name, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5b2acc6a7e7..5f5db3cc4ac 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.3.10 - version: 0.3.10 + specifier: ^0.2.12 + version: 0.2.12 react: specifier: ^19.0.0 version: 19.0.0 @@ -143,6 +143,9 @@ importers: vite: specifier: ^6.2.4 version: 6.2.5(@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.5(@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) @@ -1139,7 +1142,7 @@ importers: version: 6.1.18(react-native@0.76.3(@babel/core@7.26.10)(@babel/preset-env@7.26.9(@babel/core@7.26.10))(@react-native-community/cli-server-api@13.6.9(encoding@0.1.13))(@types/react@19.0.1)(encoding@0.1.13)(react@19.0.0))(react@19.0.0) '@react-navigation/stack': specifier: ^6.4.1 - version: 6.4.1(e9c097e00fee89f3cf54c317dda4adb5) + version: 6.4.1(44i6xs33lapt7cl2pkawmwjtru) '@tanstack/react-query': specifier: workspace:* version: link:../../../packages/react-query @@ -5805,10 +5808,6 @@ 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==} @@ -9878,6 +9877,11 @@ 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'} @@ -10257,6 +10261,10 @@ 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} @@ -12021,6 +12029,10 @@ 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} @@ -12029,6 +12041,10 @@ 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} @@ -12044,6 +12060,11 @@ 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} @@ -12864,9 +12885,9 @@ packages: public-encrypt@4.0.3: resolution: {integrity: sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==} - publint@0.3.10: - resolution: {integrity: sha512-xl9X9x0iyOURsAD7IPQJAQ5TgGpozs5K8KUtqzQBSxJqtKH74ReeCpjr2jw9MFOsY9q/EbXSJNkSFM2mgyu38g==} - engines: {node: '>=18'} + publint@0.2.12: + resolution: {integrity: sha512-YNeUtCVeM4j9nDiTT2OPczmlyzOkIXNtdDZnSuajAxS/nZ6j3t7Vs9SUB4euQNddiltIwu7Tdd3s+hr08fAsMw==} + engines: {node: '>=16'} hasBin: true pump@2.0.1: @@ -19415,8 +19436,6 @@ 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 @@ -19637,7 +19656,7 @@ snapshots: dependencies: nanoid: 3.3.8 - '@react-navigation/stack@6.4.1(e9c097e00fee89f3cf54c317dda4adb5)': + '@react-navigation/stack@6.4.1(44i6xs33lapt7cl2pkawmwjtru)': dependencies: '@react-navigation/elements': 1.3.31(@react-navigation/native@6.1.18(react-native@0.76.3(@babel/core@7.26.10)(@babel/preset-env@7.26.9(@babel/core@7.26.10))(@react-native-community/cli-server-api@13.6.9(encoding@0.1.13))(@types/react@19.0.1)(encoding@0.1.13)(react@19.0.0))(react@19.0.0))(react-native-safe-area-context@4.12.0(react-native@0.76.3(@babel/core@7.26.10)(@babel/preset-env@7.26.9(@babel/core@7.26.10))(@react-native-community/cli-server-api@13.6.9(encoding@0.1.13))(@types/react@19.0.1)(encoding@0.1.13)(react@19.0.0))(react@19.0.0))(react-native@0.76.3(@babel/core@7.26.10)(@babel/preset-env@7.26.9(@babel/core@7.26.10))(@react-native-community/cli-server-api@13.6.9(encoding@0.1.13))(@types/react@19.0.1)(encoding@0.1.13)(react@19.0.0))(react@19.0.0) '@react-navigation/native': 6.1.18(react-native@0.76.3(@babel/core@7.26.10)(@babel/preset-env@7.26.9(@babel/core@7.26.10))(@react-native-community/cli-server-api@13.6.9(encoding@0.1.13))(@types/react@19.0.1)(encoding@0.1.13)(react@19.0.0))(react@19.0.0) @@ -24632,6 +24651,14 @@ 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 @@ -25134,6 +25161,10 @@ 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 @@ -27474,6 +27505,10 @@ 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 @@ -27482,6 +27517,8 @@ 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: @@ -27505,6 +27542,13 @@ 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 @@ -28369,10 +28413,9 @@ snapshots: randombytes: 2.1.0 safe-buffer: 5.2.1 - publint@0.3.10: + publint@0.2.12: dependencies: - '@publint/pack': 0.1.2 - package-manager-detector: 1.1.0 + npm-packlist: 5.1.3 picocolors: 1.1.1 sade: 1.8.1 diff --git a/scripts/getViteAliases.js b/scripts/getViteAliases.js new file mode 100644 index 00000000000..9b93db89a02 --- /dev/null +++ b/scripts/getViteAliases.js @@ -0,0 +1,17 @@ +// @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 4a784907bea..8c4eebe8586 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -7,7 +7,6 @@ "allowUnusedLabels": false, "checkJs": true, "composite": true, - "customConditions": ["@tanstack/custom-condition"], "declaration": true, "declarationMap": true, "emitDeclarationOnly": true, @@ -26,7 +25,58 @@ "resolveJsonModule": true, "skipLibCheck": true, "strict": true, - "target": "ES2020" + "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"] + } }, "include": ["eslint.config.js", "prettier.config.js"] } From 6c01fb6730f08137ff760b1fe059785bc92e73eb Mon Sep 17 00:00:00 2001 From: Tyler <26290074+tylersayshi@users.noreply.github.com> Date: Mon, 7 Apr 2025 18:42:49 -0700 Subject: [PATCH 2/3] fix export --- packages/eslint-plugin-query/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/eslint-plugin-query/package.json b/packages/eslint-plugin-query/package.json index 512abaa0186..bde3d51eee3 100644 --- a/packages/eslint-plugin-query/package.json +++ b/packages/eslint-plugin-query/package.json @@ -40,8 +40,8 @@ "exports": { ".": { "import": { - "types": "./dist/esm/index.d.ts", - "default": "./dist/esm/index.js" + "types": "./dist/index.d.ts", + "default": "./dist/index.js" }, "require": { "types": "./dist/index.d.cts", From ae1fa66d88df9d34ad620e6f63c81260ab3a7e4d Mon Sep 17 00:00:00 2001 From: TkDodo Date: Wed, 9 Apr 2025 15:50:39 +0200 Subject: [PATCH 3/3] refactor: make test:lib depend on compile again --- nx.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nx.json b/nx.json index 2eb76dffedb..630c654fdaf 100644 --- a/nx.json +++ b/nx.json @@ -45,7 +45,7 @@ }, "test:lib": { "cache": true, - "dependsOn": ["^build"], + "dependsOn": ["^compile"], "inputs": ["default", "^production"], "outputs": ["{projectRoot}/coverage"] },