@vue/runtime-core 3.5.0-rc.1 → 3.5.1

package/dist/runtime-core.cjs.js

@@ -1,5 +1,5 @@
 /**
-* @vue/runtime-core v3.5.0-rc.1
+* @vue/runtime-core v3.5.1
 * (c) 2018-present Yuxi (Evan) You and Vue contributors
 * @license MIT
 **/
@@ -1145,7 +1145,9 @@ const BaseTransitionImpl = {
         // #11061, ensure enterHooks is fresh after clone
         (hooks) => enterHooks = hooks
       );
-      setTransitionHooks(innerChild, enterHooks);
+      if (innerChild.type !== Comment) {
+        setTransitionHooks(innerChild, enterHooks);
+      }
       const oldChild = instance.subTree;
       const oldInnerChild = oldChild && getInnerChild$1(oldChild);
       if (oldInnerChild && oldInnerChild.type !== Comment && !isSameVNodeType(innerChild, oldInnerChild) && recursiveGetSubtree(instance).type !== Comment) {
@@ -1468,10 +1470,11 @@ function setRef(rawRef, oldRawRef, parentSuspense, vnode, isUnmount = false) {
   const oldRef = oldRawRef && oldRawRef.r;
   const refs = owner.refs === shared.EMPTY_OBJ ? owner.refs = {} : owner.refs;
   const setupState = owner.setupState;
+  const canSetSetupRef = setupState === shared.EMPTY_OBJ ? () => false : (key) => shared.hasOwn(setupState, key) && !(Object.getOwnPropertyDescriptor(refs, key) || shared.EMPTY_OBJ).get;
   if (oldRef != null && oldRef !== ref) {
     if (shared.isString(oldRef)) {
       refs[oldRef] = null;
-      if (shared.hasOwn(setupState, oldRef)) {
+      if (canSetSetupRef(oldRef)) {
         setupState[oldRef] = null;
       }
     } else if (reactivity.isRef(oldRef)) {
@@ -1486,14 +1489,14 @@ function setRef(rawRef, oldRawRef, parentSuspense, vnode, isUnmount = false) {
     if (_isString || _isRef) {
       const doSet = () => {
         if (rawRef.f) {
-          const existing = _isString ? shared.hasOwn(setupState, ref) ? setupState[ref] : refs[ref] : ref.value;
+          const existing = _isString ? canSetSetupRef(ref) ? setupState[ref] : refs[ref] : ref.value;
           if (isUnmount) {
             shared.isArray(existing) && shared.remove(existing, refValue);
           } else {
             if (!shared.isArray(existing)) {
               if (_isString) {
                 refs[ref] = [refValue];
-                if (shared.hasOwn(setupState, ref)) {
+                if (canSetSetupRef(ref)) {
                   setupState[ref] = refs[ref];
                 }
               } else {
@@ -1506,7 +1509,7 @@ function setRef(rawRef, oldRawRef, parentSuspense, vnode, isUnmount = false) {
           }
         } else if (_isString) {
           refs[ref] = value;
-          if (shared.hasOwn(setupState, ref)) {
+          if (canSetSetupRef(ref)) {
             setupState[ref] = value;
           }
         } else if (_isRef) {
@@ -1856,8 +1859,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)
@@ -2113,7 +2115,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(
+        `--${shared.getEscapedCssVarName(key, false)}`,
+        String(cssVars[key])
+      );
     }
   }
   if (vnode === root && instance.parent) {
@@ -8202,7 +8207,7 @@ function isMemoSame(cached, memo) {
   return true;
 }
 
-const version = "3.5.0-rc.1";
+const version = "3.5.1";
 const warn = warn$1 ;
 const ErrorTypeStrings = ErrorTypeStrings$1 ;
 const devtools = devtools$1 ;

package/dist/runtime-core.cjs.prod.js

@@ -1,5 +1,5 @@
 /**
-* @vue/runtime-core v3.5.0-rc.1
+* @vue/runtime-core v3.5.1
 * (c) 2018-present Yuxi (Evan) You and Vue contributors
 * @license MIT
 **/
@@ -723,7 +723,9 @@ const BaseTransitionImpl = {
         // #11061, ensure enterHooks is fresh after clone
         (hooks) => enterHooks = hooks
       );
-      setTransitionHooks(innerChild, enterHooks);
+      if (innerChild.type !== Comment) {
+        setTransitionHooks(innerChild, enterHooks);
+      }
       const oldChild = instance.subTree;
       const oldInnerChild = oldChild && getInnerChild$1(oldChild);
       if (oldInnerChild && oldInnerChild.type !== Comment && !isSameVNodeType(innerChild, oldInnerChild) && recursiveGetSubtree(instance).type !== Comment) {
@@ -1026,10 +1028,11 @@ function setRef(rawRef, oldRawRef, parentSuspense, vnode, isUnmount = false) {
   const oldRef = oldRawRef && oldRawRef.r;
   const refs = owner.refs === shared.EMPTY_OBJ ? owner.refs = {} : owner.refs;
   const setupState = owner.setupState;
+  const canSetSetupRef = setupState === shared.EMPTY_OBJ ? () => false : (key) => shared.hasOwn(setupState, key) && !(Object.getOwnPropertyDescriptor(refs, key) || shared.EMPTY_OBJ).get;
   if (oldRef != null && oldRef !== ref) {
     if (shared.isString(oldRef)) {
       refs[oldRef] = null;
-      if (shared.hasOwn(setupState, oldRef)) {
+      if (canSetSetupRef(oldRef)) {
         setupState[oldRef] = null;
       }
     } else if (reactivity.isRef(oldRef)) {
@@ -1044,14 +1047,14 @@ function setRef(rawRef, oldRawRef, parentSuspense, vnode, isUnmount = false) {
     if (_isString || _isRef) {
       const doSet = () => {
         if (rawRef.f) {
-          const existing = _isString ? shared.hasOwn(setupState, ref) ? setupState[ref] : refs[ref] : ref.value;
+          const existing = _isString ? canSetSetupRef(ref) ? setupState[ref] : refs[ref] : ref.value;
           if (isUnmount) {
             shared.isArray(existing) && shared.remove(existing, refValue);
           } else {
             if (!shared.isArray(existing)) {
               if (_isString) {
                 refs[ref] = [refValue];
-                if (shared.hasOwn(setupState, ref)) {
+                if (canSetSetupRef(ref)) {
                   setupState[ref] = refs[ref];
                 }
               } else {
@@ -1064,7 +1067,7 @@ function setRef(rawRef, oldRawRef, parentSuspense, vnode, isUnmount = false) {
           }
         } else if (_isString) {
           refs[ref] = value;
-          if (shared.hasOwn(setupState, ref)) {
+          if (canSetSetupRef(ref)) {
             setupState[ref] = value;
           }
         } else if (_isRef) {
@@ -1380,8 +1383,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)
@@ -6376,7 +6378,7 @@ function isMemoSame(cached, memo) {
   return true;
 }
 
-const version = "3.5.0-rc.1";
+const version = "3.5.1";
 const warn$1 = shared.NOOP;
 const ErrorTypeStrings = ErrorTypeStrings$1 ;
 const devtools = void 0;

package/dist/runtime-core.d.ts

@@ -269,13 +269,13 @@ export declare function defineOptions<RawBindings = {}, D = {}, C extends Comput
     slots?: never;
 }): void;
 export declare function defineSlots<S extends Record<string, any> = Record<string, any>>(): StrictUnwrapSlotsType<SlotsType<S>>;
-export type ModelRef<T, M extends PropertyKey = string> = Ref<T> & [
-    ModelRef<T, M>,
+export type ModelRef<T, M extends PropertyKey = string, G = T, S = T> = Ref<G, S> & [
+    ModelRef<T, M, G, S>,
     Record<M, true | undefined>
 ];
-type DefineModelOptions<T = any> = {
-    get?: (v: T) => any;
-    set?: (v: T) => any;
+type DefineModelOptions<T = any, G = T, S = T> = {
+    get?: (v: T) => G;
+    set?: (v: S) => any;
 };
 /**
  * Vue `<script setup>` compiler macro for declaring a
@@ -310,20 +310,18 @@ type DefineModelOptions<T = any> = {
  * const count = defineModel<number>('count', { default: 0 })
  * ```
  */
-export declare function defineModel<T, M extends PropertyKey = string>(options: {
-    required: true;
-} & PropOptions<T> & DefineModelOptions<T>): ModelRef<T, M>;
-export declare function defineModel<T, M extends PropertyKey = string>(options: {
+export declare function defineModel<T, M extends PropertyKey = string, G = T, S = T>(options: ({
     default: any;
-} & PropOptions<T> & DefineModelOptions<T>): ModelRef<T, M>;
-export declare function defineModel<T, M extends PropertyKey = string>(options?: PropOptions<T> & DefineModelOptions<T>): ModelRef<T | undefined, M>;
-export declare function defineModel<T, M extends PropertyKey = string>(name: string, options: {
+} | {
     required: true;
-} & PropOptions<T> & DefineModelOptions<T>): ModelRef<T, M>;
-export declare function defineModel<T, M extends PropertyKey = string>(name: string, options: {
+}) & PropOptions<T> & DefineModelOptions<T, G, S>): ModelRef<T, M, G, S>;
+export declare function defineModel<T, M extends PropertyKey = string, G = T, S = T>(options?: PropOptions<T> & DefineModelOptions<T, G, S>): ModelRef<T | undefined, M, G | undefined, S | undefined>;
+export declare function defineModel<T, M extends PropertyKey = string, G = T, S = T>(name: string, options: ({
     default: any;
-} & PropOptions<T> & DefineModelOptions<T>): ModelRef<T, M>;
-export declare function defineModel<T, M extends PropertyKey = string>(name: string, options?: PropOptions<T> & DefineModelOptions<T>): ModelRef<T | undefined, M>;
+} | {
+    required: true;
+}) & PropOptions<T> & DefineModelOptions<T, G, S>): ModelRef<T, M, G, S>;
+export declare function defineModel<T, M extends PropertyKey = string, G = T, S = T>(name: string, options?: PropOptions<T> & DefineModelOptions<T, G, S>): ModelRef<T | undefined, M, G | undefined, S | undefined>;
 type NotUndefined<T> = T extends undefined ? never : T;
 type MappedOmit<T, K extends keyof any> = {
     [P in keyof T as P extends K ? never : P]: T[P];
@@ -959,7 +957,7 @@ export type ComponentOptionsWithArrayProps<PropNames extends string = string, Ra
 /**
  * @deprecated
  */
-export type ComponentOptionsWithObjectProps<PropsOptions = ComponentObjectPropsOptions, RawBindings = {}, D = {}, C extends ComputedOptions = {}, M extends MethodOptions = {}, Mixin extends ComponentOptionsMixin = ComponentOptionsMixin, Extends extends ComponentOptionsMixin = ComponentOptionsMixin, E extends EmitsOptions = EmitsOptions, EE extends string = string, I extends ComponentInjectOptions = {}, II extends string = string, S extends SlotsType = {}, LC extends Record<string, Component> = {}, Directives extends Record<string, Directive> = {}, Exposed extends string = string, Provide extends ComponentProvideOptions = ComponentProvideOptions, Props = Prettify<Readonly<ExtractPropTypes<PropsOptions> & EmitsToProps<E>>>, Defaults = ExtractDefaultPropTypes<PropsOptions>> = ComponentOptionsBase<Props, RawBindings, D, C, M, Mixin, Extends, E, EE, Defaults, I, II, S, LC, Directives, Exposed, Provide> & {
+export type ComponentOptionsWithObjectProps<PropsOptions = ComponentObjectPropsOptions, RawBindings = {}, D = {}, C extends ComputedOptions = {}, M extends MethodOptions = {}, Mixin extends ComponentOptionsMixin = ComponentOptionsMixin, Extends extends ComponentOptionsMixin = ComponentOptionsMixin, E extends EmitsOptions = EmitsOptions, EE extends string = string, I extends ComponentInjectOptions = {}, II extends string = string, S extends SlotsType = {}, LC extends Record<string, Component> = {}, Directives extends Record<string, Directive> = {}, Exposed extends string = string, Provide extends ComponentProvideOptions = ComponentProvideOptions, Props = Prettify<Readonly<ExtractPropTypes<PropsOptions>> & Readonly<EmitsToProps<E>>>, Defaults = ExtractDefaultPropTypes<PropsOptions>> = ComponentOptionsBase<Props, RawBindings, D, C, M, Mixin, Extends, E, EE, Defaults, I, II, S, LC, Directives, Exposed, Provide> & {
     props: PropsOptions & ThisType<void>;
 } & ThisType<CreateComponentPublicInstanceWithMixins<Props, RawBindings, D, C, M, Mixin, Extends, E, Props, Defaults, false, I, S, LC, Directives>>;
 
@@ -993,7 +991,7 @@ export declare function defineComponent<Props extends Record<string, any>, E ext
 }): DefineSetupFnComponent<Props, E, S>;
 export declare function defineComponent<TypeProps, RuntimePropsOptions extends ComponentObjectPropsOptions = ComponentObjectPropsOptions, RuntimePropsKeys extends string = string, TypeEmits extends ComponentTypeEmits = {}, RuntimeEmitsOptions extends EmitsOptions = {}, RuntimeEmitsKeys extends string = string, Data = {}, SetupBindings = {}, Computed extends ComputedOptions = {}, Methods extends MethodOptions = {}, Mixin extends ComponentOptionsMixin = ComponentOptionsMixin, Extends extends ComponentOptionsMixin = ComponentOptionsMixin, InjectOptions extends ComponentInjectOptions = {}, InjectKeys extends string = string, Slots extends SlotsType = {}, LocalComponents extends Record<string, Component> = {}, Directives extends Record<string, Directive> = {}, Exposed extends string = string, Provide extends ComponentProvideOptions = ComponentProvideOptions, ResolvedEmits extends EmitsOptions = {} extends RuntimeEmitsOptions ? TypeEmitsToOptions<TypeEmits> : RuntimeEmitsOptions, InferredProps = unknown extends TypeProps ? string extends RuntimePropsKeys ? ComponentObjectPropsOptions extends RuntimePropsOptions ? {} : ExtractPropTypes<RuntimePropsOptions> : {
     [key in RuntimePropsKeys]?: any;
-} : TypeProps, ResolvedProps = Readonly<InferredProps & EmitsToProps<ResolvedEmits>>, TypeRefs extends Record<string, unknown> = {}>(options: {
+} : TypeProps, ResolvedProps = Readonly<InferredProps> & Readonly<EmitsToProps<ResolvedEmits>>, TypeRefs extends Record<string, unknown> = {}>(options: {
     props?: (RuntimePropsOptions & ThisType<void>) | RuntimePropsKeys[];
     /**
      * @private for language-tools use only
@@ -1519,7 +1517,7 @@ export declare function defineAsyncComponent<T extends Component = {
     new (): ComponentPublicInstance;
 }>(source: AsyncComponentLoader<T> | AsyncComponentOptions<T>): T;
 
-export declare function useModel<M extends PropertyKey, T extends Record<string, any>, K extends keyof T>(props: T, name: K, options?: DefineModelOptions<T[K]>): ModelRef<T[K], M>;
+export declare function useModel<M extends PropertyKey, T extends Record<string, any>, K extends keyof T, G = T[K], S = T[K]>(props: T, name: K, options?: DefineModelOptions<T[K], G, S>): ModelRef<T[K], M, G, S>;
 
 export declare function useTemplateRef<T = unknown, Keys extends string = string>(key: Keys): Readonly<ShallowRef<T | null>>;
 

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

@@ -1,11 +1,11 @@
 /**
-* @vue/runtime-core v3.5.0-rc.1
+* @vue/runtime-core v3.5.1
 * (c) 2018-present Yuxi (Evan) You and Vue contributors
 * @license MIT
 **/
 import { pauseTracking, resetTracking, isRef, toRaw, traverse, isReactive, ref, shallowReadArray, toReactive, shallowReadonly, track, reactive, shallowReactive, trigger, ReactiveEffect, watch as watch$1, customRef, isProxy, proxyRefs, markRaw, EffectScope, computed as computed$1, shallowRef, readonly, isShallow, isReadonly } from '@vue/reactivity';
 export { EffectScope, ReactiveEffect, TrackOpTypes, TriggerOpTypes, customRef, effect, effectScope, getCurrentScope, getCurrentWatcher, isProxy, isReactive, isReadonly, isRef, isShallow, markRaw, onScopeDispose, onWatcherCleanup, proxyRefs, reactive, readonly, ref, shallowReactive, shallowReadonly, shallowRef, stop, toRaw, toRef, toRefs, toValue, triggerRef, unref } from '@vue/reactivity';
-import { isString, isFunction, isPromise, isArray, EMPTY_OBJ, NOOP, getGlobalThis, extend, isBuiltInDirective, hasOwn, remove, def, isOn, isReservedProp, normalizeClass, stringifyStyle, normalizeStyle, isKnownSvgAttr, isBooleanAttr, isKnownHtmlAttr, includeBooleanAttr, isRenderableAttrValue, isObject, isRegExp, invokeArrayFns, toHandlerKey, capitalize, camelize, isGloballyAllowed, NO, hyphenate, EMPTY_ARR, toRawType, makeMap, hasChanged, looseToNumber, isModelListener, toNumber } from '@vue/shared';
+import { isString, isFunction, isPromise, isArray, EMPTY_OBJ, NOOP, getGlobalThis, extend, isBuiltInDirective, hasOwn, remove, def, isOn, isReservedProp, normalizeClass, stringifyStyle, normalizeStyle, isKnownSvgAttr, isBooleanAttr, isKnownHtmlAttr, includeBooleanAttr, isRenderableAttrValue, getEscapedCssVarName, isObject, isRegExp, invokeArrayFns, toHandlerKey, capitalize, camelize, isGloballyAllowed, NO, hyphenate, EMPTY_ARR, toRawType, makeMap, hasChanged, looseToNumber, isModelListener, toNumber } from '@vue/shared';
 export { camelize, capitalize, normalizeClass, normalizeProps, normalizeStyle, toDisplayString, toHandlerKey } from '@vue/shared';
 
 const stack = [];
@@ -1148,7 +1148,9 @@ const BaseTransitionImpl = {
         // #11061, ensure enterHooks is fresh after clone
         (hooks) => enterHooks = hooks
       );
-      setTransitionHooks(innerChild, enterHooks);
+      if (innerChild.type !== Comment) {
+        setTransitionHooks(innerChild, enterHooks);
+      }
       const oldChild = instance.subTree;
       const oldInnerChild = oldChild && getInnerChild$1(oldChild);
       if (oldInnerChild && oldInnerChild.type !== Comment && !isSameVNodeType(innerChild, oldInnerChild) && recursiveGetSubtree(instance).type !== Comment) {
@@ -1472,10 +1474,11 @@ function setRef(rawRef, oldRawRef, parentSuspense, vnode, isUnmount = false) {
   const oldRef = oldRawRef && oldRawRef.r;
   const refs = owner.refs === EMPTY_OBJ ? owner.refs = {} : owner.refs;
   const setupState = owner.setupState;
+  const canSetSetupRef = setupState === EMPTY_OBJ ? () => false : (key) => hasOwn(setupState, key) && !(Object.getOwnPropertyDescriptor(refs, key) || EMPTY_OBJ).get;
   if (oldRef != null && oldRef !== ref) {
     if (isString(oldRef)) {
       refs[oldRef] = null;
-      if (hasOwn(setupState, oldRef)) {
+      if (canSetSetupRef(oldRef)) {
         setupState[oldRef] = null;
       }
     } else if (isRef(oldRef)) {
@@ -1490,14 +1493,14 @@ function setRef(rawRef, oldRawRef, parentSuspense, vnode, isUnmount = false) {
     if (_isString || _isRef) {
       const doSet = () => {
         if (rawRef.f) {
-          const existing = _isString ? hasOwn(setupState, ref) ? setupState[ref] : refs[ref] : ref.value;
+          const existing = _isString ? canSetSetupRef(ref) ? setupState[ref] : refs[ref] : ref.value;
           if (isUnmount) {
             isArray(existing) && remove(existing, refValue);
           } else {
             if (!isArray(existing)) {
               if (_isString) {
                 refs[ref] = [refValue];
-                if (hasOwn(setupState, ref)) {
+                if (canSetSetupRef(ref)) {
                   setupState[ref] = refs[ref];
                 }
               } else {
@@ -1510,7 +1513,7 @@ function setRef(rawRef, oldRawRef, parentSuspense, vnode, isUnmount = false) {
           }
         } else if (_isString) {
           refs[ref] = value;
-          if (hasOwn(setupState, ref)) {
+          if (canSetSetupRef(ref)) {
             setupState[ref] = value;
           }
         } else if (_isRef) {
@@ -1871,8 +1874,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)
@@ -2128,7 +2130,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, false)}`,
+        String(cssVars[key])
+      );
     }
   }
   if (vnode === root && instance.parent) {
@@ -8273,7 +8278,7 @@ function isMemoSame(cached, memo) {
   return true;
 }
 
-const version = "3.5.0-rc.1";
+const version = "3.5.1";
 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;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue/runtime-core",
-  "version": "3.5.0-rc.1",
+  "version": "3.5.1",
   "description": "@vue/runtime-core",
   "main": "index.js",
   "module": "dist/runtime-core.esm-bundler.js",
@@ -46,7 +46,7 @@
   },
   "homepage": "https://github.com/vuejs/core/tree/main/packages/runtime-core#readme",
   "dependencies": {
-    "@vue/reactivity": "3.5.0-rc.1",
-    "@vue/shared": "3.5.0-rc.1"
+    "@vue/shared": "3.5.1",
+    "@vue/reactivity": "3.5.1"
   }
 }