solid-js 1.3.2 → 1.3.6

package/dist/dev.cjs

@@ -267,6 +267,7 @@ function createResource(source, fetcher, options) {
       initP = null,
       id = null,
       loadedUnderTransition = false,
+      scheduled = false,
       dynamic = typeof source === "function";
   if (sharedConfig.context) {
     id = `${sharedConfig.context.id}${sharedConfig.context.count++}`;
@@ -321,6 +322,8 @@ function createResource(source, fetcher, options) {
     return v;
   }
   function load(refetching = true) {
+    if (refetching && scheduled) return;
+    scheduled = false;
     setError(err = undefined);
     const lookup = dynamic ? source() : source;
     loadedUnderTransition = Transition && Transition.running;
@@ -338,6 +341,8 @@ function createResource(source, fetcher, options) {
       return p;
     }
     pr = p;
+    scheduled = true;
+    queueMicrotask(() => scheduled = false);
     batch(() => {
       setLoading(true);
       trigger();
@@ -1313,7 +1318,6 @@ function lazy(fn) {
   const wrap = props => {
     const ctx = sharedConfig.context;
     if (ctx) {
-      ctx.count++;
       const [s, set] = createSignal();
       (p || (p = fn())).then(mod => {
         setHydrateContext(ctx);
@@ -1332,6 +1336,9 @@ function lazy(fn) {
     }
     let Comp;
     return createMemo(() => (Comp = comp()) && untrack(() => {
+      Object.assign(Comp, {
+        [$DEVCOMP]: true
+      });
       if (!ctx) return Comp(props);
       const c = sharedConfig.context;
       setHydrateContext(ctx);
@@ -1399,12 +1406,19 @@ function Switch(props) {
 function Match(props) {
   return props;
 }
+let Errors;
+function resetErrorBoundaries() {
+  Errors && [...Errors].forEach(fn => fn());
+}
 function ErrorBoundary(props) {
   let err = undefined;
   if (sharedConfig.context && sharedConfig.load) {
     err = sharedConfig.load(sharedConfig.context.id + sharedConfig.context.count);
   }
   const [errored, setErrored] = createSignal(err);
+  Errors || (Errors = new Set());
+  Errors.add(setErrored);
+  onCleanup(() => Errors.delete(setErrored));
   let e;
   return createMemo(() => {
     if ((e = errored()) != null) {
@@ -1519,7 +1533,6 @@ function Suspense(props) {
         setHydrateContext(ctx);
         set();
         setHydrateContext();
-        p = undefined;
       });
     }
   }
@@ -1546,6 +1559,7 @@ function Suspense(props) {
           dispose && dispose();
           if ((!inFallback || p !== undefined) && visibleContent) {
             store.resolved = true;
+            ctx = p = undefined;
             resumeEffects(store.effects);
             return rendered;
           }
@@ -1624,6 +1638,7 @@ exports.onError = onError;
 exports.onMount = onMount;
 exports.refetchResources = refetchResources;
 exports.requestCallback = requestCallback;
+exports.resetErrorBoundaries = resetErrorBoundaries;
 exports.runWithOwner = runWithOwner;
 exports.sharedConfig = sharedConfig;
 exports.splitProps = splitProps;

package/dist/dev.js

@@ -263,6 +263,7 @@ function createResource(source, fetcher, options) {
       initP = null,
       id = null,
       loadedUnderTransition = false,
+      scheduled = false,
       dynamic = typeof source === "function";
   if (sharedConfig.context) {
     id = `${sharedConfig.context.id}${sharedConfig.context.count++}`;
@@ -317,6 +318,8 @@ function createResource(source, fetcher, options) {
     return v;
   }
   function load(refetching = true) {
+    if (refetching && scheduled) return;
+    scheduled = false;
     setError(err = undefined);
     const lookup = dynamic ? source() : source;
     loadedUnderTransition = Transition && Transition.running;
@@ -334,6 +337,8 @@ function createResource(source, fetcher, options) {
       return p;
     }
     pr = p;
+    scheduled = true;
+    queueMicrotask(() => scheduled = false);
     batch(() => {
       setLoading(true);
       trigger();
@@ -1309,7 +1314,6 @@ function lazy(fn) {
   const wrap = props => {
     const ctx = sharedConfig.context;
     if (ctx) {
-      ctx.count++;
       const [s, set] = createSignal();
       (p || (p = fn())).then(mod => {
         setHydrateContext(ctx);
@@ -1328,6 +1332,9 @@ function lazy(fn) {
     }
     let Comp;
     return createMemo(() => (Comp = comp()) && untrack(() => {
+      Object.assign(Comp, {
+        [$DEVCOMP]: true
+      });
       if (!ctx) return Comp(props);
       const c = sharedConfig.context;
       setHydrateContext(ctx);
@@ -1395,12 +1402,19 @@ function Switch(props) {
 function Match(props) {
   return props;
 }
+let Errors;
+function resetErrorBoundaries() {
+  Errors && [...Errors].forEach(fn => fn());
+}
 function ErrorBoundary(props) {
   let err = undefined;
   if (sharedConfig.context && sharedConfig.load) {
     err = sharedConfig.load(sharedConfig.context.id + sharedConfig.context.count);
   }
   const [errored, setErrored] = createSignal(err);
+  Errors || (Errors = new Set());
+  Errors.add(setErrored);
+  onCleanup(() => Errors.delete(setErrored));
   let e;
   return createMemo(() => {
     if ((e = errored()) != null) {
@@ -1515,7 +1529,6 @@ function Suspense(props) {
         setHydrateContext(ctx);
         set();
         setHydrateContext();
-        p = undefined;
       });
     }
   }
@@ -1542,6 +1555,7 @@ function Suspense(props) {
           dispose && dispose();
           if ((!inFallback || p !== undefined) && visibleContent) {
             store.resolved = true;
+            ctx = p = undefined;
             resumeEffects(store.effects);
             return rendered;
           }
@@ -1576,4 +1590,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, $PROXY, DEV, ErrorBoundary, For, Index, Match, Show, Suspense, SuspenseList, Switch, batch, cancelCallback, children, createComponent, createComputed, createContext, createDeferred, createEffect, createMemo, createReaction, 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, createReaction, createRenderEffect, createResource, createRoot, createSelector, createSignal, createUniqueId, enableExternalSource, enableHydration, enableScheduling, equalFn, from, getListener, getOwner, indexArray, lazy, mapArray, mergeProps, observable, on, onCleanup, onError, onMount, refetchResources, requestCallback, resetErrorBoundaries, runWithOwner, sharedConfig, splitProps, startTransition, untrack, useContext, useTransition };

package/dist/server.cjs

@@ -4,7 +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 $DEVCOMP = Symbol("solid-dev-component");
 const DEV = {};
 const ERROR = Symbol("error");
 const UNOWNED = {
@@ -79,7 +79,7 @@ function createMemo(fn, value) {
 function createDeferred(source) {
   return source;
 }
-function createSelector(source, fn) {
+function createSelector(source, fn = equalFn) {
   return k => fn(k, source());
 }
 function batch(fn) {
@@ -311,6 +311,7 @@ function Switch(props) {
 function Match(props) {
   return props;
 }
+function resetErrorBoundaries() {}
 function ErrorBoundary(props) {
   let error, res;
   const ctx = sharedConfig.context;
@@ -349,7 +350,7 @@ function createResource(fn, fetcher, options = {}) {
   if (sharedConfig.context.async) {
     resource = sharedConfig.context.resources[id] || (sharedConfig.context.resources[id] = {});
     if (resource.ref) {
-      if (!resource.data && !resource.ref[0].loading) resource.ref[1].refetch();
+      if (!resource.data && !resource.ref[0].loading && !resource.ref[0].error) resource.ref[1].refetch();
       return resource.ref;
     }
   }
@@ -367,6 +368,7 @@ function createResource(fn, fetcher, options = {}) {
     return resolved ? sharedConfig.context.resources[id].data : value;
   };
   read.loading = false;
+  read.error = undefined;
   function load() {
     const ctx = sharedConfig.context;
     if (!ctx.async) return read.loading = !!(typeof fn === "function" ? fn() : fn);
@@ -395,7 +397,7 @@ function createResource(fn, fetcher, options = {}) {
         return res;
       }).catch(err => {
         read.loading = false;
-        error = err;
+        read.error = error = err;
         p = null;
         notifySuspense(contexts);
       });
@@ -410,17 +412,19 @@ function createResource(fn, fetcher, options = {}) {
     mutate: v => value = v
   }];
 }
+function refetchResources(info) {}
 function lazy(fn) {
   let resolved;
   const p = fn();
   const contexts = new Set();
   p.then(mod => resolved = mod.default);
   const wrap = props => {
-    const id = sharedConfig.context.id + sharedConfig.context.count++;
+    const id = sharedConfig.context.id.slice(0, -1);
     if (resolved) return resolved(props);
     const ctx = useContext(SuspenseContext);
     const track = {
-      loading: true
+      loading: true,
+      error: undefined
     };
     if (ctx) {
       ctx.resources.set(id, track);
@@ -556,7 +560,9 @@ exports.on = on;
 exports.onCleanup = onCleanup;
 exports.onError = onError;
 exports.onMount = onMount;
+exports.refetchResources = refetchResources;
 exports.requestCallback = requestCallback;
+exports.resetErrorBoundaries = resetErrorBoundaries;
 exports.runWithOwner = runWithOwner;
 exports.sharedConfig = sharedConfig;
 exports.splitProps = splitProps;

package/dist/server.js

@@ -1,6 +1,6 @@
 const equalFn = (a, b) => a === b;
 const $PROXY = Symbol("solid-proxy");
-const $DEVCOMP = Symbol('solid-dev-component');
+const $DEVCOMP = Symbol("solid-dev-component");
 const DEV = {};
 const ERROR = Symbol("error");
 const UNOWNED = {
@@ -75,7 +75,7 @@ function createMemo(fn, value) {
 function createDeferred(source) {
   return source;
 }
-function createSelector(source, fn) {
+function createSelector(source, fn = equalFn) {
   return k => fn(k, source());
 }
 function batch(fn) {
@@ -307,6 +307,7 @@ function Switch(props) {
 function Match(props) {
   return props;
 }
+function resetErrorBoundaries() {}
 function ErrorBoundary(props) {
   let error, res;
   const ctx = sharedConfig.context;
@@ -345,7 +346,7 @@ function createResource(fn, fetcher, options = {}) {
   if (sharedConfig.context.async) {
     resource = sharedConfig.context.resources[id] || (sharedConfig.context.resources[id] = {});
     if (resource.ref) {
-      if (!resource.data && !resource.ref[0].loading) resource.ref[1].refetch();
+      if (!resource.data && !resource.ref[0].loading && !resource.ref[0].error) resource.ref[1].refetch();
       return resource.ref;
     }
   }
@@ -363,6 +364,7 @@ function createResource(fn, fetcher, options = {}) {
     return resolved ? sharedConfig.context.resources[id].data : value;
   };
   read.loading = false;
+  read.error = undefined;
   function load() {
     const ctx = sharedConfig.context;
     if (!ctx.async) return read.loading = !!(typeof fn === "function" ? fn() : fn);
@@ -391,7 +393,7 @@ function createResource(fn, fetcher, options = {}) {
         return res;
       }).catch(err => {
         read.loading = false;
-        error = err;
+        read.error = error = err;
         p = null;
         notifySuspense(contexts);
       });
@@ -406,17 +408,19 @@ function createResource(fn, fetcher, options = {}) {
     mutate: v => value = v
   }];
 }
+function refetchResources(info) {}
 function lazy(fn) {
   let resolved;
   const p = fn();
   const contexts = new Set();
   p.then(mod => resolved = mod.default);
   const wrap = props => {
-    const id = sharedConfig.context.id + sharedConfig.context.count++;
+    const id = sharedConfig.context.id.slice(0, -1);
     if (resolved) return resolved(props);
     const ctx = useContext(SuspenseContext);
     const track = {
-      loading: true
+      loading: true,
+      error: undefined
     };
     if (ctx) {
       ctx.resources.set(id, track);
@@ -511,4 +515,4 @@ function Suspense(props) {
   return props.fallback;
 }
 
-export { $DEVCOMP, $PROXY, DEV, ErrorBoundary, For, Index, Match, Show, Suspense, SuspenseList, Switch, batch, children, createComponent, createComputed, createContext, createDeferred, createEffect, createMemo, createReaction, 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, createReaction, createRenderEffect, createResource, createRoot, createSelector, createSignal, createUniqueId, enableExternalSource, enableHydration, enableScheduling, equalFn, from, getListener, getOwner, lazy, mapArray, mergeProps, observable, on, onCleanup, onError, onMount, refetchResources, requestCallback, resetErrorBoundaries, runWithOwner, sharedConfig, splitProps, startTransition, untrack, useContext, useTransition };

package/dist/solid.cjs

@@ -264,6 +264,7 @@ function createResource(source, fetcher, options) {
       initP = null,
       id = null,
       loadedUnderTransition = false,
+      scheduled = false,
       dynamic = typeof source === "function";
   if (sharedConfig.context) {
     id = `${sharedConfig.context.id}${sharedConfig.context.count++}`;
@@ -318,6 +319,8 @@ function createResource(source, fetcher, options) {
     return v;
   }
   function load(refetching = true) {
+    if (refetching && scheduled) return;
+    scheduled = false;
     setError(err = undefined);
     const lookup = dynamic ? source() : source;
     loadedUnderTransition = Transition && Transition.running;
@@ -335,6 +338,8 @@ function createResource(source, fetcher, options) {
       return p;
     }
     pr = p;
+    scheduled = true;
+    queueMicrotask(() => scheduled = false);
     batch(() => {
       setLoading(true);
       trigger();
@@ -1232,7 +1237,6 @@ function lazy(fn) {
   const wrap = props => {
     const ctx = sharedConfig.context;
     if (ctx) {
-      ctx.count++;
       const [s, set] = createSignal();
       (p || (p = fn())).then(mod => {
         setHydrateContext(ctx);
@@ -1318,12 +1322,19 @@ function Switch(props) {
 function Match(props) {
   return props;
 }
+let Errors;
+function resetErrorBoundaries() {
+  Errors && [...Errors].forEach(fn => fn());
+}
 function ErrorBoundary(props) {
   let err = undefined;
   if (sharedConfig.context && sharedConfig.load) {
     err = sharedConfig.load(sharedConfig.context.id + sharedConfig.context.count);
   }
   const [errored, setErrored] = createSignal(err);
+  Errors || (Errors = new Set());
+  Errors.add(setErrored);
+  onCleanup(() => Errors.delete(setErrored));
   let e;
   return createMemo(() => {
     if ((e = errored()) != null) {
@@ -1438,7 +1449,6 @@ function Suspense(props) {
         setHydrateContext(ctx);
         set();
         setHydrateContext();
-        p = undefined;
       });
     }
   }
@@ -1465,6 +1475,7 @@ function Suspense(props) {
           dispose && dispose();
           if ((!inFallback || p !== undefined) && visibleContent) {
             store.resolved = true;
+            ctx = p = undefined;
             resumeEffects(store.effects);
             return rendered;
           }
@@ -1533,6 +1544,7 @@ exports.onError = onError;
 exports.onMount = onMount;
 exports.refetchResources = refetchResources;
 exports.requestCallback = requestCallback;
+exports.resetErrorBoundaries = resetErrorBoundaries;
 exports.runWithOwner = runWithOwner;
 exports.sharedConfig = sharedConfig;
 exports.splitProps = splitProps;

package/dist/solid.js

@@ -260,6 +260,7 @@ function createResource(source, fetcher, options) {
       initP = null,
       id = null,
       loadedUnderTransition = false,
+      scheduled = false,
       dynamic = typeof source === "function";
   if (sharedConfig.context) {
     id = `${sharedConfig.context.id}${sharedConfig.context.count++}`;
@@ -314,6 +315,8 @@ function createResource(source, fetcher, options) {
     return v;
   }
   function load(refetching = true) {
+    if (refetching && scheduled) return;
+    scheduled = false;
     setError(err = undefined);
     const lookup = dynamic ? source() : source;
     loadedUnderTransition = Transition && Transition.running;
@@ -331,6 +334,8 @@ function createResource(source, fetcher, options) {
       return p;
     }
     pr = p;
+    scheduled = true;
+    queueMicrotask(() => scheduled = false);
     batch(() => {
       setLoading(true);
       trigger();
@@ -1228,7 +1233,6 @@ function lazy(fn) {
   const wrap = props => {
     const ctx = sharedConfig.context;
     if (ctx) {
-      ctx.count++;
       const [s, set] = createSignal();
       (p || (p = fn())).then(mod => {
         setHydrateContext(ctx);
@@ -1314,12 +1318,19 @@ function Switch(props) {
 function Match(props) {
   return props;
 }
+let Errors;
+function resetErrorBoundaries() {
+  Errors && [...Errors].forEach(fn => fn());
+}
 function ErrorBoundary(props) {
   let err = undefined;
   if (sharedConfig.context && sharedConfig.load) {
     err = sharedConfig.load(sharedConfig.context.id + sharedConfig.context.count);
   }
   const [errored, setErrored] = createSignal(err);
+  Errors || (Errors = new Set());
+  Errors.add(setErrored);
+  onCleanup(() => Errors.delete(setErrored));
   let e;
   return createMemo(() => {
     if ((e = errored()) != null) {
@@ -1434,7 +1445,6 @@ function Suspense(props) {
         setHydrateContext(ctx);
         set();
         setHydrateContext();
-        p = undefined;
       });
     }
   }
@@ -1461,6 +1471,7 @@ function Suspense(props) {
           dispose && dispose();
           if ((!inFallback || p !== undefined) && visibleContent) {
             store.resolved = true;
+            ctx = p = undefined;
             resumeEffects(store.effects);
             return rendered;
           }
@@ -1484,4 +1495,4 @@ function Suspense(props) {
 
 let DEV;
 
-export { $DEVCOMP, $PROXY, DEV, ErrorBoundary, For, Index, Match, Show, Suspense, SuspenseList, Switch, batch, cancelCallback, children, createComponent, createComputed, createContext, createDeferred, createEffect, createMemo, createReaction, 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, createReaction, createRenderEffect, createResource, createRoot, createSelector, createSignal, createUniqueId, enableExternalSource, enableHydration, enableScheduling, equalFn, from, getListener, getOwner, indexArray, lazy, mapArray, mergeProps, observable, on, onCleanup, onError, onMount, refetchResources, requestCallback, resetErrorBoundaries, 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.2",
+  "version": "1.3.6",
   "author": "Ryan Carniato",
   "license": "MIT",
   "homepage": "https://solidjs.com",
@@ -144,5 +144,5 @@
     "compiler",
     "performance"
   ],
-  "gitHead": "b0aa7b227de8a3b4dc686690207d54a8af244efc"
+  "gitHead": "10183a0ee2de5c685e4d4558cbe1b78a6ca4c48e"
 }

package/store/package.json

@@ -9,5 +9,27 @@
   "unpkg": "./dist/store.cjs",
   "types": "./types/index.d.ts",
   "type": "module",
-  "sideEffects": false
+  "sideEffects": false,
+  "exports": {
+    ".": {
+      "browser": {
+        "development": {
+          "import": "./dist/dev.js",
+          "require": "./dist/dev.cjs"
+        },
+        "import": "./dist/store.js",
+        "require": "./dist/store.cjs"
+      },
+      "node": {
+        "import": "./dist/server.js",
+        "require": "./dist/server.cjs"
+      },
+      "development": {
+        "import": "./dist/dev.js",
+        "require": "./dist/dev.cjs"
+      },
+      "import": "./dist/store.js",
+      "require": "./dist/store.cjs"
+    }
+  }
 }

package/types/index.d.ts

@@ -1,5 +1,5 @@
 export { createRoot, createSignal, createEffect, createRenderEffect, createComputed, createReaction, 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 type { Accessor, Setter, Signal, Resource, ResourceReturn, ResourceFetcher, ResourceFetcherInfo, Context, ReturnTypes } from "./reactive/signal";
 export * from "./reactive/observable";
 export * from "./reactive/scheduler";
 export * from "./reactive/array";

package/types/jsx.d.ts

@@ -2085,6 +2085,8 @@ export namespace JSX {
   }
   interface DetailsHtmlAttributes<T> extends HTMLAttributes<T> {
     open?: boolean;
+    onToggle?: EventHandlerUnion<T, Event>;
+    ontoggle?: EventHandlerUnion<T, Event>;
   }
   interface DialogHtmlAttributes<T> extends HTMLAttributes<T> {
     open?: boolean;

package/types/reactive/signal.d.ts

@@ -204,13 +204,13 @@ export declare type ResourceActions<T> = {
     refetch: (info?: unknown) => void;
 };
 export declare type ResourceReturn<T> = [Resource<T>, ResourceActions<T>];
-export declare type ResourceSource<S> = S | false | null | (() => S | false | null);
+export declare type ResourceSource<S> = S | false | null | undefined | (() => S | false | null | undefined);
 export declare type ResourceFetcher<S, T> = (k: S, info: ResourceFetcherInfo<T>) => T | Promise<T>;
 export declare type ResourceFetcherInfo<T> = {
     value: T | undefined;
     refetching?: unknown;
 };
-export declare type ResourceOptions<T> = T extends undefined ? {
+export declare type ResourceOptions<T> = undefined extends T ? {
     initialValue?: T;
     name?: string;
     globalRefetch?: boolean;

package/types/render/component.d.ts

@@ -13,8 +13,9 @@ export declare type Component<P = {}> = (props: PropsWithChildren<P>) => JSX.Ele
  */
 export declare type ComponentProps<T extends keyof JSX.IntrinsicElements | Component<any>> = T extends Component<infer P> ? P : T extends keyof JSX.IntrinsicElements ? JSX.IntrinsicElements[T] : {};
 export declare function createComponent<T>(Comp: (props: T) => JSX.Element, props: T): JSX.Element;
+declare type UnboxLazy<T> = T extends () => infer U ? U : T;
 declare type BoxedTupleTypes<T extends any[]> = {
-    [P in keyof T]: [T[P]];
+    [P in keyof T]: [UnboxLazy<T[P]>];
 }[Exclude<keyof T, keyof any[]>];
 declare type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends (k: infer I) => void ? I : never;
 declare type UnboxIntersection<T> = T extends {

package/types/render/flow.d.ts

@@ -77,6 +77,7 @@ export declare type MatchProps<T> = {
  * @description https://www.solidjs.com/docs/latest/api#%3Cswitch%3E%2F%3Cmatch%3E
  */
 export declare function Match<T>(props: MatchProps<T>): JSX.Element;
+export declare function resetErrorBoundaries(): void;
 /**
  * catches uncaught errors inside components and renders a fallback content
  *

package/types/server/index.d.ts

@@ -1,3 +1,3 @@
 export { createRoot, createSignal, createComputed, createRenderEffect, createEffect, createReaction, 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 { mergeProps, splitProps, createComponent, For, Index, Show, Switch, Match, ErrorBoundary, Suspense, SuspenseList, createResource, refetchResources, resetErrorBoundaries, enableScheduling, enableHydration, startTransition, useTransition, createUniqueId, lazy, sharedConfig } from "./rendering";
 export type { Component, Resource } from "./rendering";

package/types/server/reactive.d.ts

@@ -19,7 +19,7 @@ export declare function createEffect<T>(fn: (v?: T) => T, value?: T): void;
 export declare function createReaction(fn: () => void): (fn: () => void) => void;
 export declare function createMemo<T>(fn: (v?: T) => T, value?: T): () => T;
 export declare function createDeferred<T>(source: () => T): () => T;
-export declare function createSelector<T>(source: () => T, fn: (k: T, value: T) => boolean): (k: T) => boolean;
+export declare function createSelector<T>(source: () => T, fn?: (k: T, value: T) => boolean): (k: T) => boolean;
 export declare function batch<T>(fn: () => T): T;
 export declare const untrack: typeof batch;
 export declare function on<T, U>(deps: Array<() => T> | (() => T), fn: (value: Array<T> | T, prev?: Array<T> | T, prevResults?: U) => U, options?: {

package/types/server/rendering.d.ts

@@ -55,6 +55,7 @@ declare type MatchProps<T> = {
     children: string | ((item: T) => string);
 };
 export declare function Match<T>(props: MatchProps<T>): MatchProps<T>;
+export declare function resetErrorBoundaries(): void;
 export declare function ErrorBoundary(props: {
     fallback: string | ((err: any, reset: () => void) => string);
     children: string;
@@ -62,10 +63,12 @@ export declare function ErrorBoundary(props: {
 export interface Resource<T> {
     (): T | undefined;
     loading: boolean;
+    error: any;
 }
 declare type SuspenseContextType = {
     resources: Map<string, {
         loading: boolean;
+        error: any;
     }>;
     completed: () => void;
 };

package/universal/package.json

@@ -4,5 +4,15 @@
   "module": "./dist/universal.js",
   "types": "./types/index.d.ts",
   "type": "module",
-  "sideEffects": false
+  "sideEffects": false,
+  "exports": {
+    ".": {
+      "development": {
+        "import": "./dist/dev.js",
+        "require": "./dist/dev.cjs"
+      },
+      "import": "./dist/universal.js",
+      "require": "./dist/universal.cjs"
+    }
+  }
 }

package/web/dist/dev.cjs

@@ -197,6 +197,9 @@ function dynamicProperty(props, key) {
   });
   return props;
 }
+function innerHTML(parent, content) {
+  !solidJs.sharedConfig.context && (parent.innerHTML = content);
+}
 function insert(parent, accessor, marker, initial) {
   if (marker !== undefined && !initial) initial = [];
   if (typeof accessor !== "function") return insertExpression(parent, accessor, initial, marker);
@@ -389,28 +392,24 @@ function insertExpression(parent, value, current, marker, unwrapArray) {
       return current;
     }
     if (array.length === 0) {
-      current = cleanChildren(parent, current, marker);
-      if (multi) return current;
+      cleanChildren(parent, current, marker);
+    } else if (Array.isArray(current)) {
+      if (current.length === 0) {
+        appendNodes(parent, array, marker);
+      } else reconcileArrays(parent, current, array);
     } else {
-      if (Array.isArray(current)) {
-        if (current.length === 0) {
-          appendNodes(parent, array, marker);
-        } else reconcileArrays(parent, current, array);
-      } else if (current == null || current === "") {
-        appendNodes(parent, array);
-      } else {
-        reconcileArrays(parent, multi && current || [parent.firstChild], array);
-      }
+      current && cleanChildren(parent);
+      appendNodes(parent, array);
     }
     current = array;
   } else if (value instanceof Node) {
-    if (solidJs.sharedConfig.context) return current = value.parentNode ? value : current;
+    if (solidJs.sharedConfig.context) return current = value.parentNode ? multi ? [value] : value : current;
     if (Array.isArray(current)) {
       if (multi) return current = cleanChildren(parent, current, marker, value);
       cleanChildren(parent, current, null, value);
     } else if (current == null || current === "" || !parent.firstChild) {
       parent.appendChild(value);
-    } else parent.replaceChild(value, multi ? current : parent.firstChild);
+    } else parent.replaceChild(value, parent.firstChild);
     current = value;
   } else console.warn(`Unrecognized value. Skipped inserting`, value);
   return current;
@@ -453,7 +452,7 @@ function cleanChildren(parent, current, marker, replacement) {
         if (!inserted && !i) isParent ? parent.replaceChild(node, el) : parent.insertBefore(node, marker);else isParent && el.remove();
       } else inserted = true;
     }
-  } else if (current instanceof Node) parent.replaceChild(node, current);else parent.insertBefore(node, marker);
+  } else parent.insertBefore(node, marker);
   return [node];
 }
 function gatherHydratable(element, root) {
@@ -540,6 +539,9 @@ function Dynamic(props) {
     const component = p.component;
     switch (typeof component) {
       case "function":
+        Object.assign(component, {
+          [solidJs.$DEVCOMP]: true
+        });
         return solidJs.untrack(() => component(others));
       case "string":
         const isSvg = SVGElements.has(component);
@@ -623,6 +625,7 @@ exports.getNextElement = getNextElement;
 exports.getNextMarker = getNextMarker;
 exports.getNextMatch = getNextMatch;
 exports.hydrate = hydrate;
+exports.innerHTML = innerHTML;
 exports.insert = insert;
 exports.isServer = isServer;
 exports.memo = memo;

package/web/dist/dev.js

@@ -1,4 +1,4 @@
-import { createMemo, createRoot, createRenderEffect, sharedConfig, enableHydration, createSignal, onCleanup, splitProps, untrack } from 'solid-js';
+import { createMemo, createRoot, createRenderEffect, sharedConfig, enableHydration, createSignal, onCleanup, splitProps, $DEVCOMP, untrack } from 'solid-js';
 export { ErrorBoundary, For, Index, Match, Show, Suspense, SuspenseList, Switch, createComponent, createRenderEffect as effect, getOwner, mergeProps } from 'solid-js';
 
 const booleans = ["allowfullscreen", "async", "autofocus", "autoplay", "checked", "controls", "default", "disabled", "formnovalidate", "hidden", "indeterminate", "ismap", "loop", "multiple", "muted", "nomodule", "novalidate", "open", "playsinline", "readonly", "required", "reversed", "seamless", "selected"];
@@ -194,6 +194,9 @@ function dynamicProperty(props, key) {
   });
   return props;
 }
+function innerHTML(parent, content) {
+  !sharedConfig.context && (parent.innerHTML = content);
+}
 function insert(parent, accessor, marker, initial) {
   if (marker !== undefined && !initial) initial = [];
   if (typeof accessor !== "function") return insertExpression(parent, accessor, initial, marker);
@@ -386,28 +389,24 @@ function insertExpression(parent, value, current, marker, unwrapArray) {
       return current;
     }
     if (array.length === 0) {
-      current = cleanChildren(parent, current, marker);
-      if (multi) return current;
+      cleanChildren(parent, current, marker);
+    } else if (Array.isArray(current)) {
+      if (current.length === 0) {
+        appendNodes(parent, array, marker);
+      } else reconcileArrays(parent, current, array);
     } else {
-      if (Array.isArray(current)) {
-        if (current.length === 0) {
-          appendNodes(parent, array, marker);
-        } else reconcileArrays(parent, current, array);
-      } else if (current == null || current === "") {
-        appendNodes(parent, array);
-      } else {
-        reconcileArrays(parent, multi && current || [parent.firstChild], array);
-      }
+      current && cleanChildren(parent);
+      appendNodes(parent, array);
     }
     current = array;
   } else if (value instanceof Node) {
-    if (sharedConfig.context) return current = value.parentNode ? value : current;
+    if (sharedConfig.context) return current = value.parentNode ? multi ? [value] : value : current;
     if (Array.isArray(current)) {
       if (multi) return current = cleanChildren(parent, current, marker, value);
       cleanChildren(parent, current, null, value);
     } else if (current == null || current === "" || !parent.firstChild) {
       parent.appendChild(value);
-    } else parent.replaceChild(value, multi ? current : parent.firstChild);
+    } else parent.replaceChild(value, parent.firstChild);
     current = value;
   } else console.warn(`Unrecognized value. Skipped inserting`, value);
   return current;
@@ -450,7 +449,7 @@ function cleanChildren(parent, current, marker, replacement) {
         if (!inserted && !i) isParent ? parent.replaceChild(node, el) : parent.insertBefore(node, marker);else isParent && el.remove();
       } else inserted = true;
     }
-  } else if (current instanceof Node) parent.replaceChild(node, current);else parent.insertBefore(node, marker);
+  } else parent.insertBefore(node, marker);
   return [node];
 }
 function gatherHydratable(element, root) {
@@ -537,6 +536,9 @@ function Dynamic(props) {
     const component = p.component;
     switch (typeof component) {
       case "function":
+        Object.assign(component, {
+          [$DEVCOMP]: true
+        });
         return untrack(() => component(others));
       case "string":
         const isSvg = SVGElements.has(component);
@@ -547,4 +549,4 @@ function Dynamic(props) {
   });
 }
 
-export { Aliases, Assets, ChildProperties, DelegatedEvents, Dynamic, Assets as HydrationScript, NoHydration, Portal, PropAliases, Properties, SVGElements, SVGNamespace, addEventListener, assign, classList, clearDelegatedEvents, delegateEvents, dynamicProperty, escape, generateHydrationScript, getHydrationKey, getNextElement, getNextMarker, getNextMatch, hydrate, insert, isServer, memo, render, renderToStream, renderToString, renderToStringAsync, resolveSSRNode, runHydrationEvents, setAttribute, setAttributeNS, spread, ssr, ssrBoolean, ssrClassList, ssrHydrationKey, ssrSpread, ssrStyle, style, template };
+export { Aliases, Assets, ChildProperties, DelegatedEvents, Dynamic, Assets as HydrationScript, NoHydration, Portal, PropAliases, Properties, SVGElements, SVGNamespace, addEventListener, assign, classList, clearDelegatedEvents, delegateEvents, dynamicProperty, escape, generateHydrationScript, getHydrationKey, getNextElement, getNextMarker, getNextMatch, hydrate, innerHTML, insert, isServer, memo, render, renderToStream, renderToString, renderToStringAsync, resolveSSRNode, runHydrationEvents, setAttribute, setAttributeNS, spread, ssr, ssrBoolean, ssrClassList, ssrHydrationKey, ssrSpread, ssrStyle, style, template };

package/web/dist/server.cjs

@@ -232,7 +232,7 @@ function stringifyString(str) {
   return result;
 }
 
-const REPLACE_SCRIPT = `function $df(e,y,t){t=document.getElementById(e),document.getElementById("pl"+e).replaceWith(...t.childNodes),_$HY.set(e,y||null)}`;
+const REPLACE_SCRIPT = `function $df(e,y,t,g){t=document.getElementById(e),g=document.getElementById("pl"+e),g&&g.replaceWith(...t.childNodes),_$HY.set(e,y||null)}`;
 const FRAGMENT_REPLACE = /<!\[([\d.]+)\]>/;
 function renderToString(code, options = {}) {
   let scripts = "";
@@ -322,12 +322,17 @@ function renderToStream(code, options = {}) {
   const dedupe = new WeakMap();
   const checkEnd = () => {
     if (!registry.size && !completed) {
-      onCompleteAll && onCompleteAll(result);
+      writeTasks();
+      onCompleteAll && onCompleteAll({
+        write(v) {
+          !completed && buffer.write(v);
+        }
+      });
       writable && writable.end();
       completed = true;
     }
   };
-  const writeInitialScript = () => {
+  const writeTasks = () => {
     if (tasks.length && !completed) {
       buffer.write(`<script${nonce ? ` nonce="${nonce}"` : ""}>${tasks.join(";")}</script>`);
       tasks.length = 0;
@@ -354,7 +359,7 @@ function renderToStream(code, options = {}) {
     nonce,
     writeResource(id, p, error) {
       if (!scheduled) {
-        Promise.resolve().then(writeInitialScript);
+        Promise.resolve().then(writeTasks);
         scheduled = true;
       }
       if (error) return tasks.push(`_$HY.set("${id}", ${serializeError(p)})`);
@@ -369,17 +374,19 @@ function renderToStream(code, options = {}) {
     registerFragment(key) {
       registry.set(key, []);
       if (!scheduled) {
-        Promise.resolve().then(writeInitialScript);
+        Promise.resolve().then(writeTasks);
         scheduled = true;
       }
       tasks.push(`_$HY.init("${key}")`);
       return (value, error) => {
-        const keys = registry.get(key);
-        registry.delete(key);
-        if (waitForFragments(registry, key)) return;
-        if ((value !== undefined || error) && !completed) {
-          buffer.write(`<div hidden id="${key}">${value !== undefined ? value : " "}</div><script${nonce ? ` nonce="${nonce}"` : ""}>${!scriptFlushed ? REPLACE_SCRIPT : ""}${keys.length ? keys.map(k => `_$HY.unset("${k}");`) : ""}$df("${key}"${error ? "," + serializeError(error) : ""})</script>`);
-          scriptFlushed = true;
+        if (registry.has(key)) {
+          const keys = registry.get(key);
+          registry.delete(key);
+          if (waitForFragments(registry, key)) return;
+          if ((value !== undefined || error) && !completed) {
+            buffer.write(`<div hidden id="${key}">${value !== undefined ? value : " "}</div><script${nonce ? ` nonce="${nonce}"` : ""}>${!scriptFlushed ? REPLACE_SCRIPT : ""}${keys.length ? keys.map(k => `_$HY.unset("${k}");`) : ""}$df("${key}"${error ? "," + serializeError(error) : ""})</script>`);
+            scriptFlushed = true;
+          }
         }
         checkEnd();
         return true;
@@ -393,7 +400,11 @@ function renderToStream(code, options = {}) {
     buffer.write(html);
     tasks.length = 0;
     scheduled = false;
-    onCompleteShell && onCompleteShell();
+    onCompleteShell && onCompleteShell({
+      write(v) {
+        !completed && buffer.write(v);
+      }
+    });
   });
   return {
     pipe(w) {
@@ -612,8 +623,11 @@ function serializeSet(registry, key, value) {
 }
 function pipeToNodeWritable(code, writable, options = {}) {
   if (options.onReady) {
-    options.onCompleteShell = () => {
+    options.onCompleteShell = ({
+      write
+    }) => {
       options.onReady({
+        write,
         startWriting() {
           stream.pipe(writable);
         }
@@ -625,8 +639,11 @@ function pipeToNodeWritable(code, writable, options = {}) {
 }
 function pipeToWritable(code, writable, options = {}) {
   if (options.onReady) {
-    options.onCompleteShell = () => {
+    options.onCompleteShell = ({
+      write
+    }) => {
       options.onReady({
+        write,
         startWriting() {
           stream.pipeTo(writable);
         }

package/web/dist/server.js

@@ -229,7 +229,7 @@ function stringifyString(str) {
   return result;
 }
 
-const REPLACE_SCRIPT = `function $df(e,y,t){t=document.getElementById(e),document.getElementById("pl"+e).replaceWith(...t.childNodes),_$HY.set(e,y||null)}`;
+const REPLACE_SCRIPT = `function $df(e,y,t,g){t=document.getElementById(e),g=document.getElementById("pl"+e),g&&g.replaceWith(...t.childNodes),_$HY.set(e,y||null)}`;
 const FRAGMENT_REPLACE = /<!\[([\d.]+)\]>/;
 function renderToString(code, options = {}) {
   let scripts = "";
@@ -319,12 +319,17 @@ function renderToStream(code, options = {}) {
   const dedupe = new WeakMap();
   const checkEnd = () => {
     if (!registry.size && !completed) {
-      onCompleteAll && onCompleteAll(result);
+      writeTasks();
+      onCompleteAll && onCompleteAll({
+        write(v) {
+          !completed && buffer.write(v);
+        }
+      });
       writable && writable.end();
       completed = true;
     }
   };
-  const writeInitialScript = () => {
+  const writeTasks = () => {
     if (tasks.length && !completed) {
       buffer.write(`<script${nonce ? ` nonce="${nonce}"` : ""}>${tasks.join(";")}</script>`);
       tasks.length = 0;
@@ -351,7 +356,7 @@ function renderToStream(code, options = {}) {
     nonce,
     writeResource(id, p, error) {
       if (!scheduled) {
-        Promise.resolve().then(writeInitialScript);
+        Promise.resolve().then(writeTasks);
         scheduled = true;
       }
       if (error) return tasks.push(`_$HY.set("${id}", ${serializeError(p)})`);
@@ -366,17 +371,19 @@ function renderToStream(code, options = {}) {
     registerFragment(key) {
       registry.set(key, []);
       if (!scheduled) {
-        Promise.resolve().then(writeInitialScript);
+        Promise.resolve().then(writeTasks);
         scheduled = true;
       }
       tasks.push(`_$HY.init("${key}")`);
       return (value, error) => {
-        const keys = registry.get(key);
-        registry.delete(key);
-        if (waitForFragments(registry, key)) return;
-        if ((value !== undefined || error) && !completed) {
-          buffer.write(`<div hidden id="${key}">${value !== undefined ? value : " "}</div><script${nonce ? ` nonce="${nonce}"` : ""}>${!scriptFlushed ? REPLACE_SCRIPT : ""}${keys.length ? keys.map(k => `_$HY.unset("${k}");`) : ""}$df("${key}"${error ? "," + serializeError(error) : ""})</script>`);
-          scriptFlushed = true;
+        if (registry.has(key)) {
+          const keys = registry.get(key);
+          registry.delete(key);
+          if (waitForFragments(registry, key)) return;
+          if ((value !== undefined || error) && !completed) {
+            buffer.write(`<div hidden id="${key}">${value !== undefined ? value : " "}</div><script${nonce ? ` nonce="${nonce}"` : ""}>${!scriptFlushed ? REPLACE_SCRIPT : ""}${keys.length ? keys.map(k => `_$HY.unset("${k}");`) : ""}$df("${key}"${error ? "," + serializeError(error) : ""})</script>`);
+            scriptFlushed = true;
+          }
         }
         checkEnd();
         return true;
@@ -390,7 +397,11 @@ function renderToStream(code, options = {}) {
     buffer.write(html);
     tasks.length = 0;
     scheduled = false;
-    onCompleteShell && onCompleteShell();
+    onCompleteShell && onCompleteShell({
+      write(v) {
+        !completed && buffer.write(v);
+      }
+    });
   });
   return {
     pipe(w) {
@@ -609,8 +620,11 @@ function serializeSet(registry, key, value) {
 }
 function pipeToNodeWritable(code, writable, options = {}) {
   if (options.onReady) {
-    options.onCompleteShell = () => {
+    options.onCompleteShell = ({
+      write
+    }) => {
       options.onReady({
+        write,
         startWriting() {
           stream.pipe(writable);
         }
@@ -622,8 +636,11 @@ function pipeToNodeWritable(code, writable, options = {}) {
 }
 function pipeToWritable(code, writable, options = {}) {
   if (options.onReady) {
-    options.onCompleteShell = () => {
+    options.onCompleteShell = ({
+      write
+    }) => {
       options.onReady({
+        write,
         startWriting() {
           stream.pipeTo(writable);
         }

package/web/dist/web.cjs

@@ -196,6 +196,9 @@ function dynamicProperty(props, key) {
   });
   return props;
 }
+function innerHTML(parent, content) {
+  !solidJs.sharedConfig.context && (parent.innerHTML = content);
+}
 function insert(parent, accessor, marker, initial) {
   if (marker !== undefined && !initial) initial = [];
   if (typeof accessor !== "function") return insertExpression(parent, accessor, initial, marker);
@@ -388,28 +391,24 @@ function insertExpression(parent, value, current, marker, unwrapArray) {
       return current;
     }
     if (array.length === 0) {
-      current = cleanChildren(parent, current, marker);
-      if (multi) return current;
+      cleanChildren(parent, current, marker);
+    } else if (Array.isArray(current)) {
+      if (current.length === 0) {
+        appendNodes(parent, array, marker);
+      } else reconcileArrays(parent, current, array);
     } else {
-      if (Array.isArray(current)) {
-        if (current.length === 0) {
-          appendNodes(parent, array, marker);
-        } else reconcileArrays(parent, current, array);
-      } else if (current == null || current === "") {
-        appendNodes(parent, array);
-      } else {
-        reconcileArrays(parent, multi && current || [parent.firstChild], array);
-      }
+      current && cleanChildren(parent);
+      appendNodes(parent, array);
     }
     current = array;
   } else if (value instanceof Node) {
-    if (solidJs.sharedConfig.context) return current = value.parentNode ? value : current;
+    if (solidJs.sharedConfig.context) return current = value.parentNode ? multi ? [value] : value : current;
     if (Array.isArray(current)) {
       if (multi) return current = cleanChildren(parent, current, marker, value);
       cleanChildren(parent, current, null, value);
     } else if (current == null || current === "" || !parent.firstChild) {
       parent.appendChild(value);
-    } else parent.replaceChild(value, multi ? current : parent.firstChild);
+    } else parent.replaceChild(value, parent.firstChild);
     current = value;
   } else ;
   return current;
@@ -452,7 +451,7 @@ function cleanChildren(parent, current, marker, replacement) {
         if (!inserted && !i) isParent ? parent.replaceChild(node, el) : parent.insertBefore(node, marker);else isParent && el.remove();
       } else inserted = true;
     }
-  } else if (current instanceof Node) parent.replaceChild(node, current);else parent.insertBefore(node, marker);
+  } else parent.insertBefore(node, marker);
   return [node];
 }
 function gatherHydratable(element, root) {
@@ -622,6 +621,7 @@ exports.getNextElement = getNextElement;
 exports.getNextMarker = getNextMarker;
 exports.getNextMatch = getNextMatch;
 exports.hydrate = hydrate;
+exports.innerHTML = innerHTML;
 exports.insert = insert;
 exports.isServer = isServer;
 exports.memo = memo;

package/web/dist/web.js

@@ -193,6 +193,9 @@ function dynamicProperty(props, key) {
   });
   return props;
 }
+function innerHTML(parent, content) {
+  !sharedConfig.context && (parent.innerHTML = content);
+}
 function insert(parent, accessor, marker, initial) {
   if (marker !== undefined && !initial) initial = [];
   if (typeof accessor !== "function") return insertExpression(parent, accessor, initial, marker);
@@ -385,28 +388,24 @@ function insertExpression(parent, value, current, marker, unwrapArray) {
       return current;
     }
     if (array.length === 0) {
-      current = cleanChildren(parent, current, marker);
-      if (multi) return current;
+      cleanChildren(parent, current, marker);
+    } else if (Array.isArray(current)) {
+      if (current.length === 0) {
+        appendNodes(parent, array, marker);
+      } else reconcileArrays(parent, current, array);
     } else {
-      if (Array.isArray(current)) {
-        if (current.length === 0) {
-          appendNodes(parent, array, marker);
-        } else reconcileArrays(parent, current, array);
-      } else if (current == null || current === "") {
-        appendNodes(parent, array);
-      } else {
-        reconcileArrays(parent, multi && current || [parent.firstChild], array);
-      }
+      current && cleanChildren(parent);
+      appendNodes(parent, array);
     }
     current = array;
   } else if (value instanceof Node) {
-    if (sharedConfig.context) return current = value.parentNode ? value : current;
+    if (sharedConfig.context) return current = value.parentNode ? multi ? [value] : value : current;
     if (Array.isArray(current)) {
       if (multi) return current = cleanChildren(parent, current, marker, value);
       cleanChildren(parent, current, null, value);
     } else if (current == null || current === "" || !parent.firstChild) {
       parent.appendChild(value);
-    } else parent.replaceChild(value, multi ? current : parent.firstChild);
+    } else parent.replaceChild(value, parent.firstChild);
     current = value;
   } else ;
   return current;
@@ -449,7 +448,7 @@ function cleanChildren(parent, current, marker, replacement) {
         if (!inserted && !i) isParent ? parent.replaceChild(node, el) : parent.insertBefore(node, marker);else isParent && el.remove();
       } else inserted = true;
     }
-  } else if (current instanceof Node) parent.replaceChild(node, current);else parent.insertBefore(node, marker);
+  } else parent.insertBefore(node, marker);
   return [node];
 }
 function gatherHydratable(element, root) {
@@ -546,4 +545,4 @@ function Dynamic(props) {
   });
 }
 
-export { Aliases, Assets, ChildProperties, DelegatedEvents, Dynamic, Assets as HydrationScript, NoHydration, Portal, PropAliases, Properties, SVGElements, SVGNamespace, addEventListener, assign, classList, clearDelegatedEvents, delegateEvents, dynamicProperty, escape, generateHydrationScript, getHydrationKey, getNextElement, getNextMarker, getNextMatch, hydrate, insert, isServer, memo, render, renderToStream, renderToString, renderToStringAsync, resolveSSRNode, runHydrationEvents, setAttribute, setAttributeNS, spread, ssr, ssrBoolean, ssrClassList, ssrHydrationKey, ssrSpread, ssrStyle, style, template };
+export { Aliases, Assets, ChildProperties, DelegatedEvents, Dynamic, Assets as HydrationScript, NoHydration, Portal, PropAliases, Properties, SVGElements, SVGNamespace, addEventListener, assign, classList, clearDelegatedEvents, delegateEvents, dynamicProperty, escape, generateHydrationScript, getHydrationKey, getNextElement, getNextMarker, getNextMatch, hydrate, innerHTML, insert, isServer, memo, render, renderToStream, renderToString, renderToStringAsync, resolveSSRNode, runHydrationEvents, setAttribute, setAttributeNS, spread, ssr, ssrBoolean, ssrClassList, ssrHydrationKey, ssrSpread, ssrStyle, style, template };

package/web/package.json

@@ -9,5 +9,27 @@
   "unpkg": "./dist/web.cjs",
   "types": "./types/index.d.ts",
   "type": "module",
-  "sideEffects": false
+  "sideEffects": false,
+  "exports": {
+    ".": {
+      "browser": {
+        "development": {
+          "import": "./dist/dev.js",
+          "require": "./dist/dev.cjs"
+        },
+        "import": "./dist/web.js",
+        "require": "./dist/web.cjs"
+      },
+      "node": {
+        "import": "./dist/server.js",
+        "require": "./dist/server.cjs"
+      },
+      "development": {
+        "import": "./dist/dev.js",
+        "require": "./dist/dev.cjs"
+      },
+      "import": "./dist/web.js",
+      "require": "./dist/web.cjs"
+    }
+  }
 }

package/web/types/client.d.ts

@@ -30,6 +30,7 @@ export function spread<T>(
 export function assign(node: Element, props: any, isSVG?: Boolean, skipChildren?: Boolean): void;
 export function setAttribute(node: Element, name: string, value: string): void;
 export function setAttributeNS(node: Element, namespace: string, name: string, value: string): void;
+export function innerHTML(node: Element, content: string): void;
 export function addEventListener(
   node: Element,
   name: string,