solid-js 1.3.1 → 1.3.5

package/dist/dev.cjs

@@ -249,7 +249,7 @@ function createResource(source, fetcher, options) {
     fetcher = source;
     source = true;
   }
-  options ||= {};
+  options || (options = {});
   if (options.globalRefetch !== false) {
     Resources || (Resources = new Set());
     Resources.add(load);
@@ -506,7 +506,7 @@ function startTransition(fn) {
         queue: new Set(),
         running: true
       });
-      t.done ||= new Promise(res => t.resolve = res);
+      t.done || (t.done = new Promise(res => t.resolve = res));
       t.running = true;
     }
     batch(fn);
@@ -1313,7 +1313,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 +1331,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 +1401,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) {
@@ -1508,20 +1517,18 @@ function Suspense(props) {
     const key = sharedConfig.context.id + sharedConfig.context.count;
     p = sharedConfig.load(key);
     if (p) {
-      if (typeof p !== "object" || !("then" in p)) error = p;else {
-        const [s, set] = createSignal(undefined, {
-          equals: false
-        });
-        flicker = s;
-        p.then(err => {
-          if (error = err) return set();
-          sharedConfig.gather(key);
-          setHydrateContext(ctx);
-          set();
-          setHydrateContext();
-          p = undefined;
-        });
-      }
+      if (typeof p !== "object" || !("then" in p)) p = Promise.resolve(p);
+      const [s, set] = createSignal(undefined, {
+        equals: false
+      });
+      flicker = s;
+      p.then(err => {
+        if (error = err) return set();
+        sharedConfig.gather(key);
+        setHydrateContext(ctx);
+        set();
+        setHydrateContext();
+      });
     }
   }
   const listContext = useContext(SuspenseListContext);
@@ -1547,6 +1554,7 @@ function Suspense(props) {
           dispose && dispose();
           if ((!inFallback || p !== undefined) && visibleContent) {
             store.resolved = true;
+            ctx = p = undefined;
             resumeEffects(store.effects);
             return rendered;
           }
@@ -1625,6 +1633,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

@@ -245,7 +245,7 @@ function createResource(source, fetcher, options) {
     fetcher = source;
     source = true;
   }
-  options ||= {};
+  options || (options = {});
   if (options.globalRefetch !== false) {
     Resources || (Resources = new Set());
     Resources.add(load);
@@ -502,7 +502,7 @@ function startTransition(fn) {
         queue: new Set(),
         running: true
       });
-      t.done ||= new Promise(res => t.resolve = res);
+      t.done || (t.done = new Promise(res => t.resolve = res));
       t.running = true;
     }
     batch(fn);
@@ -1309,7 +1309,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 +1327,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 +1397,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) {
@@ -1504,20 +1513,18 @@ function Suspense(props) {
     const key = sharedConfig.context.id + sharedConfig.context.count;
     p = sharedConfig.load(key);
     if (p) {
-      if (typeof p !== "object" || !("then" in p)) error = p;else {
-        const [s, set] = createSignal(undefined, {
-          equals: false
-        });
-        flicker = s;
-        p.then(err => {
-          if (error = err) return set();
-          sharedConfig.gather(key);
-          setHydrateContext(ctx);
-          set();
-          setHydrateContext();
-          p = undefined;
-        });
-      }
+      if (typeof p !== "object" || !("then" in p)) p = Promise.resolve(p);
+      const [s, set] = createSignal(undefined, {
+        equals: false
+      });
+      flicker = s;
+      p.then(err => {
+        if (error = err) return set();
+        sharedConfig.gather(key);
+        setHydrateContext(ctx);
+        set();
+        setHydrateContext();
+      });
     }
   }
   const listContext = useContext(SuspenseListContext);
@@ -1543,6 +1550,7 @@ function Suspense(props) {
           dispose && dispose();
           if ((!inFallback || p !== undefined) && visibleContent) {
             store.resolved = true;
+            ctx = p = undefined;
             resumeEffects(store.effects);
             return rendered;
           }
@@ -1577,4 +1585,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

@@ -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

@@ -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

@@ -246,7 +246,7 @@ function createResource(source, fetcher, options) {
     fetcher = source;
     source = true;
   }
-  options ||= {};
+  options || (options = {});
   if (options.globalRefetch !== false) {
     Resources || (Resources = new Set());
     Resources.add(load);
@@ -503,7 +503,7 @@ function startTransition(fn) {
         queue: new Set(),
         running: true
       });
-      t.done ||= new Promise(res => t.resolve = res);
+      t.done || (t.done = new Promise(res => t.resolve = res));
       t.running = true;
     }
     batch(fn);
@@ -1232,7 +1232,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 +1317,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) {
@@ -1427,20 +1433,18 @@ function Suspense(props) {
     const key = sharedConfig.context.id + sharedConfig.context.count;
     p = sharedConfig.load(key);
     if (p) {
-      if (typeof p !== "object" || !("then" in p)) error = p;else {
-        const [s, set] = createSignal(undefined, {
-          equals: false
-        });
-        flicker = s;
-        p.then(err => {
-          if (error = err) return set();
-          sharedConfig.gather(key);
-          setHydrateContext(ctx);
-          set();
-          setHydrateContext();
-          p = undefined;
-        });
-      }
+      if (typeof p !== "object" || !("then" in p)) p = Promise.resolve(p);
+      const [s, set] = createSignal(undefined, {
+        equals: false
+      });
+      flicker = s;
+      p.then(err => {
+        if (error = err) return set();
+        sharedConfig.gather(key);
+        setHydrateContext(ctx);
+        set();
+        setHydrateContext();
+      });
     }
   }
   const listContext = useContext(SuspenseListContext);
@@ -1466,6 +1470,7 @@ function Suspense(props) {
           dispose && dispose();
           if ((!inFallback || p !== undefined) && visibleContent) {
             store.resolved = true;
+            ctx = p = undefined;
             resumeEffects(store.effects);
             return rendered;
           }
@@ -1534,6 +1539,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

@@ -242,7 +242,7 @@ function createResource(source, fetcher, options) {
     fetcher = source;
     source = true;
   }
-  options ||= {};
+  options || (options = {});
   if (options.globalRefetch !== false) {
     Resources || (Resources = new Set());
     Resources.add(load);
@@ -499,7 +499,7 @@ function startTransition(fn) {
         queue: new Set(),
         running: true
       });
-      t.done ||= new Promise(res => t.resolve = res);
+      t.done || (t.done = new Promise(res => t.resolve = res));
       t.running = true;
     }
     batch(fn);
@@ -1228,7 +1228,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 +1313,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) {
@@ -1423,20 +1429,18 @@ function Suspense(props) {
     const key = sharedConfig.context.id + sharedConfig.context.count;
     p = sharedConfig.load(key);
     if (p) {
-      if (typeof p !== "object" || !("then" in p)) error = p;else {
-        const [s, set] = createSignal(undefined, {
-          equals: false
-        });
-        flicker = s;
-        p.then(err => {
-          if (error = err) return set();
-          sharedConfig.gather(key);
-          setHydrateContext(ctx);
-          set();
-          setHydrateContext();
-          p = undefined;
-        });
-      }
+      if (typeof p !== "object" || !("then" in p)) p = Promise.resolve(p);
+      const [s, set] = createSignal(undefined, {
+        equals: false
+      });
+      flicker = s;
+      p.then(err => {
+        if (error = err) return set();
+        sharedConfig.gather(key);
+        setHydrateContext(ctx);
+        set();
+        setHydrateContext();
+      });
     }
   }
   const listContext = useContext(SuspenseListContext);
@@ -1462,6 +1466,7 @@ function Suspense(props) {
           dispose && dispose();
           if ((!inFallback || p !== undefined) && visibleContent) {
             store.resolved = true;
+            ctx = p = undefined;
             resumeEffects(store.effects);
             return rendered;
           }
@@ -1485,4 +1490,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.1",
+  "version": "1.3.5",
   "author": "Ryan Carniato",
   "license": "MIT",
   "homepage": "https://solidjs.com",
@@ -144,5 +144,5 @@
     "compiler",
     "performance"
   ],
-  "gitHead": "9198a44115b8450b0ae61355008a490c4e25007f"
+  "gitHead": "cc19f07cfd675bd5579891dcae3145fa0d171c66"
 }

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/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/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

@@ -59,7 +59,7 @@ function reconcileArrays(parentNode, a, b) {
       while (bStart < bEnd) parentNode.insertBefore(b[bStart++], node);
     } else if (bEnd === bStart) {
       while (aStart < aEnd) {
-        if (!map || !map.has(a[aStart])) parentNode.removeChild(a[aStart]);
+        if (!map || !map.has(a[aStart])) a[aStart].remove();
         aStart++;
       }
     } else if (a[aStart] === b[bEnd - 1] && b[bStart] === a[aEnd - 1]) {
@@ -88,7 +88,7 @@ function reconcileArrays(parentNode, a, b) {
             while (bStart < index) parentNode.insertBefore(b[bStart++], node);
           } else parentNode.replaceChild(b[bStart++], a[aStart++]);
         } else aStart++;
-      } else parentNode.removeChild(a[aStart++]);
+      } else a[aStart++].remove();
     }
   }
 }
@@ -347,6 +347,7 @@ function spreadExpression(node, props, prevProps = {}, isSVG, skipChildren) {
   return prevProps;
 }
 function insertExpression(parent, value, current, marker, unwrapArray) {
+  if (solidJs.sharedConfig.context && !current) current = [...parent.childNodes];
   while (typeof current === "function") current = current();
   if (value === current) return current;
   const t = typeof value,
@@ -388,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, current);
+      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;
@@ -449,10 +446,10 @@ function cleanChildren(parent, current, marker, replacement) {
       const el = current[i];
       if (node !== el) {
         const isParent = el.parentNode === parent;
-        if (!inserted && !i) isParent ? parent.replaceChild(node, el) : parent.insertBefore(node, marker);else isParent && parent.removeChild(el);
+        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) {
@@ -539,6 +536,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);

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"];
@@ -56,7 +56,7 @@ function reconcileArrays(parentNode, a, b) {
       while (bStart < bEnd) parentNode.insertBefore(b[bStart++], node);
     } else if (bEnd === bStart) {
       while (aStart < aEnd) {
-        if (!map || !map.has(a[aStart])) parentNode.removeChild(a[aStart]);
+        if (!map || !map.has(a[aStart])) a[aStart].remove();
         aStart++;
       }
     } else if (a[aStart] === b[bEnd - 1] && b[bStart] === a[aEnd - 1]) {
@@ -85,7 +85,7 @@ function reconcileArrays(parentNode, a, b) {
             while (bStart < index) parentNode.insertBefore(b[bStart++], node);
           } else parentNode.replaceChild(b[bStart++], a[aStart++]);
         } else aStart++;
-      } else parentNode.removeChild(a[aStart++]);
+      } else a[aStart++].remove();
     }
   }
 }
@@ -344,6 +344,7 @@ function spreadExpression(node, props, prevProps = {}, isSVG, skipChildren) {
   return prevProps;
 }
 function insertExpression(parent, value, current, marker, unwrapArray) {
+  if (sharedConfig.context && !current) current = [...parent.childNodes];
   while (typeof current === "function") current = current();
   if (value === current) return current;
   const t = typeof value,
@@ -385,28 +386,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, current);
+      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;
@@ -446,10 +443,10 @@ function cleanChildren(parent, current, marker, replacement) {
       const el = current[i];
       if (node !== el) {
         const isParent = el.parentNode === parent;
-        if (!inserted && !i) isParent ? parent.replaceChild(node, el) : parent.insertBefore(node, marker);else isParent && parent.removeChild(el);
+        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) {
@@ -536,6 +533,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);

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,13 @@ function renderToStream(code, options = {}) {
   const dedupe = new WeakMap();
   const checkEnd = () => {
     if (!registry.size && !completed) {
+      writeTasks();
       onCompleteAll && onCompleteAll(result);
       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 +355,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 +370,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;
@@ -575,8 +578,8 @@ function getHydrationKey() {
 function generateHydrationScript({
   eventNames = ["click", "input"],
   nonce
-}) {
-  return `<script${nonce ? ` nonce="${nonce}"` : ""}>var e,t;e=window._$HY||(_$HY={events:[],completed:new WeakSet,r:{}}),t=e=>e&&e.hasAttribute&&(e.hasAttribute("data-hk")?e:t(e.host&&e.host instanceof Node?e.host:e.parentNode)),["${eventNames.join('","')}"].forEach((o=>document.addEventListener(o,(o=>{let s=o.composedPath&&o.composedPath()[0]||o.target,a=t(s);a&&!e.completed.has(a)&&e.events.push([a,o])})))),e.init=(t,o)=>{e.r[t]=[new Promise(((e,t)=>o=e)),o]},e.set=(t,o,s)=>{(s=e.r[t])&&s[1](o),e.r[t]=[o]},e.unset=t=>{delete e.r[t]},e.load=(t,o)=>{if(o=e.r[t])return o[0]};</script><!xs>`;
+} = {}) {
+  return `<script${nonce ? ` nonce="${nonce}"` : ""}>var e,t;e=window._$HY||(_$HY={events:[],completed:new WeakSet,r:{}}),t=e=>e&&e.hasAttribute&&(e.hasAttribute("data-hk")?e:t(e.host&&e.host instanceof Node?e.host:e.parentNode)),["${eventNames.join('","')}"].forEach((o=>document.addEventListener(o,(o=>{let s=o.composedPath&&o.composedPath()[0]||o.target,a=t(s);a&&!e.completed.has(a)&&e.events.push([a,o])})))),e.init=(t,o)=>{e.r[t]=[new Promise(((e,t)=>o=e)),o]},e.set=(t,o,s)=>{(s=e.r[t])&&s[1](o),e.r[t]=[o]},e.unset=t=>{delete e.r[t]},e.load=(t,o)=>{if(o=e.r[t])return o[0]};</script><!--xs-->`;
 }
 function injectAssets(assets, html) {
   for (let i = 0; i < assets.length; i++) {
@@ -586,7 +589,7 @@ function injectAssets(assets, html) {
 }
 function injectScripts(html, scripts, nonce) {
   const tag = `<script${nonce ? ` nonce="${nonce}"` : ""}>${scripts}</script>`;
-  const index = html.indexOf("<!xs>");
+  const index = html.indexOf("<!--xs-->");
   if (index > -1) {
     return html.slice(0, index) + tag + html.slice(index);
   }

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,13 @@ function renderToStream(code, options = {}) {
   const dedupe = new WeakMap();
   const checkEnd = () => {
     if (!registry.size && !completed) {
+      writeTasks();
       onCompleteAll && onCompleteAll(result);
       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 +352,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 +367,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;
@@ -572,8 +575,8 @@ function getHydrationKey() {
 function generateHydrationScript({
   eventNames = ["click", "input"],
   nonce
-}) {
-  return `<script${nonce ? ` nonce="${nonce}"` : ""}>var e,t;e=window._$HY||(_$HY={events:[],completed:new WeakSet,r:{}}),t=e=>e&&e.hasAttribute&&(e.hasAttribute("data-hk")?e:t(e.host&&e.host instanceof Node?e.host:e.parentNode)),["${eventNames.join('","')}"].forEach((o=>document.addEventListener(o,(o=>{let s=o.composedPath&&o.composedPath()[0]||o.target,a=t(s);a&&!e.completed.has(a)&&e.events.push([a,o])})))),e.init=(t,o)=>{e.r[t]=[new Promise(((e,t)=>o=e)),o]},e.set=(t,o,s)=>{(s=e.r[t])&&s[1](o),e.r[t]=[o]},e.unset=t=>{delete e.r[t]},e.load=(t,o)=>{if(o=e.r[t])return o[0]};</script><!xs>`;
+} = {}) {
+  return `<script${nonce ? ` nonce="${nonce}"` : ""}>var e,t;e=window._$HY||(_$HY={events:[],completed:new WeakSet,r:{}}),t=e=>e&&e.hasAttribute&&(e.hasAttribute("data-hk")?e:t(e.host&&e.host instanceof Node?e.host:e.parentNode)),["${eventNames.join('","')}"].forEach((o=>document.addEventListener(o,(o=>{let s=o.composedPath&&o.composedPath()[0]||o.target,a=t(s);a&&!e.completed.has(a)&&e.events.push([a,o])})))),e.init=(t,o)=>{e.r[t]=[new Promise(((e,t)=>o=e)),o]},e.set=(t,o,s)=>{(s=e.r[t])&&s[1](o),e.r[t]=[o]},e.unset=t=>{delete e.r[t]},e.load=(t,o)=>{if(o=e.r[t])return o[0]};</script><!--xs-->`;
 }
 function injectAssets(assets, html) {
   for (let i = 0; i < assets.length; i++) {
@@ -583,7 +586,7 @@ function injectAssets(assets, html) {
 }
 function injectScripts(html, scripts, nonce) {
   const tag = `<script${nonce ? ` nonce="${nonce}"` : ""}>${scripts}</script>`;
-  const index = html.indexOf("<!xs>");
+  const index = html.indexOf("<!--xs-->");
   if (index > -1) {
     return html.slice(0, index) + tag + html.slice(index);
   }

package/web/dist/web.cjs

@@ -59,7 +59,7 @@ function reconcileArrays(parentNode, a, b) {
       while (bStart < bEnd) parentNode.insertBefore(b[bStart++], node);
     } else if (bEnd === bStart) {
       while (aStart < aEnd) {
-        if (!map || !map.has(a[aStart])) parentNode.removeChild(a[aStart]);
+        if (!map || !map.has(a[aStart])) a[aStart].remove();
         aStart++;
       }
     } else if (a[aStart] === b[bEnd - 1] && b[bStart] === a[aEnd - 1]) {
@@ -88,7 +88,7 @@ function reconcileArrays(parentNode, a, b) {
             while (bStart < index) parentNode.insertBefore(b[bStart++], node);
           } else parentNode.replaceChild(b[bStart++], a[aStart++]);
         } else aStart++;
-      } else parentNode.removeChild(a[aStart++]);
+      } else a[aStart++].remove();
     }
   }
 }
@@ -346,6 +346,7 @@ function spreadExpression(node, props, prevProps = {}, isSVG, skipChildren) {
   return prevProps;
 }
 function insertExpression(parent, value, current, marker, unwrapArray) {
+  if (solidJs.sharedConfig.context && !current) current = [...parent.childNodes];
   while (typeof current === "function") current = current();
   if (value === current) return current;
   const t = typeof value,
@@ -387,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, current);
+      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;
@@ -448,10 +445,10 @@ function cleanChildren(parent, current, marker, replacement) {
       const el = current[i];
       if (node !== el) {
         const isParent = el.parentNode === parent;
-        if (!inserted && !i) isParent ? parent.replaceChild(node, el) : parent.insertBefore(node, marker);else isParent && parent.removeChild(el);
+        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) {

package/web/dist/web.js

@@ -56,7 +56,7 @@ function reconcileArrays(parentNode, a, b) {
       while (bStart < bEnd) parentNode.insertBefore(b[bStart++], node);
     } else if (bEnd === bStart) {
       while (aStart < aEnd) {
-        if (!map || !map.has(a[aStart])) parentNode.removeChild(a[aStart]);
+        if (!map || !map.has(a[aStart])) a[aStart].remove();
         aStart++;
       }
     } else if (a[aStart] === b[bEnd - 1] && b[bStart] === a[aEnd - 1]) {
@@ -85,7 +85,7 @@ function reconcileArrays(parentNode, a, b) {
             while (bStart < index) parentNode.insertBefore(b[bStart++], node);
           } else parentNode.replaceChild(b[bStart++], a[aStart++]);
         } else aStart++;
-      } else parentNode.removeChild(a[aStart++]);
+      } else a[aStart++].remove();
     }
   }
 }
@@ -343,6 +343,7 @@ function spreadExpression(node, props, prevProps = {}, isSVG, skipChildren) {
   return prevProps;
 }
 function insertExpression(parent, value, current, marker, unwrapArray) {
+  if (sharedConfig.context && !current) current = [...parent.childNodes];
   while (typeof current === "function") current = current();
   if (value === current) return current;
   const t = typeof value,
@@ -384,28 +385,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, current);
+      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;
@@ -445,10 +442,10 @@ function cleanChildren(parent, current, marker, replacement) {
       const el = current[i];
       if (node !== el) {
         const isParent = el.parentNode === parent;
-        if (!inserted && !i) isParent ? parent.replaceChild(node, el) : parent.insertBefore(node, marker);else isParent && parent.removeChild(el);
+        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) {

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"
+    }
+  }
 }