From 914e0d82e67e1439065243921e60b01b764b5abb Mon Sep 17 00:00:00 2001
From: Hydra <hydralauncher@proton.me>
Date: Mon, 13 May 2024 10:46:22 +0100
Subject: [PATCH 1/2] ci: moving prettier to eslint

---
 .eslintrc.cjs              | 2 +-
 .github/workflows/lint.yml | 3 ---
 package.json               | 1 -
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/.eslintrc.cjs b/.eslintrc.cjs
index 564daa84..e23081dc 100644
--- a/.eslintrc.cjs
+++ b/.eslintrc.cjs
@@ -6,7 +6,7 @@ module.exports = {
     "plugin:react-hooks/recommended",
     "plugin:jsx-a11y/recommended",
     "@electron-toolkit/eslint-config-ts/recommended",
-    "prettier",
+    "plugin:prettier/recommended",
   ],
   rules: {
     "@typescript-eslint/explicit-function-return-type": "off",
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 5d5fc277..af4cbae7 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -21,9 +21,6 @@ jobs:
       - name: Validate current commit (last commit) with commitlint
         run: npx commitlint --last --verbose
 
-      - name: Check formatting
-        run: yarn format:check
-
       - name: Typecheck
         run: yarn typecheck
 
diff --git a/package.json b/package.json
index 85043c80..e59d3e12 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,6 @@
   "type": "module",
   "scripts": {
     "format": "prettier --write .",
-    "format:check": "prettier --check .",
     "lint": "eslint . --ext .js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix",
     "typecheck:node": "tsc --noEmit -p tsconfig.node.json --composite false",
     "typecheck:web": "tsc --noEmit -p tsconfig.web.json --composite false",

From d30e095dc4a0f6ee0b46226319c9dede0db2a3f9 Mon Sep 17 00:00:00 2001
From: Hydra <hydralauncher@proton.me>
Date: Mon, 13 May 2024 10:48:17 +0100
Subject: [PATCH 2/2] ci: adding macos-latest

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 59527b31..9a71e379 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -8,7 +8,7 @@ jobs:
   build:
     strategy:
       matrix:
-        os: [windows-latest, ubuntu-latest]
+        os: [windows-latest, macos-latest, ubuntu-latest]
 
     runs-on: ${{ matrix.os }}