update config to refer to new crate structure

.github/workflows/push.yaml

@@ -15,7 +15,7 @@ jobs:
       node: ${{ steps.filter.outputs.node }}
       rust: ${{ steps.filter.outputs.rust }}
       gitbutler-core: ${{ steps.filter.outputs.gitbutler-core }}
-      gitbutler-app: ${{ steps.filter.outputs.gitbutler-app }}
+      gitbutler-tauri: ${{ steps.filter.outputs.gitbutler-tauri }}
       gitbutler-changeset: ${{ steps.filter.outputs.gitbutler-changeset }}
       gitbutler-git: ${{ steps.filter.outputs.gitbutler-git }}
     steps:
@@ -25,7 +25,7 @@ jobs:
         with:
           filters: |
             node:
-              - 'gitbutler-ui/**'
+              - 'app/**'
               - 'package.json'
               - 'pnpm-lock.yaml'
             common-rust: &rust
@@ -34,19 +34,18 @@ jobs:
               - 'rust-toolchain.toml'
             rust: &any-rust
               - *rust
-              - 'gitbutler-!(ui)/**'
               - 'crates/**'
-            gitbutler-app:
+            gitbutler-tauri:
               - *any-rust
             gitbutler-core:
               - *rust
               - 'crates/gitbutler-core/**'
             gitbutler-changeset:
               - *rust
-              - 'gitbutler-changeset/**'
+              - 'crates/gitbutler-changeset/**'
             gitbutler-git:
               - *rust
-              - 'gitbutler-git/**'
+              - 'crates/gitbutler-git/**'
 
   lint-node:
     needs: changes
@@ -102,9 +101,9 @@ jobs:
         env:
           RUSTDOCFLAGS: -Dwarnings
 
-  check-gitbutler:
+  check-gitbutler-tauri:
     needs: [changes, rust-init]
-    if: ${{ needs.changes.outputs.gitbutler-core == 'true' }}
+    if: ${{ needs.changes.outputs.gitbutler-tauri == 'true' }}
     runs-on: ubuntu-latest
     container:
       image: ghcr.io/gitbutlerapp/ci-base-image:latest
@@ -120,29 +119,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/check-crate
         with:
-          crate: gitbutler-core
-          features: ${{ toJson(matrix.features) }}
-          action: ${{ matrix.action }}
-
-  check-gitbutler-app:
-    needs: [changes, rust-init]
-    if: ${{ needs.changes.outputs.gitbutler-app == 'true' }}
-    runs-on: ubuntu-latest
-    container:
-      image: ghcr.io/gitbutlerapp/ci-base-image:latest
-    strategy:
-      matrix:
-        action:
-          - test
-          - check
-          - check-tests
-        features:
-          - ''
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ./.github/actions/check-crate
-        with:
-          crate: gitbutler-app
+          crate: gitbutler-tauri
           features: ${{ toJson(matrix.features) }}
           action: ${{ matrix.action }}
 
@@ -194,12 +171,35 @@ jobs:
           features: ${{ toJson(matrix.features) }}
           action: ${{ matrix.action }}
 
+  check-gitbutler-core:
+    needs: [changes, rust-init]
+    if: ${{ needs.changes.outputs.gitbutler-core == 'true' }}
+    runs-on: ubuntu-latest
+    container:
+      image: ghcr.io/gitbutlerapp/ci-base-image:latest
+    strategy:
+      matrix:
+        action:
+          - test
+          - check
+        features:
+          - ''
+          - '*'
+          - []
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ./.github/actions/check-crate
+        with:
+          crate: gitbutler-git
+          features: ${{ toJson(matrix.features) }}
+          action: ${{ matrix.action }}
+
   check-rust:
     if: always()
     needs:
       - changes
-      - check-gitbutler
-      - check-gitbutler-app
+      - check-gitbutler-tauri
+      - check-gitbutler-core
       - check-gitbutler-changeset
       - check-gitbutler-git
     runs-on: ubuntu-latest

Cargo.toml

@@ -1,14 +1,9 @@
-[lints.clippy]
-all = "deny"
-perf = "deny"
-correctness = "deny"
-
 [workspace]
 members = [
     "crates/gitbutler-core",
-    "gitbutler-app",
-    "gitbutler-changeset",
-    "gitbutler-git",
+    "crates/gitbutler-tauri",
+    "crates/gitbutler-changeset",
+    "crates/gitbutler-git",
 ]
 resolver = "2"
 
@@ -20,6 +15,9 @@ thiserror = "1.0.58"
 rusqlite = { version = "0.29.0", features = [ "bundled", "blob" ] }
 tokio = { version = "1.37.0" }
 
+gitbutler-git = { path = "crates/gitbutler-git" }
+gitbutler-core = { path = "crates/gitbutler-core" }
+
 [profile.release]
 codegen-units = 1 # Compile crates one after another so the compiler can optimize better
 lto = true        # Enables link to optimizations

crates/gitbutler-core/Cargo.toml

@@ -51,10 +51,10 @@ uuid.workspace = true
 walkdir = "2.5.0"
 zip = "0.6.5"
 tempfile = "3.10"
-gitbutler-git = { path = "../../gitbutler-git" }
+gitbutler-git.workspace = true
 
 [features]
 # by default Tauri runs in production mode
 # when `tauri dev` runs it is executed with `cargo run --no-default-features` if `devPath` is a URL
 default = ["error-context"]
-error-context = ["dep:backtrace"]
+error-context = ["dep:backtrace"]

crates/gitbutler-tauri/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "gitbutler-app"
+name = "gitbutler-tauri"
 version = "0.0.0"
 edition = "2021"
 rust-version = "1.57"
@@ -10,7 +10,7 @@ publish = false
 doctest = false
 
 [[bin]]
-name = "gitbutler-app"
+name = "gitbutler-tauri"
 path = "src/main.rs"
 test = false
 
@@ -43,7 +43,6 @@ sentry-tracing = "0.32.0"
 serde.workspace = true
 serde_json = { version = "1.0", features = [ "std", "arbitrary_precision" ] }
 slug = "0.1.5"
-tauri = { version = "1.6.1", features = [ "http-all", "os-all", "dialog-open", "fs-read-file", "path-all", "process-relaunch", "protocol-asset", "shell-open", "window-maximize", "window-start-dragging", "window-unmaximize"] }
 tauri-plugin-context-menu = { git = "https://github.com/c2r0b/tauri-plugin-context-menu", branch = "main" }
 tauri-plugin-single-instance = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }
 tauri-plugin-window-state = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }
@@ -56,14 +55,22 @@ tokio-util = "0.7.10"
 tracing = "0.1.40"
 tracing-appender = "0.2.3"
 tracing-subscriber = "0.3.17"
-gitbutler-core = { path = "../crates/gitbutler-core" }
+gitbutler-core.workspace = true
+
+[dependencies.tauri]
+version = "1.6.1"
+features = [
+    "http-all", "os-all", "dialog-open", "fs-read-file",
+    "path-all", "process-relaunch", "protocol-asset",
+    "shell-open", "window-maximize", "window-start-dragging",
+    "window-unmaximize"
+]
 
 [lints.clippy]
 all = "deny"
 perf = "deny"
 correctness = "deny"
 
-
 [features]
 # by default Tauri runs in production mode
 # when `tauri dev` runs it is executed with `cargo run --no-default-features` if `devPath` is a URL

crates/gitbutler-tauri/build.rs

@@ -4,19 +4,20 @@ fn main() {
     // exist at build time, and it's otherwise manually required to create
     // it before building.
     let manifest_dir = std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR"));
-    assert_eq!(manifest_dir.file_name().unwrap(), "gitbutler-app");
-    let build_dir = manifest_dir.parent().unwrap().join("gitbutler-ui/build");
+    assert_eq!(manifest_dir.file_name().unwrap(), "gitbutler-tauri");
+    let build_dir = manifest_dir
+        .parent()
+        .unwrap()
+        .parent()
+        .unwrap()
+        .join("app")
+        .join("build");
     if !build_dir.exists() {
         // NOTE(qix-): Do not use `create_dir_all` here - the parent directory
         // NOTE(qix-): already exists, and we want to fail if not (for some reason).
         #[allow(clippy::expect_fun_call, clippy::create_dir)]
-        std::fs::create_dir(&build_dir).expect(
-            format!(
-                "failed to create gitbutler-ui build directory: {:?}",
-                build_dir
-            )
-            .as_str(),
-        );
+        std::fs::create_dir(&build_dir)
+            .expect(format!("failed to create app/build directory: {:?}", build_dir).as_str());
     }
 
     tauri_build::build();

crates/gitbutler-tauri/inject-git-binaries.sh

@@ -6,17 +6,20 @@ function log {
     printf "[%s] %s\n\n" "$THIS" "$*"
 }
 
+ROOT="$(dirname "$THIS")/../.."
+TARGET_ROOT="$ROOT/target/release"
+CRATE_ROOT="$ROOT/crates/gitbutler-tauri"
 
-if [ -f "target/release/gitbutler-git-askpass" ] && [ -f "target/release/gitbutler-git-setsid" ]; then
+if [ -f "$TARGET_ROOT/gitbutler-git-askpass" ] && [ -f "$TARGET_ROOT/gitbutler-git-setsid" ]; then
     TRIPLE="$(rustc -vV | sed -n 's|host: ||p')"
-    log injecting gitbutler-git binaries into gitbutler-app "(TRIPLE=${TRIPLE})"
-    cp -v target/release/gitbutler-git-askpass "gitbutler-app/gitbutler-git-askpass-${TRIPLE}"
-    cp -v target/release/gitbutler-git-setsid "gitbutler-app/gitbutler-git-setsid-${TRIPLE}"
-elif [ -f "target/release/gitbutler-git-askpass.exe" ] && [ -f "target/release/gitbutler-git-setsid.exe" ]; then
+    log injecting gitbutler-git binaries into crates/gitbutler-tauri "(TRIPLE=${TRIPLE})"
+    cp -v "$TARGET_ROOT/gitbutler-git-askpass" "$CRATE_ROOT/gitbutler-git-askpass-${TRIPLE}"
+    cp -v "$TARGET_ROOT/gitbutler-git-setsid" "$CRATE_ROOT/gitbutler-git-setsid-${TRIPLE}"
+elif [ -f "$TARGET_ROOT/gitbutler-git-askpass.exe" ] && [ -f "$TARGET_ROOT/gitbutler-git-setsid.exe" ]; then
     TRIPLE="$(rustc.exe -vV | sed -n 's|host: ||p')"
-    log injecting gitbutler-git binaries into gitbutler-app "(TRIPLE=${TRIPLE})"
-    cp -v target/release/gitbutler-git-askpass.exe "gitbutler-app/gitbutler-git-askpass-${TRIPLE}.exe"
-    cp -v target/release/gitbutler-git-setsid.exe "gitbutler-app/gitbutler-git-setsid-${TRIPLE}.exe"
+    log injecting gitbutler-git binaries into crates/gitbutler-tauri "(TRIPLE=${TRIPLE})"
+    cp -v "$TARGET_ROOT/gitbutler-git-askpass.exe" "$CRATE_ROOT/gitbutler-git-askpass-${TRIPLE}.exe"
+    cp -v "$TARGET_ROOT/gitbutler-git-setsid.exe" "$CRATE_ROOT/gitbutler-git-setsid-${TRIPLE}.exe"
 else
     log gitbutler-git binaries are not built
     exit 1

crates/gitbutler-tauri/src/main.rs

@@ -16,13 +16,13 @@
 use std::path::PathBuf;
 
 use anyhow::Context;
-use gitbutler_app::{
-    analytics, app, askpass, commands, deltas, github, keys, logs, menu, projects, sentry,
-    sessions, users, virtual_branches, watcher, zip,
-};
 #[cfg(target_os = "windows")]
 use gitbutler_core::windows;
 use gitbutler_core::{assets, database, git, storage};
+use gitbutler_tauri::{
+    analytics, app, askpass, commands, deltas, github, keys, logs, menu, projects, sentry,
+    sessions, users, virtual_branches, watcher, zip,
+};
 use tauri::{generate_context, Manager, Wry};
 use tauri_plugin_log::LogTarget;
 use tauri_plugin_store::{with_store, JsonValue, StoreCollection};

crates/gitbutler-tauri/tauri.conf.json

@@ -3,7 +3,7 @@
 		"beforeDevCommand": "pnpm dev",
 		"beforeBuildCommand": "pnpm build:development",
 		"devPath": "http://localhost:1420",
-		"distDir": "../gitbutler-ui/build",
+		"distDir": "../../app/build",
 		"withGlobalTauri": false
 	},
 	"package": {

crates/gitbutler-tauri/tauri.conf.nightly.json

@@ -1,6 +1,6 @@
 {
 	"build": {
-		"beforeBuildCommand": "pnpm build:nightly && cargo build --release -p gitbutler-git && bash ./gitbutler-app/inject-git-binaries.sh"
+		"beforeBuildCommand": "pnpm build:nightly && cargo build --release -p gitbutler-git && bash ./gitbutler-tauri/inject-git-binaries.sh"
 	},
 	"package": {
 		"productName": "GitButler Nightly"

crates/gitbutler-tauri/tauri.conf.release.json

@@ -1,6 +1,6 @@
 {
 	"build": {
-		"beforeBuildCommand": "pnpm build && cargo build --release -p gitbutler-git && bash ./gitbutler-app/inject-git-binaries.sh"
+		"beforeBuildCommand": "pnpm build && cargo build --release -p gitbutler-git && bash ./gitbutler-tauri/inject-git-binaries.sh"
 	},
 	"package": {
 		"productName": "GitButler"

crates/gitbutler-tauri/tests/app.rs

@@ -1,4 +1,4 @@
 // TODO(ST): move test code into crate and use that, but wait for `crates/`
-#[path = "../../crates/gitbutler-core/tests/shared/mod.rs"]
+#[path = "../../gitbutler-core/tests/shared/mod.rs"]
 pub mod shared;
 mod watcher;

crates/gitbutler-tauri/tests/watcher/handler/calculate_delta_handler.rs

@@ -5,12 +5,12 @@ use std::{
 };
 
 use anyhow::Result;
-use gitbutler_app::watcher::handlers::calculate_deltas_handler::Handler;
 use gitbutler_core::{
     deltas::{self, operations::Operation},
     reader, sessions,
     virtual_branches::{self, branch, VirtualBranchesHandle},
 };
+use gitbutler_tauri::watcher::handlers::calculate_deltas_handler::Handler;
 use once_cell::sync::Lazy;
 
 use self::branch::BranchId;

crates/gitbutler-tauri/tests/watcher/handler/fetch_gitbutler_data.rs

@@ -1,7 +1,7 @@
 use std::time::SystemTime;
 
-use gitbutler_app::watcher::handlers::fetch_gitbutler_data::Handler;
 use gitbutler_core::projects;
+use gitbutler_tauri::watcher::handlers::fetch_gitbutler_data::Handler;
 use pretty_assertions::assert_eq;
 
 use crate::{

crates/gitbutler-tauri/tests/watcher/handler/git_file_change.rs

@@ -1,8 +1,8 @@
 use std::fs;
 
 use anyhow::Result;
-use gitbutler_app::watcher::{handlers, handlers::git_file_change::Handler, Event};
 use gitbutler_core::projects;
+use gitbutler_tauri::watcher::{handlers, handlers::git_file_change::Handler, Event};
 use pretty_assertions::assert_eq;
 
 use crate::shared::{Case, Suite};

crates/gitbutler-tauri/tests/watcher/handler/push_project_to_gitbutler.rs

@@ -1,8 +1,8 @@
 use std::{collections::HashMap, path::PathBuf};
 
 use anyhow::Result;
-use gitbutler_app::watcher::handlers::push_project_to_gitbutler::Handler;
 use gitbutler_core::{git, project_repository::LogUntil, projects};
+use gitbutler_tauri::watcher::handlers::push_project_to_gitbutler::Handler;
 
 use crate::{
     shared::{virtual_branches::set_test_target, Case, Suite},

pnpm-lock.yaml

@@ -12,7 +12,7 @@ importers:
         specifier: ^1.5.11
         version: 1.5.11
 
-  gitbutler-ui:
+  app:
     dependencies:
       openai:
         specifier: ^4.31.0
@@ -221,10 +221,10 @@ importers:
         version: 0.7.0
       tauri-plugin-log-api:
         specifier: github:tauri-apps/tauri-plugin-log#v1
-        version: github.com/tauri-apps/tauri-plugin-log/19f5dcc0425e9127d2c591780e5047b83e77a7c2
+        version: github.com/tauri-apps/tauri-plugin-log/db7255ca2e07fc4d3e6cc5d93f9ccfceacb28901
       tauri-plugin-store-api:
         specifier: github:tauri-apps/tauri-plugin-store#v1
-        version: github.com/tauri-apps/tauri-plugin-store/7d2632996f290b0f18cc5f8a2b2791046400690e
+        version: github.com/tauri-apps/tauri-plugin-store/02243686d0507d2aeeb2924cd889dd0bcb47ecef
       tinykeys:
         specifier: ^2.1.0
         version: 2.1.0
@@ -295,34 +295,6 @@ packages:
       to-fast-properties: 2.0.0
     dev: true
 
-  /@codemirror/autocomplete@6.12.0(@codemirror/language@6.10.1)(@codemirror/state@6.4.1)(@codemirror/view@6.26.1)(@lezer/common@1.2.1):
-    resolution: {integrity: sha512-r4IjdYFthwbCQyvqnSlx0WBHRHi8nBvU+WjJxFUij81qsBfhNudf/XKKmmC2j3m0LaOYUQTf3qiEK1J8lO1sdg==}
-    peerDependencies:
-      '@codemirror/language': ^6.0.0
-      '@codemirror/state': ^6.0.0
-      '@codemirror/view': ^6.0.0
-      '@lezer/common': ^1.0.0
-    dependencies:
-      '@codemirror/language': 6.10.1
-      '@codemirror/state': 6.4.1
-      '@codemirror/view': 6.26.1
-      '@lezer/common': 1.2.1
-    dev: true
-
-  /@codemirror/autocomplete@6.13.0(@codemirror/language@6.10.1)(@codemirror/state@6.4.1)(@codemirror/view@6.26.1)(@lezer/common@1.2.1):
-    resolution: {integrity: sha512-SuDrho1klTINfbcMPnyro1ZxU9xJtwDMtb62R8TjL/tOl71IoOsvBo1a9x+hDvHhIzkTcJHy2VC+rmpGgYkRSw==}
-    peerDependencies:
-      '@codemirror/language': ^6.0.0
-      '@codemirror/state': ^6.0.0
-      '@codemirror/view': ^6.0.0
-      '@lezer/common': ^1.0.0
-    dependencies:
-      '@codemirror/language': 6.10.1
-      '@codemirror/state': 6.4.1
-      '@codemirror/view': 6.26.1
-      '@lezer/common': 1.2.1
-    dev: true
-
   /@codemirror/autocomplete@6.15.0(@codemirror/language@6.10.1)(@codemirror/state@6.4.1)(@codemirror/view@6.26.1)(@lezer/common@1.2.1):
     resolution: {integrity: sha512-G2Zm0mXznxz97JhaaOdoEG2cVupn4JjPaS4AcNvZzhOsnnG9YVN68VzfoUw6dYTsIxT6a/cmoFEN47KAWhXaOg==}
     peerDependencies:
@@ -337,20 +309,6 @@ packages:
       '@lezer/common': 1.2.1
     dev: true
 
-  /@codemirror/autocomplete@6.9.0(@codemirror/language@6.10.1)(@codemirror/state@6.4.1)(@codemirror/view@6.26.1)(@lezer/common@1.2.1):
-    resolution: {integrity: sha512-Fbwm0V/Wn3BkEJZRhr0hi5BhCo5a7eBL6LYaliPjOSwCyfOpnjXY59HruSxOUNV+1OYer0Tgx1zRNQttjXyDog==}
-    peerDependencies:
-      '@codemirror/language': ^6.0.0
-      '@codemirror/state': ^6.0.0
-      '@codemirror/view': ^6.0.0
-      '@lezer/common': ^1.0.0
-    dependencies:
-      '@codemirror/language': 6.10.1
-      '@codemirror/state': 6.4.1
-      '@codemirror/view': 6.26.1
-      '@lezer/common': 1.2.1
-    dev: true
-
   /@codemirror/lang-cpp@6.0.2:
     resolution: {integrity: sha512-6oYEYUKHvrnacXxWxYa6t4puTlbN3dgV662BDfSH8+MfjQjVmP697/KYTDOqpxgerkvoNm7q5wlFMBeX8ZMocg==}
     dependencies:
@@ -361,7 +319,7 @@ packages:
   /@codemirror/lang-css@6.2.1(@codemirror/view@6.26.1):
     resolution: {integrity: sha512-/UNWDNV5Viwi/1lpr/dIXJNWiwDxpw13I4pTUAsNxZdg6E0mI2kTQb0P2iHczg1Tu+H4EBgJR+hYhKiHKko7qg==}
     dependencies:
-      '@codemirror/autocomplete': 6.9.0(@codemirror/language@6.10.1)(@codemirror/state@6.4.1)(@codemirror/view@6.26.1)(@lezer/common@1.2.1)
+      '@codemirror/autocomplete': 6.15.0(@codemirror/language@6.10.1)(@codemirror/state@6.4.1)(@codemirror/view@6.26.1)(@lezer/common@1.2.1)
       '@codemirror/language': 6.10.1
       '@codemirror/state': 6.4.1
       '@lezer/common': 1.2.1
@@ -373,7 +331,7 @@ packages:
   /@codemirror/lang-html@6.4.8:
     resolution: {integrity: sha512-tE2YK7wDlb9ZpAH6mpTPiYm6rhfdQKVDa5r9IwIFlwwgvVaKsCfuKKZoJGWsmMZIf3FQAuJ5CHMPLymOtg1hXw==}
     dependencies:
-      '@codemirror/autocomplete': 6.12.0(@codemirror/language@6.10.1)(@codemirror/state@6.4.1)(@codemirror/view@6.26.1)(@lezer/common@1.2.1)
+      '@codemirror/autocomplete': 6.15.0(@codemirror/language@6.10.1)(@codemirror/state@6.4.1)(@codemirror/view@6.26.1)(@lezer/common@1.2.1)
       '@codemirror/lang-css': 6.2.1(@codemirror/view@6.26.1)
       '@codemirror/lang-javascript': 6.2.2
       '@codemirror/language': 6.10.1
@@ -394,13 +352,13 @@ packages:
   /@codemirror/lang-javascript@6.2.2:
     resolution: {integrity: sha512-VGQfY+FCc285AhWuwjYxQyUQcYurWlxdKYT4bqwr3Twnd5wP5WSeu52t4tvvuWmljT4EmgEgZCqSieokhtY8hg==}
     dependencies:
-      '@codemirror/autocomplete': 6.13.0(@codemirror/language@6.10.1)(@codemirror/state@6.4.1)(@codemirror/view@6.26.1)(@lezer/common@1.2.1)
+      '@codemirror/autocomplete': 6.15.0(@codemirror/language@6.10.1)(@codemirror/state@6.4.1)(@codemirror/view@6.26.1)(@lezer/common@1.2.1)
       '@codemirror/language': 6.10.1
       '@codemirror/lint': 6.4.1
       '@codemirror/state': 6.4.1
       '@codemirror/view': 6.26.1
       '@lezer/common': 1.2.1
-      '@lezer/javascript': 1.4.13
+      '@lezer/javascript': 1.4.14
     dev: true
 
   /@codemirror/lang-json@6.0.1:
@@ -413,7 +371,7 @@ packages:
   /@codemirror/lang-markdown@6.2.4:
     resolution: {integrity: sha512-UghkA1vSMs8bT7RSZM6vsIocigyah2bV00eRQuZy76401UmFZdsTsbQNBGdyxRQDOLeEvF5iFwap0BM8LKyd+g==}
     dependencies:
-      '@codemirror/autocomplete': 6.12.0(@codemirror/language@6.10.1)(@codemirror/state@6.4.1)(@codemirror/view@6.26.1)(@lezer/common@1.2.1)
+      '@codemirror/autocomplete': 6.15.0(@codemirror/language@6.10.1)(@codemirror/state@6.4.1)(@codemirror/view@6.26.1)(@lezer/common@1.2.1)
       '@codemirror/lang-html': 6.4.8
       '@codemirror/language': 6.10.1
       '@codemirror/state': 6.4.1
@@ -459,7 +417,7 @@ packages:
       '@codemirror/language': 6.10.1
       '@lezer/common': 1.2.1
       '@lezer/highlight': 1.2.0
-      '@lezer/lr': 1.3.14
+      '@lezer/lr': 1.4.0
     dev: true
 
   /@codemirror/lang-wast@6.0.2:
@@ -468,7 +426,7 @@ packages:
       '@codemirror/language': 6.10.1
       '@lezer/common': 1.2.1
       '@lezer/highlight': 1.2.0
-      '@lezer/lr': 1.3.14
+      '@lezer/lr': 1.4.0
     dev: true
 
   /@codemirror/lang-xml@6.1.0:
@@ -841,14 +799,14 @@ packages:
     resolution: {integrity: sha512-eS1M3L3U2mDowoFVPG7tEp01SWu9/68Nx3HEBgLJVn3N9ku7g5S7WdFv0jzmcTipAyONYfZJ+7x4WRkfdB2Ung==}
     dependencies:
       '@lezer/highlight': 1.2.0
-      '@lezer/lr': 1.3.10
+      '@lezer/lr': 1.4.0
     dev: true
 
   /@lezer/css@1.1.3:
     resolution: {integrity: sha512-SjSM4pkQnQdJDVc80LYzEaMiNy9txsFbI7HsMgeVF28NdLaAdHNtQ+kB/QqDUzRBV/75NTXjJ/R5IdC8QQGxMg==}
     dependencies:
       '@lezer/highlight': 1.2.0
-      '@lezer/lr': 1.3.10
+      '@lezer/lr': 1.4.0
     dev: true
 
   /@lezer/highlight@1.2.0:
@@ -868,14 +826,6 @@ packages:
   /@lezer/java@1.0.4:
     resolution: {integrity: sha512-POc53LHf2AuNeRXjqZbXNu88GKj0KZTjjSx0L7tYeXlrEHF+3NAQx+dEwKVuCbkl0ZMtpRy2VsDYOV7KKV0oyg==}
     dependencies:
-      '@lezer/highlight': 1.2.0
-      '@lezer/lr': 1.3.10
-    dev: true
-
-  /@lezer/javascript@1.4.13:
-    resolution: {integrity: sha512-5IBr8LIO3xJdJH1e9aj/ZNLE4LSbdsx25wFmGRAZsj2zSmwAYjx26JyU/BYOCpRQlu1jcv1z3vy4NB9+UkfRow==}
-    dependencies:
-      '@lezer/common': 1.2.1
       '@lezer/highlight': 1.2.0
       '@lezer/lr': 1.4.0
     dev: true
@@ -892,19 +842,7 @@ packages:
     resolution: {integrity: sha512-nkVC27qiEZEjySbi6gQRuMwa2sDu2PtfjSgz0A4QF81QyRGm3kb2YRzLcOPcTEtmcwvrX/cej7mlhbwViA4WJw==}
     dependencies:
       '@lezer/highlight': 1.2.0
-      '@lezer/lr': 1.3.10
-    dev: true
-
-  /@lezer/lr@1.3.10:
-    resolution: {integrity: sha512-BZfVvf7Re5BIwJHlZXbJn9L8lus5EonxQghyn+ih8Wl36XMFBPTXC0KM0IdUtj9w/diPHsKlXVgL+AlX2jYJ0Q==}
-    dependencies:
-      '@lezer/common': 1.2.1
-    dev: true
-
-  /@lezer/lr@1.3.14:
-    resolution: {integrity: sha512-z5mY4LStlA3yL7aHT/rqgG614cfcvklS+8oFRFBYrs4YaWLJyKKM4+nN6KopToX0o9Hj6zmH6M5kinOYuy06ug==}
-    dependencies:
-      '@lezer/common': 1.2.1
+      '@lezer/lr': 1.4.0
     dev: true
 
   /@lezer/lr@1.4.0:
@@ -924,7 +862,7 @@ packages:
     resolution: {integrity: sha512-aqdCQJOXJ66De22vzdwnuC502hIaG9EnPK2rSi+ebXyUd+j7GAX1mRjWZOVOmf3GST1YUfUCu6WXDiEgDGOVwA==}
     dependencies:
       '@lezer/highlight': 1.2.0
-      '@lezer/lr': 1.3.10
+      '@lezer/lr': 1.4.0
     dev: true
 
   /@lezer/python@1.1.8:
@@ -938,7 +876,7 @@ packages:
     resolution: {integrity: sha512-j+ToFKM6Wpglv3OQ4ebHYdYIMT2dh0ziCCV0rTf47AWiHOVhR0WjaKrBq+yuvDQNEhr5sxPxVI7+naJIgpqcsQ==}
     dependencies:
       '@lezer/highlight': 1.2.0
-      '@lezer/lr': 1.3.10
+      '@lezer/lr': 1.4.0
     dev: true
 
   /@lezer/xml@1.0.2:
@@ -2458,7 +2396,7 @@ packages:
       eslint-plugin-import: 2.29.1(@typescript-eslint/parser@6.21.0)(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0)
       fast-glob: 3.3.1
       get-tsconfig: 4.7.0
-      is-core-module: 2.13.0
+      is-core-module: 2.13.1
       is-glob: 4.0.3
     transitivePeerDependencies:
       - '@typescript-eslint/parser'
@@ -3084,12 +3022,6 @@ packages:
     engines: {node: '>= 0.4'}
     dev: true
 
-  /is-core-module@2.13.0:
-    resolution: {integrity: sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==}
-    dependencies:
-      has: 1.0.3
-    dev: true
-
   /is-core-module@2.13.1:
     resolution: {integrity: sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==}
     dependencies:
@@ -3323,6 +3255,7 @@ packages:
 
   /loupe@2.3.6:
     resolution: {integrity: sha512-RaPMZKiMy8/JruncMU5Bt6na1eftNoo++R4Y+N2FrxkDVTrGvcyzFTsaGif4QTeKESheMGegbhw6iUAq+5A8zA==}
+    deprecated: Please upgrade to 2.3.7 which fixes GHSA-4q6p-r6v2-jvc5
     dependencies:
       get-func-name: 2.0.2
     dev: true
@@ -4949,16 +4882,16 @@ packages:
     engines: {node: '>=12.20'}
     dev: true
 
-  github.com/tauri-apps/tauri-plugin-log/19f5dcc0425e9127d2c591780e5047b83e77a7c2:
-    resolution: {tarball: https://codeload.github.com/tauri-apps/tauri-plugin-log/tar.gz/19f5dcc0425e9127d2c591780e5047b83e77a7c2}
+  github.com/tauri-apps/tauri-plugin-log/db7255ca2e07fc4d3e6cc5d93f9ccfceacb28901:
+    resolution: {tarball: https://codeload.github.com/tauri-apps/tauri-plugin-log/tar.gz/db7255ca2e07fc4d3e6cc5d93f9ccfceacb28901}
     name: tauri-plugin-log-api
     version: 0.0.0
     dependencies:
       '@tauri-apps/api': 1.5.3
     dev: true
 
-  github.com/tauri-apps/tauri-plugin-store/7d2632996f290b0f18cc5f8a2b2791046400690e:
-    resolution: {tarball: https://codeload.github.com/tauri-apps/tauri-plugin-store/tar.gz/7d2632996f290b0f18cc5f8a2b2791046400690e}
+  github.com/tauri-apps/tauri-plugin-store/02243686d0507d2aeeb2924cd889dd0bcb47ecef:
+    resolution: {tarball: https://codeload.github.com/tauri-apps/tauri-plugin-store/tar.gz/02243686d0507d2aeeb2924cd889dd0bcb47ecef}
     name: tauri-plugin-store-api
     version: 0.0.0
     dependencies:

pnpm-workspace.yaml

@@ -1,2 +1,2 @@
 packages:
-  - 'gitbutler-ui'
+  - 'app'

scripts/release.sh

@@ -158,7 +158,7 @@ info "  sign: $DO_SIGN"
 TMP_DIR="$(mktemp -d)"
 trap "rm -rf '$TMP_DIR'" exit
 
-CONFIG_PATH=$(readlink -f "$PWD/../gitbutler-app/tauri.conf.$CHANNEL.json")
+CONFIG_PATH=$(readlink -f "$PWD/../crates/gitbutler-tauri/tauri.conf.$CHANNEL.json")
 
 # update the version in the tauri release config
 jq '.package.version="'"$VERSION"'"' "$CONFIG_PATH" >"$TMP_DIR/tauri.conf.json"