Merge branch 'develop'

holisticon · Jan 18, 2017 · ae759ef · ae759ef
2 parents 4387150 + 70a19f6
commit ae759ef
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/etc/karma.conf.js b/etc/karma.conf.js
@@ -22,6 +22,11 @@ module.exports = function (config) {
     // base path that will be used to resolve all patterns (e.g. files, exclude)
     basePath: '',
 
+    // see https://github.com/angular/angular-cli/issues/2125
+    mime: {
+      'text/x-typescript': ['ts', 'tsx']
+    },
+
     /*
      * Frameworks to use
      *

diff --git a/package.json b/package.json
@@ -61,7 +61,7 @@
     "karma-coverage": "1.0.0",
     "karma-jasmine": "1.0.2",
     "karma-jasmine-html-reporter": "0.2.2",
-    "karma-junit-reporter": "1.1.0",
+    "karma-junit-reporter": "1.2.0",
     "karma-phantomjs-launcher": "1.0.2",
     "karma-sourcemap-loader": "0.3.7",
     "karma-webpack": "1.8.0",