@vue/runtime-core 3.3.0-beta.3 → 3.3.0-beta.5

package/dist/runtime-core.cjs.js

@@ -1135,7 +1135,7 @@ function mountSuspense(vnode, container, anchor, parentComponent, parentSuspense
     );
     setActiveBranch(suspense, vnode.ssFallback);
   } else {
-    suspense.resolve();
+    suspense.resolve(false, true);
   }
 }
 function patchSuspense(n1, n2, container, anchor, parentComponent, isSVG, slotScopeIds, optimized, { p: patch, um: unmount, o: { createElement } }) {
@@ -1294,7 +1294,6 @@ function patchSuspense(n1, n2, container, anchor, parentComponent, isSVG, slotSc
 }
 let hasWarned = false;
 function createSuspenseBoundary(vnode, parentSuspense, parentComponent, container, hiddenContainer, anchor, isSVG, slotScopeIds, optimized, rendererInternals, isHydrating = false) {
-  var _a;
   if (!hasWarned) {
     hasWarned = true;
     console[console.info ? "info" : "log"](
@@ -1309,10 +1308,10 @@ function createSuspenseBoundary(vnode, parentSuspense, parentComponent, containe
     o: { parentNode, remove }
   } = rendererInternals;
   let parentSuspenseId;
-  const isSuspensible = ((_a = vnode.props) == null ? void 0 : _a.suspensible) != null && vnode.props.suspensible !== false;
+  const isSuspensible = isVNodeSuspensible(vnode);
   if (isSuspensible) {
     if (parentSuspense == null ? void 0 : parentSuspense.pendingBranch) {
-      parentSuspenseId = parentSuspense == null ? void 0 : parentSuspense.pendingId;
+      parentSuspenseId = parentSuspense.pendingId;
       parentSuspense.deps++;
     }
   }
@@ -1337,7 +1336,7 @@ function createSuspenseBoundary(vnode, parentSuspense, parentComponent, containe
     isHydrating,
     isUnmounted: false,
     effects: [],
-    resolve(resume = false) {
+    resolve(resume = false, sync = false) {
       {
         if (!resume && !suspense.pendingBranch) {
           throw new Error(
@@ -1399,7 +1398,7 @@ function createSuspenseBoundary(vnode, parentSuspense, parentComponent, containe
       if (isSuspensible) {
         if (parentSuspense && parentSuspense.pendingBranch && parentSuspenseId === parentSuspense.pendingId) {
           parentSuspense.deps--;
-          if (parentSuspense.deps === 0) {
+          if (parentSuspense.deps === 0 && !sync) {
             parentSuspense.resolve();
           }
         }
@@ -1609,6 +1608,10 @@ function setActiveBranch(suspense, branch) {
     updateHOCHostEl(parentComponent, el);
   }
 }
+function isVNodeSuspensible(vnode) {
+  var _a;
+  return ((_a = vnode.props) == null ? void 0 : _a.suspensible) != null && vnode.props.suspensible !== false;
+}
 
 function watchEffect(effect, options) {
   return doWatch(effect, null, options);
@@ -2240,7 +2243,11 @@ function getTransitionRawChildren(children, keepComment = false, parentKey) {
 }
 
 function defineComponent(options, extraOptions) {
-  return shared.isFunction(options) ? shared.extend({}, extraOptions, { setup: options, name: options.name }) : options;
+  return shared.isFunction(options) ? (
+    // #8326: extend call and options.name access are considered side-effects
+    // by Rollup, so we have to wrap it in a pure-annotated IIFE.
+    /* @__PURE__ */ (() => shared.extend({ name: options.name }, extraOptions, { setup: options }))()
+  ) : options;
 }
 
 const isAsyncWrapper = (i) => !!i.type.__asyncLoader;
@@ -6717,6 +6724,9 @@ const normalizeRef = ({
   ref_key,
   ref_for
 }) => {
+  if (typeof ref === "number") {
+    ref = "" + ref;
+  }
   return ref != null ? shared.isString(ref) || reactivity.isRef(ref) || shared.isFunction(ref) ? { i: currentRenderingInstance, r: ref, k: ref_key, f: !!ref_for } : ref : null;
 };
 function createBaseVNode(type, props = null, children = null, patchFlag = 0, dynamicProps = null, shapeFlag = type === Fragment ? 0 : 1, isBlockNode = false, needFullChildrenNormalization = false) {
@@ -7654,7 +7664,7 @@ function isMemoSame(cached, memo) {
   return true;
 }
 
-const version = "3.3.0-beta.3";
+const version = "3.3.0-beta.5";
 const _ssrUtils = {
   createComponentInstance,
   setupComponent,

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

@@ -653,7 +653,7 @@ function mountSuspense(vnode, container, anchor, parentComponent, parentSuspense
     );
     setActiveBranch(suspense, vnode.ssFallback);
   } else {
-    suspense.resolve();
+    suspense.resolve(false, true);
   }
 }
 function patchSuspense(n1, n2, container, anchor, parentComponent, isSVG, slotScopeIds, optimized, { p: patch, um: unmount, o: { createElement } }) {
@@ -811,7 +811,6 @@ function patchSuspense(n1, n2, container, anchor, parentComponent, isSVG, slotSc
   }
 }
 function createSuspenseBoundary(vnode, parentSuspense, parentComponent, container, hiddenContainer, anchor, isSVG, slotScopeIds, optimized, rendererInternals, isHydrating = false) {
-  var _a;
   const {
     p: patch,
     m: move,
@@ -820,10 +819,10 @@ function createSuspenseBoundary(vnode, parentSuspense, parentComponent, containe
     o: { parentNode, remove }
   } = rendererInternals;
   let parentSuspenseId;
-  const isSuspensible = ((_a = vnode.props) == null ? void 0 : _a.suspensible) != null && vnode.props.suspensible !== false;
+  const isSuspensible = isVNodeSuspensible(vnode);
   if (isSuspensible) {
     if (parentSuspense == null ? void 0 : parentSuspense.pendingBranch) {
-      parentSuspenseId = parentSuspense == null ? void 0 : parentSuspense.pendingId;
+      parentSuspenseId = parentSuspense.pendingId;
       parentSuspense.deps++;
     }
   }
@@ -845,7 +844,7 @@ function createSuspenseBoundary(vnode, parentSuspense, parentComponent, containe
     isHydrating,
     isUnmounted: false,
     effects: [],
-    resolve(resume = false) {
+    resolve(resume = false, sync = false) {
       const {
         vnode: vnode2,
         activeBranch,
@@ -895,7 +894,7 @@ function createSuspenseBoundary(vnode, parentSuspense, parentComponent, containe
       if (isSuspensible) {
         if (parentSuspense && parentSuspense.pendingBranch && parentSuspenseId === parentSuspense.pendingId) {
           parentSuspense.deps--;
-          if (parentSuspense.deps === 0) {
+          if (parentSuspense.deps === 0 && !sync) {
             parentSuspense.resolve();
           }
         }
@@ -1096,6 +1095,10 @@ function setActiveBranch(suspense, branch) {
     updateHOCHostEl(parentComponent, el);
   }
 }
+function isVNodeSuspensible(vnode) {
+  var _a;
+  return ((_a = vnode.props) == null ? void 0 : _a.suspensible) != null && vnode.props.suspensible !== false;
+}
 
 function watchEffect(effect, options) {
   return doWatch(effect, null, options);
@@ -1680,7 +1683,11 @@ function getTransitionRawChildren(children, keepComment = false, parentKey) {
 }
 
 function defineComponent(options, extraOptions) {
-  return shared.isFunction(options) ? shared.extend({}, extraOptions, { setup: options, name: options.name }) : options;
+  return shared.isFunction(options) ? (
+    // #8326: extend call and options.name access are considered side-effects
+    // by Rollup, so we have to wrap it in a pure-annotated IIFE.
+    /* @__PURE__ */ (() => shared.extend({ name: options.name }, extraOptions, { setup: options }))()
+  ) : options;
 }
 
 const isAsyncWrapper = (i) => !!i.type.__asyncLoader;
@@ -5406,6 +5413,9 @@ const normalizeRef = ({
   ref_key,
   ref_for
 }) => {
+  if (typeof ref === "number") {
+    ref = "" + ref;
+  }
   return ref != null ? shared.isString(ref) || reactivity.isRef(ref) || shared.isFunction(ref) ? { i: currentRenderingInstance, r: ref, k: ref_key, f: !!ref_for } : ref : null;
 };
 function createBaseVNode(type, props = null, children = null, patchFlag = 0, dynamicProps = null, shapeFlag = type === Fragment ? 0 : 1, isBlockNode = false, needFullChildrenNormalization = false) {
@@ -6005,7 +6015,7 @@ function isMemoSame(cached, memo) {
   return true;
 }
 
-const version = "3.3.0-beta.3";
+const version = "3.3.0-beta.5";
 const _ssrUtils = {
   createComponentInstance,
   setupComponent,

package/dist/runtime-core.d.ts

@@ -14,7 +14,8 @@ declare const SlotSymbol: unique symbol;
 export type SlotsType<T extends Record<string, any> = Record<string, any>> = {
     [SlotSymbol]?: T;
 };
-type TypedSlots<S extends SlotsType, T = NonNullable<S[typeof SlotSymbol]>> = [keyof S] extends [never] ? Slots : Readonly<Prettify<{
+type StrictUnwrapSlotsType<S extends SlotsType, T = NonNullable<S[typeof SlotSymbol]>> = [keyof S] extends [never] ? Slots : Readonly<T>;
+type UnwrapSlotsType<S extends SlotsType, T = NonNullable<S[typeof SlotSymbol]>> = [keyof S] extends [never] ? Slots : Readonly<Prettify<{
     [K in keyof T]: NonNullable<T[K]> extends (...args: any[]) => any ? T[K] : Slot<T[K]>;
 }>>;
 type RawSlots = {
@@ -118,7 +119,7 @@ C extends ComputedOptions = {}, M extends MethodOptions = {}, E extends EmitsOpt
     $props: Prettify<MakeDefaultsOptional extends true ? Partial<Defaults> & Omit<P & PublicProps, keyof Defaults> : P & PublicProps>;
     $attrs: Data;
     $refs: Data;
-    $slots: TypedSlots<S>;
+    $slots: UnwrapSlotsType<S>;
     $root: ComponentPublicInstance | null;
     $parent: ComponentPublicInstance | null;
     $emit: EmitFn<E>;
@@ -169,6 +170,10 @@ declare const SuspenseImpl: {
 export declare const Suspense: {
     new (): {
         $props: VNodeProps & SuspenseProps;
+        $slots: {
+            default(): VNode[];
+            fallback(): VNode[];
+        };
     };
     __isSuspense: true;
 };
@@ -189,7 +194,7 @@ export interface SuspenseBoundary {
     isHydrating: boolean;
     isUnmounted: boolean;
     effects: Function[];
-    resolve(force?: boolean): void;
+    resolve(force?: boolean, sync?: boolean): void;
     fallback(fallbackVNode: VNode): void;
     move(container: RendererElement, anchor: RendererNode | null, type: MoveType): void;
     next(): RendererNode | null;
@@ -291,6 +296,9 @@ export interface KeepAliveProps {
 export declare const KeepAlive: {
     new (): {
         $props: VNodeProps & KeepAliveProps;
+        $slots: {
+            default(): VNode[];
+        };
     };
     __isKeepAlive: true;
 };
@@ -370,11 +378,36 @@ type InferPropType<T> = [T] extends [null] ? any : [T] extends [{
 }] ? Date : [T] extends [(infer U)[] | {
     type: (infer U)[];
 }] ? U extends DateConstructor ? Date | InferPropType<U> : InferPropType<U> : [T] extends [Prop<infer V, infer D>] ? unknown extends V ? IfAny<V, V, D> : V : T;
+/**
+ * Extract prop types from a runtime props options object.
+ * The extracted types are **internal** - i.e. the resolved props received by
+ * the component.
+ * - Boolean props are always present
+ * - Props with default values are always present
+ *
+ * To extract accepted props from the parent, use {@link ExtractPublicPropTypes}.
+ */
 export type ExtractPropTypes<O> = {
     [K in keyof Pick<O, RequiredKeys<O>>]: InferPropType<O[K]>;
 } & {
     [K in keyof Pick<O, OptionalKeys<O>>]?: InferPropType<O[K]>;
 };
+type PublicRequiredKeys<T> = {
+    [K in keyof T]: T[K] extends {
+        required: true;
+    } ? K : never;
+}[keyof T];
+type PublicOptionalKeys<T> = Exclude<keyof T, PublicRequiredKeys<T>>;
+/**
+ * Extract prop types from a runtime props options object.
+ * The extracted types are **public** - i.e. the expected props that can be
+ * passed to component.
+ */
+export type ExtractPublicPropTypes<O> = {
+    [K in keyof Pick<O, PublicRequiredKeys<O>>]: InferPropType<O[K]>;
+} & {
+    [K in keyof Pick<O, PublicOptionalKeys<O>>]?: InferPropType<O[K]>;
+};
 declare const enum BooleanFlags {
     shouldCast = 0,
     shouldCastTrue = 1
@@ -662,7 +695,7 @@ type OptionTypesType<P = {}, B = {}, D = {}, C extends ComputedOptions = {}, M e
 
 export interface InjectionKey<T> extends Symbol {
 }
-export declare function provide<T extends InjectionKey<any>>(key: T | string | number, value: T extends InjectionKey<infer V> ? V : any): void;
+export declare function provide<T, K = InjectionKey<T> | string | number>(key: K, value: K extends InjectionKey<infer V> ? V : T): void;
 export declare function inject<T>(key: InjectionKey<T> | string): T | undefined;
 export declare function inject<T>(key: InjectionKey<T> | string, defaultValue: T, treatDefaultAsFactory?: false): T;
 export declare function inject<T>(key: InjectionKey<T> | string, defaultValue: T | (() => T), treatDefaultAsFactory: true): T;
@@ -805,6 +838,9 @@ export declare const BaseTransitionPropsValidators: {
 };
 export declare const BaseTransition: new () => {
     $props: BaseTransitionProps<any>;
+    $slots: {
+        default(): VNode[];
+    };
 };
 export declare function resolveTransitionHooks(vnode: VNode, props: BaseTransitionProps<any>, state: TransitionState, instance: ComponentInternalInstance): TransitionHooks;
 export declare function setTransitionHooks(vnode: VNode, hooks: TransitionHooks): void;
@@ -832,6 +868,9 @@ declare function hydrateTeleport(node: Node, vnode: TeleportVNode, parentCompone
 export declare const Teleport: {
     new (): {
         $props: VNodeProps & TeleportProps;
+        $slots: {
+            default(): VNode[];
+        };
     };
     __isTeleport: true;
 };
@@ -1063,7 +1102,7 @@ export type Component<Props = any, RawBindings = any, D = any, C extends Compute
 type LifecycleHook<TFn = Function> = TFn[] | null;
 export type SetupContext<E = EmitsOptions, S extends SlotsType = {}> = E extends any ? {
     attrs: Data;
-    slots: TypedSlots<S>;
+    slots: UnwrapSlotsType<S>;
     emit: EmitFn<E>;
     expose: (exposed?: Record<string, any>) => void;
 } : never;
@@ -1322,7 +1361,7 @@ export declare function defineOptions<RawBindings = {}, D = {}, C extends Comput
     expose?: undefined;
     slots?: undefined;
 }): void;
-export declare function defineSlots<S extends Record<string, any> = Record<string, any>>(): TypedSlots<SlotsType<S>>;
+export declare function defineSlots<S extends Record<string, any> = Record<string, any>>(): StrictUnwrapSlotsType<SlotsType<S>>;
 /**
  * (**Experimental**) Vue `<script setup>` compiler macro for declaring a
  * two-way binding prop that can be consumed via `v-model` from the parent

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

@@ -1139,7 +1139,7 @@ function mountSuspense(vnode, container, anchor, parentComponent, parentSuspense
     );
     setActiveBranch(suspense, vnode.ssFallback);
   } else {
-    suspense.resolve();
+    suspense.resolve(false, true);
   }
 }
 function patchSuspense(n1, n2, container, anchor, parentComponent, isSVG, slotScopeIds, optimized, { p: patch, um: unmount, o: { createElement } }) {
@@ -1298,7 +1298,6 @@ function patchSuspense(n1, n2, container, anchor, parentComponent, isSVG, slotSc
 }
 let hasWarned = false;
 function createSuspenseBoundary(vnode, parentSuspense, parentComponent, container, hiddenContainer, anchor, isSVG, slotScopeIds, optimized, rendererInternals, isHydrating = false) {
-  var _a;
   if (process.env.NODE_ENV !== "production" && true && !hasWarned) {
     hasWarned = true;
     console[console.info ? "info" : "log"](
@@ -1313,10 +1312,10 @@ function createSuspenseBoundary(vnode, parentSuspense, parentComponent, containe
     o: { parentNode, remove }
   } = rendererInternals;
   let parentSuspenseId;
-  const isSuspensible = ((_a = vnode.props) == null ? void 0 : _a.suspensible) != null && vnode.props.suspensible !== false;
+  const isSuspensible = isVNodeSuspensible(vnode);
   if (isSuspensible) {
     if (parentSuspense == null ? void 0 : parentSuspense.pendingBranch) {
-      parentSuspenseId = parentSuspense == null ? void 0 : parentSuspense.pendingId;
+      parentSuspenseId = parentSuspense.pendingId;
       parentSuspense.deps++;
     }
   }
@@ -1341,7 +1340,7 @@ function createSuspenseBoundary(vnode, parentSuspense, parentComponent, containe
     isHydrating,
     isUnmounted: false,
     effects: [],
-    resolve(resume = false) {
+    resolve(resume = false, sync = false) {
       if (process.env.NODE_ENV !== "production") {
         if (!resume && !suspense.pendingBranch) {
           throw new Error(
@@ -1403,7 +1402,7 @@ function createSuspenseBoundary(vnode, parentSuspense, parentComponent, containe
       if (isSuspensible) {
         if (parentSuspense && parentSuspense.pendingBranch && parentSuspenseId === parentSuspense.pendingId) {
           parentSuspense.deps--;
-          if (parentSuspense.deps === 0) {
+          if (parentSuspense.deps === 0 && !sync) {
             parentSuspense.resolve();
           }
         }
@@ -1613,6 +1612,10 @@ function setActiveBranch(suspense, branch) {
     updateHOCHostEl(parentComponent, el);
   }
 }
+function isVNodeSuspensible(vnode) {
+  var _a;
+  return ((_a = vnode.props) == null ? void 0 : _a.suspensible) != null && vnode.props.suspensible !== false;
+}
 
 function watchEffect(effect, options) {
   return doWatch(effect, null, options);
@@ -2246,7 +2249,11 @@ function getTransitionRawChildren(children, keepComment = false, parentKey) {
 }
 
 function defineComponent(options, extraOptions) {
-  return isFunction(options) ? extend({}, extraOptions, { setup: options, name: options.name }) : options;
+  return isFunction(options) ? (
+    // #8326: extend call and options.name access are considered side-effects
+    // by Rollup, so we have to wrap it in a pure-annotated IIFE.
+    /* @__PURE__ */ (() => extend({ name: options.name }, extraOptions, { setup: options }))()
+  ) : options;
 }
 
 const isAsyncWrapper = (i) => !!i.type.__asyncLoader;
@@ -6761,6 +6768,9 @@ const normalizeRef = ({
   ref_key,
   ref_for
 }) => {
+  if (typeof ref === "number") {
+    ref = "" + ref;
+  }
   return ref != null ? isString(ref) || isRef(ref) || isFunction(ref) ? { i: currentRenderingInstance, r: ref, k: ref_key, f: !!ref_for } : ref : null;
 };
 function createBaseVNode(type, props = null, children = null, patchFlag = 0, dynamicProps = null, shapeFlag = type === Fragment ? 0 : 1, isBlockNode = false, needFullChildrenNormalization = false) {
@@ -7714,7 +7724,7 @@ function isMemoSame(cached, memo) {
   return true;
 }
 
-const version = "3.3.0-beta.3";
+const version = "3.3.0-beta.5";
 const _ssrUtils = {
   createComponentInstance,
   setupComponent,

package/package.json

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