feat: restore prettier (#2630)

package.json

@@ -15,6 +15,7 @@
     "husky": "^0.14.3",
     "jest": "^22.0.4",
     "lodash": "^4.17.4",
+    "prettier": "^1.10.2",
     "promise-toolbox": "^0.9.5",
     "sorted-object": "^2.0.1"
   },

packages/xo-web/package.json

@@ -94,7 +94,6 @@
     "moment": "^2.20.1",
     "moment-timezone": "^0.5.14",
     "notifyjs": "^3.0.0",
-    "prettier": "^1.9.2",
     "promise-toolbox": "^0.9.5",
     "prop-types": "^15.6.0",
     "random-password": "^0.1.2",

scripts/lint-staged

@@ -3,7 +3,8 @@
 set -eu
 
 format_files () {
-  eslint --fix "$@"
+  prettier --write "$@"
+  eslint --ignore-pattern '!*' --fix "$@"
 }
 test_files () {
   jest --findRelatedTests --passWithNoTests "$@"

scripts/normalize-packages

@@ -48,6 +48,7 @@ require('exec-promise')(() =>
       'husky',
       'jest',
       'lint-staged',
+      'prettier',
       'standard',
     ])
     deleteProperties(pkg, 'scripts', [ 'commitmsg', 'cz' ])
@@ -75,6 +76,7 @@ require('exec-promise')(() =>
       unlink(`${dir}/.flowconfig`),
       unlink(`${dir}/.gitignore`),
       unlink(`${dir}/.jshintrc`),
+      unlink(`${dir}/.prettierrc.js`),
       unlink(`${dir}/.travis.yml`),
       unlink(`${dir}/ISSUE_TEMPLATE.lock`),
       unlink(`${dir}/package-lock.json`),

yarn.lock

@@ -8878,7 +8878,7 @@ preserve@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
 
-prettier@^1.9.2:
+prettier@^1.10.2:
   version "1.10.2"
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.10.2.tgz#1af8356d1842276a99a5b5529c82dd9e9ad3cc93"