@@ -5,7 +5,6 @@ import { EmbarkEmitter as Events } from './events';
5
5
import { filesMatchingPattern , fileMatchesPattern } from './utils/utils' ;
6
6
const path = require ( 'path' ) ;
7
7
const deepEqual = require ( 'deep-equal' ) ;
8
- const web3 = require ( 'web3' ) ;
9
8
import { __ } from 'embark-i18n' ;
10
9
import {
11
10
buildUrlFromConfig ,
@@ -23,13 +22,12 @@ import {
23
22
getExternalContractUrl
24
23
} from 'embark-utils' ;
25
24
import { Logger } from 'embark-logger' ;
26
- import { readJsonSync } from 'fs-extra' ;
27
25
const cloneDeep = require ( 'lodash.clonedeep' ) ;
28
26
const { replaceZeroAddressShorthand } = AddressUtils ;
29
27
30
- import { getBlockchainDefaults , getContractDefaults , embarkConfigDefaults } from './configDefaults' ;
28
+ import { getBlockchainDefaults , getContractDefaults } from './configDefaults' ;
31
29
32
- const constants = readJsonSync ( path . join ( __dirname , '../constants.json' ) ) ;
30
+ const constants = require ( '../constants.json' ) ;
33
31
34
32
const DEFAULT_CONFIG_PATH = 'config/' ;
35
33
@@ -84,7 +82,7 @@ export class Config {
84
82
85
83
events : Events ;
86
84
87
- embarkConfig : EmbarkConfig = embarkConfigDefaults ;
85
+ embarkConfig : EmbarkConfig = constants . defaultEmbarkConfig ;
88
86
89
87
context : any ;
90
88
@@ -629,7 +627,7 @@ export class Config {
629
627
}
630
628
631
629
loadEmbarkConfigFile ( ) {
632
- this . embarkConfig = recursiveMerge ( embarkConfigDefaults , this . embarkConfig ) ;
630
+ this . embarkConfig = recursiveMerge ( constants . defaultEmbarkConfig , this . embarkConfig ) ;
633
631
634
632
const contracts = this . embarkConfig . contracts ;
635
633
// determine contract 'root' directories
0 commit comments