Merge branch 'master' into performance-optimizations

Conflicts:
	yarn.lock

package.json

@@ -89,7 +89,7 @@
     "angular2-text-mask": "9.0.0",
     "angulartics2": "^6.2.0",
     "body-parser": "1.18.2",
-    "bootstrap": "4.1.3",
+    "bootstrap": "4.3.1",
     "cerialize": "0.1.18",
     "compression": "1.7.1",
     "cookie-parser": "1.4.3",
@@ -111,7 +111,7 @@
     "ng-mocks": "^6.2.1",
     "ng2-file-upload": "1.2.1",
     "ng2-nouislider": "^1.7.11",
-    "ngx-bootstrap": "^3.0.1",
+    "ngx-bootstrap": "^3.2.0",
     "ngx-infinite-scroll": "6.0.1",
     "ngx-moment": "^3.1.0",
     "ngx-pagination": "3.0.3",
@@ -163,6 +163,7 @@
     "copy-webpack-plugin": "^4.4.1",
     "coveralls": "3.0.0",
     "css-loader": "1.0.0",
+    "cssnano": "^4.1.10",
     "deep-freeze": "0.0.1",
     "exports-loader": "^0.7.0",
     "html-webpack-plugin": "^4.0.0-alpha",
@@ -188,6 +189,7 @@
     "node-sass": "^4.11.0",
     "nodemon": "^1.15.0",
     "npm-run-all": "4.1.3",
+    "optimize-css-assets-webpack-plugin": "^5.0.1",
     "postcss": "^7.0.2",
     "postcss-apply": "0.11.0",
     "postcss-cli": "^6.0.0",

webpack/webpack.prod.js

@@ -2,6 +2,8 @@ const webpack = require('webpack');
 const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
 const CompressionPlugin = require("compression-webpack-plugin");
 const UglifyJsPlugin = require('uglifyjs-webpack-plugin');
+const OptimizeCSSAssetsPlugin = require("optimize-css-assets-webpack-plugin");
+const cssnano = require("cssnano");
 
 const {
     root
@@ -18,12 +20,6 @@ module.exports = {
             }
         }),
 
-        // Loader options
-        new webpack.LoaderOptionsPlugin({
-            minimize: true,
-            debug: false
-        }),
-
         new BundleAnalyzerPlugin({
             analyzerMode: 'disabled', // change it to `server` to view bundle stats
             reportFilename: 'report.html',
@@ -64,6 +60,15 @@ module.exports = {
                     },
                     sourceMap: true
                 }
+            }),
+            new OptimizeCSSAssetsPlugin({
+              cssProcessor: cssnano,
+              cssProcessorOptions: {
+                discardComments: {
+                  removeAll: true,
+                }
+              },
+              safe: true
             })
         ]
     },

webpack/webpack.test.js

@@ -241,18 +241,6 @@ module.exports = function (options) {
           'HMR': false,
         }
       }),
-
-      /**
-       * Plugin LoaderOptionsPlugin (experimental)
-       *
-       * See: https://gist.github.com/sokra/27b24881210b56bbaff7
-       */
-      new LoaderOptionsPlugin({
-        debug: false,
-        options: {
-
-        }
-      }),
       new ForkTsCheckerWebpackPlugin()
     ],