Merge pull request remix-run#255 from KidkArolis/improve-karma-conf

Improve karma conf
danieljuhl · Sep 1, 2014 · e57112e · e57112e
2 parents 96122dd + ed0b54b
commit e57112e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 14 deletions.
diff --git a/karma.conf.js b/karma.conf.js
@@ -12,16 +12,12 @@ module.exports = function(config) {
     exclude: [],
 
     preprocessors: {
-      'specs/main.js': ['webpack']
+      'specs/main.js': ['webpack', 'sourcemap']
     },
 
     webpack: {
       cache: true,
-      // TODO: figure out how to get source maps in here, none of this works
-      //devtool: {
-        //'inline-source-map': true,
-        //inlineSourceMap: true
-      //},
+      devtool: 'inline-source-map',
       module: {
         loaders: [
           {test: /\.js$/, loader: 'jsx-loader'}
@@ -49,13 +45,6 @@ module.exports = function(config) {
 
     captureTimeout: 60000,
 
-    singleRun: false,
-
-    plugins: [
-      require("karma-mocha"),
-      require("karma-chrome-launcher"),
-      require("karma-firefox-launcher"),
-      require("karma-webpack")
-    ]
+    singleRun: false
   });
 };
diff --git a/package.json b/package.json
@@ -36,6 +36,7 @@
     "karma-cli": "0.0.4",
     "karma-firefox-launcher": "0.1.3",
     "karma-mocha": "0.1.3",
+    "karma-sourcemap-loader": "^0.2.0",
     "karma-webpack": "1.2.1",
     "mocha": "1.20.1",
     "react": ">=0.11.0",