Go back to running prettier from eslint

Means less steps to run and less editor extensions that need to be installed.

This reverts 9d40e4b.

.github/workflows/build.yml

@@ -27,9 +27,6 @@ jobs:
       - name: 👖 Lint
         run: npm run lint
 
-      - name: 💄 Prettier
-        run: npm run prettier
-
   types:
     name: 🔎 Types
     runs-on: ubuntu-latest

.prettierignore

@@ -6,14 +6,3 @@ postgres-data
 /public/build
 /storybook-static
 /test-results
-
-# Ignore everything except JS/TS files.
-# Based on https://stackoverflow.com/a/70715829/458193
-*
-!*.cjs
-!*.js
-!*.jsx
-!*.mjs
-!*.ts
-!*.tsx
-!*/

.vscode/extensions.json

@@ -1,7 +1,6 @@
 {
   "recommendations": [
     "bradlc.vscode-tailwindcss",
-    "dbaeumer.vscode-eslint",
-    "esbenp.prettier-vscode"
+    "dbaeumer.vscode-eslint"
   ]
 }

.vscode/settings.json

@@ -2,8 +2,6 @@
   "editor.codeActionsOnSave": {
     "source.fixAll.eslint": "explicit"
   },
-  "editor.defaultFormatter": "esbenp.prettier-vscode",
-  "editor.formatOnSave": true,
   "eslint.useFlatConfig": true,
   "eslint.run": "onSave"
 }

eslint.config.js

@@ -1,6 +1,7 @@
 import {FlatCompat} from '@eslint/eslintrc';
 import js from '@eslint/js';
 import jsxA11y from 'eslint-plugin-jsx-a11y';
+import prettierRecommended from 'eslint-plugin-prettier/recommended';
 import react from 'eslint-plugin-react';
 import vitest from 'eslint-plugin-vitest';
 import typescript from 'typescript-eslint';
@@ -124,4 +125,7 @@ export default [
       'vitest/no-focused-tests': 'error',
     },
   },
+
+  // Prettier. This must be after all other configs.
+  prettierRecommended,
 ];

package.json

@@ -10,7 +10,6 @@
     "docker": "docker compose up --detach",
     "docker:down": "docker compose down",
     "lint": "eslint --max-warnings 0 .",
-    "prettier": "prettier . --cache --check",
     "prisma": "dotenvx run --convention=nextjs -- prisma",
     "prod": "NODE_ENV=production node --enable-source-maps ./build/express/server.js",
     "routes": "remix routes",
@@ -24,7 +23,7 @@
     "test:axeOnly": "axe-storybook --build-dir ./storybook-static",
     "test:e2e": "npm run setup:e2e && npx playwright test",
     "types": "tsc --noEmit",
-    "validate": "run-p \"test -- --run\" lint prettier types"
+    "validate": "run-p \"test -- --run\" lint types"
   },
   "dependencies": {
     "@conform-to/react": "^1.1.5",
@@ -81,8 +80,10 @@
     "es-module-lexer": "^1.5.4",
     "esbuild": "^0.23.1",
     "eslint": "^8.57.0",
+    "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-import": "^2.30.0",
     "eslint-plugin-jsx-a11y": "^6.10.0",
+    "eslint-plugin-prettier": "^5.2.1",
     "eslint-plugin-react": "^7.35.2",
     "eslint-plugin-react-hooks": "^4.6.2",
     "eslint-plugin-vitest": "^0.5.4",