calling merge config in entry point, as it should not be a dep of the runner

Author: James Wright

lib/index.js

@@ -4,6 +4,7 @@ const intro = require('./intro');
 const runner = require('./runner');
 const localAppServer = require('./localAppServer');
 const resultsPrinter = require('./resultsPrinter');
+const mergeConfig = require('./mergeConfig');
 
 module.exports = {
 _isInvalid(results) {
@@ -38,6 +39,8 @@ module.exports = {
 return Promise.reject(new Error('No config specified!'));
 }
 
+config = mergeConfig(config);
+
 // No destructing in Node.js 4 brah
 const appServerOptions = config.localAppServer;
 const failHard = config.failHard;

lib/runner.js

@@ -3,7 +3,6 @@
 const markupService = require('./services/markupService');
 const w3Service = require('./services/w3Service');
 const Result = require('./models/Result');
-const mergeConfig = require('./mergeConfig');
 
 module.exports = {
 _createPromise(url, validatorUrl) {
@@ -15,12 +14,8 @@ module.exports = {
 },
 
 run(config) {
-const mergedConfig = mergeConfig(config);
-const promises = mergedConfig.urls.map(url => this._createPromise(url, mergedConfig.validatorUrl));
+const promises = config.urls.map(url => this._createPromise(url, config.validatorUrl));
 
-return Promise.all(promises)
-.catch(e => {
-console.error(e);
-});
+return Promise.all(promises);
 }
 };

package.json

@@ -1,6 +1,6 @@
 {
  "name": "valimate",
- "version": "2.2.1",
+ "version": "2.2.2",
  "description": "Automated HTML validation tool.",
  "repository": "https://github.com/jamesseanwright/valimate",