From bb6cdc92648d1919c48e72ecb7aa52ad2bf5f22e Mon Sep 17 00:00:00 2001
From: Graham McGregor <graham@gmcgregor.ca>
Date: Sun, 29 Oct 2017 13:32:56 -0400
Subject: [PATCH] Check prettier status when linting

We want to ensure that all code conforms to prettier.

Ideally contributors will have the prettier plugin for their editor to
autoformat-on-save and they won't have to do anything manually.

Also, remove eslint-prettier plugin since it's not being used anymore.
---
 .eslintrc    | 1 -
 package.json | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/.eslintrc b/.eslintrc
index 932540d..78c2f08 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -112,7 +112,6 @@
     "no-plusplus": 0
   },
   "plugins": [
-    "prettier",
     "react"
   ],
   "extends": ["plugin:react/recommended"]
diff --git a/package.json b/package.json
index 250c15a..4954165 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,6 @@
     "babel-preset-stage-0": "^6.3.13",
     "css-loader": "^0.23.1",
     "eslint": "^3.14.1",
-    "eslint-plugin-prettier": "^2.3.1",
     "eslint-plugin-react": "^7.4.0",
     "font-awesome-webpack": "0.0.4",
     "jasmine-core": "^2.4.1",
@@ -68,7 +67,7 @@
     "start": "node server.js",
     "build":
       "BABEL_ENV=production webpack --config webpack.config.production.js && node pre-render.js",
-    "lint": "eslint .",
+    "lint": "eslint . && prettier --list-different '**/*.{js,jsx,ts,css,less,scss,json}'",
     "test": "karma start --single-run --browsers PhantomJS",
     "pretty": "prettier --write '**/*.{js,jsx,ts,css,less,scss,json}'"
   }