Add Prettier to codebase

FormidableLabs · Dec 20, 2018 · b77cb61 · b77cb61
1 parent a4e2b08
commit b77cb61
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 8 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -1,9 +1,10 @@
 {
-  "extends": "formidable/configurations/es6-react",
+  "extends": ["formidable/configurations/es6-react", "prettier"],
   "rules": {
     "import/no-unresolved": [2, { "ignore": ["victory*"] }],
     "no-magic-numbers": [
-      "error", { "ignore": [-1, 0, 0.5, 1, 2, 90, 180, 270, 360] }
+      "error",
+      { "ignore": [-1, 0, 0.5, 1, 2, 90, 180, 270, 360] }
     ]
   }
 }
diff --git a/package-scripts.js b/package-scripts.js
@@ -35,7 +35,7 @@ module.exports = {
       )
     },
     check: {
-      ci: npsUtils.series.nps("lint", "test.ci"),
+      ci: npsUtils.series.nps("format.ci", "lint", "test.ci"),
       cov: npsUtils.series.nps("lint", "test.cov"),
       dev: npsUtils.series.nps("lint", "test.dev"),
       default: npsUtils.series.nps("lint", "test")

diff --git a/package.json b/package.json
@@ -62,6 +62,7 @@
     "enzyme-adapter-react-16": "^1.0.3",
     "eslint": "^2.0.0",
     "eslint-config-formidable": "^2.0.1",
+    "eslint-config-prettier": "^3.3.0",
     "eslint-plugin-filenames": "^1.2.0",
     "eslint-plugin-import": "^2.2.0",
     "eslint-plugin-mocha": "^4.9.0",
@@ -89,6 +90,7 @@
     "mocha": "^5.0.0",
     "nps": "^5.9.0",
     "nps-utils": "^1.5.0",
+    "prettier": "^1.15.3",
     "prop-types": "^15.5.8",
     "react": "^16.0.0",
     "react-chromatic": "^0.8.2",

diff --git a/test/.eslintrc b/test/.eslintrc
@@ -1,10 +1,7 @@
-
 {
-  "extends": "formidable/configurations/es6-react",
+  "extends": ["formidable/configurations/es6-react", "prettier"],
   "env": { "mocha": true },
-  "plugins": [
-    "mocha"
-  ],
+  "plugins": ["mocha"],
   "rules": {
     "mocha/no-exclusive-tests": 2,
     "no-magic-numbers": 0,

diff --git a/yarn.lock b/yarn.lock
@@ -4562,6 +4562,13 @@ eslint-config-formidable@^2.0.1:
   version "2.0.1"
   resolved "http://registry.npmjs.org/eslint-config-formidable/-/eslint-config-formidable-2.0.1.tgz#995b8f4a15d80109fbfbe409e537686dfaf41fc2"
 
+eslint-config-prettier@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-3.3.0.tgz#41afc8d3b852e757f06274ed6c44ca16f939a57d"
+  integrity sha512-Bc3bh5bAcKNvs3HOpSi6EfGA2IIp7EzWcg2tS4vP7stnXu/J1opihHDM7jI9JCIckyIDTgZLSWn7J3HY0j2JfA==
+  dependencies:
+    get-stdin "^6.0.0"
+
 eslint-import-resolver-node@^0.3.1:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.2.tgz#58f15fb839b8d0576ca980413476aab2472db66a"
@@ -5366,6 +5373,11 @@ get-stdin@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-5.0.1.tgz#122e161591e21ff4c52530305693f20e6393a398"
 
+get-stdin@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-6.0.0.tgz#9e09bf712b360ab9225e812048f71fde9c89657b"
+  integrity sha512-jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g==
+
 get-stream@^3.0.0:
   version "3.0.0"
   resolved "http://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
@@ -8363,6 +8375,11 @@ preserve@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
 
+prettier@^1.15.3:
+  version "1.15.3"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.15.3.tgz#1feaac5bdd181237b54dbe65d874e02a1472786a"
+  integrity sha512-gAU9AGAPMaKb3NNSUUuhhFAS7SCO4ALTN4nRIn6PJ075Qd28Yn2Ig2ahEJWdJwJmlEBTUfC7mMUSFy8MwsOCfg==
+
 pretty-error@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-2.1.1.tgz#5f4f87c8f91e5ae3f3ba87ab4cf5e03b1a17f1a3"