Skip to content

Commit 0b74c9f

Browse files
birkskyumbirkskyum
authored
Merge cde6e61 into 9f2795a 
2 parents 9f2795a + cde6e61 commit 0b74c9f

364 files changed

Lines changed: 3746 additions & 2782 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.

‎.changeset/pre.json‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
{
2+
"mode": "pre",
3+
"tag": "alpha",
4+
"initialVersions": {
5+
"@tanstack/arktype-adapter": "1.166.7",
6+
"@tanstack/eslint-plugin-router": "1.161.4",
7+
"@tanstack/history": "1.161.4",
8+
"@tanstack/nitro-v2-vite-plugin": "1.154.7",
9+
"@tanstack/react-router": "1.166.7",
10+
"@tanstack/react-router-devtools": "1.166.7",
11+
"@tanstack/react-router-ssr-query": "1.166.7",
12+
"@tanstack/react-start": "1.166.8",
13+
"@tanstack/react-start-client": "1.166.7",
14+
"@tanstack/react-start-server": "1.166.7",
15+
"@tanstack/router-cli": "1.166.7",
16+
"@tanstack/router-core": "1.166.7",
17+
"@tanstack/router-devtools": "1.166.7",
18+
"@tanstack/router-devtools-core": "1.166.7",
19+
"@tanstack/router-generator": "1.166.7",
20+
"@tanstack/router-plugin": "1.166.7",
21+
"@tanstack/router-ssr-query-core": "1.166.7",
22+
"@tanstack/router-utils": "1.161.4",
23+
"@tanstack/router-vite-plugin": "1.166.7",
24+
"@tanstack/solid-router": "1.166.7",
25+
"@tanstack/solid-router-devtools": "1.166.7",
26+
"@tanstack/solid-router-ssr-query": "1.166.7",
27+
"@tanstack/solid-start": "1.166.8",
28+
"@tanstack/solid-start-client": "1.166.7",
29+
"@tanstack/solid-start-server": "1.166.7",
30+
"@tanstack/start-client-core": "1.166.7",
31+
"@tanstack/start-fn-stubs": "1.161.4",
32+
"@tanstack/start-plugin-core": "1.166.8",
33+
"@tanstack/start-server-core": "1.166.7",
34+
"@tanstack/start-static-server-functions": "1.166.8",
35+
"@tanstack/start-storage-context": "1.166.7",
36+
"@tanstack/valibot-adapter": "1.166.7",
37+
"@tanstack/virtual-file-routes": "1.161.4",
38+
"@tanstack/vue-router": "1.166.7",
39+
"@tanstack/vue-router-devtools": "1.166.7",
40+
"@tanstack/vue-router-ssr-query": "1.166.7",
41+
"@tanstack/vue-start": "1.166.8",
42+
"@tanstack/vue-start-client": "1.166.7",
43+
"@tanstack/vue-start-server": "1.166.7",
44+
"@tanstack/zod-adapter": "1.166.7"
45+
},
46+
"changesets": ["social-mails-sort", "three-carrots-return"]
47+
}

‎.changeset/social-mails-sort.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
---
2+
'@tanstack/solid-router-ssr-query': major
3+
'@tanstack/solid-router-devtools': major
4+
'@tanstack/solid-start-client': major
5+
'@tanstack/solid-start-server': major
6+
'@tanstack/solid-router': major
7+
'@tanstack/solid-start': major
8+
---
9+
10+
solid v2 pre-release for solid-router and start

‎.changeset/three-carrots-return.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
---
2+
'@tanstack/solid-router-ssr-query': patch
3+
'@tanstack/solid-router-devtools': patch
4+
'@tanstack/solid-start-client': patch
5+
'@tanstack/solid-start-server': patch
6+
'@tanstack/solid-router': patch
7+
'@tanstack/solid-start': patch
8+
---
9+
10+
bump to alpha.1

‎.github/workflows/release.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
run: |
5959
BRANCH="${GITHUB_REF_NAME}"
6060
if [[ "$BRANCH" == *-pre ]]; then
61-
echo "tag=next" >> "$GITHUB_OUTPUT"
61+
echo "prerelease=true" >> "$GITHUB_OUTPUT"
6262
elif [[ "$BRANCH" == *-maint ]]; then
6363
echo "tag=maint" >> "$GITHUB_OUTPUT"
6464
fi
@@ -67,7 +67,7 @@ jobs:
6767
run: pnpm run changeset:publish ${{ steps.dist-tag.outputs.tag && format('--tag {0}', steps.dist-tag.outputs.tag) }}
6868
- name: Create GitHub Release
6969
if: steps.commit.outputs.committed == 'true'
70-
run: node scripts/create-github-release.mjs ${{ steps.dist-tag.outputs.tag == 'next' && '--prerelease' }}
70+
run: node scripts/create-github-release.mjs ${{ steps.dist-tag.outputs.prerelease == 'true' && '--prerelease' }}
7171
env:
7272
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7373
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎benchmarks/bundle-size/package.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
"@tanstack/solid-start": "workspace:^",
1414
"react": "^19.0.0",
1515
"react-dom": "^19.0.0",
16-
"solid-js": "^1.9.10",
16+
"solid-js": "2.0.0-beta.2",
17+
"@solidjs/web": "2.0.0-beta.2",
1718
"vue": "^3.5.16"
1819
},
1920
"devDependencies": {
@@ -25,6 +26,6 @@
2526
"@vitejs/plugin-vue-jsx": "^4.1.2",
2627
"typescript": "^5.7.2",
2728
"vite": "^7.3.1",
28-
"vite-plugin-solid": "^2.11.10"
29+
"vite-plugin-solid": "3.0.0-next.2"
2930
}
3031
}

‎benchmarks/bundle-size/scenarios/solid-router-full/src/main.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { render } from 'solid-js/web'
1+
import { render } from '@solidjs/web'
22
import { RouterProvider, createRouter } from '@tanstack/solid-router'
33
import { routeTree } from './routeTree.gen'
44

‎benchmarks/bundle-size/scenarios/solid-router-minimal/src/main.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { render } from 'solid-js/web'
1+
import { render } from '@solidjs/web'
22
import { RouterProvider, createRouter } from '@tanstack/solid-router'
33
import { routeTree } from './routeTree.gen'
44

‎benchmarks/client-nav/package.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@
2525
"@tanstack/vue-router": "workspace:^",
2626
"react": "^19.0.0",
2727
"react-dom": "^19.0.0",
28-
"solid-js": "^1.9.10",
28+
"solid-js": "2.0.0-beta.2",
29+
"@solidjs/web": "2.0.0-beta.2",
2930
"vue": "^3.5.16"
3031
},
3132
"devDependencies": {
@@ -38,7 +39,7 @@
3839
"@types/jsdom": "28.0.0",
3940
"typescript": "^5.7.2",
4041
"vite": "^7.3.1",
41-
"vite-plugin-solid": "^2.11.10",
42+
"vite-plugin-solid": "3.0.0-next.2",
4243
"vitest": "^4.0.17"
4344
},
4445
"nx": {

‎benchmarks/client-nav/solid/app.tsx‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { For, createEffect } from 'solid-js'
2-
import { render } from 'solid-js/web'
2+
import { render } from '@solidjs/web'
33
import {
44
Link,
55
Outlet,
@@ -30,9 +30,10 @@ function Params() {
3030
select: (params) => runPerfSelectorComputation(Number(params.id ?? 0)),
3131
})
3232

33-
createEffect(() => {
34-
void params()
35-
})
33+
createEffect(
34+
() => params(),
35+
() => {},
36+
)
3637

3738
return null
3839
}
@@ -43,9 +44,10 @@ function Search() {
4344
select: (search) => runPerfSelectorComputation(Number(search.id ?? 0)),
4445
})
4546

46-
createEffect(() => {
47-
void search()
48-
})
47+
createEffect(
48+
() => search(),
49+
() => {},
50+
)
4951

5052
return null
5153
}

‎benchmarks/ssr/package.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@
2424
"@tanstack/vue-start": "workspace:^",
2525
"react": "^19.0.0",
2626
"react-dom": "^19.0.0",
27-
"solid-js": "^1.9.10",
27+
"solid-js": "2.0.0-beta.2",
28+
"@solidjs/web": "2.0.0-beta.2",
2829
"vue": "^3.5.16"
2930
},
3031
"devDependencies": {
@@ -33,7 +34,7 @@
3334
"@vitejs/plugin-vue-jsx": "^4.1.2",
3435
"typescript": "^5.7.2",
3536
"vite": "^7.3.1",
36-
"vite-plugin-solid": "^2.11.10",
37+
"vite-plugin-solid": "3.0.0-next.2",
3738
"vitest": "^4.0.17"
3839
},
3940
"nx": {

0 commit comments

Comments
 (0)