summaryrefslogtreecommitdiff
path: root/package.json
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2018-01-10 14:35:34 +0000
committerPhil Hughes <me@iamphill.com>2018-01-10 14:35:34 +0000
commit249b5015d79b0395f9fcfe696be8824e5b4c6ac9 (patch)
treec7d2410a253bae52939f93a5cb8c02a067c52199 /package.json
parent16e2e4c75187979db73f4770270c37837a371c64 (diff)
parent3dfc91cf732369aab182629db0299153814d2068 (diff)
downloadgitlab-ce-249b5015d79b0395f9fcfe696be8824e5b4c6ac9.tar.gz
Merge branch '34312-eslint-vue-plugin' into 'master'
Resolve "Add eslint-vue-plugin to our stack" Closes #34312 See merge request gitlab-org/gitlab-ce!16210
Diffstat (limited to 'package.json')
-rw-r--r--package.json5
1 files changed, 3 insertions, 2 deletions
diff --git a/package.json b/package.json
index 5b9b90f0e77..4759ae76817 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,6 @@
"document-register-element": "1.3.0",
"dropzone": "^4.2.0",
"emoji-unicode-version": "^0.2.1",
- "eslint-plugin-html": "^2.0.1",
"exports-loader": "^0.6.4",
"file-loader": "^0.11.1",
"fuzzaldrin-plus": "^0.5.0",
@@ -90,13 +89,15 @@
"@gitlab-org/gitlab-svgs": "^1.5.0",
"axios-mock-adapter": "^1.10.0",
"babel-plugin-istanbul": "^4.1.5",
- "eslint": "^3.10.1",
+ "eslint": "^3.18.0",
"eslint-config-airbnb-base": "^10.0.1",
"eslint-import-resolver-webpack": "^0.8.3",
"eslint-plugin-filenames": "^1.1.0",
+ "eslint-plugin-html": "2.0.1",
"eslint-plugin-import": "^2.2.0",
"eslint-plugin-jasmine": "^2.1.0",
"eslint-plugin-promise": "^3.5.0",
+ "eslint-plugin-vue": "^4.0.1",
"istanbul": "^0.4.5",
"jasmine-core": "^2.6.3",
"jasmine-jquery": "^2.1.1",