chore: Merge branch 'master-upstream' into feat/typed_slots

# Conflicts:
#	packages/runtime-core/src/componentOptions.ts

packages/compiler-core/__tests__/transforms/vSlot.spec.ts

@@ -780,9 +780,7 @@ describe('compiler: transform component slots', () => {
     })
 
     test('<slot w/ nested component>', () => {
-      const { slots } = parseWithSlots(
-        `<Comp><Comp><slot/></Comp></Comp>`
-      )
+      const { slots } = parseWithSlots(`<Comp><Comp><slot/></Comp></Comp>`)
       expect(slots).toMatchObject(toMatch)
     })
   })

packages/compiler-sfc/src/cssVars.ts

@@ -12,7 +12,8 @@ import { PluginCreator } from 'postcss'
 import hash from 'hash-sum'
 
 export const CSS_VARS_HELPER = `useCssVars`
-export const cssVarRE = /\bv-bind\(\s*(?:'([^']+)'|"([^"]+)"|([^'"][^)]*))\s*\)/g
+export const cssVarRE =
+  /\bv-bind\(\s*(?:'([^']+)'|"([^"]+)"|([^'"][^)]*))\s*\)/g
 
 export function genCssVarsFromList(
   vars: string[],

packages/runtime-core/src/compat/componentFunctional.ts

@@ -13,7 +13,9 @@ const normalizedFunctionalComponentMap = new Map<
   FunctionalComponent
 >()
 
-export const legacySlotProxyHandlers: ProxyHandler<InternalSlots> = {
+export const legacySlotProxyHandlers: ProxyHandler<
+  InternalSlots<Record<string, null>>
+> = {
   get(target, key: string) {
     const slot = target[key]
     return slot && slot()

packages/runtime-core/src/componentOptions.ts

@@ -60,7 +60,15 @@ import {
 import { warn } from './warning'
 import { VNodeChild } from './vnode'
 import { callWithAsyncErrorHandling } from './errorHandling'
-import { UnionToIntersection } from './helpers/typeUtils'
+import { LooseRequired, UnionToIntersection } from './helpers/typeUtils'
+import { deepMergeData } from './compat/data'
+import { DeprecationTypes } from './compat/compatConfig'
+import {
+  CompatConfig,
+  isCompatEnabled,
+  softAssertCompatEnabled
+} from './compat/compatConfig'
+import { OptionMergeFunction } from './apiCreateApp'
 import { Slots } from './componentSlots'
 
 /**
@@ -115,9 +123,13 @@ export interface ComponentOptionsBase<
     ComponentCustomOptions {
   setup?: (
     this: void,
-    props: Props &
-      UnionToIntersection<ExtractOptionProp<Mixin>> &
-      UnionToIntersection<ExtractOptionProp<Extends>>,
+    props: Readonly<
+      LooseRequired<
+        Props &
+          UnionToIntersection<ExtractOptionProp<Mixin>> &
+          UnionToIntersection<ExtractOptionProp<Extends>>
+      >
+    >,
     ctx: SetupContext<E, Slots<S>>
   ) => Promise<RawBindings> | RawBindings | RenderFunction | void
   name?: string
@@ -136,6 +148,9 @@ export interface ComponentOptionsBase<
   expose?: string[]
   serverPrefetch?(): Promise<any>
 
+  // Runtime compiler only -----------------------------------------------------
+  compilerOptions?: RuntimeCompilerOptions
+
   slots?: S & ThisType<void>
 
   // Internal ------------------------------------------------------------------
@@ -211,7 +226,8 @@ export type ComponentOptionsWithoutProps<
   Extends extends ComponentOptionsMixin = ComponentOptionsMixin,
   E extends EmitsOptions = EmitsOptions,
   EE extends string = string,
-  S = any
+  S = any,
+  PE = Props & EmitsToProps<E>
 > = ComponentOptionsBase<
   PE,
   RawBindings,
@@ -228,7 +244,7 @@ export type ComponentOptionsWithoutProps<
   props?: undefined
 } & ThisType<
     CreateComponentPublicInstance<
-      {},
+      PE,
       RawBindings,
       D,
       C,
@@ -251,7 +267,7 @@ export type ComponentOptionsWithArrayProps<
   E extends EmitsOptions = EmitsOptions,
   EE extends string = string,
   S = any,
-  Props = Readonly<{ [key in PropNames]?: any }>
+  Props = Readonly<{ [key in PropNames]?: any }> & EmitsToProps<E>
 > = ComponentOptionsBase<
   Props,
   RawBindings,
@@ -291,7 +307,7 @@ export type ComponentOptionsWithObjectProps<
   E extends EmitsOptions = EmitsOptions,
   EE extends string = string,
   S = any,
-  Props = Readonly<ExtractPropTypes<PropsOptions>>,
+  Props = Readonly<ExtractPropTypes<PropsOptions>> & EmitsToProps<E>,
   Defaults = ExtractDefaultPropTypes<PropsOptions>
 > = ComponentOptionsBase<
   Props,

packages/runtime-core/src/componentSlots.ts

@@ -39,8 +39,8 @@ export type Slots<T = any> = RenderSlot &
   (unknown extends T
     ? Readonly<Partial<Record<string, Slot>>>
     : T extends Array<infer V>
-      ? Readonly<SlotArray<V>>
-      : Readonly<SlotsObject<T>>)
+    ? Readonly<SlotArray<V>>
+    : Readonly<SlotsObject<T>>)
 
 export type RenderSlot = {
   // manual render fn hint to skip forced children updates

packages/runtime-core/src/scheduler.ts

@@ -128,10 +128,7 @@ function queueCb(
   if (!isArray(cb)) {
     if (
       !activeQueue ||
-      !activeQueue.includes(
-        cb,
-        cb.allowRecurse ? index + 1 : index
-      )
+      !activeQueue.includes(cb, cb.allowRecurse ? index + 1 : index)
     ) {
       pendingQueue.push(cb)
     }

test-dts/index.d.ts

@@ -9,8 +9,8 @@ export function expectType<T>(value: T): void
 export function expectError<T>(value: T): void
 export function expectAssignable<T, T2 extends T = T>(value: T2): void
 
-export type IsUnion<T, U extends T = T> = (T extends any
-  ? (U extends T ? false : true)
-  : never) extends false
+export type IsUnion<T, U extends T = T> = (
+  T extends any ? (U extends T ? false : true) : never
+) extends false
   ? false
   : true