refactor: use isObject

vuejs · Aug 10, 2022 · c1c606e · c1c606e
1 parent 592361b
commit c1c606e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/packages/runtime-core/src/componentEmits.ts b/packages/runtime-core/src/componentEmits.ts
@@ -7,6 +7,7 @@ import {
   hyphenate,
   isArray,
   isFunction,
+  isObject,
   isOn,
   toNumber,
   UnionToIntersection
@@ -226,7 +227,7 @@ export function normalizeEmitsOptions(
   }
 
   if (!raw && !hasExtends) {
-    if (comp && typeof comp === 'object') {
+    if (isObject(comp)) {
       cache.set(comp, null)
     }
     return null
@@ -238,7 +239,7 @@ export function normalizeEmitsOptions(
     extend(normalized, raw)
   }
 
-  if (comp && typeof comp === 'object') {
+  if (isObject(comp)) {
     cache.set(comp, normalized)
   }
   return normalized

diff --git a/packages/runtime-core/src/componentOptions.ts b/packages/runtime-core/src/componentOptions.ts
@@ -966,7 +966,7 @@ export function resolveMergedOptions(
     }
     mergeOptions(resolved, base, optionMergeStrategies)
   }
-  if (base && typeof base === 'object') {
+  if (isObject(base)) {
     cache.set(base, resolved)
   }
   return resolved

diff --git a/packages/runtime-core/src/componentProps.ts b/packages/runtime-core/src/componentProps.ts
@@ -494,7 +494,7 @@ export function normalizePropsOptions(
   }
 
   if (!raw && !hasExtends) {
-    if (comp && typeof comp === 'object') {
+    if (isObject(comp)) {
       cache.set(comp, EMPTY_ARR as any)
     }
     return EMPTY_ARR as any
@@ -536,7 +536,7 @@ export function normalizePropsOptions(
   }
 
   const res: NormalizedPropsOptions = [normalized, needCastKeys]
-  if (comp && typeof comp === 'object') {
+  if (isObject(comp)) {
     cache.set(comp, res)
   }
   return res