Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion lib/utils/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import Config from 'webpack-configurator'
const debug = require('debug')('gatsby:webpack-config')
import path from 'path'
import _ from 'lodash'
import invariant from 'invariant'

import babelConfig from './babel-config'

Expand Down Expand Up @@ -380,7 +381,14 @@ module.exports = (program, directory, stage, webpackPort = 1500, routes = []) =>
})

if (modifyWebpackConfig) {
return modifyWebpackConfig(module(config), stage)
const modifiedWebpackConfig = modifyWebpackConfig(module(config), stage)
invariant(_.isObject(modifiedWebpackConfig),
`
You must return an object when modifying the Webpack config.
Returned: ${modifiedWebpackConfig}
stage: ${stage}
`)
return modifiedWebpackConfig
} else {
return module(config)
}
Expand Down