From a324106f9f1a547644f22143ee4377850478b9eb Mon Sep 17 00:00:00 2001 From: SKINMAKER Date: Sun, 26 Nov 2023 00:31:48 +0900 Subject: [PATCH] chore: use prettier (#636) * chore: use prettier * chore: add jsx single quote * chore: remove indent rule * chore: add prettier plugin for eslint --- .eslintrc.js | 2 +- .prettierrc.js | 3 ++- package.json | 6 +++--- yarn.lock | 33 ++++++++++++--------------------- 4 files changed, 18 insertions(+), 26 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index 1c198f9798..6c59e1ce94 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -13,6 +13,7 @@ module.exports = { 'plugin:react/recommended', 'plugin:react-hooks/recommended', 'plugin:jsx-a11y/recommended', + 'prettier', ], parser: '@typescript-eslint/parser', parserOptions: { @@ -34,7 +35,6 @@ module.exports = { '@typescript-eslint/explicit-function-return-type': 'off', '@typescript-eslint/explicit-module-boundary-types': 'off', '@typescript-eslint/no-unused-vars': ['warn'], - indent: ['error', 'tab'], quotes: ['error', 'single'], semi: ['error', 'never'], }, diff --git a/.prettierrc.js b/.prettierrc.js index c41c7fd58d..9af50c9129 100644 --- a/.prettierrc.js +++ b/.prettierrc.js @@ -4,8 +4,9 @@ module.exports = { semi: false, trailingComma: 'es5', singleQuote: true, + jsxSingleQuote: true, printWidth: 100, tabWidth: 2, useTabs: true, - plugins: ['prettier-plugin-tailwind'] + plugins: ['prettier-plugin-tailwindcss'] } \ No newline at end of file diff --git a/package.json b/package.json index 34a2cbac34..b9991846f0 100644 --- a/package.json +++ b/package.json @@ -85,14 +85,14 @@ "@typescript-eslint/parser": "^5.61.0", "eslint": "^8.44.0", "eslint-config-next": "^13.4.7", - "eslint-config-prettier": "^8.8.0", + "eslint-config-prettier": "^9.0.0", "eslint-plugin-jsx-a11y": "^6.7.1", "eslint-plugin-prettier": "^4.2.1", "eslint-plugin-react": "^7.32.2", "eslint-plugin-react-hooks": "^4.6.0", "jest": "^29.4.1", - "prettier": "^2.3.2", - "prettier-plugin-tailwind": "^2.2.12", + "prettier": "^3.1.0", + "prettier-plugin-tailwindcss": "^0.5.7", "ts-jest": "^29.1.1", "typescript": "^5.1.6" }, diff --git a/yarn.lock b/yarn.lock index ea2bf76ffd..a393f7aaab 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5021,10 +5021,10 @@ eslint-config-next@^13.4.7: eslint-plugin-react "^7.31.7" eslint-plugin-react-hooks "^4.5.0" -eslint-config-prettier@^8.8.0: - version "8.8.0" - resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.8.0.tgz#bfda738d412adc917fd7b038857110efe98c9348" - integrity sha512-wLbQiFre3tdGgpDv67NQKnJuTlcUVYHas3k+DZCc2U2BadthoEY4B7hLPvAxaqdyOGCzuLfii2fqGph10va7oA== +eslint-config-prettier@^9.0.0: + version "9.0.0" + resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-9.0.0.tgz#eb25485946dd0c66cd216a46232dc05451518d1f" + integrity sha512-IcJsTkJae2S35pRsRAwoCE+925rJJStOdkKnLVgtE+tEpqU0EVVM7OqrwxqgptKdX29NUwC82I5pXsGFIgSevw== eslint-import-resolver-node@^0.3.6, eslint-import-resolver-node@^0.3.7: version "0.3.7" @@ -8330,17 +8330,15 @@ prettier-linter-helpers@^1.0.0: dependencies: fast-diff "^1.1.2" -prettier-plugin-tailwind@^2.2.12: - version "2.2.12" - resolved "https://registry.yarnpkg.com/prettier-plugin-tailwind/-/prettier-plugin-tailwind-2.2.12.tgz#959b4710f9245eb37765a922d3117c2df8c556f3" - integrity sha512-2SvZxpsYme0g5MrxGsKM43rx28f9AVlJrbwMnx4a03svCfsHwVGtcN6oN1YlClnEwZbquu3IhVAMcawEMKTjuA== - dependencies: - tailwind-classes-sorter "^0.2.5" +prettier-plugin-tailwindcss@^0.5.7: + version "0.5.7" + resolved "https://registry.yarnpkg.com/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.5.7.tgz#d05dc42c6f2167e3bf2c20e9f71a1fff4232b5d9" + integrity sha512-4v6uESAgwCni6YF6DwJlRaDjg9Z+al5zM4JfngcazMy4WEf/XkPS5TEQjbD+DZ5iNuG6RrKQLa/HuX2SYzC3kQ== -prettier@^2.3.2: - version "2.8.8" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da" - integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q== +prettier@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.1.0.tgz#c6d16474a5f764ea1a4a373c593b779697744d5e" + integrity sha512-TQLvXjq5IAibjh8EpBIkNKxO749UEWABoiIZehEPiY4GNpVdhaFKqSTu+QrlU6D2dPAfubRmtJTi4K4YkQ5eXw== pretty-bytes@^5.3.0, pretty-bytes@^5.4.1: version "5.6.0" @@ -9452,13 +9450,6 @@ synckit@^0.8.5: "@pkgr/utils" "^2.3.1" tslib "^2.5.0" -tailwind-classes-sorter@^0.2.5: - version "0.2.5" - resolved "https://registry.yarnpkg.com/tailwind-classes-sorter/-/tailwind-classes-sorter-0.2.5.tgz#fa499fb5564783e5edd77259ce1a3ba9e0c8b3ad" - integrity sha512-7S0AaDitt+Fjy9m3v0GrQ/KZrCswNDD25SSXX9U/HIB5h9lk0ImSkq/VVcnzu78cRQxR0fFfvHYFdfcqN3dCGA== - dependencies: - find-up "^5.0.0" - tailwindcss@^3.3.2: version "3.3.2" resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.3.2.tgz#2f9e35d715fdf0bbf674d90147a0684d7054a2d3"