@@ -49,24 +49,6 @@ const getGlobbedPaths = (globPatterns, excludes) => {
49
49
return output ;
50
50
} ;
51
51
52
- // /**
53
- // * Validate NODE_ENV existence
54
- // */
55
- // const validateEnvironmentVariable = function () {
56
- // const environmentFiles = glob.sync('./config/env/' + process.env.NODE_ENV + '.js');
57
- // console.log();
58
- // if (!environmentFiles.length) {
59
- // if (process.env.NODE_ENV) {
60
- // console.error(chalk.red('+ Error: No configuration file found for "' + process.env.NODE_ENV + '" environment using development instead'));
61
- // } else {
62
- // console.error(chalk.red('+ Error: NODE_ENV is not defined! Using default development environment'));
63
- // }
64
- // process.env.NODE_ENV = 'development';
65
- // }
66
- // // Reset console color
67
- // console.log(chalk.white(''));
68
- // };
69
-
70
52
/** Validate config.domain is set
71
53
*/
72
54
const validateDomainIsSet = ( config ) => {
@@ -106,39 +88,36 @@ const initSecureMode = (config) => {
106
88
const initGlobalConfigFiles = ( config , assets ) => {
107
89
// Appending files
108
90
config . files = { } ;
109
-
110
91
// Setting Globbed mongoose model files
111
92
config . files . mongooseModels = getGlobbedPaths ( assets . mongooseModels ) ;
112
-
113
93
// Setting Globbed sequelize model files
114
94
config . files . sequelizeModels = getGlobbedPaths ( assets . sequelizeModels ) ;
115
-
116
95
// Setting Globbed route files
117
96
config . files . routes = getGlobbedPaths ( assets . routes ) ;
118
-
119
97
// Setting Globbed config files
120
98
config . files . configs = getGlobbedPaths ( assets . config ) ;
121
-
122
99
// Setting Globbed socket files
123
100
// config.files.sockets = getGlobbedPaths(assets.sockets);
124
-
125
101
// Setting Globbed policies files
126
102
config . files . policies = getGlobbedPaths ( assets . policies ) ;
127
103
} ;
128
104
129
105
/**
130
106
* Initialize global configuration
131
107
*/
132
- const initGlobalConfig = ( ) => {
133
- // Validate NODE_ENV existence
134
- // // validateEnvironmentVariable();
135
108
109
+ const initGlobalConfig = ( ) => {
136
110
// Get the default assets
137
111
const assets = require ( path . join ( process . cwd ( ) , './config/assets' ) ) ;
138
112
139
113
// Get the current config
140
- const currentEnv = process . env . NODE_ENV || 'development' ;
141
- const defaultConfig = require ( path . join ( process . cwd ( ) , './config' , 'defaults' , currentEnv ) ) || { } ;
114
+ const _path = path . join ( process . cwd ( ) , './config' , 'defaults' , process . env . NODE_ENV || 'development' ) ;
115
+ let defaultConfig ;
116
+ if ( fs . existsSync ( `${ _path } .js` ) ) defaultConfig = require ( _path ) ;
117
+ else {
118
+ console . error ( chalk . red ( `+ Error: No configuration file found for "${ process . env . NODE_ENV } " environment using development instead` ) ) ;
119
+ defaultConfig = require ( path . join ( process . cwd ( ) , './config' , 'defaults' , 'development' ) ) ;
120
+ }
142
121
143
122
// Get the config from process.env.WAOS_NODE_*
144
123
const environmentVars = _ . mapKeys (
@@ -147,10 +126,8 @@ const initGlobalConfig = () => {
147
126
) ;
148
127
const environmentConfigVars = { } ;
149
128
_ . forEach ( environmentVars , ( v , k ) => objectPath . set ( environmentConfigVars , k , v ) ) ;
150
-
151
129
// Merge config files
152
130
const config = _ . merge ( defaultConfig , environmentConfigVars ) ;
153
-
154
131
// read package.json for MEAN.JS project information
155
132
const pkg = require ( path . resolve ( './package.json' ) ) ;
156
133
config . meanjs = pkg ;
@@ -160,13 +137,10 @@ const initGlobalConfig = () => {
160
137
161
138
// Initialize global globbed files
162
139
initGlobalConfigFiles ( config , assets ) ;
163
-
164
140
// Init Secure SSL if can be used
165
141
initSecureMode ( config ) ;
166
-
167
142
// Print a warning if config.domain is not set
168
143
validateDomainIsSet ( config ) ;
169
-
170
144
// Expose configuration utilities
171
145
config . utils = {
172
146
getGlobbedPaths,
0 commit comments