diff --git a/karma.conf.js b/karma.conf.js index 826d74a601..ccc4f2e193 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -15,7 +15,7 @@ module.exports = function(config) { var configuration = { // base path that will be used to resolve all patterns (e.g. files, exclude) - basePath: '', + basePath: '.', /* * Frameworks to use @@ -84,7 +84,7 @@ module.exports = function(config) { * possible values: 'dots', 'progress' * available reporters: https://npmjs.org/browse/keyword/karma-reporter */ - reporters: [ 'mocha', 'coverage' ], + reporters: [ 'mocha', 'coverage', 'karma-remap-istanbul' ], // Karma web server port port: 9876, diff --git a/tsconfig.json b/tsconfig.json index 226f3dbe19..6926f8cfff 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -7,6 +7,7 @@ "removeComments": false, "emitDecoratorMetadata": true, "experimentalDecorators": true, + "allowSyntheticDefaultImports": true, "allowUnreachableCode": false, "allowUnusedLabels": false, "noEmitHelpers": true, diff --git a/webpack.test.config.js b/webpack.test.config.js index 768ff712cd..cd288ce894 100644 --- a/webpack.test.config.js +++ b/webpack.test.config.js @@ -91,20 +91,23 @@ module.exports = function (options) { */ { test: /\.ts$/, - loaders: ['awesome-typescript-loader', 'angular2-template-loader'], - /*loader: 'awesome-typescript-loader', - query: { - // use inline sourcemaps for "karma-remap-coverage" reporter - sourceMap: false, - inlineSourceMap: true, - compilerOptions: { - - // Remove TypeScript helpers to be injected - // below by DefinePlugin - removeComments: true - - } - },*/ + loaders: [ + { + loader: 'awesome-typescript-loader', + query: { + // use inline sourcemaps for "karma-remap-coverage" reporter + sourceMap: false, + inlineSourceMap: true, + sourceRoot: false, + compilerOptions: { + // Remove TypeScript helpers to be injected + // below by DefinePlugin + removeComments: true + } + } + }, + 'angular2-template-loader' + ], exclude: [/\.e2e\.ts$/] },