fix: write globalTypes into dist for correct export (#4740)

vuejs · Aug 29, 2024 · 194e77c · 194e77c
1 parent ecaa9f9
commit 194e77c
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/packages/language-core/lib/codegen/script/index.ts b/packages/language-core/lib/codegen/script/index.ts
@@ -51,7 +51,7 @@ export interface ScriptCodegenOptions {
 export function* generateScript(options: ScriptCodegenOptions): Generator<Code, ScriptCodegenContext> {
 	const ctx = createScriptCodegenContext(options);
 
-	yield `/// <reference types="${options.vueCompilerOptions.lib}/__globalTypes_${options.vueCompilerOptions.target}_${options.vueCompilerOptions.strictTemplates}" />${newLine}`;
+	yield `/// <reference types="${options.vueCompilerOptions.lib}/dist/__globalTypes_${options.vueCompilerOptions.target}_${options.vueCompilerOptions.strictTemplates}.d.ts" />${newLine}`;
 
 	if (options.sfc.script?.src) {
 		yield* generateSrc(options.sfc.script, options.sfc.script.src);

diff --git a/packages/tsc/index.ts b/packages/tsc/index.ts
@@ -27,7 +27,7 @@ export function run(tscPath = require.resolve('typescript/lib/tsc')) {
 						: options.host?.getCurrentDirectory() ?? ts.sys.getCurrentDirectory();
 					const libDir = require.resolve(`${vueOptions.lib}/package.json`, { paths: [rootDir] })
 						.slice(0, -'package.json'.length);
-					const globalTypesPath = `${libDir}__globalTypes_${vueOptions.target}_${vueOptions.strictTemplates}.d.ts`;
+					const globalTypesPath = `${libDir}dist/__globalTypes_${vueOptions.target}_${vueOptions.strictTemplates}.d.ts`;
 					const globalTypesContents = vue.generateGlobalTypes(vueOptions.lib, vueOptions.target, vueOptions.strictTemplates);
 					ts.sys.writeFile(globalTypesPath, globalTypesContents);
 				} catch { }

diff --git a/packages/tsc/tests/dts.spec.ts b/packages/tsc/tests/dts.spec.ts
@@ -37,7 +37,7 @@ describe('vue-tsc-dts', () => {
 				: options.host?.getCurrentDirectory() ?? ts.sys.getCurrentDirectory();
 			const libDir = require.resolve(`${vueOptions.lib}/package.json`, { paths: [rootDir] })
 				.slice(0, -'package.json'.length);
-			const globalTypesPath = `${libDir}__globalTypes_${vueOptions.target}_${vueOptions.strictTemplates}.d.ts`;
+			const globalTypesPath = `${libDir}dist/__globalTypes_${vueOptions.target}_${vueOptions.strictTemplates}.d.ts`;
 			const globalTypesContents = vue.generateGlobalTypes(vueOptions.lib, vueOptions.target, vueOptions.strictTemplates);
 			ts.sys.writeFile(globalTypesPath, globalTypesContents);
 		} catch { }

diff --git a/packages/typescript-plugin/index.ts b/packages/typescript-plugin/index.ts
@@ -63,7 +63,7 @@ const plugin: ts.server.PluginModuleFactory = mods => {
 				try {
 					const libDir = require.resolve(`${options.lib}/package.json`, { paths: [proj.getCurrentDirectory()] })
 						.slice(0, -'package.json'.length);
-					const globalTypesPath = `${libDir}__globalTypes_${options.target}_${options.strictTemplates}.d.ts`;
+					const globalTypesPath = `${libDir}dist/__globalTypes_${options.target}_${options.strictTemplates}.d.ts`;
 					const globalTypesContents = vue.generateGlobalTypes(options.lib, options.target, options.strictTemplates);
 					proj.writeFile(globalTypesPath, globalTypesContents);
 				} catch { }