Update dependencies (#826)

* update dependencies in migrations/fixtures

* update dependencies in web dir

kotsadm/migrations/fixtures/package.json

@@ -6,15 +6,15 @@
   "main": "./build/fixtures.js",
   "dependencies": {
     "js-yaml": "^3.13.1",
-    "lodash": "^4.17.13",
+    "lodash": "^4.17.19",
     "pg-escape": "^0.2.0",
     "source-map-support": "^0.5.0",
     "yargs": "^13.2.2"
   },
   "devDependencies": {
     "@types/node": "^11.13.4",
-    "ts-node": "^7.0.1",
-    "tslint": "^5.11.0",
+    "ts-node": "8.10.2",
+    "tslint": "6.1.2",
     "typescript": "^3.1.1"
   },
   "bin": "build/fixtures.js",

kotsadm/web/.eslintrc

@@ -39,7 +39,9 @@
     "react/jsx-no-duplicate-props": [2],
     "react/jsx-no-target-blank": [1],
     "no-useless-escape": [1],
-    "template-curly-spacing": "off"
+    "template-curly-spacing": "off",
+    "no-useless-catch": "off",
+    "no-prototype-builtins": "off"
   },
   "settings": {
     "react": {

kotsadm/web/Dockerfile.skaffold

@@ -1,4 +1,4 @@
-FROM node:8
+FROM node:10
 EXPOSE 3000 9229
 
 ADD ./package.json /src/package.json

kotsadm/web/package.json

@@ -31,22 +31,22 @@
     }
   },
   "devDependencies": {
-    "@babel/core": "^7.4.4",
-    "@babel/plugin-proposal-class-properties": "^7.4.4",
-    "@babel/plugin-proposal-decorators": "^7.4.4",
-    "@babel/plugin-proposal-object-rest-spread": "^7.4.4",
-    "@babel/plugin-proposal-optional-chaining": "^7.2.0",
-    "@babel/preset-env": "^7.4.4",
-    "@babel/preset-react": "^7.0.0",
+    "@babel/core": "7.10.5",
+    "@babel/plugin-proposal-class-properties": "7.10.4",
+    "@babel/plugin-proposal-decorators": "7.10.5",
+    "@babel/plugin-proposal-object-rest-spread": "7.10.4",
+    "@babel/plugin-proposal-optional-chaining": "7.10.4",
+    "@babel/preset-env": "7.10.4",
+    "@babel/preset-react": "7.10.4",
     "@pact-foundation/pact": "^8.2.4",
     "@pact-foundation/pact-node": "^8.3.2",
-    "apollo-link-context": "^1.0.17",
-    "autoprefixer": "^9.5.1",
+    "apollo-link-context": "1.0.20",
+    "autoprefixer": "9.8.5",
     "babel-cli": "^6.26.0",
     "babel-core": "7.0.0-bridge.0",
-    "babel-eslint": "^10.0.1",
+    "babel-eslint": "10.1.0",
     "babel-jest": "^24.8.0",
-    "babel-loader": "^8.0.6",
+    "babel-loader": "8.1.0",
     "babel-plugin-transform-class-properties": "^6.24.1",
     "babel-plugin-transform-dynamic-import": "^2.1.0",
     "babel-plugin-transform-object-rest-spread": "^6.26.0",
@@ -58,107 +58,105 @@
     "chai": "^4.2.0",
     "chai-as-promised": "^7.1.1",
     "chai-string": "^1.5.0",
-    "copy-webpack-plugin": "^5.0.3",
-    "cross-env": "^5.2.0",
-    "css-loader": "^2.1.1",
+    "css-loader": "3.6.0",
     "cssnano": "^4.1.10",
-    "enzyme": "^3.9.0",
-    "enzyme-to-json": "^3.3.4",
-    "eslint": "^5.16.0",
-    "eslint-config-standard": "^12.0.0",
-    "eslint-loader": "^2.1.1",
-    "eslint-plugin-import": "^2.17.2",
-    "eslint-plugin-node": "^9.0.1",
-    "eslint-plugin-promise": "^4.0.1",
-    "eslint-plugin-react": "^7.13.0",
-    "eslint-plugin-standard": "^4.0.0",
+    "enzyme": "3.11.0",
+    "enzyme-to-json": "3.5.0",
+    "eslint": "7.5.0",
+    "eslint-config-standard": "14.1.1",
+    "eslint-loader": "4.0.2",
+    "eslint-plugin-import": "2.22.0",
+    "eslint-plugin-node": "11.1.0",
+    "eslint-plugin-promise": "4.2.1",
+    "eslint-plugin-react": "7.20.3",
+    "eslint-plugin-standard": "4.0.1",
     "extract-text-webpack-plugin": "^3.0.2",
-    "favicons-webpack-plugin": "^0.0.9",
-    "file-loader": "^3.0.1",
+    "favicons-webpack-plugin": "2.1.0",
+    "file-loader": "6.0.0",
     "html-webpack-plugin": "^3.2.0",
     "html-webpack-template": "^6.2.0",
-    "jest": "^24.8.0",
+    "jest": "26.1.0",
     "jsonwebtoken": "^8.5.1",
-    "mini-css-extract-plugin": "^0.7.0",
+    "mini-css-extract-plugin": "0.9.0",
     "node-sass": "^4.12.0",
     "object-assign": "^4.1.1",
     "postcss-loader": "^3.0.0",
     "prop-types": "^15.7.2",
     "react": "^16.8.6",
     "react-dom": "npm:@hot-loader/react-dom",
-    "react-hot-loader": "^4.11.0",
+    "react-hot-loader": "4.12.21",
     "react-router": "^5.0.0",
     "react-router-dom": "^5.0.0",
-    "sass-loader": "^7.1.0",
-    "script-ext-html-webpack-plugin": "^2.1.3",
+    "sass-loader": "9.0.2",
+    "script-ext-html-webpack-plugin": "2.1.4",
     "source-map-loader": "^0.2.4",
-    "style-loader": "^0.23.1",
-    "svg-url-loader": "^2.3.2",
-    "terser-webpack-plugin": "^1.3.0",
-    "uglify-js": "^3.5.14",
-    "uglifyjs-webpack-plugin": "^2.1.3",
-    "url-loader": "^1.1.2",
-    "webpack": "^4.32.0",
-    "webpack-bundle-analyzer": "^3.3.2",
-    "webpack-cli": "^3.3.2",
-    "webpack-dev-server": "^3.4.1",
-    "webpack-merge": "4.2.1"
+    "style-loader": "1.2.1",
+    "svg-url-loader": "6.0.0",
+    "terser-webpack-plugin": "3.0.7",
+    "uglify-js": "3.10.0",
+    "uglifyjs-webpack-plugin": "2.2.0",
+    "url-loader": "4.1.0",
+    "webpack": "4.43.0",
+    "webpack-bundle-analyzer": "3.8.0",
+    "webpack-cli": "3.3.12",
+    "webpack-dev-server": "3.11.0",
+    "webpack-merge": "5.0.9"
   },
   "dependencies": {
-    "@babel/plugin-syntax-dynamic-import": "^7.2.0",
+    "@babel/plugin-syntax-dynamic-import": "7.8.3",
     "@bugsnag/js": "^6.2.0",
     "@bugsnag/plugin-react": "^6.2.0",
     "@grafana/ui": "^6.4.3",
     "@maji/react-prism": "^1.0.1",
     "@replicatedhq/ship-init": "1.6.22",
     "@types/file-saver": "^2.0.1",
-    "apexcharts": "^3.15.2",
-    "apollo-cache-inmemory": "^1.5.1",
-    "apollo-client": "^2.5.1",
-    "apollo-link": "^1.2.11",
-    "apollo-link-error": "^1.1.10",
-    "apollo-link-http": "^1.5.14",
+    "apexcharts": "3.19.3",
+    "apollo-cache-inmemory": "1.6.6",
+    "apollo-client": "2.6.10",
+    "apollo-link": "1.2.14",
+    "apollo-link-error": "1.1.13",
+    "apollo-link-http": "1.5.17",
     "apollo-link-rest": "^0.4.4",
     "apollo-link-state": "^0.4.2",
     "babel-plugin-syntax-dynamic-import": "^6.18.0",
     "change-case": "^3.1.0",
     "classnames": "^2.2.6",
-    "clipboard": "^2.0.4",
-    "cronstrue": "^1.84.0",
-    "dayjs": "^1.8.14",
+    "clipboard": "2.0.6",
+    "cronstrue": "^1.96.0",
+    "dayjs": "1.8.29",
     "diff": "^4.0.2",
     "downloadjs": "^1.4.7",
-    "enzyme-adapter-react-16": "^1.13.1",
+    "enzyme-adapter-react-16": "1.15.2",
     "file-saver": "^2.0.2",
     "graphql": "^14.3.0",
-    "graphql-tag": "^2.10.1",
-    "handlebars": "^4.5.1",
+    "graphql-tag": "2.10.4",
+    "handlebars": "^4.7.6",
     "history": "^4.9.0",
     "isomorphic-fetch": "^2.2.1",
-    "jest-enzyme": "^6.0.4",
-    "js-yaml": "^3.13.1",
+    "jest-enzyme": "7.1.2",
+    "js-yaml": "3.14.0",
     "markdown-it": "^10.0.0",
     "moment": "^2.24.0",
     "monaco-editor": "0.14.3",
     "monaco-editor-webpack-plugin": "^1.5.4",
-    "prismjs": "^1.17.1",
-    "query-string": "^6.11.0",
+    "prismjs": "1.20.0",
+    "query-string": "6.13.1",
     "randomstring": "^1.1.5",
     "rc-progress": "^2.5.2",
-    "react-apexcharts": "^1.3.6",
+    "react-apexcharts": "1.3.7",
     "react-apollo": "^2.5.5",
     "react-dropzone": "^4.2.9",
     "react-favicon": "^0.0.17",
     "react-helmet": "^5.2.1",
-    "react-modal": "^3.8.1",
+    "react-modal": "3.11.2",
     "react-monaco-editor": "0.18.0",
     "react-select": "^2.4.3",
     "react-tooltip": "4.2.6",
     "react-vis": "^1.11.7",
     "trim": "^0.0.1",
     "truncate-middle": "^1.0.6",
     "urlize": "^0.2.1",
-    "webpack-bugsnag-plugins": "1.4.0"
+    "webpack-bugsnag-plugins": "^1.4.3"
   },
   "browserslist": [
     "> 1%",

kotsadm/web/webpack.config.dist.js

@@ -2,7 +2,6 @@ var webpack = require("webpack");
 var path = require("path");
 var srcPath = path.join(__dirname, "src");
 const TerserPlugin = require("terser-webpack-plugin");
-const CopyWebpackPlugin = require("copy-webpack-plugin");
 const { BugsnagSourceMapUploaderPlugin } = require("webpack-bugsnag-plugins");
 
 function getPlugins(appEnv, env) {
@@ -20,21 +19,6 @@ function getPlugins(appEnv, env) {
     }));
   }
 
-  if (env !== "enterprise") {
-    plugins.push(
-      new CopyWebpackPlugin([
-        {
-          from: "./src/services/prodPerfect.js",
-          transform: function (content) {
-            var contentS = content.toString("utf8");
-            contentS = contentS.replace("@@PROD_PERFECT_WRITE_KEY", appEnv.PROD_PERFECT_WRITE_KEY);
-            return contentS.toString(new Buffer(contentS));
-          }
-        }
-      ]),
-    );
-  }
-
   return plugins;
 }
 

kotsadm/web/webpack.config.js

@@ -1,5 +1,5 @@
 const path = require("path");
-const webpackMerge = require("webpack-merge");
+const { merge } = require("webpack-merge");
 const webpack = require("webpack");
 const HtmlWebpackPlugin = require("html-webpack-plugin");
 const HtmlWebpackTemplate = require("html-webpack-template");
@@ -109,7 +109,16 @@ module.exports = function (env) {
         },
         {
           test: /\.woff(2)?(\?v=\d+\.\d+\.\d+)?$/,
-          loader: "url-loader?limit=10000&mimetype=application/font-woff&name=./assets/[hash].[ext]",
+          use: [
+            {
+              loader: "url-loader",
+              options: {
+                limit: 10000,
+                mimetype: "application/font-woff",
+                name: "./assets/[hash].[ext]"
+              }
+            }
+          ]
         },
       ],
     },
@@ -187,9 +196,9 @@ module.exports = function (env) {
 
   if (env === "skaffold" || !env) {
     var dev = require("./webpack.config.dev");
-    return webpackMerge(common, dev);
+    return merge(common, dev);
   } else {
     var dist = require("./webpack.config.dist");
-    return webpackMerge(common, dist(env));
+    return merge(common, dist(env));
   }
 };