diff --git a/packages/xo-web/.prettierrc.js b/.prettierrc.js similarity index 100% rename from packages/xo-web/.prettierrc.js rename to .prettierrc.js diff --git a/package.json b/package.json index a234b9d9d..201367df3 100644 --- a/package.json +++ b/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" }, diff --git a/packages/xo-web/package.json b/packages/xo-web/package.json index aae7ec3cf..bc95f483f 100644 --- a/packages/xo-web/package.json +++ b/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", diff --git a/scripts/lint-staged b/scripts/lint-staged index ff6891a7b..e3e8f97a8 100755 --- a/scripts/lint-staged +++ b/scripts/lint-staged @@ -3,7 +3,8 @@ set -eu format_files () { - eslint --fix "$@" + prettier --write "$@" + eslint --ignore-pattern '!*' --fix "$@" } test_files () { jest --findRelatedTests --passWithNoTests "$@" diff --git a/scripts/normalize-packages b/scripts/normalize-packages index 0cfe7f272..6d62d406d 100755 --- a/scripts/normalize-packages +++ b/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`), diff --git a/yarn.lock b/yarn.lock index 774aedeef..b29fc4215 100644 --- a/yarn.lock +++ b/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"