Merge pull request #2051 from gitbutlerapp/workspace-layout

move to canonical rust workspace codebase layout
2024-09-20 00:27:17 +03:00 · 2023-12-22 14:28:05 +01:00 · 2023-12-22 14:28:05 +01:00 · f7a7a61d8a
commit f7a7a61d8a
parent 8376b737e4 0e33410ed4
460 changed files with 12 additions and 13 deletions
--- a/.github/actions/init-env-rust/action.yaml
+++ b/.github/actions/init-env-rust/action.yaml
@ -38,4 +38,4 @@ runs:

    - name: placeholder for ui assets
      shell: bash
-      run: mkdir packages/ui/build
+      run: mkdir gitbutler-ui/build
--- a/.github/workflows/push.yaml
+++ b/.github/workflows/push.yaml
@ -14,13 +14,12 @@ jobs:
        with:
          filters: |
            rust:
-              - 'packages/tauri/**'
-              - 'packages/butler/**'
+              - 'gitbutler-app/**'
              - 'Cargo.lock'
              - 'Cargo.toml'
              - 'rust-toolchain.toml'
            node:
-              - 'packages/ui/**'
+              - 'gitbutler-ui/**'
              - 'package.json'
              - 'pnpm-lock.yaml'

--- a/Cargo.lock
+++ b/Cargo.lock
@ -1775,7 +1775,7 @@ dependencies = [
 ]

 [[package]]
-name = "gitbutler"
+name = "gitbutler-app"
 version = "0.0.0"
 dependencies = [
 "anyhow",
--- a/Cargo.toml
+++ b/Cargo.toml
@ -1,6 +1,6 @@
 [workspace]
 members = [
-    "packages/tauri",
+    "gitbutler-app",
 ]
 resolver = "2"

--- a/README.md
+++ b/README.md
@ -74,7 +74,7 @@ We are also collecting tokio's runtime tracing information that could be viewed
 To build the app in production mode, run:

 ```bash
-$ pnpm tauri build --features devtools --config packages/tauri/tauri.conf.nightly.json
+$ pnpm tauri build --features devtools --config gitbutler-app/tauri.conf.nightly.json
 ```

 This will make an asset similar to our nightly build.
--- a/packages/tauri/Cargo.toml
+++ b/packages/tauri/Cargo.toml
@ -1,5 +1,5 @@
 [package]
-name = "gitbutler"
+name = "gitbutler-app"
 version = "0.0.0"
 edition = "2021"
 rust-version = "1.57"
@ -9,7 +9,7 @@ name = "gblib"
 path = "src/lib.rs"

 [[bin]]
-name = "gitbutler"
+name = "gitbutler-app"
 path = "src/bin.rs"

 [build-dependencies]
--- a/packages/tauri/build.rs
+++ b/packages/tauri/build.rs
--- a/packages/tauri/icons/128x128.png
+++ b/packages/tauri/icons/128x128.png
--- a/packages/tauri/icons/128x128@2x.png
+++ b/packages/tauri/icons/128x128@2x.png
--- a/packages/tauri/icons/32x32.png
+++ b/packages/tauri/icons/32x32.png
--- a/packages/tauri/icons/Square107x107Logo.png
+++ b/packages/tauri/icons/Square107x107Logo.png
--- a/packages/tauri/icons/Square142x142Logo.png
+++ b/packages/tauri/icons/Square142x142Logo.png
--- a/packages/tauri/icons/Square150x150Logo.png
+++ b/packages/tauri/icons/Square150x150Logo.png
--- a/packages/tauri/icons/Square284x284Logo.png
+++ b/packages/tauri/icons/Square284x284Logo.png
--- a/packages/tauri/icons/Square30x30Logo.png
+++ b/packages/tauri/icons/Square30x30Logo.png
--- a/packages/tauri/icons/Square310x310Logo.png
+++ b/packages/tauri/icons/Square310x310Logo.png
--- a/packages/tauri/icons/Square44x44Logo.png
+++ b/packages/tauri/icons/Square44x44Logo.png
--- a/packages/tauri/icons/Square71x71Logo.png
+++ b/packages/tauri/icons/Square71x71Logo.png
--- a/packages/tauri/icons/Square89x89Logo.png
+++ b/packages/tauri/icons/Square89x89Logo.png
--- a/packages/tauri/icons/StoreLogo.png
+++ b/packages/tauri/icons/StoreLogo.png
--- a/packages/tauri/icons/dev/128x128.png
+++ b/packages/tauri/icons/dev/128x128.png
--- a/packages/tauri/icons/dev/128x128@2x.png
+++ b/packages/tauri/icons/dev/128x128@2x.png
--- a/packages/tauri/icons/dev/32x32.png
+++ b/packages/tauri/icons/dev/32x32.png
--- a/packages/tauri/icons/dev/icon.icns
+++ b/packages/tauri/icons/dev/icon.icns
--- a/packages/tauri/icons/dev/icon.ico
+++ b/packages/tauri/icons/dev/icon.ico
--- a/packages/tauri/icons/icon.icns
+++ b/packages/tauri/icons/icon.icns
--- a/packages/tauri/icons/icon.ico
+++ b/packages/tauri/icons/icon.ico
--- a/packages/tauri/icons/icon.png
+++ b/packages/tauri/icons/icon.png
--- a/packages/tauri/icons/tray.png
+++ b/packages/tauri/icons/tray.png
--- a/packages/tauri/src/analytics.rs
+++ b/packages/tauri/src/analytics.rs
--- a/packages/tauri/src/analytics/posthog.rs
+++ b/packages/tauri/src/analytics/posthog.rs
--- a/packages/tauri/src/analytics/posthog/mock.rs
+++ b/packages/tauri/src/analytics/posthog/mock.rs
--- a/packages/tauri/src/analytics/posthog/real.rs
+++ b/packages/tauri/src/analytics/posthog/real.rs
--- a/packages/tauri/src/analytics/posthog/retry.rs
+++ b/packages/tauri/src/analytics/posthog/retry.rs
--- a/packages/tauri/src/app.rs
+++ b/packages/tauri/src/app.rs
--- a/packages/tauri/src/assets.rs
+++ b/packages/tauri/src/assets.rs
--- a/packages/tauri/src/bin.rs
+++ b/packages/tauri/src/bin.rs
--- a/packages/tauri/src/commands.rs
+++ b/packages/tauri/src/commands.rs
--- a/packages/tauri/src/database.rs
+++ b/packages/tauri/src/database.rs
--- a/packages/tauri/src/database/migrations/V0deltas.sql
+++ b/packages/tauri/src/database/migrations/V0deltas.sql
--- a/packages/tauri/src/database/migrations/V1sessions.sql
+++ b/packages/tauri/src/database/migrations/V1sessions.sql
--- a/packages/tauri/src/database/migrations/V2files.sql
+++ b/packages/tauri/src/database/migrations/V2files.sql
--- a/packages/tauri/src/database/migrations/V3bookmarks.sql
+++ b/packages/tauri/src/database/migrations/V3bookmarks.sql
--- a/packages/tauri/src/database/migrations/V4__bookmarks_update.sql
+++ b/packages/tauri/src/database/migrations/V4__bookmarks_update.sql
--- a/packages/tauri/src/database/migrations/V5__bookmarks_update.sql
+++ b/packages/tauri/src/database/migrations/V5__bookmarks_update.sql
--- a/packages/tauri/src/database/migrations/V6__sessions_project_id_id_idx.sql
+++ b/packages/tauri/src/database/migrations/V6__sessions_project_id_id_idx.sql
--- a/packages/tauri/src/database/migrations/V7__drop_files.sql
+++ b/packages/tauri/src/database/migrations/V7__drop_files.sql
--- a/packages/tauri/src/database/migrations/V8__drop_bookmarks.sql
+++ b/packages/tauri/src/database/migrations/V8__drop_bookmarks.sql
--- a/packages/tauri/src/dedup.rs
+++ b/packages/tauri/src/dedup.rs
--- a/packages/tauri/src/deltas.rs
+++ b/packages/tauri/src/deltas.rs
--- a/packages/tauri/src/deltas/commands.rs
+++ b/packages/tauri/src/deltas/commands.rs
--- a/packages/tauri/src/deltas/controller.rs
+++ b/packages/tauri/src/deltas/controller.rs
--- a/packages/tauri/src/deltas/database.rs
+++ b/packages/tauri/src/deltas/database.rs
--- a/packages/tauri/src/deltas/delta.rs
+++ b/packages/tauri/src/deltas/delta.rs
--- a/packages/tauri/src/deltas/document.rs
+++ b/packages/tauri/src/deltas/document.rs
--- a/packages/tauri/src/deltas/operations.rs
+++ b/packages/tauri/src/deltas/operations.rs
--- a/packages/tauri/src/deltas/reader.rs
+++ b/packages/tauri/src/deltas/reader.rs
--- a/packages/tauri/src/deltas/writer.rs
+++ b/packages/tauri/src/deltas/writer.rs
--- a/packages/tauri/src/error.rs
+++ b/packages/tauri/src/error.rs
--- a/packages/tauri/src/error/sentry.rs
+++ b/packages/tauri/src/error/sentry.rs
--- a/packages/tauri/src/events.rs
+++ b/packages/tauri/src/events.rs
--- a/packages/tauri/src/fs.rs
+++ b/packages/tauri/src/fs.rs
--- a/packages/tauri/src/gb_repository.rs
+++ b/packages/tauri/src/gb_repository.rs
--- a/packages/tauri/src/gb_repository/repository.rs
+++ b/packages/tauri/src/gb_repository/repository.rs
--- a/packages/tauri/src/gb_repository/repository_tests.rs
+++ b/packages/tauri/src/gb_repository/repository_tests.rs
--- a/packages/tauri/src/git.rs
+++ b/packages/tauri/src/git.rs
--- a/packages/tauri/src/git/blob.rs
+++ b/packages/tauri/src/git/blob.rs
--- a/packages/tauri/src/git/branch.rs
+++ b/packages/tauri/src/git/branch.rs
--- a/packages/tauri/src/git/commit.rs
+++ b/packages/tauri/src/git/commit.rs
--- a/packages/tauri/src/git/config.rs
+++ b/packages/tauri/src/git/config.rs
--- a/packages/tauri/src/git/credentials.rs
+++ b/packages/tauri/src/git/credentials.rs
--- a/packages/tauri/src/git/diff.rs
+++ b/packages/tauri/src/git/diff.rs
--- a/packages/tauri/src/git/error.rs
+++ b/packages/tauri/src/git/error.rs
--- a/packages/tauri/src/git/index.rs
+++ b/packages/tauri/src/git/index.rs
--- a/packages/tauri/src/git/oid.rs
+++ b/packages/tauri/src/git/oid.rs
--- a/packages/tauri/src/git/reference.rs
+++ b/packages/tauri/src/git/reference.rs
--- a/packages/tauri/src/git/reference/refname.rs
+++ b/packages/tauri/src/git/reference/refname.rs
--- a/packages/tauri/src/git/reference/refname/error.rs
+++ b/packages/tauri/src/git/reference/refname/error.rs
--- a/packages/tauri/src/git/reference/refname/local.rs
+++ b/packages/tauri/src/git/reference/refname/local.rs
--- a/packages/tauri/src/git/reference/refname/remote.rs
+++ b/packages/tauri/src/git/reference/refname/remote.rs
--- a/packages/tauri/src/git/reference/refname/virtual.rs
+++ b/packages/tauri/src/git/reference/refname/virtual.rs
--- a/packages/tauri/src/git/remote.rs
+++ b/packages/tauri/src/git/remote.rs
--- a/packages/tauri/src/git/repository.rs
+++ b/packages/tauri/src/git/repository.rs
--- a/packages/tauri/src/git/signature.rs
+++ b/packages/tauri/src/git/signature.rs
--- a/packages/tauri/src/git/tree.rs
+++ b/packages/tauri/src/git/tree.rs
--- a/packages/tauri/src/git/url.rs
+++ b/packages/tauri/src/git/url.rs
--- a/packages/tauri/src/git/url/convert.rs
+++ b/packages/tauri/src/git/url/convert.rs
--- a/packages/tauri/src/git/url/parse.rs
+++ b/packages/tauri/src/git/url/parse.rs
--- a/packages/tauri/src/git/url/scheme.rs
+++ b/packages/tauri/src/git/url/scheme.rs
--- a/packages/tauri/src/github.rs
+++ b/packages/tauri/src/github.rs
--- a/packages/tauri/src/github/commands.rs
+++ b/packages/tauri/src/github/commands.rs
--- a/packages/tauri/src/id.rs
+++ b/packages/tauri/src/id.rs
--- a/packages/tauri/src/keys.rs
+++ b/packages/tauri/src/keys.rs
--- a/packages/tauri/src/keys/commands.rs
+++ b/packages/tauri/src/keys/commands.rs
--- a/packages/tauri/src/keys/controller.rs
+++ b/packages/tauri/src/keys/controller.rs
--- a/packages/tauri/src/keys/key.rs
+++ b/packages/tauri/src/keys/key.rs
--- a/packages/tauri/src/keys/storage.rs
+++ b/packages/tauri/src/keys/storage.rs
--- a/packages/tauri/src/lib.rs
+++ b/packages/tauri/src/lib.rs
--- a/packages/tauri/src/logs.rs
+++ b/packages/tauri/src/logs.rs
--- a/packages/tauri/src/menu.rs
+++ b/packages/tauri/src/menu.rs
--- a/Show More
+++ b/Show More