Merge pull request #398 from thusc/use-cwd-config

Use the current working directory's config file.
usebedrock · Jul 14, 2021 · bcbeb83 · bcbeb83
2 parents a098863 + 385497f
commit bcbeb83
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/core/discovery/config.js b/core/discovery/config.js
@@ -1,9 +1,12 @@
+const path = require('path');
+
 const defaultConfig = require('./default-config');
 
 let config = {...defaultConfig};
 
 try {
-  const projectConfig = require('../../bedrock.config');
+  const projectConfigPath = path.join(process.cwd(), 'bedrock.config');
+  const projectConfig = require(projectConfigPath);
   config = {...config, ...projectConfig};
 } catch (err) {
   console.log(err);
@@ -13,7 +16,8 @@ try {
 
 if (process.env.NODE_ENV == "production") {
   try {
-    const projectConfig = require('../../bedrock.config.prod');
+    const projectConfigPath = path.join(process.cwd(), 'bedrock.config.prod');
+    const projectConfig = require(projectConfigPath);
     config = {...config, ...projectConfig};
   } catch (err) {
     console.log(err);