fix(server-dev): Load .env using dotenv.

lowdefy · May 24, 2022 · 85d7827 · 85d7827
1 parent ac34fe8
commit 85d7827
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/packages/server-dev/manager/processes/initialBuild.mjs b/packages/server-dev/manager/processes/initialBuild.mjs
@@ -17,10 +17,10 @@
 
 function initialBuild(context) {
   return async () => {
+    context.readDotEnv();
     await context.lowdefyBuild();
     await context.installPlugins();
     await context.nextBuild();
-    await context.readDotEnv();
   };
 }
 

diff --git a/packages/server-dev/manager/processes/readDotEnv.mjs b/packages/server-dev/manager/processes/readDotEnv.mjs
@@ -16,12 +16,10 @@
 
 import path from 'path';
 import dotenv from 'dotenv';
-import { readFile } from '@lowdefy/node-utils';
 
 function readDotEnv(context) {
-  return async () => {
-    const dotEnv = await readFile(path.join(context.directories.config, '.env'));
-    context.serverEnv = dotenv.parse(dotEnv || '');
+  return () => {
+    dotenv.config({ path: path.join(context.directories.config, '.env'), silent: true });
   };
 }
 

diff --git a/packages/server-dev/manager/processes/startNextServer.mjs b/packages/server-dev/manager/processes/startNextServer.mjs
@@ -27,7 +27,6 @@ function startServerProcess(context) {
     processOptions: {
       env: {
         ...process.env,
-        ...context.serverEnv,
         PORT: context.options.port,
       },
     },

diff --git a/packages/server-dev/manager/watchers/envWatcher.mjs b/packages/server-dev/manager/watchers/envWatcher.mjs
@@ -21,7 +21,8 @@ import setupWatcher from '../utils/setupWatcher.mjs';
 function envWatcher(context) {
   const callback = async () => {
     console.warn('.env file changed.');
-    await context.readDotEnv();
+    context.readDotEnv();
+    await context.lowdefyBuild();
     context.restartServer();
   };
   return setupWatcher({