Skip to content

Commit 0c229f4

Browse files
tylersayshiTkDodo
andauthored
Revert "chore(paths): use customConditions to define internal imports… (#8973)
* Revert "chore(paths): use customConditions to define internal imports (#8935)" This reverts commit 8e0c6b7. * fix export * refactor: make test:lib depend on compile again --------- Co-authored-by: Dominik Dorfmeister <[email protected]>
1 parent 7d3a1a3 commit 0c229f4

File tree

68 files changed

+248
-85
lines changed

Some content is hidden

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

68 files changed

+248
-85
lines changed

nx.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
},
4646
"test:lib": {
4747
"cache": true,
48-
"dependsOn": ["^build"],
48+
"dependsOn": ["^compile"],
4949
"inputs": ["default", "^production"],
5050
"outputs": ["{projectRoot}/coverage"]
5151
},

package.json

+2-1
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.3.10",
61+
"publint": "^0.2.12",
6262
"react": "^19.0.0",
6363
"react-dom": "^19.0.0",
6464
"sherif": "^1.0.0",
@@ -73,6 +73,7 @@
7373
"typescript56": "npm:[email protected]",
7474
"typescript57": "npm:[email protected]",
7575
"vite": "^6.2.4",
76+
"vite-tsconfig-paths": "^5.1.4",
7677
"vitest": "^3.1.1"
7778
},
7879
"pnpm": {

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

-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
"module": "build/index.mjs",
3737
"exports": {
3838
".": {
39-
"@tanstack/custom-condition": "./src/index.ts",
4039
"types": "./build/index.d.ts",
4140
"default": "./build/index.mjs"
4241
},
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../scripts/getViteAliases.js

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

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

4+
import { dynamicAliases } from './root.vite.config'
35
import packageJson from './package.json'
46

57
export default defineConfig({
8+
plugins: [tsconfigPaths({ ignoreConfigErrors: true })],
69
resolve: {
7-
conditions: ['@tanstack/custom-condition'],
10+
alias: dynamicAliases,
811
},
912
test: {
1013
name: packageJson.name,

packages/angular-query-experimental/package.json

-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
"module": "build/index.mjs",
5252
"exports": {
5353
".": {
54-
"@tanstack/custom-condition": "./src/index.ts",
5554
"types": "./build/index.d.ts",
5655
"default": "./build/index.mjs"
5756
},
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../scripts/getViteAliases.js

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

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

4+
import { dynamicAliases } from './root.vite.config'
35
import packageJson from './package.json'
46

57
export default defineConfig({
8+
plugins: [tsconfigPaths({ ignoreConfigErrors: true })],
69
resolve: {
7-
conditions: ['@tanstack/custom-condition'],
10+
alias: dynamicAliases,
811
},
912
test: {
1013
name: packageJson.name,

packages/eslint-plugin-query/package.json

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

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

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

5+
import { dynamicAliases } from './root.vite.config'
46
import packageJson from './package.json'
57

68
const config = defineConfig({
9+
plugins: [tsconfigPaths({ ignoreConfigErrors: true })],
710
resolve: {
8-
conditions: ['@tanstack/custom-condition'],
11+
alias: dynamicAliases,
912
},
1013
test: {
1114
name: packageJson.name,

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

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

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

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

4+
import { dynamicAliases } from './root.vite.config'
35
import packageJson from './package.json'
46

57
export default defineConfig({
8+
plugins: [tsconfigPaths({ ignoreConfigErrors: true })],
69
resolve: {
7-
conditions: ['@tanstack/custom-condition'],
10+
alias: dynamicAliases,
811
},
912
test: {
1013
name: packageJson.name,

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

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

packages/query-codemods/vite.config.ts

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

4+
import { dynamicAliases } from './root.vite.config'
35
import packageJson from './package.json'
46

57
export default defineConfig({
8+
plugins: [tsconfigPaths({ ignoreConfigErrors: true })],
69
resolve: {
7-
conditions: ['@tanstack/custom-condition'],
10+
alias: dynamicAliases,
811
},
912
test: {
1013
name: packageJson.name,

packages/query-core/package.json

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

packages/query-core/vite.config.ts

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

4+
import { dynamicAliases } from './root.vite.config'
35
import packageJson from './package.json'
46

57
export default defineConfig({
8+
plugins: [tsconfigPaths({ ignoreConfigErrors: true })],
69
resolve: {
7-
conditions: ['@tanstack/custom-condition'],
10+
alias: dynamicAliases,
811
},
912
test: {
1013
name: packageJson.name,

packages/query-devtools/package.json

-3
Original file line numberDiff line numberDiff line change
@@ -41,20 +41,17 @@
4141
"browser": {},
4242
"exports": {
4343
"solid": {
44-
"@tanstack/custom-condition": "./src/index.ts",
4544
"development": "./build/index.js",
4645
"import": "./build/index.js"
4746
},
4847
"development": {
4948
"import": {
50-
"@tanstack/custom-condition": "./src/index.ts",
5149
"types": "./build/index.d.ts",
5250
"default": "./build/dev.js"
5351
},
5452
"require": "./build/dev.cjs"
5553
},
5654
"import": {
57-
"@tanstack/custom-condition": "./src/index.ts",
5855
"types": "./build/index.d.ts",
5956
"default": "./build/index.js"
6057
},
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../scripts/getViteAliases.js

packages/query-devtools/vite.config.ts

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

5+
import { dynamicAliases } from './root.vite.config'
46
import packageJson from './package.json'
57

68
export default defineConfig({
7-
plugins: [solid()],
9+
plugins: [solid(), tsconfigPaths({ ignoreConfigErrors: true })],
810
resolve: {
9-
conditions: ['@tanstack/custom-condition'],
11+
alias: dynamicAliases,
1012
},
1113
test: {
1214
name: packageJson.name,

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

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

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

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

4+
import { dynamicAliases } from './root.vite.config'
35
import packageJson from './package.json'
46

57
export default defineConfig({
8+
plugins: [tsconfigPaths({ ignoreConfigErrors: true })],
69
resolve: {
7-
conditions: ['@tanstack/custom-condition'],
10+
alias: dynamicAliases,
811
},
912
test: {
1013
name: packageJson.name,

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

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

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

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

4+
import { dynamicAliases } from './root.vite.config'
35
import packageJson from './package.json'
46

57
export default defineConfig({
8+
plugins: [tsconfigPaths({ ignoreConfigErrors: true })],
69
resolve: {
7-
conditions: ['@tanstack/custom-condition'],
10+
alias: dynamicAliases,
811
},
912
test: {
1013
name: packageJson.name,

packages/react-query-devtools/package.json

-3
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
"exports": {
4242
".": {
4343
"import": {
44-
"@tanstack/custom-condition": "./src/index.ts",
4544
"types": "./build/modern/index.d.ts",
4645
"default": "./build/modern/index.js"
4746
},
@@ -52,7 +51,6 @@
5251
},
5352
"./production": {
5453
"import": {
55-
"@tanstack/custom-condition": "./src/production.ts",
5654
"types": "./build/modern/production.d.ts",
5755
"default": "./build/modern/production.js"
5856
},
@@ -63,7 +61,6 @@
6361
},
6462
"./build/modern/production.js": {
6563
"import": {
66-
"@tanstack/custom-condition": "./src/production.ts",
6764
"types": "./build/modern/production.d.ts",
6865
"default": "./build/modern/production.js"
6966
},
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../scripts/getViteAliases.js

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

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

5+
import { dynamicAliases } from './root.vite.config'
46
import packageJson from './package.json'
57

68
export default defineConfig({
7-
plugins: [react()],
9+
plugins: [react(), tsconfigPaths({ ignoreConfigErrors: true })],
810
resolve: {
9-
conditions: ['@tanstack/custom-condition'],
11+
alias: dynamicAliases,
1012
},
1113
test: {
1214
name: packageJson.name,

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

-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
"exports": {
3939
".": {
4040
"import": {
41-
"@tanstack/custom-condition": "./src/index.ts",
4241
"types": "./build/modern/index.d.ts",
4342
"default": "./build/modern/index.js"
4443
},
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../scripts/getViteAliases.js
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
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'
36

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

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

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

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

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

5+
import { dynamicAliases } from './root.vite.config'
46
import packageJson from './package.json'
57

68
export default defineConfig({
7-
plugins: [react()],
9+
plugins: [react(), tsconfigPaths({ ignoreConfigErrors: true })],
810
resolve: {
9-
conditions: ['@tanstack/custom-condition'],
11+
alias: dynamicAliases,
1012
},
1113
test: {
1214
name: packageJson.name,

packages/react-query/package.json

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

0 commit comments

Comments
 (0)