@vue/compat 3.5.0-beta.3 → 3.5.0

package/dist/vue.runtime.esm-bundler.js

@@ -1,5 +1,5 @@
 /**
-* @vue/compat v3.5.0-beta.3
+* @vue/compat v3.5.0
 * (c) 2018-present Yuxi (Evan) You and Vue contributors
 * @license MIT
 **/
@@ -214,6 +214,14 @@ function isRenderableAttrValue(value) {
   return type === "string" || type === "number" || type === "boolean";
 }
 
+const cssVarNameEscapeSymbolsRE = /[ !"#$%&'()*+,./:;<=>?@[\\\]^`{|}~]/g;
+function getEscapedCssVarName(key, doubleEscape) {
+  return key.replace(
+    cssVarNameEscapeSymbolsRE,
+    (s) => `\\${s}`
+  );
+}
+
 function looseCompareArrays(a, b) {
   if (a.length !== b.length) return false;
   let equal = true;
@@ -337,12 +345,13 @@ class EffectScope {
   pause() {
     if (this._active) {
       this._isPaused = true;
+      let i, l;
       if (this.scopes) {
-        for (let i = 0, l = this.scopes.length; i < l; i++) {
+        for (i = 0, l = this.scopes.length; i < l; i++) {
           this.scopes[i].pause();
         }
       }
-      for (let i = 0, l = this.effects.length; i < l; i++) {
+      for (i = 0, l = this.effects.length; i < l; i++) {
         this.effects[i].pause();
       }
     }
@@ -354,12 +363,13 @@ class EffectScope {
     if (this._active) {
       if (this._isPaused) {
         this._isPaused = false;
+        let i, l;
         if (this.scopes) {
-          for (let i = 0, l = this.scopes.length; i < l; i++) {
+          for (i = 0, l = this.scopes.length; i < l; i++) {
             this.scopes[i].resume();
           }
         }
-        for (let i = 0, l = this.effects.length; i < l; i++) {
+        for (i = 0, l = this.effects.length; i < l; i++) {
           this.effects[i].resume();
         }
       }
@@ -552,11 +562,9 @@ function startBatch() {
   batchDepth++;
 }
 function endBatch() {
-  if (batchDepth > 1) {
-    batchDepth--;
+  if (--batchDepth > 0) {
     return;
   }
-  batchDepth--;
   let error;
   while (batchedEffect) {
     let e = batchedEffect;
@@ -1077,7 +1085,7 @@ function apply(self, method, fn, thisArg, wrappedRetFn, args) {
   const needsWrap = arr !== self && !isShallow(self);
   const methodFn = arr[method];
   if (methodFn !== arrayProto[method]) {
-    const result2 = methodFn.apply(arr, args);
+    const result2 = methodFn.apply(self, args);
     return needsWrap ? toReactive(result2) : result2;
   }
   let wrappedFn = fn;
@@ -1219,7 +1227,12 @@ class MutableReactiveHandler extends BaseReactiveHandler {
       }
     }
     const hadKey = isArray(target) && isIntegerKey(key) ? Number(key) < target.length : hasOwn(target, key);
-    const result = Reflect.set(target, key, value, receiver);
+    const result = Reflect.set(
+      target,
+      key,
+      value,
+      isRef(target) ? target : receiver
+    );
     if (target === toRaw(receiver)) {
       if (!hadKey) {
         trigger(target, "add", key, value);
@@ -2038,18 +2051,25 @@ function watch$1(source, cb, options = EMPTY_OBJ) {
     const depth = deep === true ? Infinity : deep;
     getter = () => traverse(baseGetter(), depth);
   }
+  const scope = getCurrentScope();
+  const watchHandle = () => {
+    effect.stop();
+    if (scope) {
+      remove(scope.effects, effect);
+    }
+  };
   if (once) {
     if (cb) {
       const _cb = cb;
       cb = (...args) => {
         _cb(...args);
-        effect.stop();
+        watchHandle();
       };
     } else {
       const _getter = getter;
       getter = () => {
         _getter();
-        effect.stop();
+        watchHandle();
       };
     }
   }
@@ -2118,13 +2138,6 @@ function watch$1(source, cb, options = EMPTY_OBJ) {
   } else {
     effect.run();
   }
-  const scope = getCurrentScope();
-  const watchHandle = () => {
-    effect.stop();
-    if (scope) {
-      remove(scope.effects, effect);
-    }
-  };
   watchHandle.pause = effect.pause.bind(effect);
   watchHandle.resume = effect.resume.bind(effect);
   watchHandle.stop = watchHandle;
@@ -4113,7 +4126,7 @@ function getTransitionRawChildren(children, keepComment = false, parentKey) {
 // @__NO_SIDE_EFFECTS__
 function defineComponent(options, extraOptions) {
   return isFunction(options) ? (
-    // #8326: extend call and options.name access are considered side-effects
+    // #8236: extend call and options.name access are considered side-effects
     // by Rollup, so we have to wrap it in a pure-annotated IIFE.
     /* @__PURE__ */ (() => extend({ name: options.name }, extraOptions, { setup: options }))()
   ) : options;
@@ -4560,8 +4573,7 @@ Server rendered element contains more child nodes than client vdom.`
       const isText = vnode.type === Text;
       if (node) {
         if (isText && !optimized) {
-          let next = children[i + 1];
-          if (next && (next = normalizeVNode(next)).type === Text) {
+          if (i + 1 < l && normalizeVNode(children[i + 1]).type === Text) {
             insert(
               createText(
                 node.data.slice(vnode.children.length)
@@ -4817,7 +4829,10 @@ function resolveCssVars(instance, vnode, expectedMap) {
   if (instance.getCssVars && (vnode === root || root && root.type === Fragment && root.children.includes(vnode))) {
     const cssVars = instance.getCssVars();
     for (const key in cssVars) {
-      expectedMap.set(`--${key}`, String(cssVars[key]));
+      expectedMap.set(
+        `--${getEscapedCssVarName(key)}`,
+        String(cssVars[key])
+      );
     }
   }
   if (vnode === root && instance.parent) {
@@ -5251,6 +5266,7 @@ const KeepAliveImpl = {
       );
       const { include, exclude, max } = props;
       if (include && (!name || !matches(include, name)) || exclude && name && matches(exclude, name)) {
+        vnode.shapeFlag &= ~256;
         current = vnode;
         return rawVNode;
       }
@@ -7001,7 +7017,7 @@ function createCompatVue$1(createApp, createSingletonApp) {
       return vm;
     }
   }
-  Vue.version = `2.6.14-compat:${"3.5.0-beta.3"}`;
+  Vue.version = `2.6.14-compat:${"3.5.0"}`;
   Vue.config = singletonApp.config;
   Vue.use = (plugin, ...options) => {
     if (plugin && isFunction(plugin.install)) {
@@ -12191,7 +12207,7 @@ function isMemoSame(cached, memo) {
   return true;
 }
 
-const version = "3.5.0-beta.3";
+const version = "3.5.0";
 const warn = !!(process.env.NODE_ENV !== "production") ? warn$1 : NOOP;
 const ErrorTypeStrings = ErrorTypeStrings$1 ;
 const devtools = !!(process.env.NODE_ENV !== "production") || true ? devtools$1 : void 0;
@@ -12890,15 +12906,20 @@ function compatCoerceAttr(el, key, value, instance = null) {
 
 function patchDOMProp(el, key, value, parentComponent) {
   if (key === "innerHTML" || key === "textContent") {
-    if (value == null) return;
-    el[key] = value;
+    if (value != null) {
+      el[key] = key === "innerHTML" ? unsafeToTrustedHTML(value) : value;
+    }
     return;
   }
   const tag = el.tagName;
   if (key === "value" && tag !== "PROGRESS" && // custom elements may use _value internally
   !tag.includes("-")) {
     const oldValue = tag === "OPTION" ? el.getAttribute("value") || "" : el.value;
-    const newValue = value == null ? "" : String(value);
+    const newValue = value == null ? (
+      // #11647: value should be set as empty string for null and undefined,
+      // but <input type="checkbox"> should be set as 'on'.
+      el.type === "checkbox" ? "on" : ""
+    ) : String(value);
     if (oldValue !== newValue || !("_value" in el)) {
       el.value = newValue;
     }
@@ -13334,6 +13355,9 @@ class VueElement extends BaseClass {
         delete this._props[key];
       } else {
         this._props[key] = val;
+        if (key === "key" && this._app) {
+          this._app._ceVNode.key = val;
+        }
       }
       if (shouldUpdate && this._instance) {
         this._update();
@@ -13781,12 +13805,16 @@ const vModelCheckbox = {
 };
 function setChecked(el, { value, oldValue }, vnode) {
   el._modelValue = value;
+  let checked;
   if (isArray(value)) {
-    el.checked = looseIndexOf(value, vnode.props.value) > -1;
+    checked = looseIndexOf(value, vnode.props.value) > -1;
   } else if (isSet(value)) {
-    el.checked = value.has(vnode.props.value);
-  } else if (value !== oldValue) {
-    el.checked = looseEqual(value, getCheckboxValue(el, true));
+    checked = value.has(vnode.props.value);
+  } else {
+    checked = looseEqual(value, getCheckboxValue(el, true));
+  }
+  if (el.checked !== checked) {
+    el.checked = checked;
   }
 }
 const vModelRadio = {

package/dist/vue.runtime.global.js

@@ -1,5 +1,5 @@
 /**
-* @vue/compat v3.5.0-beta.3
+* @vue/compat v3.5.0
 * (c) 2018-present Yuxi (Evan) You and Vue contributors
 * @license MIT
 **/
@@ -217,6 +217,14 @@ var Vue = (function () {
     return type === "string" || type === "number" || type === "boolean";
   }
 
+  const cssVarNameEscapeSymbolsRE = /[ !"#$%&'()*+,./:;<=>?@[\\\]^`{|}~]/g;
+  function getEscapedCssVarName(key, doubleEscape) {
+    return key.replace(
+      cssVarNameEscapeSymbolsRE,
+      (s) => `\\${s}`
+    );
+  }
+
   function looseCompareArrays(a, b) {
     if (a.length !== b.length) return false;
     let equal = true;
@@ -340,12 +348,13 @@ var Vue = (function () {
     pause() {
       if (this._active) {
         this._isPaused = true;
+        let i, l;
         if (this.scopes) {
-          for (let i = 0, l = this.scopes.length; i < l; i++) {
+          for (i = 0, l = this.scopes.length; i < l; i++) {
             this.scopes[i].pause();
           }
         }
-        for (let i = 0, l = this.effects.length; i < l; i++) {
+        for (i = 0, l = this.effects.length; i < l; i++) {
           this.effects[i].pause();
         }
       }
@@ -357,12 +366,13 @@ var Vue = (function () {
       if (this._active) {
         if (this._isPaused) {
           this._isPaused = false;
+          let i, l;
           if (this.scopes) {
-            for (let i = 0, l = this.scopes.length; i < l; i++) {
+            for (i = 0, l = this.scopes.length; i < l; i++) {
               this.scopes[i].resume();
             }
           }
-          for (let i = 0, l = this.effects.length; i < l; i++) {
+          for (i = 0, l = this.effects.length; i < l; i++) {
             this.effects[i].resume();
           }
         }
@@ -555,11 +565,9 @@ var Vue = (function () {
     batchDepth++;
   }
   function endBatch() {
-    if (batchDepth > 1) {
-      batchDepth--;
+    if (--batchDepth > 0) {
       return;
     }
-    batchDepth--;
     let error;
     while (batchedEffect) {
       let e = batchedEffect;
@@ -1076,7 +1084,7 @@ var Vue = (function () {
     const needsWrap = arr !== self && !isShallow(self);
     const methodFn = arr[method];
     if (methodFn !== arrayProto[method]) {
-      const result2 = methodFn.apply(arr, args);
+      const result2 = methodFn.apply(self, args);
       return needsWrap ? toReactive(result2) : result2;
     }
     let wrappedFn = fn;
@@ -1218,7 +1226,12 @@ var Vue = (function () {
         }
       }
       const hadKey = isArray(target) && isIntegerKey(key) ? Number(key) < target.length : hasOwn(target, key);
-      const result = Reflect.set(target, key, value, receiver);
+      const result = Reflect.set(
+        target,
+        key,
+        value,
+        isRef(target) ? target : receiver
+      );
       if (target === toRaw(receiver)) {
         if (!hadKey) {
           trigger(target, "add", key, value);
@@ -2031,18 +2044,25 @@ var Vue = (function () {
       const depth = deep === true ? Infinity : deep;
       getter = () => traverse(baseGetter(), depth);
     }
+    const scope = getCurrentScope();
+    const watchHandle = () => {
+      effect.stop();
+      if (scope) {
+        remove(scope.effects, effect);
+      }
+    };
     if (once) {
       if (cb) {
         const _cb = cb;
         cb = (...args) => {
           _cb(...args);
-          effect.stop();
+          watchHandle();
         };
       } else {
         const _getter = getter;
         getter = () => {
           _getter();
-          effect.stop();
+          watchHandle();
         };
       }
     }
@@ -2111,13 +2131,6 @@ var Vue = (function () {
     } else {
       effect.run();
     }
-    const scope = getCurrentScope();
-    const watchHandle = () => {
-      effect.stop();
-      if (scope) {
-        remove(scope.effects, effect);
-      }
-    };
     watchHandle.pause = effect.pause.bind(effect);
     watchHandle.resume = effect.resume.bind(effect);
     watchHandle.stop = watchHandle;
@@ -4097,7 +4110,7 @@ Details: https://v3-migration.vuejs.org/breaking-changes/migration-build.html`
   // @__NO_SIDE_EFFECTS__
   function defineComponent(options, extraOptions) {
     return isFunction(options) ? (
-      // #8326: extend call and options.name access are considered side-effects
+      // #8236: extend call and options.name access are considered side-effects
       // by Rollup, so we have to wrap it in a pure-annotated IIFE.
       /* @__PURE__ */ (() => extend({ name: options.name }, extraOptions, { setup: options }))()
     ) : options;
@@ -4533,8 +4546,7 @@ Server rendered element contains more child nodes than client vdom.`
         const isText = vnode.type === Text;
         if (node) {
           if (isText && !optimized) {
-            let next = children[i + 1];
-            if (next && (next = normalizeVNode(next)).type === Text) {
+            if (i + 1 < l && normalizeVNode(children[i + 1]).type === Text) {
               insert(
                 createText(
                   node.data.slice(vnode.children.length)
@@ -4790,7 +4802,10 @@ Server rendered element contains fewer child nodes than client vdom.`
     if (instance.getCssVars && (vnode === root || root && root.type === Fragment && root.children.includes(vnode))) {
       const cssVars = instance.getCssVars();
       for (const key in cssVars) {
-        expectedMap.set(`--${key}`, String(cssVars[key]));
+        expectedMap.set(
+          `--${getEscapedCssVarName(key)}`,
+          String(cssVars[key])
+        );
       }
     }
     if (vnode === root && instance.parent) {
@@ -5218,6 +5233,7 @@ Server rendered element contains fewer child nodes than client vdom.`
         );
         const { include, exclude, max } = props;
         if (include && (!name || !matches(include, name)) || exclude && name && matches(exclude, name)) {
+          vnode.shapeFlag &= ~256;
           current = vnode;
           return rawVNode;
         }
@@ -6963,7 +6979,7 @@ If this is a native custom element, make sure to exclude it from component resol
         return vm;
       }
     }
-    Vue.version = `2.6.14-compat:${"3.5.0-beta.3"}`;
+    Vue.version = `2.6.14-compat:${"3.5.0"}`;
     Vue.config = singletonApp.config;
     Vue.use = (plugin, ...options) => {
       if (plugin && isFunction(plugin.install)) {
@@ -12063,7 +12079,7 @@ Component that was made reactive: `,
     return true;
   }
 
-  const version = "3.5.0-beta.3";
+  const version = "3.5.0";
   const warn = warn$1 ;
   const ErrorTypeStrings = ErrorTypeStrings$1 ;
   const devtools = devtools$1 ;
@@ -12745,15 +12761,20 @@ Component that was made reactive: `,
 
   function patchDOMProp(el, key, value, parentComponent) {
     if (key === "innerHTML" || key === "textContent") {
-      if (value == null) return;
-      el[key] = value;
+      if (value != null) {
+        el[key] = key === "innerHTML" ? unsafeToTrustedHTML(value) : value;
+      }
       return;
     }
     const tag = el.tagName;
     if (key === "value" && tag !== "PROGRESS" && // custom elements may use _value internally
     !tag.includes("-")) {
       const oldValue = tag === "OPTION" ? el.getAttribute("value") || "" : el.value;
-      const newValue = value == null ? "" : String(value);
+      const newValue = value == null ? (
+        // #11647: value should be set as empty string for null and undefined,
+        // but <input type="checkbox"> should be set as 'on'.
+        el.type === "checkbox" ? "on" : ""
+      ) : String(value);
       if (oldValue !== newValue || !("_value" in el)) {
         el.value = newValue;
       }
@@ -13189,6 +13210,9 @@ Expected function or array of functions, received type ${typeof value}.`
           delete this._props[key];
         } else {
           this._props[key] = val;
+          if (key === "key" && this._app) {
+            this._app._ceVNode.key = val;
+          }
         }
         if (shouldUpdate && this._instance) {
           this._update();
@@ -13624,12 +13648,16 @@ Expected function or array of functions, received type ${typeof value}.`
   };
   function setChecked(el, { value, oldValue }, vnode) {
     el._modelValue = value;
+    let checked;
     if (isArray(value)) {
-      el.checked = looseIndexOf(value, vnode.props.value) > -1;
+      checked = looseIndexOf(value, vnode.props.value) > -1;
     } else if (isSet(value)) {
-      el.checked = value.has(vnode.props.value);
-    } else if (value !== oldValue) {
-      el.checked = looseEqual(value, getCheckboxValue(el, true));
+      checked = value.has(vnode.props.value);
+    } else {
+      checked = looseEqual(value, getCheckboxValue(el, true));
+    }
+    if (el.checked !== checked) {
+      el.checked = checked;
     }
   }
   const vModelRadio = {