fix(runtime-core): only set cache for object keys

vuejs · Jul 13, 2022 · d956a0d · d956a0d
1 parent 8dcb6c7
commit d956a0d
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/packages/runtime-core/src/componentEmits.ts b/packages/runtime-core/src/componentEmits.ts
@@ -226,7 +226,9 @@ export function normalizeEmitsOptions(
   }
 
   if (!raw && !hasExtends) {
-    cache.set(comp, null)
+    if (comp && typeof comp === 'object') {
+      cache.set(comp, null)
+    }
     return null
   }
 
@@ -236,7 +238,9 @@ export function normalizeEmitsOptions(
     extend(normalized, raw)
   }
 
-  cache.set(comp, normalized)
+  if (comp && typeof comp === 'object') {
+    cache.set(comp, normalized)
+  }
   return normalized
 }
 

diff --git a/packages/runtime-core/src/componentOptions.ts b/packages/runtime-core/src/componentOptions.ts
@@ -966,8 +966,9 @@ export function resolveMergedOptions(
     }
     mergeOptions(resolved, base, optionMergeStrategies)
   }
-
-  cache.set(base, resolved)
+  if (base && typeof base === 'object') {
+    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,9 @@ export function normalizePropsOptions(
   }
 
   if (!raw && !hasExtends) {
-    cache.set(comp, EMPTY_ARR as any)
+    if (comp && typeof comp === 'object') {
+      cache.set(comp, EMPTY_ARR as any)
+    }
     return EMPTY_ARR as any
   }
 
@@ -534,7 +536,9 @@ export function normalizePropsOptions(
   }
 
   const res: NormalizedPropsOptions = [normalized, needCastKeys]
-  cache.set(comp, res)
+  if (comp && typeof comp === 'object') {
+    cache.set(comp, res)
+  }
   return res
 }