@vue/compat 3.6.0-rc.7 → 3.6.0-rc.9

package/dist/vue-compat.d.ts

@@ -375,11 +375,11 @@ type PropConstructor<T = any> = {
 } | {
   (): T;
 } | PropMethod<T>;
-type PropMethod<T, TConstructor = any> = [T] extends [((...args: any) => any) | undefined] ? {
+type PropMethod<T, TConstructor = any> = {
   new (): TConstructor;
   (): T;
   readonly prototype: TConstructor;
-} : never;
+};
 type RequiredKeys<T> = { [K in keyof T]: T[K] extends {
   required: true;
 } | {
@@ -408,7 +408,7 @@ type InferPropType<T, NullAsAny = true> = [T] extends [null] ? NullAsAny extends
   type: DateConstructor;
 }] ? Date : [T] extends [(infer U)[] | {
   type: (infer U)[];
-}] ? U extends DateConstructor ? Date | InferPropType<U, false> : InferPropType<U, false> : [T] extends [Prop<infer V, infer D>] ? unknown extends V ? keyof V extends never ? IfAny<V, V, D> : V : V : T;
+}] ? U extends DateConstructor ? Date | InferPropType<U, false> : InferPropType<U, false> : [T] extends [Prop<infer V, infer D>] ? unknown extends V ? keyof V extends never ? IfAny<V, V, unknown extends D ? V : D> : V : V : T;
 /**
  * Extract prop types from a runtime props options object.
  * The extracted types are **internal** - i.e. the resolved props received by
@@ -1048,6 +1048,7 @@ interface VaporInVdomInterface {
   activate(vnode: VNode, container: RendererElement, anchor: RendererNode | null, parentComponent: ComponentInternalInstance, parentSuspense: SuspenseBoundary | null): void;
   deactivate(vnode: VNode, container: RendererElement, parentSuspense: SuspenseBoundary | null): void;
   setTransitionHooks(component: ComponentInternalInstance, transition: TransitionHooks): void;
+  applyCssVars(vnode: VNode, vars: Record<string, string>): void;
 }
 /**
  * Options for rendering a VDOM slot inside vapor. `flags` carries the
@@ -1065,7 +1066,7 @@ interface VdomSlotOptions {
 interface VdomInVaporInterface {
   mount: (component: ConcreteComponent, parentComponent: any, props?: any, slots?: any, once?: boolean) => any;
   slot: (slots: any, name: string | (() => string), props: Record<string, any>, parentComponent: any, options?: VdomSlotOptions) => any;
-  mountVNode: (vnode: VNode, parentComponent: any, getFallthroughAttrs?: () => Record<string, any>) => any;
+  mountVNode: (vnode: VNode, parentComponent: any, isSingleRoot?: boolean) => any;
 }
 /**
  * Minimal app context shared between vdom and vapor
@@ -1595,11 +1596,6 @@ interface GenericComponentInstance {
    * @internal
    */
   asyncResolved: boolean;
-  /**
-   * restore renderer-specific async context after `withAsyncContext()`
-   * @internal
-   */
-  restoreAsyncContext?: () => void | (() => void);
   /**
    * `updateTeleportCssVars`
    * For updating css vars on contained teleports

package/dist/vue.cjs.js

@@ -1,5 +1,5 @@
 /**
-  * @vue/compat v3.6.0-rc.7
+  * @vue/compat v3.6.0-rc.9
   * (c) 2018-present Yuxi (Evan) You and Vue contributors
   * @license MIT
   **/
@@ -238,10 +238,10 @@ function normalizeStyle(value) {
 }
 const listDelimiterRE = /;(?![^(]*\))/g;
 const propertyDelimiterRE = /:([^]+)/;
-const styleCommentRE = /\/\*[^]*?\*\//g;
+const styleCommentRE = /"(?:[^"\\]|\\[^])*"|'(?:[^'\\]|\\[^])*'|\\[^]|\/\*[^]*?\*\//g;
 function parseStringStyle(cssText) {
 	const ret = {};
-	cssText.replace(styleCommentRE, "").split(listDelimiterRE).forEach((item) => {
+	cssText.replace(styleCommentRE, (match) => match.startsWith("/*") ? "" : match).split(listDelimiterRE).forEach((item) => {
 		if (item) {
 			const tmp = item.split(propertyDelimiterRE);
 			tmp.length > 1 && (ret[tmp[0].trim()] = tmp[1].trim());
@@ -407,19 +407,19 @@ function getEscapedCssVarName(key, doubleEscape) {
 }
 //#endregion
 //#region packages/shared/src/looseEqual.ts
-function looseCompareArrays(a, b) {
+function looseCompareArrays(a, b, seen) {
 	if (a.length !== b.length) return false;
 	let equal = true;
-	for (let i = 0; equal && i < a.length; i++) equal = looseEqual(a[i], b[i]);
+	for (let i = 0; equal && i < a.length; i++) equal = looseEqual(a[i], b[i], seen);
 	return equal;
 }
-function looseCompareCollections(a, b) {
+function looseCompareCollections(a, b, seen) {
 	if (a.size !== b.size) return false;
 	const candidates = Array.from(b);
 	const matched = new Uint8Array(candidates.length);
 	for (const item of a) {
 		let index = -1;
-		for (let i = 0; i < candidates.length; i++) if (!matched[i] && looseEqual(item, candidates[i])) {
+		for (let i = 0; i < candidates.length; i++) if (!matched[i] && looseEqual(item, candidates[i], seen)) {
 			index = i;
 			break;
 		}
@@ -428,7 +428,33 @@ function looseCompareCollections(a, b) {
 	}
 	return true;
 }
-function looseEqual(a, b) {
+function looseCompareObjects(a, b, seen) {
+	let aValidType = isMap(a);
+	let bValidType = isMap(b);
+	if (aValidType || bValidType) return aValidType && bValidType ? looseCompareCollections(a, b, seen) : false;
+	aValidType = isSet(a);
+	bValidType = isSet(b);
+	if (aValidType || bValidType) return aValidType && bValidType ? looseCompareCollections(a, b, seen) : false;
+	if (Object.keys(a).length !== Object.keys(b).length) return false;
+	for (const key in a) {
+		const aHasKey = a.hasOwnProperty(key);
+		const bHasKey = b.hasOwnProperty(key);
+		if (aHasKey && !bHasKey || !aHasKey && bHasKey || !looseEqual(a[key], b[key], seen)) return false;
+	}
+	return String(a) === String(b);
+}
+function looseCompareNested(a, b, seen, compare) {
+	if (!seen) seen = [/* @__PURE__ */ new Map(), /* @__PURE__ */ new Map()];
+	const [seenA, seenB] = seen;
+	if (seenA.has(a) || seenB.has(b)) return seenA.get(a) === b && seenB.get(b) === a;
+	seenA.set(a, b);
+	seenB.set(b, a);
+	const equal = compare(a, b, seen);
+	seenA.delete(a);
+	seenB.delete(b);
+	return equal;
+}
+function looseEqual(a, b, seen) {
 	if (a === b) return true;
 	let aValidType = isDate(a);
 	let bValidType = isDate(b);
@@ -438,23 +464,12 @@ function looseEqual(a, b) {
 	if (aValidType || bValidType) return a === b;
 	aValidType = isArray(a);
 	bValidType = isArray(b);
-	if (aValidType || bValidType) return aValidType && bValidType ? looseCompareArrays(a, b) : false;
+	if (aValidType || bValidType) return aValidType && bValidType ? looseCompareNested(a, b, seen, looseCompareArrays) : false;
 	aValidType = isObject(a);
 	bValidType = isObject(b);
 	if (aValidType || bValidType) {
 		if (!aValidType || !bValidType) return false;
-		aValidType = isMap(a);
-		bValidType = isMap(b);
-		if (aValidType || bValidType) return aValidType && bValidType ? looseCompareCollections(a, b) : false;
-		aValidType = isSet(a);
-		bValidType = isSet(b);
-		if (aValidType || bValidType) return aValidType && bValidType ? looseCompareCollections(a, b) : false;
-		if (Object.keys(a).length !== Object.keys(b).length) return false;
-		for (const key in a) {
-			const aHasKey = a.hasOwnProperty(key);
-			const bHasKey = b.hasOwnProperty(key);
-			if (aHasKey && !bHasKey || !aHasKey && bHasKey || !looseEqual(a[key], b[key])) return false;
-		}
+		return looseCompareNested(a, b, seen, looseCompareObjects);
 	}
 	return String(a) === String(b);
 }
@@ -584,6 +599,8 @@ function setupFlagsHandler(target) {
 function warn$2(msg, ...args) {
 	console.warn(`[Vue warn] ${msg}`, ...args);
 }
+//#endregion
+//#region packages/reactivity/src/system.ts
 const notifyBuffer = [];
 let batchDepth = 0;
 let activeSub = void 0;
@@ -910,13 +927,17 @@ function getDepFromReactive(object, key) {
 /**
 * Track array iteration and return:
 * - if input is reactive: a cloned raw array with reactive values
-* - if input is non-reactive or shallowReactive: the original raw array
+* - if input is readonly: a cloned raw array with readonly values, preserving
+*   reactivity
+* - if input is raw or shallow: the original raw array
 */
 function reactiveReadArray(array) {
 	const raw = /* @__PURE__ */ toRaw(array);
 	if (raw === array) return raw;
 	track(raw, "iterate", ARRAY_ITERATE_KEY);
-	return /* @__PURE__ */ isShallow(array) ? raw : raw.map(toReactive);
+	if (/* @__PURE__ */ isShallow(array)) return raw;
+	if (!/* @__PURE__ */ isReadonly(array)) return raw.map(toReactive);
+	return /* @__PURE__ */ isReactive(array) ? raw.map((item) => toReadonly(toReactive(item))) : raw.map(toReadonly);
 }
 /**
 * Track array iteration and return raw array
@@ -4448,12 +4469,12 @@ function createHydrationFunctions(rendererInternals) {
 				} else {
 					mountComponent(vnode, container, null, parentComponent, parentSuspense, getContainerType(container), optimized);
 					const component = vnode.component;
-					if (!component.subTree && (isAsyncWrapper(vnode) || component.asyncDep && !component.asyncResolved)) {
+					if (!component.subTree && (isAsyncWrapper(vnode) || component.asyncDep)) {
 						let subTree;
 						if (isFragmentStart) {
 							subTree = createVNode(Static);
 							subTree.anchor = nextNode ? nextNode.previousSibling : container.lastChild;
-						} else subTree = node.nodeType === 3 ? createTextVNode("") : createVNode("div");
+						} else subTree = node.nodeType === 3 ? createTextVNode("") : createVNode(node.nodeType === 8 ? Comment : "div");
 						subTree.el = node;
 						component.subTree = subTree;
 					}
@@ -6251,37 +6272,32 @@ function createPropsRestProxy(props, excludedKeys) {
 function withAsyncContext(getAwaitable) {
 	const ctx = getCurrentGenericInstance();
 	const inSSRSetup = isInSSRComponentSetup;
-	const restoreAsyncContext = ctx && ctx.restoreAsyncContext ? ctx.restoreAsyncContext.bind(ctx) : void 0;
 	if (!ctx) warn$1("withAsyncContext called without active current instance. This is likely a bug.");
 	let awaitable = getAwaitable();
 	setCurrentInstance(null, void 0);
 	if (inSSRSetup) setInSSRSetupState(false);
 	const restore = () => {
-		const resetStoppedScope = ctx && !ctx.scope.active ? ctx.scope : void 0;
+		const stoppedScope = ctx && !ctx.scope.active ? ctx.scope : void 0;
 		setCurrentInstance(ctx);
 		if (inSSRSetup) setInSSRSetupState(true);
-		const reset = restoreAsyncContext && restoreAsyncContext();
-		return () => {
-			if (reset) reset();
-			if (resetStoppedScope) resetStoppedScope.reset();
-		};
+		return stoppedScope;
 	};
 	const cleanup = () => {
 		setCurrentInstance(null, void 0);
 		if (inSSRSetup) setInSSRSetupState(false);
 	};
 	if (isPromise(awaitable)) awaitable = awaitable.catch((e) => {
-		const reset = restore();
+		const stoppedScope = restore();
 		Promise.resolve().then(() => Promise.resolve().then(() => {
-			if (reset) reset();
+			if (stoppedScope) stoppedScope.reset();
 			cleanup();
 		}));
 		throw e;
 	});
 	return [awaitable, () => {
-		const reset = restore();
+		const stoppedScope = restore();
 		Promise.resolve().then(() => {
-			if (reset) reset();
+			if (stoppedScope) stoppedScope.reset();
 			cleanup();
 		});
 	}];
@@ -6607,7 +6623,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-rc.7`;
+	Vue.version = `2.6.14-compat:3.6.0-rc.9`;
 	Vue.config = singletonApp.config;
 	Vue.use = (plugin, ...options) => {
 		if (plugin && isFunction(plugin.install)) plugin.install(Vue, ...options);
@@ -7947,6 +7963,10 @@ function baseCreateRenderer(options, createHydrationFns) {
 			optimized = false;
 			n2.dynamicChildren = null;
 		}
+		if (n2.dynamicChildren && n1 && n1.dynamicChildren && n1.dynamicChildren.hasOnce) {
+			if (n2.dynamicChildren === EMPTY_ARR) n2.dynamicChildren = [];
+			n2.dynamicChildren.hasOnce = true;
+		}
 		const { type, ref, shapeFlag } = n2;
 		switch (type) {
 			case Text:
@@ -8266,6 +8286,7 @@ function baseCreateRenderer(options, createHydrationFns) {
 		if (shouldUpdateComponent(n1, n2, optimized)) {
 			if (instance.asyncDep && !instance.asyncResolved) {
 				pushWarningContext(n2);
+				n2.el = n1.el;
 				updateComponentPreRender(instance, n2, optimized);
 				popWarningContext();
 				return;
@@ -8581,13 +8602,13 @@ function baseCreateRenderer(options, createHydrationFns) {
 	};
 	const unmount = (vnode, parentComponent, parentSuspense, doRemove = false, optimized = false) => {
 		const { type, props, ref, children, dynamicChildren, shapeFlag, patchFlag, dirs, cacheIndex, memo } = vnode;
-		if (patchFlag === -2) optimized = false;
+		if (patchFlag === -2 || dynamicChildren && dynamicChildren.hasOnce) optimized = false;
 		if (ref != null) {
 			const prevSub = setActiveSub();
 			setRef(ref, null, parentSuspense, vnode, true);
 			setActiveSub(prevSub);
 		}
-		if (cacheIndex != null) parentComponent.renderCache[cacheIndex] = void 0;
+		if (cacheIndex != null && (!vnode.ctx || vnode.ctx === parentComponent)) parentComponent.renderCache[cacheIndex] = void 0;
 		if (shapeFlag & 256) {
 			if (isVaporComponent(vnode.type)) getVaporInterface(parentComponent, vnode).deactivate(vnode, parentComponent.ctx.getStorageContainer(), parentSuspense);
 			else parentComponent.ctx.deactivate(vnode);
@@ -8641,6 +8662,7 @@ function baseCreateRenderer(options, createHydrationFns) {
 		}
 		if (type === Static) {
 			removeStaticNode(vnode);
+			if (transition && !transition.persisted && transition.afterLeave) transition.afterLeave();
 			return;
 		}
 		if (transition) performTransitionLeave(el, transition, () => hostRemove(el), !!(vnode.shapeFlag & 1));
@@ -8666,7 +8688,10 @@ function baseCreateRenderer(options, createHydrationFns) {
 		if (effect) {
 			effect.stop();
 			unmount(subTree, instance, parentSuspense, doRemove);
-		} else if (doRemove && subTree && instance.vnode.el) remove(subTree);
+		} else if (instance.vnode.el && subTree) {
+			subTree.transition = instance.vnode.transition;
+			unmount(subTree, instance, parentSuspense, doRemove);
+		}
 		if (um) queuePostRenderEffect(um, void 0, parentSuspense);
 		if (isCompatEnabled$1("INSTANCE_EVENT_HOOKS", instance)) queuePostRenderEffect(() => instance.emit("hook:destroyed"), void 0, parentSuspense);
 		queuePostRenderEffect(() => instance.isUnmounted = true, void 0, parentSuspense);
@@ -8873,7 +8898,7 @@ const Suspense = {
 	process(n1, n2, container, anchor, parentComponent, parentSuspense, namespace, slotScopeIds, optimized, rendererInternals) {
 		if (n1 == null) mountSuspense(n2, container, anchor, parentComponent, parentSuspense, namespace, slotScopeIds, optimized, rendererInternals);
 		else {
-			if (parentSuspense && parentSuspense.deps > 0 && !n1.suspense.isInFallback) {
+			if (parentSuspense && parentSuspense.deps > 0 && !n1.suspense.isInFallback && !parentSuspense.isHydrating) {
 				n2.suspense = n1.suspense;
 				n2.suspense.vnode = n2;
 				n2.el = n1.el;
@@ -8911,7 +8936,9 @@ function patchSuspense(n1, n2, container, anchor, parentComponent, namespace, sl
 	if (pendingBranch) {
 		suspense.pendingBranch = newBranch;
 		if (isSameVNodeType(pendingBranch, newBranch)) {
-			patch(pendingBranch, newBranch, suspense.hiddenContainer, null, parentComponent, suspense, namespace, slotScopeIds, optimized);
+			suspense.deps++;
+			patch(pendingBranch, newBranch, isHydrating ? container : suspense.hiddenContainer, null, parentComponent, suspense, namespace, slotScopeIds, optimized);
+			suspense.deps--;
 			if (suspense.deps <= 0) suspense.resolve();
 			else if (isInFallback) {
 				if (!isHydrating && !suspense.isFallbackMountPending) {
@@ -9047,6 +9074,7 @@ function createSuspenseBoundary(vnode, parentSuspense, parentComponent, containe
 			suspense.effects = [];
 			if (isSuspensible) {
 				if (parentSuspense && parentSuspense.pendingBranch && parentSuspenseId === parentSuspense.pendingId) {
+					parentSuspenseId = void 0;
 					parentSuspense.deps--;
 					if (parentSuspense.deps === 0 && !sync) parentSuspense.resolve();
 				}
@@ -9084,11 +9112,16 @@ function createSuspenseBoundary(vnode, parentSuspense, parentComponent, containe
 		registerDep(instance, onResolve) {
 			const isInPendingSuspense = !!suspense.pendingBranch;
 			if (isInPendingSuspense) suspense.deps++;
+			const hydratedEl = instance.vnode && instance.vnode.el;
 			instance.asyncDep.catch((err) => {
 				handleError(err, instance, 0);
 			}).then((asyncSetupResult) => {
 				if (instance.isUnmounted || suspense.isUnmounted || suspense.pendingId !== instance.suspenseId) return;
 				setCurrentInstance(null, void 0);
+				if (hydratedEl && !instance.scope.active) {
+					if (isInPendingSuspense && --suspense.deps === 0) suspense.resolve();
+					return;
+				}
 				instance.asyncResolved = true;
 				onResolve(asyncSetupResult);
 				if (isInPendingSuspense && --suspense.deps === 0) suspense.resolve();
@@ -9444,7 +9477,8 @@ function cloneVNode(vnode, extraProps, mergeRef = false, cloneTransition = false
 		vs: cloneVaporSlotMeta(vnode),
 		vb: vnode.vb,
 		ibu: vnode.ibu,
-		iu: vnode.iu
+		iu: vnode.iu,
+		cacheIndex: vnode.cacheIndex
 	};
 	if (transition && cloneTransition) setTransitionHooks(cloned, transition.clone(cloned));
 	defineLegacyVNodeProperties(cloned);
@@ -10160,7 +10194,7 @@ function isMemoSame(cached, memo) {
 }
 //#endregion
 //#region packages/runtime-core/src/index.ts
-const version = "3.6.0-rc.7";
+const version = "3.6.0-rc.9";
 const warn = warn$1;
 /**
 * Runtime error messages. Only exposed in dev or esm builds.