solid-js 2.0.0-beta.0 → 2.0.0-beta.1

package/dist/dev.cjs

@@ -60,6 +60,10 @@ function registerGraph(value) {
   value.graph = owner;
 }
 
+const NoHydrateContext = {
+  id: Symbol("NoHydrateContext"),
+  defaultValue: false
+};
 const sharedConfig = {
   hydrating: false,
   registry: undefined,
@@ -67,6 +71,7 @@ const sharedConfig = {
   getNextContextId() {
     const o = signals.getOwner();
     if (!o) throw new Error(`getNextContextId cannot be used under non-hydrating context`);
+    if (signals.getContext(NoHydrateContext)) return undefined;
     return signals.getNextChildId(o);
   }
 };
@@ -586,6 +591,17 @@ function Loading(props) {
     return signals.createLoadBoundary(() => props.children, () => props.fallback);
   });
 }
+function NoHydration(props) {
+  const o = signals.createOwner();
+  return signals.runWithOwner(o, () => {
+    signals.setContext(NoHydrateContext, true);
+    if (sharedConfig.hydrating) return undefined;
+    return props.children;
+  });
+}
+function Hydration(props) {
+  return props.children;
+}
 
 function createComponent(Comp, props) {
   return devComponent(Comp, props || {});
@@ -617,6 +633,7 @@ function lazy(fn, moduleUrl) {
     }) : "");
   };
   wrap.preload = () => p || ((p = fn()).then(mod => comp = () => mod.default), p);
+  wrap.moduleUrl = moduleUrl;
   return wrap;
 }
 let counter = 0;
@@ -869,8 +886,11 @@ exports.$DEVCOMP = $DEVCOMP;
 exports.DEV = DEV;
 exports.Errored = Errored;
 exports.For = For;
+exports.Hydration = Hydration;
 exports.Loading = Loading;
 exports.Match = Match;
+exports.NoHydrateContext = NoHydrateContext;
+exports.NoHydration = NoHydration;
 exports.Repeat = Repeat;
 exports.Show = Show;
 exports.Switch = Switch;

package/dist/dev.js

@@ -1,4 +1,4 @@
-import { getContext, createMemo as createMemo$1, flatten, getOwner, createRoot, setContext, untrack, setStrictRead, createLoadBoundary, onCleanup, isDisposed, runWithOwner, createEffect as createEffect$1, createOptimistic as createOptimistic$1, createOptimisticStore as createOptimisticStore$1, createProjection as createProjection$1, createRenderEffect as createRenderEffect$1, createSignal as createSignal$1, createStore as createStore$1, setSnapshotCapture, releaseSnapshotScope, getNextChildId, createErrorBoundary as createErrorBoundary$1, markSnapshotScope, flush, clearSnapshots, peekNextChildId, mapArray, repeat } from '@solidjs/signals';
+import { getContext, createMemo as createMemo$1, flatten, getOwner, createRoot, setContext, untrack, setStrictRead, createLoadBoundary, onCleanup, isDisposed, runWithOwner, createOwner, createEffect as createEffect$1, createOptimistic as createOptimistic$1, createOptimisticStore as createOptimisticStore$1, createProjection as createProjection$1, createRenderEffect as createRenderEffect$1, createSignal as createSignal$1, createStore as createStore$1, setSnapshotCapture, releaseSnapshotScope, getNextChildId, createErrorBoundary as createErrorBoundary$1, markSnapshotScope, flush, clearSnapshots, peekNextChildId, mapArray, repeat } from '@solidjs/signals';
 export { $PROXY, $TRACK, NotReadyError, action, createOwner, createReaction, createRoot, createTrackedEffect, deep, flatten, flush, getNextChildId, getObserver, getOwner, isEqual, isPending, isRefreshing, isWrappable, latest, mapArray, merge, omit, onCleanup, onSettled, reconcile, refresh, repeat, resolve, runWithOwner, snapshot, storePath, untrack } from '@solidjs/signals';
 
 const $DEVCOMP = Symbol("COMPONENT_DEV" );
@@ -59,6 +59,10 @@ function registerGraph(value) {
   value.graph = owner;
 }
 
+const NoHydrateContext = {
+  id: Symbol("NoHydrateContext"),
+  defaultValue: false
+};
 const sharedConfig = {
   hydrating: false,
   registry: undefined,
@@ -66,6 +70,7 @@ const sharedConfig = {
   getNextContextId() {
     const o = getOwner();
     if (!o) throw new Error(`getNextContextId cannot be used under non-hydrating context`);
+    if (getContext(NoHydrateContext)) return undefined;
     return getNextChildId(o);
   }
 };
@@ -585,6 +590,17 @@ function Loading(props) {
     return createLoadBoundary(() => props.children, () => props.fallback);
   });
 }
+function NoHydration(props) {
+  const o = createOwner();
+  return runWithOwner(o, () => {
+    setContext(NoHydrateContext, true);
+    if (sharedConfig.hydrating) return undefined;
+    return props.children;
+  });
+}
+function Hydration(props) {
+  return props.children;
+}
 
 function createComponent(Comp, props) {
   return devComponent(Comp, props || {});
@@ -616,6 +632,7 @@ function lazy(fn, moduleUrl) {
     }) : "");
   };
   wrap.preload = () => p || ((p = fn()).then(mod => comp = () => mod.default), p);
+  wrap.moduleUrl = moduleUrl;
   return wrap;
 }
 let counter = 0;
@@ -736,4 +753,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 { $DEVCOMP, DEV, Errored, For, Loading, Match, Repeat, Show, Switch, children, createComponent, createContext, createEffect, createMemo, createOptimistic, createOptimisticStore, createProjection, createRenderEffect, createSignal, createStore, createUniqueId, enableHydration, lazy, sharedConfig, ssrHandleError, ssrRunInScope, useContext };
+export { $DEVCOMP, DEV, Errored, For, Hydration, Loading, Match, NoHydrateContext, NoHydration, Repeat, Show, Switch, children, createComponent, createContext, createEffect, createMemo, createOptimistic, createOptimisticStore, createProjection, createRenderEffect, createSignal, createStore, createUniqueId, enableHydration, lazy, sharedConfig, ssrHandleError, ssrRunInScope, useContext };

package/dist/server.cjs

@@ -2,10 +2,15 @@
 
 var signals = require('@solidjs/signals');
 
+const NoHydrateContext = {
+  id: Symbol("NoHydrateContext"),
+  defaultValue: false
+};
 const sharedConfig = {
   getNextContextId() {
     const o = signals.getOwner();
     if (!o) throw new Error(`getNextContextId cannot be used under non-hydrating context`);
+    if (signals.getContext(NoHydrateContext)) return undefined;
     return signals.getNextChildId(o);
   }
 };
@@ -158,6 +163,7 @@ function processResult(comp, result, owner, ctx, deferStream, ssrSource) {
   if (comp.disposed) return;
   const id = owner.id;
   const uninitialized = comp.value === undefined;
+  const noHydrate = signals.getContext(NoHydrateContext, owner);
   if (result instanceof Promise) {
     result.then(v => {
       result.s = 1;
@@ -166,7 +172,7 @@ function processResult(comp, result, owner, ctx, deferStream, ssrSource) {
       comp.value = v;
       comp.error = undefined;
     }, () => {});
-    if (ctx?.async && ctx.serialize && id) ctx.serialize(id, result, deferStream);
+    if (ctx?.async && ctx.serialize && id && !noHydrate) ctx.serialize(id, result, deferStream);
     if (uninitialized) {
       comp.error = new signals.NotReadyError(result);
     }
@@ -183,7 +189,7 @@ function processResult(comp, result, owner, ctx, deferStream, ssrSource) {
         comp.value = v.value;
         comp.error = undefined;
       }, () => {});
-      if (ctx?.async && ctx.serialize && id) ctx.serialize(id, promise, deferStream);
+      if (ctx?.async && ctx.serialize && id && !noHydrate) ctx.serialize(id, promise, deferStream);
       if (uninitialized) {
         comp.error = new signals.NotReadyError(promise);
       }
@@ -211,7 +217,7 @@ function processResult(comp, result, owner, ctx, deferStream, ssrSource) {
           }
         })
       };
-      if (ctx?.async && ctx.serialize && id) ctx.serialize(id, tapped, deferStream);
+      if (ctx?.async && ctx.serialize && id && !noHydrate) ctx.serialize(id, tapped, deferStream);
       if (uninitialized) {
         comp.error = new signals.NotReadyError(firstReady);
       }
@@ -331,7 +337,7 @@ function createProjection(fn, initialValue = {}, options) {
         promise.v = state;
         markReady();
       }, () => {});
-      if (ctx?.async && !ctx.noHydrate && owner.id) ctx.serialize(owner.id, promise, options?.deferStream);
+      if (ctx?.async && !signals.getContext(NoHydrateContext) && owner.id) ctx.serialize(owner.id, promise, options?.deferStream);
       const [pending, markReady] = createPendingProxy(state, promise);
       return pending;
     } else {
@@ -388,7 +394,7 @@ function createProjection(fn, initialValue = {}, options) {
           }
         })
       };
-      if (ctx?.async && !ctx.noHydrate && owner.id) ctx.serialize(owner.id, tapped, options?.deferStream);
+      if (ctx?.async && !signals.getContext(NoHydrateContext) && owner.id) ctx.serialize(owner.id, tapped, options?.deferStream);
       const [pending, markReady] = createPendingProxy(state, firstReady);
       return pending;
     }
@@ -406,7 +412,7 @@ function createProjection(fn, initialValue = {}, options) {
       promise.v = state;
       markReady();
     }, () => {});
-    if (ctx?.async && !ctx.noHydrate && owner.id) ctx.serialize(owner.id, promise, options?.deferStream);
+    if (ctx?.async && !signals.getContext(NoHydrateContext) && owner.id) ctx.serialize(owner.id, promise, options?.deferStream);
     const [pending, markReady] = createPendingProxy(state, promise);
     return pending;
   }
@@ -434,19 +440,23 @@ function deep(store) {
   return store;
 }
 function mapArray(list, mapFn, options = {}) {
-  const root = signals.getOwner();
-  const id = signals.getNextChildId(root);
+  const parent = signals.createOwner();
   return () => {
     const items = list();
     let s = [];
     if (items && items.length) {
-      for (let i = 0, len = items.length; i < len; i++) {
-        const o = signals.createOwner({
-          id: id + i
-        });
-        s.push(signals.runWithOwner(o, () => mapFn(() => items[i], () => i)));
-      }
-    } else if (options.fallback) s = [options.fallback()];
+      signals.runWithOwner(parent, () => {
+        for (let i = 0, len = items.length; i < len; i++) {
+          const o = signals.createOwner();
+          s.push(signals.runWithOwner(o, () => mapFn(() => items[i], () => i)));
+        }
+      });
+    } else if (options.fallback) {
+      s = [signals.runWithOwner(parent, () => {
+        const fo = signals.createOwner();
+        return signals.runWithOwner(fo, () => options.fallback());
+      })];
+    }
     return s;
   };
 }
@@ -483,13 +493,13 @@ function createErrorBoundary(fn, fallback) {
   return signals.runWithOwner(owner, () => {
     let result;
     signals.setContext(ErrorContext, err => {
-      if (ctx && !ctx.noHydrate && owner.id) ctx.serialize(owner.id, err);
+      if (ctx && !signals.getContext(NoHydrateContext) && owner.id) ctx.serialize(owner.id, err);
       result = fallback(err, () => {});
     });
     try {
       result = fn();
     } catch (err) {
-      if (ctx && !ctx.noHydrate && owner.id) ctx.serialize(owner.id, err);
+      if (ctx && !signals.getContext(NoHydrateContext) && owner.id) ctx.serialize(owner.id, err);
       result = fallback(err, () => {});
     }
     return () => result;
@@ -590,20 +600,23 @@ function lazy(fn, moduleUrl) {
     return p;
   };
   const wrap = props => {
-    if (!moduleUrl) {
+    const noHydrate = signals.getContext(NoHydrateContext);
+    if (!noHydrate && !moduleUrl) {
       throw new Error("lazy() used in SSR without a moduleUrl. " + "All lazy() components require a moduleUrl for correct hydration. " + "This is typically injected by the bundler plugin.");
     }
-    if (!sharedConfig.context?.resolveAssets) {
+    if (!noHydrate && !sharedConfig.context?.resolveAssets) {
       throw new Error(`lazy() called with moduleUrl "${moduleUrl}" but no asset manifest is set. ` + "Pass a manifest option to renderToStream/renderToString.");
     }
     load();
     const ctx = sharedConfig.context;
-    if (!ctx?.registerAsset || !ctx.resolveAssets) return;
+    if (!ctx?.registerAsset || !ctx.resolveAssets || !moduleUrl) return;
     const assets = ctx.resolveAssets(moduleUrl);
     if (assets) {
       for (let i = 0; i < assets.css.length; i++) ctx.registerAsset("style", assets.css[i]);
-      for (let i = 0; i < assets.js.length; i++) ctx.registerAsset("module", assets.js[i]);
-      ctx.registerModule?.(moduleUrl, assets.js[0]);
+      if (!noHydrate) {
+        for (let i = 0; i < assets.js.length; i++) ctx.registerAsset("module", assets.js[i]);
+        ctx.registerModule?.(moduleUrl, assets.js[0]);
+      }
     }
     if (ctx?.async) {
       ctx.block(p.then(() => {
@@ -616,10 +629,13 @@ function lazy(fn, moduleUrl) {
     });
   };
   wrap.preload = load;
+  wrap.moduleUrl = moduleUrl;
   return wrap;
 }
 function createUniqueId() {
-  return sharedConfig.getNextContextId();
+  const o = signals.getOwner();
+  if (!o) throw new Error(`createUniqueId cannot be used outside of a reactive context`);
+  return signals.getNextChildId(o);
 }
 
 function For(props) {
@@ -766,6 +782,23 @@ function Loading(props) {
   ctx.serialize(id, "$$f");
   return signals.runWithOwner(fallbackOwner, () => props.fallback);
 }
+function NoHydration(props) {
+  const o = signals.createOwner();
+  return signals.runWithOwner(o, () => {
+    signals.setContext(NoHydrateContext, true);
+    return props.children;
+  });
+}
+function Hydration(props) {
+  if (!signals.getContext(NoHydrateContext)) return props.children;
+  const o = signals.createOwner({
+    id: props.id ?? ""
+  });
+  return signals.runWithOwner(o, () => {
+    signals.setContext(NoHydrateContext, false);
+    return props.children;
+  });
+}
 
 const DEV = undefined;
 
@@ -837,8 +870,11 @@ exports.$DEVCOMP = $DEVCOMP;
 exports.DEV = DEV;
 exports.Errored = Errored;
 exports.For = For;
+exports.Hydration = Hydration;
 exports.Loading = Loading;
 exports.Match = Match;
+exports.NoHydrateContext = NoHydrateContext;
+exports.NoHydration = NoHydration;
 exports.Repeat = Repeat;
 exports.Show = Show;
 exports.Switch = Switch;

package/dist/server.js

@@ -1,10 +1,15 @@
-import { getOwner, getNextChildId, createOwner, runWithOwner, onCleanup, NotReadyError, isWrappable, setContext, getContext, flatten, createRoot } from '@solidjs/signals';
+import { getOwner, getContext, getNextChildId, createOwner, runWithOwner, onCleanup, NotReadyError, isWrappable, setContext, flatten, createRoot } from '@solidjs/signals';
 export { $PROXY, $TRACK, NotReadyError, createOwner, createRoot, flatten, getNextChildId, getOwner, isEqual, isWrappable, merge, omit, onCleanup, runWithOwner, snapshot, storePath } from '@solidjs/signals';
 
+const NoHydrateContext = {
+  id: Symbol("NoHydrateContext"),
+  defaultValue: false
+};
 const sharedConfig = {
   getNextContextId() {
     const o = getOwner();
     if (!o) throw new Error(`getNextContextId cannot be used under non-hydrating context`);
+    if (getContext(NoHydrateContext)) return undefined;
     return getNextChildId(o);
   }
 };
@@ -157,6 +162,7 @@ function processResult(comp, result, owner, ctx, deferStream, ssrSource) {
   if (comp.disposed) return;
   const id = owner.id;
   const uninitialized = comp.value === undefined;
+  const noHydrate = getContext(NoHydrateContext, owner);
   if (result instanceof Promise) {
     result.then(v => {
       result.s = 1;
@@ -165,7 +171,7 @@ function processResult(comp, result, owner, ctx, deferStream, ssrSource) {
       comp.value = v;
       comp.error = undefined;
     }, () => {});
-    if (ctx?.async && ctx.serialize && id) ctx.serialize(id, result, deferStream);
+    if (ctx?.async && ctx.serialize && id && !noHydrate) ctx.serialize(id, result, deferStream);
     if (uninitialized) {
       comp.error = new NotReadyError(result);
     }
@@ -182,7 +188,7 @@ function processResult(comp, result, owner, ctx, deferStream, ssrSource) {
         comp.value = v.value;
         comp.error = undefined;
       }, () => {});
-      if (ctx?.async && ctx.serialize && id) ctx.serialize(id, promise, deferStream);
+      if (ctx?.async && ctx.serialize && id && !noHydrate) ctx.serialize(id, promise, deferStream);
       if (uninitialized) {
         comp.error = new NotReadyError(promise);
       }
@@ -210,7 +216,7 @@ function processResult(comp, result, owner, ctx, deferStream, ssrSource) {
           }
         })
       };
-      if (ctx?.async && ctx.serialize && id) ctx.serialize(id, tapped, deferStream);
+      if (ctx?.async && ctx.serialize && id && !noHydrate) ctx.serialize(id, tapped, deferStream);
       if (uninitialized) {
         comp.error = new NotReadyError(firstReady);
       }
@@ -330,7 +336,7 @@ function createProjection(fn, initialValue = {}, options) {
         promise.v = state;
         markReady();
       }, () => {});
-      if (ctx?.async && !ctx.noHydrate && owner.id) ctx.serialize(owner.id, promise, options?.deferStream);
+      if (ctx?.async && !getContext(NoHydrateContext) && owner.id) ctx.serialize(owner.id, promise, options?.deferStream);
       const [pending, markReady] = createPendingProxy(state, promise);
       return pending;
     } else {
@@ -387,7 +393,7 @@ function createProjection(fn, initialValue = {}, options) {
           }
         })
       };
-      if (ctx?.async && !ctx.noHydrate && owner.id) ctx.serialize(owner.id, tapped, options?.deferStream);
+      if (ctx?.async && !getContext(NoHydrateContext) && owner.id) ctx.serialize(owner.id, tapped, options?.deferStream);
       const [pending, markReady] = createPendingProxy(state, firstReady);
       return pending;
     }
@@ -405,7 +411,7 @@ function createProjection(fn, initialValue = {}, options) {
       promise.v = state;
       markReady();
     }, () => {});
-    if (ctx?.async && !ctx.noHydrate && owner.id) ctx.serialize(owner.id, promise, options?.deferStream);
+    if (ctx?.async && !getContext(NoHydrateContext) && owner.id) ctx.serialize(owner.id, promise, options?.deferStream);
     const [pending, markReady] = createPendingProxy(state, promise);
     return pending;
   }
@@ -433,19 +439,23 @@ function deep(store) {
   return store;
 }
 function mapArray(list, mapFn, options = {}) {
-  const root = getOwner();
-  const id = getNextChildId(root);
+  const parent = createOwner();
   return () => {
     const items = list();
     let s = [];
     if (items && items.length) {
-      for (let i = 0, len = items.length; i < len; i++) {
-        const o = createOwner({
-          id: id + i
-        });
-        s.push(runWithOwner(o, () => mapFn(() => items[i], () => i)));
-      }
-    } else if (options.fallback) s = [options.fallback()];
+      runWithOwner(parent, () => {
+        for (let i = 0, len = items.length; i < len; i++) {
+          const o = createOwner();
+          s.push(runWithOwner(o, () => mapFn(() => items[i], () => i)));
+        }
+      });
+    } else if (options.fallback) {
+      s = [runWithOwner(parent, () => {
+        const fo = createOwner();
+        return runWithOwner(fo, () => options.fallback());
+      })];
+    }
     return s;
   };
 }
@@ -482,13 +492,13 @@ function createErrorBoundary(fn, fallback) {
   return runWithOwner(owner, () => {
     let result;
     setContext(ErrorContext, err => {
-      if (ctx && !ctx.noHydrate && owner.id) ctx.serialize(owner.id, err);
+      if (ctx && !getContext(NoHydrateContext) && owner.id) ctx.serialize(owner.id, err);
       result = fallback(err, () => {});
     });
     try {
       result = fn();
     } catch (err) {
-      if (ctx && !ctx.noHydrate && owner.id) ctx.serialize(owner.id, err);
+      if (ctx && !getContext(NoHydrateContext) && owner.id) ctx.serialize(owner.id, err);
       result = fallback(err, () => {});
     }
     return () => result;
@@ -589,20 +599,23 @@ function lazy(fn, moduleUrl) {
     return p;
   };
   const wrap = props => {
-    if (!moduleUrl) {
+    const noHydrate = getContext(NoHydrateContext);
+    if (!noHydrate && !moduleUrl) {
       throw new Error("lazy() used in SSR without a moduleUrl. " + "All lazy() components require a moduleUrl for correct hydration. " + "This is typically injected by the bundler plugin.");
     }
-    if (!sharedConfig.context?.resolveAssets) {
+    if (!noHydrate && !sharedConfig.context?.resolveAssets) {
       throw new Error(`lazy() called with moduleUrl "${moduleUrl}" but no asset manifest is set. ` + "Pass a manifest option to renderToStream/renderToString.");
     }
     load();
     const ctx = sharedConfig.context;
-    if (!ctx?.registerAsset || !ctx.resolveAssets) return;
+    if (!ctx?.registerAsset || !ctx.resolveAssets || !moduleUrl) return;
     const assets = ctx.resolveAssets(moduleUrl);
     if (assets) {
       for (let i = 0; i < assets.css.length; i++) ctx.registerAsset("style", assets.css[i]);
-      for (let i = 0; i < assets.js.length; i++) ctx.registerAsset("module", assets.js[i]);
-      ctx.registerModule?.(moduleUrl, assets.js[0]);
+      if (!noHydrate) {
+        for (let i = 0; i < assets.js.length; i++) ctx.registerAsset("module", assets.js[i]);
+        ctx.registerModule?.(moduleUrl, assets.js[0]);
+      }
     }
     if (ctx?.async) {
       ctx.block(p.then(() => {
@@ -615,10 +628,13 @@ function lazy(fn, moduleUrl) {
     });
   };
   wrap.preload = load;
+  wrap.moduleUrl = moduleUrl;
   return wrap;
 }
 function createUniqueId() {
-  return sharedConfig.getNextContextId();
+  const o = getOwner();
+  if (!o) throw new Error(`createUniqueId cannot be used outside of a reactive context`);
+  return getNextChildId(o);
 }
 
 function For(props) {
@@ -765,7 +781,24 @@ function Loading(props) {
   ctx.serialize(id, "$$f");
   return runWithOwner(fallbackOwner, () => props.fallback);
 }
+function NoHydration(props) {
+  const o = createOwner();
+  return runWithOwner(o, () => {
+    setContext(NoHydrateContext, true);
+    return props.children;
+  });
+}
+function Hydration(props) {
+  if (!getContext(NoHydrateContext)) return props.children;
+  const o = createOwner({
+    id: props.id ?? ""
+  });
+  return runWithOwner(o, () => {
+    setContext(NoHydrateContext, false);
+    return props.children;
+  });
+}
 
 const DEV = undefined;
 
-export { $DEVCOMP, DEV, Errored, For, Loading, Match, Repeat, Show, Switch, action, children, createComponent, createContext, createDeepProxy, createEffect, createMemo, createOptimistic, createOptimisticStore, createProjection, createReaction, createRenderEffect, createSignal, createStore, createTrackedEffect, createUniqueId, deep, enableHydration, flush, getObserver, isPending, isRefreshing, latest, lazy, mapArray, onSettled, reconcile, refresh, repeat, resolve, sharedConfig, ssrHandleError, ssrRunInScope, untrack, useContext };
+export { $DEVCOMP, DEV, Errored, For, Hydration, Loading, Match, NoHydrateContext, NoHydration, Repeat, Show, Switch, action, children, createComponent, createContext, createDeepProxy, createEffect, createMemo, createOptimistic, createOptimisticStore, createProjection, createReaction, createRenderEffect, createSignal, createStore, createTrackedEffect, createUniqueId, deep, enableHydration, flush, getObserver, isPending, isRefreshing, latest, lazy, mapArray, onSettled, reconcile, refresh, repeat, resolve, sharedConfig, ssrHandleError, ssrRunInScope, untrack, useContext };

package/dist/solid.cjs

@@ -32,6 +32,10 @@ function children(fn) {
   return memo;
 }
 
+const NoHydrateContext = {
+  id: Symbol("NoHydrateContext"),
+  defaultValue: false
+};
 const sharedConfig = {
   hydrating: false,
   registry: undefined,
@@ -39,6 +43,7 @@ const sharedConfig = {
   getNextContextId() {
     const o = signals.getOwner();
     if (!o) throw new Error(`getNextContextId cannot be used under non-hydrating context`);
+    if (signals.getContext(NoHydrateContext)) return undefined;
     return signals.getNextChildId(o);
   }
 };
@@ -557,6 +562,17 @@ function Loading(props) {
     return signals.createLoadBoundary(() => props.children, () => props.fallback);
   });
 }
+function NoHydration(props) {
+  const o = signals.createOwner();
+  return signals.runWithOwner(o, () => {
+    signals.setContext(NoHydrateContext, true);
+    if (sharedConfig.hydrating) return undefined;
+    return props.children;
+  });
+}
+function Hydration(props) {
+  return props.children;
+}
 
 function createComponent(Comp, props) {
   return signals.untrack(() => Comp(props || {}));
@@ -585,6 +601,7 @@ function lazy(fn, moduleUrl) {
     }) : "");
   };
   wrap.preload = () => p || ((p = fn()).then(mod => comp = () => mod.default), p);
+  wrap.moduleUrl = moduleUrl;
   return wrap;
 }
 let counter = 0;
@@ -813,8 +830,11 @@ exports.$DEVCOMP = $DEVCOMP;
 exports.DEV = DEV;
 exports.Errored = Errored;
 exports.For = For;
+exports.Hydration = Hydration;
 exports.Loading = Loading;
 exports.Match = Match;
+exports.NoHydrateContext = NoHydrateContext;
+exports.NoHydration = NoHydration;
 exports.Repeat = Repeat;
 exports.Show = Show;
 exports.Switch = Switch;

package/dist/solid.js

@@ -1,4 +1,4 @@
-import { getContext, createMemo as createMemo$1, flatten, createRoot, setContext, createLoadBoundary, getOwner, onCleanup, isDisposed, runWithOwner, createEffect as createEffect$1, createOptimistic as createOptimistic$1, createOptimisticStore as createOptimisticStore$1, createProjection as createProjection$1, createRenderEffect as createRenderEffect$1, createSignal as createSignal$1, createStore as createStore$1, setSnapshotCapture, releaseSnapshotScope, getNextChildId, createErrorBoundary as createErrorBoundary$1, markSnapshotScope, flush, clearSnapshots, peekNextChildId, untrack, mapArray, repeat } from '@solidjs/signals';
+import { getContext, createMemo as createMemo$1, flatten, createRoot, setContext, createLoadBoundary, getOwner, onCleanup, isDisposed, runWithOwner, createOwner, createEffect as createEffect$1, createOptimistic as createOptimistic$1, createOptimisticStore as createOptimisticStore$1, createProjection as createProjection$1, createRenderEffect as createRenderEffect$1, createSignal as createSignal$1, createStore as createStore$1, setSnapshotCapture, releaseSnapshotScope, getNextChildId, createErrorBoundary as createErrorBoundary$1, markSnapshotScope, flush, clearSnapshots, peekNextChildId, untrack, mapArray, repeat } from '@solidjs/signals';
 export { $PROXY, $TRACK, NotReadyError, action, createOwner, createReaction, createRoot, createTrackedEffect, deep, flatten, flush, getNextChildId, getObserver, getOwner, isEqual, isPending, isRefreshing, isWrappable, latest, mapArray, merge, omit, onCleanup, onSettled, reconcile, refresh, repeat, resolve, runWithOwner, snapshot, storePath, untrack } from '@solidjs/signals';
 
 const $DEVCOMP = Symbol(0);
@@ -31,6 +31,10 @@ function children(fn) {
   return memo;
 }
 
+const NoHydrateContext = {
+  id: Symbol("NoHydrateContext"),
+  defaultValue: false
+};
 const sharedConfig = {
   hydrating: false,
   registry: undefined,
@@ -38,6 +42,7 @@ const sharedConfig = {
   getNextContextId() {
     const o = getOwner();
     if (!o) throw new Error(`getNextContextId cannot be used under non-hydrating context`);
+    if (getContext(NoHydrateContext)) return undefined;
     return getNextChildId(o);
   }
 };
@@ -556,6 +561,17 @@ function Loading(props) {
     return createLoadBoundary(() => props.children, () => props.fallback);
   });
 }
+function NoHydration(props) {
+  const o = createOwner();
+  return runWithOwner(o, () => {
+    setContext(NoHydrateContext, true);
+    if (sharedConfig.hydrating) return undefined;
+    return props.children;
+  });
+}
+function Hydration(props) {
+  return props.children;
+}
 
 function createComponent(Comp, props) {
   return untrack(() => Comp(props || {}));
@@ -584,6 +600,7 @@ function lazy(fn, moduleUrl) {
     }) : "");
   };
   wrap.preload = () => p || ((p = fn()).then(mod => comp = () => mod.default), p);
+  wrap.moduleUrl = moduleUrl;
   return wrap;
 }
 let counter = 0;
@@ -680,4 +697,4 @@ function ssrHandleError() {}
 function ssrRunInScope() {}
 const DEV = undefined;
 
-export { $DEVCOMP, DEV, Errored, For, Loading, Match, Repeat, Show, Switch, children, createComponent, createContext, createEffect, createMemo, createOptimistic, createOptimisticStore, createProjection, createRenderEffect, createSignal, createStore, createUniqueId, enableHydration, lazy, sharedConfig, ssrHandleError, ssrRunInScope, useContext };
+export { $DEVCOMP, DEV, Errored, For, Hydration, Loading, Match, NoHydrateContext, NoHydration, Repeat, Show, Switch, children, createComponent, createContext, createEffect, createMemo, createOptimistic, createOptimisticStore, createProjection, createRenderEffect, createSignal, createStore, createUniqueId, enableHydration, lazy, sharedConfig, ssrHandleError, ssrRunInScope, useContext };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "solid-js",
   "description": "A declarative JavaScript library for building user interfaces.",
-  "version": "2.0.0-beta.0",
+  "version": "2.0.0-beta.1",
   "author": "Ryan Carniato",
   "license": "MIT",
   "homepage": "https://solidjs.com",
@@ -79,7 +79,7 @@
     "performance"
   ],
   "dependencies": {
-    "@solidjs/signals": "^0.11.1",
+    "@solidjs/signals": "^0.11.3",
     "csstype": "^3.1.0",
     "seroval": "~1.5.0",
     "seroval-plugins": "~1.5.0"

package/types/client/component.d.ts

@@ -70,5 +70,6 @@ export declare function lazy<T extends Component<any>>(fn: () => Promise<{
     preload: () => Promise<{
         default: T;
     }>;
+    moduleUrl?: string;
 };
 export declare function createUniqueId(): string;

package/types/client/hydration.d.ts

@@ -1,4 +1,4 @@
-import { createErrorBoundary as coreErrorBoundary, createMemo as coreMemo, createSignal as coreSignal, createOptimistic as coreOptimistic, createRenderEffect as coreRenderEffect, createEffect as coreEffect, type ProjectionOptions, type Store, type StoreSetter } from "@solidjs/signals";
+import { createErrorBoundary as coreErrorBoundary, createMemo as coreMemo, createSignal as coreSignal, createOptimistic as coreOptimistic, createRenderEffect as coreRenderEffect, createEffect as coreEffect, type ProjectionOptions, type Store, type StoreSetter, type Context } from "@solidjs/signals";
 import { JSX } from "../jsx.js";
 declare module "@solidjs/signals" {
     interface MemoOptions<T> {
@@ -18,6 +18,7 @@ export type HydrationProjectionOptions = ProjectionOptions & {
     ssrSource?: "server" | "hybrid" | "initial" | "client";
 };
 export type HydrationContext = {};
+export declare const NoHydrateContext: Context<boolean>;
 type SharedConfig = {
     hydrating: boolean;
     resources?: {
@@ -73,4 +74,19 @@ export declare function Loading(props: {
     fallback?: JSX.Element;
     children: JSX.Element;
 }): JSX.Element;
+/**
+ * Disables hydration for its children on the client.
+ * During hydration, skips the subtree entirely (returns undefined so DOM is left untouched).
+ * After hydration, renders children fresh.
+ */
+export declare function NoHydration(props: {
+    children: JSX.Element;
+}): JSX.Element;
+/**
+ * Re-enables hydration within a NoHydration zone (passthrough on client).
+ */
+export declare function Hydration(props: {
+    id?: string;
+    children: JSX.Element;
+}): JSX.Element;
 export {};

package/types/index.d.ts

@@ -4,7 +4,7 @@ export { $DEVCOMP, children, createContext, useContext } from "./client/core.js"
 export type { ChildrenReturn, Context, ContextProviderComponent, ResolvedChildren, ResolvedJSXElement } from "./client/core.js";
 export * from "./client/component.js";
 export * from "./client/flow.js";
-export { sharedConfig, Loading, enableHydration, createMemo, createSignal, createStore, createProjection, createOptimistic, createOptimisticStore, createRenderEffect, createEffect } from "./client/hydration.js";
+export { sharedConfig, Loading, enableHydration, createMemo, createSignal, createStore, createProjection, createOptimistic, createOptimisticStore, createRenderEffect, createEffect, NoHydration, Hydration, NoHydrateContext } from "./client/hydration.js";
 export declare function ssrHandleError(): void;
 export declare function ssrRunInScope(): void;
 import type { JSX } from "./jsx.js";

package/types/server/component.d.ts

@@ -62,5 +62,6 @@ export declare function lazy<T extends Component<any>>(fn: () => Promise<{
     preload: () => Promise<{
         default: T;
     }>;
+    moduleUrl?: string;
 };
 export declare function createUniqueId(): string;

package/types/server/hydration.d.ts

@@ -1,6 +1,6 @@
 import type { JSX } from "../jsx.js";
-export { sharedConfig } from "./shared.js";
-export type { HydrationContext } from "./shared.js";
+export { sharedConfig, NoHydrateContext } from "./shared.js";
+export type { HydrationContext, SSRTemplateObject } from "./shared.js";
 /**
  * Handles errors during SSR rendering.
  * Returns the promise source for NotReadyError (for async handling),
@@ -19,3 +19,20 @@ export declare function Loading(props: {
     fallback?: JSX.Element;
     children: JSX.Element;
 }): JSX.Element;
+/**
+ * Disables hydration for its children during SSR.
+ * Elements inside will not receive hydration keys (`_hk`) and signals will not be serialized.
+ * Use `Hydration` to re-enable hydration within a `NoHydration` zone.
+ */
+export declare function NoHydration(props: {
+    children: JSX.Element;
+}): JSX.Element;
+/**
+ * Re-enables hydration within a `NoHydration` zone, establishing a new ID namespace.
+ * Pass an `id` prop matching the client's `hydrate({ renderId })` to align hydration keys.
+ * Has no effect when not inside a `NoHydration` zone (passthrough).
+ */
+export declare function Hydration(props: {
+    id?: string;
+    children: JSX.Element;
+}): JSX.Element;

package/types/server/index.d.ts

@@ -4,7 +4,7 @@ export { $DEVCOMP, children, createContext, useContext, ssrRunInScope } from "./
 export type { ChildrenReturn, Context, ContextProviderComponent, ResolvedChildren, ResolvedJSXElement } from "./core.js";
 export * from "./component.js";
 export * from "./flow.js";
-export { sharedConfig, Loading, ssrHandleError } from "./hydration.js";
+export { sharedConfig, Loading, ssrHandleError, NoHydration, Hydration, NoHydrateContext } from "./hydration.js";
 export type { HydrationContext } from "./hydration.js";
 import type { JSX } from "../jsx.js";
 type JSXElement = JSX.Element;

package/types/server/shared.d.ts

@@ -1,4 +1,5 @@
-type SSRTemplateObject = {
+import type { Context } from "@solidjs/signals";
+export type SSRTemplateObject = {
     t: string[];
     h: Function[];
     p: Promise<any>[];
@@ -35,11 +36,11 @@ export type HydrationContext = {
     assets: any[];
     /** True only in renderToStream — enables async data serialization and streaming. */
     async?: boolean;
-    noHydrate: boolean;
 };
+export declare const NoHydrateContext: Context<boolean>;
 type SharedConfig = {
     context?: HydrationContext;
-    getNextContextId(): string;
+    getNextContextId(): string | undefined;
 };
 export declare const sharedConfig: SharedConfig;
 export {};

package/types/server/signals.d.ts

@@ -3,6 +3,7 @@ export { flatten } from "@solidjs/signals";
 export { snapshot, merge, omit, storePath, $PROXY, $TRACK } from "@solidjs/signals";
 export type { Accessor, ComputeFunction, EffectFunction, EffectBundle, EffectOptions, MemoOptions, NoInfer, SignalOptions, Setter, Signal, Owner, Maybe, Store, StoreSetter, StoreNode, NotWrappable, SolidStore, Merge, Omit, Context, ContextRecord, IQueue, StorePathRange, ArrayFilterFn, CustomPartial, Part, PathSetter } from "@solidjs/signals";
 import type { Accessor, ComputeFunction, EffectFunction, EffectBundle, EffectOptions, MemoOptions, SignalOptions, Signal, Owner, Store, StoreSetter, Context } from "@solidjs/signals";
+import { NoHydrateContext } from "./shared.js";
 interface ServerComputation<T = any> {
     owner: Owner;
     value: T;
@@ -46,6 +47,7 @@ export declare function repeat<T>(count: Accessor<number>, mapFn: (i: number) =>
 }): () => T[];
 declare const ErrorContext: Context<((err: any) => void) | null>;
 export { ErrorContext };
+export { NoHydrateContext };
 export declare function createErrorBoundary<U>(fn: () => any, fallback: (error: unknown, reset: () => void) => U): () => unknown;
 export declare function createLoadBoundary(fn: () => any, fallback: () => any): () => unknown;
 export declare function untrack<T>(fn: () => T): T;