diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 50fb6f0..abd1563 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -62,10 +62,6 @@ jobs: bun run format:check || echo "::warning::Frontend formatting issues found (not failing on push)" fi - - name: Lint - working-directory: web - run: bun run lint - - name: Type check working-directory: web run: bun run typecheck diff --git a/scripts/check.ts b/scripts/check.ts index d95707e..8593720 100644 --- a/scripts/check.ts +++ b/scripts/check.ts @@ -99,16 +99,15 @@ interface Check { const checks: Check[] = [ { - name: "rustfmt", + name: "rust-format", cmd: ["cargo", "fmt", "--all", "--", "--check"], hint: "Run 'cargo fmt --all' to see and fix formatting issues.", }, - { name: "clippy", cmd: ["cargo", "clippy", "--all-features", "--", "--deny", "warnings"] }, - { name: "cargo-check", cmd: ["cargo", "check", "--all-features"] }, + { name: "rust-lint", cmd: ["cargo", "clippy", "--all-features", "--", "--deny", "warnings"] }, + { name: "rust-check", cmd: ["cargo", "check", "--all-features"] }, { name: "rust-test", cmd: ["cargo", "nextest", "run", "-E", "not test(export_bindings)"] }, { name: "svelte-check", cmd: ["bun", "run", "--cwd", "web", "check"] }, - { name: "biome", cmd: ["bun", "run", "--cwd", "web", "format:check"] }, - { name: "biome-lint", cmd: ["bun", "run", "--cwd", "web", "lint"] }, + { name: "web-format", cmd: ["bun", "run", "--cwd", "web", "format:check"] }, { name: "web-test", cmd: ["bun", "run", "--cwd", "web", "test"] }, { name: "actionlint", cmd: ["actionlint"] }, ]; @@ -125,19 +124,19 @@ const domains: Record< recheck: Check[]; } > = { - rustfmt: { - peers: ["clippy", "cargo-check", "rust-test"], + "rust-format": { + peers: ["rust-lint", "rust-check", "rust-test"], format: () => runPiped(["cargo", "fmt", "--all"]), recheck: [ - { name: "rustfmt", cmd: ["cargo", "fmt", "--all", "--", "--check"] }, - { name: "cargo-check", cmd: ["cargo", "check", "--all-features"] }, + { name: "rust-format", cmd: ["cargo", "fmt", "--all", "--", "--check"] }, + { name: "rust-check", cmd: ["cargo", "check", "--all-features"] }, ], }, - biome: { - peers: ["svelte-check", "biome-lint", "web-test"], + "web-format": { + peers: ["svelte-check", "web-test"], format: () => runPiped(["bun", "run", "--cwd", "web", "format"]), recheck: [ - { name: "biome", cmd: ["bun", "run", "--cwd", "web", "format:check"] }, + { name: "web-format", cmd: ["bun", "run", "--cwd", "web", "format:check"] }, { name: "svelte-check", cmd: ["bun", "run", "--cwd", "web", "check"] }, ], }, diff --git a/web/package.json b/web/package.json index b311802..1d3720b 100644 --- a/web/package.json +++ b/web/package.json @@ -8,7 +8,7 @@ "preview": "vite preview", "check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json", "typecheck": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json", - "lint": "biome check .", + "lint": "biome lint .", "test": "vitest run", "format": "biome format --write .", "format:check": "biome format ."