diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 6e0988f7..aaedf37d 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -24,7 +24,8 @@ "rust-lang.rust-analyzer", "tamasfe.even-better-toml", "dsznajder.es7-react-js-snippets", - "biomejs.biome" + "biomejs.biome", + "GitHub.vscode-github-actions" ] } } diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index aebc16a7..619213d6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,9 +12,8 @@ env: CI: true jobs: - lint: + cargo-lint: runs-on: ubuntu-latest - name: Lint steps: - uses: actions/checkout@v4 - uses: Swatinem/rust-cache@v2 @@ -26,8 +25,7 @@ jobs: - run: cargo check - run: cargo clippy --all-targets --all-features -- -D warnings - test: - name: Tests + cargo-test: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -35,3 +33,19 @@ jobs: - name: Install dependencies uses: ./.github/actions/install-dependencies - run: cargo test + + npm-lint: + runs-on: ubuntu-latest + defaults: + run: + working-directory: server/ui + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 + with: + node-version: 22 + cache: npm + - name: Install dependencies + run: npm ci + - run: npm run check + - run: npm run build diff --git a/server/ui/eslint.config.js b/server/ui/eslint.config.js index 5f63fbe8..07c47e8c 100644 --- a/server/ui/eslint.config.js +++ b/server/ui/eslint.config.js @@ -1,10 +1,10 @@ import js from "@eslint/js"; -import globals from "globals"; +import prettierRecommended from "eslint-plugin-prettier/recommended"; +import react from "eslint-plugin-react"; import reactHooks from "eslint-plugin-react-hooks"; import reactRefresh from "eslint-plugin-react-refresh"; +import globals from "globals"; import tseslint from "typescript-eslint"; -import react from "eslint-plugin-react"; -import prettierRecommended from "eslint-plugin-prettier/recommended"; export default tseslint.config( { ignores: ["dist"] },