Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use the current working directory's config file. #398

Merged
merged 1 commit into from
Jul 14, 2021
Merged

Use the current working directory's config file. #398

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions core/discovery/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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);
Expand All @@ -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);
Expand Down