From f2789d9f845469ac28cdefa562a524dbc89fcb76 Mon Sep 17 00:00:00 2001 From: Johnson Chu Date: Wed, 10 Apr 2024 15:49:52 +0900 Subject: [PATCH] fix(tsc): remove exit early condition close #4231 --- packages/tsc/index.ts | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/packages/tsc/index.ts b/packages/tsc/index.ts index c6e5357538..21c98d8253 100644 --- a/packages/tsc/index.ts +++ b/packages/tsc/index.ts @@ -22,14 +22,7 @@ export function run() { ) { const writeFile = options.host!.writeFile.bind(options.host); options.host!.writeFile = (fileName, contents, ...args) => { - if ( - fileName.endsWith('.d.ts') - && vueLanguagePlugin - .getCanonicalFileName(fileName.replace(windowsPathReg, '/')) - .slice(0, -5) === vueLanguagePlugin.pluginContext.globalTypesHolder - ) { - contents = removeEmitGlobalTypes(contents); - } + contents = removeEmitGlobalTypes(contents); return writeFile(fileName, contents, ...args); }; const vueLanguagePlugin = vue.createVueLanguagePlugin( @@ -66,6 +59,8 @@ export function run() { } } +const removeEmitGlobalTypesRegexp = /[^\n]*__VLS_globalTypesStart[\w\W]*__VLS_globalTypesEnd[^\n]*\n/g; + export function removeEmitGlobalTypes(dts: string) { - return dts.replace(/[^\n]*__VLS_globalTypesStart[\w\W]*__VLS_globalTypesEnd[^\n]*\n/, ''); + return dts.replace(removeEmitGlobalTypesRegexp, ''); }