fixup! fix: don't try to deepMerge read-only properties

mixxxdj · Jan 20, 2025 · 3c3c4ff · 3c3c4ff
1 parent 3b16e7c
commit 3c3c4ff
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/res/controllers/common-controller-scripts.js b/res/controllers/common-controller-scripts.js
@@ -178,17 +178,21 @@ const deepMerge = function(target, source) {
         target.push(...Object.values(objTarget));
     } else if (isSimpleObject(target) && isSimpleObject(source)) {
         Object.keys(source).forEach(key => {
-            // ensure the property is not read-only, if so skip it.
-            if (!Object.getOwnPropertyDescriptor(source, key).writable) {
-                return;
-            }
             if (
                 Array.isArray(target[key]) && Array.isArray(source[key]) ||
               isSimpleObject(target[key]) && isSimpleObject(source[key])
             ) {
                 deepMerge(target[key], source[key]);
             } else if (source[key] !== undefined && source[key] !== null) {
-                Object.assign(target, {[key]: source[key]});
+                try {
+                    Object.assign(target, {[key]: source[key]});
+                } catch (e) {
+                    if (e instanceof TypeError) {
+                        console.warn(e.message);
+                    } else {
+                        throw e;
+                    }
+                }
             }
         });
     }