From: Evan You <yyx990803@gmail.com>
Date: Fri, 26 Jun 2020 14:07:07 +0000 (-0400)
Subject: chore: fix types
X-Git-Tag: v3.0.0-beta.16~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5453e791ae15f8a6b1f04908a3dcb220d09cccd5;p=thirdparty%2Fvuejs%2Fcore.git

chore: fix types
---

diff --git a/packages/runtime-core/src/helpers/resolveAssets.ts b/packages/runtime-core/src/helpers/resolveAssets.ts
index 268de161c3..c0e38772f7 100644
--- a/packages/runtime-core/src/helpers/resolveAssets.ts
+++ b/packages/runtime-core/src/helpers/resolveAssets.ts
@@ -1,12 +1,7 @@
 import { currentRenderingInstance } from '../componentRenderUtils'
-import {
-  currentInstance,
-  Component,
-  FunctionalComponent,
-  ComponentOptions
-} from '../component'
+import { currentInstance, Component, FunctionalComponent } from '../component'
 import { Directive } from '../directives'
-import { camelize, capitalize, isString, isObject } from '@vue/shared'
+import { camelize, capitalize, isString } from '@vue/shared'
 import { warn } from '../warning'
 
 const COMPONENTS = 'components'
diff --git a/packages/runtime-core/src/profiling.ts b/packages/runtime-core/src/profiling.ts
index 6dbc8c2962..04954d5286 100644
--- a/packages/runtime-core/src/profiling.ts
+++ b/packages/runtime-core/src/profiling.ts
@@ -17,7 +17,11 @@ export function endMeasure(instance: ComponentInternalInstance, type: string) {
     const startTag = `vue-${type}-${instance.uid}`
     const endTag = startTag + `:end`
     perf.mark(endTag)
-    perf.measure(`<${formatComponentName(instance)}> ${type}`, startTag, endTag)
+    perf.measure(
+      `<${formatComponentName(instance, instance.type)}> ${type}`,
+      startTag,
+      endTag
+    )
     perf.clearMarks(startTag)
     perf.clearMarks(endTag)
   }