🔨 chore: bump deps

Signed-off-by: Pauline <git@ethanlibs.co>

.github/workflows/release.yml

@@ -91,7 +91,7 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build
-        run: pnpm desktop build --ci -v --target ${{ matrix.settings.target }} --bundles ${{ matrix.settings.bundles }}
+        run: pnpm tauri build --ci -v --target ${{ matrix.settings.target }} --bundles ${{ matrix.settings.bundles }}
         # env:
         # TAURI_SIGNING_PRIVATE_KEY: $ {{ secrets.TAURI_PRIVATE_KEY }}
         # TAURI_SIGNING_PRIVATE_KEY_PASSWORD: $ {{ secrets.TAURI_KEY_PASSWORD }}

Cargo.toml

@@ -164,8 +164,12 @@ async-recursion = { version = "1.1" }
 sysinfo = { version = "0.31", features = [ "serde" ] }
 sys-info = { version = "0.9" }
 whoami = { version = "1.5" }
-cocoa = { version = "0.25" }
+cocoa = { version = "0.26" }
 objc = { version = "0.2" }
+cc = { version = "1.1" }
+libc = { version = "0.2" }
+# https://github.com/tauri-apps/tauri/blob/tauri-v2.0.0-rc.0/core/tauri/Cargo.toml#L86
+webkit2gtk = { version = "=2.0.1", features = [ "v2_38" ] }
 
 [workspace.dependencies.prisma-client-rust]
 git = "https://github.com/brendonovich/prisma-client-rust"

TODO.md

@@ -2,12 +2,12 @@
 
 - [ ] migrate launcher backend storage to `prisma-client-rust` (see `prisma` branch).
 - [ ] migrate api commands that currently use `tauri-specta` but don't actually rely on `tauri` to `rspc`
- - waiting on `rspc` to update to the latest version (hopefully once tauri comes out of rc)
+	- waiting on `rspc` to update to the latest version (hopefully once tauri comes out of rc)
 - [ ] bump `tauri` to stable v2 when it releases.
- - [x] bump `tauri` to latest rc v2.
+	- [x] bump `tauri` to latest rc v2.
 - [ ] test all major version/loader combos launching and mod loading.
 - legacy fabric, babric, nilloader, java agent support
- - nilloader <https://github.com/modrinth/labrinth/issues/903> <https://github.com/orgs/modrinth/discussions/45>
+	- nilloader <https://github.com/modrinth/labrinth/issues/903> <https://github.com/orgs/modrinth/discussions/45>
 - [ ] shared cluster resources and options (<https://github.com/enjarai/shared-resources>)
 - [ ] ftb, technic, and tlauncher importing
 - [ ] better debug logging and mc logging, for the launcher and spawn
@@ -36,3 +36,9 @@
 - [x] authentication
 - [x] manifest fetching
 - [ ] fix old intel gpus <https://github.com/MultiMC/Launcher/issues/1276#issuecomment-774541617>
+- [ ] fix cmd+a on macos not selecting all text
+- [ ] fix cmd+c on macos not pasting in oauth and entire launcher
+- [ ] hotfix some webkitgtk problems if possible
+- [ ] fetching from screenshots
+- [ ] feature parity with prism:
+	- [ ] h

apps/desktop/Cargo.toml

@@ -2,7 +2,7 @@
 name = "onelauncher_gui"
 default-run = "onelauncher_gui"
 description = "Next-generation open source Minecraft launcher"
-version = "1.0.0-alpha.1" # todo: make it so tauri works with the ws
+version = { workspace = true }
 license = { workspace = true }
 edition = { workspace = true }
 repository = { workspace = true }
@@ -31,9 +31,7 @@ tauri-plugin-deep-link = { workspace = true }
 tauri-specta = { workspace = true }
 specta = { workspace = true }
 specta-typescript = { workspace = true }
-
-interpulse.workspace = true
-
+interpulse = { workspace = true }
 strum = { workspace = true }
 once_cell = { workspace = true }
 tokio = { workspace = true }
@@ -62,16 +60,13 @@ workspace = true
 features = [ "test" ]
 
 [target.'cfg(target_os = "macos")'.dependencies]
-cocoa.workspace = true
-
-objc.workspace = true
+cocoa = { workspace = true }
+objc = { workspace = true }
 
 [target.'cfg(target_os = "linux")'.dependencies]
-# https://github.com/tauri-apps/tauri/blob/tauri-v2.0.0-rc.0/core/tauri/Cargo.toml#L86
-webkit2gtk = { version = "=2.0.1", features = [ "v2_38" ] }
+webkit2gtk = { workspace = true }
 
 [features]
 default = [ "custom-protocol" ]
 devtools = [ "tauri/devtools" ]
-# This feature is used for production builds or when a dev server is not specified, DO NOT REMOVE!!
 custom-protocol = [ "tauri/custom-protocol" ]

apps/desktop/package.json

@@ -15,7 +15,8 @@
 	"scripts": {
 		"build": "tauri build",
 		"dev": "tauri dev",
-		"tauri": "tauri"
+		"tauri": "tauri",
+		"tauri-ext": "pnpm --filter @onelauncher/scripts -- tauri"
 	},
 	"dependencies": {
 		"@onelauncher/core": "workspace:*",

apps/frontend/package.json

@@ -27,7 +27,7 @@
 		"@solid-primitives/refs": "^1.0.8",
 		"@solidjs/router": "^0.14.3",
 		"@t3-oss/env-core": "^0.11.0",
-		"@tanstack/solid-query": "^5.51.21",
+		"@tanstack/solid-query": "^5.51.24",
 		"@tauri-apps/api": "=2.0.0-rc.1",
 		"@tauri-apps/plugin-clipboard-manager": "=2.0.0-rc.0",
 		"@tauri-apps/plugin-dialog": "=2.0.0-rc.0",

package.json

@@ -35,9 +35,8 @@
 		"frontend": "pnpm --filter @onelauncher/frontend -- ",
 		"client": "pnpm --filter @onelauncher/client -- ",
 		"desktop": "pnpm --filter @onelauncher/desktop -- ",
-		"core": "cd packages/core && cargo",
-		"testing": "cd apps/testing && cargo",
-		"tauri": "cd apps/desktop && cargo",
+		"tauri": "pnpm desktop tauri-ext",
+
 		"postupdate": "cargo update",
 		"test:vi": "pnpm vitest run",
 		"test:update": "pnpm vitest -u",

packages/client/package.json

@@ -18,7 +18,7 @@
 	"dependencies": {
 		"@flowr/utils": "^3.12.1",
 		"@solid-primitives/deep": "^0.2.9",
-		"@tanstack/solid-query": "^5.51.21",
+		"@tanstack/solid-query": "^5.51.24",
 		"fast-equals": "^5.0.1",
 		"plausible-tracker": "^0.3.9",
 		"react": "^18.3.1",

packages/gamemode/Cargo.toml

@@ -11,7 +11,7 @@ homepage = { workspace = true }
 authors = { workspace = true }
 
 [dependencies]
-libc = { version = "0.2" }
+libc = { workspace = true }
 
 [build-dependencies]
-cc = { version = "1.1" }
+cc = { workspace = true }

packages/scripts/package.json

@@ -24,7 +24,7 @@
 		"mustache": "^4.2.0",
 		"pathe": "^1.1.2",
 		"semver": "^7.6.3",
-		"undici": "^6.19.7"
+		"undici": "^6.19.8"
 	},
 	"devDependencies": {
 		"@types/iarna__toml": "^2.0.5",