ch4o5/locomotive-boilerplate
Template
1
0
Fork 0
mirror of https://github.com/locomotivemtl/locomotive-boilerplate.git synced 2026-01-15 00:55:08 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'feature/update-node-version' into devenini/develop

Browse Source
This commit is contained in:
Deven Caron
2023-02-02 10:00:56 -05:00
parent 68dd79caef 7c1b61eda9
commit fb5957024d
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
build/utils/config.js
View File

@@ -2,17 +2,19 @@
* @file Provides simple user configuration options.
*/
import loconfig from '../../loconfig.json' assert { type: "json" };
import loconfig from '../../loconfig.json' assert { type: 'json' };
let usrconfig;
try {
usrconfig = await import('../../loconfig.local.json');
usrconfig = await import('../../loconfig.local.json', {
assert: { type: 'json' }
});
usrconfig = usrconfig.default;
merge(loconfig, usrconfig);
} catch (err) {
// do nothing
console.error(err);
}
export default loconfig;