From 3bd713b14ab5979627772c955c5fce994506a3a6 Mon Sep 17 00:00:00 2001 From: David Tai Date: Sat, 7 May 2022 00:46:48 +0800 Subject: [PATCH 1/2] fix: add missing include path `../../**/*` in generate tsconfig. fix(#204) the generated tsconfig.json file in .nitro/types is missing "include path" of "../../**/*", causing typescript unable to grab all global types defined in .nitro/types/nitro.d.ts. adding "../../**/*" to tsConfig.include array in nitro\src\build.ts should fix this issue. --- src/build.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/build.ts b/src/build.ts index cdfa56f3f3..268761151b 100644 --- a/src/build.ts +++ b/src/build.ts @@ -100,7 +100,8 @@ export async function writeTypes (nitro: Nitro) { : {} }, include: [ - './nitro.d.ts' + './nitro.d.ts', + '../../**/*' ] } await writeFile(join(nitro.options.buildDir, 'types/tsconfig.json'), JSON.stringify(tsConfig, null, 2)) From a8117d87dc3ca98505b888d679865810d9c7d4be Mon Sep 17 00:00:00 2001 From: David Tai Date: Sat, 7 May 2022 23:02:47 +0800 Subject: [PATCH 2/2] fix: use relative path of the buildDir to the rootDir/srcDir for include paths update hard coded generated tsconfig's include path to use relative paths from buildDir to rootDir/srcDir --- src/build.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/build.ts b/src/build.ts index 268761151b..82ba02568f 100644 --- a/src/build.ts +++ b/src/build.ts @@ -101,7 +101,8 @@ export async function writeTypes (nitro: Nitro) { }, include: [ './nitro.d.ts', - '../../**/*' + join(relative(join(nitro.options.buildDir, 'types'), nitro.options.rootDir), '**/*'), + ...nitro.options.srcDir !== nitro.options.rootDir ? [join(relative(join(nitro.options.buildDir, 'types'), nitro.options.srcDir), '**/*')] : [] ] } await writeFile(join(nitro.options.buildDir, 'types/tsconfig.json'), JSON.stringify(tsConfig, null, 2))