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

1 files changed, 15 insertions, 11 deletions

diff --git a/package.json b/package.json
index bd2ded48e03..82976399171 100644
--- a/package.json
+++ b/package.json
@@ -4,14 +4,15 @@
     "check-dependencies": "scripts/frontend/check_dependencies.sh",
     "block-dependencies": "node scripts/frontend/block_dependencies.js",
     "clean": "rm -rf public/assets tmp/cache/*-loader",
-    "dev-server": "NODE_OPTIONS=\"--max-old-space-size=3584\" nodemon -w 'config/webpack.config.js' --exec 'webpack-dev-server --config config/webpack.config.js'",
+    "dev-server": "NODE_OPTIONS=\"--max-old-space-size=3584\" node scripts/frontend/webpack_dev_server.js",
     "eslint": "eslint --cache --max-warnings 0 --report-unused-disable-directives --ext .js,.vue .",
     "eslint-fix": "eslint --cache --max-warnings 0 --report-unused-disable-directives --ext .js,.vue --fix .",
     "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",
+    "jest": "jest --config jest.config.unit.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",
     "prekarma": "yarn check-dependencies",
     "karma": "BABEL_ENV=${BABEL_ENV:=karma} karma start --single-run true config/karma.config.js",
@@ -39,11 +40,14 @@
     "@babel/plugin-syntax-import-meta": "^7.8.3",
     "@babel/preset-env": "^7.8.4",
     "@gitlab/at.js": "1.5.5",
-    "@gitlab/svgs": "1.121.0",
-    "@gitlab/ui": "12.1.0",
+    "@gitlab/svgs": "1.127.0",
+    "@gitlab/ui": "14.10.0",
     "@gitlab/visual-review-tools": "1.6.1",
+    "@rails/actioncable": "^6.0.3",
     "@sentry/browser": "^5.10.2",
-    "@sourcegraph/code-host-integration": "0.0.36",
+    "@sourcegraph/code-host-integration": "0.0.46",
+    "@toast-ui/editor": "^2.0.1",
+    "@toast-ui/vue-editor": "^2.0.1",
     "apollo-cache-inmemory": "^1.6.3",
     "apollo-client": "^2.6.4",
     "apollo-link": "^1.2.11",
@@ -60,12 +64,13 @@
     "chart.js": "2.7.2",
     "classlist-polyfill": "^1.2.0",
     "clipboard": "^1.7.1",
+    "codemirror": "^5.48.4",
     "codesandbox-api": "0.0.23",
     "compression-webpack-plugin": "^3.0.1",
     "copy-webpack-plugin": "^5.0.5",
     "core-js": "^3.6.4",
     "cropper": "^2.3.0",
-    "css-loader": "^1.0.0",
+    "css-loader": "^2.1.1",
     "d3-scale": "^2.2.2",
     "d3-selection": "^1.2.0",
     "dateformat": "^3.0.3",
@@ -96,6 +101,7 @@
     "lodash": "^4.17.15",
     "marked": "^0.3.12",
     "mermaid": "^8.4.8",
+    "mitt": "^1.2.0",
     "monaco-editor": "^0.18.1",
     "monaco-editor-webpack-plugin": "^1.7.0",
     "mousetrap": "^1.4.6",
@@ -124,12 +130,11 @@
     "tiptap-commands": "^1.4.0",
     "tiptap-extensions": "^1.8.0",
     "tributejs": "4.1.3",
-    "underscore": "^1.9.2",
     "unfetch": "^4.1.0",
     "url-loader": "^3.0.0",
     "visibilityjs": "^1.2.4",
     "vue": "^2.6.10",
-    "vue-apollo": "^3.0.0-beta.28",
+    "vue-apollo": "^3.0.3",
     "vue-loader": "^15.9.0",
     "vue-router": "^3.0.2",
     "vue-template-compiler": "^2.6.10",
@@ -145,7 +150,7 @@
   },
   "devDependencies": {
     "@babel/plugin-transform-modules-commonjs": "^7.8.3",
-    "@gitlab/eslint-plugin": "2.2.1",
+    "@gitlab/eslint-plugin": "3.1.0",
     "@vue/test-utils": "^1.0.0-beta.30",
     "axios-mock-adapter": "^1.15.0",
     "babel-jest": "^24.1.0",
@@ -160,11 +165,10 @@
     "eslint-import-resolver-jest": "^2.1.1",
     "eslint-import-resolver-webpack": "^0.12.1",
     "eslint-plugin-jasmine": "^4.1.0",
-    "eslint-plugin-jest": "^22.3.0",
     "eslint-plugin-no-jquery": "^2.3.0",
     "gettext-extractor": "^3.4.3",
     "gettext-extractor-vue": "^4.0.2",
-    "graphql-tag": "^2.10.0",
+    "graphql-tag": "^2.10.1",
     "istanbul-lib-coverage": "^3.0.0",
     "istanbul-lib-report": "^3.0.0",
     "istanbul-reports": "^3.0.0",