summaryrefslogtreecommitdiff
path: root/package.json
diff options
context:
space:
mode:
authorMarin Jankovski <marin@gitlab.com>2018-09-24 10:15:47 +0000
committerMarin Jankovski <marin@gitlab.com>2018-09-24 10:15:47 +0000
commit4ce9f2fdfb6d135e6229675b9965c1b90efdfcfe (patch)
tree71372f3bba3829db1025e599571b03d2d741daa0 /package.json
parent17a4f24c790797548137cf04524f115fe238fd7e (diff)
parentaef686d4a91d86bbfbe6d3c85c7cd98d3558d6f7 (diff)
downloadgitlab-ce-4ce9f2fdfb6d135e6229675b9965c1b90efdfcfe.tar.gz
Merge branch 'upgrade-eslint' into 'master'
Upgrade eslint to v5.x See merge request gitlab-org/gitlab-ce!21825
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 72367a5ae85..cc6bbdd351e 100644
--- a/package.json
+++ b/package.json
@@ -110,22 +110,22 @@
},
"devDependencies": {
"axios-mock-adapter": "^1.15.0",
- "babel-eslint": "^8.2.3",
+ "babel-eslint": "^9.0.0",
"babel-plugin-istanbul": "^4.1.6",
"babel-plugin-rewire": "^1.1.0",
"babel-template": "^6.26.0",
"babel-types": "^6.26.0",
"chalk": "^2.4.1",
"commander": "^2.15.1",
- "eslint": "~4.12.1",
- "eslint-config-airbnb-base": "^12.1.0",
- "eslint-import-resolver-webpack": "^0.10.0",
- "eslint-plugin-filenames": "^1.2.0",
- "eslint-plugin-html": "4.0.3",
- "eslint-plugin-import": "^2.12.0",
- "eslint-plugin-jasmine": "^2.1.0",
- "eslint-plugin-promise": "^3.8.0",
- "eslint-plugin-vue": "^4.5.0",
+ "eslint": "~5.6.0",
+ "eslint-config-airbnb-base": "^13.1.0",
+ "eslint-import-resolver-webpack": "^0.10.1",
+ "eslint-plugin-filenames": "^1.3.2",
+ "eslint-plugin-html": "4.0.5",
+ "eslint-plugin-import": "^2.14.0",
+ "eslint-plugin-jasmine": "^2.10.1",
+ "eslint-plugin-promise": "^4.0.1",
+ "eslint-plugin-vue": "^5.0.0-beta.3",
"gettext-extractor": "^3.3.2",
"gettext-extractor-vue": "^4.0.1",
"ignore": "^3.3.7",