@vue/compat 3.5.0-beta.3 → 3.5.0

package/dist/vue.cjs.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
 **/
@@ -331,6 +331,13 @@ function escapeHtml(string) {
   }
   return lastIndex !== index ? html + str.slice(lastIndex, index) : html;
 }
+const cssVarNameEscapeSymbolsRE = /[ !"#$%&'()*+,./:;<=>?@[\\\]^`{|}~]/g;
+function getEscapedCssVarName(key, doubleEscape) {
+  return key.replace(
+    cssVarNameEscapeSymbolsRE,
+    (s) => `\\${s}`
+  );
+}
 
 function looseCompareArrays(a, b) {
   if (a.length !== b.length) return false;
@@ -455,12 +462,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();
       }
     }
@@ -472,12 +480,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();
         }
       }
@@ -670,11 +679,9 @@ function startBatch() {
   batchDepth++;
 }
 function endBatch() {
-  if (batchDepth > 1) {
-    batchDepth--;
+  if (--batchDepth > 0) {
     return;
   }
-  batchDepth--;
   let error;
   while (batchedEffect) {
     let e = batchedEffect;
@@ -1191,7 +1198,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;
@@ -1333,7 +1340,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);
@@ -2146,18 +2158,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();
       };
     }
   }
@@ -2226,13 +2245,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;
@@ -4212,7 +4224,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;
@@ -4648,8 +4660,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)
@@ -4905,7 +4916,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) {
@@ -5339,6 +5353,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;
       }
@@ -7087,7 +7102,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)) {
@@ -12223,7 +12238,7 @@ function isMemoSame(cached, memo) {
   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 ;
@@ -12856,15 +12871,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;
     }
@@ -13300,6 +13320,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();
@@ -13747,12 +13770,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 = {
@@ -18051,7 +18078,7 @@ function genNode(node, context) {
     case 26:
       genReturnStatement(node, context);
       break;
-    /* istanbul ignore next */
+    /* v8 ignore start */
     case 10:
       break;
     default:

package/dist/vue.cjs.prod.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
 **/
@@ -379,12 +379,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();
       }
     }
@@ -396,12 +397,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();
         }
       }
@@ -583,11 +585,9 @@ function startBatch() {
   batchDepth++;
 }
 function endBatch() {
-  if (batchDepth > 1) {
-    batchDepth--;
+  if (--batchDepth > 0) {
     return;
   }
-  batchDepth--;
   let error;
   while (batchedEffect) {
     let e = batchedEffect;
@@ -1064,7 +1064,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;
@@ -1206,7 +1206,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);
@@ -1937,18 +1942,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();
       };
     }
   }
@@ -2013,13 +2025,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;
@@ -3297,7 +3302,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$1({ name: options.name }, extraOptions, { setup: options }))()
   ) : options;
@@ -3689,8 +3694,7 @@ function createHydrationFunctions(rendererInternals) {
       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)
@@ -4225,6 +4229,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;
       }
@@ -5697,7 +5702,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)) {
@@ -9833,7 +9838,7 @@ function isMemoSame(cached, memo) {
   return true;
 }
 
-const version = "3.5.0-beta.3";
+const version = "3.5.0";
 const warn$1 = NOOP;
 const ErrorTypeStrings = ErrorTypeStrings$1 ;
 const devtools = void 0;
@@ -10451,15 +10456,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;
     }
@@ -10860,6 +10870,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();
@@ -11257,12 +11270,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 = {