Fix merging of nested options objects from API

lib/config.js

@@ -26,7 +26,7 @@ module.exports = class Config {
       throw new Error('[spike constructor] option "root" is required')
     }
     // merges API options into app.js options
-    let allOpts = Object.assign(this.parseAppJs(opts), opts)
+    let allOpts = merge(this.parseAppJs(opts), opts)
     this.transformSpikeOptionsToWebpack(this.validateOpts(allOpts))
     this.project = project
   }

test/app_config.js

@@ -13,6 +13,13 @@ test('API config overrides app.js config', (t) => {
   })
 })
 
+test('API config merges properly with app.js config', (t) => {
+  return compileFixture(t, 'app_config', { testing: { bar: 'double override' } }).then(({res}) => {
+    t.truthy(res.stats.compilation.options.testing.baz === 'override')
+    t.truthy(res.stats.compilation.options.testing.bar === 'double override')
+  })
+})
+
 test('throws error for invalid app.js syntax', (t) => {
   return t.throws(() => compileFixture(t, 'app_config_error'), /Error: wow/)
 })

test/fixtures/app_config/app.js

@@ -1,5 +1,7 @@
 module.exports = {
   testing: {
-    foo: 'override'
+    foo: 'override',
+    bar: 'override',
+    baz: 'override'
   }
 }