diff options
author | Lukas Eipert <leipert@gitlab.com> | 2019-02-28 12:34:47 +0100 |
---|---|---|
committer | Lukas Eipert <leipert@gitlab.com> | 2019-02-28 12:36:29 +0100 |
commit | c151cebaaa9d8cc779a09eee87ddf57ff0653a59 (patch) | |
tree | 86942f0b3d5fa68b724b5f55f3751ed3416be75b /package.json | |
parent | 40ec172f75c0c2161c74414c387c802396563ca8 (diff) | |
download | gitlab-ce-c151cebaaa9d8cc779a09eee87ddf57ff0653a59.tar.gz |
Upgrade jest and related dependencies
This removes other outdated babel@6 dependencies as well.
Unfortunately the newer version of vue-jest has a dependency of an older
version of ts-jest. In order to satisfy the peerDependency from ts-jest,
we are forcing the version@24. The only "breaking" change from ts-jest
23->24 is that it requires a newer version of jest. This might be
obsolete soon, as vue-jest plans on switching to babel eventually.
Diffstat (limited to 'package.json')
-rw-r--r-- | package.json | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/package.json b/package.json index 36f677c5484..d846d214417 100644 --- a/package.json +++ b/package.json @@ -128,17 +128,13 @@ "xterm": "^3.5.0" }, "devDependencies": { + "@babel/plugin-transform-modules-commonjs": "^7.2.0", "@gitlab/eslint-config": "^1.4.0", "@vue/test-utils": "^1.0.0-beta.25", "axios-mock-adapter": "^1.15.0", - "babel-core": "^7.0.0-bridge", - "babel-jest": "^23.6.0", - "babel-plugin-dynamic-import-node": "^2.2.0", + "babel-jest": "^24.1.0", "babel-plugin-istanbul": "^5.1.0", "babel-plugin-rewire": "^1.2.0", - "babel-plugin-transform-es2015-modules-commonjs": "^6.26.2", - "babel-template": "^6.26.0", - "babel-types": "^6.26.0", "chalk": "^2.4.1", "commander": "^2.18.0", "docdash": "^1.0.2", @@ -148,7 +144,7 @@ "eslint-plugin-html": "5.0.0", "eslint-plugin-import": "^2.14.0", "eslint-plugin-jasmine": "^2.10.1", - "eslint-plugin-jest": "^22.1.0", + "eslint-plugin-jest": "^22.3.0", "gettext-extractor": "^3.3.2", "gettext-extractor-vue": "^4.0.1", "graphql-tag": "^2.10.0", @@ -156,8 +152,8 @@ "jasmine-core": "^2.9.0", "jasmine-diff": "^0.1.3", "jasmine-jquery": "^2.1.1", - "jest": "^23.6.0", - "jest-junit": "^5.2.0", + "jest": "^24.1.0", + "jest-junit": "^6.3.0", "jsdoc": "^3.5.5", "jsdoc-vue": "^1.0.0", "karma": "^3.0.0", @@ -175,10 +171,13 @@ "stylelint": "^9.10.1", "stylelint-config-recommended": "^2.1.0", "stylelint-scss": "^3.5.3", - "vue-jest": "^3.0.2", + "vue-jest": "^4.0.0-beta.2", "webpack-dev-server": "^3.1.14", "yarn-deduplicate": "^1.1.0" }, + "resolutions": { + "vue-jest/ts-jest": "24.0.0" + }, "engines": { "node": ">=8.10.0", "yarn": "^1.10.0" |