From b2ea2cd2c922f1ac0f9964e22194efef74087a97 Mon Sep 17 00:00:00 2001 From: Sebastian Martinez Date: Mon, 7 Oct 2024 16:13:22 +0200 Subject: [PATCH] Move `src-tauri` crate to `crates/radicle-tauri` --- .github/workflows/check.yml | 4 +- .gitignore | 4 +- .../radicle-tauri}/.gitignore | 0 .../radicle-tauri}/Cargo.lock | 41 +++++++++--------- .../radicle-tauri}/Cargo.toml | 8 +--- .../radicle-tauri}/bindings/Author.ts | 0 .../radicle-tauri}/bindings/CobOptions.ts | 0 .../radicle-tauri}/bindings/CodeLocation.ts | 0 .../radicle-tauri}/bindings/CodeRange.ts | 0 .../radicle-tauri}/bindings/Comment.ts | 0 .../radicle-tauri}/bindings/Config.ts | 0 .../radicle-tauri}/bindings/Edit.ts | 0 .../radicle-tauri}/bindings/Issue.ts | 0 .../radicle-tauri}/bindings/Never.ts | 0 .../radicle-tauri}/bindings/NewIssue.ts | 0 .../bindings/NewIssueComment.ts | 0 .../bindings/NewPatchComment.ts | 0 .../radicle-tauri}/bindings/PaginatedQuery.ts | 0 .../radicle-tauri}/bindings/Patch.ts | 0 .../radicle-tauri}/bindings/Reaction.ts | 0 .../radicle-tauri}/bindings/RepoInfo.ts | 0 .../radicle-tauri}/bindings/Review.ts | 0 .../radicle-tauri}/bindings/Revision.ts | 0 .../radicle-tauri}/bindings/Stats.ts | 0 .../bindings/SupportedPayloads.ts | 0 .../bindings/serde_json/JsonValue.ts | 0 {src-tauri => crates/radicle-tauri}/build.rs | 0 .../radicle-tauri}/capabilities/default.json | 0 .../radicle-tauri}/icons/128x128.png | Bin .../radicle-tauri}/icons/128x128@2x.png | Bin .../radicle-tauri}/icons/16x16.png | Bin .../radicle-tauri}/icons/16x16@2x.png | Bin .../radicle-tauri}/icons/24x24.png | Bin .../radicle-tauri}/icons/256x256.png | Bin .../radicle-tauri}/icons/256x256@2x.png | Bin .../radicle-tauri}/icons/32x32.png | Bin .../radicle-tauri}/icons/32x32@2x.png | Bin .../radicle-tauri}/icons/48x48.png | Bin .../radicle-tauri}/icons/512x512.png | Bin .../radicle-tauri}/icons/512x512@2x.png | Bin .../radicle-tauri}/icons/icon.icns | Bin .../radicle-tauri}/icons/icon.ico | Bin .../radicle-tauri}/src/commands.rs | 0 .../radicle-tauri}/src/commands/auth.rs | 0 .../radicle-tauri}/src/commands/cob.rs | 0 .../radicle-tauri}/src/commands/cob/issue.rs | 0 .../radicle-tauri}/src/commands/cob/patch.rs | 0 .../radicle-tauri}/src/commands/profile.rs | 0 .../radicle-tauri}/src/commands/repo.rs | 0 .../radicle-tauri}/src/commands/thread.rs | 0 .../radicle-tauri}/src/error.rs | 0 .../radicle-tauri}/src/lib.rs | 0 .../radicle-tauri}/src/main.rs | 0 .../radicle-tauri}/src/types/cobs.rs | 0 .../radicle-tauri}/src/types/config.rs | 0 .../radicle-tauri}/src/types/mod.rs | 0 .../radicle-tauri}/src/types/repo.rs | 0 .../radicle-tauri}/tauri.conf.json | 4 +- eslint.config.js | 2 +- package.json | 2 +- scripts/check-rs | 6 +-- tsconfig.json | 2 +- vite.config.ts | 4 +- 63 files changed, 36 insertions(+), 41 deletions(-) rename {src-tauri => crates/radicle-tauri}/.gitignore (100%) rename {src-tauri => crates/radicle-tauri}/Cargo.lock (99%) rename {src-tauri => crates/radicle-tauri}/Cargo.toml (86%) rename {src-tauri => crates/radicle-tauri}/bindings/Author.ts (100%) rename {src-tauri => crates/radicle-tauri}/bindings/CobOptions.ts (100%) rename {src-tauri => crates/radicle-tauri}/bindings/CodeLocation.ts (100%) rename {src-tauri => crates/radicle-tauri}/bindings/CodeRange.ts (100%) rename {src-tauri => crates/radicle-tauri}/bindings/Comment.ts (100%) rename {src-tauri => crates/radicle-tauri}/bindings/Config.ts (100%) rename {src-tauri => crates/radicle-tauri}/bindings/Edit.ts (100%) rename {src-tauri => crates/radicle-tauri}/bindings/Issue.ts (100%) rename {src-tauri => crates/radicle-tauri}/bindings/Never.ts (100%) rename {src-tauri => crates/radicle-tauri}/bindings/NewIssue.ts (100%) rename {src-tauri => crates/radicle-tauri}/bindings/NewIssueComment.ts (100%) rename {src-tauri => crates/radicle-tauri}/bindings/NewPatchComment.ts (100%) rename {src-tauri => crates/radicle-tauri}/bindings/PaginatedQuery.ts (100%) rename {src-tauri => crates/radicle-tauri}/bindings/Patch.ts (100%) rename {src-tauri => crates/radicle-tauri}/bindings/Reaction.ts (100%) rename {src-tauri => crates/radicle-tauri}/bindings/RepoInfo.ts (100%) rename {src-tauri => crates/radicle-tauri}/bindings/Review.ts (100%) rename {src-tauri => crates/radicle-tauri}/bindings/Revision.ts (100%) rename {src-tauri => crates/radicle-tauri}/bindings/Stats.ts (100%) rename {src-tauri => crates/radicle-tauri}/bindings/SupportedPayloads.ts (100%) rename {src-tauri => crates/radicle-tauri}/bindings/serde_json/JsonValue.ts (100%) rename {src-tauri => crates/radicle-tauri}/build.rs (100%) rename {src-tauri => crates/radicle-tauri}/capabilities/default.json (100%) rename {src-tauri => crates/radicle-tauri}/icons/128x128.png (100%) rename {src-tauri => crates/radicle-tauri}/icons/128x128@2x.png (100%) rename {src-tauri => crates/radicle-tauri}/icons/16x16.png (100%) rename {src-tauri => crates/radicle-tauri}/icons/16x16@2x.png (100%) rename {src-tauri => crates/radicle-tauri}/icons/24x24.png (100%) rename {src-tauri => crates/radicle-tauri}/icons/256x256.png (100%) rename {src-tauri => crates/radicle-tauri}/icons/256x256@2x.png (100%) rename {src-tauri => crates/radicle-tauri}/icons/32x32.png (100%) rename {src-tauri => crates/radicle-tauri}/icons/32x32@2x.png (100%) rename {src-tauri => crates/radicle-tauri}/icons/48x48.png (100%) rename {src-tauri => crates/radicle-tauri}/icons/512x512.png (100%) rename {src-tauri => crates/radicle-tauri}/icons/512x512@2x.png (100%) rename {src-tauri => crates/radicle-tauri}/icons/icon.icns (100%) rename {src-tauri => crates/radicle-tauri}/icons/icon.ico (100%) rename {src-tauri => crates/radicle-tauri}/src/commands.rs (100%) rename {src-tauri => crates/radicle-tauri}/src/commands/auth.rs (100%) rename {src-tauri => crates/radicle-tauri}/src/commands/cob.rs (100%) rename {src-tauri => crates/radicle-tauri}/src/commands/cob/issue.rs (100%) rename {src-tauri => crates/radicle-tauri}/src/commands/cob/patch.rs (100%) rename {src-tauri => crates/radicle-tauri}/src/commands/profile.rs (100%) rename {src-tauri => crates/radicle-tauri}/src/commands/repo.rs (100%) rename {src-tauri => crates/radicle-tauri}/src/commands/thread.rs (100%) rename {src-tauri => crates/radicle-tauri}/src/error.rs (100%) rename {src-tauri => crates/radicle-tauri}/src/lib.rs (100%) rename {src-tauri => crates/radicle-tauri}/src/main.rs (100%) rename {src-tauri => crates/radicle-tauri}/src/types/cobs.rs (100%) rename {src-tauri => crates/radicle-tauri}/src/types/config.rs (100%) rename {src-tauri => crates/radicle-tauri}/src/types/mod.rs (100%) rename {src-tauri => crates/radicle-tauri}/src/types/repo.rs (100%) rename {src-tauri => crates/radicle-tauri}/tauri.conf.json (94%) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 281433a75..1bcf05a82 100644 --- a/.github/workflows/check.yml +++ b/.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 diff --git a/.gitignore b/.gitignore index b7792c119..73a70b1b6 100644 --- a/.gitignore +++ b/.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 diff --git a/src-tauri/.gitignore b/crates/radicle-tauri/.gitignore similarity index 100% rename from src-tauri/.gitignore rename to crates/radicle-tauri/.gitignore diff --git a/src-tauri/Cargo.lock b/crates/radicle-tauri/Cargo.lock similarity index 99% rename from src-tauri/Cargo.lock rename to crates/radicle-tauri/Cargo.lock index fc37fd2e9..f7b40e45b 100644 --- a/src-tauri/Cargo.lock +++ b/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" diff --git a/src-tauri/Cargo.toml b/crates/radicle-tauri/Cargo.toml similarity index 86% rename from src-tauri/Cargo.toml rename to crates/radicle-tauri/Cargo.toml index bc7194fa9..0c98d6e4d 100644 --- a/src-tauri/Cargo.toml +++ b/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 ", "Sebastian Martinez "] -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" diff --git a/src-tauri/bindings/Author.ts b/crates/radicle-tauri/bindings/Author.ts similarity index 100% rename from src-tauri/bindings/Author.ts rename to crates/radicle-tauri/bindings/Author.ts diff --git a/src-tauri/bindings/CobOptions.ts b/crates/radicle-tauri/bindings/CobOptions.ts similarity index 100% rename from src-tauri/bindings/CobOptions.ts rename to crates/radicle-tauri/bindings/CobOptions.ts diff --git a/src-tauri/bindings/CodeLocation.ts b/crates/radicle-tauri/bindings/CodeLocation.ts similarity index 100% rename from src-tauri/bindings/CodeLocation.ts rename to crates/radicle-tauri/bindings/CodeLocation.ts diff --git a/src-tauri/bindings/CodeRange.ts b/crates/radicle-tauri/bindings/CodeRange.ts similarity index 100% rename from src-tauri/bindings/CodeRange.ts rename to crates/radicle-tauri/bindings/CodeRange.ts diff --git a/src-tauri/bindings/Comment.ts b/crates/radicle-tauri/bindings/Comment.ts similarity index 100% rename from src-tauri/bindings/Comment.ts rename to crates/radicle-tauri/bindings/Comment.ts diff --git a/src-tauri/bindings/Config.ts b/crates/radicle-tauri/bindings/Config.ts similarity index 100% rename from src-tauri/bindings/Config.ts rename to crates/radicle-tauri/bindings/Config.ts diff --git a/src-tauri/bindings/Edit.ts b/crates/radicle-tauri/bindings/Edit.ts similarity index 100% rename from src-tauri/bindings/Edit.ts rename to crates/radicle-tauri/bindings/Edit.ts diff --git a/src-tauri/bindings/Issue.ts b/crates/radicle-tauri/bindings/Issue.ts similarity index 100% rename from src-tauri/bindings/Issue.ts rename to crates/radicle-tauri/bindings/Issue.ts diff --git a/src-tauri/bindings/Never.ts b/crates/radicle-tauri/bindings/Never.ts similarity index 100% rename from src-tauri/bindings/Never.ts rename to crates/radicle-tauri/bindings/Never.ts diff --git a/src-tauri/bindings/NewIssue.ts b/crates/radicle-tauri/bindings/NewIssue.ts similarity index 100% rename from src-tauri/bindings/NewIssue.ts rename to crates/radicle-tauri/bindings/NewIssue.ts diff --git a/src-tauri/bindings/NewIssueComment.ts b/crates/radicle-tauri/bindings/NewIssueComment.ts similarity index 100% rename from src-tauri/bindings/NewIssueComment.ts rename to crates/radicle-tauri/bindings/NewIssueComment.ts diff --git a/src-tauri/bindings/NewPatchComment.ts b/crates/radicle-tauri/bindings/NewPatchComment.ts similarity index 100% rename from src-tauri/bindings/NewPatchComment.ts rename to crates/radicle-tauri/bindings/NewPatchComment.ts diff --git a/src-tauri/bindings/PaginatedQuery.ts b/crates/radicle-tauri/bindings/PaginatedQuery.ts similarity index 100% rename from src-tauri/bindings/PaginatedQuery.ts rename to crates/radicle-tauri/bindings/PaginatedQuery.ts diff --git a/src-tauri/bindings/Patch.ts b/crates/radicle-tauri/bindings/Patch.ts similarity index 100% rename from src-tauri/bindings/Patch.ts rename to crates/radicle-tauri/bindings/Patch.ts diff --git a/src-tauri/bindings/Reaction.ts b/crates/radicle-tauri/bindings/Reaction.ts similarity index 100% rename from src-tauri/bindings/Reaction.ts rename to crates/radicle-tauri/bindings/Reaction.ts diff --git a/src-tauri/bindings/RepoInfo.ts b/crates/radicle-tauri/bindings/RepoInfo.ts similarity index 100% rename from src-tauri/bindings/RepoInfo.ts rename to crates/radicle-tauri/bindings/RepoInfo.ts diff --git a/src-tauri/bindings/Review.ts b/crates/radicle-tauri/bindings/Review.ts similarity index 100% rename from src-tauri/bindings/Review.ts rename to crates/radicle-tauri/bindings/Review.ts diff --git a/src-tauri/bindings/Revision.ts b/crates/radicle-tauri/bindings/Revision.ts similarity index 100% rename from src-tauri/bindings/Revision.ts rename to crates/radicle-tauri/bindings/Revision.ts diff --git a/src-tauri/bindings/Stats.ts b/crates/radicle-tauri/bindings/Stats.ts similarity index 100% rename from src-tauri/bindings/Stats.ts rename to crates/radicle-tauri/bindings/Stats.ts diff --git a/src-tauri/bindings/SupportedPayloads.ts b/crates/radicle-tauri/bindings/SupportedPayloads.ts similarity index 100% rename from src-tauri/bindings/SupportedPayloads.ts rename to crates/radicle-tauri/bindings/SupportedPayloads.ts diff --git a/src-tauri/bindings/serde_json/JsonValue.ts b/crates/radicle-tauri/bindings/serde_json/JsonValue.ts similarity index 100% rename from src-tauri/bindings/serde_json/JsonValue.ts rename to crates/radicle-tauri/bindings/serde_json/JsonValue.ts diff --git a/src-tauri/build.rs b/crates/radicle-tauri/build.rs similarity index 100% rename from src-tauri/build.rs rename to crates/radicle-tauri/build.rs diff --git a/src-tauri/capabilities/default.json b/crates/radicle-tauri/capabilities/default.json similarity index 100% rename from src-tauri/capabilities/default.json rename to crates/radicle-tauri/capabilities/default.json diff --git a/src-tauri/icons/128x128.png b/crates/radicle-tauri/icons/128x128.png similarity index 100% rename from src-tauri/icons/128x128.png rename to crates/radicle-tauri/icons/128x128.png diff --git a/src-tauri/icons/128x128@2x.png b/crates/radicle-tauri/icons/128x128@2x.png similarity index 100% rename from src-tauri/icons/128x128@2x.png rename to crates/radicle-tauri/icons/128x128@2x.png diff --git a/src-tauri/icons/16x16.png b/crates/radicle-tauri/icons/16x16.png similarity index 100% rename from src-tauri/icons/16x16.png rename to crates/radicle-tauri/icons/16x16.png diff --git a/src-tauri/icons/16x16@2x.png b/crates/radicle-tauri/icons/16x16@2x.png similarity index 100% rename from src-tauri/icons/16x16@2x.png rename to crates/radicle-tauri/icons/16x16@2x.png diff --git a/src-tauri/icons/24x24.png b/crates/radicle-tauri/icons/24x24.png similarity index 100% rename from src-tauri/icons/24x24.png rename to crates/radicle-tauri/icons/24x24.png diff --git a/src-tauri/icons/256x256.png b/crates/radicle-tauri/icons/256x256.png similarity index 100% rename from src-tauri/icons/256x256.png rename to crates/radicle-tauri/icons/256x256.png diff --git a/src-tauri/icons/256x256@2x.png b/crates/radicle-tauri/icons/256x256@2x.png similarity index 100% rename from src-tauri/icons/256x256@2x.png rename to crates/radicle-tauri/icons/256x256@2x.png diff --git a/src-tauri/icons/32x32.png b/crates/radicle-tauri/icons/32x32.png similarity index 100% rename from src-tauri/icons/32x32.png rename to crates/radicle-tauri/icons/32x32.png diff --git a/src-tauri/icons/32x32@2x.png b/crates/radicle-tauri/icons/32x32@2x.png similarity index 100% rename from src-tauri/icons/32x32@2x.png rename to crates/radicle-tauri/icons/32x32@2x.png diff --git a/src-tauri/icons/48x48.png b/crates/radicle-tauri/icons/48x48.png similarity index 100% rename from src-tauri/icons/48x48.png rename to crates/radicle-tauri/icons/48x48.png diff --git a/src-tauri/icons/512x512.png b/crates/radicle-tauri/icons/512x512.png similarity index 100% rename from src-tauri/icons/512x512.png rename to crates/radicle-tauri/icons/512x512.png diff --git a/src-tauri/icons/512x512@2x.png b/crates/radicle-tauri/icons/512x512@2x.png similarity index 100% rename from src-tauri/icons/512x512@2x.png rename to crates/radicle-tauri/icons/512x512@2x.png diff --git a/src-tauri/icons/icon.icns b/crates/radicle-tauri/icons/icon.icns similarity index 100% rename from src-tauri/icons/icon.icns rename to crates/radicle-tauri/icons/icon.icns diff --git a/src-tauri/icons/icon.ico b/crates/radicle-tauri/icons/icon.ico similarity index 100% rename from src-tauri/icons/icon.ico rename to crates/radicle-tauri/icons/icon.ico diff --git a/src-tauri/src/commands.rs b/crates/radicle-tauri/src/commands.rs similarity index 100% rename from src-tauri/src/commands.rs rename to crates/radicle-tauri/src/commands.rs diff --git a/src-tauri/src/commands/auth.rs b/crates/radicle-tauri/src/commands/auth.rs similarity index 100% rename from src-tauri/src/commands/auth.rs rename to crates/radicle-tauri/src/commands/auth.rs diff --git a/src-tauri/src/commands/cob.rs b/crates/radicle-tauri/src/commands/cob.rs similarity index 100% rename from src-tauri/src/commands/cob.rs rename to crates/radicle-tauri/src/commands/cob.rs diff --git a/src-tauri/src/commands/cob/issue.rs b/crates/radicle-tauri/src/commands/cob/issue.rs similarity index 100% rename from src-tauri/src/commands/cob/issue.rs rename to crates/radicle-tauri/src/commands/cob/issue.rs diff --git a/src-tauri/src/commands/cob/patch.rs b/crates/radicle-tauri/src/commands/cob/patch.rs similarity index 100% rename from src-tauri/src/commands/cob/patch.rs rename to crates/radicle-tauri/src/commands/cob/patch.rs diff --git a/src-tauri/src/commands/profile.rs b/crates/radicle-tauri/src/commands/profile.rs similarity index 100% rename from src-tauri/src/commands/profile.rs rename to crates/radicle-tauri/src/commands/profile.rs diff --git a/src-tauri/src/commands/repo.rs b/crates/radicle-tauri/src/commands/repo.rs similarity index 100% rename from src-tauri/src/commands/repo.rs rename to crates/radicle-tauri/src/commands/repo.rs diff --git a/src-tauri/src/commands/thread.rs b/crates/radicle-tauri/src/commands/thread.rs similarity index 100% rename from src-tauri/src/commands/thread.rs rename to crates/radicle-tauri/src/commands/thread.rs diff --git a/src-tauri/src/error.rs b/crates/radicle-tauri/src/error.rs similarity index 100% rename from src-tauri/src/error.rs rename to crates/radicle-tauri/src/error.rs diff --git a/src-tauri/src/lib.rs b/crates/radicle-tauri/src/lib.rs similarity index 100% rename from src-tauri/src/lib.rs rename to crates/radicle-tauri/src/lib.rs diff --git a/src-tauri/src/main.rs b/crates/radicle-tauri/src/main.rs similarity index 100% rename from src-tauri/src/main.rs rename to crates/radicle-tauri/src/main.rs diff --git a/src-tauri/src/types/cobs.rs b/crates/radicle-tauri/src/types/cobs.rs similarity index 100% rename from src-tauri/src/types/cobs.rs rename to crates/radicle-tauri/src/types/cobs.rs diff --git a/src-tauri/src/types/config.rs b/crates/radicle-tauri/src/types/config.rs similarity index 100% rename from src-tauri/src/types/config.rs rename to crates/radicle-tauri/src/types/config.rs diff --git a/src-tauri/src/types/mod.rs b/crates/radicle-tauri/src/types/mod.rs similarity index 100% rename from src-tauri/src/types/mod.rs rename to crates/radicle-tauri/src/types/mod.rs diff --git a/src-tauri/src/types/repo.rs b/crates/radicle-tauri/src/types/repo.rs similarity index 100% rename from src-tauri/src/types/repo.rs rename to crates/radicle-tauri/src/types/repo.rs diff --git a/src-tauri/tauri.conf.json b/crates/radicle-tauri/tauri.conf.json similarity index 94% rename from src-tauri/tauri.conf.json rename to crates/radicle-tauri/tauri.conf.json index c29dd6727..10cd3d3e4 100644 --- a/src-tauri/tauri.conf.json +++ b/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" } } } diff --git a/eslint.config.js b/eslint.config.js index da0c2b17e..24c3789fc 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -137,7 +137,7 @@ export default [ "build/*", "isolation/*", "node_modules/**/*", - "src-tauri/**/*", + "crates/radicle-tauri/**/*", "eslint.config.js", ], }, diff --git a/package.json b/package.json index 04787e782..f6d622bb4 100644 --- a/package.json +++ b/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": { diff --git a/scripts/check-rs b/scripts/check-rs index 7137fa332..d2caeeb67 100755 --- a/scripts/check-rs +++ b/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 diff --git a/tsconfig.json b/tsconfig.json index 3c9957932..1c0934748 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -20,7 +20,7 @@ "skipLibCheck": true, "paths": { "@app/*": ["./src/*"], - "@bindings/*": ["./src-tauri/bindings/*"], + "@bindings/*": ["./crates/radicle-tauri/bindings/*"], "@public/*": ["./public/*"] } } diff --git a/vite.config.ts b/vite.config.ts index b7f6cbb9e..adfab5202 100644 --- a/vite.config.ts +++ b/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"), }, },