Use nyc for coverage

.gitignore

@@ -1,8 +1,6 @@
 node_modules/
-
 dist/
 typings/
-
 coverage/
 .nyc_output/
 

client/app.ts

@@ -1,6 +1,3 @@
-import 'angular';
-import 'angular-ui-router';
-
 import {appModuleName, appModuleVendorDependencies} from './config';
 
 angular

karma.conf.js

@@ -17,9 +17,6 @@ module.exports = function (config) {
       'client/**/*.ts': [
         'webpack',
         'sourcemap'
-      ],
-      'client/**/!(*.spec).ts': [
-        'coverage'
       ]
     },
 
@@ -35,9 +32,6 @@ module.exports = function (config) {
           loaders.typescriptTest,
           loaders.jade,
           loaders.html
-        ],
-        postLoaders: [
-          loaders.istanbulInstrumenter
         ]
       },
       stats: {
@@ -51,15 +45,7 @@ module.exports = function (config) {
       noInfo: true // prevent console spamming when running in Karma!
     },
 
-    reporters: ['mocha', 'coverage'],
-    coverageReporter: {
-      reporters: [
-        { type: 'lcov' },
-        { type: 'html' },
-        { type: 'text-summary' }
-      ],
-      dir: './coverage/client/'
-    },
+    reporters: ['mocha'],
 
     colors: true,
 

package.json

@@ -3,14 +3,23 @@
   "version": "0.0.0",
   "description": "",
   "scripts": {
-    "build": "npm run clean && cross-env NODE_ENV=production webpack --progress --colors",
+    "prebuild": "npm run clean",
+    "build": "cross-env NODE_ENV=production webpack --progress --colors",
     "clean": "rimraf dist/ coverage/",
     "lint": "tslint 'client/**/*.ts'",
     "postinstall": "npm run typings",
     "start": "webpack-dev-server --inline --colors --display-error-details --display-cached",
-    "clean": "rimraf dist/ && rimraf coverage/",
-    "build": "npm run clean && webpack --progress --colors",
-    "test": "karma start"
+    "test": "npm run lint && nyc karma start",
+    "pretypings": "rimraf typings/",
+    "typings": "tsd install && tsd link"
+  },
+  "nyc": {
+    "extensions": [
+      ".ts"
+    ],
+    "include": [
+      "client/**/!(*.spec).ts"
+    ]
   },
   "author": "Jason Kurian <jgkurian@me.com>",
   "license": "MIT",
@@ -20,36 +29,41 @@
     "chai-things": "^0.2.0",
     "cross-env": "^1.0.7",
     "file-loader": "^0.8.5",
-    "html-webpack-plugin": "^2.9.0",
+    "html-webpack-plugin": "^2.10.0",
     "istanbul-instrumenter-loader": "^0.2.0",
     "jade": "^1.11.0",
     "jade-loader": "^0.8.0",
+    "karma": "^0.13.22",
     "karma-chai": "^0.1.0",
     "karma-chai-plugins": "^0.7.0",
     "karma-chrome-launcher": "^0.2.2",
-    "karma-coverage": "^0.5.3",
+    "karma-coverage": "^0.5.5",
     "karma-mocha": "^0.2.2",
-    "karma-mocha-reporter": "^1.2.3",
+    "karma-mocha-reporter": "^2.0.0",
     "karma-sinon": "^1.0.4",
     "karma-sourcemap-loader": "^0.3.7",
     "karma-webpack": "^1.7.0",
     "mocha": "^2.4.5",
     "ng-annotate-loader": "0.1.0",
+    "nyc": "^6.0.0",
     "raw-loader": "^0.5.1",
     "rimraf": "^2.5.2",
     "sinon": "^1.17.3",
     "sinon-chai": "^2.8.0",
     "style-loader": "^0.13.0",
     "ts-loader": "^0.8.1",
-    "tslint-loader": "^2.1.0",
-    "typescript": "^1.8.2",
+    "tsd": "^0.6.5",
+    "tslint": "^3.6.0",
+    "tslint-loader": "^2.1.3",
+    "typescript": "^1.8.7",
     "url-loader": "^0.5.7",
     "webpack": "^1.12.14",
     "webpack-dev-server": "^1.14.1"
   },
   "dependencies": {
     "angular": "^1.5.0",
     "angular-ui-router": "^0.2.18",
-    "lodash": "^4.5.1"
+    "basscss": "^8.0.1",
+    "lodash": "^4.6.1"
   }
 }

tsconfig.json

@@ -1,5 +1,4 @@
 {
-  "version": "1.8.2",
   "compilerOptions": {
     "experimentalDecorators": true,
     "module": "commonjs",

webpack/getConfig.js

@@ -3,28 +3,29 @@
 const path = require('path');
 const webpack = require('webpack');
 const htmlWebpackPlugin = require('html-webpack-plugin');
-const distAbsolutePath = path.resolve(__dirname, '..', 'dist');
 const loaders = require('./loaders');
 
 module.exports = function (context) {
   context = context || 'dev';
-  const production = context === 'prod';
+  const isProduction = context === 'production';
+  const distAbsolutePath = path.resolve(__dirname, '..', 'dist');
+
   let plugins = [
     new webpack.optimize.CommonsChunkPlugin('vendor', '[name].[hash].bundle.js'),
     new htmlWebpackPlugin({
       template: path.join(__dirname, '..', 'index.html'),
       inject: 'body',
-      minify: false
+      minify: isProduction
     })
   ];
 
-  if (production) {
+  if (isProduction) {
     plugins.push(new webpack.optimize.UglifyJsPlugin());
   }
 
   return {
     devtool: 'inline-source-map',
-    debug: !production,
+    debug: !isProduction,
     cache: true,
     verbose: true,
     displayErrorDetails: true,
@@ -34,9 +35,7 @@ module.exports = function (context) {
     },
 
     entry: {
-      app: [
-        './client/app.ts'
-      ],
+      app: './client/app.ts',
       vendor: [
         'angular',
         'angular-ui-router'