From 07d433b9304218c3a2e6e39b4a1c4ae3d6882f0e Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Wed, 21 Sep 2022 15:20:38 +0100
Subject: [PATCH 1/4] fix(nuxi): include `workspaceDir` in tsconfig include

---
 packages/nuxi/src/utils/prepare.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/nuxi/src/utils/prepare.ts b/packages/nuxi/src/utils/prepare.ts
index 533e33eefe0..93a542838f1 100644
--- a/packages/nuxi/src/utils/prepare.ts
+++ b/packages/nuxi/src/utils/prepare.ts
@@ -27,7 +27,8 @@ export const writeTypes = async (nuxt: Nuxt) => {
     include: [
       './nuxt.d.ts',
       join(relative(nuxt.options.buildDir, nuxt.options.rootDir), '**/*'),
-      ...nuxt.options.srcDir !== nuxt.options.rootDir ? [join(relative(nuxt.options.buildDir, nuxt.options.srcDir), '**/*')] : []
+      ...nuxt.options.srcDir !== nuxt.options.rootDir ? [join(relative(nuxt.options.buildDir, nuxt.options.srcDir), '**/*')] : [],
+      ...nuxt.options.workspaceDir !== nuxt.options.rootDir ? [join(relative(nuxt.options.buildDir, nuxt.options.workspaceDir), '**/*')] : []
     ]
   })
 

From 1778f7e74fc8b8e412eda1a2294e8aa1c0294223 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Wed, 21 Sep 2022 15:51:21 +0100
Subject: [PATCH 2/4] test: avoid including nuxt source files within test

---
 test/fixtures/basic/nuxt.config.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/test/fixtures/basic/nuxt.config.ts b/test/fixtures/basic/nuxt.config.ts
index 2663699bbfc..6ead85acb6e 100644
--- a/test/fixtures/basic/nuxt.config.ts
+++ b/test/fixtures/basic/nuxt.config.ts
@@ -16,6 +16,11 @@ export default defineNuxtConfig({
   extends: [
     './extends/node_modules/foo'
   ],
+  hooks: {
+    'prepare:types' ({ tsConfig }) {
+      tsConfig.include = tsConfig.include.filter(i => i !== '../**/**/*')
+    }
+  },
   nitro: {
     output: { dir: process.env.NITRO_OUTPUT_DIR },
     prerender: {

From eaacd74dd8b66560f720d6983f5182391bca6347 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Wed, 21 Sep 2022 15:55:53 +0100
Subject: [PATCH 3/4] test: use existing hooks key

---
 test/fixtures/basic/nuxt.config.ts | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/test/fixtures/basic/nuxt.config.ts b/test/fixtures/basic/nuxt.config.ts
index 6ead85acb6e..1266ad3876c 100644
--- a/test/fixtures/basic/nuxt.config.ts
+++ b/test/fixtures/basic/nuxt.config.ts
@@ -16,11 +16,6 @@ export default defineNuxtConfig({
   extends: [
     './extends/node_modules/foo'
   ],
-  hooks: {
-    'prepare:types' ({ tsConfig }) {
-      tsConfig.include = tsConfig.include.filter(i => i !== '../**/**/*')
-    }
-  },
   nitro: {
     output: { dir: process.env.NITRO_OUTPUT_DIR },
     prerender: {
@@ -58,6 +53,9 @@ export default defineNuxtConfig({
     }
   ],
   hooks: {
+    'prepare:types' ({ tsConfig }) {
+      tsConfig.include = tsConfig.include.filter(i => i !== '../**/**/*')
+    },
     'modules:done' () {
       addComponent({
         name: 'CustomComponent',

From 55b57ed9b1ea4af15f9542f6c25d7a32791c597e Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Wed, 21 Sep 2022 16:02:51 +0100
Subject: [PATCH 4/4] test: fix path

---
 test/fixtures/basic/nuxt.config.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/fixtures/basic/nuxt.config.ts b/test/fixtures/basic/nuxt.config.ts
index 1266ad3876c..f95ce54fbd0 100644
--- a/test/fixtures/basic/nuxt.config.ts
+++ b/test/fixtures/basic/nuxt.config.ts
@@ -54,7 +54,7 @@ export default defineNuxtConfig({
   ],
   hooks: {
     'prepare:types' ({ tsConfig }) {
-      tsConfig.include = tsConfig.include.filter(i => i !== '../**/**/*')
+      tsConfig.include = tsConfig.include.filter(i => i !== '../../../../**/*')
     },
     'modules:done' () {
       addComponent({