Skip to content

Commit c037364

Browse files
committed
Merge remote-tracking branch 'origin/next' into claude/create-deferred-d40
# Conflicts: # scripts/size/scenarios.js
2 parents 52a2fc6 + eb4e019 commit c037364

15 files changed

Lines changed: 160 additions & 50 deletions

File tree

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"solid-js": patch
3+
---
4+
5+
Hydration no longer hydrates a streamed `<Loading>` fallback when the fragment was already revealed but its `_fr` record hasn't settled yet (an async entry running between the two scripts). The boundary renders nothing and adopts the revealed content once the record settles (#4074).

‎examples/chat/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
},
1717
"dependencies": {
1818
"@anthropic-ai/sdk": "^0.133.0",
19-
"@solidjs/router": "2.0.0-next.39",
19+
"@solidjs/router": "2.0.0-next.40",
2020
"@solidjs/web": "workspace:*",
2121
"highlight.js": "^11.11.1",
2222
"marked": "^12.0.2",

‎examples/hackernews-spa/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"typecheck": "tsc --noEmit"
1414
},
1515
"dependencies": {
16-
"@solidjs/router": "2.0.0-next.39",
16+
"@solidjs/router": "2.0.0-next.40",
1717
"@solidjs/web": "workspace:*",
1818
"solid-js": "workspace:*"
1919
},

‎examples/hackernews/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"typecheck": "tsc --noEmit"
1414
},
1515
"dependencies": {
16-
"@solidjs/router": "2.0.0-next.39",
16+
"@solidjs/router": "2.0.0-next.40",
1717
"@solidjs/web": "workspace:*",
1818
"solid-js": "workspace:*"
1919
},

‎examples/notes/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"typecheck": "tsc --noEmit"
1414
},
1515
"dependencies": {
16-
"@solidjs/router": "2.0.0-next.39",
16+
"@solidjs/router": "2.0.0-next.40",
1717
"@solidjs/web": "workspace:*",
1818
"date-fns": "^3.6.0",
1919
"marked": "^12.0.2",

‎examples/server-dbmon/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"typecheck": "tsc --noEmit"
1414
},
1515
"dependencies": {
16-
"@solidjs/router": "2.0.0-next.39",
16+
"@solidjs/router": "2.0.0-next.40",
1717
"@solidjs/web": "workspace:*",
1818
"solid-js": "workspace:*"
1919
},

‎examples/todos-server/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"typecheck": "tsc --noEmit"
1414
},
1515
"dependencies": {
16-
"@solidjs/router": "2.0.0-next.39",
16+
"@solidjs/router": "2.0.0-next.40",
1717
"@solidjs/web": "workspace:*",
1818
"solid-js": "workspace:*",
1919
"unstorage": "^1.17.5"

‎packages/signals/src/store/types.ts‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,13 @@ export interface ProjectionOptions extends StoreOptions {
6666
seedLoadingValue?: boolean;
6767
}
6868

69+
/** @internal */
6970
export type NoFn<T> = T extends Function ? never : T;
70-
/** Rejects array roots on the seedless derived form: a store's root shape is
71-
* fixed when it is created, and `[]` is already a complete seed for an array. */
71+
/**
72+
* Rejects array roots on the seedless derived form: a store's root shape is
73+
* fixed when it is created, and `[]` is already a complete seed for an array.
74+
* @internal
75+
*/
7276
export type NoArray<T> = Extract<T, readonly unknown[]> extends never ? unknown : never;
7377

7478
/** Brand keys the proxy answers directly (never user data). */

‎packages/solid/src/client/hydration.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2918,7 +2918,11 @@ function hydratedCreateLoadingBoundary<T, U>(
29182918
false,
29192919
fragmentAbort(id)
29202920
);
2921-
return fallback();
2921+
// Revealed ahead of its `_fr` settlement (two scripts on the wire; an
2922+
// async entry can run between them, #4074): the fallback is gone and
2923+
// the content is in the DOM, so render nothing until the resume
2924+
// adopts it.
2925+
return (globalThis as any)._$HY.v?.[id] ? undefined : fallback();
29222926
}
29232927

29242928
if (assetPromise && !sharedConfig.has!(id)) {

‎packages/web/src/client.ts‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ export function takeHydrationValue(key) {
304304
* Client stub — a render's link handler is set during server rendering
305305
* (see the server entry's `setLinkClaim`). Always `false` here, so a router
306306
* can call it unguarded from isomorphic setup code.
307-
* @experimental
307+
* @internal
308308
*/
309309
export function setLinkClaim(_handler: LinkClaimHandler | undefined): boolean {
310310
return false;
@@ -318,7 +318,7 @@ export function setLinkClaim(_handler: LinkClaimHandler | undefined): boolean {
318318
* and after hydration. `false` on a page rendered without the router — the
319319
* absence of link state on an anchor then means nothing, and a link
320320
* consumer must resolve it itself. Server: `false`.
321-
* @experimental
321+
* @internal
322322
*/
323323
export function hasServerLinkState(): boolean {
324324
const registry = globalThis._$HY && globalThis._$HY.r;
@@ -704,7 +704,10 @@ const claimAttributeSets = [];
704704
// when the two land in separately bundled copies of this module.
705705
const CLAIM_SEAM = Symbol.for("solid.element-claims");
706706

707-
/** Options for `registerElementClaim`. */
707+
/**
708+
* Options for `registerElementClaim`.
709+
* @internal
710+
*/
708711
export type ElementClaimOptions = {
709712
/**
710713
* Attribute names whose compiler-owned writes re-claim an already claimed

0 commit comments

Comments
 (0)