From 37d24eed7dce72b3f7e4a983de1ab38ddaa72739 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Tue, 13 Feb 2024 11:19:25 +0000
Subject: [PATCH] fix(schema): use `rootDir`, not `process.cwd`, for
 `modulesDir` (#25766)

---
 packages/schema/build.config.ts      | 2 ++
 packages/schema/src/config/common.ts | 8 ++++----
 packages/schema/src/config/vite.ts   | 4 ++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/packages/schema/build.config.ts b/packages/schema/build.config.ts
index c41cb37406..04a306a6c4 100644
--- a/packages/schema/build.config.ts
+++ b/packages/schema/build.config.ts
@@ -9,6 +9,8 @@ export default defineBuildConfig({
       name: 'config',
       builder: 'untyped',
       defaults: {
+        srcDir: '/<srcDir>/',
+        workspaceDir: '/<workspaceDir>/',
         rootDir: '/<rootDir>/',
         vite: {
           base: '/'
diff --git a/packages/schema/src/config/common.ts b/packages/schema/src/config/common.ts
index da6f6f9ed0..3a5e85f3b7 100644
--- a/packages/schema/src/config/common.ts
+++ b/packages/schema/src/config/common.ts
@@ -136,10 +136,10 @@ export default defineUntypedSchema({
     $default: ['node_modules'],
     $resolve: async (val: string[] | undefined, get): Promise<string[]> => {
       const rootDir = await get('rootDir') as string
-      return [
-        ...await Promise.all((val || []).map(async (dir: string) => resolve(rootDir, dir))),
-        resolve(process.cwd(), 'node_modules')
-      ]
+      return [...new Set([
+        ...(val || []).map((dir: string) => resolve(rootDir, dir)),
+        resolve(rootDir, 'node_modules')
+      ])]
     }
   },
 
diff --git a/packages/schema/src/config/vite.ts b/packages/schema/src/config/vite.ts
index a3c8413716..f53fcb027a 100644
--- a/packages/schema/src/config/vite.ts
+++ b/packages/schema/src/config/vite.ts
@@ -92,14 +92,14 @@ export default defineUntypedSchema({
         allow: {
           $resolve: async (val: string[] | undefined, get) => {
             const [buildDir, srcDir, rootDir, workspaceDir, modulesDir] = await Promise.all([get('buildDir'), get('srcDir'), get('rootDir'), get('workspaceDir'), get('modulesDir')]) as [string, string, string, string, string]
-            return [
+            return [...new Set([
               buildDir,
               srcDir,
               rootDir,
               workspaceDir,
               ...(modulesDir),
               ...val ?? []
-            ]
+            ])]
           }
         }
       }