fix #2282: Add Check for Proxy support (#2284)

* fix: Add Check for Proxy support * Create quick-mirrors-mix.md --------- Co-authored-by: Ryan Carniato <ryansolid@gmail.com>
solidjs · Sep 23, 2024 · 9e192d7 · 9e192d7
1 parent 73c0092
commit 9e192d7
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/.changeset/quick-mirrors-mix.md b/.changeset/quick-mirrors-mix.md
@@ -0,0 +1,5 @@
+---
+"solid-js": patch
+---
+
+fix #2282: Add Check for Proxy support
diff --git a/packages/solid/src/reactive/signal.ts b/packages/solid/src/reactive/signal.ts
@@ -30,6 +30,7 @@ import type { FlowComponent, FlowProps } from "../render/index.js";
 
 export const equalFn = <T>(a: T, b: T) => a === b;
 export const $PROXY = Symbol("solid-proxy");
+export const SUPPORTS_PROXY = typeof Proxy === "function";
 export const $TRACK = Symbol("solid-track");
 export const $DEVCOMP = Symbol("solid-dev-component");
 const signalOptions = { equals: equalFn };

diff --git a/packages/solid/src/render/component.ts b/packages/solid/src/render/component.ts
@@ -5,6 +5,7 @@ import {
   createMemo,
   devComponent,
   $PROXY,
+  SUPPORTS_PROXY,
   $DEVCOMP,
   EffectFunction
 } from "../reactive/signal.js";
@@ -197,7 +198,7 @@ export function mergeProps<T extends unknown[]>(...sources: T): MergeProps<T> {
     sources[i] =
       typeof s === "function" ? ((proxy = true), createMemo(s as EffectFunction<unknown>)) : s;
   }
-  if (proxy) {
+  if (SUPPORTS_PROXY && proxy) {
     return new Proxy(
       {
         get(property: string | number | symbol) {
@@ -280,7 +281,7 @@ export function splitProps<
   T extends Record<any, any>,
   K extends [readonly (keyof T)[], ...(readonly (keyof T)[])[]]
 >(props: T, ...keys: K): SplitProps<T, K> {
-  if ($PROXY in props) {
+  if (SUPPORTS_PROXY && $PROXY in props) {
     const blocked = new Set<keyof T>(keys.length > 1 ? keys.flat() : keys[0]);
     const res = keys.map(k => {
       return new Proxy(