Skip to content

Commit 8e0c6b7

Browse files
tylersayshiTkDodo
andauthored
chore(paths): use customConditions to define internal imports (TanStack#8935)
* fix(paths): use customConditions to define internal imports * the rest of the changes * publint and vitest fixes * order matters! thanks https://colinhacks.com/essays/live-types-typescript-monorepo * upgrade publint to get customCondition support added here: publint/publint@b34ea94 * remove dynamicAliases * remove getViteAliases * try without references? * Revert "try without references?" This reverts commit b18bc94. --------- Co-authored-by: Dominik Dorfmeister <[email protected]>
1 parent 1bf2df6 commit 8e0c6b7

File tree

67 files changed

+82
-245
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+82
-245
lines changed

package.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
"premove": "^4.0.0",
5959
"prettier": "^3.4.2",
6060
"prettier-plugin-svelte": "^3.3.2",
61-
"publint": "^0.2.12",
61+
"publint": "^0.3.10",
6262
"react": "^19.0.0",
6363
"react-dom": "^19.0.0",
6464
"sherif": "^1.0.0",
@@ -73,7 +73,6 @@
7373
"typescript56": "npm:[email protected]",
7474
"typescript57": "npm:[email protected]",
7575
"vite": "^6.2.4",
76-
"vite-tsconfig-paths": "^5.1.4",
7776
"vitest": "^3.1.1"
7877
},
7978
"pnpm": {

packages/angular-query-devtools-experimental/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
"module": "build/index.mjs",
3737
"exports": {
3838
".": {
39+
"@tanstack/custom-condition": "./src/index.ts",
3940
"types": "./build/index.d.ts",
4041
"default": "./build/index.mjs"
4142
},

packages/angular-query-devtools-experimental/root.vite.config.js

-1
This file was deleted.

packages/angular-query-devtools-experimental/vite.config.ts

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
import { defineConfig } from 'vitest/config'
2-
import tsconfigPaths from 'vite-tsconfig-paths'
32

4-
import { dynamicAliases } from './root.vite.config'
53
import packageJson from './package.json'
64

75
export default defineConfig({
8-
plugins: [tsconfigPaths({ ignoreConfigErrors: true })],
96
resolve: {
10-
alias: dynamicAliases,
7+
conditions: ['@tanstack/custom-condition'],
118
},
129
test: {
1310
name: packageJson.name,

packages/angular-query-experimental/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
"module": "build/index.mjs",
5252
"exports": {
5353
".": {
54+
"@tanstack/custom-condition": "./src/index.ts",
5455
"types": "./build/index.d.ts",
5556
"default": "./build/index.mjs"
5657
},

packages/angular-query-experimental/root.vite.config.js

-1
This file was deleted.

packages/angular-query-experimental/vite.config.ts

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
import { defineConfig } from 'vitest/config'
2-
import tsconfigPaths from 'vite-tsconfig-paths'
32

4-
import { dynamicAliases } from './root.vite.config'
53
import packageJson from './package.json'
64

75
export default defineConfig({
8-
plugins: [tsconfigPaths({ ignoreConfigErrors: true })],
96
resolve: {
10-
alias: dynamicAliases,
7+
conditions: ['@tanstack/custom-condition'],
118
},
129
test: {
1310
name: packageJson.name,

packages/eslint-plugin-query/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
"exports": {
4141
".": {
4242
"import": {
43+
"@tanstack/custom-condition": "./src/index.ts",
4344
"types": "./dist/esm/index.d.ts",
4445
"default": "./dist/esm/index.js"
4546
},

packages/eslint-plugin-query/root.vite.config.js

-1
This file was deleted.

packages/eslint-plugin-query/vite.config.ts

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
import { defineConfig, mergeConfig } from 'vitest/config'
22
import { tanstackViteConfig } from '@tanstack/config/vite'
3-
import tsconfigPaths from 'vite-tsconfig-paths'
43

5-
import { dynamicAliases } from './root.vite.config'
64
import packageJson from './package.json'
75

86
const config = defineConfig({
9-
plugins: [tsconfigPaths({ ignoreConfigErrors: true })],
107
resolve: {
11-
alias: dynamicAliases,
8+
conditions: ['@tanstack/custom-condition'],
129
},
1310
test: {
1411
name: packageJson.name,

packages/query-async-storage-persister/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
"exports": {
4242
".": {
4343
"import": {
44+
"@tanstack/custom-condition": "./src/index.ts",
4445
"types": "./build/modern/index.d.ts",
4546
"default": "./build/modern/index.js"
4647
},

packages/query-async-storage-persister/root.vite.config.js

-1
This file was deleted.

packages/query-async-storage-persister/vite.config.ts

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
import { defineConfig } from 'vitest/config'
2-
import tsconfigPaths from 'vite-tsconfig-paths'
32

4-
import { dynamicAliases } from './root.vite.config'
53
import packageJson from './package.json'
64

75
export default defineConfig({
8-
plugins: [tsconfigPaths({ ignoreConfigErrors: true })],
96
resolve: {
10-
alias: dynamicAliases,
7+
conditions: ['@tanstack/custom-condition'],
118
},
129
test: {
1310
name: packageJson.name,

packages/query-broadcast-client-experimental/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
"exports": {
3939
".": {
4040
"import": {
41+
"@tanstack/custom-condition": "./src/index.ts",
4142
"types": "./build/modern/index.d.ts",
4243
"default": "./build/modern/index.js"
4344
},

packages/query-codemods/root.vite.config.js

-1
This file was deleted.

packages/query-codemods/vite.config.ts

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
import { defineConfig } from 'vitest/config'
2-
import tsconfigPaths from 'vite-tsconfig-paths'
32

4-
import { dynamicAliases } from './root.vite.config'
53
import packageJson from './package.json'
64

75
export default defineConfig({
8-
plugins: [tsconfigPaths({ ignoreConfigErrors: true })],
96
resolve: {
10-
alias: dynamicAliases,
7+
conditions: ['@tanstack/custom-condition'],
118
},
129
test: {
1310
name: packageJson.name,

packages/query-core/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
"exports": {
4242
".": {
4343
"import": {
44+
"@tanstack/custom-condition": "./src/index.ts",
4445
"types": "./build/modern/index.d.ts",
4546
"default": "./build/modern/index.js"
4647
},

packages/query-core/root.vite.config.js

-1
This file was deleted.

packages/query-core/vite.config.ts

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
import { defineConfig } from 'vitest/config'
2-
import tsconfigPaths from 'vite-tsconfig-paths'
32

4-
import { dynamicAliases } from './root.vite.config'
53
import packageJson from './package.json'
64

75
export default defineConfig({
8-
plugins: [tsconfigPaths({ ignoreConfigErrors: true })],
96
resolve: {
10-
alias: dynamicAliases,
7+
conditions: ['@tanstack/custom-condition'],
118
},
129
test: {
1310
name: packageJson.name,

packages/query-devtools/package.json

+3
Original file line numberDiff line numberDiff line change
@@ -41,17 +41,20 @@
4141
"browser": {},
4242
"exports": {
4343
"solid": {
44+
"@tanstack/custom-condition": "./src/index.ts",
4445
"development": "./build/index.js",
4546
"import": "./build/index.js"
4647
},
4748
"development": {
4849
"import": {
50+
"@tanstack/custom-condition": "./src/index.ts",
4951
"types": "./build/index.d.ts",
5052
"default": "./build/dev.js"
5153
},
5254
"require": "./build/dev.cjs"
5355
},
5456
"import": {
57+
"@tanstack/custom-condition": "./src/index.ts",
5558
"types": "./build/index.d.ts",
5659
"default": "./build/index.js"
5760
},

packages/query-devtools/root.vite.config.js

-1
This file was deleted.

packages/query-devtools/vite.config.ts

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
import solid from 'vite-plugin-solid'
22
import { defineConfig } from 'vitest/config'
3-
import tsconfigPaths from 'vite-tsconfig-paths'
43

5-
import { dynamicAliases } from './root.vite.config'
64
import packageJson from './package.json'
75

86
export default defineConfig({
9-
plugins: [solid(), tsconfigPaths({ ignoreConfigErrors: true })],
7+
plugins: [solid()],
108
resolve: {
11-
alias: dynamicAliases,
9+
conditions: ['@tanstack/custom-condition'],
1210
},
1311
test: {
1412
name: packageJson.name,

packages/query-persist-client-core/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
"exports": {
4242
".": {
4343
"import": {
44+
"@tanstack/custom-condition": "./src/index.ts",
4445
"types": "./build/modern/index.d.ts",
4546
"default": "./build/modern/index.js"
4647
},

packages/query-persist-client-core/root.vite.config.js

-1
This file was deleted.

packages/query-persist-client-core/vite.config.ts

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
import { defineConfig } from 'vitest/config'
2-
import tsconfigPaths from 'vite-tsconfig-paths'
32

4-
import { dynamicAliases } from './root.vite.config'
53
import packageJson from './package.json'
64

75
export default defineConfig({
8-
plugins: [tsconfigPaths({ ignoreConfigErrors: true })],
96
resolve: {
10-
alias: dynamicAliases,
7+
conditions: ['@tanstack/custom-condition'],
118
},
129
test: {
1310
name: packageJson.name,

packages/query-sync-storage-persister/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
"exports": {
4242
".": {
4343
"import": {
44+
"@tanstack/custom-condition": "./src/index.ts",
4445
"types": "./build/modern/index.d.ts",
4546
"default": "./build/modern/index.js"
4647
},

packages/query-sync-storage-persister/root.vite.config.js

-1
This file was deleted.

packages/query-sync-storage-persister/vite.config.ts

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
import { defineConfig } from 'vitest/config'
2-
import tsconfigPaths from 'vite-tsconfig-paths'
32

4-
import { dynamicAliases } from './root.vite.config'
53
import packageJson from './package.json'
64

75
export default defineConfig({
8-
plugins: [tsconfigPaths({ ignoreConfigErrors: true })],
96
resolve: {
10-
alias: dynamicAliases,
7+
conditions: ['@tanstack/custom-condition'],
118
},
129
test: {
1310
name: packageJson.name,

packages/react-query-devtools/package.json

+3
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
"exports": {
4242
".": {
4343
"import": {
44+
"@tanstack/custom-condition": "./src/index.ts",
4445
"types": "./build/modern/index.d.ts",
4546
"default": "./build/modern/index.js"
4647
},
@@ -51,6 +52,7 @@
5152
},
5253
"./production": {
5354
"import": {
55+
"@tanstack/custom-condition": "./src/production.ts",
5456
"types": "./build/modern/production.d.ts",
5557
"default": "./build/modern/production.js"
5658
},
@@ -61,6 +63,7 @@
6163
},
6264
"./build/modern/production.js": {
6365
"import": {
66+
"@tanstack/custom-condition": "./src/production.ts",
6467
"types": "./build/modern/production.d.ts",
6568
"default": "./build/modern/production.js"
6669
},

packages/react-query-devtools/root.vite.config.js

-1
This file was deleted.

packages/react-query-devtools/vite.config.ts

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
import { defineConfig } from 'vitest/config'
22
import react from '@vitejs/plugin-react'
3-
import tsconfigPaths from 'vite-tsconfig-paths'
43

5-
import { dynamicAliases } from './root.vite.config'
64
import packageJson from './package.json'
75

86
export default defineConfig({
9-
plugins: [react(), tsconfigPaths({ ignoreConfigErrors: true })],
7+
plugins: [react()],
108
resolve: {
11-
alias: dynamicAliases,
9+
conditions: ['@tanstack/custom-condition'],
1210
},
1311
test: {
1412
name: packageJson.name,

packages/react-query-next-experimental/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
"exports": {
3939
".": {
4040
"import": {
41+
"@tanstack/custom-condition": "./src/index.ts",
4142
"types": "./build/modern/index.d.ts",
4243
"default": "./build/modern/index.js"
4344
},

packages/react-query-next-experimental/root.vite.config.js

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
import { defineConfig } from 'vite'
22
import react from '@vitejs/plugin-react'
3-
import tsconfigPaths from 'vite-tsconfig-paths'
4-
5-
import { dynamicAliases } from './root.vite.config'
63

74
export default defineConfig({
8-
plugins: [react(), tsconfigPaths({ ignoreConfigErrors: true })],
5+
plugins: [react()],
96
resolve: {
10-
alias: dynamicAliases,
7+
conditions: ['@tanstack/custom-condition'],
118
},
129
})

packages/react-query-persist-client/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
"exports": {
4242
".": {
4343
"import": {
44+
"@tanstack/custom-condition": "./src/index.ts",
4445
"types": "./build/modern/index.d.ts",
4546
"default": "./build/modern/index.js"
4647
},

packages/react-query-persist-client/root.vite.config.js

-1
This file was deleted.

packages/react-query-persist-client/vite.config.ts

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
import { defineConfig } from 'vitest/config'
22
import react from '@vitejs/plugin-react'
3-
import tsconfigPaths from 'vite-tsconfig-paths'
43

5-
import { dynamicAliases } from './root.vite.config'
64
import packageJson from './package.json'
75

86
export default defineConfig({
9-
plugins: [react(), tsconfigPaths({ ignoreConfigErrors: true })],
7+
plugins: [react()],
108
resolve: {
11-
alias: dynamicAliases,
9+
conditions: ['@tanstack/custom-condition'],
1210
},
1311
test: {
1412
name: packageJson.name,

packages/react-query/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
"exports": {
4444
".": {
4545
"import": {
46+
"@tanstack/custom-condition": "./src/index.ts",
4647
"types": "./build/modern/index.d.ts",
4748
"default": "./build/modern/index.js"
4849
},

packages/react-query/root.vite.config.js

-1
This file was deleted.

packages/react-query/vite.config.ts

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
import { defineConfig } from 'vitest/config'
22
import react from '@vitejs/plugin-react'
3-
import tsconfigPaths from 'vite-tsconfig-paths'
43

5-
import { dynamicAliases } from './root.vite.config'
64
import packageJson from './package.json'
75

86
export default defineConfig({
9-
plugins: [react(), tsconfigPaths({ ignoreConfigErrors: true })],
7+
plugins: [react()],
108
resolve: {
11-
alias: dynamicAliases,
9+
conditions: ['@tanstack/custom-condition'],
1210
},
1311
test: {
1412
name: packageJson.name,

0 commit comments

Comments
 (0)