From 0791717207fb24b1a12125c965ee7e3358a9f164 Mon Sep 17 00:00:00 2001 From: Daniel Roe Date: Wed, 9 Nov 2022 12:14:33 +0100 Subject: [PATCH 1/3] fix(nuxi): exclude 'dist' from type checking --- packages/nuxi/src/utils/prepare.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/nuxi/src/utils/prepare.ts b/packages/nuxi/src/utils/prepare.ts index 7edd8b9222f..854a8ad4dfd 100644 --- a/packages/nuxi/src/utils/prepare.ts +++ b/packages/nuxi/src/utils/prepare.ts @@ -29,7 +29,11 @@ export const writeTypes = async (nuxt: Nuxt) => { join(relative(nuxt.options.buildDir, nuxt.options.rootDir), '**/*'), ...nuxt.options.srcDir !== nuxt.options.rootDir ? [join(relative(nuxt.options.buildDir, nuxt.options.srcDir), '**/*')] : [], ...nuxt.options.typescript.includeWorkspace && nuxt.options.workspaceDir !== nuxt.options.rootDir ? [join(relative(nuxt.options.buildDir, nuxt.options.workspaceDir), '**/*')] : [] - ] + ], + exclude: [ + // nitro generate output + resolve(nuxt.options.rootDir, 'dist') + ].map(p => relative(nuxt.options.buildDir, p)) }) const aliases: Record = { From 71eb31d2f59ed029ef6a74e56643ff9794554a56 Mon Sep 17 00:00:00 2001 From: Daniel Roe Date: Wed, 9 Nov 2022 14:11:26 +0100 Subject: [PATCH 2/3] refactor: combine call --- packages/nuxi/src/utils/prepare.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/nuxi/src/utils/prepare.ts b/packages/nuxi/src/utils/prepare.ts index 854a8ad4dfd..876d34745a7 100644 --- a/packages/nuxi/src/utils/prepare.ts +++ b/packages/nuxi/src/utils/prepare.ts @@ -32,8 +32,8 @@ export const writeTypes = async (nuxt: Nuxt) => { ], exclude: [ // nitro generate output - resolve(nuxt.options.rootDir, 'dist') - ].map(p => relative(nuxt.options.buildDir, p)) + relative(nuxt.options.buildDir, resolve(nuxt.options.rootDir, 'dist')) + ] }) const aliases: Record = { From f730708997b6dc5bf921962e3326e3be636ccb99 Mon Sep 17 00:00:00 2001 From: Daniel Roe Date: Wed, 9 Nov 2022 14:12:05 +0100 Subject: [PATCH 3/3] docs: add link --- packages/nuxi/src/utils/prepare.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/nuxi/src/utils/prepare.ts b/packages/nuxi/src/utils/prepare.ts index 876d34745a7..a7ce89fa957 100644 --- a/packages/nuxi/src/utils/prepare.ts +++ b/packages/nuxi/src/utils/prepare.ts @@ -31,7 +31,7 @@ export const writeTypes = async (nuxt: Nuxt) => { ...nuxt.options.typescript.includeWorkspace && nuxt.options.workspaceDir !== nuxt.options.rootDir ? [join(relative(nuxt.options.buildDir, nuxt.options.workspaceDir), '**/*')] : [] ], exclude: [ - // nitro generate output + // nitro generate output: https://github.com/nuxt/framework/blob/main/packages/nuxt/src/core/nitro.ts#L186 relative(nuxt.options.buildDir, resolve(nuxt.options.rootDir, 'dist')) ] })