summaryrefslogtreecommitdiff
path: root/package.json
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-10-21 07:08:36 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-10-21 07:08:36 +0000
commit48aff82709769b098321c738f3444b9bdaa694c6 (patch)
treee00c7c43e2d9b603a5a6af576b1685e400410dee /package.json
parent879f5329ee916a948223f8f43d77fba4da6cd028 (diff)
downloadgitlab-ce-48aff82709769b098321c738f3444b9bdaa694c6.tar.gz
Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42
Diffstat (limited to 'package.json')
-rw-r--r--package.json42
1 files changed, 20 insertions, 22 deletions
diff --git a/package.json b/package.json
index ca76e4cab0b..eed43d4eb53 100644
--- a/package.json
+++ b/package.json
@@ -42,11 +42,11 @@
"@babel/plugin-syntax-import-meta": "^7.10.1",
"@babel/preset-env": "^7.10.1",
"@gitlab/at.js": "1.5.5",
- "@gitlab/svgs": "1.164.0",
- "@gitlab/ui": "21.3.1",
+ "@gitlab/svgs": "1.171.0",
+ "@gitlab/ui": "21.33.0",
"@gitlab/visual-review-tools": "1.6.1",
- "@rails/actioncable": "^6.0.3-1",
- "@sentry/browser": "^5.22.3",
+ "@rails/actioncable": "^6.0.3-3",
+ "@rails/ujs": "^6.0.3-2",
"@sourcegraph/code-host-integration": "0.0.50",
"@toast-ui/editor": "^2.4.0",
"@toast-ui/vue-editor": "^2.4.0",
@@ -80,7 +80,7 @@
"deckar01-task_list": "^2.3.1",
"diff": "^3.4.0",
"document-register-element": "1.14.3",
- "dompurify": "^2.0.11",
+ "dompurify": "^2.1.1",
"dropzone": "^4.2.0",
"editorconfig": "^0.15.3",
"emoji-regex": "^7.0.3",
@@ -92,14 +92,12 @@
"glob": "^7.1.6",
"graphql": "^14.7.0",
"graphql-tag": "^2.10.1",
- "gray-matter": "^4.0.2",
"immer": "^7.0.7",
"imports-loader": "^0.8.0",
"ipaddr.js": "^1.9.1",
"jed": "^1.1.1",
"jest-transform-graphql": "^2.1.0",
"jquery": "^3.5.0",
- "jquery-ujs": "1.2.2",
"jquery.caret": "^0.3.1",
"jquery.waitforimages": "^2.2.0",
"js-cookie": "^2.2.1",
@@ -107,6 +105,7 @@
"jszip": "^3.1.3",
"jszip-utils": "^0.0.2",
"katex": "^0.10.0",
+ "linkifyjs": "^2.1.9",
"lodash": "^4.17.20",
"marked": "^0.3.12",
"mermaid": "^8.5.2",
@@ -145,11 +144,11 @@
"url-loader": "^3.0.0",
"uuid": "8.1.0",
"visibilityjs": "^1.2.4",
- "vue": "^2.6.10",
+ "vue": "^2.6.12",
"vue-apollo": "^3.0.3",
- "vue-loader": "^15.9.0",
- "vue-router": "^3.4.3",
- "vue-template-compiler": "^2.6.10",
+ "vue-loader": "^15.9.3",
+ "vue-router": "^3.4.7",
+ "vue-template-compiler": "^2.6.12",
"vue-virtual-scroll-list": "^1.4.4",
"vuedraggable": "^2.23.0",
"vuex": "^3.5.1",
@@ -168,9 +167,9 @@
"@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-jest": "^26.5.2",
+ "babel-plugin-dynamic-import-node": "^2.3.3",
+ "babel-plugin-istanbul": "^6.0.0",
"chalk": "^2.4.1",
"commander": "^2.18.0",
"custom-jquery-matchers": "^2.1.0",
@@ -188,11 +187,11 @@
"jasmine-core": "^2.9.0",
"jasmine-diff": "^0.1.3",
"jasmine-jquery": "^2.1.1",
- "jest": "^24.1.0",
+ "jest": "^26.5.2",
"jest-canvas-mock": "^2.1.2",
- "jest-environment-jsdom-sixteen": "^1.0.0",
- "jest-junit": "^6.3.0",
- "jest-util": "^24.0.0",
+ "jest-environment-jsdom": "^26.5.2",
+ "jest-junit": "^12.0.0",
+ "jest-util": "^26.5.2",
"jsdoc": "^3.5.5",
"jsdoc-vue": "^1.0.0",
"karma": "^4.2.0",
@@ -205,7 +204,7 @@
"karma-webpack": "^4.0.2",
"markdownlint-cli": "0.23.2",
"md5": "^2.2.1",
- "node-sass": "^4.12.0",
+ "node-sass": "^4.14.1",
"nodemon": "^2.0.4",
"pixelmatch": "^4.0.2",
"postcss": "^7.0.14",
@@ -215,7 +214,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-rc.0",
"webpack-dev-server": "^3.10.3",
"xhr-mock": "^2.5.1",
"yarn-check-webpack-plugin": "^1.2.0",
@@ -226,8 +225,7 @@
},
"resolutions": {
"chokidar": "^3.4.0",
- "monaco-editor": "0.20.0",
- "vue-jest/ts-jest": "24.0.0"
+ "monaco-editor": "0.20.0"
},
"engines": {
"node": ">=10.13.0",