From c890ca6eb1093173f5b3d651844c8e6a8dafd5a6 Mon Sep 17 00:00:00 2001 From: Daniel Tschinder Date: Fri, 16 Jun 2017 17:31:50 +0200 Subject: [PATCH] Add prettier eslint plugin --- .eslintrc | 8 ++++---- package.json | 1 + yarn.lock | 15 +++++++++++++++ 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/.eslintrc b/.eslintrc index 50bf9694..5517af4a 100644 --- a/.eslintrc +++ b/.eslintrc @@ -3,10 +3,10 @@ "es6": true, "node": true }, - "extends": [ - "eslint-config-babel" - ], + "extends": ["eslint-config-babel"], + "plugins": ["prettier"], "rules": { - "arrow-parens": "off" + "arrow-parens": "off", + "prettier/prettier": "error" } } diff --git a/package.json b/package.json index 6caf093e..bc43d89d 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "eslint": "^3.8.1", "eslint-config-babel": "^6.0.0", "eslint-plugin-flowtype": "^2.25.0", + "eslint-plugin-prettier": "^2.1.2", "husky": "^0.13.2", "lint-staged": "^3.3.1", "nyc": "^11.0.1", diff --git a/yarn.lock b/yarn.lock index 6c6c2bc8..a2b6abc4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1717,6 +1717,13 @@ eslint-plugin-flowtype@^2.25.0: dependencies: lodash "^4.15.0" +eslint-plugin-prettier@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-2.1.2.tgz#4b90f4ee7f92bfbe2e926017e1ca40eb628965ea" + dependencies: + fast-diff "^1.1.1" + jest-docblock "^20.0.1" + eslint@^3.8.1: version "3.19.0" resolved "https://registry.yarnpkg.com/eslint/-/eslint-3.19.0.tgz#c8fc6201c7f40dd08941b87c085767386a679acc" @@ -1890,6 +1897,10 @@ extsprintf@1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.0.2.tgz#e1080e0658e300b06294990cc70e1502235fd550" +fast-diff@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.1.1.tgz#0aea0e4e605b6a2189f0e936d4b7fbaf1b7cfd9b" + fast-levenshtein@~2.0.4: version "2.0.6" resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" @@ -2680,6 +2691,10 @@ jest-diff@19.0.0, jest-diff@^19.0.0: jest-matcher-utils "^19.0.0" pretty-format "^19.0.0" +jest-docblock@^20.0.1: + version "20.0.3" + resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-20.0.3.tgz#17bea984342cc33d83c50fbe1545ea0efaa44712" + jest-file-exists@^19.0.0: version "19.0.0" resolved "https://registry.yarnpkg.com/jest-file-exists/-/jest-file-exists-19.0.0.tgz#cca2e587a11ec92e24cfeab3f8a94d657f3fceb8"