Updates dependencies

package-lock.json

@@ -1683,9 +1683,9 @@
             }
         },
         "extend": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
-            "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=",
+            "version": "3.0.2",
+            "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+            "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
             "dev": true
         },
         "extend-shallow": {
@@ -2752,9 +2752,9 @@
             }
         },
         "global-modules-path": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/global-modules-path/-/global-modules-path-2.1.0.tgz",
-            "integrity": "sha512-3DrmGj2TP+96cABk9TfMp6f3knH/Y46dqvWznTU3Tf6/bDGLDAn15tFluQ7BcloykOcdY16U0WGq0BQblYOxJQ==",
+            "version": "2.3.0",
+            "resolved": "https://registry.npmjs.org/global-modules-path/-/global-modules-path-2.3.0.tgz",
+            "integrity": "sha512-HchvMJNYh9dGSCy8pOQ2O8u/hoXaL+0XhnrwH0RyLiSXMMTl9W3N6KUU73+JFOg5PGjtzl6VZzUQsnrpm7Szag==",
             "dev": true
         },
         "graceful-fs": {
@@ -5484,9 +5484,9 @@
             "dev": true
         },
         "tsutils": {
-            "version": "2.28.0",
-            "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.28.0.tgz",
-            "integrity": "sha512-bh5nAtW0tuhvOJnx1GLRn5ScraRLICGyJV5wJhtRWOLsxW70Kk5tZtpK3O/hW6LDnqKS9mlUMPZj9fEMJ0gxqA==",
+            "version": "2.29.0",
+            "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.29.0.tgz",
+            "integrity": "sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==",
             "dev": true,
             "requires": {
                 "tslib": "^1.8.1"
@@ -5897,9 +5897,9 @@
             }
         },
         "webpack": {
-            "version": "4.16.1",
-            "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.16.1.tgz",
-            "integrity": "sha512-6jpzObU18y7lXDJz7XCLvzgrqcJ0rZ2jhKvnTivza9gM2GvPW93xxtmEll2GgmdC0zVQAtbHrH/9BtyMjSDZfA==",
+            "version": "4.16.3",
+            "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.16.3.tgz",
+            "integrity": "sha512-3VcrVoFgzSz1IYgga71YpU3HO89Al5bSnDOj9RJQPsy+FNyI1sFsUyJITn3pktNuaRBlQT0usvKZE3GgkPGAIw==",
             "dev": true,
             "requires": {
                 "@webassemblyjs/ast": "1.5.13",

package.json

@@ -3522,7 +3522,7 @@
         "build": "npm run lint && tsc -m commonjs -p ./ && npm run ui:build -- --env.quick",
         "bundle": "npm run lint && webpack --env.production --context ./src/ui --config ./src/ui/webpack.config.js && webpack --env.production",
         "clean": "git clean -Xdf",
-        "lint": "tslint --project tsconfig.json --fix",
+        "lint": "tslint --project tsconfig.json",
         "pack": "vsce package",
         "pretty": "prettier --config .prettierrc --loglevel warn --write \"./**/*.ts\"",
         "pub": "vsce publish",
@@ -3555,7 +3555,7 @@
         "tslint-prettiest": "0.0.1",
         "typescript": "2.9.2",
         "vscode": "1.1.18",
-        "webpack": "4.16.1",
+        "webpack": "4.16.3",
         "webpack-cli": "3.1.0",
         "webpack-node-externals": "1.7.2"
     }

src/ui/package.json

@@ -20,17 +20,18 @@
     },
     "private": true,
     "scripts": {
-        "build": "webpack --env.production",
-        "build-dev": "webpack",
+        "build": "webpack",
+        "bundle": "npm run lint && webpack --env.production",
+        "lint": "tslint --project tsconfig.json",
         "watch": "webpack --watch"
     },
     "devDependencies": {
         "@types/node": "7.0.67",
-        "@types/webpack": "4.4.7",
+        "@types/webpack": "4.4.8",
         "css-loader": "1.0.0",
         "html-webpack-inline-source-plugin": "0.0.10",
         "html-webpack-plugin": "3.2.0",
-        "imagemin-webpack-plugin": "2.1.5",
+        "imagemin-webpack-plugin": "2.2.0",
         "mini-css-extract-plugin": "0.4.1",
         "node-sass": "4.9.2",
         "sass-loader": "7.0.3",
@@ -38,7 +39,7 @@
         "tslint": "5.11.0",
         "ts-loader": "4.4.2",
         "typescript": "2.9.2",
-        "uglifyjs-webpack-plugin": "1.2.7",
-        "webpack": "4.16.1"
+        "webpack": "4.16.3",
+        "webpack-cli": "3.1.0"
     }
 }

src/ui/webpack.config.js

@@ -5,14 +5,10 @@ const path = require('path');
 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');
+const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 
 module.exports = function(env, argv) {
-    if (env === undefined) {
-        env = {};
-    }
-
+    env = env || {};
     const production = !!env.production;
 
     const quick = !production && !!env.quick;
@@ -34,14 +30,14 @@ module.exports = function(env, argv) {
             // inlineSource: '.(js|css)$',
             minify: minify
                 ? {
-                    removeComments: true,
-                    collapseWhitespace: true,
-                    removeRedundantAttributes: true,
-                    useShortDoctype: true,
-                    removeEmptyAttributes: true,
-                    removeStyleLinkTypeAttributes: true,
-                    keepClosingSlash: true
-                }
+                      removeComments: true,
+                      collapseWhitespace: true,
+                      removeRedundantAttributes: true,
+                      useShortDoctype: true,
+                      removeEmptyAttributes: true,
+                      removeStyleLinkTypeAttributes: true,
+                      keepClosingSlash: true
+                  }
                 : false
         }),
         new HtmlWebpackPlugin({
@@ -54,31 +50,17 @@ module.exports = function(env, argv) {
             // inlineSource: '.(js|css)$',
             minify: minify
                 ? {
-                    removeComments: true,
-                    collapseWhitespace: true,
-                    removeRedundantAttributes: true,
-                    useShortDoctype: true,
-                    removeEmptyAttributes: true,
-                    removeStyleLinkTypeAttributes: true,
-                    keepClosingSlash: true
-                }
+                      removeComments: true,
+                      collapseWhitespace: true,
+                      removeRedundantAttributes: true,
+                      useShortDoctype: true,
+                      removeEmptyAttributes: true,
+                      removeStyleLinkTypeAttributes: true,
+                      keepClosingSlash: true
+                  }
                 : false
         }),
-        new HtmlWebpackInlineSourcePlugin(),
-        new UglifyJsPlugin({
-            parallel: true,
-            sourceMap: sourceMaps,
-            uglifyOptions: {
-                ecma: 5,
-                compress: minify,
-                mangle: minify,
-                output: {
-                    beautify: !minify,
-                    comments: false,
-                    ecma: 5
-                }
-            }
-        })
+        new HtmlWebpackInlineSourcePlugin()
     ];
 
     if (!quick) {
@@ -109,6 +91,7 @@ module.exports = function(env, argv) {
             // main: ['./scss/main.scss']
         },
         mode: production ? 'production' : 'development',
+        devtool: sourceMaps ? 'eval-source-map' : undefined,
         output: {
             filename: '[name].js',
             path: path.resolve(__dirname, '../../', 'out/ui'),
@@ -116,26 +99,25 @@ module.exports = function(env, argv) {
         },
         optimization: {
             splitChunks: {
-              cacheGroups: {
-                styles: {
-                  name: 'styles',
-                  test: /\.css$/,
-                  chunks: 'all',
-                  enforce: true
+                cacheGroups: {
+                    styles: {
+                        name: 'styles',
+                        test: /\.css$/,
+                        chunks: 'all',
+                        enforce: true
+                    }
                 }
-              }
             }
         },
         resolve: {
-            extensions: ['.ts', '.js'],
+            extensions: ['.tsx', '.ts', '.js'],
             modules: [path.resolve(__dirname), 'node_modules']
         },
-        devtool: sourceMaps ? 'eval-source-map' : undefined,
         module: {
             rules: [
                 {
-                    test: /\.ts$/,
-                    use: [{ loader: 'ts-loader' }],
+                    test: /\.tsx?$/,
+                    use: 'ts-loader',
                     exclude: /node_modules/
                 },
                 {

webpack.config.js

@@ -3,10 +3,7 @@ const path = require('path');
 const nodeExternals = require('webpack-node-externals');
 
 module.exports = function(env, argv) {
-    if (env === undefined) {
-        env = {};
-    }
-
+    env = env || {};
     const production = !!env.production;
 
     return {