Move src-tauri crate to crates/radicle-tauri

.github/workflows/check.yml

@@ -18,13 +18,13 @@ jobs:
     runs-on: ubuntu-latest
     defaults:
       run:
-        working-directory: ./src-tauri
+        working-directory: ./crates/radicle-tauri
     steps:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@stable
       - uses: Swatinem/rust-cache@v2
         with:
-          workspaces: src-tauri -> target
+          workspaces: crates/radicle-tauri -> target
       - uses: awalsh128/cache-apt-pkgs-action@latest
         with:
           packages: libgtk-3-dev libsoup-3.0-dev libjavascriptcoregtk-4.1-dev libwebkit2gtk-4.1-dev

.gitignore

@@ -2,8 +2,8 @@
 node_modules/
 
 # Tauri
-src-tauri/target
-src-tauri/gen/schemas
+crates/radicle-tauri/target
+crates/radicle-tauri/gen/schemas
 
 # KaTeX files
 public/*.min.css

crates/radicle-tauri/Cargo.lock

@@ -3834,27 +3834,6 @@ dependencies = [
  "fastrand",
 ]
 
-[[package]]
-name = "radicle-desktop"
-version = "0.0.0"
-dependencies = [
- "anyhow",
- "base64 0.22.1",
- "log",
- "radicle",
- "radicle-surf",
- "serde",
- "serde_json",
- "tauri",
- "tauri-build",
- "tauri-plugin-clipboard-manager",
- "tauri-plugin-devtools",
- "tauri-plugin-shell",
- "tauri-plugin-window-state",
- "thiserror",
- "ts-rs",
-]
-
 [[package]]
 name = "radicle-git-ext"
 version = "0.8.1"
@@ -3906,6 +3885,26 @@ dependencies = [
  "url",
 ]
 
+[[package]]
+name = "radicle-tauri"
+version = "0.0.0"
+dependencies = [
+ "anyhow",
+ "log",
+ "radicle",
+ "radicle-surf",
+ "serde",
+ "serde_json",
+ "tauri",
+ "tauri-build",
+ "tauri-plugin-clipboard-manager",
+ "tauri-plugin-devtools",
+ "tauri-plugin-shell",
+ "tauri-plugin-window-state",
+ "thiserror",
+ "ts-rs",
+]
+
 [[package]]
 name = "rand"
 version = "0.7.3"

crates/radicle-tauri/Cargo.toml

@@ -1,15 +1,11 @@
 [package]
-name = "radicle-desktop"
+name = "radicle-tauri"
 version = "0.0.0"
-description = "Radicle Desktop App"
 authors = ["Rudolfs Osins <rudolfs@osins.org>", "Sebastian Martinez <me@sebastinez.dev>"]
-homepage = "https://radicle.xyz"
 license = "MIT OR Apache-2.0"
-repository = ""
 edition = "2021"
 rust-version = "1.70"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+publish = false
 
 [lib]
 name = "app_lib"

crates/radicle-tauri/tauri.conf.json

@@ -6,7 +6,7 @@
     "beforeDevCommand": "npm start",
     "devUrl": "http://localhost:1420",
     "beforeBuildCommand": "npm run build",
-    "frontendDist": "../build"
+    "frontendDist": "../../build"
   },
   "app": {
     "windows": [
@@ -26,7 +26,7 @@
       "pattern": {
         "use": "isolation",
         "options": {
-          "dir": "../isolation"
+          "dir": "../../isolation"
         }
       }
     }

eslint.config.js

@@ -137,7 +137,7 @@ export default [
       "build/*",
       "isolation/*",
       "node_modules/**/*",
-      "src-tauri/**/*",
+      "crates/radicle-tauri/**/*",
       "eslint.config.js",
     ],
   },

package.json

@@ -13,7 +13,7 @@
     "check-js": "scripts/check-js",
     "check-rs": "scripts/check-rs",
     "format": "npx prettier '**/*.@(ts|js|svelte|json|css|html|yml)' --write",
-    "generate-types": "cargo test --manifest-path ./src-tauri/Cargo.toml && npx prettier ./src-tauri/bindings --write",
+    "generate-types": "cargo test --manifest-path ./crates/radicle-tauri/Cargo.toml && npx prettier ./crates/radicle-tauri/bindings --write",
     "tauri": "npx tauri"
   },
   "engines": {

scripts/check-rs

@@ -1,6 +1,6 @@
 #!/bin/sh
 set -e
 
-cargo check --manifest-path ./src-tauri/Cargo.toml
-cargo clippy --manifest-path ./src-tauri/Cargo.toml -- -Dwarnings
-cargo fmt --manifest-path ./src-tauri/Cargo.toml --check
+cargo check --manifest-path ./crates/radicle-tauri/Cargo.toml
+cargo clippy --manifest-path ./crates/radicle-tauri/Cargo.toml -- -Dwarnings
+cargo fmt --manifest-path ./crates/radicle-tauri/Cargo.toml --check

tsconfig.json

@@ -20,7 +20,7 @@
     "skipLibCheck": true,
     "paths": {
       "@app/*": ["./src/*"],
-      "@bindings/*": ["./src-tauri/bindings/*"],
+      "@bindings/*": ["./crates/radicle-tauri/bindings/*"],
       "@public/*": ["./public/*"]
     }
   }

vite.config.ts

@@ -14,13 +14,13 @@ export default defineConfig({
     port: 1420,
     strictPort: true,
     watch: {
-      ignored: ["**/src-tauri/**"],
+      ignored: ["**/crates/radicle-tauri/**"],
     },
   },
   resolve: {
     alias: {
       "@app": path.resolve("./src"),
-      "@bindings": path.resolve("./src-tauri/bindings/"),
+      "@bindings": path.resolve("./crates/radicle-tauri/bindings/"),
       "@public": path.resolve("./public"),
     },
   },