diff --git a/packages/vue-code-gen/src/generators/template.ts b/packages/vue-code-gen/src/generators/template.ts index 3f74329c9..be3df0b35 100644 --- a/packages/vue-code-gen/src/generators/template.ts +++ b/packages/vue-code-gen/src/generators/template.ts @@ -498,13 +498,6 @@ export function generate( } tsCodeGen.addText(`) {\n`); - // fix https://github.com/johnsoncodehk/volar/issues/1284 - tsCodeGen.addText(`declare const __VLS_ctx: typeof __VLS_ctxBase & {\n`); - for (const localVar in localVars) { - tsCodeGen.addText(`${localVar}: typeof ${localVar},\n`); - } - tsCodeGen.addText(`};\n`); - for (const childNode of node.children) { visitNode(childNode, parentEl); } @@ -603,14 +596,6 @@ export function generate( for (const varName of slotBlockVars) localVars[varName] = (localVars[varName] ?? 0) + 1; - - if (slotBlockVars.length) { - tsCodeGen.addText(`declare const __VLS_ctx: typeof __VLS_ctxBase & {\n`); - for (const localVar of slotBlockVars) { - tsCodeGen.addText(`${localVar}: typeof ${localVar},\n`); - } - tsCodeGen.addText(`};\n`); - } } writeDirectives(node); writeElReferences(node); // diff --git a/packages/vue-typescript/src/use/useSfcTemplateScript.ts b/packages/vue-typescript/src/use/useSfcTemplateScript.ts index 44e624d95..95d68965e 100644 --- a/packages/vue-typescript/src/use/useSfcTemplateScript.ts +++ b/packages/vue-typescript/src/use/useSfcTemplateScript.ts @@ -99,7 +99,7 @@ export function useSfcTemplateScript( writeImportTypes(); - codeGen.addText(`declare const __VLS_ctxBase: InstanceType & {\n`); + codeGen.addText(`declare var __VLS_ctx: InstanceType & {\n`); /* CSS Module */ const cssModuleMappingsArr: ReturnType[] = []; for (const moduleName in cssModuleClasses.value) { @@ -109,16 +109,15 @@ export function useSfcTemplateScript( codeGen.addText('};\n'); } codeGen.addText(`};\n`); - codeGen.addText(`declare const __VLS_ctx: typeof __VLS_ctxBase;\n`); - codeGen.addText(`declare const __VLS_vmUnwrap: typeof __VLS_options & { components: { } };\n`); + codeGen.addText(`declare var __VLS_vmUnwrap: typeof __VLS_options & { components: { } };\n`); /* Components */ codeGen.addText('/* Components */\n'); - codeGen.addText('declare const __VLS_otherComponents: NonNullable & __VLS_types.GlobalComponents & typeof __VLS_vmUnwrap.components & __VLS_types.PickComponents;\n'); - codeGen.addText('declare const __VLS_ownComponent: __VLS_types.SelfComponent;\n'); - codeGen.addText('declare const __VLS_allComponents: typeof __VLS_otherComponents & Omit;\n'); - codeGen.addText('declare const __VLS_rawComponents: __VLS_types.ConvertInvalidComponents & JSX.IntrinsicElements;\n'); // sort by priority + codeGen.addText('declare var __VLS_otherComponents: NonNullable & __VLS_types.GlobalComponents & typeof __VLS_vmUnwrap.components & __VLS_types.PickComponents;\n'); + codeGen.addText('declare var __VLS_ownComponent: __VLS_types.SelfComponent;\n'); + codeGen.addText('declare var __VLS_allComponents: typeof __VLS_otherComponents & Omit;\n'); + codeGen.addText('declare var __VLS_rawComponents: __VLS_types.ConvertInvalidComponents & JSX.IntrinsicElements;\n'); // sort by priority codeGen.addText(`__VLS_allComponents.${SearchTexts.Components};\n`); codeGen.addText(`({} as __VLS_types.GlobalAttrs).${SearchTexts.GlobalAttrs};\n`); @@ -128,7 +127,7 @@ export function useSfcTemplateScript( codeGen.addText('type __VLS_StyleScopedClasses = {\n'); const cssScopedMappings = writeCssClassProperties(cssScopedClasses.value, true, 'boolean', true); codeGen.addText('};\n'); - codeGen.addText('declare const __VLS_styleScopedClasses: __VLS_StyleScopedClasses | keyof __VLS_StyleScopedClasses | (keyof __VLS_StyleScopedClasses)[];\n'); + codeGen.addText('declare var __VLS_styleScopedClasses: __VLS_StyleScopedClasses | keyof __VLS_StyleScopedClasses | (keyof __VLS_StyleScopedClasses)[];\n'); codeGen.addText(`/* CSS variable injection */\n`); writeCssVars();