Updates dependencies

package-lock.json

@@ -27,9 +27,9 @@
             "dev": true
         },
         "@types/node": {
-            "version": "10.0.3",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-10.0.3.tgz",
-            "integrity": "sha512-J7nx6JzxmtT4zyvfLipYL7jNaxvlCWpyG7JhhCQ4fQyG+AGfovAHoYR55TFx+X8akfkUJYpt5JG6GPeFMjZaCQ==",
+            "version": "10.0.4",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-10.0.4.tgz",
+            "integrity": "sha512-RisaZmcmCLjRipAY7nVi3fmkIk4Z0JMn8YHdGF6qYMsIDpD0dfzz+3yy2dL5Q5aHWOnqPx51IRxkA44myknJvw==",
             "dev": true
         },
         "@types/tmp": {
@@ -1825,9 +1825,9 @@
             "dev": true
         },
         "colors": {
-            "version": "1.2.3",
-            "resolved": "https://registry.npmjs.org/colors/-/colors-1.2.3.tgz",
-            "integrity": "sha512-qTfM2pNFeMZcLvf/RbrVAzDEVttZjFhaApfx9dplNjvHSX88Ui66zBRb/4YGob/xUWxDceirgoC1lT676asfCQ==",
+            "version": "1.2.4",
+            "resolved": "https://registry.npmjs.org/colors/-/colors-1.2.4.tgz",
+            "integrity": "sha512-6Y+iBnWmXL+AWtlOp2Vr6R2w5MUlNJRwR0ShVFaAb1CqWzhPOpQg4L0jxD+xpw/Nc8QJwaq3KM79QUCriY8CWQ==",
             "dev": true
         },
         "combined-stream": {
@@ -2262,9 +2262,9 @@
             "dev": true
         },
         "duplexify": {
-            "version": "3.5.4",
-            "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.4.tgz",
-            "integrity": "sha512-JzYSLYMhoVVBe8+mbHQ4KgpvHpm0DZpJuL8PY93Vyv1fW7jYJ90LoXa1di/CVbJM+TgMs91rbDapE/RNIfnJsA==",
+            "version": "3.6.0",
+            "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.6.0.tgz",
+            "integrity": "sha512-fO3Di4tBKJpYTFHAxTU00BcfWMY9w24r/x21a6rZRbsD/ToUgGxsMbiGRmB7uVAXeGKXD9MwiLZa5E97EVgIRQ==",
             "dev": true,
             "requires": {
                 "end-of-stream": "^1.0.0",
@@ -5841,9 +5841,9 @@
             }
         },
         "merge2": {
-            "version": "1.2.1",
-            "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.1.tgz",
-            "integrity": "sha512-wUqcG5pxrAcaFI1lkqkMnk3Q7nUxV/NWfpAFSeWUwG9TRODnBDCUHa75mi3o3vLWQ5N4CQERWCauSlP0I3ZqUg==",
+            "version": "1.2.2",
+            "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.2.tgz",
+            "integrity": "sha512-bgM8twH86rWni21thii6WCMQMRMmwqqdW3sGWi9IipnVAszdLXRjwDwAnyrVXo6DuP3AjRMMttZKUB48QWIFGg==",
             "dev": true
         },
         "micromatch": {
@@ -6849,12 +6849,12 @@
             }
         },
         "pumpify": {
-            "version": "1.4.0",
-            "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.4.0.tgz",
-            "integrity": "sha512-2kmNR9ry+Pf45opRVirpNuIFotsxUGLaYqxIwuR77AYrYRMuFCz9eryHBS52L360O+NcR383CL4QYlMKPq4zYA==",
+            "version": "1.5.0",
+            "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.0.tgz",
+            "integrity": "sha512-UWi0klDoq8xtVzlMRgENV9F7iCTZExaJQSQL187UXsxpk9NnrKGqTqqUNYAKGOzucSOxs2+jUnRNI+rLviPhJg==",
             "dev": true,
             "requires": {
-                "duplexify": "^3.5.3",
+                "duplexify": "^3.6.0",
                 "inherits": "^2.0.3",
                 "pump": "^2.0.0"
             }
@@ -6866,9 +6866,9 @@
             "dev": true
         },
         "qs": {
-            "version": "6.5.1",
-            "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz",
-            "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==",
+            "version": "6.5.2",
+            "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
+            "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
             "dev": true
         },
         "query-string": {
@@ -8153,9 +8153,9 @@
             "integrity": "sha512-f/qGG2tUkrISBlQZEjEqoZ3B2+npJjIf04H1wuAv9iA8i04Icp+61KRXxFdha22670NJopsZCIjhC3SnjPRKrQ=="
         },
         "tslint": {
-            "version": "5.9.1",
-            "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.9.1.tgz",
-            "integrity": "sha1-ElX4ej/1frCw4fDmEKi0dIBGya4=",
+            "version": "5.10.0",
+            "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.10.0.tgz",
+            "integrity": "sha1-EeJrzLiK+gLdDZlWyuPUVAtfVMM=",
             "dev": true,
             "requires": {
                 "babel-code-frame": "^6.22.0",
@@ -8690,9 +8690,9 @@
             }
         },
         "webpack": {
-            "version": "4.6.0",
-            "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.6.0.tgz",
-            "integrity": "sha512-Fu/k/3fZeGtIhuFkiYpIy1UDHhMiGKjG4FFPVuvG+5Os2lWA1ttWpmi9Qnn6AgfZqj9MvhZW/rmj/ip+nHr06g==",
+            "version": "4.7.0",
+            "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.7.0.tgz",
+            "integrity": "sha512-OXOAip9mjy0ahFYCXu6LLNzTiIQzd2UOHkNHANc/dyxf8CYCgcJ5UKsTXfbfeJb4tqkKb6B1FIQ9Xtl6gftb8Q==",
             "dev": true,
             "requires": {
                 "acorn": "^5.0.0",

package.json

@@ -3036,16 +3036,16 @@
     },
     "devDependencies": {
         "@types/copy-paste": "1.1.30",
-        "@types/node": "10.0.3",
+        "@types/node": "10.0.4",
         "@types/tmp": "0.0.33",
         "husky": "0.14.3",
         "ts-loader": "4.2.0",
-        "tslint": "5.9.1",
+        "tslint": "5.10.0",
         "typescript": "2.8.3",
         "uglify-es": "3.3.9",
         "uglifyjs-webpack-plugin": "1.2.5",
         "vscode": "1.1.17",
-        "webpack": "4.6.0",
+        "webpack": "4.7.0",
         "webpack-cli": "2.1.2",
         "webpack-node-externals": "1.7.2"
     }

src/ui/package-lock.json

@@ -5,9 +5,9 @@
     "requires": true,
     "dependencies": {
         "@types/node": {
-            "version": "10.0.3",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-10.0.3.tgz",
-            "integrity": "sha512-J7nx6JzxmtT4zyvfLipYL7jNaxvlCWpyG7JhhCQ4fQyG+AGfovAHoYR55TFx+X8akfkUJYpt5JG6GPeFMjZaCQ==",
+            "version": "10.0.4",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-10.0.4.tgz",
+            "integrity": "sha512-RisaZmcmCLjRipAY7nVi3fmkIk4Z0JMn8YHdGF6qYMsIDpD0dfzz+3yy2dL5Q5aHWOnqPx51IRxkA44myknJvw==",
             "dev": true
         },
         "@types/tapable": {
@@ -588,15 +588,6 @@
             "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
             "dev": true
         },
-        "async": {
-            "version": "2.6.0",
-            "resolved": "https://registry.npmjs.org/async/-/async-2.6.0.tgz",
-            "integrity": "sha512-xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw==",
-            "dev": true,
-            "requires": {
-                "lodash": "^4.14.0"
-            }
-        },
         "async-each": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz",
@@ -2581,9 +2572,9 @@
             "dev": true
         },
         "duplexify": {
-            "version": "3.5.4",
-            "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.4.tgz",
-            "integrity": "sha512-JzYSLYMhoVVBe8+mbHQ4KgpvHpm0DZpJuL8PY93Vyv1fW7jYJ90LoXa1di/CVbJM+TgMs91rbDapE/RNIfnJsA==",
+            "version": "3.6.0",
+            "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.6.0.tgz",
+            "integrity": "sha512-fO3Di4tBKJpYTFHAxTU00BcfWMY9w24r/x21a6rZRbsD/ToUgGxsMbiGRmB7uVAXeGKXD9MwiLZa5E97EVgIRQ==",
             "dev": true,
             "requires": {
                 "end-of-stream": "^1.0.0",
@@ -2922,18 +2913,6 @@
                 }
             }
         },
-        "extract-text-webpack-plugin": {
-            "version": "4.0.0-beta.0",
-            "resolved": "https://registry.npmjs.org/extract-text-webpack-plugin/-/extract-text-webpack-plugin-4.0.0-beta.0.tgz",
-            "integrity": "sha512-Hypkn9jUTnFr0DpekNam53X47tXn3ucY08BQumv7kdGgeVUBLq3DJHJTi6HNxv4jl9W+Skxjz9+RnK0sJyqqjA==",
-            "dev": true,
-            "requires": {
-                "async": "^2.4.1",
-                "loader-utils": "^1.1.0",
-                "schema-utils": "^0.4.5",
-                "webpack-sources": "^1.1.0"
-            }
-        },
         "extsprintf": {
             "version": "1.3.0",
             "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
@@ -6049,6 +6028,16 @@
             "integrity": "sha1-3z02Uqc/3ta5sLJBRub9BSNTRY4=",
             "dev": true
         },
+        "mini-css-extract-plugin": {
+            "version": "0.4.0",
+            "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.4.0.tgz",
+            "integrity": "sha512-2Zik6PhUZ/MbiboG6SDS9UTPL4XXy4qnyGjSdCIWRrr8xb6PwLtHE+AYOjkXJWdF0OG8vo/yrJ8CgS5WbMpzIg==",
+            "dev": true,
+            "requires": {
+                "loader-utils": "^1.1.0",
+                "webpack-sources": "^1.1.0"
+            }
+        },
         "minimalistic-assert": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
@@ -6405,12 +6394,6 @@
                     "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
                     "dev": true
                 },
-                "punycode": {
-                    "version": "1.4.1",
-                    "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-                    "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
-                    "dev": true
-                },
                 "readable-stream": {
                     "version": "2.3.6",
                     "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
@@ -8051,20 +8034,20 @@
             }
         },
         "pumpify": {
-            "version": "1.4.0",
-            "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.4.0.tgz",
-            "integrity": "sha512-2kmNR9ry+Pf45opRVirpNuIFotsxUGLaYqxIwuR77AYrYRMuFCz9eryHBS52L360O+NcR383CL4QYlMKPq4zYA==",
+            "version": "1.5.0",
+            "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.0.tgz",
+            "integrity": "sha512-UWi0klDoq8xtVzlMRgENV9F7iCTZExaJQSQL187UXsxpk9NnrKGqTqqUNYAKGOzucSOxs2+jUnRNI+rLviPhJg==",
             "dev": true,
             "requires": {
-                "duplexify": "^3.5.3",
+                "duplexify": "^3.6.0",
                 "inherits": "^2.0.3",
                 "pump": "^2.0.0"
             }
         },
         "punycode": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.0.tgz",
-            "integrity": "sha1-X4Y+3Im5bbCQdLrXlHvwkFbKTn0=",
+            "version": "1.4.1",
+            "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+            "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
             "dev": true
         },
         "q": {
@@ -9690,14 +9673,6 @@
             "dev": true,
             "requires": {
                 "punycode": "^1.4.1"
-            },
-            "dependencies": {
-                "punycode": {
-                    "version": "1.4.1",
-                    "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-                    "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
-                    "dev": true
-                }
             }
         },
         "trim-newlines": {
@@ -10091,9 +10066,9 @@
             "dev": true
         },
         "tslint": {
-            "version": "5.9.1",
-            "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.9.1.tgz",
-            "integrity": "sha1-ElX4ej/1frCw4fDmEKi0dIBGya4=",
+            "version": "5.10.0",
+            "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.10.0.tgz",
+            "integrity": "sha1-EeJrzLiK+gLdDZlWyuPUVAtfVMM=",
             "dev": true,
             "requires": {
                 "babel-code-frame": "^6.22.0",
@@ -10399,6 +10374,14 @@
             "dev": true,
             "requires": {
                 "punycode": "^2.1.0"
+            },
+            "dependencies": {
+                "punycode": {
+                    "version": "2.1.0",
+                    "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.0.tgz",
+                    "integrity": "sha1-X4Y+3Im5bbCQdLrXlHvwkFbKTn0=",
+                    "dev": true
+                }
             }
         },
         "urix": {
@@ -10710,9 +10693,9 @@
             }
         },
         "webpack": {
-            "version": "4.6.0",
-            "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.6.0.tgz",
-            "integrity": "sha512-Fu/k/3fZeGtIhuFkiYpIy1UDHhMiGKjG4FFPVuvG+5Os2lWA1ttWpmi9Qnn6AgfZqj9MvhZW/rmj/ip+nHr06g==",
+            "version": "4.7.0",
+            "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.7.0.tgz",
+            "integrity": "sha512-OXOAip9mjy0ahFYCXu6LLNzTiIQzd2UOHkNHANc/dyxf8CYCgcJ5UKsTXfbfeJb4tqkKb6B1FIQ9Xtl6gftb8Q==",
             "dev": true,
             "requires": {
                 "acorn": "^5.0.0",

src/ui/package.json

@@ -24,20 +24,20 @@
         "build-dev": "webpack"
     },
     "devDependencies": {
-        "@types/node": "10.0.3",
+        "@types/node": "10.0.4",
         "@types/webpack": "4.1.4",
         "css-loader": "0.28.11",
-        "extract-text-webpack-plugin": "4.0.0-beta.0",
         "html-webpack-inline-source-plugin": "0.0.10",
         "html-webpack-plugin": "3.2.0",
         "imagemin-webpack-plugin": "2.1.1",
+        "mini-css-extract-plugin": "0.4.0",
         "node-sass": "4.9.0",
         "sass-loader": "7.0.1",
         "style-loader": "0.21.0",
-        "tslint": "5.9.1",
+        "tslint": "5.10.0",
         "ts-loader": "4.2.0",
         "typescript": "2.8.3",
         "uglifyjs-webpack-plugin": "1.2.5",
-        "webpack": "4.6.0"
+        "webpack": "4.7.0"
     }
 }

src/ui/webpack.config.js

@@ -2,10 +2,10 @@
 const webpack = require('webpack');
 const glob = require('glob');
 const path = require('path');
-const ExtractTextPlugin = require('extract-text-webpack-plugin');
 const HtmlWebpackInlineSourcePlugin = require('html-webpack-inline-source-plugin');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 const ImageminPlugin = require('imagemin-webpack-plugin').default;
+const MiniCssExtractPlugin = require("mini-css-extract-plugin");
 const UglifyJsPlugin = require('uglifyjs-webpack-plugin');
 
 module.exports = function(env, argv) {
@@ -21,8 +21,8 @@ module.exports = function(env, argv) {
 
     const plugins = [
         new webpack.optimize.ModuleConcatenationPlugin(),
-        new ExtractTextPlugin({
-            filename: 'main.css'
+        new MiniCssExtractPlugin({
+            filename: '[name].css'
         }),
         new HtmlWebpackPlugin({
             excludeAssets: [/.*\.main\.js/],
@@ -114,6 +114,18 @@ module.exports = function(env, argv) {
             path: path.resolve(__dirname, '../../', 'out/ui'),
             publicPath: '{{root}}/out/ui/'
         },
+        optimization: {
+            splitChunks: {
+              cacheGroups: {
+                styles: {
+                  name: 'styles',
+                  test: /\.css$/,
+                  chunks: 'all',
+                  enforce: true
+                }
+              }
+            }
+        },
         resolve: {
             extensions: ['.ts', '.js'],
             modules: [path.resolve(__dirname), 'node_modules']
@@ -128,25 +140,25 @@ module.exports = function(env, argv) {
                 },
                 {
                     test: /\.scss$/,
-                    use: ExtractTextPlugin.extract({
-                        fallback: 'style-loader',
-                        use: [
-                            {
-                                loader: 'css-loader',
-                                options: {
-                                    minimize: minify,
-                                    sourceMap: sourceMaps,
-                                    url: false
-                                }
-                            },
-                            {
-                                loader: 'sass-loader',
-                                options: {
-                                    sourceMap: sourceMaps
-                                }
+                    use: [
+                        {
+                            loader: MiniCssExtractPlugin.loader
+                        },
+                        {
+                            loader: 'css-loader',
+                            options: {
+                                minimize: minify,
+                                sourceMap: sourceMaps,
+                                url: false
+                            }
+                        },
+                        {
+                            loader: 'sass-loader',
+                            options: {
+                                sourceMap: sourceMaps
                             }
-                        ]
-                    }),
+                        }
+                    ],
                     exclude: /node_modules/
                 }
             ]