diff --git a/.eslintrc.js b/.eslintrc.js index 54e983f..572dce7 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -17,7 +17,7 @@ rulesDirPlugin.RULES_DIR = 'eslint-rules'; module.exports = { extends: 'fbjs-opensource', - plugins: ['rulesdir'], + plugins: ['rulesdir', 'prettier'], parserOptions: { ecmaVersion: 2017, sourceType: 'script', diff --git a/package.json b/package.json index acfaaa1..5acf8ff 100644 --- a/package.json +++ b/package.json @@ -6,8 +6,9 @@ "version": "0.22.1", "description": "Flow-typed JavaScript support for Atom IDE", "scripts": { - "ci": "yarn format --list-different && yarn lint", - "format": "prettier --write {lib,eslint-rules}/**/*.js .eslintrc.js package.json", + "ci": "yarn lint", + "format": + "prettier --write {lib,eslint-rules}/**/*.js .eslintrc.js package.json", "lint": "eslint lib" }, "engines": { @@ -17,14 +18,8 @@ "atom-languageclient": "0.9.2", "flow-language-server": "0.4.3" }, - "activationHooks": [ - "core:loaded-shell-environment" - ], - "enhancedScopes": [ - "source.js", - "source.js.flow", - "source.jsx" - ], + "activationHooks": ["core:loaded-shell-environment"], + "enhancedScopes": ["source.js", "source.js.flow", "source.jsx"], "prettier": { "bracketSpacing": false, "proseWrap": "always", @@ -78,6 +73,7 @@ "devDependencies": { "eslint": "^v4.6.0", "eslint-config-fbjs-opensource": "^1.0.0", + "eslint-plugin-prettier": "^2.6.0", "eslint-plugin-rulesdir": "^0.1.0", "prettier": "^1.6.1" }