solid-js 2.0.0-beta.4 → 2.0.0-beta.6

package/dist/solid.js

@@ -1,5 +1,5 @@
-import { getContext, createMemo as createMemo$1, flatten, createRoot, setContext, createLoadingBoundary, 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, $REFRESH, $TRACK, NotReadyError, action, createErrorBoundary, createLoadingBoundary, createOwner, createReaction, createRoot, createTrackedEffect, deep, enableExternalSource, enforceLoadingBoundary, 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';
+import { getContext, createMemo as createMemo$1, flatten, createRoot, setContext, createOwner, runWithOwner, createEffect as createEffect$1, createErrorBoundary as createErrorBoundary$1, createLoadingBoundary as createLoadingBoundary$1, getOwner, 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, onCleanup, isDisposed, peekNextChildId, clearSnapshots, flush, markSnapshotScope, untrack, mapArray, repeat, createRevealOrder } from '@solidjs/signals';
+export { $PROXY, $REFRESH, $TRACK, NotReadyError, action, createOwner, createReaction, createRevealOrder, createRoot, createTrackedEffect, deep, enableExternalSource, enforceLoadingBoundary, flatten, flush, getNextChildId, getObserver, getOwner, isDisposed, isEqual, isPending, isRefreshing, isWrappable, latest, mapArray, merge, omit, onCleanup, onSettled, reconcile, refresh, repeat, resolve, runWithOwner, snapshot, storePath, untrack } from '@solidjs/signals';
 
 const IS_DEV = false;
 const $DEVCOMP = Symbol(0);
@@ -71,6 +71,7 @@ function drainHydrationCallbacks() {
   if (cbs) for (const cb of cbs) cb();
   setTimeout(() => {
     if (globalThis._$HY) globalThis._$HY.done = true;
+    sharedConfig.registry?.clear();
   });
 }
 function checkHydrationComplete() {
@@ -88,23 +89,10 @@ let _createOptimisticStore;
 let _createRenderEffect;
 let _createEffect;
 class MockPromise {
-  static all() {
-    return new MockPromise();
-  }
-  static allSettled() {
-    return new MockPromise();
-  }
-  static any() {
-    return new MockPromise();
-  }
-  static race() {
-    return new MockPromise();
-  }
-  static reject() {
-    return new MockPromise();
-  }
-  static resolve() {
-    return new MockPromise();
+  static {
+    for (const k of ["all", "allSettled", "any", "race", "reject", "resolve"]) {
+      MockPromise[k] = () => new MockPromise();
+    }
   }
   catch() {
     return new MockPromise();
@@ -139,6 +127,28 @@ function syncThenable(value) {
     }
   };
 }
+const NO_HYDRATED_VALUE = Symbol("NO_HYDRATED_VALUE");
+function readHydratedValue(initP, refresh) {
+  if (initP == null) return NO_HYDRATED_VALUE;
+  refresh();
+  if (typeof initP === "object" && initP.s === 2) throw initP.v;
+  return initP?.v ?? initP;
+}
+function readSerializedOrCompute(compute, prev) {
+  if (!sharedConfig.hydrating) return compute(prev);
+  const o = getOwner();
+  let initP;
+  if (sharedConfig.has(o.id)) initP = sharedConfig.load(o.id);
+  const init = readHydratedValue(initP, () => subFetch(compute, prev));
+  return init !== NO_HYDRATED_VALUE ? init : compute(prev);
+}
+function forwardIteratorReturn(it, value) {
+  const returned = it.return?.(value);
+  return returned && typeof returned.then === "function" ? returned : syncThenable(returned ?? {
+    done: true,
+    value
+  });
+}
 function normalizeIterator(it) {
   let first = true;
   let buffered = null;
@@ -165,6 +175,10 @@ function normalizeIterator(it) {
         latest = peek;
       }
       return Promise.resolve(latest);
+    },
+    return(value) {
+      buffered = null;
+      return forwardIteratorReturn(it, value);
     }
   };
 }
@@ -242,6 +256,9 @@ function wrapFirstYield(iterable, activate) {
             });
           }
           return p;
+        },
+        return(value) {
+          return forwardIteratorReturn(srcIt, value);
         }
       };
     }
@@ -324,6 +341,10 @@ function hydrateStoreFromAsyncIterable(coreFn, initialValue, options) {
               if (!r.done) result = process(r);
             }
             return Promise.resolve(result);
+          },
+          return(value) {
+            buffered = null;
+            return forwardIteratorReturn(srcIt, value);
           }
         };
       }
@@ -356,14 +377,7 @@ function hydratedCreateMemo(compute, value, options) {
   }
   const aiResult = hydrateSignalFromAsyncIterable(createMemo$1, compute, value, options);
   if (aiResult !== null) return aiResult;
-  return createMemo$1(prev => {
-    const o = getOwner();
-    if (!sharedConfig.hydrating) return compute(prev);
-    let initP;
-    if (sharedConfig.has(o.id)) initP = sharedConfig.load(o.id);
-    const init = initP?.v ?? initP;
-    return init != null ? (subFetch(compute, prev), init) : compute(prev);
-  }, value, options);
+  return createMemo$1(prev => readSerializedOrCompute(compute, prev), value, options);
 }
 function hydratedCreateSignal(fn, second, third) {
   if (typeof fn !== "function" || !sharedConfig.hydrating) return createSignal$1(fn, second, third);
@@ -389,14 +403,7 @@ function hydratedCreateSignal(fn, second, third) {
   }
   const aiResult = hydrateSignalFromAsyncIterable(createSignal$1, fn, second, third);
   if (aiResult !== null) return aiResult;
-  return createSignal$1(prev => {
-    if (!sharedConfig.hydrating) return fn(prev);
-    const o = getOwner();
-    let initP;
-    if (sharedConfig.has(o.id)) initP = sharedConfig.load(o.id);
-    const init = initP?.v ?? initP;
-    return init != null ? (subFetch(fn, prev), init) : fn(prev);
-  }, second, third);
+  return createSignal$1(prev => readSerializedOrCompute(fn, prev), second, third);
 }
 function hydratedCreateErrorBoundary(fn, fallback) {
   if (!sharedConfig.hydrating) return createErrorBoundary$1(fn, fallback);
@@ -442,24 +449,10 @@ function hydratedCreateOptimistic(fn, second, third) {
   }
   const aiResult = hydrateSignalFromAsyncIterable(createOptimistic$1, fn, second, third);
   if (aiResult !== null) return aiResult;
-  return createOptimistic$1(prev => {
-    const o = getOwner();
-    if (!sharedConfig.hydrating) return fn(prev);
-    let initP;
-    if (sharedConfig.has(o.id)) initP = sharedConfig.load(o.id);
-    const init = initP?.v ?? initP;
-    return init != null ? (subFetch(fn, prev), init) : fn(prev);
-  }, second, third);
+  return createOptimistic$1(prev => readSerializedOrCompute(fn, prev), second, third);
 }
 function wrapStoreFn(fn) {
-  return draft => {
-    const o = getOwner();
-    if (!sharedConfig.hydrating) return fn(draft);
-    let initP;
-    if (sharedConfig.has(o.id)) initP = sharedConfig.load(o.id);
-    const init = initP?.v ?? initP;
-    return init != null ? (subFetch(fn, draft), init) : fn(draft);
-  };
+  return draft => readSerializedOrCompute(() => fn(draft), draft);
 }
 function hydrateStoreLikeFn(coreFn, fn, initialValue, options, ssrSource) {
   if (ssrSource === "client") {
@@ -482,11 +475,8 @@ function hydrateStoreLikeFn(coreFn, fn, initialValue, options, ssrSource) {
       if (!hydrated()) {
         if (sharedConfig.has(o.id)) {
           const initP = sharedConfig.load(o.id);
-          const init = initP?.v ?? initP;
-          if (init != null) {
-            subFetch(fn, draft);
-            return init;
-          }
+          const init = readHydratedValue(initP, () => subFetch(fn, draft));
+          if (init !== NO_HYDRATED_VALUE) return init;
         }
         return fn(draft);
       }
@@ -553,14 +543,7 @@ function hydratedEffect(coreFn, compute, effectFn, value, options) {
     return;
   }
   markTopLevelSnapshotScope();
-  coreFn(prev => {
-    const o = getOwner();
-    if (!sharedConfig.hydrating) return compute(prev);
-    let initP;
-    if (sharedConfig.has(o.id)) initP = sharedConfig.load(o.id);
-    const init = initP?.v ?? initP;
-    return init != null ? (subFetch(compute, prev), init) : compute(prev);
-  }, effectFn, value, options);
+  coreFn(prev => readSerializedOrCompute(compute, prev), effectFn, value, options);
 }
 function hydratedCreateRenderEffect(compute, effectFn, value, options) {
   return hydratedEffect(createRenderEffect$1, compute, effectFn, value, options);
@@ -658,7 +641,7 @@ function resumeBoundaryHydration(o, id, set) {
     checkHydrationComplete();
     return;
   }
-  sharedConfig.gather(id);
+  sharedConfig.gather?.(id);
   _hydratingValue = true;
   markSnapshotScope(o);
   _snapshotRootOwner = o;
@@ -670,11 +653,41 @@ function resumeBoundaryHydration(o, id, set) {
   flush();
   checkHydrationComplete();
 }
-function Loading(props) {
-  const onOpt = props.on ? {
-    on: () => props.on()
-  } : undefined;
-  if (!sharedConfig.hydrating) return createLoadingBoundary(() => props.children, () => props.fallback, onOpt);
+function initBoundaryResume(o, id) {
+  _pendingBoundaries++;
+  onCleanup(() => {
+    if (!isDisposed(o)) return;
+    sharedConfig.cleanupFragment?.(id);
+  });
+  const set = createBoundaryTrigger();
+  return [set, () => resumeBoundaryHydration(o, id, set)];
+}
+function waitAndResume(p, resume, assetPromise) {
+  const waitFor = assetPromise ? Promise.all([p, assetPromise]) : p;
+  waitFor.then(() => {
+    if (p && typeof p === "object") p.s = 1;
+    resume();
+  }, err => {
+    if (p && typeof p === "object") {
+      p.s = 2;
+      p.v = err;
+    }
+    resume();
+  });
+}
+function scheduleResumeAfterAssets(id, resume, assetPromise) {
+  sharedConfig.gather?.(id);
+  const doResume = () => queueMicrotask(resume);
+  if (assetPromise) {
+    assetPromise.then(doResume);
+    return true;
+  }
+  doResume();
+  return false;
+}
+function createLoadingBoundary(fn, fallback, options) {
+  if (!sharedConfig.hydrating) return createLoadingBoundary$1(fn, fallback, options);
+  let settledSerializationResumeQueued = false;
   return createMemo$1(() => {
     const o = getOwner();
     const id = o.id;
@@ -684,27 +697,21 @@ function Loading(props) {
       if (mapping && typeof mapping === "object") assetPromise = loadModuleAssets(mapping);
     }
     if (sharedConfig.hydrating && sharedConfig.has(id)) {
-      let ref = sharedConfig.load(id);
+      const ref = sharedConfig.load(id);
       let p;
       if (ref) {
-        if (typeof ref !== "object" || ref.s !== 1) p = ref;else sharedConfig.gather(id);
+        if (typeof ref !== "object" || ref.s == null) p = ref;else if (ref.s === 1 || ref.s === 2) sharedConfig.gather?.(id);else p = ref;
+      }
+      if (ref && typeof ref === "object" && ref.s === 1 && p == null && !settledSerializationResumeQueued) {
+        settledSerializationResumeQueued = true;
+        const [, resume] = initBoundaryResume(o, id);
+        if (scheduleResumeAfterAssets(id, resume, assetPromise)) return undefined;
+        return fallback();
       }
       if (p) {
-        _pendingBoundaries++;
-        onCleanup(() => {
-          if (!isDisposed(o)) return;
-          sharedConfig.cleanupFragment?.(id);
-        });
-        const set = createBoundaryTrigger();
+        const [set, resume] = initBoundaryResume(o, id);
         if (p !== "$$f") {
-          const waitFor = assetPromise ? Promise.all([p, assetPromise]) : p;
-          waitFor.then(() => resumeBoundaryHydration(o, id, set), err => {
-            _pendingBoundaries--;
-            checkHydrationComplete();
-            runWithOwner(o, () => {
-              throw err;
-            });
-          });
+          waitAndResume(p, resume, assetPromise);
         } else {
           const afterAssets = () => {
             _pendingBoundaries--;
@@ -713,17 +720,26 @@ function Loading(props) {
           };
           if (assetPromise) assetPromise.then(() => queueMicrotask(afterAssets));else queueMicrotask(afterAssets);
         }
-        return props.fallback;
+        return fallback();
+      }
+    }
+    if (sharedConfig.hydrating && sharedConfig.has(id + "_fr") && !settledSerializationResumeQueued) {
+      settledSerializationResumeQueued = true;
+      const fr = sharedConfig.load(id + "_fr");
+      const [, resume] = initBoundaryResume(o, id);
+      if (fr && typeof fr === "object" && (fr.s === 1 || fr.s === 2)) {
+        if (scheduleResumeAfterAssets(id, resume, assetPromise)) return undefined;
+        return fallback();
       }
+      waitAndResume(fr, resume, assetPromise);
+      return fallback();
     }
-    if (assetPromise) {
-      _pendingBoundaries++;
-      const set = createBoundaryTrigger();
-      assetPromise.then(() => resumeBoundaryHydration(o, id, set));
+    if (assetPromise && !sharedConfig.has(id)) {
+      const [, resume] = initBoundaryResume(o, id);
+      assetPromise.then(resume);
       return undefined;
     }
-    const boundary = createLoadingBoundary(() => props.children, () => props.fallback, onOpt);
-    return boundary;
+    return createLoadingBoundary$1(fn, fallback, options);
   });
 }
 function NoHydration(props) {
@@ -847,9 +863,21 @@ function Errored(props) {
     return typeof f === "function" && f.length ? f(err, reset) : f;
   });
 }
+function Loading(props) {
+  const onOpt = "on" in props ? {
+    on: () => props.on
+  } : undefined;
+  return createLoadingBoundary(() => props.children, () => props.fallback, onOpt);
+}
+function Reveal(props) {
+  return createRevealOrder(() => props.children, {
+    together: () => !!props.together,
+    collapsed: () => !!props.collapsed
+  });
+}
 
 function ssrHandleError() {}
 function ssrRunInScope() {}
 const DEV = undefined;
 
-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 };
+export { $DEVCOMP, DEV, Errored, For, Hydration, Loading, Match, NoHydrateContext, NoHydration, Repeat, Reveal, Show, Switch, children, createComponent, createContext, createEffect, createErrorBoundary, createLoadingBoundary, 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.4",
+  "version": "2.0.0-beta.6",
   "author": "Ryan Carniato",
   "license": "MIT",
   "homepage": "https://solidjs.com",
@@ -79,7 +79,7 @@
     "performance"
   ],
   "dependencies": {
-    "@solidjs/signals": "^0.13.6",
+    "@solidjs/signals": "^0.13.11",
     "csstype": "^3.1.0",
     "seroval": "~1.5.0",
     "seroval-plugins": "~1.5.0"

package/types/client/core.d.ts

@@ -1,4 +1,4 @@
-import type { Accessor, Owner, EffectOptions } from "@solidjs/signals";
+import type { Accessor, EffectOptions } from "@solidjs/signals";
 import type { JSX } from "../jsx.js";
 import { FlowComponent } from "./component.js";
 export declare const IS_DEV: string | boolean;
@@ -56,10 +56,3 @@ export type ChildrenReturn = Accessor<ResolvedChildren> & {
  */
 export declare function children(fn: Accessor<JSX.Element>): ChildrenReturn;
 export declare function devComponent<P, V>(Comp: (props: P) => V, props: P): V;
-interface SourceMapValue {
-    value: unknown;
-    name?: string;
-    graph?: Owner;
-}
-export declare function registerGraph(value: SourceMapValue): void;
-export {};

package/types/client/flow.d.ts

@@ -1,5 +1,8 @@
 import type { Accessor } from "@solidjs/signals";
 import type { JSX } from "../jsx.js";
+type NonZeroParams<T extends (...args: any[]) => any> = Parameters<T>["length"] extends 0 ? never : T;
+type ConditionalRenderCallback<T> = (item: Accessor<NonNullable<T>>) => JSX.Element;
+type ConditionalRenderChildren<T, F extends ConditionalRenderCallback<T> = ConditionalRenderCallback<T>> = JSX.Element | NonZeroParams<F>;
 /**
  * Creates a list of elements from a list
  *
@@ -40,11 +43,11 @@ export declare function Repeat<T extends JSX.Element>(props: {
  * Conditionally render its children or an optional fallback component
  * @description https://docs.solidjs.com/reference/components/show
  */
-export declare function Show<T>(props: {
+export declare function Show<T, F extends ConditionalRenderCallback<T>>(props: {
     when: T | undefined | null | false;
     keyed?: boolean;
     fallback?: JSX.Element;
-    children: JSX.Element | ((item: Accessor<NonNullable<T>>) => JSX.Element);
+    children: ConditionalRenderChildren<T, F>;
 }): JSX.Element;
 /**
  * Switches between content based on mutually exclusive conditions
@@ -64,10 +67,10 @@ export declare function Switch(props: {
     fallback?: JSX.Element;
     children: JSX.Element;
 }): JSX.Element;
-export type MatchProps<T> = {
+export type MatchProps<T, F extends ConditionalRenderCallback<T> = ConditionalRenderCallback<T>> = {
     when: T | undefined | null | false;
     keyed?: boolean;
-    children: JSX.Element | ((item: Accessor<NonNullable<T>>) => JSX.Element);
+    children: ConditionalRenderChildren<T, F>;
 };
 /**
  * Selects a content based on condition when inside a `<Switch>` control flow
@@ -78,7 +81,7 @@ export type MatchProps<T> = {
  * ```
  * @description https://docs.solidjs.com/reference/components/switch-and-match
  */
-export declare function Match<T>(props: MatchProps<T>): JSX.Element;
+export declare function Match<T, F extends ConditionalRenderCallback<T>>(props: MatchProps<T, F>): JSX.Element;
 /**
  * Catches uncaught errors inside components and renders a fallback content
  *
@@ -98,3 +101,42 @@ export declare function Errored(props: {
     fallback: JSX.Element | ((err: any, reset: () => void) => JSX.Element);
     children: JSX.Element;
 }): JSX.Element;
+/**
+ * Tracks all resources inside a component and renders a fallback until they are all resolved
+ * ```typescript
+ * const AsyncComponent = lazy(() => import('./component'));
+ *
+ * <Loading fallback={<LoadingIndicator />}>
+ *   <AsyncComponent />
+ * </Loading>
+ * ```
+ * @description https://docs.solidjs.com/reference/components/suspense
+ */
+export declare function Loading(props: {
+    fallback?: JSX.Element;
+    on?: any;
+    children: JSX.Element;
+}): JSX.Element;
+/**
+ * Coordinates the reveal timing of sibling `<Loading>` boundaries.
+ *
+ * - **Sequential** (default): boundaries reveal in DOM order as each resolves.
+ * - **Together** (`together`): all boundaries wait until the group is ready, then reveal at once.
+ * - **Collapsed** (`collapsed`, sequential only): only the frontier boundary shows its fallback;
+ *   later boundaries produce nothing until their turn.
+ *
+ * ```typescript
+ * <Reveal>
+ *   <Loading fallback={<Skeleton />}><ProfileHeader /></Loading>
+ *   <Loading fallback={<Skeleton />}><Posts /></Loading>
+ * </Reveal>
+ * ```
+ *
+ * @description https://docs.solidjs.com/reference/components/reveal
+ */
+export declare function Reveal(props: {
+    together?: boolean;
+    collapsed?: boolean;
+    children: JSX.Element;
+}): JSX.Element;
+export {};

package/types/client/hydration.d.ts

@@ -1,17 +1,15 @@
 import { createErrorBoundary as coreErrorBoundary, createMemo as coreMemo, createSignal as coreSignal, createOptimistic as coreOptimistic, createRenderEffect as coreRenderEffect, createEffect as coreEffect, $REFRESH, type ProjectionOptions, type Store, type StoreSetter, type Context } from "@solidjs/signals";
 import { JSX } from "../jsx.js";
+type HydrationSsrFields = {
+    deferStream?: boolean;
+    ssrSource?: "server" | "hybrid" | "initial" | "client";
+};
 declare module "@solidjs/signals" {
-    interface MemoOptions<T> {
-        deferStream?: boolean;
-        ssrSource?: "server" | "hybrid" | "initial" | "client";
+    interface MemoOptions<T> extends HydrationSsrFields {
     }
-    interface SignalOptions<T> {
-        deferStream?: boolean;
-        ssrSource?: "server" | "hybrid" | "initial" | "client";
+    interface SignalOptions<T> extends HydrationSsrFields {
     }
-    interface EffectOptions {
-        deferStream?: boolean;
-        ssrSource?: "server" | "hybrid" | "initial" | "client";
+    interface EffectOptions extends HydrationSsrFields {
     }
 }
 export type HydrationProjectionOptions = ProjectionOptions & {
@@ -76,11 +74,9 @@ export declare const createEffect: typeof coreEffect;
  * ```
  * @description https://docs.solidjs.com/reference/components/suspense
  */
-export declare function Loading(props: {
-    fallback?: JSX.Element;
+export declare function createLoadingBoundary(fn: () => any, fallback: () => any, options?: {
     on?: () => any;
-    children: JSX.Element;
-}): JSX.Element;
+}): () => unknown;
 /**
  * Disables hydration for its children on the client.
  * During hydration, skips the subtree entirely (returns undefined so DOM is left untouched).

package/types/index.d.ts

@@ -1,20 +1,17 @@
-export { $PROXY, $REFRESH, $TRACK, action, createErrorBoundary, createLoadingBoundary, createOwner, createReaction, createRoot, createTrackedEffect, deep, flatten, flush, getNextChildId, getObserver, getOwner, isEqual, isRefreshing, isPending, isWrappable, mapArray, merge, omit, onCleanup, onSettled, latest, reconcile, refresh, repeat, resolve, NotReadyError, runWithOwner, enableExternalSource, enforceLoadingBoundary, snapshot, storePath, untrack } from "@solidjs/signals";
+export { $PROXY, $REFRESH, $TRACK, action, createOwner, createReaction, createRevealOrder, createRoot, createTrackedEffect, deep, flatten, flush, getNextChildId, getObserver, getOwner, isDisposed, isEqual, isRefreshing, isPending, isWrappable, mapArray, merge, omit, onCleanup, onSettled, latest, reconcile, refresh, repeat, resolve, NotReadyError, runWithOwner, enableExternalSource, enforceLoadingBoundary, snapshot, storePath, untrack } from "@solidjs/signals";
 export type { Accessor, ComputeFunction, EffectFunction, EffectOptions, ExternalSource, ExternalSourceConfig, ExternalSourceFactory, Merge, NoInfer, NotWrappable, Omit, Owner, Signal, SignalOptions, Setter, Store, SolidStore, StoreNode, StoreSetter, StorePathRange, ArrayFilterFn, CustomPartial, Part, PathSetter } from "@solidjs/signals";
 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, NoHydration, Hydration, NoHydrateContext } from "./client/hydration.js";
+export { sharedConfig, enableHydration, createErrorBoundary, createLoadingBoundary, 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";
 type JSXElement = JSX.Element;
 export type { JSXElement, JSX };
-import { registerGraph } from "./client/core.js";
-export declare const DEV: {
-    readonly hooks: {};
-    readonly registerGraph: typeof registerGraph;
-} | undefined;
+import { type Dev } from "@solidjs/signals";
+export declare const DEV: Dev | undefined;
 declare global {
     var Solid$$: boolean;
 }