vue 2.7.0 → 2.7.1

package/dist/vue.common.dev.js

@@ -1,5 +1,5 @@
 /*!
- * Vue.js v2.7.0
+ * Vue.js v2.7.1
  * (c) 2014-2022 Evan You
  * Released under the MIT License.
  */
@@ -318,7 +318,7 @@ function hasChanged(x, y) {
         return x === 0 && 1 / x !== 1 / y;
     }
     else {
-        return x === x && y === y;
+        return x === x || y === y;
     }
 }
 
@@ -925,6 +925,33 @@ function triggerRef(ref) {
 function unref(ref) {
     return isRef(ref) ? ref.value : ref;
 }
+function proxyRefs(objectWithRefs) {
+    if (isReactive(objectWithRefs)) {
+        return objectWithRefs;
+    }
+    const proxy = {};
+    const keys = Object.keys(objectWithRefs);
+    for (let i = 0; i < keys.length; i++) {
+        proxyWithRefUnwrap(proxy, objectWithRefs, keys[i]);
+    }
+    return proxy;
+}
+function proxyWithRefUnwrap(target, source, key) {
+    Object.defineProperty(target, key, {
+        enumerable: true,
+        configurable: true,
+        get: () => unref(source[key]),
+        set: value => {
+            const oldValue = source[key];
+            if (isRef(oldValue) && !isRef(value)) {
+                oldValue.value = value;
+            }
+            else {
+                source[key] = value;
+            }
+        }
+    });
+}
 function customRef(factory) {
     const dep = new Dep();
     const { get, set } = factory(() => {
@@ -1461,7 +1488,9 @@ function initSetup(vm) {
                 // exposed for compiled render fn
                 const proxy = (vm._setupProxy = {});
                 for (const key in setupResult) {
-                    proxyWithRefUnwrap(proxy, setupResult, key);
+                    if (key !== '__sfc') {
+                        proxyWithRefUnwrap(proxy, setupResult, key);
+                    }
                 }
             }
         }
@@ -1470,20 +1499,6 @@ function initSetup(vm) {
         }
     }
 }
-function proxyWithRefUnwrap(target, source, key) {
-    Object.defineProperty(target, key, {
-        enumerable: true,
-        configurable: true,
-        get: () => {
-            const raw = source[key];
-            return isRef(raw) ? raw.value : raw;
-        },
-        set: newVal => {
-            const raw = source[key];
-            isRef(raw) ? (raw.value = newVal) : (source[key] = newVal);
-        }
-    });
-}
 function createSetupContext(vm) {
     let exposeCalled = false;
     return {
@@ -4588,7 +4603,7 @@ const onServerPrefetch = createLifeCycle('serverPrefetch');
 const onRenderTracked = createLifeCycle('renderTracked');
 const onRenderTriggered = createLifeCycle('renderTriggered');
 
-const version = '2.7.0';
+const version = '2.7.1';
 /**
  * @internal type is manually declared in <root>/types/v3-define-component.d.ts
  */
@@ -4606,6 +4621,7 @@ var vca = /*#__PURE__*/Object.freeze({
   toRef: toRef,
   toRefs: toRefs,
   unref: unref,
+  proxyRefs: proxyRefs,
   customRef: customRef,
   triggerRef: triggerRef,
   reactive: reactive,
@@ -4793,7 +4809,7 @@ function defineReactive(obj, key, val, customSetter, shallow) {
                     }
                 }
             }
-            return isRef(value) ? value.value : value;
+            return isRef(value) && !shallow ? value.value : value;
         },
         set: function reactiveSetter(newVal) {
             const value = getter ? getter.call(obj) : val;