small refactors

Author: Jeff Escalante

lib/config.js

@@ -194,6 +194,12 @@ module.exports = class Config {
       ]
     }
 
+    // If the user has passed options, accept them, but the ones set above take
+    // priority if there's a conflict, as they are essential to spike.
+    if (opts.resolveLoader) {
+      this.resolveLoader = merge(opts.resolveLoader, this.resolveLoader)
+    }
+
     const reIgnores = opts.ignore.map(mmToRe)
     const spikeLoaders = [
       {

lib/index.js

@@ -14,7 +14,7 @@ const Sprout = require('sprout')
 const Joi = require('joi')
 const {EventEmitter} = require('events')
 const Config = require('./config')
-const Errors = require('./errors')
+const {Error, Warning} = require('./errors')
 
 /**
  * @class Spike
@@ -157,17 +157,17 @@ function npmInstall (opts) {
  */
 function compileCallback (id, err, stats) {
   if (err) {
-    return this.emit('error', new Errors.Error({ id: id, message: err }))
+    return this.emit('error', new Error({ id: id, message: err }))
   }
   // Webpack "soft errors" are classified as warnings in spike. An error is
   // an error. If it doesn't break the build, it's a warning.
   const jsonStats = stats.toJson()
   if (jsonStats.errors.length) {
-    this.emit('warning', new Errors.Warning({ id: id, message: jsonStats.errors }))
+    this.emit('warning', new Warning({ id: id, message: jsonStats.errors }))
   }
   /* istanbul ignore next */
   if (jsonStats.warnings.length) {
-    this.emit('warning', new Errors.Warning({ id: id, message: jsonStats.warnings }))
+    this.emit('warning', new Warning({ id: id, message: jsonStats.warnings }))
   }
 
   this.emit('compile', { id: id, stats: stats })

test/_helpers.js

@@ -20,9 +20,9 @@ exports.compileFixture = function compileFixture (t, name, options = {}) {
   const project = new Spike(Object.assign(options, { root: testPath }))
   const publicPath = path.join(testPath, 'public')
 
-  return When.promise(function (resolve, reject) {
+  return When.promise((resolve, reject) => {
     project.on('error', reject)
-    project.on('compile', function (res) { resolve({res, publicPath}) })
+    project.on('compile', (res) => { resolve({res, publicPath}) })
 
     project.compile()
   })