Fix infinite loop in Suspense error handling on the server (#1649)

solidjs · Mar 26, 2023 · 1d4d532 · 1d4d532
1 parent 620c763
commit 1d4d532
Showing 1 changed file with 8 additions and 9 deletions.
diff --git a/packages/solid/src/server/rendering.ts b/packages/solid/src/server/rendering.ts
@@ -552,7 +552,6 @@ export function SuspenseList(props: {
 
 export function Suspense(props: { fallback?: string; children: string }) {
   let done: undefined | ((html?: string, error?: any) => boolean);
-  let clean: any;
   const ctx = sharedConfig.context!;
   const id = ctx.id + ctx.count;
   const o = createOwner();
@@ -569,8 +568,8 @@ export function Suspense(props: { fallback?: string; children: string }) {
     });
   function runSuspense() {
     setHydrateContext({ ...ctx, count: 0 });
-    o && cleanNode(o);
-    return runWithOwner(o!, () => {
+    cleanNode(o);
+    return runWithOwner(o, () => {
       return createComponent(SuspenseContext.Provider, {
         value,
         get children() {
@@ -584,14 +583,14 @@ export function Suspense(props: { fallback?: string; children: string }) {
   // never suspended
   if (suspenseComplete(value)) return res;
 
-  onError(err => {
-    if (!done || !done(undefined, err)) {
-      if (o)
-        runWithOwner(o.owner!, () => {
+  runWithOwner(o, () => {
+    onError(err => {
+      if (!done || !done(undefined, err)) {
+        runWithOwner(o.owner, () => {
           throw err;
         });
-      else throw err;
-    }
+      }
+    });
   });
   done = ctx.async ? ctx.registerFragment(id) : undefined;
   if (ctx.async) {