2 files changed, 44 insertions, 21 deletions

diff --git a/client/config/webpack.common.js b/client/config/webpack.common.js
index 80d77b400..6067d94e7 100644
--- a/client/config/webpack.common.js
+++ b/client/config/webpack.common.js
@@ -119,8 +119,25 @@ module.exports = function (options) {
 
         {
           test: /\.(sass|scss)$/,
-          use: ['css-to-string-loader', 'css-loader?sourceMap', 'resolve-url-loader', 'sass-loader?sourceMap'],
-          exclude: [ helpers.root('src', 'styles') ]
+          use: [
+            'css-to-string-loader',
+            'css-loader?sourceMap',
+            'resolve-url-loader',
+            {
+              loader: 'sass-loader',
+              options: {
+                sourceMap: true
+              }
+            },
+            {
+              loader: 'sass-resources-loader',
+              options: {
+                resources: [
+                  helpers.root('src/sass/_variables.scss')
+                ]
+              }
+            }
+          ]
         },
         { test: /\.woff(2)?(\?v=[0-9]\.[0-9]\.[0-9])?$/, use: 'url-loader?limit=10000&minetype=application/font-woff' },
         { test: /\.(ttf|eot|svg)(\?v=[0-9]\.[0-9]\.[0-9])?$/, use: 'file-loader' },
@@ -133,7 +150,10 @@ module.exports = function (options) {
         {
           test: /\.html$/,
           loader: 'raw-loader',
-          exclude: [ helpers.root('src/index.html'), helpers.root('src/standalone/videos/embed.html') ]
+          exclude: [
+            helpers.root('src/index.html'),
+            helpers.root('src/standalone/videos/embed.html')
+          ]
         }
 
       ]
@@ -262,7 +282,8 @@ module.exports = function (options) {
       new LoaderOptionsPlugin({
         options: {
           sassLoader: {
-            precision: 10
+            precision: 10,
+            includePaths: [ helpers.root('src/sass') ]
           }
         }
       }),
diff --git a/client/config/webpack.dev.js b/client/config/webpack.dev.js
index 3468dba78..5e0f36d7f 100644
--- a/client/config/webpack.dev.js
+++ b/client/config/webpack.dev.js
@@ -90,23 +90,24 @@ module.exports = function (env) {
 
     module: {
 
-      rules: [
-        {
-          test: /\.ts$/,
-          use: [
-            {
-              loader: 'tslint-loader',
-              options: {
-                configFile: 'tslint.json'
-              }
-            }
-          ],
-          exclude: [
-            /\.(spec|e2e)\.ts$/,
-            /node_modules\//
-          ]
-        }
-      ]
+      // Too slow, life is short
+      // rules: [
+      //   {
+      //     test: /\.ts$/,
+      //     use: [
+      //       {
+      //         loader: 'tslint-loader',
+      //         options: {
+      //           configFile: 'tslint.json'
+      //         }
+      //       }
+      //     ],
+      //     exclude: [
+      //       /\.(spec|e2e)\.ts$/,
+      //       /node_modules\//
+      //     ]
+      //   }
+      // ]
     },
 
     plugins: [
@@ -202,6 +203,7 @@ module.exports = function (env) {
           tslint: {
             emitErrors: false,
             failOnHint: false,
+            typeCheck: true,
             resourcePath: 'src'
           },