vue 3.6.0-beta.13 → 3.6.0-beta.15

package/dist/vue.cjs.js

@@ -1,5 +1,5 @@
 /**
-  * vue v3.6.0-beta.13
+  * vue v3.6.0-beta.15
   * (c) 2018-present Yuxi (Evan) You and Vue contributors
   * @license MIT
   **/
@@ -68,6 +68,7 @@ function compileToFunction(template, options) {
 (0, _vue_runtime_dom.registerRuntimeCompiler)(compileToFunction);
 //#endregion
 exports.compile = compileToFunction;
+exports.defineVaporAsyncComponent = _vue_runtime_dom.defineAsyncComponent;
 Object.keys(_vue_runtime_dom).forEach(function(k) {
 	if (k !== "default" && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {
 		enumerable: true,

package/dist/vue.cjs.prod.js

@@ -1,5 +1,5 @@
 /**
-  * vue v3.6.0-beta.13
+  * vue v3.6.0-beta.15
   * (c) 2018-present Yuxi (Evan) You and Vue contributors
   * @license MIT
   **/
@@ -59,6 +59,7 @@ function compileToFunction(template, options) {
 (0, _vue_runtime_dom.registerRuntimeCompiler)(compileToFunction);
 //#endregion
 exports.compile = compileToFunction;
+exports.defineVaporAsyncComponent = _vue_runtime_dom.defineAsyncComponent;
 Object.keys(_vue_runtime_dom).forEach(function(k) {
 	if (k !== "default" && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {
 		enumerable: true,

package/dist/vue.d.mts

@@ -1,6 +1,6 @@
 import { CompilerOptions } from "@vue/compiler-dom";
-import { RenderFunction } from "@vue/runtime-dom";
-import { VaporSlot, withAsyncContext } from "@vue/runtime-vapor";
+import { RenderFunction, defineAsyncComponent as defineVaporAsyncComponent$1 } from "@vue/runtime-dom";
+import { VaporSlot, defineVaporAsyncComponent, withAsyncContext } from "@vue/runtime-vapor";
 export * from "@vue/runtime-dom";
 export * from "@vue/runtime-vapor";
 
@@ -9,4 +9,4 @@ export * from "@vue/runtime-vapor";
 //#region temp/packages/vue/src/index.d.ts
 export declare function compileToFunction(template: string | HTMLElement, options?: CompilerOptions): RenderFunction;
 //#endregion
-export { type VaporSlot, compileToFunction as compile, withAsyncContext };
+export { type VaporSlot, compileToFunction as compile, defineVaporAsyncComponent, withAsyncContext };

package/dist/vue.d.ts

@@ -1,6 +1,6 @@
 import { CompilerOptions } from "@vue/compiler-dom";
-import { RenderFunction } from "@vue/runtime-dom";
-import { VaporSlot, withAsyncContext } from "@vue/runtime-vapor";
+import { RenderFunction, defineAsyncComponent as defineVaporAsyncComponent$1 } from "@vue/runtime-dom";
+import { VaporSlot, defineVaporAsyncComponent, withAsyncContext } from "@vue/runtime-vapor";
 export * from "@vue/runtime-dom";
 export * from "@vue/runtime-vapor";
 
@@ -9,4 +9,4 @@ export * from "@vue/runtime-vapor";
 //#region temp/packages/vue/src/index.d.ts
 export declare function compileToFunction(template: string | HTMLElement, options?: CompilerOptions): RenderFunction;
 //#endregion
-export { type VaporSlot, compileToFunction as compile, withAsyncContext };
+export { type VaporSlot, compileToFunction as compile, defineVaporAsyncComponent, withAsyncContext };

package/dist/vue.esm-browser.js

@@ -1,5 +1,5 @@
 /**
-  * vue v3.6.0-beta.13
+  * vue v3.6.0-beta.15
   * (c) 2018-present Yuxi (Evan) You and Vue contributors
   * @license MIT
   **/
@@ -2246,8 +2246,9 @@ var WatcherEffect = class extends ReactiveEffect {
 		if (once && cb) {
 			const _cb = cb;
 			cb = (...args) => {
-				_cb(...args);
+				const res = _cb(...args);
 				this.stop();
+				return res;
 			};
 		}
 		this.cb = cb;
@@ -2261,7 +2262,7 @@ var WatcherEffect = class extends ReactiveEffect {
 		if (!this.cb) return;
 		const { immediate, deep, call } = this.options;
 		if (initialRun && !immediate) return;
-		if (deep || this.forceTrigger || (this.isMultiSource ? newValue.some((v, i) => hasChanged(v, oldValue[i])) : hasChanged(newValue, oldValue))) {
+		if (initialRun || deep || this.forceTrigger || (this.isMultiSource ? newValue.some((v, i) => hasChanged(v, oldValue[i])) : hasChanged(newValue, oldValue))) {
 			cleanup(this);
 			const currentWatcher = activeWatcher;
 			activeWatcher = this;
@@ -2678,6 +2679,7 @@ function flushJobs(seen) {
 		}
 		flushIndex = 0;
 		jobsLength = 0;
+		jobs.length = 0;
 		flushPostFlushCbs(seen);
 		currentFlushPromise = null;
 		if (jobsLength || postJobs.length) flushJobs(seen);
@@ -2735,6 +2737,14 @@ function createRecord(id, initialDef) {
 function normalizeClassComponent(component) {
 	return isClassComponent(component) ? component.__vccOpts : component;
 }
+function hasDirtyAncestor(instance, dirtyInstances) {
+	let parent = instance.parent;
+	while (parent) {
+		if (dirtyInstances.has(parent)) return true;
+		parent = parent.parent;
+	}
+	return false;
+}
 function rerender(id, newRender) {
 	const record = map.get(id);
 	if (!record) return;
@@ -2766,42 +2776,69 @@ function reload(id, newComp) {
 	const isVapor = record.initialDef.__vapor;
 	updateComponentDef(record.initialDef, newComp);
 	const instances = [...record.instances];
-	if (isVapor && newComp.__vapor && !instances.some((i) => i.ceReload)) {
+	if (isVapor && newComp.__vapor && !instances.some((instance) => instance.parent && !instance.parent.vapor) && !instances.some((i) => i.ceReload)) {
 		for (const instance of instances) if (instance.root && instance.root.ce && instance !== instance.root) instance.root.ce._removeChildStyle(instance.type);
-		for (const instance of instances) instance.hmrReload(newComp);
-	} else for (const instance of instances) {
-		const oldComp = normalizeClassComponent(instance.type);
-		let dirtyInstances = hmrDirtyComponents.get(oldComp);
-		if (!dirtyInstances) {
-			if (oldComp !== record.initialDef) updateComponentDef(oldComp, newComp);
-			hmrDirtyComponents.set(oldComp, dirtyInstances = /* @__PURE__ */ new Set());
-		}
-		dirtyInstances.add(instance);
-		hmrDirtyComponentsMode.set(oldComp, !!isVapor);
-		instance.appContext.propsCache.delete(instance.type);
-		instance.appContext.emitsCache.delete(instance.type);
-		instance.appContext.optionsCache.delete(instance.type);
-		if (instance.ceReload) {
-			dirtyInstances.add(instance);
-			instance.ceReload(newComp.styles);
-			dirtyInstances.delete(instance);
-		} else if (instance.parent) queueJob(() => {
-			isHmrUpdating = true;
+		const dirtyInstances = new Set(instances);
+		const rerenderedParents = /* @__PURE__ */ new Set();
+		for (const instance of instances) {
 			const parent = instance.parent;
-			if (parent.vapor) parent.hmrRerender();
-			else if (!(parent.effect.flags & 1024)) {
-				parent.renderCache = [];
-				parent.effect.run();
+			if (parent) {
+				if (!hasDirtyAncestor(instance, dirtyInstances) && !rerenderedParents.has(parent)) {
+					rerenderedParents.add(parent);
+					parent.hmrRerender();
+				}
+			} else instance.hmrReload(newComp);
+		}
+	} else {
+		const parentUpdates = /* @__PURE__ */ new Map();
+		const dirtyInstanceSet = new Set(instances);
+		for (const instance of instances) {
+			const oldComp = normalizeClassComponent(instance.type);
+			let dirtyInstances = hmrDirtyComponents.get(oldComp);
+			if (!dirtyInstances) {
+				if (oldComp !== record.initialDef) updateComponentDef(oldComp, newComp);
+				hmrDirtyComponents.set(oldComp, dirtyInstances = /* @__PURE__ */ new Set());
 			}
-			nextTick(() => {
-				isHmrUpdating = false;
+			dirtyInstances.add(instance);
+			hmrDirtyComponentsMode.set(oldComp, !!isVapor);
+			instance.appContext.propsCache.delete(instance.type);
+			instance.appContext.emitsCache.delete(instance.type);
+			instance.appContext.optionsCache.delete(instance.type);
+			if (instance.ceReload) {
+				dirtyInstances.add(instance);
+				instance.ceReload(newComp.styles);
+				dirtyInstances.delete(instance);
+			} else if (instance.parent) {
+				const parent = instance.parent;
+				if (!hasDirtyAncestor(instance, dirtyInstanceSet)) {
+					let updates = parentUpdates.get(parent);
+					if (!updates) parentUpdates.set(parent, updates = []);
+					updates.push([instance, dirtyInstances]);
+				}
+			} else if (instance.appContext.reload) instance.appContext.reload();
+			else if (typeof window !== "undefined") window.location.reload();
+			else console.warn("[HMR] Root or manually mounted instance modified. Full reload required.");
+			if (instance.root.ce && instance !== instance.root) instance.root.ce._removeChildStyle(oldComp);
+		}
+		parentUpdates.forEach((updates, parent) => {
+			queueJob(() => {
+				isHmrUpdating = true;
+				if (parent.vapor) parent.hmrRerender();
+				else {
+					const i = parent;
+					if (!(i.effect.flags & 1024)) {
+						i.renderCache = [];
+						i.effect.run();
+					}
+				}
+				nextTick(() => {
+					isHmrUpdating = false;
+				});
+				updates.forEach(([instance, dirtyInstances]) => {
+					dirtyInstances.delete(instance);
+				});
 			});
-			dirtyInstances.delete(instance);
 		});
-		else if (instance.appContext.reload) instance.appContext.reload();
-		else if (typeof window !== "undefined") window.location.reload();
-		else console.warn("[HMR] Root or manually mounted instance modified. Full reload required.");
-		if (instance.root.ce && instance !== instance.root) instance.root.ce._removeChildStyle(oldComp);
 	}
 	queuePostFlushCb(() => {
 		hmrDirtyComponents.clear();
@@ -4281,11 +4318,16 @@ function defineAsyncComponent(source) {
 				onError(err);
 				return () => errorComponent ? createVNode(errorComponent, { error: err }) : null;
 			});
-			const { loaded, error, delayed } = useAsyncComponentState(delay, timeout, onError);
+			const { loaded, error, delayed } = useAsyncComponentState(delay, timeout, onError, instance);
 			load().then(() => {
+				if (instance.isUnmounted) return;
 				loaded.value = true;
 				if (instance.parent && instance.parent.vnode && isKeepAlive(instance.parent.vnode)) instance.parent.update();
 			}).catch((err) => {
+				if (instance.isUnmounted) {
+					setPendingRequest(null);
+					return;
+				}
 				onError(err);
 				error.value = err;
 			});
@@ -4343,14 +4385,22 @@ function createAsyncComponentContext(source) {
 		setPendingRequest: (request) => pendingRequest = request
 	};
 }
-const useAsyncComponentState = (delay, timeout, onError) => {
+const useAsyncComponentState = (delay, timeout, onError, instance = currentInstance) => {
 	const loaded = /* @__PURE__ */ ref(false);
 	const error = /* @__PURE__ */ ref();
 	const delayed = /* @__PURE__ */ ref(!!delay);
-	if (delay) setTimeout(() => {
+	let timeoutTimer;
+	let delayTimer;
+	if (instance) onUnmounted(() => {
+		if (timeoutTimer != null) clearTimeout(timeoutTimer);
+		if (delayTimer != null) clearTimeout(delayTimer);
+	}, instance);
+	if (delay) delayTimer = setTimeout(() => {
+		if (instance && instance.isUnmounted) return;
 		delayed.value = false;
 	}, delay);
-	if (timeout != null) setTimeout(() => {
+	if (timeout != null) timeoutTimer = setTimeout(() => {
+		if (instance && instance.isUnmounted) return;
 		if (!loaded.value && !error.value) {
 			const err = /* @__PURE__ */ new Error(`Async component timed out after ${timeout}ms.`);
 			onError(err);
@@ -4753,6 +4803,7 @@ function renderSlot(slots, name, props = {}, fallback, noSlotted) {
 			slot: vaporSlot,
 			fallback
 		};
+		if (!noSlotted && ret.scopeId) ret.slotScopeIds = [ret.scopeId + "-s"];
 		return ret;
 	}
 	if (currentRenderingInstance && (currentRenderingInstance.ce || currentRenderingInstance.parent && isAsyncWrapper(currentRenderingInstance.parent) && currentRenderingInstance.parent.ce)) {
@@ -5606,12 +5657,13 @@ function useModel(props, name, options = EMPTY_OBJ) {
 					for (const key of rawPropKeys) if (key === name || key === camelizedName || key === hyphenatedName) parentPassedModelValue = true;
 					else if (key === `onUpdate:${name}` || key === `onUpdate:${camelizedName}` || key === `onUpdate:${hyphenatedName}`) parentPassedModelUpdater = true;
 				}
-				if (!parentPassedModelValue || !parentPassedModelUpdater) {
+				const hasVModel = parentPassedModelValue && parentPassedModelUpdater;
+				if (!hasVModel) {
 					localValue = value;
 					trigger();
 				}
 				i.emit(`update:${name}`, emittedValue);
-				if (hasChanged(value, emittedValue) && hasChanged(value, prevSetValue) && !hasChanged(emittedValue, prevEmittedValue)) trigger();
+				if (hasChanged(value, prevSetValue) && (hasChanged(value, emittedValue) && !hasChanged(emittedValue, prevEmittedValue) || hasVModel && prevSetValue !== EMPTY_OBJ && !hasChanged(emittedValue, localValue))) trigger();
 				prevSetValue = value;
 				prevEmittedValue = emittedValue;
 			}
@@ -8457,7 +8509,7 @@ function isMemoSame(cached, memo) {
 }
 //#endregion
 //#region packages/runtime-core/src/index.ts
-const version = "3.6.0-beta.13";
+const version = "3.6.0-beta.15";
 const warn = warn$1;
 /**
 * Runtime error messages. Only exposed in dev or esm builds.
@@ -9608,7 +9660,7 @@ const TransitionGroup = /* @__PURE__ */ decorate({
 			prevChildren = [];
 			if (children) for (let i = 0; i < children.length; i++) {
 				const child = children[i];
-				if (child.el && child.el instanceof Element) {
+				if (child.el && child.el instanceof Element && !child.el[vShowHidden]) {
 					prevChildren.push(child);
 					setTransitionHooks(child, resolveTransitionHooks(child, cssTransitionProps, state, instance));
 					positionMap.set(child, getPosition(child.el));
@@ -11722,7 +11774,7 @@ const tokenizer = new Tokenizer(stack, {
 		}
 	},
 	oncdata(start, end) {
-		if (stack[0].ns !== 0) onText(getSlice(start, end), start, end);
+		if ((stack[0] ? stack[0].ns : currentOptions.ns) !== 0) onText(getSlice(start, end), start, end);
 		else emitError(1, start - 9);
 	},
 	onprocessinginstruction(start) {
@@ -12183,7 +12235,7 @@ function getSelfName(filename) {
 	const nameMatch = filename.replace(/\?.*$/, "").match(/([^/\\]+)\.\w+$/);
 	return nameMatch ? capitalize(camelize(nameMatch[1])) : null;
 }
-function createTransformContext(root, { filename = "", prefixIdentifiers = false, hoistStatic = false, hmr = false, cacheHandlers = false, nodeTransforms = [], directiveTransforms = {}, transformHoist = null, isBuiltInComponent = NOOP, isCustomElement = NOOP, expressionPlugins = [], scopeId = null, slotted = true, ssr = false, inSSR = false, ssrCssVars = ``, bindingMetadata = EMPTY_OBJ, inline = false, isTS = false, onError = defaultOnError, onWarn = defaultOnWarn, compatConfig }) {
+function createTransformContext(root, { filename = "", prefixIdentifiers = false, hoistStatic = false, hmr = false, cacheHandlers = false, nodeTransforms = [], directiveTransforms = {}, transformHoist = null, isBuiltInComponent = NOOP, isCustomElement = NOOP, expressionPlugins = [], scopeId = null, slotted = true, ssr = false, inSSR = false, ssrCssVars = ``, bindingMetadata = EMPTY_OBJ, inline = false, isTS = false, eventDelegation = true, onError = defaultOnError, onWarn = defaultOnWarn, compatConfig }) {
 	const context = {
 		filename,
 		selfName: getSelfName(filename),
@@ -12205,6 +12257,7 @@ function createTransformContext(root, { filename = "", prefixIdentifiers = false
 		bindingMetadata,
 		inline,
 		isTS,
+		eventDelegation,
 		onError,
 		onWarn,
 		compatConfig,
@@ -12216,6 +12269,7 @@ function createTransformContext(root, { filename = "", prefixIdentifiers = false
 		imports: [],
 		cached: [],
 		constantCache: /* @__PURE__ */ new WeakMap(),
+		vForMemoKeyedNodes: /* @__PURE__ */ new WeakSet(),
 		temps: 0,
 		identifiers: Object.create(null),
 		identifierScopes: Object.create(null),
@@ -12836,7 +12890,7 @@ const transformExpression = (node, context) => {
 			if (dir.type === 7 && dir.name !== "for") {
 				const exp = dir.exp;
 				const arg = dir.arg;
-				if (exp && exp.type === 4 && !(dir.name === "on" && arg) && !(memo && arg && arg.type === 4 && arg.content === "key")) dir.exp = processExpression(exp, context, dir.name === "slot");
+				if (exp && exp.type === 4 && !(dir.name === "on" && arg) && !(memo && context.vForMemoKeyedNodes.has(node) && arg && arg.type === 4 && arg.content === "key")) dir.exp = processExpression(exp, context, dir.name === "slot");
 				if (arg && arg.type === 4 && !arg.isStatic) dir.arg = processExpression(arg, context);
 			}
 		}
@@ -14344,4 +14398,4 @@ function compileToFunction(template, options) {
 }
 registerRuntimeCompiler(compileToFunction);
 //#endregion
-export { BaseTransition, BaseTransitionPropsValidators, Comment, DeprecationTypes, EffectScope, ErrorCodes, ErrorTypeStrings, Fragment, KeepAlive, MoveType, NULL_DYNAMIC_COMPONENT, ReactiveEffect, Static, Suspense, Teleport, Text, TrackOpTypes, Transition, TransitionGroup, TriggerOpTypes, VueElement, VueElementBase, assertNumber, callWithAsyncErrorHandling, callWithErrorHandling, camelize, capitalize, cloneVNode, compatUtils, compileToFunction as compile, computed, createApp, createBlock, createCommentVNode, createElementBlock, createBaseVNode as createElementVNode, createHydrationRenderer, createPropsRestProxy, createRenderer, createSSRApp, createSlots, createStaticVNode, createTextVNode, createVNode, customRef, defineAsyncComponent, defineComponent, defineCustomElement, defineEmits, defineExpose, defineModel, defineOptions, defineProps, defineSSRCustomElement, defineSlots, devtools, effect, effectScope, getCurrentInstance, getCurrentScope, getCurrentWatcher, getTransitionRawChildren, guardReactiveProps, h, handleError, hasInjectionContext, hydrate, hydrateOnIdle, hydrateOnInteraction, hydrateOnMediaQuery, hydrateOnVisible, initCustomFormatter, initDirectivesForSSR, inject, isMemoSame, isProxy, isReactive, isReadonly, isRef, isRuntimeOnly, isShallow, isVNode, markRaw, mergeDefaults, mergeModels, mergeProps, nextTick, nodeOps, normalizeClass, normalizeProps, normalizeStyle, onActivated, onBeforeMount, onBeforeUnmount, onBeforeUpdate, onDeactivated, onErrorCaptured, onMounted, onRenderTracked, onRenderTriggered, onScopeDispose, onServerPrefetch, onUnmounted, onUpdated, onWatcherCleanup, openBlock, patchProp, popScopeId, provide, proxyRefs, pushScopeId, queuePostFlushCb, reactive, readonly, ref, registerRuntimeCompiler, render, renderList, renderSlot, resolveComponent, resolveDirective, resolveDynamicComponent, resolveFilter, resolveTransitionHooks, setBlockTracking, setDevtoolsHook, setIsHydratingEnabled, setTransitionHooks, shallowReactive, shallowReadonly, shallowRef, ssrContextKey, ssrUtils, stop, toDisplayString, toHandlerKey, toHandlers, toRaw, toRef, toRefs, toValue, transformVNodeArgs, triggerRef, unref, useAttrs, useCssModule, useCssVars, useHost, useId, useInstanceOption, useModel, useSSRContext, useShadowRoot, useSlots, useTemplateRef, useTransitionState, vModelCheckbox, vModelDynamic, vModelRadio, vModelSelect, vModelText, vShow, version, warn, watch, watchEffect, watchPostEffect, watchSyncEffect, withAsyncContext, withCtx, withDefaults, withDirectives, withKeys, withMemo, withModifiers, withScopeId };
+export { BaseTransition, BaseTransitionPropsValidators, Comment, DeprecationTypes, EffectScope, ErrorCodes, ErrorTypeStrings, Fragment, KeepAlive, MoveType, NULL_DYNAMIC_COMPONENT, ReactiveEffect, Static, Suspense, Teleport, Text, TrackOpTypes, Transition, TransitionGroup, TriggerOpTypes, VueElement, VueElementBase, assertNumber, callWithAsyncErrorHandling, callWithErrorHandling, camelize, capitalize, cloneVNode, compatUtils, compileToFunction as compile, computed, createApp, createBlock, createCommentVNode, createElementBlock, createBaseVNode as createElementVNode, createHydrationRenderer, createPropsRestProxy, createRenderer, createSSRApp, createSlots, createStaticVNode, createTextVNode, createVNode, customRef, defineAsyncComponent, defineAsyncComponent as defineVaporAsyncComponent, defineComponent, defineCustomElement, defineEmits, defineExpose, defineModel, defineOptions, defineProps, defineSSRCustomElement, defineSlots, devtools, effect, effectScope, getCurrentInstance, getCurrentScope, getCurrentWatcher, getTransitionRawChildren, guardReactiveProps, h, handleError, hasInjectionContext, hydrate, hydrateOnIdle, hydrateOnInteraction, hydrateOnMediaQuery, hydrateOnVisible, initCustomFormatter, initDirectivesForSSR, inject, isMemoSame, isProxy, isReactive, isReadonly, isRef, isRuntimeOnly, isShallow, isVNode, markRaw, mergeDefaults, mergeModels, mergeProps, nextTick, nodeOps, normalizeClass, normalizeProps, normalizeStyle, onActivated, onBeforeMount, onBeforeUnmount, onBeforeUpdate, onDeactivated, onErrorCaptured, onMounted, onRenderTracked, onRenderTriggered, onScopeDispose, onServerPrefetch, onUnmounted, onUpdated, onWatcherCleanup, openBlock, patchProp, popScopeId, provide, proxyRefs, pushScopeId, queuePostFlushCb, reactive, readonly, ref, registerRuntimeCompiler, render, renderList, renderSlot, resolveComponent, resolveDirective, resolveDynamicComponent, resolveFilter, resolveTransitionHooks, setBlockTracking, setDevtoolsHook, setIsHydratingEnabled, setTransitionHooks, shallowReactive, shallowReadonly, shallowRef, ssrContextKey, ssrUtils, stop, toDisplayString, toHandlerKey, toHandlers, toRaw, toRef, toRefs, toValue, transformVNodeArgs, triggerRef, unref, useAttrs, useCssModule, useCssVars, useHost, useId, useInstanceOption, useModel, useSSRContext, useShadowRoot, useSlots, useTemplateRef, useTransitionState, vModelCheckbox, vModelDynamic, vModelRadio, vModelSelect, vModelText, vShow, version, warn, watch, watchEffect, watchPostEffect, watchSyncEffect, withAsyncContext, withCtx, withDefaults, withDirectives, withKeys, withMemo, withModifiers, withScopeId };