diff --git a/.gitignore b/.gitignore index 3b9a11a3..46e71c67 100644 --- a/.gitignore +++ b/.gitignore @@ -24,7 +24,7 @@ vender/ # Created by git when using merge tools for conflicts *.BACKUP.* -# *.BASE.* +*.BASE.* *.LOCAL.* *.REMOTE.* *_BACKUP_*.txt @@ -117,6 +117,9 @@ fabric.properties .idea/* +!.idea/codeStyles +!.idea/runConfigurations + ### Linux ### *~ @@ -241,7 +244,7 @@ web_modules/ .yarn-integrity # dotenv environment variable files -# .env +.env .env.development.local .env.test.local .env.production.local @@ -258,7 +261,6 @@ out # Nuxt.js build / generate output .nuxt - # Gatsby files .cache/ # Comment in the public line in if your project uses Gatsby and not Next.js @@ -266,7 +268,6 @@ out # public # vuepress build output -.vuepress/dist # vuepress v2.x temp and cache directory .temp @@ -322,7 +323,7 @@ Cargo.lock *.pdb ### rust-analyzer ### -# Can be generated by other build systems other than cargo (ex: bazelbuild/rust_rules) +# Can be generated by other build systems other than cargo (ex: bazelbuild/rust_rules) rust-project.json @@ -333,7 +334,6 @@ rust-project.json !.vscode/launch.json !.vscode/extensions.json !.vscode/*.code-snippets -!.vscode/tailwind.json # Local History for Visual Studio Code .history/ @@ -359,7 +359,7 @@ ehthumbs_vista.db # Folder config file [Dd]esktop.ini -# Recyc# le Bin used on file shares +# Recycle Bin used on file shares $RECYCLE.BIN/ # Windows Installer files @@ -389,4 +389,4 @@ $RECYCLE.BIN/ # and uncomment the following lines # .pnp.* -# End of https://www.toptal.com/developers/gitignore/api/node,rust,yarn,linux,macos,windows,rust-analyzer,visualstudiocode,git +# End of https://www.toptal.com/developers/gitignore/api/git,node,rust,yarn,linux,macos,windows,rust-analyzer,visualstudiocode,intellij+all diff --git a/.nvmrc b/.nvmrc deleted file mode 100644 index 209e3ef4..00000000 --- a/.nvmrc +++ /dev/null @@ -1 +0,0 @@ -20 diff --git a/Cargo.toml b/Cargo.toml index 1dd59d6b..a7838664 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,8 +1,9 @@ [workspace] resolver = "2" members = [ - "crates/*", - "apps/desktop/src-tauri", + "apps/testing", + "apps/desktop", + "packages/core" ] [workspace.package] @@ -19,6 +20,8 @@ authors = [ version = "1.0.0" [workspace.dependencies] +onelauncher = { path = "./packages/core" } + # tauri uses latest crates.io beta channel (temporarily can use v2 and main branches if necessary) tauri = { version = "=2.0.0-beta.24", features = [ "rustls-tls", diff --git a/apps/desktop/.gitignore b/apps/desktop/.gitignore index a7f40a76..787194aa 100644 --- a/apps/desktop/.gitignore +++ b/apps/desktop/.gitignore @@ -1,4 +1,3 @@ -/dist-isolation -/coverage -/src/bindings.ts -/dist \ No newline at end of file +# Generated by Tauri +.cargo/ +/gen diff --git a/apps/desktop/.setup-cross.sh b/apps/desktop/.setup-cross.sh deleted file mode 100755 index d47ae248..00000000 --- a/apps/desktop/.setup-cross.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -export ICONS_VOLUME="$(realpath ./.icons)" -export DIST_VOLUME="$(realpath dist)" -export ISOLATION_VOLUME="$(realpath isolation-dist)" -export WORKSPACE_VOLUME="$(realpath ../..)" diff --git a/apps/desktop/.taurignore b/apps/desktop/.taurignore deleted file mode 100644 index 87b87b05..00000000 --- a/apps/desktop/.taurignore +++ /dev/null @@ -1,2 +0,0 @@ -src-tauri/Cross.toml -src-tauri/.gitignore diff --git a/apps/desktop/src-tauri/App.entitlements b/apps/desktop/App.entitlements similarity index 100% rename from apps/desktop/src-tauri/App.entitlements rename to apps/desktop/App.entitlements diff --git a/apps/desktop/src-tauri/Cargo.toml b/apps/desktop/Cargo.toml similarity index 93% rename from apps/desktop/src-tauri/Cargo.toml rename to apps/desktop/Cargo.toml index e8e7740b..f8568fe6 100644 --- a/apps/desktop/src-tauri/Cargo.toml +++ b/apps/desktop/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "onelauncher_gui" description = "Next-generation open source Minecraft launcher" -version = { workspace = true } +version = "1.0.0" # todo: make it so tauri works with the ws license = { workspace = true } edition = { workspace = true } repository = { workspace = true } @@ -25,7 +25,7 @@ tauri-build = { workspace = true, features = [ ] } [dependencies] -onelauncher = { path = "../../../crates/core", features = [ "tauri" ] } +onelauncher = { workspace = true, features = [ "tauri" ] } tauri = { workspace = true, features = [ "isolation", diff --git a/apps/desktop/src-tauri/Info.plist b/apps/desktop/Info.plist similarity index 100% rename from apps/desktop/src-tauri/Info.plist rename to apps/desktop/Info.plist diff --git a/apps/desktop/src-tauri/build.rs b/apps/desktop/build.rs similarity index 100% rename from apps/desktop/src-tauri/build.rs rename to apps/desktop/build.rs diff --git a/apps/desktop/src-tauri/capabilities/.gitignore b/apps/desktop/capabilities/.gitignore similarity index 100% rename from apps/desktop/src-tauri/capabilities/.gitignore rename to apps/desktop/capabilities/.gitignore diff --git a/apps/desktop/src-tauri/capabilities/default.json b/apps/desktop/capabilities/default.json similarity index 100% rename from apps/desktop/src-tauri/capabilities/default.json rename to apps/desktop/capabilities/default.json diff --git a/apps/desktop/package.json b/apps/desktop/package.json index 34c0bb36..d42729a8 100644 --- a/apps/desktop/package.json +++ b/apps/desktop/package.json @@ -1,8 +1,8 @@ { - "name": "@onelauncher/gui", + "name": "@onelauncher/desktop", "type": "module", "version": "1.0.0", - "description": "Next-generation open source Minecraft desktop launcher", + "description": "Next-generation open source Minecraft launcher", "license": "GPL-3.0-only", "repository": { "type": "git", @@ -10,45 +10,16 @@ "directory": "apps/desktop" }, "scripts": { - "tauri": "pnpm tauri", - "dev": "pnpm vite dev", - "build": "pnpm vite build" + "build": "pnpm tauri build", + "dev": "pnpm tauri dev", + "tauri": "pnpm tauri" }, "dependencies": { - "@fontsource/poppins": "^5.0.14", - "@iconify-json/logos": "^1.1.43", - "@leeoniya/ufuzzy": "^1.0.14", - "@onelauncher/client": "workspace:*", + "@onelauncher/core": "workspace:*", "@onelauncher/distribution": "workspace:*", - "@rspc/client": "^0.2.3", - "@rspc/solid-query": "^0.2.3", - "@rspc/tauri": "^0.2.0", - "@solid-primitives/refs": "^1.0.8", - "@solidjs/router": "^0.14.1", - "@tanstack/solid-query": "^5.51.9", - "@tauri-apps/api": "^2.0.0-beta.13", - "@tauri-apps/plugin-clipboard-manager": "github:tauri-apps/tauri-plugin-clipboard-manager#v2", - "@tauri-apps/plugin-shell": "github:tauri-apps/tauri-plugin-shell#v2", - "@thisbeyond/solid-dnd": "^0.7.5", - "@thisbeyond/solid-select": "^0.15.0", - "@unocss/reset": "^0.61.5", - "@untitled-theme/icons-solid": "^0.10.5", - "overlayscrollbars": "^2.9.2", - "overlayscrollbars-solid": "^0.5.5", - "solid-js": "^1.8.19", - "solid-transition-group": "^0.2.3", - "uuid": "^10.0.0" + "@onelauncher/frontend": "workspace:*" }, "devDependencies": { - "@solidjs/testing-library": "^0.8.9", - "@tauri-apps/cli": "^2.0.0-beta.20", - "@testing-library/jest-dom": "^6.4.8", - "@types/uuid": "^10.0.0", - "jsdom": "^24.1.1", - "sass": "^1.77.8", - "unocss": "^0.61.5", - "vite-plugin-solid": "^2.10.2", - "vite-plugin-solid-svg": "^0.8.1", - "vite-tsconfig-paths": "^4.3.2" + "@tauri-apps/cli": "^2.0.0-beta.20" } } diff --git a/apps/desktop/src-tauri/permissions/onelauncher/default.toml b/apps/desktop/permissions/onelauncher/default.toml similarity index 100% rename from apps/desktop/src-tauri/permissions/onelauncher/default.toml rename to apps/desktop/permissions/onelauncher/default.toml diff --git a/apps/desktop/src-tauri/.gitignore b/apps/desktop/src-tauri/.gitignore deleted file mode 100644 index 787194aa..00000000 --- a/apps/desktop/src-tauri/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -# Generated by Tauri -.cargo/ -/gen diff --git a/apps/desktop/src-tauri/Cross.toml b/apps/desktop/src-tauri/Cross.toml deleted file mode 100644 index a5131b31..00000000 --- a/apps/desktop/src-tauri/Cross.toml +++ /dev/null @@ -1,12 +0,0 @@ -[build.env] -# must set ICONS_VOLUME, DIST_VOLUME, ISOLATION_VOLUME and WORKSPACE_VOLUME environment variables -# this can be done running `$ . .setup-cross.sh` in the onelauncher_gui folder -volumes = [ - "ICONS_VOLUME", - "DIST_VOLUME", - "ISOLATION_VOLUME", - "WORKSPACE_VOLUME" -] - -[target.aarch64-unknown-linux-gnu] -image = "aarch64-unknown-linux-gnu:latest" diff --git a/apps/desktop/src-tauri/src/api/commands.rs b/apps/desktop/src/api/commands.rs similarity index 100% rename from apps/desktop/src-tauri/src/api/commands.rs rename to apps/desktop/src/api/commands.rs diff --git a/apps/desktop/src-tauri/src/api/mod.rs b/apps/desktop/src/api/mod.rs similarity index 100% rename from apps/desktop/src-tauri/src/api/mod.rs rename to apps/desktop/src/api/mod.rs diff --git a/apps/desktop/src-tauri/src/error.rs b/apps/desktop/src/error.rs similarity index 100% rename from apps/desktop/src-tauri/src/error.rs rename to apps/desktop/src/error.rs diff --git a/apps/desktop/src-tauri/src/ext/mod.rs b/apps/desktop/src/ext/mod.rs similarity index 100% rename from apps/desktop/src-tauri/src/ext/mod.rs rename to apps/desktop/src/ext/mod.rs diff --git a/apps/desktop/src-tauri/src/ext/updater.rs b/apps/desktop/src/ext/updater.rs similarity index 100% rename from apps/desktop/src-tauri/src/ext/updater.rs rename to apps/desktop/src/ext/updater.rs diff --git a/apps/desktop/src-tauri/src/lib.rs b/apps/desktop/src/lib.rs similarity index 97% rename from apps/desktop/src-tauri/src/lib.rs rename to apps/desktop/src/lib.rs index e0e78c61..802d66d8 100644 --- a/apps/desktop/src-tauri/src/lib.rs +++ b/apps/desktop/src/lib.rs @@ -58,7 +58,7 @@ pub async fn run_app(setup: F) { let builder = collect_commands!(); #[cfg(debug_assertions)] - let builder = builder.path("../src/bindings.ts"); + let builder = builder.path("../../frontend/src/bindings.ts"); builder.build().unwrap() }); diff --git a/apps/desktop/src-tauri/src/main.rs b/apps/desktop/src/main.rs similarity index 100% rename from apps/desktop/src-tauri/src/main.rs rename to apps/desktop/src/main.rs diff --git a/apps/desktop/src-tauri/tauri.conf.json b/apps/desktop/tauri.conf.json similarity index 82% rename from apps/desktop/src-tauri/tauri.conf.json rename to apps/desktop/tauri.conf.json index cc11f880..9fd16df0 100644 --- a/apps/desktop/src-tauri/tauri.conf.json +++ b/apps/desktop/tauri.conf.json @@ -1,7 +1,6 @@ { "$schema": "https://raw.githubusercontent.com/tauri-apps/tauri/dev/core/tauri-config-schema/schema.json", "productName": "OneLauncher", - "version": "../package.json", "identifier": "OneLauncher", "app": { "withGlobalTauri": true, @@ -18,7 +17,7 @@ "pattern": { "use": "isolation", "options": { - "dir": "../src-isolation/" + "dir": "../frontend/src-isolation/" } }, "assetProtocol": { @@ -56,9 +55,9 @@ ] }, "build": { - "beforeDevCommand": "pnpm dev", - "beforeBuildCommand": "pnpm build", - "frontendDist": "../dist", + "beforeDevCommand": "pnpm dev --filter @onelauncher/frontend", + "beforeBuildCommand": "pnpm build --filter @onelauncher/frontend", + "frontendDist": "../frontend/dist", "devUrl": "http://localhost:8001" }, "bundle": { @@ -66,11 +65,11 @@ "targets": "all", "category": "Game", "icon": [ - "../.icons/32x32.png", - "../.icons/128x128.png", - "../.icons/128x128@2x.png", - "../.icons/icon.icns", - "../.icons/icon.ico" + "../../packages/distribution/icons/32x32.png", + "../../packages/distribution/icons/128x128.png", + "../../packages/distribution/icons/128x128@2x.png", + "../../packages/distribution/icons/icon.icns", + "../../packages/distribution/icons/icon.ico" ], "copyright": "Polyfrost", "longDescription": "", @@ -80,7 +79,7 @@ "linux": { "deb": { "depends": [], - "desktopTemplate": "../../distribution/linux/org.polyfrost.launcher.desktop.template" + "desktopTemplate": "../../packages/distribution/linux/org.polyfrost.launcher.desktop.template" } }, "shortDescription": "Next-generation open source Minecraft launcher", diff --git a/apps/frontend/.gitignore b/apps/frontend/.gitignore new file mode 100644 index 00000000..8d939d16 --- /dev/null +++ b/apps/frontend/.gitignore @@ -0,0 +1,3 @@ +/dist-isolation +/coverage +/src/bindings.ts diff --git a/apps/frontend/dist/.gitignore b/apps/frontend/dist/.gitignore new file mode 100644 index 00000000..c5327226 --- /dev/null +++ b/apps/frontend/dist/.gitignore @@ -0,0 +1,5 @@ +# Ignore everything in this directory +* +# Except this file +!.gitignore +# This is done so that Tauri never complains that '../dist does not exist' diff --git a/apps/desktop/index.html b/apps/frontend/index.html similarity index 100% rename from apps/desktop/index.html rename to apps/frontend/index.html diff --git a/apps/frontend/package.json b/apps/frontend/package.json new file mode 100644 index 00000000..52ebc767 --- /dev/null +++ b/apps/frontend/package.json @@ -0,0 +1,52 @@ +{ + "name": "@onelauncher/frontend", + "type": "module", + "version": "1.0.0", + "description": "Next-generation open source Minecraft launcher frontend", + "license": "GPL-3.0-only", + "repository": { + "type": "git", + "url": "git@github.com:polyfrost/onelauncher", + "directory": "apps/frontend" + }, + "scripts": { + "dev": "pnpm vite dev", + "build": "pnpm vite build" + }, + "dependencies": { + "@fontsource/poppins": "^5.0.14", + "@iconify-json/logos": "^1.1.43", + "@leeoniya/ufuzzy": "^1.0.14", + "@onelauncher/client": "workspace:*", + "@rspc/client": "^0.2.3", + "@rspc/solid-query": "^0.2.3", + "@rspc/tauri": "^0.2.0", + "@solid-primitives/refs": "^1.0.8", + "@solidjs/router": "^0.14.1", + "@tanstack/solid-query": "^5.51.9", + "@tauri-apps/api": "^2.0.0-beta.13", + "@tauri-apps/plugin-clipboard-manager": "github:tauri-apps/tauri-plugin-clipboard-manager#v2", + "@tauri-apps/plugin-shell": "github:tauri-apps/tauri-plugin-shell#v2", + "@thisbeyond/solid-dnd": "^0.7.5", + "@thisbeyond/solid-select": "^0.15.0", + "@unocss/reset": "^0.61.5", + "@untitled-theme/icons-solid": "^0.10.5", + "overlayscrollbars": "^2.9.2", + "overlayscrollbars-solid": "^0.5.5", + "solid-js": "^1.8.19", + "solid-transition-group": "^0.2.3", + "uuid": "^10.0.0" + }, + "devDependencies": { + "@solidjs/testing-library": "^0.8.9", + "@tauri-apps/cli": "^2.0.0-beta.20", + "@testing-library/jest-dom": "^6.4.8", + "@types/uuid": "^10.0.0", + "jsdom": "^24.1.1", + "sass": "^1.77.8", + "unocss": "^0.61.5", + "vite-plugin-solid": "^2.10.2", + "vite-plugin-solid-svg": "^0.8.1", + "vite-tsconfig-paths": "^4.3.2" + } +} diff --git a/apps/desktop/public/tauri.svg b/apps/frontend/public/tauri.svg similarity index 100% rename from apps/desktop/public/tauri.svg rename to apps/frontend/public/tauri.svg diff --git a/apps/desktop/public/vite.svg b/apps/frontend/public/vite.svg similarity index 100% rename from apps/desktop/public/vite.svg rename to apps/frontend/public/vite.svg diff --git a/apps/desktop/src-isolation/index.html b/apps/frontend/src-isolation/index.html similarity index 100% rename from apps/desktop/src-isolation/index.html rename to apps/frontend/src-isolation/index.html diff --git a/apps/desktop/src-isolation/index.js b/apps/frontend/src-isolation/index.js similarity index 100% rename from apps/desktop/src-isolation/index.js rename to apps/frontend/src-isolation/index.js diff --git a/apps/desktop/src/assets/images/default_instance_cover.jpg b/apps/frontend/src/assets/images/default_instance_cover.jpg similarity index 100% rename from apps/desktop/src/assets/images/default_instance_cover.jpg rename to apps/frontend/src/assets/images/default_instance_cover.jpg diff --git a/apps/desktop/src/assets/images/header.png b/apps/frontend/src/assets/images/header.png similarity index 100% rename from apps/desktop/src/assets/images/header.png rename to apps/frontend/src/assets/images/header.png diff --git a/apps/desktop/src/assets/images/steve.png b/apps/frontend/src/assets/images/steve.png similarity index 100% rename from apps/desktop/src/assets/images/steve.png rename to apps/frontend/src/assets/images/steve.png diff --git a/apps/desktop/src/assets/logos/curseforge.svg b/apps/frontend/src/assets/logos/curseforge.svg similarity index 100% rename from apps/desktop/src/assets/logos/curseforge.svg rename to apps/frontend/src/assets/logos/curseforge.svg diff --git a/apps/desktop/src/assets/logos/discord.svg b/apps/frontend/src/assets/logos/discord.svg similarity index 100% rename from apps/desktop/src/assets/logos/discord.svg rename to apps/frontend/src/assets/logos/discord.svg diff --git a/apps/desktop/src/assets/logos/fabric.png b/apps/frontend/src/assets/logos/fabric.png similarity index 100% rename from apps/desktop/src/assets/logos/fabric.png rename to apps/frontend/src/assets/logos/fabric.png diff --git a/apps/desktop/src/assets/logos/forge.png b/apps/frontend/src/assets/logos/forge.png similarity index 100% rename from apps/desktop/src/assets/logos/forge.png rename to apps/frontend/src/assets/logos/forge.png diff --git a/apps/desktop/src/assets/logos/modrinth.svg b/apps/frontend/src/assets/logos/modrinth.svg similarity index 100% rename from apps/desktop/src/assets/logos/modrinth.svg rename to apps/frontend/src/assets/logos/modrinth.svg diff --git a/apps/desktop/src/assets/logos/quilt.png b/apps/frontend/src/assets/logos/quilt.png similarity index 100% rename from apps/desktop/src/assets/logos/quilt.png rename to apps/frontend/src/assets/logos/quilt.png diff --git a/apps/desktop/src/assets/logos/vanilla.png b/apps/frontend/src/assets/logos/vanilla.png similarity index 100% rename from apps/desktop/src/assets/logos/vanilla.png rename to apps/frontend/src/assets/logos/vanilla.png diff --git a/apps/desktop/src/globals.css b/apps/frontend/src/globals.css similarity index 100% rename from apps/desktop/src/globals.css rename to apps/frontend/src/globals.css diff --git a/apps/desktop/src/imports.ts b/apps/frontend/src/imports.ts similarity index 100% rename from apps/desktop/src/imports.ts rename to apps/frontend/src/imports.ts diff --git a/apps/desktop/src/index.tsx b/apps/frontend/src/index.tsx similarity index 100% rename from apps/desktop/src/index.tsx rename to apps/frontend/src/index.tsx diff --git a/apps/desktop/src/shims.d.ts b/apps/frontend/src/shims.d.ts similarity index 100% rename from apps/desktop/src/shims.d.ts rename to apps/frontend/src/shims.d.ts diff --git a/apps/desktop/src/types/global.d.ts b/apps/frontend/src/types/global.d.ts similarity index 100% rename from apps/desktop/src/types/global.d.ts rename to apps/frontend/src/types/global.d.ts diff --git a/apps/desktop/src/ui/App.tsx b/apps/frontend/src/ui/App.tsx similarity index 100% rename from apps/desktop/src/ui/App.tsx rename to apps/frontend/src/ui/App.tsx diff --git a/apps/desktop/src/ui/components/AnimatedRoutes.tsx b/apps/frontend/src/ui/components/AnimatedRoutes.tsx similarity index 100% rename from apps/desktop/src/ui/components/AnimatedRoutes.tsx rename to apps/frontend/src/ui/components/AnimatedRoutes.tsx diff --git a/apps/desktop/src/ui/components/ErrorBoundary.tsx b/apps/frontend/src/ui/components/ErrorBoundary.tsx similarity index 100% rename from apps/desktop/src/ui/components/ErrorBoundary.tsx rename to apps/frontend/src/ui/components/ErrorBoundary.tsx diff --git a/apps/desktop/src/ui/components/Navbar.tsx b/apps/frontend/src/ui/components/Navbar.tsx similarity index 100% rename from apps/desktop/src/ui/components/Navbar.tsx rename to apps/frontend/src/ui/components/Navbar.tsx diff --git a/apps/desktop/src/ui/components/ScrollableContainer.tsx b/apps/frontend/src/ui/components/ScrollableContainer.tsx similarity index 100% rename from apps/desktop/src/ui/components/ScrollableContainer.tsx rename to apps/frontend/src/ui/components/ScrollableContainer.tsx diff --git a/apps/desktop/src/ui/components/SettingsRow.tsx b/apps/frontend/src/ui/components/SettingsRow.tsx similarity index 100% rename from apps/desktop/src/ui/components/SettingsRow.tsx rename to apps/frontend/src/ui/components/SettingsRow.tsx diff --git a/apps/desktop/src/ui/components/Sidebar.tsx b/apps/frontend/src/ui/components/Sidebar.tsx similarity index 100% rename from apps/desktop/src/ui/components/Sidebar.tsx rename to apps/frontend/src/ui/components/Sidebar.tsx diff --git a/apps/desktop/src/ui/components/TimeAgo.tsx b/apps/frontend/src/ui/components/TimeAgo.tsx similarity index 100% rename from apps/desktop/src/ui/components/TimeAgo.tsx rename to apps/frontend/src/ui/components/TimeAgo.tsx diff --git a/apps/desktop/src/ui/components/WindowFrame.tsx b/apps/frontend/src/ui/components/WindowFrame.tsx similarity index 100% rename from apps/desktop/src/ui/components/WindowFrame.tsx rename to apps/frontend/src/ui/components/WindowFrame.tsx diff --git a/apps/desktop/src/ui/components/base/Button.module.scss b/apps/frontend/src/ui/components/base/Button.module.scss similarity index 100% rename from apps/desktop/src/ui/components/base/Button.module.scss rename to apps/frontend/src/ui/components/base/Button.module.scss diff --git a/apps/desktop/src/ui/components/base/Button.test.tsx b/apps/frontend/src/ui/components/base/Button.test.tsx similarity index 100% rename from apps/desktop/src/ui/components/base/Button.test.tsx rename to apps/frontend/src/ui/components/base/Button.test.tsx diff --git a/apps/desktop/src/ui/components/base/Button.tsx b/apps/frontend/src/ui/components/base/Button.tsx similarity index 100% rename from apps/desktop/src/ui/components/base/Button.tsx rename to apps/frontend/src/ui/components/base/Button.tsx diff --git a/apps/desktop/src/ui/components/base/Checkbox.module.scss b/apps/frontend/src/ui/components/base/Checkbox.module.scss similarity index 100% rename from apps/desktop/src/ui/components/base/Checkbox.module.scss rename to apps/frontend/src/ui/components/base/Checkbox.module.scss diff --git a/apps/desktop/src/ui/components/base/Checkbox.tsx b/apps/frontend/src/ui/components/base/Checkbox.tsx similarity index 100% rename from apps/desktop/src/ui/components/base/Checkbox.tsx rename to apps/frontend/src/ui/components/base/Checkbox.tsx diff --git a/apps/desktop/src/ui/components/base/Dropdown.module.scss b/apps/frontend/src/ui/components/base/Dropdown.module.scss similarity index 100% rename from apps/desktop/src/ui/components/base/Dropdown.module.scss rename to apps/frontend/src/ui/components/base/Dropdown.module.scss diff --git a/apps/desktop/src/ui/components/base/Dropdown.tsx b/apps/frontend/src/ui/components/base/Dropdown.tsx similarity index 100% rename from apps/desktop/src/ui/components/base/Dropdown.tsx rename to apps/frontend/src/ui/components/base/Dropdown.tsx diff --git a/apps/desktop/src/ui/components/base/SelectList.module.scss b/apps/frontend/src/ui/components/base/SelectList.module.scss similarity index 100% rename from apps/desktop/src/ui/components/base/SelectList.module.scss rename to apps/frontend/src/ui/components/base/SelectList.module.scss diff --git a/apps/desktop/src/ui/components/base/SelectList.tsx b/apps/frontend/src/ui/components/base/SelectList.tsx similarity index 100% rename from apps/desktop/src/ui/components/base/SelectList.tsx rename to apps/frontend/src/ui/components/base/SelectList.tsx diff --git a/apps/desktop/src/ui/components/base/Tag.module.scss b/apps/frontend/src/ui/components/base/Tag.module.scss similarity index 100% rename from apps/desktop/src/ui/components/base/Tag.module.scss rename to apps/frontend/src/ui/components/base/Tag.module.scss diff --git a/apps/desktop/src/ui/components/base/Tag.tsx b/apps/frontend/src/ui/components/base/Tag.tsx similarity index 100% rename from apps/desktop/src/ui/components/base/Tag.tsx rename to apps/frontend/src/ui/components/base/Tag.tsx diff --git a/apps/desktop/src/ui/components/base/TextField.module.scss b/apps/frontend/src/ui/components/base/TextField.module.scss similarity index 100% rename from apps/desktop/src/ui/components/base/TextField.module.scss rename to apps/frontend/src/ui/components/base/TextField.module.scss diff --git a/apps/desktop/src/ui/components/base/TextField.tsx b/apps/frontend/src/ui/components/base/TextField.tsx similarity index 100% rename from apps/desktop/src/ui/components/base/TextField.tsx rename to apps/frontend/src/ui/components/base/TextField.tsx diff --git a/apps/desktop/src/ui/components/base/Toggle.tsx b/apps/frontend/src/ui/components/base/Toggle.tsx similarity index 100% rename from apps/desktop/src/ui/components/base/Toggle.tsx rename to apps/frontend/src/ui/components/base/Toggle.tsx diff --git a/apps/desktop/src/ui/components/base/Tooltip.module.scss b/apps/frontend/src/ui/components/base/Tooltip.module.scss similarity index 100% rename from apps/desktop/src/ui/components/base/Tooltip.module.scss rename to apps/frontend/src/ui/components/base/Tooltip.module.scss diff --git a/apps/desktop/src/ui/components/base/Tooltip.tsx b/apps/frontend/src/ui/components/base/Tooltip.tsx similarity index 100% rename from apps/desktop/src/ui/components/base/Tooltip.tsx rename to apps/frontend/src/ui/components/base/Tooltip.tsx diff --git a/apps/desktop/src/ui/components/content/ModCard.tsx b/apps/frontend/src/ui/components/content/ModCard.tsx similarity index 100% rename from apps/desktop/src/ui/components/content/ModCard.tsx rename to apps/frontend/src/ui/components/content/ModCard.tsx diff --git a/apps/desktop/src/ui/components/game/ClusterCover.tsx b/apps/frontend/src/ui/components/game/ClusterCover.tsx similarity index 100% rename from apps/desktop/src/ui/components/game/ClusterCover.tsx rename to apps/frontend/src/ui/components/game/ClusterCover.tsx diff --git a/apps/desktop/src/ui/components/game/LoaderIcon.tsx b/apps/frontend/src/ui/components/game/LoaderIcon.tsx similarity index 100% rename from apps/desktop/src/ui/components/game/LoaderIcon.tsx rename to apps/frontend/src/ui/components/game/LoaderIcon.tsx diff --git a/apps/desktop/src/ui/components/game/PlayerHead.tsx b/apps/frontend/src/ui/components/game/PlayerHead.tsx similarity index 100% rename from apps/desktop/src/ui/components/game/PlayerHead.tsx rename to apps/frontend/src/ui/components/game/PlayerHead.tsx diff --git a/apps/desktop/src/ui/components/logos/PolyfrostFull.tsx b/apps/frontend/src/ui/components/logos/PolyfrostFull.tsx similarity index 100% rename from apps/desktop/src/ui/components/logos/PolyfrostFull.tsx rename to apps/frontend/src/ui/components/logos/PolyfrostFull.tsx diff --git a/apps/desktop/src/ui/components/overlay/AccountPopup.tsx b/apps/frontend/src/ui/components/overlay/AccountPopup.tsx similarity index 100% rename from apps/desktop/src/ui/components/overlay/AccountPopup.tsx rename to apps/frontend/src/ui/components/overlay/AccountPopup.tsx diff --git a/apps/desktop/src/ui/components/overlay/ContextMenu.tsx b/apps/frontend/src/ui/components/overlay/ContextMenu.tsx similarity index 100% rename from apps/desktop/src/ui/components/overlay/ContextMenu.tsx rename to apps/frontend/src/ui/components/overlay/ContextMenu.tsx diff --git a/apps/desktop/src/ui/components/overlay/FullscreenOverlay.tsx b/apps/frontend/src/ui/components/overlay/FullscreenOverlay.tsx similarity index 100% rename from apps/desktop/src/ui/components/overlay/FullscreenOverlay.tsx rename to apps/frontend/src/ui/components/overlay/FullscreenOverlay.tsx diff --git a/apps/desktop/src/ui/components/overlay/Modal.tsx b/apps/frontend/src/ui/components/overlay/Modal.tsx similarity index 100% rename from apps/desktop/src/ui/components/overlay/Modal.tsx rename to apps/frontend/src/ui/components/overlay/Modal.tsx diff --git a/apps/desktop/src/ui/components/overlay/Popup.tsx b/apps/frontend/src/ui/components/overlay/Popup.tsx similarity index 100% rename from apps/desktop/src/ui/components/overlay/Popup.tsx rename to apps/frontend/src/ui/components/overlay/Popup.tsx diff --git a/apps/desktop/src/ui/components/overlay/cluster/ClusterCreationModal.tsx b/apps/frontend/src/ui/components/overlay/cluster/ClusterCreationModal.tsx similarity index 100% rename from apps/desktop/src/ui/components/overlay/cluster/ClusterCreationModal.tsx rename to apps/frontend/src/ui/components/overlay/cluster/ClusterCreationModal.tsx diff --git a/apps/desktop/src/ui/components/overlay/cluster/ClusterStepOne.tsx b/apps/frontend/src/ui/components/overlay/cluster/ClusterStepOne.tsx similarity index 100% rename from apps/desktop/src/ui/components/overlay/cluster/ClusterStepOne.tsx rename to apps/frontend/src/ui/components/overlay/cluster/ClusterStepOne.tsx diff --git a/apps/desktop/src/ui/components/overlay/cluster/ClusterStepTwo.tsx b/apps/frontend/src/ui/components/overlay/cluster/ClusterStepTwo.tsx similarity index 100% rename from apps/desktop/src/ui/components/overlay/cluster/ClusterStepTwo.tsx rename to apps/frontend/src/ui/components/overlay/cluster/ClusterStepTwo.tsx diff --git a/apps/desktop/src/ui/components/overlay/notifications/NotificationComponent.tsx b/apps/frontend/src/ui/components/overlay/notifications/NotificationComponent.tsx similarity index 100% rename from apps/desktop/src/ui/components/overlay/notifications/NotificationComponent.tsx rename to apps/frontend/src/ui/components/overlay/notifications/NotificationComponent.tsx diff --git a/apps/desktop/src/ui/components/overlay/notifications/NotificationOverlay.tsx b/apps/frontend/src/ui/components/overlay/notifications/NotificationOverlay.tsx similarity index 100% rename from apps/desktop/src/ui/components/overlay/notifications/NotificationOverlay.tsx rename to apps/frontend/src/ui/components/overlay/notifications/NotificationOverlay.tsx diff --git a/apps/desktop/src/ui/components/overlay/notifications/NotificationPopup.tsx b/apps/frontend/src/ui/components/overlay/notifications/NotificationPopup.tsx similarity index 100% rename from apps/desktop/src/ui/components/overlay/notifications/NotificationPopup.tsx rename to apps/frontend/src/ui/components/overlay/notifications/NotificationPopup.tsx diff --git a/apps/desktop/src/ui/hooks/useAccount.ts b/apps/frontend/src/ui/hooks/useAccount.ts similarity index 100% rename from apps/desktop/src/ui/hooks/useAccount.ts rename to apps/frontend/src/ui/hooks/useAccount.ts diff --git a/apps/desktop/src/ui/hooks/useBrowserController.tsx b/apps/frontend/src/ui/hooks/useBrowserController.tsx similarity index 100% rename from apps/desktop/src/ui/hooks/useBrowserController.tsx rename to apps/frontend/src/ui/hooks/useBrowserController.tsx diff --git a/apps/desktop/src/ui/hooks/useCluster.tsx b/apps/frontend/src/ui/hooks/useCluster.tsx similarity index 100% rename from apps/desktop/src/ui/hooks/useCluster.tsx rename to apps/frontend/src/ui/hooks/useCluster.tsx diff --git a/apps/desktop/src/ui/hooks/useCommand.ts b/apps/frontend/src/ui/hooks/useCommand.ts similarity index 100% rename from apps/desktop/src/ui/hooks/useCommand.ts rename to apps/frontend/src/ui/hooks/useCommand.ts diff --git a/apps/desktop/src/ui/hooks/useNotifications.ts b/apps/frontend/src/ui/hooks/useNotifications.ts similarity index 100% rename from apps/desktop/src/ui/hooks/useNotifications.ts rename to apps/frontend/src/ui/hooks/useNotifications.ts diff --git a/apps/desktop/src/ui/hooks/useSettings.tsx b/apps/frontend/src/ui/hooks/useSettings.tsx similarity index 100% rename from apps/desktop/src/ui/hooks/useSettings.tsx rename to apps/frontend/src/ui/hooks/useSettings.tsx diff --git a/apps/desktop/src/ui/pages/Home.tsx b/apps/frontend/src/ui/pages/Home.tsx similarity index 100% rename from apps/desktop/src/ui/pages/Home.tsx rename to apps/frontend/src/ui/pages/Home.tsx diff --git a/apps/desktop/src/ui/pages/Updates.tsx b/apps/frontend/src/ui/pages/Updates.tsx similarity index 100% rename from apps/desktop/src/ui/pages/Updates.tsx rename to apps/frontend/src/ui/pages/Updates.tsx diff --git a/apps/desktop/src/ui/pages/browser/BrowserCategory.tsx b/apps/frontend/src/ui/pages/browser/BrowserCategory.tsx similarity index 100% rename from apps/desktop/src/ui/pages/browser/BrowserCategory.tsx rename to apps/frontend/src/ui/pages/browser/BrowserCategory.tsx diff --git a/apps/desktop/src/ui/pages/browser/BrowserMain.tsx b/apps/frontend/src/ui/pages/browser/BrowserMain.tsx similarity index 100% rename from apps/desktop/src/ui/pages/browser/BrowserMain.tsx rename to apps/frontend/src/ui/pages/browser/BrowserMain.tsx diff --git a/apps/desktop/src/ui/pages/browser/BrowserMod.tsx b/apps/frontend/src/ui/pages/browser/BrowserMod.tsx similarity index 100% rename from apps/desktop/src/ui/pages/browser/BrowserMod.tsx rename to apps/frontend/src/ui/pages/browser/BrowserMod.tsx diff --git a/apps/desktop/src/ui/pages/browser/BrowserRoot.tsx b/apps/frontend/src/ui/pages/browser/BrowserRoot.tsx similarity index 100% rename from apps/desktop/src/ui/pages/browser/BrowserRoot.tsx rename to apps/frontend/src/ui/pages/browser/BrowserRoot.tsx diff --git a/apps/desktop/src/ui/pages/cluster/ClusterLogs.tsx b/apps/frontend/src/ui/pages/cluster/ClusterLogs.tsx similarity index 100% rename from apps/desktop/src/ui/pages/cluster/ClusterLogs.tsx rename to apps/frontend/src/ui/pages/cluster/ClusterLogs.tsx diff --git a/apps/desktop/src/ui/pages/cluster/ClusterMods.tsx b/apps/frontend/src/ui/pages/cluster/ClusterMods.tsx similarity index 100% rename from apps/desktop/src/ui/pages/cluster/ClusterMods.tsx rename to apps/frontend/src/ui/pages/cluster/ClusterMods.tsx diff --git a/apps/desktop/src/ui/pages/cluster/ClusterOverview.tsx b/apps/frontend/src/ui/pages/cluster/ClusterOverview.tsx similarity index 100% rename from apps/desktop/src/ui/pages/cluster/ClusterOverview.tsx rename to apps/frontend/src/ui/pages/cluster/ClusterOverview.tsx diff --git a/apps/desktop/src/ui/pages/cluster/ClusterRoot.tsx b/apps/frontend/src/ui/pages/cluster/ClusterRoot.tsx similarity index 100% rename from apps/desktop/src/ui/pages/cluster/ClusterRoot.tsx rename to apps/frontend/src/ui/pages/cluster/ClusterRoot.tsx diff --git a/apps/desktop/src/ui/pages/cluster/ClusterScreenshots.tsx b/apps/frontend/src/ui/pages/cluster/ClusterScreenshots.tsx similarity index 100% rename from apps/desktop/src/ui/pages/cluster/ClusterScreenshots.tsx rename to apps/frontend/src/ui/pages/cluster/ClusterScreenshots.tsx diff --git a/apps/desktop/src/ui/pages/cluster/ClusterSettings.tsx b/apps/frontend/src/ui/pages/cluster/ClusterSettings.tsx similarity index 100% rename from apps/desktop/src/ui/pages/cluster/ClusterSettings.tsx rename to apps/frontend/src/ui/pages/cluster/ClusterSettings.tsx diff --git a/apps/desktop/src/ui/pages/settings/SettingsRoot.tsx b/apps/frontend/src/ui/pages/settings/SettingsRoot.tsx similarity index 100% rename from apps/desktop/src/ui/pages/settings/SettingsRoot.tsx rename to apps/frontend/src/ui/pages/settings/SettingsRoot.tsx diff --git a/apps/desktop/src/ui/pages/settings/about/SettingsChangelog.tsx b/apps/frontend/src/ui/pages/settings/about/SettingsChangelog.tsx similarity index 100% rename from apps/desktop/src/ui/pages/settings/about/SettingsChangelog.tsx rename to apps/frontend/src/ui/pages/settings/about/SettingsChangelog.tsx diff --git a/apps/desktop/src/ui/pages/settings/about/SettingsDeveloper.tsx b/apps/frontend/src/ui/pages/settings/about/SettingsDeveloper.tsx similarity index 100% rename from apps/desktop/src/ui/pages/settings/about/SettingsDeveloper.tsx rename to apps/frontend/src/ui/pages/settings/about/SettingsDeveloper.tsx diff --git a/apps/desktop/src/ui/pages/settings/about/SettingsFeedback.tsx b/apps/frontend/src/ui/pages/settings/about/SettingsFeedback.tsx similarity index 100% rename from apps/desktop/src/ui/pages/settings/about/SettingsFeedback.tsx rename to apps/frontend/src/ui/pages/settings/about/SettingsFeedback.tsx diff --git a/apps/desktop/src/ui/pages/settings/game/SettingsAccounts.tsx b/apps/frontend/src/ui/pages/settings/game/SettingsAccounts.tsx similarity index 100% rename from apps/desktop/src/ui/pages/settings/game/SettingsAccounts.tsx rename to apps/frontend/src/ui/pages/settings/game/SettingsAccounts.tsx diff --git a/apps/desktop/src/ui/pages/settings/game/SettingsMinecraft.tsx b/apps/frontend/src/ui/pages/settings/game/SettingsMinecraft.tsx similarity index 100% rename from apps/desktop/src/ui/pages/settings/game/SettingsMinecraft.tsx rename to apps/frontend/src/ui/pages/settings/game/SettingsMinecraft.tsx diff --git a/apps/desktop/src/ui/pages/settings/launcher/SettingsAppearance.tsx b/apps/frontend/src/ui/pages/settings/launcher/SettingsAppearance.tsx similarity index 100% rename from apps/desktop/src/ui/pages/settings/launcher/SettingsAppearance.tsx rename to apps/frontend/src/ui/pages/settings/launcher/SettingsAppearance.tsx diff --git a/apps/desktop/src/ui/pages/settings/launcher/SettingsGeneral.tsx b/apps/frontend/src/ui/pages/settings/launcher/SettingsGeneral.tsx similarity index 100% rename from apps/desktop/src/ui/pages/settings/launcher/SettingsGeneral.tsx rename to apps/frontend/src/ui/pages/settings/launcher/SettingsGeneral.tsx diff --git a/apps/desktop/src/utils/PausableTimer.ts b/apps/frontend/src/utils/PausableTimer.ts similarity index 100% rename from apps/desktop/src/utils/PausableTimer.ts rename to apps/frontend/src/utils/PausableTimer.ts diff --git a/apps/desktop/src/utils/helpers.ts b/apps/frontend/src/utils/helpers.ts similarity index 100% rename from apps/desktop/src/utils/helpers.ts rename to apps/frontend/src/utils/helpers.ts diff --git a/apps/desktop/src/utils/primitives.ts b/apps/frontend/src/utils/primitives.ts similarity index 100% rename from apps/desktop/src/utils/primitives.ts rename to apps/frontend/src/utils/primitives.ts diff --git a/apps/desktop/src/utils/program-info.ts b/apps/frontend/src/utils/program-info.ts similarity index 100% rename from apps/desktop/src/utils/program-info.ts rename to apps/frontend/src/utils/program-info.ts diff --git a/apps/desktop/src/utils/sorting.ts b/apps/frontend/src/utils/sorting.ts similarity index 100% rename from apps/desktop/src/utils/sorting.ts rename to apps/frontend/src/utils/sorting.ts diff --git a/apps/desktop/src/vite-env.d.ts b/apps/frontend/src/vite-env.d.ts similarity index 100% rename from apps/desktop/src/vite-env.d.ts rename to apps/frontend/src/vite-env.d.ts diff --git a/apps/desktop/tsconfig.json b/apps/frontend/tsconfig.json similarity index 100% rename from apps/desktop/tsconfig.json rename to apps/frontend/tsconfig.json diff --git a/apps/desktop/tsconfig.node.json b/apps/frontend/tsconfig.node.json similarity index 100% rename from apps/desktop/tsconfig.node.json rename to apps/frontend/tsconfig.node.json diff --git a/apps/desktop/uno.config.ts b/apps/frontend/uno.config.ts similarity index 100% rename from apps/desktop/uno.config.ts rename to apps/frontend/uno.config.ts diff --git a/apps/desktop/vite.config.ts b/apps/frontend/vite.config.ts similarity index 67% rename from apps/desktop/vite.config.ts rename to apps/frontend/vite.config.ts index 84d48ac6..3840b435 100644 --- a/apps/desktop/vite.config.ts +++ b/apps/frontend/vite.config.ts @@ -1,7 +1,7 @@ /// import process from 'node:process'; -import type { Plugin, UserConfig } from 'vite'; +import type { UserConfig } from 'vite'; import { defineConfig, loadEnv } from 'vite'; import solid from 'vite-plugin-solid'; @@ -20,7 +20,6 @@ export default defineConfig(async ({ mode }) => { defaultAsComponent: false, }), paths(), - devtools(), ], envPrefix: ['VITE_', 'TAURI_'], @@ -51,19 +50,3 @@ export default defineConfig(async ({ mode }) => { return config; }); - -function devtools(): Plugin { - return { - name: 'devtools-plugin', - transformIndexHtml(html) { - if (process.env.NODE_ENV === 'development') { - const devtoolsScript = ``; - const headTagIndex = html.indexOf(''); - if (headTagIndex > -1) - return html.slice(0, headTagIndex) + devtoolsScript + html.slice(headTagIndex); - } - - return html; - }, - }; -} diff --git a/crates/testing/Cargo.toml b/apps/testing/Cargo.toml similarity index 88% rename from crates/testing/Cargo.toml rename to apps/testing/Cargo.toml index 0f87ae7b..571fdefe 100644 --- a/crates/testing/Cargo.toml +++ b/apps/testing/Cargo.toml @@ -11,7 +11,7 @@ homepage = { workspace = true } authors = { workspace = true } [dependencies] -onelauncher = { path = "../core", features = [ "cli" ] } +onelauncher = { workspace = true, features = [ "cli" ] } tokio = { workspace = true } webbrowser = { workspace = true } diff --git a/crates/testing/index.html b/apps/testing/index.html similarity index 100% rename from crates/testing/index.html rename to apps/testing/index.html diff --git a/apps/testing/package.json b/apps/testing/package.json new file mode 100644 index 00000000..21137fe0 --- /dev/null +++ b/apps/testing/package.json @@ -0,0 +1,13 @@ +{ + "name": "@onelauncher/testing", + "type": "module", + "version": "1.0.0", + "description": "Next-generation open source Minecraft launcher playground", + "license": "GPL-3.0-only", + "repository": { + "type": "git", + "url": "git@github.com:polyfrost/onelauncher", + "directory": "apps/testing" + }, + "scripts": {} +} diff --git a/crates/testing/src/main.rs b/apps/testing/src/main.rs similarity index 100% rename from crates/testing/src/main.rs rename to apps/testing/src/main.rs diff --git a/eslint.config.js b/eslint.config.js index 89d48e34..52e354f9 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -15,13 +15,12 @@ export default petal({ '**/dist', '**/types', '**/cache', - '**/dist', '**/.temp', '**/*.svg', '**/gen', '*.rs', 'pnpm-lock.yaml', '**/node_modules', - 'desktop/src/bindings.ts', + 'apps/desktop/src/bindings.ts', ], }); diff --git a/package.json b/package.json index d550a9a5..072bbd0d 100644 --- a/package.json +++ b/package.json @@ -19,14 +19,19 @@ "node": ">=18" }, "scripts": { - "gui": "pnpm --filter @onelauncher/gui -- ", - "client": "pnpm --filter @onelauncher/client --", - "tauri": "pnpm gui tauri", - "format": "pnpm lint:fix && cargo +nightly fmt", - "lint": "pnpm eslint . --cache", - "lint:fix": "pnpm lint --fix", - "release:node": "pnpm bumpp -r", - "core": "cd crates/core && cargo" + "frontend": "pnpm --filter @onelauncher/frontend -- ", + "client": "pnpm --filter @onelauncher/client -- ", + "core": "cd packages/core && cargo", + "testing": "cd apps/testing && cargo", + "desktop": "cd apps/desktop && cargo", + "format": "pnpm lint:es:fix && pnpm lint:rust:fix", + "lint": "pnpm lint:es && pnpm lint:rust", + + "lint:es": "pnpm eslint . --cache", + "lint:es:fix": "pnpm lint:es --fix", + "lint:rust": "cargo +nightly fmt --check && cargo clippy -- -D warnings", + "lint:rust:fix": "cargo +nightly fmt && cargo clippy --fix", + "release:node": "pnpm bumpp -r" }, "devDependencies": { "@flowr/eslint-config": "^3.10.1", diff --git a/crates/core/Cargo.toml b/packages/core/Cargo.toml similarity index 100% rename from crates/core/Cargo.toml rename to packages/core/Cargo.toml diff --git a/packages/core/package.json b/packages/core/package.json new file mode 100644 index 00000000..6e1569a7 --- /dev/null +++ b/packages/core/package.json @@ -0,0 +1,13 @@ +{ + "name": "@onelauncher/core", + "type": "module", + "version": "1.0.0", + "description": "Next-generation open source Minecraft launcher core", + "license": "GPL-3.0-only", + "repository": { + "type": "git", + "url": "git@github.com:polyfrost/onelauncher", + "directory": "packages/core" + }, + "scripts": {} +} diff --git a/crates/core/src/api/cluster/create.rs b/packages/core/src/api/cluster/create.rs similarity index 100% rename from crates/core/src/api/cluster/create.rs rename to packages/core/src/api/cluster/create.rs diff --git a/crates/core/src/api/cluster/mod.rs b/packages/core/src/api/cluster/mod.rs similarity index 100% rename from crates/core/src/api/cluster/mod.rs rename to packages/core/src/api/cluster/mod.rs diff --git a/crates/core/src/api/cluster/update.rs b/packages/core/src/api/cluster/update.rs similarity index 100% rename from crates/core/src/api/cluster/update.rs rename to packages/core/src/api/cluster/update.rs diff --git a/crates/core/src/api/handler.rs b/packages/core/src/api/handler.rs similarity index 100% rename from crates/core/src/api/handler.rs rename to packages/core/src/api/handler.rs diff --git a/crates/core/src/api/ingress.rs b/packages/core/src/api/ingress.rs similarity index 100% rename from crates/core/src/api/ingress.rs rename to packages/core/src/api/ingress.rs diff --git a/crates/core/src/api/java.rs b/packages/core/src/api/java.rs similarity index 100% rename from crates/core/src/api/java.rs rename to packages/core/src/api/java.rs diff --git a/crates/core/src/api/logger.rs b/packages/core/src/api/logger.rs similarity index 100% rename from crates/core/src/api/logger.rs rename to packages/core/src/api/logger.rs diff --git a/crates/core/src/api/metadata.rs b/packages/core/src/api/metadata.rs similarity index 100% rename from crates/core/src/api/metadata.rs rename to packages/core/src/api/metadata.rs diff --git a/crates/core/src/api/minecraft.rs b/packages/core/src/api/minecraft.rs similarity index 100% rename from crates/core/src/api/minecraft.rs rename to packages/core/src/api/minecraft.rs diff --git a/crates/core/src/api/mod.rs b/packages/core/src/api/mod.rs similarity index 100% rename from crates/core/src/api/mod.rs rename to packages/core/src/api/mod.rs diff --git a/crates/core/src/api/package/content/mod.rs b/packages/core/src/api/package/content/mod.rs similarity index 100% rename from crates/core/src/api/package/content/mod.rs rename to packages/core/src/api/package/content/mod.rs diff --git a/crates/core/src/api/package/content/modrinth.rs b/packages/core/src/api/package/content/modrinth.rs similarity index 100% rename from crates/core/src/api/package/content/modrinth.rs rename to packages/core/src/api/package/content/modrinth.rs diff --git a/crates/core/src/api/package/from.rs b/packages/core/src/api/package/from.rs similarity index 100% rename from crates/core/src/api/package/from.rs rename to packages/core/src/api/package/from.rs diff --git a/crates/core/src/api/package/import/atlauncher.rs b/packages/core/src/api/package/import/atlauncher.rs similarity index 100% rename from crates/core/src/api/package/import/atlauncher.rs rename to packages/core/src/api/package/import/atlauncher.rs diff --git a/crates/core/src/api/package/import/curseforge.rs b/packages/core/src/api/package/import/curseforge.rs similarity index 100% rename from crates/core/src/api/package/import/curseforge.rs rename to packages/core/src/api/package/import/curseforge.rs diff --git a/crates/core/src/api/package/import/ftb.rs b/packages/core/src/api/package/import/ftb.rs similarity index 100% rename from crates/core/src/api/package/import/ftb.rs rename to packages/core/src/api/package/import/ftb.rs diff --git a/crates/core/src/api/package/import/gdlauncher.rs b/packages/core/src/api/package/import/gdlauncher.rs similarity index 100% rename from crates/core/src/api/package/import/gdlauncher.rs rename to packages/core/src/api/package/import/gdlauncher.rs diff --git a/crates/core/src/api/package/import/mod.rs b/packages/core/src/api/package/import/mod.rs similarity index 100% rename from crates/core/src/api/package/import/mod.rs rename to packages/core/src/api/package/import/mod.rs diff --git a/crates/core/src/api/package/import/modrinth.rs b/packages/core/src/api/package/import/modrinth.rs similarity index 100% rename from crates/core/src/api/package/import/modrinth.rs rename to packages/core/src/api/package/import/modrinth.rs diff --git a/crates/core/src/api/package/import/multibased.rs b/packages/core/src/api/package/import/multibased.rs similarity index 100% rename from crates/core/src/api/package/import/multibased.rs rename to packages/core/src/api/package/import/multibased.rs diff --git a/crates/core/src/api/package/import/technic.rs b/packages/core/src/api/package/import/technic.rs similarity index 100% rename from crates/core/src/api/package/import/technic.rs rename to packages/core/src/api/package/import/technic.rs diff --git a/crates/core/src/api/package/import/tlauncher.rs b/packages/core/src/api/package/import/tlauncher.rs similarity index 100% rename from crates/core/src/api/package/import/tlauncher.rs rename to packages/core/src/api/package/import/tlauncher.rs diff --git a/crates/core/src/api/package/mod.rs b/packages/core/src/api/package/mod.rs similarity index 100% rename from crates/core/src/api/package/mod.rs rename to packages/core/src/api/package/mod.rs diff --git a/crates/core/src/api/package/mrpack.rs b/packages/core/src/api/package/mrpack.rs similarity index 100% rename from crates/core/src/api/package/mrpack.rs rename to packages/core/src/api/package/mrpack.rs diff --git a/crates/core/src/api/package/zip.rs b/packages/core/src/api/package/zip.rs similarity index 100% rename from crates/core/src/api/package/zip.rs rename to packages/core/src/api/package/zip.rs diff --git a/crates/core/src/api/processor.rs b/packages/core/src/api/processor.rs similarity index 100% rename from crates/core/src/api/processor.rs rename to packages/core/src/api/processor.rs diff --git a/crates/core/src/api/proxy/mod.rs b/packages/core/src/api/proxy/mod.rs similarity index 100% rename from crates/core/src/api/proxy/mod.rs rename to packages/core/src/api/proxy/mod.rs diff --git a/crates/core/src/api/proxy/send.rs b/packages/core/src/api/proxy/send.rs similarity index 100% rename from crates/core/src/api/proxy/send.rs rename to packages/core/src/api/proxy/send.rs diff --git a/crates/core/src/api/proxy/utils.rs b/packages/core/src/api/proxy/utils.rs similarity index 100% rename from crates/core/src/api/proxy/utils.rs rename to packages/core/src/api/proxy/utils.rs diff --git a/crates/core/src/api/settings.rs b/packages/core/src/api/settings.rs similarity index 100% rename from crates/core/src/api/settings.rs rename to packages/core/src/api/settings.rs diff --git a/crates/core/src/constants.rs b/packages/core/src/constants.rs similarity index 100% rename from crates/core/src/constants.rs rename to packages/core/src/constants.rs diff --git a/crates/core/src/error.rs b/packages/core/src/error.rs similarity index 100% rename from crates/core/src/error.rs rename to packages/core/src/error.rs diff --git a/crates/core/src/game/arguments.rs b/packages/core/src/game/arguments.rs similarity index 100% rename from crates/core/src/game/arguments.rs rename to packages/core/src/game/arguments.rs diff --git a/crates/core/src/game/metadata.rs b/packages/core/src/game/metadata.rs similarity index 100% rename from crates/core/src/game/metadata.rs rename to packages/core/src/game/metadata.rs diff --git a/crates/core/src/game/mod.rs b/packages/core/src/game/mod.rs similarity index 100% rename from crates/core/src/game/mod.rs rename to packages/core/src/game/mod.rs diff --git a/crates/core/src/lib.rs b/packages/core/src/lib.rs similarity index 100% rename from crates/core/src/lib.rs rename to packages/core/src/lib.rs diff --git a/crates/core/src/logger.rs b/packages/core/src/logger.rs similarity index 100% rename from crates/core/src/logger.rs rename to packages/core/src/logger.rs diff --git a/crates/core/src/store/clusters.rs b/packages/core/src/store/clusters.rs similarity index 100% rename from crates/core/src/store/clusters.rs rename to packages/core/src/store/clusters.rs diff --git a/crates/core/src/store/credentials.rs b/packages/core/src/store/credentials.rs similarity index 100% rename from crates/core/src/store/credentials.rs rename to packages/core/src/store/credentials.rs diff --git a/crates/core/src/store/dirs.rs b/packages/core/src/store/dirs.rs similarity index 100% rename from crates/core/src/store/dirs.rs rename to packages/core/src/store/dirs.rs diff --git a/crates/core/src/store/discord.rs b/packages/core/src/store/discord.rs similarity index 100% rename from crates/core/src/store/discord.rs rename to packages/core/src/store/discord.rs diff --git a/crates/core/src/store/java_versions.rs b/packages/core/src/store/java_versions.rs similarity index 100% rename from crates/core/src/store/java_versions.rs rename to packages/core/src/store/java_versions.rs diff --git a/crates/core/src/store/metadata.rs b/packages/core/src/store/metadata.rs similarity index 100% rename from crates/core/src/store/metadata.rs rename to packages/core/src/store/metadata.rs diff --git a/crates/core/src/store/minecraft.rs b/packages/core/src/store/minecraft.rs similarity index 100% rename from crates/core/src/store/minecraft.rs rename to packages/core/src/store/minecraft.rs diff --git a/crates/core/src/store/mod.rs b/packages/core/src/store/mod.rs similarity index 100% rename from crates/core/src/store/mod.rs rename to packages/core/src/store/mod.rs diff --git a/crates/core/src/store/oneconfig.rs b/packages/core/src/store/oneconfig.rs similarity index 100% rename from crates/core/src/store/oneconfig.rs rename to packages/core/src/store/oneconfig.rs diff --git a/crates/core/src/store/package.rs b/packages/core/src/store/package.rs similarity index 100% rename from crates/core/src/store/package.rs rename to packages/core/src/store/package.rs diff --git a/crates/core/src/store/processor.rs b/packages/core/src/store/processor.rs similarity index 100% rename from crates/core/src/store/processor.rs rename to packages/core/src/store/processor.rs diff --git a/crates/core/src/store/settings.rs b/packages/core/src/store/settings.rs similarity index 100% rename from crates/core/src/store/settings.rs rename to packages/core/src/store/settings.rs diff --git a/crates/core/src/utils/http.rs b/packages/core/src/utils/http.rs similarity index 100% rename from crates/core/src/utils/http.rs rename to packages/core/src/utils/http.rs diff --git a/crates/core/src/utils/io.rs b/packages/core/src/utils/io.rs similarity index 100% rename from crates/core/src/utils/io.rs rename to packages/core/src/utils/io.rs diff --git a/crates/core/src/utils/java.rs b/packages/core/src/utils/java.rs similarity index 100% rename from crates/core/src/utils/java.rs rename to packages/core/src/utils/java.rs diff --git a/crates/core/src/utils/mod.rs b/packages/core/src/utils/mod.rs similarity index 100% rename from crates/core/src/utils/mod.rs rename to packages/core/src/utils/mod.rs diff --git a/crates/core/src/utils/pkg.rs b/packages/core/src/utils/pkg.rs similarity index 100% rename from crates/core/src/utils/pkg.rs rename to packages/core/src/utils/pkg.rs diff --git a/crates/core/src/utils/platform.rs b/packages/core/src/utils/platform.rs similarity index 100% rename from crates/core/src/utils/platform.rs rename to packages/core/src/utils/platform.rs diff --git a/crates/core/src/utils/watcher.rs b/packages/core/src/utils/watcher.rs similarity index 100% rename from crates/core/src/utils/watcher.rs rename to packages/core/src/utils/watcher.rs diff --git a/crates/core/wrapper/README.md b/packages/core/wrapper/README.md similarity index 100% rename from crates/core/wrapper/README.md rename to packages/core/wrapper/README.md diff --git a/crates/core/wrapper/java/JavaInfo.class b/packages/core/wrapper/java/JavaInfo.class similarity index 100% rename from crates/core/wrapper/java/JavaInfo.class rename to packages/core/wrapper/java/JavaInfo.class diff --git a/crates/core/wrapper/java/JavaInfo.java b/packages/core/wrapper/java/JavaInfo.java similarity index 100% rename from crates/core/wrapper/java/JavaInfo.java rename to packages/core/wrapper/java/JavaInfo.java diff --git a/crates/core/wrapper/java/LICENSE b/packages/core/wrapper/java/LICENSE similarity index 100% rename from crates/core/wrapper/java/LICENSE rename to packages/core/wrapper/java/LICENSE diff --git a/packages/distribution/aur/gui/PKGBUILD b/packages/distribution/aur/gui/PKGBUILD index dc3db199..d1975f4e 100644 --- a/packages/distribution/aur/gui/PKGBUILD +++ b/packages/distribution/aur/gui/PKGBUILD @@ -32,7 +32,7 @@ prepare() { build() { cd "onelauncher-${pkgver}" pnpm --filter @onelauncher/gui build - export RUSTUP_TOOLCHAIN=stable + export RUSTUP_TOOLCHAIN=stable cargo build --frozen --release --all-features } @@ -44,7 +44,7 @@ check() { package() { install -Dm755 "$srcdir"/onelauncher-"$pkgver"/target/release/onelauncher_gui "$pkgdir"/usr/bin/onelauncher - install -Dm644 "$srcdir"/onelauncher-"$pkgver"/onelauncher_gui/src-tauri/icons/128x128.png "$pkgdir"/usr/share/icons/hicolor/128x128/apps/onelauncher.png - install -Dm644 "$srcdir"/onelauncher-"$pkgver"/onelauncher_gui/src-tauri/icons/icon.png "$pkgdir"/usr/share/icons/hicolor/256x256@2/apps/onelauncher.png - install -Dm644 onelauncher.desktop "$pkgdir"/usr/share/applications/onelauncher.desktop + install -Dm644 "$srcdir"/onelauncher-"$pkgver"/packages/distribution/icons/128x128.png "$pkgdir"/usr/share/icons/hicolor/128x128/apps/OneLauncher.png + install -Dm644 "$srcdir"/onelauncher-"$pkgver"/packages/distribution/icons/icon.png "$pkgdir"/usr/share/icons/hicolor/256x256@2/apps/OneLauncher.png + install -Dm644 OneLauncher.desktop "$pkgdir"/usr/share/applications/OneLauncher.desktop } diff --git a/apps/desktop/.icons/128x128.png b/packages/distribution/icons/128x128.png similarity index 100% rename from apps/desktop/.icons/128x128.png rename to packages/distribution/icons/128x128.png diff --git a/apps/desktop/.icons/128x128@2x.png b/packages/distribution/icons/128x128@2x.png similarity index 100% rename from apps/desktop/.icons/128x128@2x.png rename to packages/distribution/icons/128x128@2x.png diff --git a/apps/desktop/.icons/32x32.png b/packages/distribution/icons/32x32.png similarity index 100% rename from apps/desktop/.icons/32x32.png rename to packages/distribution/icons/32x32.png diff --git a/apps/desktop/.icons/Square107x107Logo.png b/packages/distribution/icons/Square107x107Logo.png similarity index 100% rename from apps/desktop/.icons/Square107x107Logo.png rename to packages/distribution/icons/Square107x107Logo.png diff --git a/apps/desktop/.icons/Square142x142Logo.png b/packages/distribution/icons/Square142x142Logo.png similarity index 100% rename from apps/desktop/.icons/Square142x142Logo.png rename to packages/distribution/icons/Square142x142Logo.png diff --git a/apps/desktop/.icons/Square150x150Logo.png b/packages/distribution/icons/Square150x150Logo.png similarity index 100% rename from apps/desktop/.icons/Square150x150Logo.png rename to packages/distribution/icons/Square150x150Logo.png diff --git a/apps/desktop/.icons/Square284x284Logo.png b/packages/distribution/icons/Square284x284Logo.png similarity index 100% rename from apps/desktop/.icons/Square284x284Logo.png rename to packages/distribution/icons/Square284x284Logo.png diff --git a/apps/desktop/.icons/Square30x30Logo.png b/packages/distribution/icons/Square30x30Logo.png similarity index 100% rename from apps/desktop/.icons/Square30x30Logo.png rename to packages/distribution/icons/Square30x30Logo.png diff --git a/apps/desktop/.icons/Square310x310Logo.png b/packages/distribution/icons/Square310x310Logo.png similarity index 100% rename from apps/desktop/.icons/Square310x310Logo.png rename to packages/distribution/icons/Square310x310Logo.png diff --git a/apps/desktop/.icons/Square44x44Logo.png b/packages/distribution/icons/Square44x44Logo.png similarity index 100% rename from apps/desktop/.icons/Square44x44Logo.png rename to packages/distribution/icons/Square44x44Logo.png diff --git a/apps/desktop/.icons/Square71x71Logo.png b/packages/distribution/icons/Square71x71Logo.png similarity index 100% rename from apps/desktop/.icons/Square71x71Logo.png rename to packages/distribution/icons/Square71x71Logo.png diff --git a/apps/desktop/.icons/Square89x89Logo.png b/packages/distribution/icons/Square89x89Logo.png similarity index 100% rename from apps/desktop/.icons/Square89x89Logo.png rename to packages/distribution/icons/Square89x89Logo.png diff --git a/apps/desktop/.icons/StoreLogo.png b/packages/distribution/icons/StoreLogo.png similarity index 100% rename from apps/desktop/.icons/StoreLogo.png rename to packages/distribution/icons/StoreLogo.png diff --git a/apps/desktop/.icons/icon.icns b/packages/distribution/icons/icon.icns similarity index 100% rename from apps/desktop/.icons/icon.icns rename to packages/distribution/icons/icon.icns diff --git a/apps/desktop/.icons/icon.ico b/packages/distribution/icons/icon.ico similarity index 100% rename from apps/desktop/.icons/icon.ico rename to packages/distribution/icons/icon.ico diff --git a/apps/desktop/.icons/icon.png b/packages/distribution/icons/icon.png similarity index 100% rename from apps/desktop/.icons/icon.png rename to packages/distribution/icons/icon.png diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c31aec24..cf029991 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -43,6 +43,22 @@ importers: version: 2.0.4(@types/node@20.14.12)(@vitest/ui@2.0.4)(jsdom@24.1.1)(sass@1.77.8) apps/desktop: + dependencies: + '@onelauncher/core': + specifier: workspace:* + version: link:../../packages/core + '@onelauncher/distribution': + specifier: workspace:* + version: link:../../packages/distribution + '@onelauncher/frontend': + specifier: workspace:* + version: link:../frontend + devDependencies: + '@tauri-apps/cli': + specifier: ^2.0.0-beta.20 + version: 2.0.0-beta.20 + + apps/frontend: dependencies: '@fontsource/poppins': specifier: ^5.0.14 @@ -56,9 +72,6 @@ importers: '@onelauncher/client': specifier: workspace:* version: link:../../packages/client - '@onelauncher/distribution': - specifier: workspace:* - version: link:../../packages/distribution '@rspc/client': specifier: ^0.2.3 version: 0.2.3 @@ -67,7 +80,7 @@ importers: version: 0.2.3(@tanstack/solid-query@5.51.9(solid-js@1.8.19))(solid-js@1.8.19) '@rspc/tauri': specifier: ^0.2.0 - version: 0.2.0(@tauri-apps/api@2.0.0-beta.14) + version: 0.2.0(@tauri-apps/api@2.0.0-beta.15) '@solid-primitives/refs': specifier: ^1.0.8 version: 1.0.8(solid-js@1.8.19) @@ -79,7 +92,7 @@ importers: version: 5.51.9(solid-js@1.8.19) '@tauri-apps/api': specifier: ^2.0.0-beta.13 - version: 2.0.0-beta.14 + version: 2.0.0-beta.15 '@tauri-apps/plugin-clipboard-manager': specifier: github:tauri-apps/tauri-plugin-clipboard-manager#v2 version: https://codeload.github.com/tauri-apps/tauri-plugin-clipboard-manager/tar.gz/d503abbce40595d0af6b36c10439b85c640b4c53 @@ -145,6 +158,8 @@ importers: specifier: ^4.3.2 version: 4.3.2(typescript@5.5.4)(vite@5.3.5(@types/node@20.14.12)(sass@1.77.8)) + apps/testing: {} + packages/client: dependencies: '@rspc/client': @@ -175,6 +190,8 @@ importers: specifier: ^3.23.8 version: 3.23.8 + packages/core: {} + packages/distribution: {} packages/scripts: @@ -228,10 +245,6 @@ packages: resolution: {integrity: sha512-c4IM7OTg6k1Q+AJ153e2mc2QVTezTwnb4VzquwcyiEzGnW0Kedv4do/TrkU98qPeC5LNiMt/QXwIjzYXLBpyZg==} engines: {node: '>=6.9.0'} - '@babel/core@7.24.8': - resolution: {integrity: sha512-6AWcmZC/MZCO0yKys4uhg5NlxL0ESF3K6IAaoQ+xSXvPyPyxNWRafP+GDbI88Oh68O7QkJgmEtedWPM9U0pZNg==} - engines: {node: '>=6.9.0'} - '@babel/core@7.24.9': resolution: {integrity: sha512-5e3FI4Q3M3Pbr21+5xJwCv6ZT6KmGkI0vw3Tozy5ODAQFTIWe37iT8Cr7Ice2Ntb+M3iSKCEWMB1MBgKrW3whg==} engines: {node: '>=6.9.0'} @@ -240,10 +253,6 @@ packages: resolution: {integrity: sha512-o9HBZL1G2129luEUlG1hB4N/nlYNWHnpwlND9eOMclRqqu1YDy2sSYVCFUZwl8I1Gxh+QSRrP2vD7EpUmFVXxg==} engines: {node: '>=6.9.0'} - '@babel/generator@7.24.8': - resolution: {integrity: sha512-47DG+6F5SzOi0uEvK4wMShmn5yY0mVjVJoWTphdY2B4Rx9wHgjK7Yhtr0ru6nE+sn0v38mzrWOlah0p/YlHHOQ==} - engines: {node: '>=6.9.0'} - '@babel/helper-annotate-as-pure@7.24.7': resolution: {integrity: sha512-BaDeOonYvhdKw+JoMVkAixAAJzG2jVPIwWoKBPdYuY9b452e2rPuI9QPYh3KpofZ3pW2akOmwZLOiOsHMiqRAg==} engines: {node: '>=6.9.0'} @@ -282,12 +291,6 @@ packages: resolution: {integrity: sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==} engines: {node: '>=6.9.0'} - '@babel/helper-module-transforms@7.24.8': - resolution: {integrity: sha512-m4vWKVqvkVAWLXfHCCfff2luJj86U+J0/x+0N3ArG/tP0Fq7zky2dYwMbtPmkc/oulkkbjdL3uWzuoBwQ8R00Q==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0 - '@babel/helper-module-transforms@7.24.9': resolution: {integrity: sha512-oYbh+rtFKj/HwBQkFlUzvcybzklmVdVV3UU+mN7n2t/q3yGHbuVdNxyFvSBO1tfvjyArpHNcWMAzsSPdyI46hw==} engines: {node: '>=6.9.0'} @@ -387,10 +390,6 @@ packages: resolution: {integrity: sha512-t0P1xxAPzEDcEPmjprAQq19NWum4K0EQPjMwZQZbHt+GiZqvjCHjj755Weq1YRPVzBI+3zSfvScfpnuIecVFJQ==} engines: {node: '>=6.9.0'} - '@babel/types@7.24.8': - resolution: {integrity: sha512-SkSBEHwwJRU52QEVZBmMBnE5Ux2/6WU1grdYyOhpbCNxbmJrDuDCphBzKZSO3taf0zztp+qkWlymE5tVL5l0TA==} - engines: {node: '>=6.9.0'} - '@babel/types@7.24.9': resolution: {integrity: sha512-xm8XrMKz0IlUdocVbYJe0Z9xEgidU7msskG8BbhnTPK/HZ2z/7FP7ykqPgrUH+C+r414mNfNWam1f2vqOjqjYQ==} engines: {node: '>=6.9.0'} @@ -926,10 +925,6 @@ packages: peerDependencies: solid-js: ^1.6.0 - '@tauri-apps/api@2.0.0-beta.14': - resolution: {integrity: sha512-YLYgHqdwWswr4Y70+hRzaLD6kLIUgHhE3shLXNquPiTaQ9+cX3Q2dB0AFfqsua6NXYFNe7LfkmMzaqEzqv3yQg==} - engines: {node: '>= 18.18', npm: '>= 6.6.0', yarn: '>= 1.19.1'} - '@tauri-apps/api@2.0.0-beta.15': resolution: {integrity: sha512-H9w6iISmR+NvH4XuyCZB4zDN10tf9RFt6i/9JHEjaRhAowdAaJ+oiXq/3kedizNClHMtbTQ5j0oqDVPkZDAI8g==} engines: {node: '>= 18.18', npm: '>= 6.6.0', yarn: '>= 1.19.1'} @@ -3319,26 +3314,6 @@ snapshots: '@babel/compat-data@7.24.8': {} - '@babel/core@7.24.8': - dependencies: - '@ampproject/remapping': 2.3.0 - '@babel/code-frame': 7.24.7 - '@babel/generator': 7.24.8 - '@babel/helper-compilation-targets': 7.24.8 - '@babel/helper-module-transforms': 7.24.8(@babel/core@7.24.8) - '@babel/helpers': 7.24.8 - '@babel/parser': 7.24.8 - '@babel/template': 7.24.7 - '@babel/traverse': 7.24.8 - '@babel/types': 7.24.8 - convert-source-map: 2.0.0 - debug: 4.3.5 - gensync: 1.0.0-beta.2 - json5: 2.2.3 - semver: 6.3.1 - transitivePeerDependencies: - - supports-color - '@babel/core@7.24.9': dependencies: '@ampproject/remapping': 2.3.0 @@ -3366,13 +3341,6 @@ snapshots: '@jridgewell/trace-mapping': 0.3.25 jsesc: 2.5.2 - '@babel/generator@7.24.8': - dependencies: - '@babel/types': 7.24.8 - '@jridgewell/gen-mapping': 0.3.5 - '@jridgewell/trace-mapping': 0.3.25 - jsesc: 2.5.2 - '@babel/helper-annotate-as-pure@7.24.7': dependencies: '@babel/types': 7.24.9 @@ -3402,16 +3370,16 @@ snapshots: '@babel/helper-environment-visitor@7.24.7': dependencies: - '@babel/types': 7.24.8 + '@babel/types': 7.24.9 '@babel/helper-function-name@7.24.7': dependencies: '@babel/template': 7.24.7 - '@babel/types': 7.24.8 + '@babel/types': 7.24.9 '@babel/helper-hoist-variables@7.24.7': dependencies: - '@babel/types': 7.24.8 + '@babel/types': 7.24.9 '@babel/helper-member-expression-to-functions@7.24.8': dependencies: @@ -3422,23 +3390,12 @@ snapshots: '@babel/helper-module-imports@7.18.6': dependencies: - '@babel/types': 7.24.8 + '@babel/types': 7.24.9 '@babel/helper-module-imports@7.24.7': dependencies: '@babel/traverse': 7.24.8 - '@babel/types': 7.24.8 - transitivePeerDependencies: - - supports-color - - '@babel/helper-module-transforms@7.24.8(@babel/core@7.24.8)': - dependencies: - '@babel/core': 7.24.8 - '@babel/helper-environment-visitor': 7.24.7 - '@babel/helper-module-imports': 7.24.7 - '@babel/helper-simple-access': 7.24.7 - '@babel/helper-split-export-declaration': 7.24.7 - '@babel/helper-validator-identifier': 7.24.7 + '@babel/types': 7.24.9 transitivePeerDependencies: - supports-color @@ -3471,7 +3428,7 @@ snapshots: '@babel/helper-simple-access@7.24.7': dependencies: '@babel/traverse': 7.24.8 - '@babel/types': 7.24.8 + '@babel/types': 7.24.9 transitivePeerDependencies: - supports-color @@ -3484,7 +3441,7 @@ snapshots: '@babel/helper-split-export-declaration@7.24.7': dependencies: - '@babel/types': 7.24.8 + '@babel/types': 7.24.9 '@babel/helper-string-parser@7.24.8': {} @@ -3495,7 +3452,7 @@ snapshots: '@babel/helpers@7.24.8': dependencies: '@babel/template': 7.24.7 - '@babel/types': 7.24.8 + '@babel/types': 7.24.9 '@babel/highlight@7.24.7': dependencies: @@ -3506,12 +3463,7 @@ snapshots: '@babel/parser@7.24.8': dependencies: - '@babel/types': 7.24.8 - - '@babel/plugin-syntax-jsx@7.24.7(@babel/core@7.24.8)': - dependencies: - '@babel/core': 7.24.8 - '@babel/helper-plugin-utils': 7.24.8 + '@babel/types': 7.24.9 '@babel/plugin-syntax-jsx@7.24.7(@babel/core@7.24.9)': dependencies: @@ -3561,29 +3513,23 @@ snapshots: dependencies: '@babel/code-frame': 7.24.7 '@babel/parser': 7.24.8 - '@babel/types': 7.24.8 + '@babel/types': 7.24.9 '@babel/traverse@7.24.8': dependencies: '@babel/code-frame': 7.24.7 - '@babel/generator': 7.24.8 + '@babel/generator': 7.24.10 '@babel/helper-environment-visitor': 7.24.7 '@babel/helper-function-name': 7.24.7 '@babel/helper-hoist-variables': 7.24.7 '@babel/helper-split-export-declaration': 7.24.7 '@babel/parser': 7.24.8 - '@babel/types': 7.24.8 + '@babel/types': 7.24.9 debug: 4.3.5 globals: 11.12.0 transitivePeerDependencies: - supports-color - '@babel/types@7.24.8': - dependencies: - '@babel/helper-string-parser': 7.24.8 - '@babel/helper-validator-identifier': 7.24.7 - to-fast-properties: 2.0.0 - '@babel/types@7.24.9': dependencies: '@babel/helper-string-parser': 7.24.8 @@ -3921,11 +3867,6 @@ snapshots: '@tanstack/solid-query': 5.51.9(solid-js@1.8.19) solid-js: 1.8.19 - '@rspc/tauri@0.2.0(@tauri-apps/api@2.0.0-beta.14)': - dependencies: - '@rspc/client': 0.2.0 - '@tauri-apps/api': 2.0.0-beta.14 - '@rspc/tauri@0.2.0(@tauri-apps/api@2.0.0-beta.15)': dependencies: '@rspc/client': 0.2.0 @@ -4030,8 +3971,6 @@ snapshots: '@tanstack/query-core': 5.51.9 solid-js: 1.8.19 - '@tauri-apps/api@2.0.0-beta.14': {} - '@tauri-apps/api@2.0.0-beta.15': {} '@tauri-apps/cli-darwin-arm64@2.0.0-beta.20': @@ -4130,23 +4069,23 @@ snapshots: '@types/babel__core@7.20.5': dependencies: '@babel/parser': 7.24.8 - '@babel/types': 7.24.8 + '@babel/types': 7.24.9 '@types/babel__generator': 7.6.8 '@types/babel__template': 7.4.4 '@types/babel__traverse': 7.20.5 '@types/babel__generator@7.6.8': dependencies: - '@babel/types': 7.24.8 + '@babel/types': 7.24.9 '@types/babel__template@7.4.4': dependencies: '@babel/parser': 7.24.8 - '@babel/types': 7.24.8 + '@babel/types': 7.24.9 '@types/babel__traverse@7.20.5': dependencies: - '@babel/types': 7.24.8 + '@babel/types': 7.24.9 '@types/eslint@8.56.11': dependencies: @@ -4646,19 +4585,19 @@ snapshots: asynckit@0.4.0: {} - babel-plugin-jsx-dom-expressions@0.37.19(@babel/core@7.24.8): + babel-plugin-jsx-dom-expressions@0.37.19(@babel/core@7.24.9): dependencies: - '@babel/core': 7.24.8 + '@babel/core': 7.24.9 '@babel/helper-module-imports': 7.18.6 - '@babel/plugin-syntax-jsx': 7.24.7(@babel/core@7.24.8) - '@babel/types': 7.24.8 + '@babel/plugin-syntax-jsx': 7.24.7(@babel/core@7.24.9) + '@babel/types': 7.24.9 html-entities: 2.3.3 validate-html-nesting: 1.2.2 - babel-preset-solid@1.8.16(@babel/core@7.24.8): + babel-preset-solid@1.8.16(@babel/core@7.24.9): dependencies: - '@babel/core': 7.24.8 - babel-plugin-jsx-dom-expressions: 0.37.19(@babel/core@7.24.8) + '@babel/core': 7.24.9 + babel-plugin-jsx-dom-expressions: 0.37.19(@babel/core@7.24.9) balanced-match@1.0.2: {} @@ -6150,9 +6089,9 @@ snapshots: solid-refresh@0.6.3(solid-js@1.8.19): dependencies: - '@babel/generator': 7.24.8 + '@babel/generator': 7.24.10 '@babel/helper-module-imports': 7.24.7 - '@babel/types': 7.24.8 + '@babel/types': 7.24.9 solid-js: 1.8.19 transitivePeerDependencies: - supports-color @@ -6442,9 +6381,9 @@ snapshots: vite-plugin-solid@2.10.2(@testing-library/jest-dom@6.4.8)(solid-js@1.8.19)(vite@5.3.5(@types/node@20.14.12)(sass@1.77.8)): dependencies: - '@babel/core': 7.24.8 + '@babel/core': 7.24.9 '@types/babel__core': 7.20.5 - babel-preset-solid: 1.8.16(@babel/core@7.24.8) + babel-preset-solid: 1.8.16(@babel/core@7.24.9) merge-anything: 5.1.7 solid-js: 1.8.19 solid-refresh: 0.6.3(solid-js@1.8.19)