Skip to content

Commit 4662a56

Browse files
authored
Merge branch 'next' into fix/654-ssr-link-state
2 parents af98854 + 423c087 commit 4662a56

12 files changed

Lines changed: 141 additions & 93 deletions
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@solidjs/router": patch
3+
---
4+
5+
Put `state`, `noscroll`, `replace`, and `preload` back on `JSX.AnchorHTMLAttributes` by augmenting `@solidjs/web/jsx-runtime`. `preload` also accepts `"viewport"` and `"eager"`. `link` stays owned by core. Pairs with the core change that removes those four props from the anchor type.

‎.changeset/require-solid-rc-15.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@solidjs/router": patch
3+
---
4+
5+
Require solid-js / @solidjs/web 2.0.0-rc.15. Link and form claims follow rc.15's claim contract: an element's compiled mount claim fires once, after its initial attributes are applied, and later claims come from compiler-owned `href`/`action` writes or from `claimElementTree` sweeps (frame streams, morphs). The router's claim handlers are unchanged.

‎package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,15 @@
4747
"@rollup/plugin-babel": "6.0.4",
4848
"@rollup/plugin-node-resolve": "15.3.0",
4949
"@rollup/plugin-terser": "0.4.4",
50-
"@solidjs/vite-plugin": "3.0.0-next.47",
51-
"@solidjs/web": "^2.0.0-rc.14",
50+
"@solidjs/vite-plugin": "3.0.0-next.50",
51+
"@solidjs/web": "^2.0.0-rc.15",
5252
"@types/jest": "^29.5.14",
5353
"@types/node": "^22.10.0",
5454
"babel-preset-solid": "^2.0.0-rc.2",
5555
"jsdom": "^25.0.1",
5656
"prettier": "^3.4.1",
5757
"rollup": "^4.27.4",
58-
"solid-js": "^2.0.0-rc.14",
58+
"solid-js": "^2.0.0-rc.15",
5959
"typescript": "^5.7.2",
6060
"vite": "^8.2.2",
6161
"vitest": "^4.1.11"

‎pnpm-lock.yaml‎

Lines changed: 84 additions & 69 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)