Skip to content

Commit 06c3127

Browse files
SheraffSheraff
authored
Merge branch 'main' into refactor-signals
2 parents 853c5d1 + 7f38aac commit 06c3127

56 files changed

Lines changed: 156 additions & 720 deletions

File tree

Some content is hidden

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

‎benchmarks/bundle-size/package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
"@tanstack/router-plugin": "workspace:^",
2121
"@types/react": "^19.0.8",
2222
"@types/react-dom": "^19.0.3",
23-
"@vitejs/plugin-react": "^4.3.4",
24-
"@vitejs/plugin-vue": "^5.2.3",
25-
"@vitejs/plugin-vue-jsx": "^4.1.2",
23+
"@vitejs/plugin-react": "^6.0.1",
24+
"@vitejs/plugin-vue": "^6.0.5",
25+
"@vitejs/plugin-vue-jsx": "^5.1.5",
2626
"typescript": "^5.7.2",
27-
"vite": "^7.3.1",
28-
"vite-plugin-solid": "^2.11.10"
27+
"vite": "^8.0.0",
28+
"vite-plugin-solid": "^2.11.11"
2929
}
3030
}

‎benchmarks/client-nav/package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@
3232
"@platformatic/flame": "^1.6.0",
3333
"@codspeed/vitest-plugin": "^5.0.1",
3434
"@testing-library/react": "^16.2.0",
35-
"@vitejs/plugin-react": "^4.3.4",
36-
"@vitejs/plugin-vue": "^5.2.3",
37-
"@vitejs/plugin-vue-jsx": "^4.1.2",
35+
"@vitejs/plugin-react": "^6.0.1",
36+
"@vitejs/plugin-vue": "^6.0.5",
37+
"@vitejs/plugin-vue-jsx": "^5.1.5",
3838
"@types/jsdom": "28.0.0",
3939
"typescript": "^5.7.2",
40-
"vite": "^7.3.1",
41-
"vite-plugin-solid": "^2.11.10",
40+
"vite": "^8.0.0",
41+
"vite-plugin-solid": "^2.11.11",
4242
"vitest": "^4.0.17"
4343
},
4444
"nx": {

‎benchmarks/ssr/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@
2929
},
3030
"devDependencies": {
3131
"@codspeed/vitest-plugin": "^5.0.1",
32-
"@vitejs/plugin-react": "^4.3.4",
33-
"@vitejs/plugin-vue-jsx": "^4.1.2",
32+
"@vitejs/plugin-react": "^6.0.1",
33+
"@vitejs/plugin-vue-jsx": "^5.1.5",
3434
"typescript": "^5.7.2",
35-
"vite": "^7.3.1",
36-
"vite-plugin-solid": "^2.11.10",
35+
"vite": "^8.0.0",
36+
"vite-plugin-solid": "^2.11.11",
3737
"vitest": "^4.0.17"
3838
},
3939
"nx": {

‎docs/start/framework/react/build-from-scratch.md‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ Alternatively, you can also use `@vitejs/plugin-react-swc`.
8080
and some TypeScript:
8181

8282
```shell
83-
npm i -D typescript @types/react @types/react-dom @types/node vite-tsconfig-paths
83+
npm i -D typescript @types/react @types/react-dom @types/node
8484
```
8585

8686
## Update Configuration Files
@@ -103,16 +103,17 @@ Then configure TanStack Start's Vite plugin in `vite.config.ts`:
103103
```ts
104104
// vite.config.ts
105105
import { defineConfig } from 'vite'
106-
import tsConfigPaths from 'vite-tsconfig-paths'
107106
import { tanstackStart } from '@tanstack/react-start/plugin/vite'
108107
import viteReact from '@vitejs/plugin-react'
109108

110109
export default defineConfig({
111110
server: {
112111
port: 3000,
113112
},
113+
resolve: {
114+
tsconfigPaths: true,
115+
},
114116
plugins: [
115-
tsConfigPaths(),
116117
tanstackStart(),
117118
// react's vite plugin must come after start's vite plugin
118119
viteReact(),

‎docs/start/framework/solid/build-from-scratch.md‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ npm i solid-js vite-plugin-solid
6565
and some TypeScript:
6666

6767
```shell
68-
npm i -D typescript @types/node vite-tsconfig-paths
68+
npm i -D typescript @types/node
6969
```
7070

7171
## Update Configuration Files
@@ -88,16 +88,17 @@ Then configure TanStack Start's Vite plugin in `vite.config.ts`:
8888
```ts
8989
// vite.config.ts
9090
import { defineConfig } from 'vite'
91-
import tsConfigPaths from 'vite-tsconfig-paths'
9291
import { tanstackStart } from '@tanstack/solid-start/plugin/vite'
9392
import viteSolid from 'vite-plugin-solid'
9493

9594
export default defineConfig({
9695
server: {
9796
port: 3000,
9897
},
98+
resolve: {
99+
tsconfigPaths: true,
100+
},
99101
plugins: [
100-
tsConfigPaths(),
101102
tanstackStart(),
102103
// solid's vite plugin must come after start's vite plugin
103104
viteSolid({ ssr: true }),

‎examples/react/start-bare/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"dependencies": {
1313
"@tanstack/react-router": "^1.167.5",
1414
"@tanstack/react-router-devtools": "^1.166.9",
15-
"@tanstack/react-start": "^1.166.17",
15+
"@tanstack/react-start": "^1.166.18",
1616
"react": "^19.0.0",
1717
"react-dom": "^19.0.0",
1818
"zod": "^3.24.2"

‎examples/react/start-basic-auth/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"@prisma/client": "^7.0.0",
1717
"@tanstack/react-router": "^1.167.5",
1818
"@tanstack/react-router-devtools": "^1.166.9",
19-
"@tanstack/react-start": "^1.166.17",
19+
"@tanstack/react-start": "^1.166.18",
2020
"react": "^19.0.0",
2121
"react-dom": "^19.0.0",
2222
"redaxios": "^0.5.1",

‎examples/react/start-basic-authjs/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"@auth/core": "^0.41.1",
1414
"@tanstack/react-router": "^1.167.5",
1515
"@tanstack/react-router-devtools": "^1.166.9",
16-
"@tanstack/react-start": "^1.166.17",
16+
"@tanstack/react-start": "^1.166.18",
1717
"start-authjs": "^1.0.0",
1818
"react": "^19.0.0",
1919
"react-dom": "^19.0.0",

‎examples/react/start-basic-cloudflare/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"dependencies": {
1515
"@tanstack/react-router": "^1.167.5",
1616
"@tanstack/react-router-devtools": "^1.166.9",
17-
"@tanstack/react-start": "^1.166.17",
17+
"@tanstack/react-start": "^1.166.18",
1818
"react": "^19.0.0",
1919
"react-dom": "^19.0.0"
2020
},

‎examples/react/start-basic-react-query/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"@tanstack/react-router": "^1.167.5",
1616
"@tanstack/react-router-devtools": "^1.166.9",
1717
"@tanstack/react-router-ssr-query": "^1.166.9",
18-
"@tanstack/react-start": "^1.166.17",
18+
"@tanstack/react-start": "^1.166.18",
1919
"react": "^19.0.0",
2020
"react-dom": "^19.0.0",
2121
"redaxios": "^0.5.1",

0 commit comments

Comments
 (0)