Add latest changes from gitlab-org/gitlab@13-1-stable-ee

1 files changed, 28 insertions, 19 deletions

diff --git a/package.json b/package.json
index 82976399171..99614c0acc3 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
     "eslint-report": "eslint --max-warnings 0 --ext .js,.vue --format html --output-file ./eslint-report.html --no-inline-config .",
     "file-coverage": "scripts/frontend/file_test_coverage.js",
     "prejest": "yarn check-dependencies",
-    "jest": "jest --config jest.config.unit.js",
+    "jest": "jest --config jest.config.js",
     "jest-debug": "node --inspect-brk node_modules/.bin/jest --runInBand",
     "jest:integration": "jest --config jest.config.integration.js",
     "jsdoc": "jsdoc -c config/jsdocs.config.js",
@@ -33,19 +33,19 @@
     "webpack-prod": "NODE_OPTIONS=\"--max-old-space-size=3584\" NODE_ENV=production webpack --config config/webpack.config.js"
   },
   "dependencies": {
-    "@babel/core": "^7.8.4",
-    "@babel/plugin-proposal-class-properties": "^7.8.3",
-    "@babel/plugin-proposal-json-strings": "^7.8.3",
-    "@babel/plugin-proposal-private-methods": "^7.8.3",
-    "@babel/plugin-syntax-import-meta": "^7.8.3",
-    "@babel/preset-env": "^7.8.4",
+    "@babel/core": "^7.10.1",
+    "@babel/plugin-proposal-class-properties": "^7.10.1",
+    "@babel/plugin-proposal-json-strings": "^7.10.1",
+    "@babel/plugin-proposal-private-methods": "^7.10.1",
+    "@babel/plugin-syntax-import-meta": "^7.10.1",
+    "@babel/preset-env": "^7.10.1",
     "@gitlab/at.js": "1.5.5",
-    "@gitlab/svgs": "1.127.0",
-    "@gitlab/ui": "14.10.0",
+    "@gitlab/svgs": "1.139.0",
+    "@gitlab/ui": "16.12.1",
     "@gitlab/visual-review-tools": "1.6.1",
-    "@rails/actioncable": "^6.0.3",
+    "@rails/actioncable": "^6.0.3-1",
     "@sentry/browser": "^5.10.2",
-    "@sourcegraph/code-host-integration": "0.0.46",
+    "@sourcegraph/code-host-integration": "0.0.48",
     "@toast-ui/editor": "^2.0.1",
     "@toast-ui/vue-editor": "^2.0.1",
     "apollo-cache-inmemory": "^1.6.3",
@@ -58,10 +58,9 @@
     "axios": "^0.19.0",
     "babel-loader": "^8.0.6",
     "babel-plugin-lodash": "^3.3.4",
-    "bootstrap": "4.3.1",
+    "bootstrap": "4.4.1",
     "brace-expansion": "^1.1.8",
     "cache-loader": "^4.1.0",
-    "chart.js": "2.7.2",
     "classlist-polyfill": "^1.2.0",
     "clipboard": "^1.7.1",
     "codemirror": "^5.48.4",
@@ -71,6 +70,8 @@
     "core-js": "^3.6.4",
     "cropper": "^2.3.0",
     "css-loader": "^2.1.1",
+    "d3": "^5.16.0",
+    "d3-sankey": "^0.12.3",
     "d3-scale": "^2.2.2",
     "d3-selection": "^1.2.0",
     "dateformat": "^3.0.3",
@@ -78,6 +79,7 @@
     "diff": "^3.4.0",
     "document-register-element": "1.14.3",
     "dropzone": "^4.2.0",
+    "editorconfig": "^0.15.3",
     "emoji-regex": "^7.0.3",
     "emoji-unicode-version": "^0.2.1",
     "exports-loader": "^0.7.0",
@@ -100,7 +102,9 @@
     "katex": "^0.10.0",
     "lodash": "^4.17.15",
     "marked": "^0.3.12",
-    "mermaid": "^8.4.8",
+    "mermaid": "^8.5.2",
+    "mersenne-twister": "1.1.0",
+    "minimatch": "^3.0.4",
     "mitt": "^1.2.0",
     "monaco-editor": "^0.18.1",
     "monaco-editor-webpack-plugin": "^1.7.0",
@@ -119,6 +123,7 @@
     "sortablejs": "^1.10.2",
     "sql.js": "^0.4.0",
     "stickyfilljs": "^2.1.0",
+    "string-hash": "1.1.3",
     "style-loader": "^1.1.3",
     "svg4everybody": "2.1.9",
     "swagger-ui-dist": "^3.24.3",
@@ -132,6 +137,7 @@
     "tributejs": "4.1.3",
     "unfetch": "^4.1.0",
     "url-loader": "^3.0.0",
+    "uuid": "8.1.0",
     "visibilityjs": "^1.2.4",
     "vue": "^2.6.10",
     "vue-apollo": "^3.0.3",
@@ -149,7 +155,8 @@
     "xterm": "^3.5.0"
   },
   "devDependencies": {
-    "@babel/plugin-transform-modules-commonjs": "^7.8.3",
+    "acorn": "^6.3.0",
+    "@babel/plugin-transform-modules-commonjs": "^7.10.1",
     "@gitlab/eslint-plugin": "3.1.0",
     "@vue/test-utils": "^1.0.0-beta.30",
     "axios-mock-adapter": "^1.15.0",
@@ -177,7 +184,7 @@
     "jasmine-jquery": "^2.1.1",
     "jest": "^24.1.0",
     "jest-canvas-mock": "^2.1.2",
-    "jest-environment-jsdom": "^24.0.0",
+    "jest-environment-jsdom-sixteen": "^1.0.0",
     "jest-junit": "^6.3.0",
     "jest-util": "^24.0.0",
     "jsdoc": "^3.5.5",
@@ -193,7 +200,7 @@
     "markdownlint-cli": "0.18.0",
     "md5": "^2.2.1",
     "node-sass": "^4.12.0",
-    "nodemon": "^1.18.9",
+    "nodemon": "^2.0.4",
     "pixelmatch": "^4.0.2",
     "postcss": "^7.0.14",
     "prettier": "1.18.2",
@@ -204,6 +211,7 @@
     "timezone-mock": "^1.0.8",
     "vue-jest": "^4.0.0-beta.2",
     "webpack-dev-server": "^3.10.3",
+    "xhr-mock": "^2.5.1",
     "yarn-check-webpack-plugin": "^1.2.0",
     "yarn-deduplicate": "^1.1.1"
   },
@@ -211,8 +219,9 @@
     "bootstrap-vue": "https://docs.gitlab.com/ee/development/fe_guide/dependencies.md#bootstrapvue"
   },
   "resolutions": {
-    "vue-jest/ts-jest": "24.0.0",
-    "monaco-editor": "0.18.1"
+    "chokidar": "^3.4.0",
+    "monaco-editor": "0.18.1",
+    "vue-jest/ts-jest": "24.0.0"
   },
   "engines": {
     "node": ">=10.13.0",