wip: make tests pass again

yyx990803 · yyx990803 · commit f8e2361d8312 · 2021-04-08T16:33:53.000-04:00
diff --git a/packages/runtime-core/src/compat/compatConfig.ts b/packages/runtime-core/src/compat/compatConfig.ts
@@ -41,3 +41,13 @@ export function softAssertCompatEnabled(key: DeprecationTypes, ...args: any[]) {
   }
   return isCompatEnabled(key)
 }
+
+// disable features that conflict with v3 behavior
+if (__TEST__) {
+  configureCompat({
+    COMPONENT_ASYNC: { enabled: false },
+    COMPONENT_FUNCTIONAL: { enabled: false },
+    WATCH_ARRAY: { enabled: false },
+    INSTANCE_ATTRS_CLASS_STYLE: { enabled: false }
+  })
+}
diff --git a/packages/runtime-core/src/compat/component.ts b/packages/runtime-core/src/compat/component.ts
@@ -1,4 +1,4 @@
-import { isArray, isFunction, isObject, isPromise } from '@vue/shared/src'
+import { isArray, isFunction, isObject, isPromise } from '@vue/shared'
 import { defineAsyncComponent } from '../apiAsyncComponent'
 import { Component, ComponentOptions, FunctionalComponent } from '../component'
 import { isVNode } from '../vnode'
diff --git a/packages/runtime-core/src/componentEmits.ts b/packages/runtime-core/src/componentEmits.ts
@@ -57,7 +57,7 @@ export function emit(
       propsOptions: [propsOptions]
     } = instance
     if (emitsOptions) {
-      if (!(event in emitsOptions)) {
+      if (!(event in emitsOptions) && !event.startsWith('hook:')) {
         if (!propsOptions || !(toHandlerKey(event) in propsOptions)) {
           warn(
             `Component emitted event "${event}" but it is neither declared in ` +
diff --git a/packages/runtime-dom/src/directives/vOn.ts b/packages/runtime-dom/src/directives/vOn.ts
@@ -60,8 +60,11 @@ export const withKeys = (fn: Function, modifiers: string[]) => {
   let globalKeyCodes: LegacyConfig['keyCodes']
   if (__COMPAT__) {
     if (compatUtils.isCompatEnabled(DeprecationTypes.CONFIG_KEY_CODES)) {
-      globalKeyCodes = ((getCurrentInstance()!.appContext
-        .config as any) as LegacyConfig).keyCodes
+      const instance = getCurrentInstance()
+      if (instance) {
+        globalKeyCodes = ((instance.appContext.config as any) as LegacyConfig)
+          .keyCodes
+      }
     }
     if (__DEV__ && modifiers.some(m => /^\d+$/.test(m))) {
       compatUtils.warnDeprecation(DeprecationTypes.V_ON_KEYCODE_MODIFIER)

Original file line number	Diff line number	Diff line change
`@@ -41,3 +41,13 @@ export function softAssertCompatEnabled(key: DeprecationTypes, ...args: any[]) {`
`41`	`41`	`}`
`42`	`42`	`return isCompatEnabled(key)`
`43`	`43`	`}`
	`44`	`+`
	`45`	`+// disable features that conflict with v3 behavior`
	`46`	`+if (__TEST__) {`
	`47`	`+ configureCompat({`
	`48`	`+ COMPONENT_ASYNC: { enabled: false },`
	`49`	`+ COMPONENT_FUNCTIONAL: { enabled: false },`
	`50`	`+ WATCH_ARRAY: { enabled: false },`
	`51`	`+ INSTANCE_ATTRS_CLASS_STYLE: { enabled: false }`
	`52`	`+ })`
	`53`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { isArray, isFunction, isObject, isPromise } from '@vue/shared/src'`
	`1`	`+import { isArray, isFunction, isObject, isPromise } from '@vue/shared'`
`2`	`2`	`import { defineAsyncComponent } from '../apiAsyncComponent'`
`3`	`3`	`import { Component, ComponentOptions, FunctionalComponent } from '../component'`
`4`	`4`	`import { isVNode } from '../vnode'`