fix #1875 - mergeProps not handling undefined on SSR

solidjs · Sep 11, 2023 · 12eb155 · 12eb155
1 parent f79ba4d
commit 12eb155
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/.changeset/kind-donuts-march.md b/.changeset/kind-donuts-march.md
@@ -0,0 +1,5 @@
+---
+"solid-js": patch
+---
+
+fix #1875 - mergeProps not handling undefined on SSR
diff --git a/packages/solid/src/server/rendering.ts b/packages/solid/src/server/rendering.ts
@@ -100,9 +100,10 @@ export function mergeProps(...sources: any): any {
           enumerable: true,
           get() {
             for (let i = sources.length - 1; i >= 0; i--) {
-              let s = sources[i] || {};
+              let v,
+                s = sources[i];
               if (typeof s === "function") s = s();
-              const v = s[key];
+              v = (s || {})[key];
               if (v !== undefined) return v;
             }
           }