rename desktop-solid to desktop

.github/prebuild.js

@@ -85,11 +85,13 @@ rustflags = [
   });
 
   await fs.writeFile(
-    `${__root}/apps/desktop-solid/src-tauri/tauri.macos.conf.json`,
+    `${__root}/apps/desktop/src-tauri/tauri.macos.conf.json`,
     JSON.stringify(
       {
         bundle: {
-          macOS: { frameworks: [path.join(nativeDeps, "Spacedrive.framework")] },
+          macOS: {
+            frameworks: [path.join(nativeDeps, "Spacedrive.framework")],
+          },
         },
       },
       null,

.github/workflows/publish.yml

@@ -5,7 +5,7 @@ on: workflow_dispatch
 
 env:
   CN_APPLICATION: cap/cap
-  APP_CARGO_TOML: apps/desktop-solid/src-tauri/Cargo.toml
+  APP_CARGO_TOML: apps/desktop/src-tauri/Cargo.toml
 
 jobs:
   draft:
@@ -133,14 +133,14 @@ jobs:
           echo 'NEXTAUTH_URL=${NEXT_PUBLIC_URL}' >> .env
           echo 'VITE_SERVER_URL=${NEXT_PUBLIC_URL}' >> .env
 
-      - name: Copy .env to apps/desktop-solid
-        run: cp .env apps/desktop-solid/.env
+      - name: Copy .env to apps/desktop
+        run: cp .env apps/desktop/.env
 
       - name: Output .env file
-        run: cat apps/desktop-solid/.env
+        run: cat apps/desktop/.env
 
       - name: Build MacOS Apps
-        working-directory: apps/desktop-solid
+        working-directory: apps/desktop
         run: |
           node ${{ github.workspace }}/.github/prebuild.js ${{ matrix.settings.prebuild }}
           pnpm tauri build --target ${{ matrix.settings.target }}

Cargo.toml

@@ -1,7 +1,7 @@
 [workspace]
 resolver = "2"
 members = [
-	"apps/desktop-solid/src-tauri",
+	"apps/desktop/src-tauri",
 	"crates/rendering",
 	"crates/ffmpeg",
 	"crates/utils",

README.md

@@ -1,6 +1,6 @@
 <p align="center">
   <p align="center">
-   <img width="150" height="150" src="https://github.com/CapSoftware/Cap/blob/main/apps/desktop-solid/src-tauri/icons/Square310x310Logo.png" alt="Logo">
+   <img width="150" height="150" src="https://github.com/CapSoftware/Cap/blob/main/apps/desktop/src-tauri/icons/Square310x310Logo.png" alt="Logo">
   </p>
 	<h1 align="center"><b>Cap</b></h1>
 	<p align="center">

apps/desktop-solid/package.json → apps/desktop/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "desktop-solid",
+  "name": "@cap/desktop",
   "type": "module",
   "scripts": {
     "dev": "dotenv -e ../../.env -- tauri dev",

apps/desktop-solid/src-tauri/Info.plist → apps/desktop/src-tauri/Info.plist

@@ -31,7 +31,7 @@
 	<array>
 		<dict>
 			<key>CFBundleURLName</key>
-			<string>so.cap.desktop-solid</string>
+			<string>so.cap.desktop</string>
 			<key>CFBundleURLSchemes</key>
 			<array>
 				<string>caprecorder</string>

apps/desktop-solid/src-tauri/tauri.conf.json → apps/desktop/src-tauri/tauri.conf.json

@@ -1,7 +1,7 @@
 {
   "$schema": "../node_modules/@tauri-apps/cli/schema.json",
   "productName": "Cap",
-  "identifier": "so.cap.desktop-solid",
+  "identifier": "so.cap.desktop",
   "build": {
     "beforeDevCommand": "pnpm localdev",
     "devUrl": "http://localhost:3001",

apps/desktop-solid/src/utils/render.ts → apps/desktop/src/utils/render.ts

@@ -2,7 +2,7 @@ import { writeFile, readFile } from "@tauri-apps/plugin-fs";
 import MP4Box from "mp4box";
 
 const outputFilePath =
-  "/Users/richie/Library/Application Support/so.cap.desktop-solid/recordings/ac2909e0-2f5e-45ff-95e3-8efb50a56a12.cap/output/result.mp4";
+  "/Users/richie/Library/Application Support/so.cap.desktop/recordings/ac2909e0-2f5e-45ff-95e3-8efb50a56a12.cap/output/result.mp4";
 
 interface VideoSettings {
   webcamSize: { width: number; height: number };

crates/rendering/src/main.rs

@@ -4,7 +4,7 @@
 #[tokio::main]
 async fn main() {
     // let project_path = PathBuf::from(
-    //     r#"/Users/brendonovich/Library/Application Support/so.cap.desktop-solid/recordings/414f2abd-8186-479f-85e7-08a64411a33c.cap"#,
+    //     r#"/Users/brendonovich/Library/Application Support/so.cap.desktop/recordings/414f2abd-8186-479f-85e7-08a64411a33c.cap"#,
     // );
 
     // let mut project: ProjectConfiguration = ProjectConfiguration::default();

package.json

@@ -8,7 +8,7 @@
     "format": "prettier --write \"**/*.{ts,tsx,md}\"",
     "db:push": "dotenv -e .env -- pnpm --dir packages/database db:push",
     "db:generate": "dotenv -e .env -- pnpm --dir packages/database db:generate",
-    "tauri:build": "dotenv -e .env -- pnpm --dir apps/desktop-solid tauri build --verbose"
+    "tauri:build": "dotenv -e .env -- pnpm --dir apps/desktop tauri build --verbose"
   },
   "devDependencies": {
     "@turbo/gen": "^1.9.7",