Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .zed/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"lsp": {
"biome": {
"settings": {
"configuration_path": "frontend/biome.json",
"config_path": "frontend/biome.json",
"require_config_file": true
}
}
Expand Down
6 changes: 3 additions & 3 deletions frontend/biome.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"$schema": "https://biomejs.dev/schemas/2.0.6/schema.json",
"$schema": "https://biomejs.dev/schemas/2.2.5/schema.json",
"vcs": {
"enabled": true,
"clientKind": "git",
"useIgnoreFile": true
},
"files": {
"ignoreUnknown": false,
"includes": []
"includes": ["src/**", "public/**"]
},
"formatter": {
"enabled": true,
Expand All @@ -28,7 +28,7 @@
},
"overrides": [
{
"includes": ["*.svelte", "*.astro", "*.vue"],
"includes": ["**/*.svelte"],
"linter": {
"rules": {
"style": {
Expand Down
14 changes: 7 additions & 7 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@
},
"dependencies": {
"@thisux/sveltednd": "^0.0.20",
"@wailsio/runtime": "3.0.0-alpha.66",
"@wailsio/runtime": "3.0.0-alpha.72",
"superjson": "^2.2.2",
"svelte": "^5.34.9",
"svelte-5-french-toast": "^2.0.4",
"svelte": "^5.39.11",
"svelte-5-french-toast": "^2.0.6",
"svelte-portal": "^2.2.1"
},
"devDependencies": {
"@biomejs/biome": "^1.9.4",
"@rsbuild/core": "^1.4.2",
"@rsbuild/plugin-svelte": "^1.0.10",
"typescript": "^5.8.3"
"@biomejs/biome": "^2.2.5",
"@rsbuild/core": "^1.5.14",
"@rsbuild/plugin-svelte": "^1.0.11",
"typescript": "^5.9.3"
}
}
481 changes: 240 additions & 241 deletions frontend/pnpm-lock.yaml

Large diffs are not rendered by default.

8 changes: 6 additions & 2 deletions frontend/src/components/BotList.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,11 @@ import defaultIcon from "../assets/rlbot_mono.png";
import starIcon from "../assets/star.svg";
import filledStarIcon from "../assets/starFilled.svg";
import { BASE_PLAYERS } from "../base-players";
import { parseJSON, type DraggablePlayer, type ToggleableScript } from "../index";
import {
parseJSON,
type DraggablePlayer,
type ToggleableScript,
} from "../index";
//@ts-ignore
import LoadoutEditor from "./LoadoutEditor/Main.svelte";
import { getAndParseItems } from "./LoadoutEditor/items";
Expand Down Expand Up @@ -41,7 +45,7 @@ let {
const flipDurationMs = 100;

let favorites: string[] = $state(
parseJSON(localStorage.getItem("FAVORITES")) || []
parseJSON(localStorage.getItem("FAVORITES")) || [],
);
$effect(() => {
localStorage.setItem("FAVORITES", JSON.stringify(favorites));
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/Events.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import CalendarPlusIcon from "../assets/calendar-plus.svg";
import GeoIcon from "../assets/geo.svg";
import InfoIcon from "../assets/info_icon.svg";
import Modal from "./Modal.svelte";
import RLBotMono from "../assets/rlbot_mono.png"
import RLBotMono from "../assets/rlbot_mono.png";

let {
visible = $bindable(false),
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/LoadoutEditor/Main.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ async function LaunchMatch(
} else {
previewMatchTeam = team;
lastShowcaseType = selectedShowcaseType;

await App.SetLoadout(options);
}

Expand Down
6 changes: 1 addition & 5 deletions frontend/src/components/NiceSelect.svelte
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
<script lang="ts">
let {
value = $bindable(),
options = {},
placeholder = "",
} = $props();
let { value = $bindable(), options = {}, placeholder = "" } = $props();

const options_entries = $derived(Object.entries(options));
$effect(() => {
Expand Down
5 changes: 3 additions & 2 deletions frontend/src/global.css
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,9 @@ body {
/* color: #333; */
background-color: var(--background);
color: var(--foreground);
font-family: -apple-system, BlinkMacSystemFont, "Inter", Roboto, Oxygen-Sans,
Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
font-family:
-apple-system, BlinkMacSystemFont, "Inter", Roboto, Oxygen-Sans, Ubuntu,
Cantarell, "Helvetica Neue", sans-serif;
}

h1,
Expand Down
6 changes: 3 additions & 3 deletions frontend/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ SuperJSON.registerClass(HumanInfo);

export function parseJSON(item: string | null): any | null {
if (item === null) {
return null
return null;
}

try {
return JSON.parse(item)
return JSON.parse(item);
} catch {
return null
return null;
}
}

Expand Down
18 changes: 10 additions & 8 deletions frontend/src/pages/Home.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,10 @@ import {
parseJSON,
} from "../index";
import { mapStore } from "../settings";
import { DebugRendering, ExistingMatchBehavior } from "../../bindings/github.com/RLBot/go-interface/flat/models.js";
import {
DebugRendering,
ExistingMatchBehavior,
} from "../../bindings/github.com/RLBot/go-interface/flat/models.js";

const backgroundImage =
arenaImages[Math.floor(Math.random() * arenaImages.length)];
Expand All @@ -38,9 +41,7 @@ let paths: {
repo: string | null;
installPath: string;
visible: boolean;
}[] = $state(
parseJSON(window.localStorage.getItem("BOT_SEARCH_PATHS")) || []
);
}[] = $state(parseJSON(window.localStorage.getItem("BOT_SEARCH_PATHS")) || []);

let botpackNotifIds: { [repo: string]: string } = {};

Expand Down Expand Up @@ -169,7 +170,8 @@ function updateTeam(team: DraggablePlayer[]) {
}

const found = players.find(
(p) => p.player instanceof BotInfo && p.player.tomlPath === botInfo.tomlPath,
(p) =>
p.player instanceof BotInfo && p.player.tomlPath === botInfo.tomlPath,
);
if (!found) {
// bot was removed
Expand Down Expand Up @@ -286,7 +288,7 @@ let extraOptions: ExtraOptions = $state({
autoStartAgents: true,
waitForAgents: true,
// rest are fine with being nullish
...parseJSON(localStorage.getItem("MS_EXTRAOPTIONS")) || {},
...(parseJSON(localStorage.getItem("MS_EXTRAOPTIONS")) || {}),
});
$effect(() => {
localStorage.setItem("MS_EXTRAOPTIONS", JSON.stringify(extraOptions));
Expand Down Expand Up @@ -330,7 +332,7 @@ async function onMatchStart(randomizeMap: boolean) {
(clone.player as BotInfo).config.settings.logoFile = "";
}
return draggablePlayerToPlayerJs(clone);
}
};

const options: StartMatchOptions = {
map: $mapStore,
Expand All @@ -357,7 +359,7 @@ async function onMatchStart(randomizeMap: boolean) {
let response;
try {
response = await App.StartMatch(options);
} catch(e) {
} catch (e) {
toast.error(`Match start failed\n${e}`, {
id: toastId,
duration: 10000,
Expand Down
37 changes: 17 additions & 20 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,11 @@ require (
github.com/BurntSushi/toml v1.5.0
github.com/RLBot/go-interface v0.0.0-20250705224140-6c179505c975
github.com/ncruces/zenity v0.10.14
github.com/ulikunitz/xz v0.5.12
github.com/ulikunitz/xz v0.5.15
github.com/wailsapp/mimetype v1.4.1
github.com/wailsapp/wails/v3 v3.0.0-alpha.10
github.com/wailsapp/wails/v3 v3.0.0-alpha.34
)

// see https://github.com/wailsapp/wails/pull/4259
// fixes drag and drop on windows
replace github.com/wailsapp/wails/v3 => github.com/swz-git/wails/v3 v3.0.0-20250707232038-b80d0e14ee2b

require (
dario.cat/mergo v1.0.2 // indirect
github.com/Microsoft/go-winio v0.6.2 // indirect
Expand All @@ -25,42 +21,43 @@ require (
github.com/akavel/rsrc v0.10.2 // indirect
github.com/bep/debounce v1.2.1 // indirect
github.com/cloudflare/circl v1.6.1 // indirect
github.com/cyphar/filepath-securejoin v0.4.1 // indirect
github.com/cyphar/filepath-securejoin v0.5.0 // indirect
github.com/dchest/jsmin v1.0.0 // indirect
github.com/ebitengine/purego v0.8.4 // indirect
github.com/ebitengine/purego v0.9.0 // indirect
github.com/emirpasic/gods v1.18.1 // indirect
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
github.com/go-git/go-billy/v5 v5.6.2 // indirect
github.com/go-git/go-git/v5 v5.16.2 // indirect
github.com/go-git/go-git/v5 v5.16.3 // indirect
github.com/go-ole/go-ole v1.3.0 // indirect
github.com/godbus/dbus/v5 v5.1.0 // indirect
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
github.com/google/flatbuffers v25.2.10+incompatible // indirect
github.com/google/flatbuffers v25.9.23+incompatible // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
github.com/jchv/go-winloader v0.0.0-20250406163304-c1995be93bd1 // indirect
github.com/josephspurrier/goversioninfo v1.5.0 // indirect
github.com/kevinburke/ssh_config v1.2.0 // indirect
github.com/kevinburke/ssh_config v1.4.0 // indirect
github.com/klauspost/cpuid/v2 v2.3.0 // indirect
github.com/leaanthony/go-ansi-parser v1.6.1 // indirect
github.com/leaanthony/u v1.1.1 // indirect
github.com/lmittmann/tint v1.1.2 // indirect
github.com/mattn/go-colorable v0.1.14 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/pjbgf/sha1cd v0.3.2 // indirect
github.com/pjbgf/sha1cd v0.5.0 // indirect
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/randall77/makefat v0.0.0-20210315173500-7ddd0e42c844 // indirect
github.com/rivo/uniseg v0.4.7 // indirect
github.com/samber/lo v1.51.0 // indirect
github.com/samber/lo v1.52.0 // indirect
github.com/sergi/go-diff v1.4.0 // indirect
github.com/skeema/knownhosts v1.3.1 // indirect
github.com/wailsapp/go-webview2 v1.0.21 // indirect
github.com/skeema/knownhosts v1.3.2 // indirect
github.com/wailsapp/go-webview2 v1.0.22 // indirect
github.com/xanzy/ssh-agent v0.3.3 // indirect
golang.org/x/crypto v0.39.0 // indirect
golang.org/x/image v0.28.0 // indirect
golang.org/x/net v0.41.0 // indirect
golang.org/x/sys v0.33.0 // indirect
golang.org/x/text v0.26.0 // indirect
golang.org/x/crypto v0.43.0 // indirect
golang.org/x/image v0.32.0 // indirect
golang.org/x/net v0.45.0 // indirect
golang.org/x/sys v0.37.0 // indirect
golang.org/x/text v0.30.0 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
)
Loading