solid-js 1.3.0-rc.2 → 1.3.0-rc.3

package/dist/dev.cjs

@@ -131,6 +131,7 @@ function nextHydrateContext() {
 
 const equalFn = (a, b) => a === b;
 const $PROXY = Symbol("solid-proxy");
+const $DEVCOMP = Symbol('solid-dev-component');
 const signalOptions = {
   equals: equalFn
 };
@@ -465,7 +466,7 @@ function runWithOwner(o, fn) {
   const prev = Owner;
   Owner = o;
   try {
-    return fn();
+    return runUpdates(fn, true);
   } finally {
     Owner = prev;
   }
@@ -478,7 +479,11 @@ function startTransition(fn) {
     fn();
     return Transition.done;
   }
+  const l = Listener;
+  const o = Owner;
   return Promise.resolve().then(() => {
+    Listener = l;
+    Owner = o;
     let t;
     if (Scheduler || SuspenseContext) {
       t = Transition || (Transition = {
@@ -504,7 +509,12 @@ function resumeEffects(e) {
   e.length = 0;
 }
 function devComponent(Comp, props) {
-  const c = createComputation(() => untrack(() => Comp(props)), undefined, true);
+  const c = createComputation(() => untrack(() => {
+    Object.assign(Comp, {
+      [$DEVCOMP]: true
+    });
+    return Comp(props);
+  }), undefined, true);
   c.pending = NOTPENDING;
   c.observers = null;
   c.observerSlots = null;
@@ -1559,6 +1569,7 @@ if (globalThis) {
   if (!globalThis.Solid$$) globalThis.Solid$$ = true;else console.warn("You appear to have multiple instances of Solid. This can lead to unexpected behavior.");
 }
 
+exports.$DEVCOMP = $DEVCOMP;
 exports.$PROXY = $PROXY;
 exports.ErrorBoundary = ErrorBoundary;
 exports.For = For;

package/dist/dev.js

@@ -127,6 +127,7 @@ function nextHydrateContext() {
 
 const equalFn = (a, b) => a === b;
 const $PROXY = Symbol("solid-proxy");
+const $DEVCOMP = Symbol('solid-dev-component');
 const signalOptions = {
   equals: equalFn
 };
@@ -461,7 +462,7 @@ function runWithOwner(o, fn) {
   const prev = Owner;
   Owner = o;
   try {
-    return fn();
+    return runUpdates(fn, true);
   } finally {
     Owner = prev;
   }
@@ -474,7 +475,11 @@ function startTransition(fn) {
     fn();
     return Transition.done;
   }
+  const l = Listener;
+  const o = Owner;
   return Promise.resolve().then(() => {
+    Listener = l;
+    Owner = o;
     let t;
     if (Scheduler || SuspenseContext) {
       t = Transition || (Transition = {
@@ -500,7 +505,12 @@ function resumeEffects(e) {
   e.length = 0;
 }
 function devComponent(Comp, props) {
-  const c = createComputation(() => untrack(() => Comp(props)), undefined, true);
+  const c = createComputation(() => untrack(() => {
+    Object.assign(Comp, {
+      [$DEVCOMP]: true
+    });
+    return Comp(props);
+  }), undefined, true);
   c.pending = NOTPENDING;
   c.observers = null;
   c.observerSlots = null;
@@ -1555,4 +1565,4 @@ if (globalThis) {
   if (!globalThis.Solid$$) globalThis.Solid$$ = true;else console.warn("You appear to have multiple instances of Solid. This can lead to unexpected behavior.");
 }
 
-export { $PROXY, DEV, ErrorBoundary, For, Index, Match, Show, Suspense, SuspenseList, Switch, batch, cancelCallback, children, createComponent, createComputed, createContext, createDeferred, createEffect, createMemo, createRenderEffect, createResource, createRoot, createSelector, createSignal, createUniqueId, enableExternalSource, enableHydration, enableScheduling, equalFn, from, getListener, getOwner, indexArray, lazy, mapArray, mergeProps, observable, on, onCleanup, onError, onMount, refetchResources, requestCallback, runWithOwner, sharedConfig, splitProps, startTransition, untrack, useContext, useTransition };
+export { $DEVCOMP, $PROXY, DEV, ErrorBoundary, For, Index, Match, Show, Suspense, SuspenseList, Switch, batch, cancelCallback, children, createComponent, createComputed, createContext, createDeferred, createEffect, createMemo, createRenderEffect, createResource, createRoot, createSelector, createSignal, createUniqueId, enableExternalSource, enableHydration, enableScheduling, equalFn, from, getListener, getOwner, indexArray, lazy, mapArray, mergeProps, observable, on, onCleanup, onError, onMount, refetchResources, requestCallback, runWithOwner, sharedConfig, splitProps, startTransition, untrack, useContext, useTransition };

package/dist/server.cjs

@@ -4,6 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 const equalFn = (a, b) => a === b;
 const $PROXY = Symbol("solid-proxy");
+const $DEVCOMP = Symbol('solid-dev-component');
 const DEV = {};
 const ERROR = Symbol("error");
 const UNOWNED = {
@@ -509,6 +510,7 @@ function Suspense(props) {
   return props.fallback;
 }
 
+exports.$DEVCOMP = $DEVCOMP;
 exports.$PROXY = $PROXY;
 exports.DEV = DEV;
 exports.ErrorBoundary = ErrorBoundary;

package/dist/server.js

@@ -1,5 +1,6 @@
 const equalFn = (a, b) => a === b;
 const $PROXY = Symbol("solid-proxy");
+const $DEVCOMP = Symbol('solid-dev-component');
 const DEV = {};
 const ERROR = Symbol("error");
 const UNOWNED = {
@@ -505,4 +506,4 @@ function Suspense(props) {
   return props.fallback;
 }
 
-export { $PROXY, DEV, ErrorBoundary, For, Index, Match, Show, Suspense, SuspenseList, Switch, batch, children, createComponent, createComputed, createContext, createDeferred, createEffect, createMemo, createRenderEffect, createResource, createRoot, createSelector, createSignal, createUniqueId, enableExternalSource, enableHydration, enableScheduling, equalFn, from, getListener, getOwner, lazy, mapArray, mergeProps, observable, on, onCleanup, onError, onMount, requestCallback, runWithOwner, sharedConfig, splitProps, startTransition, untrack, useContext, useTransition };
+export { $DEVCOMP, $PROXY, DEV, ErrorBoundary, For, Index, Match, Show, Suspense, SuspenseList, Switch, batch, children, createComponent, createComputed, createContext, createDeferred, createEffect, createMemo, createRenderEffect, createResource, createRoot, createSelector, createSignal, createUniqueId, enableExternalSource, enableHydration, enableScheduling, equalFn, from, getListener, getOwner, lazy, mapArray, mergeProps, observable, on, onCleanup, onError, onMount, requestCallback, runWithOwner, sharedConfig, splitProps, startTransition, untrack, useContext, useTransition };

package/dist/solid.cjs

@@ -131,6 +131,7 @@ function nextHydrateContext() {
 
 const equalFn = (a, b) => a === b;
 const $PROXY = Symbol("solid-proxy");
+const $DEVCOMP = Symbol('solid-dev-component');
 const signalOptions = {
   equals: equalFn
 };
@@ -462,7 +463,7 @@ function runWithOwner(o, fn) {
   const prev = Owner;
   Owner = o;
   try {
-    return fn();
+    return runUpdates(fn, true);
   } finally {
     Owner = prev;
   }
@@ -475,7 +476,11 @@ function startTransition(fn) {
     fn();
     return Transition.done;
   }
+  const l = Listener;
+  const o = Owner;
   return Promise.resolve().then(() => {
+    Listener = l;
+    Owner = o;
     let t;
     if (Scheduler || SuspenseContext) {
       t = Transition || (Transition = {
@@ -1472,6 +1477,7 @@ function Suspense(props) {
 
 let DEV;
 
+exports.$DEVCOMP = $DEVCOMP;
 exports.$PROXY = $PROXY;
 exports.DEV = DEV;
 exports.ErrorBoundary = ErrorBoundary;

package/dist/solid.js

@@ -127,6 +127,7 @@ function nextHydrateContext() {
 
 const equalFn = (a, b) => a === b;
 const $PROXY = Symbol("solid-proxy");
+const $DEVCOMP = Symbol('solid-dev-component');
 const signalOptions = {
   equals: equalFn
 };
@@ -458,7 +459,7 @@ function runWithOwner(o, fn) {
   const prev = Owner;
   Owner = o;
   try {
-    return fn();
+    return runUpdates(fn, true);
   } finally {
     Owner = prev;
   }
@@ -471,7 +472,11 @@ function startTransition(fn) {
     fn();
     return Transition.done;
   }
+  const l = Listener;
+  const o = Owner;
   return Promise.resolve().then(() => {
+    Listener = l;
+    Owner = o;
     let t;
     if (Scheduler || SuspenseContext) {
       t = Transition || (Transition = {
@@ -1468,4 +1473,4 @@ function Suspense(props) {
 
 let DEV;
 
-export { $PROXY, DEV, ErrorBoundary, For, Index, Match, Show, Suspense, SuspenseList, Switch, batch, cancelCallback, children, createComponent, createComputed, createContext, createDeferred, createEffect, createMemo, createRenderEffect, createResource, createRoot, createSelector, createSignal, createUniqueId, enableExternalSource, enableHydration, enableScheduling, equalFn, from, getListener, getOwner, indexArray, lazy, mapArray, mergeProps, observable, on, onCleanup, onError, onMount, refetchResources, requestCallback, runWithOwner, sharedConfig, splitProps, startTransition, untrack, useContext, useTransition };
+export { $DEVCOMP, $PROXY, DEV, ErrorBoundary, For, Index, Match, Show, Suspense, SuspenseList, Switch, batch, cancelCallback, children, createComponent, createComputed, createContext, createDeferred, createEffect, createMemo, createRenderEffect, createResource, createRoot, createSelector, createSignal, createUniqueId, enableExternalSource, enableHydration, enableScheduling, equalFn, from, getListener, getOwner, indexArray, lazy, mapArray, mergeProps, observable, on, onCleanup, onError, onMount, refetchResources, requestCallback, runWithOwner, sharedConfig, splitProps, startTransition, untrack, useContext, useTransition };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "solid-js",
   "description": "A declarative JavaScript library for building user interfaces.",
-  "version": "1.3.0-rc.2",
+  "version": "1.3.0-rc.3",
   "author": "Ryan Carniato",
   "license": "MIT",
   "homepage": "https://solidjs.com",
@@ -144,5 +144,5 @@
     "compiler",
     "performance"
   ],
-  "gitHead": "755131b48e080980ee093f087ecd91945aeb3d31"
+  "gitHead": "24a44a798dc517a578ac4881af594990a1faadc8"
 }

package/types/index.d.ts

@@ -1,4 +1,4 @@
-export { createRoot, createSignal, createEffect, createRenderEffect, createComputed, createDeferred, createSelector, createMemo, createResource, onMount, onCleanup, onError, untrack, batch, on, enableScheduling, enableExternalSource, startTransition, useTransition, refetchResources, createContext, useContext, children, getListener, getOwner, runWithOwner, equalFn, $PROXY } from "./reactive/signal";
+export { createRoot, createSignal, createEffect, createRenderEffect, createComputed, createDeferred, createSelector, createMemo, createResource, onMount, onCleanup, onError, untrack, batch, on, enableScheduling, enableExternalSource, startTransition, useTransition, refetchResources, createContext, useContext, children, getListener, getOwner, runWithOwner, equalFn, $DEVCOMP, $PROXY } from "./reactive/signal";
 export type { Accessor, Setter, Resource, ResourceReturn, ResourceFetcher, ResourceFetcherInfo, Context, ReturnTypes } from "./reactive/signal";
 export * from "./reactive/observable";
 export * from "./reactive/scheduler";

package/types/reactive/signal.d.ts

@@ -2,6 +2,7 @@ import { requestCallback } from "./scheduler";
 import type { JSX } from "../jsx";
 export declare const equalFn: <T>(a: T, b: T) => boolean;
 export declare const $PROXY: unique symbol;
+export declare const $DEVCOMP: unique symbol;
 export declare const NOTPENDING: {};
 export declare var Owner: Owner | null;
 export declare let Transition: TransitionState | null;
@@ -356,7 +357,7 @@ export declare function onCleanup(fn: () => void): () => void;
 export declare function onError(fn: (err: any) => void): void;
 export declare function getListener(): Computation<any, any> | null;
 export declare function getOwner(): Owner | null;
-export declare function runWithOwner(o: Owner, fn: () => any): any;
+export declare function runWithOwner(o: Owner, fn: () => any): void;
 export declare function enableScheduling(scheduler?: typeof requestCallback): void;
 /**
  * ```typescript

package/types/server/index.d.ts

@@ -1,3 +1,3 @@
-export { createRoot, createSignal, createComputed, createRenderEffect, createEffect, createDeferred, createSelector, createMemo, getListener, onMount, onCleanup, onError, untrack, batch, on, children, createContext, useContext, getOwner, runWithOwner, equalFn, requestCallback, mapArray, observable, from, $PROXY, DEV, enableExternalSource } from "./reactive";
+export { createRoot, createSignal, createComputed, createRenderEffect, createEffect, createDeferred, createSelector, createMemo, getListener, onMount, onCleanup, onError, untrack, batch, on, children, createContext, useContext, getOwner, runWithOwner, equalFn, requestCallback, mapArray, observable, from, $PROXY, $DEVCOMP, DEV, enableExternalSource } from "./reactive";
 export { mergeProps, splitProps, createComponent, For, Index, Show, Switch, Match, ErrorBoundary, Suspense, SuspenseList, createResource, enableScheduling, enableHydration, startTransition, useTransition, createUniqueId, lazy, sharedConfig } from "./rendering";
 export type { Component, Resource } from "./rendering";

package/types/server/reactive.d.ts

@@ -1,6 +1,7 @@
 import type { Accessor, Setter } from "../reactive/signal";
 export declare const equalFn: <T>(a: T, b: T) => boolean;
 export declare const $PROXY: unique symbol;
+export declare const $DEVCOMP: unique symbol;
 export declare const DEV: {};
 export declare let Owner: Owner | null;
 interface Owner {

package/web/dist/dev.cjs

@@ -551,75 +551,51 @@ function Dynamic(props) {
 
 Object.defineProperty(exports, 'ErrorBoundary', {
   enumerable: true,
-  get: function () {
-    return solidJs.ErrorBoundary;
-  }
+  get: function () { return solidJs.ErrorBoundary; }
 });
 Object.defineProperty(exports, 'For', {
   enumerable: true,
-  get: function () {
-    return solidJs.For;
-  }
+  get: function () { return solidJs.For; }
 });
 Object.defineProperty(exports, 'Index', {
   enumerable: true,
-  get: function () {
-    return solidJs.Index;
-  }
+  get: function () { return solidJs.Index; }
 });
 Object.defineProperty(exports, 'Match', {
   enumerable: true,
-  get: function () {
-    return solidJs.Match;
-  }
+  get: function () { return solidJs.Match; }
 });
 Object.defineProperty(exports, 'Show', {
   enumerable: true,
-  get: function () {
-    return solidJs.Show;
-  }
+  get: function () { return solidJs.Show; }
 });
 Object.defineProperty(exports, 'Suspense', {
   enumerable: true,
-  get: function () {
-    return solidJs.Suspense;
-  }
+  get: function () { return solidJs.Suspense; }
 });
 Object.defineProperty(exports, 'SuspenseList', {
   enumerable: true,
-  get: function () {
-    return solidJs.SuspenseList;
-  }
+  get: function () { return solidJs.SuspenseList; }
 });
 Object.defineProperty(exports, 'Switch', {
   enumerable: true,
-  get: function () {
-    return solidJs.Switch;
-  }
+  get: function () { return solidJs.Switch; }
 });
 Object.defineProperty(exports, 'createComponent', {
   enumerable: true,
-  get: function () {
-    return solidJs.createComponent;
-  }
+  get: function () { return solidJs.createComponent; }
 });
 Object.defineProperty(exports, 'effect', {
   enumerable: true,
-  get: function () {
-    return solidJs.createRenderEffect;
-  }
+  get: function () { return solidJs.createRenderEffect; }
 });
 Object.defineProperty(exports, 'getOwner', {
   enumerable: true,
-  get: function () {
-    return solidJs.getOwner;
-  }
+  get: function () { return solidJs.getOwner; }
 });
 Object.defineProperty(exports, 'mergeProps', {
   enumerable: true,
-  get: function () {
-    return solidJs.mergeProps;
-  }
+  get: function () { return solidJs.mergeProps; }
 });
 exports.Aliases = Aliases;
 exports.Assets = Assets;

package/web/dist/server.cjs

@@ -258,6 +258,7 @@ function renderToStringAsync(code, options = {}) {
     renderId,
     timeoutMs = 30000
   } = options;
+  const dedupe = new WeakMap();
   const context = solidJs.sharedConfig.context = {
     id: renderId || "",
     count: 0,
@@ -268,8 +269,8 @@ function renderToStringAsync(code, options = {}) {
     nonce,
     writeResource(id, p, error) {
       if (error) return scripts += `_$HY.set("${id}", ${serializeError(p)});`;
-      if (!p || typeof p !== "object" || !("then" in p)) return scripts += `_$HY.set("${id}", ${devalue(p)});`;
-      p.then(d => scripts += `_$HY.set("${id}", ${devalue(d)});`).catch(() => scripts += `_$HY.set("${id}", {});`);
+      if (!p || typeof p !== "object" || !("then" in p)) return scripts += serializeSet(dedupe, id, p);
+      p.then(d => scripts += serializeSet(dedupe, id, d)).catch(() => scripts += `_$HY.set("${id}", {});`);
     }
   };
   const timeout = new Promise((_, reject) => setTimeout(() => reject("renderToString timed out"), timeoutMs));
@@ -318,6 +319,7 @@ function renderToStream(code, options = {}) {
   const tmp = [];
   const tasks = [];
   const registry = new Map();
+  const dedupe = new WeakMap();
   const checkEnd = () => {
     if (!registry.size && !completed) {
       onCompleteAll && onCompleteAll(result);
@@ -356,11 +358,11 @@ function renderToStream(code, options = {}) {
         scheduled = true;
       }
       if (error) return tasks.push(`_$HY.set("${id}", ${serializeError(p)})`);
-      if (!p || typeof p !== "object" || !("then" in p)) return tasks.push(`_$HY.set("${id}", ${devalue(p)})`);
+      if (!p || typeof p !== "object" || !("then" in p)) return tasks.push(serializeSet(dedupe, id, p));
       tasks.push(`_$HY.init("${id}")`);
       p.then(d => {
-        !completed && buffer.write(`<script${nonce ? ` nonce="${nonce}"` : ""}>_$HY.set("${id}", ${devalue(d)})</script>`);
-      }).catch(err => {
+        !completed && buffer.write(`<script${nonce ? ` nonce="${nonce}"` : ""}>${serializeSet(dedupe, id, d)}</script>`);
+      }).catch(() => {
         !completed && buffer.write(`<script${nonce ? ` nonce="${nonce}"` : ""}>_$HY.set("${id}", {})</script>`);
       });
     },
@@ -574,7 +576,7 @@ function generateHydrationScript({
   eventNames = ["click", "input"],
   nonce
 }) {
-  return `<script${nonce ? ` nonce="${nonce}"` : ""}>((e,t,o={})=>{t=e=>e&&e.hasAttribute&&(e.hasAttribute("data-hk")?e:t(e.host&&e.host instanceof Node?e.host:e.parentNode)),["${eventNames.join('","')}"].forEach((o=>document.addEventListener(o,(o=>{let s=o.composedPath&&o.composedPath()[0]||o.target,n=t(s);n&&!e.completed.has(n)&&e.events.push([n,o])})))),e.init=(e,t)=>{o[e]=[new Promise(((e,o)=>t=e)),t]},e.set=(e,t,s)=>{(s=o[e])&&s[1](t),o[e]=[t]},e.unset=e=>{delete o[e]},e.load=(e,t)=>{if(t=o[e])return t[0]}})(window._$HY||(_$HY={events:[],completed:new WeakSet}))</script><!xs>`;
+  return `<script${nonce ? ` nonce="${nonce}"` : ""}>var e,t;e=window._$HY||(_$HY={events:[],completed:new WeakSet,r:{}}),t=e=>e&&e.hasAttribute&&(e.hasAttribute("data-hk")?e:t(e.host&&e.host instanceof Node?e.host:e.parentNode)),["${eventNames.join('","')}"].forEach((o=>document.addEventListener(o,(o=>{let s=o.composedPath&&o.composedPath()[0]||o.target,a=t(s);a&&!e.completed.has(a)&&e.events.push([a,o])})))),e.init=(t,o)=>{e.r[t]=[new Promise(((e,t)=>o=e)),o]},e.set=(t,o,s)=>{(s=e.r[t])&&s[1](o),e.r[t]=[o]},e.unset=t=>{delete e.r[t]},e.load=(t,o)=>{if(o=e.r[t])return o[0]};</script><!xs>`;
 }
 function injectAssets(assets, html) {
   for (let i = 0; i < assets.length; i++) {
@@ -602,6 +604,12 @@ function waitForFragments(registry, key) {
   }
   return false;
 }
+function serializeSet(registry, key, value) {
+  const exist = registry.get(value);
+  if (exist) return `_$HY.set("${key}", _$HY.r["${exist}"][0]);`;
+  registry.set(value, key);
+  return `_$HY.set("${key}", ${devalue(value)});`;
+}
 function pipeToNodeWritable(code, writable, options = {}) {
   if (options.onReady) {
     options.onCompleteShell = () => {
@@ -648,63 +656,43 @@ function Portal(props) {
 
 Object.defineProperty(exports, 'ErrorBoundary', {
   enumerable: true,
-  get: function () {
-    return solidJs.ErrorBoundary;
-  }
+  get: function () { return solidJs.ErrorBoundary; }
 });
 Object.defineProperty(exports, 'For', {
   enumerable: true,
-  get: function () {
-    return solidJs.For;
-  }
+  get: function () { return solidJs.For; }
 });
 Object.defineProperty(exports, 'Index', {
   enumerable: true,
-  get: function () {
-    return solidJs.Index;
-  }
+  get: function () { return solidJs.Index; }
 });
 Object.defineProperty(exports, 'Match', {
   enumerable: true,
-  get: function () {
-    return solidJs.Match;
-  }
+  get: function () { return solidJs.Match; }
 });
 Object.defineProperty(exports, 'Show', {
   enumerable: true,
-  get: function () {
-    return solidJs.Show;
-  }
+  get: function () { return solidJs.Show; }
 });
 Object.defineProperty(exports, 'Suspense', {
   enumerable: true,
-  get: function () {
-    return solidJs.Suspense;
-  }
+  get: function () { return solidJs.Suspense; }
 });
 Object.defineProperty(exports, 'SuspenseList', {
   enumerable: true,
-  get: function () {
-    return solidJs.SuspenseList;
-  }
+  get: function () { return solidJs.SuspenseList; }
 });
 Object.defineProperty(exports, 'Switch', {
   enumerable: true,
-  get: function () {
-    return solidJs.Switch;
-  }
+  get: function () { return solidJs.Switch; }
 });
 Object.defineProperty(exports, 'createComponent', {
   enumerable: true,
-  get: function () {
-    return solidJs.createComponent;
-  }
+  get: function () { return solidJs.createComponent; }
 });
 Object.defineProperty(exports, 'mergeProps', {
   enumerable: true,
-  get: function () {
-    return solidJs.mergeProps;
-  }
+  get: function () { return solidJs.mergeProps; }
 });
 exports.Assets = Assets;
 exports.Dynamic = Dynamic;

package/web/dist/server.js

@@ -255,6 +255,7 @@ function renderToStringAsync(code, options = {}) {
     renderId,
     timeoutMs = 30000
   } = options;
+  const dedupe = new WeakMap();
   const context = sharedConfig.context = {
     id: renderId || "",
     count: 0,
@@ -265,8 +266,8 @@ function renderToStringAsync(code, options = {}) {
     nonce,
     writeResource(id, p, error) {
       if (error) return scripts += `_$HY.set("${id}", ${serializeError(p)});`;
-      if (!p || typeof p !== "object" || !("then" in p)) return scripts += `_$HY.set("${id}", ${devalue(p)});`;
-      p.then(d => scripts += `_$HY.set("${id}", ${devalue(d)});`).catch(() => scripts += `_$HY.set("${id}", {});`);
+      if (!p || typeof p !== "object" || !("then" in p)) return scripts += serializeSet(dedupe, id, p);
+      p.then(d => scripts += serializeSet(dedupe, id, d)).catch(() => scripts += `_$HY.set("${id}", {});`);
     }
   };
   const timeout = new Promise((_, reject) => setTimeout(() => reject("renderToString timed out"), timeoutMs));
@@ -315,6 +316,7 @@ function renderToStream(code, options = {}) {
   const tmp = [];
   const tasks = [];
   const registry = new Map();
+  const dedupe = new WeakMap();
   const checkEnd = () => {
     if (!registry.size && !completed) {
       onCompleteAll && onCompleteAll(result);
@@ -353,11 +355,11 @@ function renderToStream(code, options = {}) {
         scheduled = true;
       }
       if (error) return tasks.push(`_$HY.set("${id}", ${serializeError(p)})`);
-      if (!p || typeof p !== "object" || !("then" in p)) return tasks.push(`_$HY.set("${id}", ${devalue(p)})`);
+      if (!p || typeof p !== "object" || !("then" in p)) return tasks.push(serializeSet(dedupe, id, p));
       tasks.push(`_$HY.init("${id}")`);
       p.then(d => {
-        !completed && buffer.write(`<script${nonce ? ` nonce="${nonce}"` : ""}>_$HY.set("${id}", ${devalue(d)})</script>`);
-      }).catch(err => {
+        !completed && buffer.write(`<script${nonce ? ` nonce="${nonce}"` : ""}>${serializeSet(dedupe, id, d)}</script>`);
+      }).catch(() => {
         !completed && buffer.write(`<script${nonce ? ` nonce="${nonce}"` : ""}>_$HY.set("${id}", {})</script>`);
       });
     },
@@ -571,7 +573,7 @@ function generateHydrationScript({
   eventNames = ["click", "input"],
   nonce
 }) {
-  return `<script${nonce ? ` nonce="${nonce}"` : ""}>((e,t,o={})=>{t=e=>e&&e.hasAttribute&&(e.hasAttribute("data-hk")?e:t(e.host&&e.host instanceof Node?e.host:e.parentNode)),["${eventNames.join('","')}"].forEach((o=>document.addEventListener(o,(o=>{let s=o.composedPath&&o.composedPath()[0]||o.target,n=t(s);n&&!e.completed.has(n)&&e.events.push([n,o])})))),e.init=(e,t)=>{o[e]=[new Promise(((e,o)=>t=e)),t]},e.set=(e,t,s)=>{(s=o[e])&&s[1](t),o[e]=[t]},e.unset=e=>{delete o[e]},e.load=(e,t)=>{if(t=o[e])return t[0]}})(window._$HY||(_$HY={events:[],completed:new WeakSet}))</script><!xs>`;
+  return `<script${nonce ? ` nonce="${nonce}"` : ""}>var e,t;e=window._$HY||(_$HY={events:[],completed:new WeakSet,r:{}}),t=e=>e&&e.hasAttribute&&(e.hasAttribute("data-hk")?e:t(e.host&&e.host instanceof Node?e.host:e.parentNode)),["${eventNames.join('","')}"].forEach((o=>document.addEventListener(o,(o=>{let s=o.composedPath&&o.composedPath()[0]||o.target,a=t(s);a&&!e.completed.has(a)&&e.events.push([a,o])})))),e.init=(t,o)=>{e.r[t]=[new Promise(((e,t)=>o=e)),o]},e.set=(t,o,s)=>{(s=e.r[t])&&s[1](o),e.r[t]=[o]},e.unset=t=>{delete e.r[t]},e.load=(t,o)=>{if(o=e.r[t])return o[0]};</script><!xs>`;
 }
 function injectAssets(assets, html) {
   for (let i = 0; i < assets.length; i++) {
@@ -599,6 +601,12 @@ function waitForFragments(registry, key) {
   }
   return false;
 }
+function serializeSet(registry, key, value) {
+  const exist = registry.get(value);
+  if (exist) return `_$HY.set("${key}", _$HY.r["${exist}"][0]);`;
+  registry.set(value, key);
+  return `_$HY.set("${key}", ${devalue(value)});`;
+}
 function pipeToNodeWritable(code, writable, options = {}) {
   if (options.onReady) {
     options.onCompleteShell = () => {

package/web/dist/web.cjs

@@ -550,75 +550,51 @@ function Dynamic(props) {
 
 Object.defineProperty(exports, 'ErrorBoundary', {
   enumerable: true,
-  get: function () {
-    return solidJs.ErrorBoundary;
-  }
+  get: function () { return solidJs.ErrorBoundary; }
 });
 Object.defineProperty(exports, 'For', {
   enumerable: true,
-  get: function () {
-    return solidJs.For;
-  }
+  get: function () { return solidJs.For; }
 });
 Object.defineProperty(exports, 'Index', {
   enumerable: true,
-  get: function () {
-    return solidJs.Index;
-  }
+  get: function () { return solidJs.Index; }
 });
 Object.defineProperty(exports, 'Match', {
   enumerable: true,
-  get: function () {
-    return solidJs.Match;
-  }
+  get: function () { return solidJs.Match; }
 });
 Object.defineProperty(exports, 'Show', {
   enumerable: true,
-  get: function () {
-    return solidJs.Show;
-  }
+  get: function () { return solidJs.Show; }
 });
 Object.defineProperty(exports, 'Suspense', {
   enumerable: true,
-  get: function () {
-    return solidJs.Suspense;
-  }
+  get: function () { return solidJs.Suspense; }
 });
 Object.defineProperty(exports, 'SuspenseList', {
   enumerable: true,
-  get: function () {
-    return solidJs.SuspenseList;
-  }
+  get: function () { return solidJs.SuspenseList; }
 });
 Object.defineProperty(exports, 'Switch', {
   enumerable: true,
-  get: function () {
-    return solidJs.Switch;
-  }
+  get: function () { return solidJs.Switch; }
 });
 Object.defineProperty(exports, 'createComponent', {
   enumerable: true,
-  get: function () {
-    return solidJs.createComponent;
-  }
+  get: function () { return solidJs.createComponent; }
 });
 Object.defineProperty(exports, 'effect', {
   enumerable: true,
-  get: function () {
-    return solidJs.createRenderEffect;
-  }
+  get: function () { return solidJs.createRenderEffect; }
 });
 Object.defineProperty(exports, 'getOwner', {
   enumerable: true,
-  get: function () {
-    return solidJs.getOwner;
-  }
+  get: function () { return solidJs.getOwner; }
 });
 Object.defineProperty(exports, 'mergeProps', {
   enumerable: true,
-  get: function () {
-    return solidJs.mergeProps;
-  }
+  get: function () { return solidJs.mergeProps; }
 });
 exports.Aliases = Aliases;
 exports.Assets = Assets;