From 4651d39c760734f98eb6d6a193e963455d9058a5 Mon Sep 17 00:00:00 2001 From: Michael Brusegard <56915010+michaelbrusegard@users.noreply.github.com> Date: Sat, 27 Jan 2024 13:50:56 +0100 Subject: [PATCH] fix: added prettier eslint plugin and cleaned up scripts + workflow since it runs automatically now --- .eslintrc.cjs | 1 + .../{lint-and-format.yml => lint.yml} | 5 ++--- README.md | 14 ++++---------- bun.lockb | Bin 217971 -> 220391 bytes package.json | 8 ++++---- 5 files changed, 11 insertions(+), 17 deletions(-) rename .github/workflows/{lint-and-format.yml => lint.yml} (76%) diff --git a/.eslintrc.cjs b/.eslintrc.cjs index 7ec4949..02b4124 100644 --- a/.eslintrc.cjs +++ b/.eslintrc.cjs @@ -9,6 +9,7 @@ const config = { 'next/core-web-vitals', 'plugin:@typescript-eslint/recommended-type-checked', 'plugin:@typescript-eslint/stylistic-type-checked', + 'plugin:prettier/recommended', ], rules: { // These opinionated rules are enabled in stylistic-type-checked above. diff --git a/.github/workflows/lint-and-format.yml b/.github/workflows/lint.yml similarity index 76% rename from .github/workflows/lint-and-format.yml rename to .github/workflows/lint.yml index dd3f2b1..79344d8 100644 --- a/.github/workflows/lint-and-format.yml +++ b/.github/workflows/lint.yml @@ -1,8 +1,8 @@ -name: Lint and Format +name: Lint on: push jobs: - lint-and-format: + lint: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -11,4 +11,3 @@ jobs: bun-version: 1.0.24 - run: bun install - run: bun lint - - run: bun format diff --git a/README.md b/README.md index bab85eb..94d01c9 100644 --- a/README.md +++ b/README.md @@ -67,22 +67,16 @@ bun run start To check linting, formatting or types you run the respective command: -Linting: +Check linting and formatting: ```bash -bun run lint +bun lint ``` -Formatting: +Check types: ```bash -bun run format -``` - -Types: - -```bash -bun run type +bun type-check ``` If you are using vscode and are experiencing issues with types, you can restart the typescript server by pressing `cmd + shift + p` and then type `TypeScript: Restart TS Server` (You need to have a typescript file open for this to work). diff --git a/bun.lockb b/bun.lockb index db62874233f28ed3ccb13d914e1c2262e7832f37..80cd6aedf1b83d22ef8b7ca5dddaf5a2fc64a5a6 100755 GIT binary patch delta 39548 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 delta 37913 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 {at%O~4x}J%5~!R9GX01pu?3_B95^VVI9g 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 diff --git a/package.json b/package.json index 8dace3a..62185ed 100644 --- a/package.json +++ b/package.json @@ -9,14 +9,12 @@ "build": "next build", "dev": "next dev", "lint": "next lint", - "format": "prettier --check '**/*.{js,cjs,ts,tsx}'", - "type": "tsc --noEmit", + "type-check": "tsc --noEmit", "start": "next start" }, "lint-staged": { "*.{js,cjs,ts,tsx}": [ - "eslint --fix", - "prettier --write" + "eslint --fix" ] }, "dependencies": { @@ -54,6 +52,8 @@ "@typescript-eslint/parser": "^6.11.0", "eslint": "^8.54.0", "eslint-config-next": "^14.0.4", + "eslint-config-prettier": "^9.1.0", + "eslint-plugin-prettier": "^5.1.3", "husky": "^8.0.0", "lint-staged": "^15.2.0", "postcss": "^8.4.31",