Merge branch 'master' into typed-slots-improves

vuejs · Mar 26, 2023 · 7cd49ab · 7cd49ab
2 parents 6c61e99 + f1a2e63
commit 7cd49ab
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/packages/vue-language-core/src/generators/script.ts b/packages/vue-language-core/src/generators/script.ts
@@ -451,7 +451,7 @@ export function generate(
 			writeTemplate();
 
 			if (generateFunctionType) {
-				codeGen.push(`return {} as Omit<JSX.Element, 'props' | 'children'> & Omit<InstanceType<typeof __VLS_publicComponent>, '$slots' | '$emit'>`);
+				codeGen.push(`return {} as Omit<import('./__VLS_types.js').Element, 'props' | 'children'> & Omit<InstanceType<typeof __VLS_publicComponent>, '$slots' | '$emit'>`);
 				codeGen.push(` & {\n`);
 				if (scriptSetupRanges.propsTypeArg) {
 					codeGen.push(`props: typeof __VLS_props,\n`);

diff --git a/packages/vue-language-core/src/generators/template.ts b/packages/vue-language-core/src/generators/template.ts
@@ -531,7 +531,7 @@ export function generate(
 			if (_isIntrinsicElement) {
 
 				for (const offset of tagOffsets) {
-					codeGen.push(`({} as JSX.IntrinsicElements)`);
+					codeGen.push(`({} as import('./__VLS_types.js').IntrinsicElements)`);
 					writePropertyAccess(
 						node.tag,
 						offset,
@@ -543,7 +543,7 @@ export function generate(
 					codeGen.push(`;\n`);
 				}
 
-				codeGen.push(`(__VLS_any as JSX.IntrinsicElements)[`);
+				codeGen.push(`(__VLS_any as import('./__VLS_types.js').IntrinsicElements)[`);
 				writeCodeWithQuotes(
 					node.tag,
 					tagOffsets[0],
@@ -699,7 +699,7 @@ export function generate(
 
 				codeGen.push(`type ${varInstanceProps} = `);
 				if (!varComponentInstance) {
-					codeGen.push(`JSX.IntrinsicElements['${node.tag}'];\n`);
+					codeGen.push(`import('./__VLS_types.js').IntrinsicElements['${node.tag}'];\n`);
 				}
 				else {
 					codeGen.push(`import('./__VLS_types.js').InstanceProps<typeof ${varComponentInstance}, ${componentVar ? 'typeof __VLS_templateComponents.' + componentVar : '{}'}>;\n`);;

diff --git a/packages/vue-language-core/src/utils/localTypes.ts b/packages/vue-language-core/src/utils/localTypes.ts
@@ -19,6 +19,10 @@ import type {
 	ObjectDirective,
 	FunctionDirective,
 } from '${libName}';
+${vueCompilerOptions.target >= 3.3 ? `import { JSX } from 'vue/jsx-runtime';` : ''}
+
+export type IntrinsicElements = JSX.IntrinsicElements;
+export type Element = JSX.Element;
 
 type IsAny<T> = boolean extends (T extends never ? true : false) ? true : false;
 export type PickNotAny<A, B> = IsAny<A> extends true ? B : A;