From 29aa6290f7aaf196c6616117a4b42701c562e8b9 Mon Sep 17 00:00:00 2001 From: Martin Reinhardt Date: Wed, 18 Jan 2017 14:25:15 +0100 Subject: [PATCH 1/3] fix(karma-timeout): Use newer karma-junit-reporter see #17 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index bf6686d..2bf6a00 100644 --- 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", From ab568d060e648ce353fe9ff7088c30ded12a181c Mon Sep 17 00:00:00 2001 From: Martin Reinhardt Date: Wed, 18 Jan 2017 14:25:59 +0100 Subject: [PATCH 2/3] fix(webpack): Fix sourcemapping issues in karma see #18 and #21 --- etc/webpack.test.js | 6 ------ 1 file changed, 6 deletions(-) diff --git a/etc/webpack.test.js b/etc/webpack.test.js index 386f4a1..ae69830 100755 --- a/etc/webpack.test.js +++ b/etc/webpack.test.js @@ -79,12 +79,6 @@ module.exports = webpackMerge(commonConfig, { * See: http://webpack.github.io/docs/configuration.html#plugins */ plugins: [ - new webpack.SourceMapDevToolPlugin({ - filename: null, // if no value is provided the sourcemap is inlined - lineToLine: true, - module: false, - test: /\.(ts|map|js)($|\?)/i // process .js and .ts files only - }), new webpack.LoaderOptionsPlugin({ test: /\.ts/i, options: { From 70a19f661a8eddc030211ae690d7353ce2c85cae Mon Sep 17 00:00:00 2001 From: Martin Reinhardt Date: Wed, 18 Jan 2017 14:42:55 +0100 Subject: [PATCH 3/3] fix(karma): Fix chrome mimetype issues in karma --- etc/karma.conf.js | 5 +++++ etc/webpack.test.js | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/etc/karma.conf.js b/etc/karma.conf.js index d13ac62..20403cb 100755 --- 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/etc/webpack.test.js b/etc/webpack.test.js index ae69830..386f4a1 100755 --- a/etc/webpack.test.js +++ b/etc/webpack.test.js @@ -79,6 +79,12 @@ module.exports = webpackMerge(commonConfig, { * See: http://webpack.github.io/docs/configuration.html#plugins */ plugins: [ + new webpack.SourceMapDevToolPlugin({ + filename: null, // if no value is provided the sourcemap is inlined + lineToLine: true, + module: false, + test: /\.(ts|map|js)($|\?)/i // process .js and .ts files only + }), new webpack.LoaderOptionsPlugin({ test: /\.ts/i, options: {