Skip to content

Commit

Permalink
Merge branch 'coast-app-fix/issue-168'
Browse files Browse the repository at this point in the history
  • Loading branch information
kamilmysliwiec committed May 7, 2020
2 parents 589518a + 6efcc5a commit 7929128
Show file tree
Hide file tree
Showing 5 changed files with 1,229 additions and 1,438 deletions.
5 changes: 3 additions & 2 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"trailingComma": "all",
"singleQuote": true
}
"singleQuote": true,
"arrowParens": "avoid"
}
6 changes: 5 additions & 1 deletion lib/config.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,11 @@ export class ConfigModule {
if (!isObject(config)) {
return;
}
const keys = Object.keys(config).filter(key => !(key in process.env));
const keys = Object.keys(config).filter(
key =>
!(key in process.env) ||
(key in process.env && process.env[key] !== config[key]),
);
keys.forEach(key => (process.env[key] = config[key]));
}

Expand Down
Loading

0 comments on commit 7929128

Please sign in to comment.