Merge pull request #246 from SpikeHD/next

Tauri v2 (for real this time probably)

.github/workflows/backend.yml

@@ -8,6 +8,8 @@ on:
       - 'package.json'
       - 'src-tauri/**'
       - 'updater/**'
+    branches:
+      - main
   pull_request:
     paths:
       - '.github/workflows/backend.yml'
@@ -69,6 +71,7 @@ jobs:
             build-essential \
             curl \
             wget \
+            libwebkit2gtk-4.1-dev \
             libssl-dev \
             libgtk-3-dev \
             libayatana-appindicator3-dev \

.github/workflows/build.yml

@@ -9,6 +9,8 @@ on:
       - 'src-tauri/**/*'
       - 'src/**/*'
       - 'updater/**/*'
+    branches:
+      - main
   pull_request:
     paths:
       - '.github/workflows/build.yml'
@@ -106,7 +108,7 @@ jobs:
         if: matrix.config.platform == 'ubuntu-latest'
         run: |
           sudo apt-get update
-          sudo apt-get install -y libwebkit2gtk-4.0-dev \
+          sudo apt-get install -y libwebkit2gtk-4.1-dev \
             build-essential \
             curl \
             wget \
@@ -120,7 +122,8 @@ jobs:
         run: |
           sudo apt-get install -y \
             libc6:armhf \
-            libwebkit2gtk-4.0-dev:armhf \
+            libapparmor1:armhf \
+            libwebkit2gtk-4.1-dev:armhf \
             libssl-dev:armhf \
             gcc-arm-linux-gnueabihf
     
@@ -129,7 +132,8 @@ jobs:
         run: |
           sudo apt-get install -y \
             libc6:arm64 \
-            libwebkit2gtk-4.0-dev:arm64 \
+            libapparmor1:arm64 \
+            libwebkit2gtk-4.1-dev:arm64 \
             libssl-dev:arm64 \
             gcc-aarch64-linux-gnu
 
@@ -201,6 +205,7 @@ jobs:
           themes/
           icons/
           injection/
+          extension/
 
       - name: (Linux) Compress build
         if: matrix.config.platform == 'ubuntu-latest'

.github/workflows/frontend.yml

@@ -7,6 +7,8 @@ on:
       - '**.lock'
       - '**.rs'
       - '**.toml'
+    branches:
+      - main
   pull_request:
     paths-ignore:
       - '**.lock'

.gitignore

@@ -28,7 +28,7 @@ src-tauri/injection/preinject_min.js
 src-tauri/injection/shelter.js
 
 src-tauri/html
-
 src-tauri/updater*
+src-tauri/gen
 
 updater/target

package.json

@@ -20,14 +20,14 @@
     "shupdate": "curl -L https://raw.githubusercontent.com/uwu/shelter-builds/main/shelter.js -o src-tauri/injection/shelter.js"
   },
   "devDependencies": {
-    "@tauri-apps/api": "^1.5.3",
-    "@tauri-apps/cli": "^1.5.11",
-    "@typescript-eslint/eslint-plugin": "^7.4.0",
-    "@typescript-eslint/parser": "^7.4.0",
+    "@tauri-apps/api": "2.0.0-rc.0",
+    "@tauri-apps/cli": "2.0.0-rc.0",
+    "@typescript-eslint/eslint-plugin": "^7.18.0",
+    "@typescript-eslint/parser": "^7.18.0",
     "esbuild": "^0.20.2",
     "eslint": "^8.57.0",
-    "prettier": "^3.2.5",
-    "typescript": "^5.4.3",
-    "vite": "^5.2.7"
+    "prettier": "^3.3.3",
+    "typescript": "^5.5.4",
+    "vite": "^5.3.5"
   }
 }