From 8f059d4aa84a1db814817b2ad2c96ea3c669bc2a Mon Sep 17 00:00:00 2001
From: Martin Hochel <hochelmartin@gmail.com>
Date: Fri, 6 May 2016 17:01:24 +0200
Subject: [PATCH] chore(webpack): allow tslint in dev + inherit in test and
 remove --hot webpack-server

- this fixes the issue of broken source maps
---
 package.json           |  2 +-
 webpack-test.config.js | 11 -----------
 webpack.config.js      | 10 +++++-----
 3 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/package.json b/package.json
index 743e2f3..bc0b7bf 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
     "test": "karma start",
     "test:watch": "npm run test -- --auto-watch --no-single-run",
     "clean": "rimraf doc/ coverage/ dist/",
-    "server": "webpack-dev-server --port $npm_package_config_port --hot --inline --progress --profile --colors --watch --display-error-details --display-cached --content-base src/"
+    "server": "webpack-dev-server --port $npm_package_config_port --inline --progress --profile --colors --watch --display-error-details --display-cached --content-base src/"
   },
   "keywords": [],
   "contributors": [
diff --git a/webpack-test.config.js b/webpack-test.config.js
index 00b1190..6c55409 100644
--- a/webpack-test.config.js
+++ b/webpack-test.config.js
@@ -12,17 +12,6 @@ const webpackDevtool = 'inline-source-map';
 
 const webpackPostLoaders = [
 
-  /*
-   * Tslint loader support for *.ts files
-   *
-   * See: https://github.com/wbuchwalter/tslint-loader
-   */
-  {
-    test: /\.ts$/,
-    loader: 'tslint-loader',
-    exclude: [ /node_modules/ ]
-  },
-
   /**
    * Instruments JS files with Istanbul for subsequent code coverage reporting.
    * Instrument only testing sources.
diff --git a/webpack.config.js b/webpack.config.js
index ad054b9..3af2d32 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -68,11 +68,11 @@ const webpackPreLoaders = [
    * See: https://github.com/wbuchwalter/tslint-loader
    */
   // @TODO codelyzer is breaking somehow source maps, allow this when it will be resolved
-  // {
-  //   test: /\.ts$/,
-  //   loader: 'tslint-loader',
-  //   exclude: [ /node_modules/ ]
-  // },
+  {
+    test: /\.ts$/,
+    loader: 'tslint-loader',
+    exclude: [ /node_modules/ ]
+  },
 
   /**
    * Source map loader support for *.js files