Move config files

This commit is contained in:
Nicolas Gallagher
2015-09-03 19:36:43 -07:00
parent fb7a997256
commit f951de43a2
3 changed files with 4 additions and 4 deletions
+4 -4
View File
@@ -1,10 +1,10 @@
var assign = require('object-assign')
var path = require('path')
var webpackConfig = require('./webpack-base.config.js') var webpackConfig = require('./webpack-base.config.js')
// entry is determined by karma config 'files' array
webpackConfig.devtool = 'inline-source-map'
webpackConfig.entry = {}
module.exports = function (config) { module.exports = function (config) {
config.set({ config.set({
basePath: path.resolve(__dirname, '..'),
browsers: [ 'Chrome' ], browsers: [ 'Chrome' ],
browserNoActivityTimeout: 60000, browserNoActivityTimeout: 60000,
client: { client: {
@@ -31,7 +31,7 @@ module.exports = function (config) {
}, },
reporters: [ 'dots' ], reporters: [ 'dots' ],
singleRun: true, singleRun: true,
webpack: webpackConfig, webpack: assign({}, webpackConfig, { devtool: 'inline' }),
webpackMiddleware: { webpackMiddleware: {
stats: { stats: {
assetsSort: 'name', assetsSort: 'name',