vue 2.7.0 → 2.7.3

package/dist/vue.runtime.esm.js

@@ -1,5 +1,5 @@
 /*!
- * Vue.js v2.7.0
+ * Vue.js v2.7.3
  * (c) 2014-2022 Evan You
  * Released under the MIT License.
  */
@@ -306,7 +306,7 @@ function hasChanged(x, y) {
         return x === 0 && 1 / x !== 1 / y;
     }
     else {
-        return x === x && y === y;
+        return x === x || y === y;
     }
 }
 
@@ -324,7 +324,9 @@ var LIFECYCLE_HOOKS = [
     'activated',
     'deactivated',
     'errorCaptured',
-    'serverPrefetch'
+    'serverPrefetch',
+    'renderTracked',
+    'renderTriggered'
 ];
 
 var config = {
@@ -879,7 +881,7 @@ function makeReactive(target, shallow) {
                 warn("Target is already a ".concat(existingOb.shallow ? "" : "non-", "shallow reactive object, and cannot be converted to ").concat(shallow ? "" : "non-", "shallow."));
             }
         }
-        var ob = observe(target, shallow);
+        var ob = observe(target, shallow, isServerRendering() /* ssr mock reactivity */);
         if (process.env.NODE_ENV !== 'production' && !ob) {
             if (target == null || isPrimitive(target)) {
                 warn("value cannot be made reactive: ".concat(String(target)));
@@ -941,7 +943,7 @@ function createRef(rawValue, shallow) {
     var ref = {};
     def(ref, RefFlag, true);
     def(ref, "__v_isShallow" /* ReactiveFlags.IS_SHALLOW */, true);
-    ref.dep = defineReactive(ref, 'value', rawValue, null, shallow);
+    def(ref, 'dep', defineReactive(ref, 'value', rawValue, null, shallow, isServerRendering()));
     return ref;
 }
 function triggerRef(ref) {
@@ -963,6 +965,33 @@ function triggerRef(ref) {
 function unref(ref) {
     return isRef(ref) ? ref.value : ref;
 }
+function proxyRefs(objectWithRefs) {
+    if (isReactive(objectWithRefs)) {
+        return objectWithRefs;
+    }
+    var proxy = {};
+    var keys = Object.keys(objectWithRefs);
+    for (var 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: function () { return unref(source[key]); },
+        set: function (value) {
+            var oldValue = source[key];
+            if (isRef(oldValue) && !isRef(value)) {
+                oldValue.value = value;
+            }
+            else {
+                source[key] = value;
+            }
+        }
+    });
+}
 function customRef(factory) {
     var dep = new Dep();
     var _a = factory(function () {
@@ -2380,7 +2409,9 @@ function initSetup(vm) {
                 // exposed for compiled render fn
                 var proxy = (vm._setupProxy = {});
                 for (var key in setupResult) {
-                    proxyWithRefUnwrap(proxy, setupResult, key);
+                    if (key !== '__sfc') {
+                        proxyWithRefUnwrap(proxy, setupResult, key);
+                    }
                 }
             }
         }
@@ -2389,20 +2420,6 @@ function initSetup(vm) {
         }
     }
 }
-function proxyWithRefUnwrap(target, source, key) {
-    Object.defineProperty(target, key, {
-        enumerable: true,
-        configurable: true,
-        get: function () {
-            var raw = source[key];
-            return isRef(raw) ? raw.value : raw;
-        },
-        set: function (newVal) {
-            var raw = source[key];
-            isRef(raw) ? (raw.value = newVal) : (source[key] = newVal);
-        }
-    });
-}
 function createSetupContext(vm) {
     var exposeCalled = false;
     return {
@@ -4198,7 +4215,7 @@ var onServerPrefetch = createLifeCycle('serverPrefetch');
 var onRenderTracked = createLifeCycle('renderTracked');
 var onRenderTriggered = createLifeCycle('renderTriggered');
 
-var version = '2.7.0';
+var version = '2.7.3';
 /**
  * @internal type is manually declared in <root>/types/v3-define-component.d.ts
  */
@@ -4216,6 +4233,13 @@ var shouldObserve = true;
 function toggleObserving(value) {
     shouldObserve = value;
 }
+// ssr mock dep
+var mockDep = {
+    notify: noop,
+    depend: noop,
+    addSub: noop,
+    removeSub: noop
+};
 /**
  * Observer class that is attached to each observed
  * object. Once attached, the observer converts the target
@@ -4223,78 +4247,63 @@ function toggleObserving(value) {
  * collect dependencies and dispatch updates.
  */
 var Observer = /** @class */ (function () {
-    function Observer(value, shallow) {
+    function Observer(value, shallow, mock) {
         if (shallow === void 0) { shallow = false; }
+        if (mock === void 0) { mock = false; }
         this.value = value;
         this.shallow = shallow;
+        this.mock = mock;
         // this.value = value
-        this.dep = new Dep();
+        this.dep = mock ? mockDep : new Dep();
         this.vmCount = 0;
         def(value, '__ob__', this);
         if (isArray(value)) {
-            if (hasProto) {
-                protoAugment(value, arrayMethods);
-            }
-            else {
-                copyAugment(value, arrayMethods, arrayKeys);
+            if (!mock) {
+                if (hasProto) {
+                    value.__proto__ = arrayMethods;
+                    /* eslint-enable no-proto */
+                }
+                else {
+                    for (var i = 0, l = arrayKeys.length; i < l; i++) {
+                        var key = arrayKeys[i];
+                        def(value, key, arrayMethods[key]);
+                    }
+                }
             }
             if (!shallow) {
                 this.observeArray(value);
             }
         }
         else {
-            this.walk(value, shallow);
+            /**
+             * Walk through all properties and convert them into
+             * getter/setters. This method should only be called when
+             * value type is Object.
+             */
+            var keys = Object.keys(value);
+            for (var i = 0; i < keys.length; i++) {
+                var key = keys[i];
+                defineReactive(value, key, NO_INIITIAL_VALUE, undefined, shallow, mock);
+            }
         }
     }
-    /**
-     * Walk through all properties and convert them into
-     * getter/setters. This method should only be called when
-     * value type is Object.
-     */
-    Observer.prototype.walk = function (obj, shallow) {
-        var keys = Object.keys(obj);
-        for (var i = 0; i < keys.length; i++) {
-            var key = keys[i];
-            defineReactive(obj, key, NO_INIITIAL_VALUE, undefined, shallow);
-        }
-    };
     /**
      * Observe a list of Array items.
      */
-    Observer.prototype.observeArray = function (items) {
-        for (var i = 0, l = items.length; i < l; i++) {
-            observe(items[i]);
+    Observer.prototype.observeArray = function (value) {
+        for (var i = 0, l = value.length; i < l; i++) {
+            observe(value[i], false, this.mock);
         }
     };
     return Observer;
 }());
 // helpers
-/**
- * Augment a target Object or Array by intercepting
- * the prototype chain using __proto__
- */
-function protoAugment(target, src) {
-    /* eslint-disable no-proto */
-    target.__proto__ = src;
-    /* eslint-enable no-proto */
-}
-/**
- * Augment a target Object or Array by defining
- * hidden properties.
- */
-/* istanbul ignore next */
-function copyAugment(target, src, keys) {
-    for (var i = 0, l = keys.length; i < l; i++) {
-        var key = keys[i];
-        def(target, key, src[key]);
-    }
-}
 /**
  * Attempt to create an observer instance for a value,
  * returns the new observer if successfully observed,
  * or the existing observer if the value already has one.
  */
-function observe(value, shallow) {
+function observe(value, shallow, ssrMockReactivity) {
     if (!isObject(value) || isRef(value) || value instanceof VNode) {
         return;
     }
@@ -4303,18 +4312,18 @@ function observe(value, shallow) {
         ob = value.__ob__;
     }
     else if (shouldObserve &&
-        !isServerRendering() &&
+        (ssrMockReactivity || !isServerRendering()) &&
         (isArray(value) || isPlainObject(value)) &&
         Object.isExtensible(value) &&
-        !value.__v_skip) {
-        ob = new Observer(value, shallow);
+        !value.__v_skip /* ReactiveFlags.SKIP */) {
+        ob = new Observer(value, shallow, ssrMockReactivity);
     }
     return ob;
 }
 /**
  * Define a reactive property on an Object.
  */
-function defineReactive(obj, key, val, customSetter, shallow) {
+function defineReactive(obj, key, val, customSetter, shallow, mock) {
     var dep = new Dep();
     var property = Object.getOwnPropertyDescriptor(obj, key);
     if (property && property.configurable === false) {
@@ -4327,7 +4336,7 @@ function defineReactive(obj, key, val, customSetter, shallow) {
         (val === NO_INIITIAL_VALUE || arguments.length === 2)) {
         val = obj[key];
     }
-    var childOb = !shallow && observe(val);
+    var childOb = !shallow && observe(val, false, mock);
     Object.defineProperty(obj, key, {
         enumerable: true,
         configurable: true,
@@ -4351,7 +4360,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) {
             var value = getter ? getter.call(obj) : val;
@@ -4375,7 +4384,7 @@ function defineReactive(obj, key, val, customSetter, shallow) {
             else {
                 val = newVal;
             }
-            childOb = !shallow && observe(newVal);
+            childOb = !shallow && observe(newVal, false, mock);
             if (process.env.NODE_ENV !== 'production') {
                 dep.notify({
                     type: "set" /* TriggerOpTypes.SET */,
@@ -4400,16 +4409,20 @@ function set(target, key, val) {
         process.env.NODE_ENV !== 'production' && warn("Set operation on key \"".concat(key, "\" failed: target is readonly."));
         return;
     }
+    var ob = target.__ob__;
     if (isArray(target) && isValidArrayIndex(key)) {
         target.length = Math.max(target.length, key);
         target.splice(key, 1, val);
+        // when mocking for SSR, array methods are not hijacked
+        if (!ob.shallow && ob.mock) {
+            observe(val, false, true);
+        }
         return val;
     }
     if (key in target && !(key in Object.prototype)) {
         target[key] = val;
         return val;
     }
-    var ob = target.__ob__;
     if (target._isVue || (ob && ob.vmCount)) {
         process.env.NODE_ENV !== 'production' &&
             warn('Avoid adding reactive properties to a Vue instance or its root $data ' +
@@ -4420,7 +4433,7 @@ function set(target, key, val) {
         target[key] = val;
         return val;
     }
-    defineReactive(ob.value, key, val);
+    defineReactive(ob.value, key, val, undefined, ob.shallow, ob.mock);
     if (process.env.NODE_ENV !== 'production') {
         ob.dep.notify({
             type: "add" /* TriggerOpTypes.ADD */,
@@ -7042,7 +7055,7 @@ function normalizeDirectives(dirs, vm) {
         }
         res[getRawDirName(dir)] = dir;
         if (vm._setupState && vm._setupState.__sfc) {
-            dir.def = resolveAsset(vm, '_setupState', 'v-' + dir.name);
+            dir.def = dir.def || resolveAsset(vm, '_setupState', 'v-' + dir.name);
         }
         dir.def = dir.def || resolveAsset(vm.$options, 'directives', dir.name, true);
     }
@@ -8589,4 +8602,4 @@ if (inBrowser) {
     }, 0);
 }
 
-export { EffectScope, computed, customRef, Vue as default, defineComponent, del, effectScope, getCurrentInstance, getCurrentScope, h, inject, isProxy, isReactive, isReadonly, isRef, isShallow, markRaw, mergeDefaults, nextTick, onActivated, onBeforeMount, onBeforeUnmount, onBeforeUpdate, onDeactivated, onErrorCaptured, onMounted, onRenderTracked, onRenderTriggered, onScopeDispose, onServerPrefetch, onUnmounted, onUpdated, provide, reactive, readonly, ref$1 as ref, set, shallowReactive, shallowReadonly, shallowRef, toRaw, toRef, toRefs, triggerRef, unref, useAttrs, useCssModule, useCssVars, useSlots, version, watch, watchEffect, watchPostEffect, watchSyncEffect };
+export { EffectScope, computed, customRef, Vue as default, defineComponent, del, effectScope, getCurrentInstance, getCurrentScope, h, inject, isProxy, isReactive, isReadonly, isRef, isShallow, markRaw, mergeDefaults, nextTick, onActivated, onBeforeMount, onBeforeUnmount, onBeforeUpdate, onDeactivated, onErrorCaptured, onMounted, onRenderTracked, onRenderTriggered, onScopeDispose, onServerPrefetch, onUnmounted, onUpdated, provide, proxyRefs, reactive, readonly, ref$1 as ref, set, shallowReactive, shallowReadonly, shallowRef, toRaw, toRef, toRefs, triggerRef, unref, useAttrs, useCssModule, useCssVars, useSlots, version, watch, watchEffect, watchPostEffect, watchSyncEffect };

package/dist/vue.runtime.js

@@ -1,5 +1,5 @@
 /*!
- * Vue.js v2.7.0
+ * Vue.js v2.7.3
  * (c) 2014-2022 Evan You
  * Released under the MIT License.
  */
@@ -312,7 +312,7 @@
           return x === 0 && 1 / x !== 1 / y;
       }
       else {
-          return x === x && y === y;
+          return x === x || y === y;
       }
   }
 
@@ -330,7 +330,9 @@
       'activated',
       'deactivated',
       'errorCaptured',
-      'serverPrefetch'
+      'serverPrefetch',
+      'renderTracked',
+      'renderTriggered'
   ];
 
   var config = {
@@ -882,7 +884,7 @@
                   warn("Target is already a ".concat(existingOb.shallow ? "" : "non-", "shallow reactive object, and cannot be converted to ").concat(shallow ? "" : "non-", "shallow."));
               }
           }
-          var ob = observe(target, shallow);
+          var ob = observe(target, shallow, isServerRendering() /* ssr mock reactivity */);
           if (!ob) {
               if (target == null || isPrimitive(target)) {
                   warn("value cannot be made reactive: ".concat(String(target)));
@@ -944,7 +946,7 @@
       var ref = {};
       def(ref, RefFlag, true);
       def(ref, "__v_isShallow" /* ReactiveFlags.IS_SHALLOW */, true);
-      ref.dep = defineReactive(ref, 'value', rawValue, null, shallow);
+      def(ref, 'dep', defineReactive(ref, 'value', rawValue, null, shallow, isServerRendering()));
       return ref;
   }
   function triggerRef(ref) {
@@ -963,6 +965,33 @@
   function unref(ref) {
       return isRef(ref) ? ref.value : ref;
   }
+  function proxyRefs(objectWithRefs) {
+      if (isReactive(objectWithRefs)) {
+          return objectWithRefs;
+      }
+      var proxy = {};
+      var keys = Object.keys(objectWithRefs);
+      for (var 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: function () { return unref(source[key]); },
+          set: function (value) {
+              var oldValue = source[key];
+              if (isRef(oldValue) && !isRef(value)) {
+                  oldValue.value = value;
+              }
+              else {
+                  source[key] = value;
+              }
+          }
+      });
+  }
   function customRef(factory) {
       var dep = new Dep();
       var _a = factory(function () {
@@ -2366,7 +2395,9 @@
                   // exposed for compiled render fn
                   var proxy = (vm._setupProxy = {});
                   for (var key in setupResult) {
-                      proxyWithRefUnwrap(proxy, setupResult, key);
+                      if (key !== '__sfc') {
+                          proxyWithRefUnwrap(proxy, setupResult, key);
+                      }
                   }
               }
           }
@@ -2375,20 +2406,6 @@
           }
       }
   }
-  function proxyWithRefUnwrap(target, source, key) {
-      Object.defineProperty(target, key, {
-          enumerable: true,
-          configurable: true,
-          get: function () {
-              var raw = source[key];
-              return isRef(raw) ? raw.value : raw;
-          },
-          set: function (newVal) {
-              var raw = source[key];
-              isRef(raw) ? (raw.value = newVal) : (source[key] = newVal);
-          }
-      });
-  }
   function createSetupContext(vm) {
       var exposeCalled = false;
       return {
@@ -4164,7 +4181,7 @@
   var onRenderTracked = createLifeCycle('renderTracked');
   var onRenderTriggered = createLifeCycle('renderTriggered');
 
-  var version = '2.7.0';
+  var version = '2.7.3';
   /**
    * @internal type is manually declared in <root>/types/v3-define-component.d.ts
    */
@@ -4182,6 +4199,7 @@
     toRef: toRef,
     toRefs: toRefs,
     unref: unref,
+    proxyRefs: proxyRefs,
     customRef: customRef,
     triggerRef: triggerRef,
     reactive: reactive,
@@ -4239,6 +4257,13 @@
   function toggleObserving(value) {
       shouldObserve = value;
   }
+  // ssr mock dep
+  var mockDep = {
+      notify: noop,
+      depend: noop,
+      addSub: noop,
+      removeSub: noop
+  };
   /**
    * Observer class that is attached to each observed
    * object. Once attached, the observer converts the target
@@ -4246,78 +4271,63 @@
    * collect dependencies and dispatch updates.
    */
   var Observer = /** @class */ (function () {
-      function Observer(value, shallow) {
+      function Observer(value, shallow, mock) {
           if (shallow === void 0) { shallow = false; }
+          if (mock === void 0) { mock = false; }
           this.value = value;
           this.shallow = shallow;
+          this.mock = mock;
           // this.value = value
-          this.dep = new Dep();
+          this.dep = mock ? mockDep : new Dep();
           this.vmCount = 0;
           def(value, '__ob__', this);
           if (isArray(value)) {
-              if (hasProto) {
-                  protoAugment(value, arrayMethods);
-              }
-              else {
-                  copyAugment(value, arrayMethods, arrayKeys);
+              if (!mock) {
+                  if (hasProto) {
+                      value.__proto__ = arrayMethods;
+                      /* eslint-enable no-proto */
+                  }
+                  else {
+                      for (var i = 0, l = arrayKeys.length; i < l; i++) {
+                          var key = arrayKeys[i];
+                          def(value, key, arrayMethods[key]);
+                      }
+                  }
               }
               if (!shallow) {
                   this.observeArray(value);
               }
           }
           else {
-              this.walk(value, shallow);
+              /**
+               * Walk through all properties and convert them into
+               * getter/setters. This method should only be called when
+               * value type is Object.
+               */
+              var keys = Object.keys(value);
+              for (var i = 0; i < keys.length; i++) {
+                  var key = keys[i];
+                  defineReactive(value, key, NO_INIITIAL_VALUE, undefined, shallow, mock);
+              }
           }
       }
-      /**
-       * Walk through all properties and convert them into
-       * getter/setters. This method should only be called when
-       * value type is Object.
-       */
-      Observer.prototype.walk = function (obj, shallow) {
-          var keys = Object.keys(obj);
-          for (var i = 0; i < keys.length; i++) {
-              var key = keys[i];
-              defineReactive(obj, key, NO_INIITIAL_VALUE, undefined, shallow);
-          }
-      };
       /**
        * Observe a list of Array items.
        */
-      Observer.prototype.observeArray = function (items) {
-          for (var i = 0, l = items.length; i < l; i++) {
-              observe(items[i]);
+      Observer.prototype.observeArray = function (value) {
+          for (var i = 0, l = value.length; i < l; i++) {
+              observe(value[i], false, this.mock);
           }
       };
       return Observer;
   }());
   // helpers
-  /**
-   * Augment a target Object or Array by intercepting
-   * the prototype chain using __proto__
-   */
-  function protoAugment(target, src) {
-      /* eslint-disable no-proto */
-      target.__proto__ = src;
-      /* eslint-enable no-proto */
-  }
-  /**
-   * Augment a target Object or Array by defining
-   * hidden properties.
-   */
-  /* istanbul ignore next */
-  function copyAugment(target, src, keys) {
-      for (var i = 0, l = keys.length; i < l; i++) {
-          var key = keys[i];
-          def(target, key, src[key]);
-      }
-  }
   /**
    * Attempt to create an observer instance for a value,
    * returns the new observer if successfully observed,
    * or the existing observer if the value already has one.
    */
-  function observe(value, shallow) {
+  function observe(value, shallow, ssrMockReactivity) {
       if (!isObject(value) || isRef(value) || value instanceof VNode) {
           return;
       }
@@ -4326,18 +4336,18 @@
           ob = value.__ob__;
       }
       else if (shouldObserve &&
-          !isServerRendering() &&
+          (ssrMockReactivity || !isServerRendering()) &&
           (isArray(value) || isPlainObject(value)) &&
           Object.isExtensible(value) &&
-          !value.__v_skip) {
-          ob = new Observer(value, shallow);
+          !value.__v_skip /* ReactiveFlags.SKIP */) {
+          ob = new Observer(value, shallow, ssrMockReactivity);
       }
       return ob;
   }
   /**
    * Define a reactive property on an Object.
    */
-  function defineReactive(obj, key, val, customSetter, shallow) {
+  function defineReactive(obj, key, val, customSetter, shallow, mock) {
       var dep = new Dep();
       var property = Object.getOwnPropertyDescriptor(obj, key);
       if (property && property.configurable === false) {
@@ -4350,7 +4360,7 @@
           (val === NO_INIITIAL_VALUE || arguments.length === 2)) {
           val = obj[key];
       }
-      var childOb = !shallow && observe(val);
+      var childOb = !shallow && observe(val, false, mock);
       Object.defineProperty(obj, key, {
           enumerable: true,
           configurable: true,
@@ -4371,7 +4381,7 @@
                       }
                   }
               }
-              return isRef(value) ? value.value : value;
+              return isRef(value) && !shallow ? value.value : value;
           },
           set: function reactiveSetter(newVal) {
               var value = getter ? getter.call(obj) : val;
@@ -4395,7 +4405,7 @@
               else {
                   val = newVal;
               }
-              childOb = !shallow && observe(newVal);
+              childOb = !shallow && observe(newVal, false, mock);
               {
                   dep.notify({
                       type: "set" /* TriggerOpTypes.SET */,
@@ -4417,16 +4427,20 @@
           warn("Set operation on key \"".concat(key, "\" failed: target is readonly."));
           return;
       }
+      var ob = target.__ob__;
       if (isArray(target) && isValidArrayIndex(key)) {
           target.length = Math.max(target.length, key);
           target.splice(key, 1, val);
+          // when mocking for SSR, array methods are not hijacked
+          if (!ob.shallow && ob.mock) {
+              observe(val, false, true);
+          }
           return val;
       }
       if (key in target && !(key in Object.prototype)) {
           target[key] = val;
           return val;
       }
-      var ob = target.__ob__;
       if (target._isVue || (ob && ob.vmCount)) {
           warn('Avoid adding reactive properties to a Vue instance or its root $data ' +
                   'at runtime - declare it upfront in the data option.');
@@ -4436,7 +4450,7 @@
           target[key] = val;
           return val;
       }
-      defineReactive(ob.value, key, val);
+      defineReactive(ob.value, key, val, undefined, ob.shallow, ob.mock);
       {
           ob.dep.notify({
               type: "add" /* TriggerOpTypes.ADD */,
@@ -7039,7 +7053,7 @@
           }
           res[getRawDirName(dir)] = dir;
           if (vm._setupState && vm._setupState.__sfc) {
-              dir.def = resolveAsset(vm, '_setupState', 'v-' + dir.name);
+              dir.def = dir.def || resolveAsset(vm, '_setupState', 'v-' + dir.name);
           }
           dir.def = dir.def || resolveAsset(vm.$options, 'directives', dir.name, true);
       }