@vue/runtime-dom 3.6.0-rc.1 → 3.6.0-rc.3

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

@@ -1,5 +1,5 @@
 /**
-  * @vue/runtime-dom v3.6.0-rc.1
+  * @vue/runtime-dom v3.6.0-rc.3
   * (c) 2018-present Yuxi (Evan) You and Vue contributors
   * @license MIT
   **/
@@ -711,7 +711,7 @@ var VueElementBase = class VueElementBase extends BaseClass {
 		if (!this._instance) if (this._resolved) this._mountComponent(this._def);
 		else if (parent && parent._pendingResolve) this._pendingResolve = parent._pendingResolve.then(() => {
 			this._pendingResolve = void 0;
-			this._resolveDef();
+			if (this.isConnected) return this._resolveDef();
 		});
 		else this._resolveDef();
 	}
@@ -747,7 +747,7 @@ var VueElementBase = class VueElementBase extends BaseClass {
 	* resolve inner component definition (handle possible async component)
 	*/
 	_resolveDef() {
-		if (this._pendingResolve) return;
+		if (this._pendingResolve) return this._pendingResolve;
 		for (let i = 0; i < this.attributes.length; i++) this._setAttr(this.attributes[i].name);
 		this._ob = new MutationObserver(this._processMutations.bind(this));
 		this._ob.observe(this, { attributes: true });
@@ -777,6 +777,7 @@ var VueElementBase = class VueElementBase extends BaseClass {
 				this._def = def;
 				resolve(def);
 			});
+			return this._pendingResolve;
 		} else resolve(this._def);
 	}
 	_mountComponent(def) {
@@ -815,14 +816,17 @@ var VueElementBase = class VueElementBase extends BaseClass {
 		const { props } = def;
 		const declaredPropKeys = isArray(props) ? props : Object.keys(props || {});
 		for (const key of Object.keys(this)) if (key[0] !== "_" && declaredPropKeys.includes(key)) this._setProp(key, this[key]);
-		for (const key of declaredPropKeys.map(camelize$1)) Object.defineProperty(this, key, {
-			get() {
-				return this._getProp(key);
-			},
-			set(val) {
-				this._setProp(key, val, true, !this._patching);
-			}
-		});
+		for (const key of declaredPropKeys.map(camelize$1)) {
+			if (!!(process.env.NODE_ENV !== "production") && key in Object.getPrototypeOf(this)) warn(`Custom element prop "${key}" conflicts with an existing property on the element and will overwrite it.`);
+			Object.defineProperty(this, key, {
+				get() {
+					return this._getProp(key);
+				},
+				set(val) {
+					this._setProp(key, val, true, !this._patching);
+				}
+			});
+		}
 	}
 	_setAttr(key) {
 		if (key.startsWith("data-v-")) return;
@@ -1240,13 +1244,22 @@ function onCompositionEnd(e) {
 	}
 }
 const assignKey = Symbol("_assign");
+const initialValueKey = Symbol("_initialValue");
 const vModelText = {
 	created(el, { modifiers: { lazy, trim, number } }, vnode) {
+		if (el.parentNode) {
+			if (el.type === "text") el[initialValueKey] = el.defaultValue.replace(/[\r\n]/g, "");
+			else if (el.type === "textarea") el[initialValueKey] = el.defaultValue.replace(/\r\n?/g, "\n");
+		}
 		el[assignKey] = getModelAssigner(vnode);
 		vModelTextInit(el, trim, number || !!(vnode.props && vnode.props.type === "number"), lazy);
 	},
-	mounted(el, { value }) {
-		el.value = value == null ? "" : value;
+	mounted(el, { value, modifiers: { trim, number } }) {
+		const newValue = value == null ? "" : value;
+		const initialValue = el[initialValueKey];
+		delete el[initialValueKey];
+		if (initialValue !== void 0 && (el.type === "text" || el.type === "textarea") && el.value !== initialValue) el[assignKey](castValue(el.value, trim, number));
+		else el.value = newValue;
 	},
 	beforeUpdate(el, { value, oldValue, modifiers: { lazy, trim, number } }, vnode) {
 		el[assignKey] = getModelAssigner(vnode);

package/dist/runtime-dom.global.js

@@ -1,5 +1,5 @@
 /**
-  * @vue/runtime-dom v3.6.0-rc.1
+  * @vue/runtime-dom v3.6.0-rc.3
   * (c) 2018-present Yuxi (Evan) You and Vue contributors
   * @license MIT
   **/
@@ -230,7 +230,7 @@ var VueRuntimeDOM = (function(exports) {
 	/**
 	* The full list is needed during SSR to produce the correct initial markup.
 	*/
-	const isBooleanAttr = /* @__PURE__ */ makeMap(specialBooleanAttrs + ",async,autofocus,autoplay,controls,default,defer,disabled,hidden,inert,loop,open,required,reversed,scoped,seamless,checked,muted,multiple,selected");
+	const isBooleanAttr = /* @__PURE__ */ makeMap(specialBooleanAttrs + ",async,autofocus,autoplay,controls,default,defer,disabled,inert,loop,open,required,reversed,scoped,seamless,checked,muted,multiple,selected");
 	/**
 	* Boolean attributes should be included if the value is truthy or ''.
 	* e.g. `<select multiple>` compiles to `{ multiple: '' }`
@@ -2512,7 +2512,7 @@ var VueRuntimeDOM = (function(exports) {
 	function queuePostFlushCb(jobs, id = Infinity) {
 		if (!isArray(jobs)) if (activePostJobs && id === -1) activePostJobs.splice(postFlushIndex, 0, jobs);
 		else queueJobWorker(jobs, id, postJobs, postJobs.length, 0);
-		else for (const job of jobs) queueJobWorker(job, id, postJobs, postJobs.length, 0);
+		else for (let i = 0; i < jobs.length; i++) queueJobWorker(jobs[i], id, postJobs, postJobs.length, 0);
 		queueFlush();
 	}
 	function flushPreFlushCbs(instance, seen) {
@@ -2533,7 +2533,7 @@ var VueRuntimeDOM = (function(exports) {
 	function flushPostFlushCbs(seen) {
 		if (postJobs.length) {
 			if (activePostJobs) {
-				activePostJobs.push(...postJobs);
+				for (let i = 0; i < postJobs.length; i++) activePostJobs.push(postJobs[i]);
 				postJobs.length = 0;
 				return;
 			}
@@ -3069,7 +3069,7 @@ var VueRuntimeDOM = (function(exports) {
 		}
 		const prev = setCurrentInstance(this);
 		const res = doWatch(getter, cb.bind(publicThis), options);
-		setCurrentInstance(...prev);
+		restoreCurrentInstance(prev);
 		return res;
 	}
 	function createPathGetter(ctx, path) {
@@ -3342,49 +3342,16 @@ var VueRuntimeDOM = (function(exports) {
 		setup(props, { slots }) {
 			const instance = getCurrentInstance();
 			const state = useTransitionState();
+			let resumeAfterLeave;
 			return () => {
-				const children = slots.default && getTransitionRawChildren(slots.default(), true);
-				const child = children && children.length ? findNonCommentChild(children) : instance.subTree ? createCommentVNode() : void 0;
+				const child = resolveTransitionChild(slots.default && slots.default(), !!instance.subTree);
 				if (!child) return;
 				const rawProps = /* @__PURE__ */ toRaw(props);
 				const { mode } = rawProps;
 				checkTransitionMode(mode);
-				if (state.isLeaving) return emptyPlaceholder(child);
-				const innerChild = getInnerChild$1(child);
-				if (!innerChild) return emptyPlaceholder(child);
-				let enterHooks = resolveTransitionHooks(innerChild, rawProps, state, instance, (hooks) => enterHooks = hooks);
-				if (innerChild.type !== Comment) setTransitionHooks(innerChild, enterHooks);
-				let oldInnerChild = instance.subTree && getInnerChild$1(instance.subTree);
-				if (oldInnerChild && oldInnerChild.type !== Comment && !isSameVNodeType(oldInnerChild, innerChild) && recursiveGetSubtree(instance).type !== Comment) {
-					let leavingHooks = resolveTransitionHooks(oldInnerChild, rawProps, state, instance);
-					setTransitionHooks(oldInnerChild, leavingHooks);
-					if (mode === "out-in" && innerChild.type !== Comment) {
-						state.isLeaving = true;
-						leavingHooks.afterLeave = () => {
-							state.isLeaving = false;
-							if (!(instance.job.flags & 4)) instance.update();
-							delete leavingHooks.afterLeave;
-							oldInnerChild = void 0;
-						};
-						return emptyPlaceholder(child);
-					} else if (mode === "in-out" && innerChild.type !== Comment) leavingHooks.delayLeave = (el, earlyRemove, delayedLeave) => {
-						const leavingVNodesCache = getLeavingNodesForType(state, oldInnerChild);
-						leavingVNodesCache[String(oldInnerChild.key)] = oldInnerChild;
-						el[leaveCbKey] = () => {
-							earlyRemove();
-							el[leaveCbKey] = void 0;
-							delete enterHooks.delayedLeave;
-							oldInnerChild = void 0;
-						};
-						enterHooks.delayedLeave = () => {
-							delayedLeave();
-							delete enterHooks.delayedLeave;
-							oldInnerChild = void 0;
-						};
-					};
-					else oldInnerChild = void 0;
-				} else if (oldInnerChild) oldInnerChild = void 0;
-				return child;
+				return prepareTransitionSwitch(instance.subTree, child, rawProps, state, instance, mode === "out-in" ? resumeAfterLeave || (resumeAfterLeave = () => {
+					if (!(instance.job.flags & 4)) instance.update();
+				}) : NOOP);
 			};
 		}
 	};
@@ -3526,16 +3493,91 @@ var VueRuntimeDOM = (function(exports) {
 			if (shapeFlag & 32 && isFunction(children.default)) return children.default();
 		}
 	}
+	function resolveTransitionChild(children, renderEmpty = false) {
+		const branches = children && getTransitionRawChildren(children, true);
+		return branches && branches.length ? findNonCommentChild(branches) : renderEmpty ? createCommentVNode() : void 0;
+	}
+	/**
+	* @internal
+	*/
+	function prepareTransitionSwitch(previous, next, props, state, instance, resumeAfterLeave, delayedLeaveSource) {
+		if (state.isLeaving) return emptyPlaceholder(next);
+		const nextInner = getInnerChild$1(next);
+		if (!nextInner) return emptyPlaceholder(next);
+		let enterHooks = resolveTransitionHooks(nextInner, props, state, instance, (hooks) => {
+			if (delayedLeaveSource) forwardDelayedLeave(hooks, delayedLeaveSource);
+			enterHooks = hooks;
+		});
+		if (delayedLeaveSource) forwardDelayedLeave(enterHooks, delayedLeaveSource);
+		if (nextInner.type !== Comment) setTransitionHooks(nextInner, enterHooks);
+		const mode = props.mode;
+		const previousInner = previous && getInnerChild$1(previous);
+		if (previous && previousInner && previousInner.type !== Comment && !isSameVNodeType(previousInner, nextInner) && (!previous.component || recursiveGetSubtree(previous.component).type !== Comment)) {
+			const leavingHooks = prepareLeavingTransitionHooks(previousInner, props, state, instance);
+			if (nextInner.type !== Comment && (mode === "out-in" || mode === "in-out") && applyTransitionModeSwitch(previousInner, leavingHooks, mode === "in-out" ? () => enterHooks : void 0, props, state, resumeAfterLeave)) return emptyPlaceholder(next);
+		}
+		return next;
+	}
+	function forwardDelayedLeave(hooks, source) {
+		const delayedLeave = source && source.delayedLeave;
+		if (!delayedLeave) return;
+		hooks.delayedLeave = () => {
+			if (source.delayedLeave === delayedLeave) delayedLeave();
+			delete hooks.delayedLeave;
+		};
+	}
+	function prepareLeavingTransitionHooks(previousInner, props, state, instance) {
+		return setTransitionHooks(previousInner, resolveTransitionHooks(previousInner, props, state, instance));
+	}
+	function applyTransitionModeSwitch(leavingVNode, leavingHooks, getEnterHooks, props, state, resumeAfterLeave) {
+		if (props.mode === "out-in") {
+			state.isLeaving = true;
+			leavingHooks.afterLeave = () => {
+				state.isLeaving = false;
+				resumeAfterLeave();
+				delete leavingHooks.afterLeave;
+			};
+			return true;
+		} else if (props.mode === "in-out" && getEnterHooks) {
+			let delayedLeavingVNode = leavingVNode;
+			leavingHooks.delayLeave = (el, earlyRemove, delayedLeave) => {
+				const enterHooks = getEnterHooks();
+				if (!enterHooks) {
+					delayedLeave();
+					return;
+				}
+				const vnode = delayedLeavingVNode;
+				const leavingVNodesCache = getLeavingNodesForType(state, vnode);
+				leavingVNodesCache[String(vnode.key)] = vnode;
+				el[leaveCbKey] = () => {
+					earlyRemove();
+					el[leaveCbKey] = void 0;
+					delete enterHooks.delayedLeave;
+					delayedLeavingVNode = void 0;
+				};
+				enterHooks.delayedLeave = () => {
+					delayedLeave();
+					delete enterHooks.delayedLeave;
+					delayedLeavingVNode = void 0;
+				};
+			};
+		}
+		return false;
+	}
 	function setTransitionHooks(vnode, hooks) {
-		if (vnode.shapeFlag & 6 && vnode.component) if (isVaporComponent(vnode.type)) getVaporInterface(vnode.component, vnode).setTransitionHooks(vnode.component, hooks);
-		else {
+		if (vnode.shapeFlag & 6 && vnode.component) {
 			vnode.transition = hooks;
-			setTransitionHooks(vnode.component.subTree, hooks);
-		}
-		else if (vnode.shapeFlag & 128) {
-			vnode.ssContent.transition = hooks.clone(vnode.ssContent);
-			vnode.ssFallback.transition = hooks.clone(vnode.ssFallback);
+			if (isVaporComponent(vnode.type)) getVaporInterface(vnode.component, vnode).setTransitionHooks(vnode.component, hooks);
+			else {
+				const subTree = vnode.component.subTree;
+				return setTransitionHooks(isTeleport(subTree.type) ? getInnerChild$1(subTree) || subTree : subTree, hooks);
+			}
+		} else if (vnode.shapeFlag & 128) {
+			const contentHooks = vnode.ssContent.transition = hooks.clone(vnode.ssContent);
+			const fallbackHooks = vnode.ssFallback.transition = hooks.clone(vnode.ssFallback);
+			return vnode.suspense && vnode.suspense.activeBranch === vnode.ssFallback ? fallbackHooks : contentHooks;
 		} else vnode.transition = hooks;
+		return hooks;
 	}
 	function getTransitionRawChildren(children, keepComment = false, parentKey) {
 		let ret = [];
@@ -3887,7 +3929,10 @@ var VueRuntimeDOM = (function(exports) {
 					const namespace = el.namespaceURI.includes("svg") ? "svg" : el.namespaceURI.includes("MathML") ? "mathml" : void 0;
 					for (const key in props) {
 						if (!(dirs && dirs.some((d) => d.dir.created)) && propHasMismatch(el, key, props[key], vnode, parentComponent)) logMismatchError();
-						if (forcePatch && (key.endsWith("value") || key === "indeterminate") || isOn(key) && !isReservedProp(key) || key[0] === "." || isCustomElement && !isReservedProp(key) || dynamicProps && dynamicProps.includes(key)) patchProp(el, key, null, props[key], namespace, parentComponent);
+						if (forcePatch && (key.endsWith("value") || key === "indeterminate") || isOn(key) && !isReservedProp(key) || key[0] === "." || isCustomElement && !isReservedProp(key) || dynamicProps && dynamicProps.includes(key)) {
+							if (isUnchangedResourceProp(el, key, props[key])) continue;
+							patchProp(el, key, null, props[key], namespace, parentComponent);
+						}
 					}
 				}
 				let vnodeHooks;
@@ -3996,6 +4041,16 @@ var VueRuntimeDOM = (function(exports) {
 	/**
 	* Dev only
 	*/
+	const resourceProps = /* @__PURE__ */ new Set([
+		"src",
+		"srcset",
+		"href",
+		"poster"
+	]);
+	function isUnchangedResourceProp(el, key, clientValue) {
+		if (!resourceProps.has(key)) return false;
+		return el.getAttribute(key) === (clientValue == null ? null : `${clientValue}`);
+	}
 	function propHasMismatch(el, key, clientValue, vnode, instance) {
 		let mismatchType;
 		let mismatchKey;
@@ -4036,7 +4091,10 @@ var VueRuntimeDOM = (function(exports) {
 	function getAttributeMismatch(el, key, clientValue) {
 		let actual;
 		let expected;
-		if (isBooleanAttr(key)) {
+		if (key === "hidden") {
+			actual = normalizeHiddenValue(el.getAttribute(key));
+			expected = normalizeHiddenValue(clientValue);
+		} else if (isBooleanAttr(key)) {
 			actual = el.hasAttribute(key);
 			expected = includeBooleanAttr(clientValue);
 		} else if (clientValue == null) {
@@ -4064,6 +4122,11 @@ var VueRuntimeDOM = (function(exports) {
 		}
 		return false;
 	}
+	function normalizeHiddenValue(value) {
+		if (!isRenderableAttrValue(value)) return false;
+		if (isString(value)) return value.toLowerCase() === "until-found" ? "until-found" : "";
+		return includeBooleanAttr(value) ? "" : false;
+	}
 	function toClassSet(str) {
 		return new Set(str.trim().split(/\s+/));
 	}
@@ -4595,7 +4658,7 @@ var VueRuntimeDOM = (function(exports) {
 				try {
 					return callWithAsyncErrorHandling(hook, target, type, args);
 				} finally {
-					setCurrentInstance(...prev);
+					restoreCurrentInstance(prev);
 					setActiveSub(prevSub);
 				}
 			});
@@ -4724,7 +4787,8 @@ var VueRuntimeDOM = (function(exports) {
 	* Compiler runtime helper for rendering `<slot/>`
 	* @private
 	*/
-	function renderSlot(slots, name, props = {}, fallback, noSlotted, branchKey) {
+	function renderSlot(slots, name, props, fallback, noSlotted, branchKey) {
+		if (props == null) props = {};
 		let slot = slots[name];
 		if (fallback) fallback.__vdom = true;
 		const vaporSlot = slot && (slot.__vs || (slot.__vapor ? slot : null));
@@ -5777,8 +5841,9 @@ var VueRuntimeDOM = (function(exports) {
 			root.dirs = root.dirs ? root.dirs.concat(vnode.dirs) : vnode.dirs;
 		}
 		if (vnode.transition) {
-			if (!isElementRoot(root)) warn$1("Component inside <Transition> renders non-element root node that cannot be animated.");
-			setTransitionHooks(root, vnode.transition);
+			const child = isTeleport(root.type) ? getInnerChild$1(root) || root : root;
+			if (!isElementRoot(child)) warn$1("Component inside <Transition> renders non-element root node that cannot be animated.");
+			setTransitionHooks(child, vnode.transition);
 		}
 		if (setRoot) setRoot(root);
 		else result = root;
@@ -5838,9 +5903,10 @@ var VueRuntimeDOM = (function(exports) {
 		}
 		return singleRoot;
 	}
+	const isFunctionalFallthroughKey = (key) => key === "class" || key === "style" || isOn(key);
 	const getFunctionalFallthrough = (attrs) => {
 		let res;
-		for (const key in attrs) if (key === "class" || key === "style" || isOn(key)) (res || (res = {}))[key] = attrs[key];
+		for (const key in attrs) if (isFunctionalFallthroughKey(key)) (res || (res = {}))[key] = attrs[key];
 		return res;
 	};
 	const filterModelListeners = (attrs, props) => {
@@ -6040,7 +6106,7 @@ var VueRuntimeDOM = (function(exports) {
 		const prev = setCurrentInstance(instance);
 		const props = /* @__PURE__ */ toRaw(instance.props);
 		value = factory.call(null, props);
-		setCurrentInstance(...prev);
+		restoreCurrentInstance(prev);
 		return value;
 	}
 	const mixinPropsCache = /* @__PURE__ */ new WeakMap();
@@ -6600,7 +6666,7 @@ var VueRuntimeDOM = (function(exports) {
 		};
 		const processComponent = (n1, n2, container, anchor, parentComponent, parentSuspense, namespace, slotScopeIds, optimized) => {
 			n2.slotScopeIds = slotScopeIds;
-			if (n2.type.__vapor) if (n1 == null) if (n2.shapeFlag & 512) getVaporInterface(parentComponent, n2).activate(n2, container, anchor, parentComponent);
+			if (n2.type.__vapor) if (n1 == null) if (n2.shapeFlag & 512) getVaporInterface(parentComponent, n2).activate(n2, container, anchor, parentComponent, parentSuspense);
 			else {
 				const vnodeBeforeMountHook = !isAsyncWrapper(n2) && n2.props && n2.props.onVnodeBeforeMount;
 				getVaporInterface(parentComponent, n2).mount(n2, container, anchor, parentComponent, parentSuspense, () => {
@@ -6943,7 +7009,7 @@ var VueRuntimeDOM = (function(exports) {
 		const move = (vnode, container, anchor, moveType, parentComponent, parentSuspense = null) => {
 			const { el, type, transition, children, shapeFlag } = vnode;
 			if (isVaporComponent(type) || type === VaporSlot) {
-				getVaporInterface(parentComponent, vnode).move(vnode, container, anchor, moveType);
+				getVaporInterface(parentComponent, vnode).move(vnode, container, anchor, moveType, parentSuspense);
 				return;
 			}
 			if (shapeFlag & 6) {
@@ -6999,7 +7065,7 @@ var VueRuntimeDOM = (function(exports) {
 			}
 			if (cacheIndex != null) parentComponent.renderCache[cacheIndex] = void 0;
 			if (shapeFlag & 256) {
-				if (isVaporComponent(vnode.type)) getVaporInterface(parentComponent, vnode).deactivate(vnode, parentComponent.ctx.getStorageContainer());
+				if (isVaporComponent(vnode.type)) getVaporInterface(parentComponent, vnode).deactivate(vnode, parentComponent.ctx.getStorageContainer(), parentSuspense);
 				else parentComponent.ctx.deactivate(vnode);
 				return;
 			}
@@ -7009,7 +7075,7 @@ var VueRuntimeDOM = (function(exports) {
 			if (shouldInvokeVnodeHook && (vnodeHook = props && props.onVnodeBeforeUnmount)) invokeVNodeHook(vnodeHook, parentComponent, vnode);
 			if (shapeFlag & 6) if (isVaporComponent(type)) {
 				if (dirs) invokeDirectiveHook(vnode, null, parentComponent, "beforeUnmount");
-				getVaporInterface(parentComponent, vnode).unmount(vnode, doRemove);
+				getVaporInterface(parentComponent, vnode).unmount(vnode, doRemove, parentSuspense);
 				if (shouldInvokeVnodeHook && (vnodeHook = props && props.onVnodeUnmounted) || dirs) queuePostRenderEffect(() => {
 					dirs && invokeDirectiveHook(vnode, null, parentComponent, "unmounted");
 					vnodeHook && invokeVNodeHook(vnodeHook, parentComponent, vnode);
@@ -7026,7 +7092,7 @@ var VueRuntimeDOM = (function(exports) {
 				else if (dynamicChildren && !dynamicChildren.hasOnce && (type !== Fragment || patchFlag > 0 && patchFlag & 64)) unmountChildren(dynamicChildren, parentComponent, parentSuspense, false, true);
 				else if (type === Fragment && patchFlag & 384 || !optimized && shapeFlag & 16) unmountChildren(children, parentComponent, parentSuspense);
 				if (type === VaporSlot) {
-					getVaporInterface(parentComponent, vnode).unmount(vnode, doRemove);
+					getVaporInterface(parentComponent, vnode).unmount(vnode, doRemove, parentSuspense);
 					return;
 				}
 				if (doRemove) remove(vnode);
@@ -7325,6 +7391,10 @@ var VueRuntimeDOM = (function(exports) {
 					suspense.activeBranch = pendingBranch;
 				} else unmount(pendingBranch, parentComponent, suspense);
 				suspense.deps = 0;
+				for (let i = 0; i < suspense.effects.length; i++) {
+					const effect = suspense.effects[i];
+					if (effect.flags & 8) queuePostFlushCb(effect);
+				}
 				suspense.effects.length = 0;
 				suspense.hiddenContainer = createElement("div");
 				if (isInFallback) {
@@ -7432,7 +7502,7 @@ var VueRuntimeDOM = (function(exports) {
 				let hasUnresolvedAncestor = false;
 				while (parent) {
 					if (parent.pendingBranch) {
-						parent.effects.push(...effects);
+						for (let i = 0; i < effects.length; i++) parent.effects.push(effects[i]);
 						hasUnresolvedAncestor = true;
 						break;
 					}
@@ -7702,9 +7772,24 @@ var VueRuntimeDOM = (function(exports) {
 			if (shapeFlag & 128) type.normalize(vnode);
 		} else if (children) vnode.shapeFlag |= isString(children) ? 8 : 16;
 		if (vnode.key !== vnode.key) warn$1(`VNode created with invalid key (NaN). VNode type:`, vnode.type);
+		if (props && vnode.shapeFlag & 1) {
+			const overwritingProp = props.innerHTML != null ? "innerHTML" : props.textContent != null ? "textContent" : null;
+			if (overwritingProp && hasContentChildren(vnode.children)) warn$1(`The \`${overwritingProp}\` prop on <${vnode.type}> will override its children. Remove either the \`${overwritingProp}\` prop or the children.`);
+		}
 		if (isBlockTreeEnabled > 0 && !isBlockNode && currentBlock && (vnode.patchFlag > 0 || shapeFlag & 6) && vnode.patchFlag !== 32) currentBlock.push(vnode);
 		return vnode;
 	}
+	/**
+	* dev only
+	* Whether children would actually render something. Empty text and empty
+	* arrays are ignored, mirroring the compiler's `node.children.length` check
+	* for `v-html` / `v-text`.
+	*/
+	function hasContentChildren(children) {
+		if (isString(children)) return children !== "";
+		if (isArray(children)) return children.length > 0;
+		return false;
+	}
 	const createVNode = createVNodeWithArgsTransform;
 	function _createVNode(type, props = null, children = null, patchFlag = 0, dynamicProps = null, isBlockNode = false) {
 		if (!type || type === NULL_DYNAMIC_COMPONENT) {
@@ -7924,6 +8009,16 @@ var VueRuntimeDOM = (function(exports) {
 			simpleSetCurrentInstance(instance);
 		}
 	};
+	/**
+	* Restores a snapshot returned by {@link setCurrentInstance}. Unlike calling
+	* `setCurrentInstance(...prev)`, an `undefined` saved scope is restored
+	* verbatim instead of re-triggering the `instance.scope` default.
+	* @internal
+	*/
+	const restoreCurrentInstance = (prev) => {
+		setCurrentScope(prev[1]);
+		simpleSetCurrentInstance(prev[0]);
+	};
 	const internalOptions = [
 		"ce",
 		"type",
@@ -8075,7 +8170,7 @@ var VueRuntimeDOM = (function(exports) {
 			const setupResult = callWithErrorHandling(setup, instance, 0, [/* @__PURE__ */ shallowReadonly(instance.props), setupContext]);
 			const isAsyncSetup = isPromise(setupResult);
 			setActiveSub(prevSub);
-			setCurrentInstance(...prev);
+			restoreCurrentInstance(prev);
 			if ((isAsyncSetup || instance.sp) && !isAsyncWrapper(instance)) markAsyncBoundary(instance);
 			if (isAsyncSetup) {
 				const unsetCurrentInstance = () => {
@@ -8083,7 +8178,12 @@ var VueRuntimeDOM = (function(exports) {
 				};
 				setupResult.then(unsetCurrentInstance, unsetCurrentInstance);
 				if (isSSR) return setupResult.then((resolvedResult) => {
-					handleSetupResult(instance, resolvedResult, isSSR);
+					setInSSRSetupState(true);
+					try {
+						handleSetupResult(instance, resolvedResult, isSSR);
+					} finally {
+						setInSSRSetupState(false);
+					}
 				}).catch((e) => {
 					handleError(e, instance, 0);
 				});
@@ -8144,7 +8244,7 @@ var VueRuntimeDOM = (function(exports) {
 				applyOptions(instance);
 			} finally {
 				setActiveSub(prevSub);
-				setCurrentInstance(...prevInstance);
+				restoreCurrentInstance(prevInstance);
 			}
 		}
 		if (!Component.render && instance.render === NOOP && !isSSR) if (!compile && Component.template)
@@ -8454,7 +8554,7 @@ var VueRuntimeDOM = (function(exports) {
 	}
 	//#endregion
 	//#region packages/runtime-core/src/index.ts
-	const version = "3.6.0-rc.1";
+	const version = "3.6.0-rc.3";
 	const warn = warn$1;
 	/**
 	* Runtime error messages. Only exposed in dev or esm builds.
@@ -9175,7 +9275,7 @@ var VueRuntimeDOM = (function(exports) {
 			if (!this._instance) if (this._resolved) this._mountComponent(this._def);
 			else if (parent && parent._pendingResolve) this._pendingResolve = parent._pendingResolve.then(() => {
 				this._pendingResolve = void 0;
-				this._resolveDef();
+				if (this.isConnected) return this._resolveDef();
 			});
 			else this._resolveDef();
 		}
@@ -9211,7 +9311,7 @@ var VueRuntimeDOM = (function(exports) {
 		* resolve inner component definition (handle possible async component)
 		*/
 		_resolveDef() {
-			if (this._pendingResolve) return;
+			if (this._pendingResolve) return this._pendingResolve;
 			for (let i = 0; i < this.attributes.length; i++) this._setAttr(this.attributes[i].name);
 			this._ob = new MutationObserver(this._processMutations.bind(this));
 			this._ob.observe(this, { attributes: true });
@@ -9241,6 +9341,7 @@ var VueRuntimeDOM = (function(exports) {
 					this._def = def;
 					resolve(def);
 				});
+				return this._pendingResolve;
 			} else resolve(this._def);
 		}
 		_mountComponent(def) {
@@ -9279,14 +9380,17 @@ var VueRuntimeDOM = (function(exports) {
 			const { props } = def;
 			const declaredPropKeys = isArray(props) ? props : Object.keys(props || {});
 			for (const key of Object.keys(this)) if (key[0] !== "_" && declaredPropKeys.includes(key)) this._setProp(key, this[key]);
-			for (const key of declaredPropKeys.map(camelize)) Object.defineProperty(this, key, {
-				get() {
-					return this._getProp(key);
-				},
-				set(val) {
-					this._setProp(key, val, true, !this._patching);
-				}
-			});
+			for (const key of declaredPropKeys.map(camelize)) {
+				if (key in Object.getPrototypeOf(this)) warn(`Custom element prop "${key}" conflicts with an existing property on the element and will overwrite it.`);
+				Object.defineProperty(this, key, {
+					get() {
+						return this._getProp(key);
+					},
+					set(val) {
+						this._setProp(key, val, true, !this._patching);
+					}
+				});
+			}
 		}
 		_setAttr(key) {
 			if (key.startsWith("data-v-")) return;
@@ -9686,13 +9790,22 @@ var VueRuntimeDOM = (function(exports) {
 		}
 	}
 	const assignKey = Symbol("_assign");
+	const initialValueKey = Symbol("_initialValue");
 	const vModelText = {
 		created(el, { modifiers: { lazy, trim, number } }, vnode) {
+			if (el.parentNode) {
+				if (el.type === "text") el[initialValueKey] = el.defaultValue.replace(/[\r\n]/g, "");
+				else if (el.type === "textarea") el[initialValueKey] = el.defaultValue.replace(/\r\n?/g, "\n");
+			}
 			el[assignKey] = getModelAssigner(vnode);
 			vModelTextInit(el, trim, number || !!(vnode.props && vnode.props.type === "number"), lazy);
 		},
-		mounted(el, { value }) {
-			el.value = value == null ? "" : value;
+		mounted(el, { value, modifiers: { trim, number } }) {
+			const newValue = value == null ? "" : value;
+			const initialValue = el[initialValueKey];
+			delete el[initialValueKey];
+			if (initialValue !== void 0 && (el.type === "text" || el.type === "textarea") && el.value !== initialValue) el[assignKey](castValue(el.value, trim, number));
+			else el.value = newValue;
 		},
 		beforeUpdate(el, { value, oldValue, modifiers: { lazy, trim, number } }, vnode) {
 			el[assignKey] = getModelAssigner(vnode);