From 1f12ad0a20affc2d641d947bd95392fc962f46d7 Mon Sep 17 00:00:00 2001 From: Marcel Schneider Date: Thu, 5 Apr 2018 22:37:23 +0200 Subject: [PATCH] Configure prettier --- .eslintrc.js | 5 ++++- .gitignore | 1 + package-lock.json | 13 +++++++++++++ package.json | 1 + 4 files changed, 19 insertions(+), 1 deletion(-) diff --git a/.eslintrc.js b/.eslintrc.js index 67c085d..c8a0565 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -10,7 +10,10 @@ module.exports = { browser: true, }, // https://github.com/feross/standard/blob/master/RULES.md#javascript-standard-style - extends: 'standard', + extends: [ + 'standard', + 'prettier' + ], // required to lint *.vue files plugins: [ 'html' diff --git a/.gitignore b/.gitignore index 93f6f9d..0adc0e0 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ static/*bistro*.json server/*.json server/server .*.swp +.tern-port diff --git a/package-lock.json b/package-lock.json index 9bd3509..c267952 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3762,6 +3762,14 @@ "user-home": "2.0.0" } }, + "eslint-config-prettier": { + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-2.9.0.tgz", + "integrity": "sha512-ag8YEyBXsm3nmOv1Hz991VtNNDMRa+MNy8cY47Pl4bw6iuzqKbJajXdqUpiw13STdLLrznxgm1hj9NhxeOYq0A==", + "requires": { + "get-stdin": "5.0.1" + } + }, "eslint-config-standard": { "version": "6.2.1", "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-6.2.1.tgz", @@ -5410,6 +5418,11 @@ "integrity": "sha1-9wLmMSfn4jHBYKgMFVSstw1QR+U=", "dev": true }, + "get-stdin": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-5.0.1.tgz", + "integrity": "sha1-Ei4WFZHiH/TFJTAwVpPyDmOTo5g=" + }, "get-value": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz", diff --git a/package.json b/package.json index 5048b6c..3d14ec4 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,7 @@ "lint": "eslint --ext .js,.vue src" }, "dependencies": { + "eslint-config-prettier": "^2.9.0", "vue": "^2.2.2", "vue-router": "^2.3.0", "vuex": "^3.0.1"