From 6e4e1050d9dba2b7b2523fdd1768823ab85feef4 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Thu, 20 Aug 2020 18:42:06 +0000
Subject: Add latest changes from gitlab-org/gitlab@13-3-stable-ee

---
 package.json | 42 ++++++++++++++++++++++--------------------
 1 file changed, 22 insertions(+), 20 deletions(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index a8dfc5d49a8..99dd3a819b7 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
     "prettier-staged-save": "node ./scripts/frontend/prettier.js save",
     "prettier-all": "node ./scripts/frontend/prettier.js check-all",
     "prettier-all-save": "node ./scripts/frontend/prettier.js save-all",
-    "stylelint": "yarn stylelint-file 'app/assets/stylesheets/**/*.*'  'ee/app/assets/stylesheets/**/*.*' '!**/vendors/**'",
+    "stylelint": "yarn stylelint-file 'app/assets/stylesheets/**/*.*'  'ee/app/assets/stylesheets/**/*.*' '!app/assets/stylesheets/startup/startup-general.scss' '!**/vendors/**'",
     "stylelint-file": "BROWSERSLIST_IGNORE_OLD_DATA=true node node_modules/stylelint/bin/stylelint.js",
     "stylelint-create-utility-map": "node scripts/frontend/stylelint/stylelint-utility-map.js",
     "test": "node scripts/frontend/test",
@@ -42,19 +42,19 @@
     "@babel/plugin-syntax-import-meta": "^7.10.1",
     "@babel/preset-env": "^7.10.1",
     "@gitlab/at.js": "1.5.5",
-    "@gitlab/svgs": "1.152.0",
-    "@gitlab/ui": "17.33.0",
+    "@gitlab/svgs": "1.158.0",
+    "@gitlab/ui": "20.3.1",
     "@gitlab/visual-review-tools": "1.6.1",
     "@rails/actioncable": "^6.0.3-1",
     "@sentry/browser": "^5.10.2",
-    "@sourcegraph/code-host-integration": "0.0.48",
-    "@toast-ui/editor": "^2.2.0",
-    "@toast-ui/vue-editor": "^2.2.0",
-    "apollo-cache-inmemory": "^1.6.3",
-    "apollo-client": "^2.6.4",
-    "apollo-link": "^1.2.11",
-    "apollo-link-batch-http": "^1.2.11",
-    "apollo-upload-client": "^10.0.0",
+    "@sourcegraph/code-host-integration": "0.0.49",
+    "@toast-ui/editor": "^2.3.1",
+    "@toast-ui/vue-editor": "^2.3.1",
+    "apollo-cache-inmemory": "^1.6.6",
+    "apollo-client": "^2.6.10",
+    "apollo-link": "^1.2.14",
+    "apollo-link-batch-http": "^1.2.14",
+    "apollo-upload-client": "^13.0.0",
     "autosize": "^4.0.2",
     "aws-sdk": "^2.637.0",
     "axios": "^0.19.0",
@@ -69,6 +69,7 @@
     "compression-webpack-plugin": "^3.0.1",
     "copy-webpack-plugin": "^5.0.5",
     "core-js": "^3.6.4",
+    "cron-validator": "^1.1.1",
     "cropper": "^2.3.0",
     "css-loader": "^2.1.1",
     "d3": "^5.16.0",
@@ -79,17 +80,18 @@
     "deckar01-task_list": "^2.3.1",
     "diff": "^3.4.0",
     "document-register-element": "1.14.3",
+    "dompurify": "^2.0.11",
     "dropzone": "^4.2.0",
     "editorconfig": "^0.15.3",
     "emoji-regex": "^7.0.3",
     "emoji-unicode-version": "^0.2.1",
     "exports-loader": "^0.7.0",
     "file-loader": "^5.1.0",
+    "font-awesome": "4.7.0",
     "fuzzaldrin-plus": "^0.6.0",
     "glob": "^7.1.6",
-    "graphql": "^14.0.2",
+    "graphql": "^14.7.0",
     "graphql-tag": "^2.10.1",
-    "immer": "^5.2.1",
     "imports-loader": "^0.8.0",
     "ipaddr.js": "^1.9.1",
     "jed": "^1.1.1",
@@ -108,9 +110,11 @@
     "mermaid": "^8.5.2",
     "mersenne-twister": "1.1.0",
     "minimatch": "^3.0.4",
+    "miragejs": "^0.1.40",
+    "mock-apollo-client": "^0.4.0",
     "monaco-editor": "^0.20.0",
     "monaco-editor-webpack-plugin": "^1.9.0",
-    "monaco-yaml": "^2.4.0",
+    "monaco-yaml": "^2.4.1",
     "mousetrap": "^1.4.6",
     "pdfjs-dist": "^2.0.943",
     "pikaday": "^1.8.0",
@@ -120,7 +124,6 @@
     "prosemirror-model": "^1.6.4",
     "raphael": "^2.2.7",
     "raw-loader": "^4.0.0",
-    "sanitize-html": "^1.22.0",
     "select2": "3.5.2-browserify",
     "smooshpack": "^0.0.62",
     "sortablejs": "^1.10.2",
@@ -157,15 +160,14 @@
   },
   "devDependencies": {
     "@babel/plugin-transform-modules-commonjs": "^7.10.1",
-    "@gitlab/eslint-plugin": "3.1.0",
+    "@gitlab/eslint-plugin": "3.2.0",
     "@testing-library/dom": "^7.16.2",
-    "@vue/test-utils": "^1.0.0-beta.30",
+    "@vue/test-utils": "1.0.0-beta.30",
     "acorn": "^6.3.0",
     "axios-mock-adapter": "^1.15.0",
     "babel-jest": "^24.1.0",
     "babel-plugin-dynamic-import-node": "^2.2.0",
     "babel-plugin-istanbul": "^5.1.0",
-    "babel-plugin-rewire": "^1.2.0",
     "chalk": "^2.4.1",
     "commander": "^2.18.0",
     "custom-jquery-matchers": "^2.1.0",
@@ -198,7 +200,7 @@
     "karma-mocha-reporter": "^2.2.5",
     "karma-sourcemap-loader": "^0.3.7",
     "karma-webpack": "^4.0.2",
-    "markdownlint-cli": "0.18.0",
+    "markdownlint-cli": "0.23.2",
     "md5": "^2.2.1",
     "node-sass": "^4.12.0",
     "nodemon": "^2.0.4",
@@ -210,7 +212,7 @@
     "stylelint-config-recommended": "^2.2.0",
     "stylelint-scss": "^3.9.2",
     "timezone-mock": "^1.0.8",
-    "vue-jest": "^4.0.0-beta.2",
+    "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",
-- 
cgit v1.2.3