@vue/compat 3.6.0-beta.14 → 3.6.0-beta.15

package/dist/vue.esm-bundler.js

@@ -1,5 +1,5 @@
 /**
-  * @vue/compat v3.6.0-beta.14
+  * @vue/compat v3.6.0-beta.15
   * (c) 2018-present Yuxi (Evan) You and Vue contributors
   * @license MIT
   **/
@@ -2251,8 +2251,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;
@@ -2268,7 +2269,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;
@@ -4736,11 +4737,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;
 			});
@@ -4798,14 +4804,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);
@@ -6366,7 +6380,7 @@ function createCompatVue$1(createApp, createSingletonApp) {
 		if (options.el) return vm.$mount(options.el);
 		else return vm;
 	}
-	Vue.version = `2.6.14-compat:3.6.0-beta.14`;
+	Vue.version = `2.6.14-compat:3.6.0-beta.15`;
 	Vue.config = singletonApp.config;
 	Vue.use = (plugin, ...options) => {
 		if (plugin && isFunction(plugin.install)) plugin.install(Vue, ...options);
@@ -6621,7 +6635,9 @@ function defineReactive(obj, key, val) {
 		else Object.keys(val).forEach((key) => {
 			try {
 				defineReactiveSimple(val, key, val[key]);
-			} catch (e) {}
+			} catch (e) {
+				if (!!(process.env.NODE_ENV !== "production")) warn$1(`Failed making property "${key}" reactive:`, e);
+			}
 		});
 	}
 	const i = obj.$;
@@ -6872,12 +6888,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;
 			}
@@ -9906,7 +9923,7 @@ function isMemoSame(cached, memo) {
 }
 //#endregion
 //#region packages/runtime-core/src/index.ts
-const version = "3.6.0-beta.14";
+const version = "3.6.0-beta.15";
 const warn = !!(process.env.NODE_ENV !== "production") ? warn$1 : NOOP;
 /**
 * Runtime error messages. Only exposed in dev or esm builds.
@@ -11130,7 +11147,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));
@@ -13476,7 +13493,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) {
@@ -13972,7 +13989,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),
@@ -13994,6 +14011,7 @@ function createTransformContext(root, { filename = "", prefixIdentifiers = false
 		bindingMetadata,
 		inline,
 		isTS,
+		eventDelegation,
 		onError,
 		onWarn,
 		compatConfig,
@@ -14005,6 +14023,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),
@@ -14640,7 +14659,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);
 			}
 		}

package/dist/vue.global.js

@@ -1,5 +1,5 @@
 /**
-  * @vue/compat v3.6.0-beta.14
+  * @vue/compat v3.6.0-beta.15
   * (c) 2018-present Yuxi (Evan) You and Vue contributors
   * @license MIT
   **/
@@ -2247,8 +2247,9 @@ var Vue = (function() {
 			if (once && cb) {
 				const _cb = cb;
 				cb = (...args) => {
-					_cb(...args);
+					const res = _cb(...args);
 					this.stop();
+					return res;
 				};
 			}
 			this.cb = cb;
@@ -2262,7 +2263,7 @@ var Vue = (function() {
 			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;
@@ -4666,11 +4667,16 @@ var Vue = (function() {
 					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;
 				});
@@ -4728,14 +4734,22 @@ var Vue = (function() {
 			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);
@@ -6290,7 +6304,7 @@ var Vue = (function() {
 			if (options.el) return vm.$mount(options.el);
 			else return vm;
 		}
-		Vue.version = `2.6.14-compat:3.6.0-beta.14`;
+		Vue.version = `2.6.14-compat:3.6.0-beta.15`;
 		Vue.config = singletonApp.config;
 		Vue.use = (plugin, ...options) => {
 			if (plugin && isFunction(plugin.install)) plugin.install(Vue, ...options);
@@ -6545,7 +6559,9 @@ var Vue = (function() {
 			else Object.keys(val).forEach((key) => {
 				try {
 					defineReactiveSimple(val, key, val[key]);
-				} catch (e) {}
+				} catch (e) {
+					warn$1(`Failed making property "${key}" reactive:`, e);
+				}
 			});
 		}
 		const i = obj.$;
@@ -6790,12 +6806,13 @@ var Vue = (function() {
 						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;
 				}
@@ -9750,7 +9767,7 @@ var Vue = (function() {
 	}
 	//#endregion
 	//#region packages/runtime-core/src/index.ts
-	const version = "3.6.0-beta.14";
+	const version = "3.6.0-beta.15";
 	const warn = warn$1;
 	/**
 	* Runtime error messages. Only exposed in dev or esm builds.
@@ -10932,7 +10949,7 @@ var Vue = (function() {
 				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));
@@ -13153,7 +13170,7 @@ var Vue = (function() {
 			}
 		},
 		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) {
@@ -13645,7 +13662,7 @@ var Vue = (function() {
 		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),
@@ -13667,6 +13684,7 @@ var Vue = (function() {
 			bindingMetadata,
 			inline,
 			isTS,
+			eventDelegation,
 			onError,
 			onWarn,
 			compatConfig,
@@ -13678,6 +13696,7 @@ var Vue = (function() {
 			imports: [],
 			cached: [],
 			constantCache: /* @__PURE__ */ new WeakMap(),
+			vForMemoKeyedNodes: /* @__PURE__ */ new WeakSet(),
 			temps: 0,
 			identifiers: Object.create(null),
 			identifierScopes: Object.create(null),
@@ -14308,7 +14327,7 @@ var Vue = (function() {
 				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);
 				}
 			}