wip: root mount api compat

2021-04-05 11:54:35 -04:00
parent 24850a99c6
commit e2d6ff845b
7 changed files with 228 additions and 30 deletions
--- a/packages/runtime-core/src/component.ts
+++ b/packages/runtime-core/src/component.ts
@@ -674,9 +674,10 @@ export function registerRuntimeCompiler(_compile: any) {
  compile = _compile
 }

-function finishComponentSetup(
+export function finishComponentSetup(
  instance: ComponentInternalInstance,
-  isSSR: boolean
+  isSSR: boolean,
+  skipOptions?: boolean
 ) {
  const Component = instance.type as ComponentOptions

@@ -719,7 +720,7 @@ function finishComponentSetup(
  }

  // support for 2.x options
-  if (__FEATURE_OPTIONS_API__) {
+  if (__FEATURE_OPTIONS_API__ && !(__COMPAT__ && skipOptions)) {
    currentInstance = instance
    pauseTracking()
    applyOptions(instance, Component)