remove fix, leave vue2 tests

rchl · Jul 13, 2023 · aa38535 · aa38535
1 parent 2258f65
commit aa38535
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/packages/vue-language-core/src/utils/directorySharedTypes.ts b/packages/vue-language-core/src/utils/directorySharedTypes.ts
@@ -1,5 +1,5 @@
 import { VueCompilerOptions } from '../types';
-import { getDefaultAllowedProps, getSlotsPropertyName } from './shared';
+import { getSlotsPropertyName } from './shared';
 
 export const baseName = '__VLS_types.d.ts';
 
@@ -87,7 +87,7 @@ type __VLS_EmitEvent<F, E> =
 	: unknown | '[Type Warning] Volar could not infer $emit event more than 4 overloads without DefineComponent. see https://github.com/vuejs/language-tools/issues/60';
 declare function __VLS_asFunctionalComponent<T, K = T extends new (...args: any) => any ? InstanceType<T> : unknown>(t: T, instance?: K):
 	T extends new (...args: any) => any
-	? (props: (K extends { $props: infer Props } ? Props : any)${getDefaultAllowedProps(vueCompilerOptions.strictTemplates, vueCompilerOptions.target)}, ctx?: {
+	? (props: (K extends { $props: infer Props } ? Props : any)${vueCompilerOptions.strictTemplates ? '' : ' & Record<string, unknown>'}, ctx?: {
 		attrs?: any,
 		slots?: K extends { ${getSlotsPropertyName(vueCompilerOptions.target)}: infer Slots } ? Slots : any,
 		emit?: K extends { $emit: infer Emit } ? Emit : any

diff --git a/packages/vue-language-core/src/utils/shared.ts b/packages/vue-language-core/src/utils/shared.ts
@@ -1,11 +1,3 @@
 export function getSlotsPropertyName(vueVersion: number) {
 	return vueVersion < 3 ? '$scopedSlots' : '$slots';
 }
-
-export function getDefaultAllowedProps(strictTemplates: boolean, vueVersion: number) {
-	if (!strictTemplates) {
-		return ' & Record<string, unknown>';
-	}
-
-	return vueVersion < 3 ? ' & JSX.IntrinsicAttributes' : '';
-}