Merge efd4035 into 0e6e497

solidjs · Jun 7, 2022 · 6fd1f43 · 6fd1f43
2 parents 0e6e497 + efd4035
commit 6fd1f43
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/packages/solid/store/src/server.ts b/packages/solid/store/src/server.ts
@@ -6,7 +6,7 @@ export function isWrappable(obj: any) {
   return (
     obj != null &&
     typeof obj === "object" &&
-    (obj.__proto__ === Object.prototype || Array.isArray(obj))
+    (Object.getPrototypeOf(obj) === Object.prototype || Array.isArray(obj))
   );
 }
 

diff --git a/packages/solid/store/src/store.ts b/packages/solid/store/src/store.ts
@@ -41,10 +41,14 @@ function wrap<T extends StoreNode>(value: T, name?: string): T {
 
 export function isWrappable<T>(obj: T | NotWrappable): obj is T;
 export function isWrappable(obj: any) {
+  let proto;
   return (
     obj != null &&
     typeof obj === "object" &&
-    (obj[$PROXY] || !obj.__proto__ || obj.__proto__ === Object.prototype || Array.isArray(obj))
+    (obj[$PROXY] ||
+      !(proto = Object.getPrototypeOf(obj)) ||
+      proto === Object.prototype ||
+      Array.isArray(obj))
   );
 }