Skip to content

Commit

Permalink
fix(loadPlugins): add object-assign polyfill
Browse files Browse the repository at this point in the history
  • Loading branch information
michael-ciniawsky committed Sep 22, 2016
1 parent aaedf90 commit acd3f84
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion lib/loadPlugins.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,15 @@
'use strict'

var path = require('path')
var assign = require('object-assign')

module.exports = function loadPlugins (config, options) {
if (typeof options === 'string') {
options = require(path.join(process.cwd(), options))
}

if (options) {
options = Object.assign({}, config.plugins, options.plugins)
options = assign({}, config.plugins, options.plugins)
} else {
options = config.plugins
}
Expand Down

0 comments on commit acd3f84

Please sign in to comment.