Folder cleanup

.github/workflows/ci-v1.yml

@@ -6,15 +6,15 @@ on:
       - ".github/workflows/ci.yml"
       - "crates/**/*.rs"
       - "!crates/devtools/**/*.rs"
-      - "tauri-v1/**/*.rs"
+      - "crates/devtools-v1/**/*.rs"
       - "crates/wire/proto/*.proto"
       - "**/Cargo.toml"
   pull_request:
     paths:
       - ".github/workflows/ci.yml"
       - "crates/**/*.rs"
       - "!crates/devtools/**/*.rs"
-      - "tauri-v1/**/*.rs"
+      - "crates/devtools-v1/**/*.rs"
       - "crates/wire/proto/*.proto"
       - "**/Cargo.toml"
 
@@ -52,7 +52,7 @@ jobs:
         with:
           toolchain: ${{matrix.rust}}
       - uses: Swatinem/rust-cache@v2
-      - run: cargo test --manifest-path tauri-v1/devtools/Cargo.toml
+      - run: cargo test --manifest-path crates/devtools-v1/Cargo.toml
         env:
           RUSTFLAGS: ${{matrix.rustflags}} ${{env.RUSTFLAGS}}
 
@@ -72,7 +72,7 @@ jobs:
         with:
           toolchain: 1.70.0 # MSRV
       - uses: Swatinem/rust-cache@v2
-      - run: cargo check --manifest-path tauri-v1/devtools/Cargo.toml --tests
+      - run: cargo check --manifest-path crates/devtools-v1/Cargo.toml --tests
 
   clippy:
     name: Clippy
@@ -89,7 +89,7 @@ jobs:
         with:
           components: clippy
       - uses: Swatinem/rust-cache@v2
-      - run: cargo clippy --manifest-path tauri-v1/devtools/Cargo.toml -- -Dclippy::all -Dclippy::pedantic
+      - run: cargo clippy --manifest-path crates/devtools-v1/Cargo.toml -- -Dclippy::all -Dclippy::pedantic
 
   rustfmt:
     name: Rustfmt
@@ -102,7 +102,7 @@ jobs:
         uses: dtolnay/rust-toolchain@nightly
         with:
           components: rustfmt
-      - run: cargo fmt --manifest-path tauri-v1/devtools/Cargo.toml -- --check
+      - run: cargo fmt --manifest-path crates/devtools-v1/Cargo.toml -- --check
 
   check-licenses:
     runs-on: ubuntu-latest
@@ -111,7 +111,7 @@ jobs:
       - name: Check Rust Licenses
         uses: EmbarkStudios/cargo-deny-action@v1
         with:
-          arguments: --manifest-path tauri-v1/devtools/Cargo.toml
+          arguments: --manifest-path crates/devtools-v1/Cargo.toml
 
 #  outdated:
 #     name: Outdated

.github/workflows/ci.yml

@@ -112,11 +112,11 @@ jobs:
         with:
           node-version: 20
           cache: 'pnpm'
-          cache-dependency-path: 'web-client/pnpm-lock.yaml'
+          cache-dependency-path: 'clients/web/pnpm-lock.yaml'
       - name: Install dependencies
         run: pnpm install -g license-checker
       - name: Check JavaScript Licenses
-        working-directory: web-client
+        working-directory: clients/web
         run:  license-checker --summary --onlyAllow="MIT;Apache-2.0;BSD-2-Clause" --excludePackages="[email protected]"
       - name: Check Rust Licenses
         uses: EmbarkStudios/cargo-deny-action@v1

.github/workflows/release-plz.yml

@@ -39,7 +39,7 @@ jobs:
       - name: Run release-plz (devtools for Tauri v1)
         uses: MarcoIeni/[email protected]
         with:
-          project_manifest: tauri-v1/devtools/Cargo.toml
+          project_manifest: crates/devtools-v1/Cargo.toml
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}

.github/workflows/wc-tests.yml

@@ -6,11 +6,11 @@ on:
       - main
     paths:
       - ".github/workflows/ci.yml"
-      - "web-client/**"
+      - "clients/web/**"
   pull_request:
     paths:
       - ".github/workflows/ci.yml"
-      - "web-client/**"
+      - "clients/web/**"
 
 jobs:
   test:
@@ -25,20 +25,20 @@ jobs:
         with:
           node-version: 20
           cache: "pnpm"
-          cache-dependency-path: "web-client/pnpm-lock.yaml"
+          cache-dependency-path: "clients/web/pnpm-lock.yaml"
 
       - name: Install dependencies
-        working-directory: web-client
+        working-directory: clients/web
         run: pnpm install install
 
       - name: Format
-        working-directory: web-client
+        working-directory: clients/web
         run: pnpm prettier --check '**/*.{ts,tsx,js,jsx,json}'
 
       - name: Linting
-        working-directory: web-client
+        working-directory: clients/web
         run: pnpm lint
 
       - name: Unit tests
-        working-directory: web-client
+        working-directory: clients/web
         run: pnpm test -- --run

web-client/package.json → clients/web/package.json

@@ -7,7 +7,7 @@
   "license": "PolyForm-Noncommercial-1.0.0",
   "author": "CrabNebula <[email protected]>",
   "scripts": {
-    "proto": "protoc --ts_out src/lib/proto --proto_path ../crates/wire/proto ../crates/wire/proto/common.proto ../crates/wire/proto/instrument.proto ../crates/wire/proto/logs.proto ../crates/wire/proto/spans.proto ../crates/wire/proto/tauri.proto ../crates/wire/proto/sources.proto ../crates/wire/proto/meta.proto ../crates/wire/proto/health.proto",
+    "proto": "protoc --ts_out src/lib/proto --proto_path ../../crates/wire/proto ../../crates/wire/proto/common.proto ../../crates/wire/proto/instrument.proto ../../crates/wire/proto/logs.proto ../../crates/wire/proto/spans.proto ../../crates/wire/proto/tauri.proto ../../crates/wire/proto/sources.proto ../../crates/wire/proto/meta.proto ../../crates/wire/proto/health.proto",
     "dev": "pnpm proto && vite",
     "build": "pnpm proto && vite build",
     "preview": "pnpm proto && vite preview",