From: Evan You <yyx990803@gmail.com>
Date: Sat, 14 Nov 2020 17:50:32 +0000 (-0500)
Subject: chore: Merge branch 'feat/expose' into script-setup-2
X-Git-Tag: v3.0.3~50^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=468e0d95cf629cd38f067644da1ec0edb760ffa5;p=thirdparty%2Fvuejs%2Fcore.git

chore: Merge branch 'feat/expose' into script-setup-2
---

468e0d95cf629cd38f067644da1ec0edb760ffa5
diff --cc packages/runtime-core/src/component.ts
index 8a7bd69fe4,af4c6b2f81..61949c4c5e
--- a/packages/runtime-core/src/component.ts
+++ b/packages/runtime-core/src/component.ts
@@@ -105,7 -105,7 +105,7 @@@ export interface ComponentInternalOptio
  export interface FunctionalComponent<P = {}, E extends EmitsOptions = {}>
    extends ComponentInternalOptions {
    // use of any here is intentional so it can be a valid JSX Element constructor
-   (props: P, ctx: SetupContext<E, P>): any
 -  (props: P, ctx: Omit<SetupContext<E>, 'expose'>): any
++  (props: P, ctx: Omit<SetupContext<E, P>, 'expose'>): any
    props?: ComponentPropsOptions<P>
    emits?: E | (keyof E)[]
    inheritAttrs?: boolean
@@@ -751,10 -760,10 +764,11 @@@ function createSetupContext(instance: C
      })
    } else {
      return {
 +      props: instance.props,
        attrs: instance.attrs,
        slots: instance.slots,
-       emit: instance.emit
+       emit: instance.emit,
+       expose
      }
    }
  }