fix(component-meta): fix modules interoperability with `vue-component…

…-type-helper` close #3566
vuejs · Sep 19, 2023 · f33face · f33face
1 parent 323938b
commit f33face
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 8 deletions.
diff --git a/packages/vue-component-meta/src/index.ts b/packages/vue-component-meta/src/index.ts
@@ -1,7 +1,7 @@
 import * as vue from '@vue/language-core';
 import type * as ts from 'typescript/lib/tsserverlibrary';
 import * as path from 'typesafe-path/posix';
-import typeHelpersCode from 'vue-component-type-helpers';
+import { code as typeHelpersCode } from 'vue-component-type-helpers';
 import { createLanguageServiceHost, decorateLanguageService } from '@volar/typescript';
 
 import type {

diff --git a/packages/vue-component-meta/tests/index.spec.ts b/packages/vue-component-meta/tests/index.spec.ts
@@ -1,6 +1,6 @@
 import * as path from 'path';
 import { describe, expect, test } from 'vitest';
-import { createComponentMetaChecker, createComponentMetaCheckerByJsonConfig, MetaCheckerOptions, ComponentMetaChecker, TypeMeta } from '../src';
+import { createComponentMetaChecker, createComponentMetaCheckerByJsonConfig, MetaCheckerOptions, ComponentMetaChecker, TypeMeta } from '../out';
 
 const worker = (checker: ComponentMetaChecker, withTsconfig: boolean) => describe(`vue-component-meta ${withTsconfig ? 'with tsconfig' : 'without tsconfig'}`, () => {
 

diff --git a/packages/vue-component-type-helpers/index.d.ts b/packages/vue-component-type-helpers/index.d.ts
@@ -1,6 +1,6 @@
-declare const text: string;
+export declare const code: string;
 
-export default text;
+export default code;
 
 export type ComponentType<T> =
 	T extends new () => {} ? 1 :

diff --git a/packages/vue-component-type-helpers/index.js b/packages/vue-component-type-helpers/index.js
@@ -1,4 +1,4 @@
-exports.default = `
+const code = `
 export type ComponentType<T> =
 	T extends new () => {} ? 1 :
 	T extends (...args: any) => any ? 2 :
@@ -33,3 +33,6 @@ export type Vue2ComponentSlots<T> =
 	T extends (props: any, ctx: { slots: infer S; }, ...args: any) => any ? NonNullable<S> :
 	{};
 `.trim();
+
+exports.code = code;
+exports.default = code;
diff --git a/packages/vue-language-service/tests/utils/createTester.ts b/packages/vue-language-service/tests/utils/createTester.ts
@@ -3,7 +3,7 @@ import * as fs from 'fs';
 import * as path from 'path';
 import type * as ts from 'typescript/lib/tsserverlibrary';
 import { URI } from 'vscode-uri';
-import { resolveConfig } from '../../src';
+import { resolveConfig } from '../../out';
 
 const uriToFileName = (uri: string) => URI.parse(uri).fsPath.replace(/\\/g, '/');
 const fileNameToUri = (fileName: string) => URI.file(fileName).toString();

diff --git a/packages/vue-language-service/tests/utils/format.ts b/packages/vue-language-service/tests/utils/format.ts
@@ -1,6 +1,6 @@
 import { describe, expect, it } from 'vitest';
 import * as kit from '@volar/kit';
-import { resolveConfig } from '../../src';
+import { resolveConfig } from '../../out';
 
 const formatter = kit.createFormatter(resolveConfig({}));
 

diff --git a/packages/vue-tsc/tests/dts.spec.ts b/packages/vue-tsc/tests/dts.spec.ts
@@ -2,7 +2,7 @@ import * as path from 'path';
 import * as fs from 'fs';
 import * as ts from 'typescript';
 import { describe, expect, it } from 'vitest';
-import { createProgram } from '../src';
+import { createProgram } from '../out';
 
 const workspace = path.resolve(__dirname, '../../vue-test-workspace/vue-tsc-dts');
 const testFiles = readFilesRecursive(workspace);