solid-js 2.0.0-beta.5 → 2.0.0-beta.7

package/dist/solid.js

@@ -1,5 +1,5 @@
-import { getContext, createMemo as createMemo$1, flatten, createRoot, setContext, createOwner, runWithOwner, createEffect as createEffect$1, createErrorBoundary as createErrorBoundary$1, createLoadingBoundary as createLoadingBoundary$1, getOwner, onCleanup, isDisposed, 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, markSnapshotScope, flush, peekNextChildId, clearSnapshots, untrack, mapArray, repeat } from '@solidjs/signals';
-export { $PROXY, $REFRESH, $TRACK, NotReadyError, action, 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);
@@ -19,10 +19,10 @@ function useContext(context) {
   return getContext(context);
 }
 function children(fn) {
-  const c = createMemo$1(fn, undefined, {
+  const c = createMemo$1(fn, {
     lazy: true
   });
-  const memo = createMemo$1(() => flatten(c()), undefined, {
+  const memo = createMemo$1(() => flatten(c()), {
     lazy: true
   });
   memo.toArray = () => {
@@ -264,7 +264,7 @@ function wrapFirstYield(iterable, activate) {
     }
   };
 }
-function hydrateSignalFromAsyncIterable(coreFn, compute, value, options) {
+function hydrateSignalFromAsyncIterable(coreFn, compute, options) {
   const parent = getOwner();
   const expectedId = peekNextChildId(parent);
   if (!sharedConfig.has(expectedId)) return null;
@@ -276,7 +276,7 @@ function hydrateSignalFromAsyncIterable(coreFn, compute, value, options) {
       return it;
     }
   };
-  return coreFn(() => iterable, value, options);
+  return coreFn(() => iterable, options);
 }
 function hydrateStoreFromAsyncIterable(coreFn, initialValue, options) {
   const parent = getOwner();
@@ -351,20 +351,20 @@ function hydrateStoreFromAsyncIterable(coreFn, initialValue, options) {
     };
   }, initialValue, options);
 }
-function hydratedCreateMemo(compute, value, options) {
+function hydratedCreateMemo(compute, options) {
   if (!sharedConfig.hydrating || options?.transparent) {
-    return createMemo$1(compute, value, options);
+    return createMemo$1(compute, options);
   }
   markTopLevelSnapshotScope();
   const ssrSource = options?.ssrSource;
   if (ssrSource === "client") {
     const [hydrated, setHydrated] = createSignal$1(false, {
-      pureWrite: true
+      ownedWrite: true
     });
     const memo = createMemo$1(prev => {
-      if (!hydrated()) return prev ?? value;
+      if (!hydrated()) return prev;
       return compute(prev);
-    }, value, options);
+    }, options);
     setHydrated(true);
     return memo;
   }
@@ -372,25 +372,25 @@ function hydratedCreateMemo(compute, value, options) {
     return createMemo$1(prev => {
       if (!sharedConfig.hydrating) return compute(prev);
       subFetch(compute, prev);
-      return prev ?? value;
-    }, value, options);
+      return prev;
+    }, options);
   }
-  const aiResult = hydrateSignalFromAsyncIterable(createMemo$1, compute, value, options);
+  const aiResult = hydrateSignalFromAsyncIterable(createMemo$1, compute, options);
   if (aiResult !== null) return aiResult;
-  return createMemo$1(prev => readSerializedOrCompute(compute, prev), value, options);
+  return createMemo$1(prev => readSerializedOrCompute(compute, prev), options);
 }
-function hydratedCreateSignal(fn, second, third) {
-  if (typeof fn !== "function" || !sharedConfig.hydrating) return createSignal$1(fn, second, third);
+function hydratedCreateSignal(fn, second) {
+  if (typeof fn !== "function" || !sharedConfig.hydrating) return createSignal$1(fn, second);
   markTopLevelSnapshotScope();
-  const ssrSource = third?.ssrSource;
+  const ssrSource = second?.ssrSource;
   if (ssrSource === "client") {
     const [hydrated, setHydrated] = createSignal$1(false, {
-      pureWrite: true
+      ownedWrite: true
     });
     const sig = createSignal$1(prev => {
-      if (!hydrated()) return prev ?? second;
+      if (!hydrated()) return prev;
       return fn(prev);
-    }, second, third);
+    }, second);
     setHydrated(true);
     return sig;
   }
@@ -398,12 +398,12 @@ function hydratedCreateSignal(fn, second, third) {
     return createSignal$1(prev => {
       if (!sharedConfig.hydrating) return fn(prev);
       subFetch(fn, prev);
-      return prev ?? second;
-    }, second, third);
+      return prev;
+    }, second);
   }
-  const aiResult = hydrateSignalFromAsyncIterable(createSignal$1, fn, second, third);
+  const aiResult = hydrateSignalFromAsyncIterable(createSignal$1, fn, second);
   if (aiResult !== null) return aiResult;
-  return createSignal$1(prev => readSerializedOrCompute(fn, prev), second, third);
+  return createSignal$1(prev => readSerializedOrCompute(fn, prev), second);
 }
 function hydratedCreateErrorBoundary(fn, fallback) {
   if (!sharedConfig.hydrating) return createErrorBoundary$1(fn, fallback);
@@ -425,18 +425,18 @@ function hydratedCreateErrorBoundary(fn, fallback) {
   }
   return createErrorBoundary$1(fn, fallback);
 }
-function hydratedCreateOptimistic(fn, second, third) {
-  if (typeof fn !== "function" || !sharedConfig.hydrating) return createOptimistic$1(fn, second, third);
+function hydratedCreateOptimistic(fn, second) {
+  if (typeof fn !== "function" || !sharedConfig.hydrating) return createOptimistic$1(fn, second);
   markTopLevelSnapshotScope();
-  const ssrSource = third?.ssrSource;
+  const ssrSource = second?.ssrSource;
   if (ssrSource === "client") {
     const [hydrated, setHydrated] = createSignal$1(false, {
-      pureWrite: true
+      ownedWrite: true
     });
     const sig = createOptimistic$1(prev => {
-      if (!hydrated()) return prev ?? second;
+      if (!hydrated()) return prev;
       return fn(prev);
-    }, second, third);
+    }, second);
     setHydrated(true);
     return sig;
   }
@@ -444,12 +444,12 @@ function hydratedCreateOptimistic(fn, second, third) {
     return createOptimistic$1(prev => {
       if (!sharedConfig.hydrating) return fn(prev);
       subFetch(fn, prev);
-      return prev ?? second;
-    }, second, third);
+      return prev;
+    }, second);
   }
-  const aiResult = hydrateSignalFromAsyncIterable(createOptimistic$1, fn, second, third);
+  const aiResult = hydrateSignalFromAsyncIterable(createOptimistic$1, fn, second);
   if (aiResult !== null) return aiResult;
-  return createOptimistic$1(prev => readSerializedOrCompute(fn, prev), second, third);
+  return createOptimistic$1(prev => readSerializedOrCompute(fn, prev), second);
 }
 function wrapStoreFn(fn) {
   return draft => readSerializedOrCompute(() => fn(draft), draft);
@@ -457,7 +457,7 @@ function wrapStoreFn(fn) {
 function hydrateStoreLikeFn(coreFn, fn, initialValue, options, ssrSource) {
   if (ssrSource === "client") {
     const [hydrated, setHydrated] = createSignal$1(false, {
-      pureWrite: true
+      ownedWrite: true
     });
     const result = coreFn(draft => {
       if (!hydrated()) return;
@@ -468,7 +468,7 @@ function hydrateStoreLikeFn(coreFn, fn, initialValue, options, ssrSource) {
   }
   if (ssrSource === "hybrid") {
     const [hydrated, setHydrated] = createSignal$1(false, {
-      pureWrite: true
+      ownedWrite: true
     });
     const result = coreFn(draft => {
       const o = getOwner();
@@ -498,14 +498,14 @@ function hydratedCreateStore(first, second, third) {
   if (typeof first !== "function" || !sharedConfig.hydrating) return createStore$1(first, second, third);
   markTopLevelSnapshotScope();
   const ssrSource = third?.ssrSource;
-  if (ssrSource === "initial") return createStore$1(second ?? {}, undefined, third);
+  if (ssrSource === "initial") return createStore$1(second ?? {});
   return hydrateStoreLikeFn(createStore$1, first, second ?? {}, third, ssrSource);
 }
 function hydratedCreateOptimisticStore(first, second, third) {
   if (typeof first !== "function" || !sharedConfig.hydrating) return createOptimisticStore$1(first, second, third);
   markTopLevelSnapshotScope();
   const ssrSource = third?.ssrSource;
-  if (ssrSource === "initial") return createOptimisticStore$1(second ?? {}, undefined, third);
+  if (ssrSource === "initial") return createOptimisticStore$1(second ?? {});
   return hydrateStoreLikeFn(createOptimisticStore$1, first, second ?? {}, third, ssrSource);
 }
 function hydratedCreateProjection(fn, initialValue, options) {
@@ -515,22 +515,22 @@ function hydratedCreateProjection(fn, initialValue, options) {
   if (ssrSource === "initial") return createProjection$1(draft => draft, initialValue, options);
   return hydrateStoreLikeFn(createProjection$1, fn, initialValue, options, ssrSource);
 }
-function hydratedEffect(coreFn, compute, effectFn, value, options) {
-  if (!sharedConfig.hydrating) return coreFn(compute, effectFn, value, options);
+function hydratedEffect(coreFn, compute, effectFn, options) {
+  if (!sharedConfig.hydrating || options?.transparent) return coreFn(compute, effectFn, options);
   const ssrSource = options?.ssrSource;
   if (ssrSource === "client") {
     const [hydrated, setHydrated] = createSignal$1(false, {
-      pureWrite: true
+      ownedWrite: true
     });
     let active = false;
     coreFn(prev => {
-      if (!hydrated()) return value;
+      if (!hydrated()) return prev;
       active = true;
       return compute(prev);
     }, (next, prev) => {
       if (!active) return;
       return effectFn(next, prev);
-    }, value, options);
+    }, options);
     setHydrated(true);
     return;
   }
@@ -538,18 +538,18 @@ function hydratedEffect(coreFn, compute, effectFn, value, options) {
     coreFn(prev => {
       if (!sharedConfig.hydrating) return compute(prev);
       subFetch(compute, prev);
-      return prev ?? value;
-    }, effectFn, value, options);
+      return prev;
+    }, effectFn, options);
     return;
   }
   markTopLevelSnapshotScope();
-  coreFn(prev => readSerializedOrCompute(compute, prev), effectFn, value, options);
+  coreFn(prev => readSerializedOrCompute(compute, prev), effectFn, options);
 }
-function hydratedCreateRenderEffect(compute, effectFn, value, options) {
-  return hydratedEffect(createRenderEffect$1, compute, effectFn, value, options);
+function hydratedCreateRenderEffect(compute, effectFn, options) {
+  return hydratedEffect(createRenderEffect$1, compute, effectFn, options);
 }
-function hydratedCreateEffect(compute, effectFn, value, options) {
-  return hydratedEffect(createEffect$1, compute, effectFn, value, options);
+function hydratedCreateEffect(compute, effectFn, options) {
+  return hydratedEffect(createEffect$1, compute, effectFn, options);
 }
 function enableHydration() {
   _createMemo = hydratedCreateMemo;
@@ -608,24 +608,6 @@ const createStore = (...args) => (_createStore || createStore$1)(...args);
 const createOptimisticStore = (...args) => (_createOptimisticStore || createOptimisticStore$1)(...args);
 const createRenderEffect = (...args) => (_createRenderEffect || createRenderEffect$1)(...args);
 const createEffect = (...args) => (_createEffect || createEffect$1)(...args);
-function loadModuleAssets(mapping) {
-  const hy = globalThis._$HY;
-  if (!hy) return;
-  if (!hy.modules) hy.modules = {};
-  if (!hy.loading) hy.loading = {};
-  const pending = [];
-  for (const moduleUrl in mapping) {
-    if (hy.modules[moduleUrl]) continue;
-    const entryUrl = mapping[moduleUrl];
-    if (!hy.loading[moduleUrl]) {
-      hy.loading[moduleUrl] = import(entryUrl).then(mod => {
-        hy.modules[moduleUrl] = mod;
-      });
-    }
-    pending.push(hy.loading[moduleUrl]);
-  }
-  return pending.length ? Promise.all(pending).then(() => {}) : undefined;
-}
 function createBoundaryTrigger() {
   setSnapshotCapture(false);
   const [s, set] = createSignal$1(undefined, {
@@ -653,6 +635,38 @@ function resumeBoundaryHydration(o, id, set) {
   flush();
   checkHydrationComplete();
 }
+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;
@@ -662,7 +676,7 @@ function createLoadingBoundary(fn, fallback, options) {
     let assetPromise;
     if (sharedConfig.hydrating && sharedConfig.has(id + "_assets")) {
       const mapping = sharedConfig.load(id + "_assets");
-      if (mapping && typeof mapping === "object") assetPromise = loadModuleAssets(mapping);
+      if (mapping && typeof mapping === "object") assetPromise = sharedConfig.loadModuleAssets?.(mapping);
     }
     if (sharedConfig.hydrating && sharedConfig.has(id)) {
       const ref = sharedConfig.load(id);
@@ -672,41 +686,14 @@ function createLoadingBoundary(fn, fallback, options) {
       }
       if (ref && typeof ref === "object" && ref.s === 1 && p == null && !settledSerializationResumeQueued) {
         settledSerializationResumeQueued = true;
-        _pendingBoundaries++;
-        onCleanup(() => {
-          if (!isDisposed(o)) return;
-          sharedConfig.cleanupFragment?.(id);
-        });
-        const set = createBoundaryTrigger();
-        const scheduleResume = () => queueMicrotask(() => resumeBoundaryHydration(o, id, set));
-        if (assetPromise) {
-          assetPromise.then(scheduleResume);
-          return undefined;
-        }
-        scheduleResume();
+        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(() => {
-            if (p && typeof p === "object") {
-              p.s = 1;
-            }
-            resumeBoundaryHydration(o, id, set);
-          }, err => {
-            if (p && typeof p === "object") {
-              p.s = 2;
-              p.v = err;
-            }
-            resumeBoundaryHydration(o, id, set);
-          });
+          waitAndResume(p, resume, assetPromise);
         } else {
           const afterAssets = () => {
             _pendingBoundaries--;
@@ -718,10 +705,20 @@ function createLoadingBoundary(fn, fallback, options) {
         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 && !sharedConfig.has(id)) {
-      _pendingBoundaries++;
-      const set = createBoundaryTrigger();
-      assetPromise.then(() => resumeBoundaryHydration(o, id, set));
+      const [, resume] = initBoundaryResume(o, id);
+      assetPromise.then(resume);
       return undefined;
     }
     return createLoadingBoundary$1(fn, fallback, options);
@@ -793,8 +790,8 @@ function Repeat(props) {
 }
 function Show(props) {
   const keyed = props.keyed;
-  const conditionValue = createMemo$1(() => props.when, undefined, undefined);
-  const condition = keyed ? conditionValue : createMemo$1(conditionValue, undefined, {
+  const conditionValue = createMemo$1(() => props.when, undefined);
+  const condition = keyed ? conditionValue : createMemo$1(conditionValue, {
     equals: (a, b) => !a === !b
   });
   return createMemo$1(() => {
@@ -808,7 +805,7 @@ function Show(props) {
       }), IS_DEV) : child;
     }
     return props.fallback;
-  }, undefined, undefined);
+  }, undefined);
 }
 function Switch(props) {
   const chs = children(() => props.children);
@@ -819,8 +816,8 @@ function Switch(props) {
       const index = i;
       const mp = mps[i];
       const prevFunc = func;
-      const conditionValue = createMemo$1(() => prevFunc() ? undefined : mp.when, undefined, undefined);
-      const condition = mp.keyed ? conditionValue : createMemo$1(conditionValue, undefined, {
+      const conditionValue = createMemo$1(() => prevFunc() ? undefined : mp.when, undefined);
+      const condition = mp.keyed ? conditionValue : createMemo$1(conditionValue, {
         equals: (a, b) => !a === !b
       });
       func = () => prevFunc() || (condition() ? [index, conditionValue, mp] : undefined);
@@ -837,7 +834,7 @@ function Switch(props) {
       if (untrack(switchFunc)()?.[0] !== index) throw narrowedError("Match");
       return conditionValue();
     }), IS_DEV) : child;
-  }, undefined, undefined);
+  }, undefined);
 }
 function Match(props) {
   return props;
@@ -854,9 +851,15 @@ function Loading(props) {
   } : 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, createErrorBoundary, createLoadingBoundary, 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.5",
+  "version": "2.0.0-beta.7",
   "author": "Ryan Carniato",
   "license": "MIT",
   "homepage": "https://solidjs.com",
@@ -18,54 +18,101 @@
   "files": [
     "dist",
     "types",
+    "types-cjs",
     "jsx-runtime.d.ts",
     "package.json"
   ],
   "exports": {
     ".": {
       "worker": {
-        "types": "./types/index.d.ts",
-        "import": "./dist/server.js",
-        "require": "./dist/server.cjs"
+        "import": {
+          "types": "./types/index.d.ts",
+          "default": "./dist/server.js"
+        },
+        "require": {
+          "types": "./types-cjs/index.d.cts",
+          "default": "./dist/server.cjs"
+        }
       },
       "browser": {
         "development": {
+          "import": {
+            "types": "./types/index.d.ts",
+            "default": "./dist/dev.js"
+          },
+          "require": {
+            "types": "./types-cjs/index.d.cts",
+            "default": "./dist/dev.cjs"
+          }
+        },
+        "import": {
           "types": "./types/index.d.ts",
-          "import": "./dist/dev.js",
-          "require": "./dist/dev.cjs"
+          "default": "./dist/solid.js"
         },
-        "types": "./types/index.d.ts",
-        "import": "./dist/solid.js",
-        "require": "./dist/solid.cjs"
+        "require": {
+          "types": "./types-cjs/index.d.cts",
+          "default": "./dist/solid.cjs"
+        }
       },
       "deno": {
-        "types": "./types/index.d.ts",
-        "import": "./dist/server.js",
-        "require": "./dist/server.cjs"
+        "import": {
+          "types": "./types/index.d.ts",
+          "default": "./dist/server.js"
+        },
+        "require": {
+          "types": "./types-cjs/index.d.cts",
+          "default": "./dist/server.cjs"
+        }
       },
       "node": {
-        "types": "./types/index.d.ts",
-        "import": "./dist/server.js",
-        "require": "./dist/server.cjs"
+        "import": {
+          "types": "./types/index.d.ts",
+          "default": "./dist/server.js"
+        },
+        "require": {
+          "types": "./types-cjs/index.d.cts",
+          "default": "./dist/server.cjs"
+        }
       },
       "development": {
+        "import": {
+          "types": "./types/index.d.ts",
+          "default": "./dist/dev.js"
+        },
+        "require": {
+          "types": "./types-cjs/index.d.cts",
+          "default": "./dist/dev.cjs"
+        }
+      },
+      "import": {
         "types": "./types/index.d.ts",
-        "import": "./dist/dev.js",
-        "require": "./dist/dev.cjs"
+        "default": "./dist/solid.js"
       },
-      "types": "./types/index.d.ts",
-      "import": "./dist/solid.js",
-      "require": "./dist/solid.cjs"
+      "require": {
+        "types": "./types-cjs/index.d.cts",
+        "default": "./dist/solid.cjs"
+      }
     },
-    "./dist/*": "./dist/*",
     "./types/*": "./types/*",
     "./jsx-runtime": {
-      "types": "./types/jsx.d.ts",
-      "default": "./dist/solid.js"
+      "import": {
+        "types": "./types/jsx.d.ts",
+        "default": "./dist/solid.js"
+      },
+      "require": {
+        "types": "./types-cjs/jsx.d.cts",
+        "default": "./dist/solid.cjs"
+      }
     },
     "./jsx-dev-runtime": {
-      "types": "./types/jsx.d.ts",
-      "default": "./dist/solid.js"
+      "import": {
+        "types": "./types/jsx.d.ts",
+        "default": "./dist/solid.js"
+      },
+      "require": {
+        "types": "./types-cjs/jsx.d.cts",
+        "default": "./dist/solid.cjs"
+      }
     },
     "./package.json": "./package.json"
   },
@@ -79,7 +126,7 @@
     "performance"
   ],
   "dependencies": {
-    "@solidjs/signals": "^0.13.9",
+    "@solidjs/signals": "^2.0.0-beta.7",
     "csstype": "^3.1.0",
     "seroval": "~1.5.0",
     "seroval-plugins": "~1.5.0"
@@ -88,10 +135,11 @@
     "build": "npm-run-all -nl build:*",
     "build:clean": "rimraf dist/ coverage/",
     "build:js": "rollup -c",
-    "types": "npm-run-all -nl types:*",
-    "types:clean": "rimraf types/",
-    "types:copy": "ncp ../../node_modules/dom-expressions/src/jsx.d.ts ./src/jsx.d.ts",
-    "types:src": "tsc --project ./tsconfig.build.json && ncp ../../node_modules/dom-expressions/src/jsx.d.ts ./types/jsx.d.ts",
+    "types": "npm-run-all -nl types:clean types:copy types:src types:cjs",
+    "types:clean": "rimraf types/ types-cjs/",
+    "types:copy": "ncp ../../node_modules/dom-expressions/src/jsx.d.ts ./src/jsx.d.ts && ncp ../../node_modules/dom-expressions/src/jsx-properties.d.ts ./src/jsx-properties.d.ts",
+    "types:src": "tsc --project ./tsconfig.build.json && ncp ../../node_modules/dom-expressions/src/jsx.d.ts ./types/jsx.d.ts && ncp ../../node_modules/dom-expressions/src/jsx-properties.d.ts ./types/jsx-properties.d.ts",
+    "types:cjs": "node ../../scripts/sync-dual-types.mjs ./types ./types-cjs",
     "test": "vitest run",
     "coverage": "vitest run --coverage",
     "test-types": "tsc --project tsconfig.test.json"

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

@@ -117,4 +117,26 @@ export declare function Loading(props: {
     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 {};