summaryrefslogtreecommitdiff
path: root/package.json
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2018-07-14 00:46:34 +0000
committerFatih Acet <acetfatih@gmail.com>2018-07-14 00:46:34 +0000
commitfabf6a5634fa5d3c585d01a0d0dfac6c39dcbe8e (patch)
tree94dbbbc261c992f3c6c737eefc7e0a933ef6ecbd /package.json
parent632c395e1809715bd3c01e2733a2f8a357136a49 (diff)
parentf773711708720bdaad2be901c690a72418a5c7c7 (diff)
downloadgitlab-ce-fabf6a5634fa5d3c585d01a0d0dfac6c39dcbe8e.tar.gz
Merge branch 'upgrade-frontend-deps' into 'master'
Upgrade webpack and other frontend deps See merge request gitlab-org/gitlab-ce!20622
Diffstat (limited to 'package.json')
-rw-r--r--package.json20
1 files changed, 10 insertions, 10 deletions
diff --git a/package.json b/package.json
index d494b06e97e..9dd7d80945f 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,7 @@
"autosize": "^4.0.0",
"axios": "^0.17.1",
"babel-core": "^6.26.3",
- "babel-loader": "^7.1.4",
+ "babel-loader": "^7.1.5",
"babel-plugin-transform-define": "^1.3.0",
"babel-preset-latest": "^6.24.1",
"babel-preset-stage-2": "^6.24.1",
@@ -36,7 +36,7 @@
"compression-webpack-plugin": "^1.1.11",
"core-js": "^2.4.1",
"cropper": "^2.3.0",
- "css-loader": "^0.28.11",
+ "css-loader": "^1.0.0",
"d3-array": "^1.2.1",
"d3-axis": "^1.0.8",
"d3-brush": "^1.0.4",
@@ -90,15 +90,15 @@
"url-loader": "^1.0.1",
"visibilityjs": "^1.2.4",
"vue": "^2.5.16",
- "vue-loader": "^15.2.0",
+ "vue-loader": "^15.2.4",
"vue-resource": "^1.5.0",
"vue-router": "^3.0.1",
"vue-template-compiler": "^2.5.16",
"vue-virtual-scroll-list": "^1.2.5",
"vuex": "^3.0.1",
- "webpack": "^4.11.1",
- "webpack-bundle-analyzer": "^2.11.1",
- "webpack-cli": "^3.0.2",
+ "webpack": "^4.16.0",
+ "webpack-bundle-analyzer": "^2.13.1",
+ "webpack-cli": "^3.0.8",
"webpack-stats-plugin": "^0.2.1",
"worker-loader": "^2.0.0"
},
@@ -125,14 +125,14 @@
"jasmine-core": "^2.9.0",
"jasmine-diff": "^0.1.3",
"jasmine-jquery": "^2.1.1",
- "karma": "^2.0.2",
+ "karma": "^2.0.4",
"karma-chrome-launcher": "^2.2.0",
"karma-coverage-istanbul-reporter": "^1.4.2",
- "karma-jasmine": "^1.1.1",
+ "karma-jasmine": "^1.1.2",
"karma-mocha-reporter": "^2.2.5",
"karma-sourcemap-loader": "^0.3.7",
- "karma-webpack": "3.0.0",
- "nodemon": "^1.17.3",
+ "karma-webpack": "^4.0.0-beta.0",
+ "nodemon": "^1.18.2",
"prettier": "1.12.1",
"webpack-dev-server": "^3.1.4"
}