From f951de43a2865c302e795c9706b0feb1b9ccfa63 Mon Sep 17 00:00:00 2001
From: Nicolas Gallagher <nicolasgallagher@twitter.com>
Date: Thu, 3 Sep 2015 19:36:43 -0700
Subject: [PATCH] Move config files

---
 karma.config.js => config/karma.config.js               | 8 ++++----
 webpack-base.config.js => config/webpack-base.config.js | 0
 webpack.config.js => config/webpack.config.js           | 0
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename karma.config.js => config/karma.config.js (82%)
 rename webpack-base.config.js => config/webpack-base.config.js (100%)
 rename webpack.config.js => config/webpack.config.js (100%)

diff --git a/karma.config.js b/config/karma.config.js
similarity index 82%
rename from karma.config.js
rename to config/karma.config.js
index ab6b2195..a2f50320 100644
--- a/karma.config.js
+++ b/config/karma.config.js
@@ -1,10 +1,10 @@
+var assign = require('object-assign')
+var path = require('path')
 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) {
   config.set({
+    basePath: path.resolve(__dirname, '..'),
     browsers: [ 'Chrome' ],
     browserNoActivityTimeout: 60000,
     client: {
@@ -31,7 +31,7 @@ module.exports = function (config) {
     },
     reporters: [ 'dots' ],
     singleRun: true,
-    webpack: webpackConfig,
+    webpack: assign({}, webpackConfig, { devtool: 'inline' }),
     webpackMiddleware: {
       stats: {
         assetsSort: 'name',
diff --git a/webpack-base.config.js b/config/webpack-base.config.js
similarity index 100%
rename from webpack-base.config.js
rename to config/webpack-base.config.js
diff --git a/webpack.config.js b/config/webpack.config.js
similarity index 100%
rename from webpack.config.js
rename to config/webpack.config.js