From d7ea9174d9d40779dd2f04a7ad0030dde8995794 Mon Sep 17 00:00:00 2001 From: ygj6 Date: Sat, 6 Nov 2021 17:08:38 +0800 Subject: [PATCH] fix(hmr): Use resolveTemplateUsageCheckString in vite/plugin-vue. --- packages/compiler-sfc/src/compileScript.ts | 11 +++-------- packages/compiler-sfc/src/index.ts | 2 +- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/packages/compiler-sfc/src/compileScript.ts b/packages/compiler-sfc/src/compileScript.ts index dcaf3848caa..af519b95034 100644 --- a/packages/compiler-sfc/src/compileScript.ts +++ b/packages/compiler-sfc/src/compileScript.ts @@ -694,9 +694,7 @@ export function compileScript( } }` } else if (type.indexOf('Boolean') > -1) { // production: if boolean exists, should keep the type. - return `${key}: { type: ${toRuntimeTypeString( - type - )}${ + return `${key}: { type: ${toRuntimeTypeString(type)}${ defaultString ? `, ${defaultString}` : `` } }` } else { @@ -1631,10 +1629,7 @@ function extractRuntimeProps( if (m.type === 'TSMethodSignature') { type = ['Function'] } else if (m.typeAnnotation) { - type = inferRuntimeType( - m.typeAnnotation.typeAnnotation, - declaredTypes - ) + type = inferRuntimeType(m.typeAnnotation.typeAnnotation, declaredTypes) } props[m.key.name] = { key: m.key.name, @@ -1961,7 +1956,7 @@ function getObjectOrArrayExpressionKeys(value: Node): string[] { const templateUsageCheckCache = createCache() -function resolveTemplateUsageCheckString(sfc: SFCDescriptor) { +export function resolveTemplateUsageCheckString(sfc: SFCDescriptor) { const { content, ast } = sfc.template! const cached = templateUsageCheckCache.get(content) if (cached) { diff --git a/packages/compiler-sfc/src/index.ts b/packages/compiler-sfc/src/index.ts index 1c4bb14ee6f..fc835b66a37 100644 --- a/packages/compiler-sfc/src/index.ts +++ b/packages/compiler-sfc/src/index.ts @@ -2,7 +2,7 @@ export { parse } from './parse' export { compileTemplate } from './compileTemplate' export { compileStyle, compileStyleAsync } from './compileStyle' -export { compileScript } from './compileScript' +export { compileScript, resolveTemplateUsageCheckString } from './compileScript' export { rewriteDefault } from './rewriteDefault' export { shouldTransform as shouldTransformRef,