@@ -5,7 +5,6 @@ import { EmbarkEmitter as Events } from './events';
55import { filesMatchingPattern , fileMatchesPattern } from './utils/utils' ;
66const path = require ( 'path' ) ;
77const deepEqual = require ( 'deep-equal' ) ;
8- const web3 = require ( 'web3' ) ;
98import { __ } from 'embark-i18n' ;
109import {
1110 buildUrlFromConfig ,
@@ -23,13 +22,12 @@ import {
2322 getExternalContractUrl
2423} from 'embark-utils' ;
2524import { Logger } from 'embark-logger' ;
26- import { readJsonSync } from 'fs-extra' ;
2725const cloneDeep = require ( 'lodash.clonedeep' ) ;
2826const { replaceZeroAddressShorthand } = AddressUtils ;
2927
30- import { getBlockchainDefaults , getContractDefaults , embarkConfigDefaults } from './configDefaults' ;
28+ import { getBlockchainDefaults , getContractDefaults } from './configDefaults' ;
3129
32- const constants = readJsonSync ( path . join ( __dirname , '../constants.json' ) ) ;
30+ const constants = require ( '../constants.json' ) ;
3331
3432const DEFAULT_CONFIG_PATH = 'config/' ;
3533
@@ -84,7 +82,7 @@ export class Config {
8482
8583 events : Events ;
8684
87- embarkConfig : EmbarkConfig = embarkConfigDefaults ;
85+ embarkConfig : EmbarkConfig = constants . defaultEmbarkConfig ;
8886
8987 context : any ;
9088
@@ -629,7 +627,7 @@ export class Config {
629627 }
630628
631629 loadEmbarkConfigFile ( ) {
632- this . embarkConfig = recursiveMerge ( embarkConfigDefaults , this . embarkConfig ) ;
630+ this . embarkConfig = recursiveMerge ( constants . defaultEmbarkConfig , this . embarkConfig ) ;
633631
634632 const contracts = this . embarkConfig . contracts ;
635633 // determine contract 'root' directories
0 commit comments