fix(config): watch envDir even outside of root (#12349)

vitejs · Mar 10, 2023 · 131f3ee · 131f3ee
1 parent f89f12a
commit 131f3ee
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/packages/vite/src/node/config.ts b/packages/vite/src/node/config.ts
@@ -342,6 +342,7 @@ export type ResolvedConfig = Readonly<
     /** @internal */
     mainConfig: ResolvedConfig | null
     isProduction: boolean
+    envDir: string
     env: Record<string, any>
     resolve: Required<ResolveOptions> & {
       alias: Alias[]
@@ -659,6 +660,7 @@ export async function resolveConfig(
     server,
     build: resolvedBuildOptions,
     preview: resolvePreviewOptions(config.preview, server),
+    envDir,
     env: {
       ...userEnv,
       BASE_URL,

diff --git a/packages/vite/src/node/server/index.ts b/packages/vite/src/node/server/index.ts
@@ -359,8 +359,8 @@ export async function createServer(
   }
 
   const watcher = chokidar.watch(
-    // config file dependencies might be outside of root
-    [path.resolve(root), ...config.configFileDependencies],
+    // config file dependencies and env file might be outside of root
+    [root, ...config.configFileDependencies, config.envDir],
     resolvedWatchOptions,
   ) as FSWatcher