Merge #783

783: Misc updates r=jhelwig a=jhelwig



Co-authored-by: Jacob Helwig <[email protected]>

Cargo.toml

@@ -9,18 +9,18 @@ edition = "2018"
 
 [dependencies]
 anyhow = "1.0.51"
-axum = { version = "0.4.0", features = ["ws"] }
+axum = { version = "0.4.2", features = ["ws"] }
 axum-debug = "0.3.2"
 clap = "2.34.0"
 hyper = "0.14.16"
 iftree = "1.0.2"
 mime = "0.3.16"
-mime_guess = "*"
-once_cell = "1.8.0"
+mime_guess = "2.0.3"
+once_cell = "1.9.0"
 qusb2snes-client = "0.2.1"
-serde = { version = "1.0.130", features = ["derive"] }
-serde_json = "1.0.68"
-serde_yaml = "0.8.21"
+serde = { version = "1.0.132", features = ["derive"] }
+serde_json = "1.0.73"
+serde_yaml = "0.8.23"
 tokio = { version = "1.14.0", features = ["full"] }
 tower = "0.4.11"
 tower-http = { version = "0.2.0", features = ["cors", "set-header", "trace"] }
@@ -30,4 +30,4 @@ ts-rs = "6.1.0"
 
 [build-dependencies]
 anyhow = "1.0.51"
-vergen = { version = "*", default-features = false, features = ["build", "git", "rustc"] }
+vergen = { version = "6.0.0", default-features = false, features = ["build", "git", "rustc"] }

ui/src/server_types/DataSource.ts

@@ -1,4 +1,4 @@
-import type { LocalFileConfig } from "./LocalFileConfig";
 import type { Qusb2snesConfig } from "./Qusb2snesConfig";
+import type { LocalFileConfig } from "./LocalFileConfig";
 
 export type DataSource = { type: "LocalFile" } & LocalFileConfig | { type: "Qusb2snes" } & Qusb2snesConfig;

ui/src/server_types/Dungeon.ts

@@ -1,8 +1,8 @@
-import type { DungeonAvailability } from "./DungeonAvailability";
-import type { LocationPosition } from "./LocationPosition";
-import type { DungeonBoss } from "./DungeonBoss";
-import type { DungeonReward } from "./DungeonReward";
 import type { Availability } from "./Availability";
 import type { Medallion } from "./Medallion";
+import type { DungeonReward } from "./DungeonReward";
+import type { DungeonAvailability } from "./DungeonAvailability";
+import type { DungeonBoss } from "./DungeonBoss";
+import type { LocationPosition } from "./LocationPosition";
 
 export interface Dungeon { name: string, dungeonCode: string, hoverText: string, totalChests: number, clearedImage: string, defaultImage: string, hasReward: boolean, position: LocationPosition | null, boss: DungeonBoss | null, foundChests: number, reward: DungeonReward, medallion: Medallion, cleared: boolean, dungeonAvailability: Availability, bossAvailability: Availability, logic: DungeonAvailability | null, }

ui/src/server_types/DungeonUpdate.ts

@@ -1,4 +1,4 @@
-import type { DungeonReward } from "./DungeonReward";
 import type { Medallion } from "./Medallion";
+import type { DungeonReward } from "./DungeonReward";
 
 export interface DungeonUpdate { foundChests: number | null, reward: DungeonReward | null, medallion: Medallion | null, cleared: boolean | null, }

ui/src/server_types/GameState.ts

@@ -1,11 +1,11 @@
-import type { Armor } from "./Armor";
 import type { Gloves } from "./Gloves";
-import type { Bottle } from "./Bottle";
-import type { Shield } from "./Shield";
+import type { Sword } from "./Sword";
+import type { Armor } from "./Armor";
 import type { Pendant } from "./Pendant";
-import type { Crystal } from "./Crystal";
+import type { Shield } from "./Shield";
 import type { Magic } from "./Magic";
-import type { Sword } from "./Sword";
 import type { BigKey } from "./BigKey";
+import type { Bottle } from "./Bottle";
+import type { Crystal } from "./Crystal";
 
 export interface GameState { bow: boolean, blueBoomerang: boolean, redBoomerang: boolean, hookShot: boolean, bomb: number, mushroom: boolean, powder: boolean, fireRod: boolean, iceRod: boolean, bombosMedallion: boolean, etherMedallion: boolean, quakeMedallion: boolean, lantern: boolean, hammer: boolean, flute: boolean, fluteActivated: boolean, shovel: boolean, net: boolean, book: boolean, bottle: boolean, bottleCount: number, caneSomaria: boolean, caneByrna: boolean, cape: boolean, mirror: boolean, silvers: boolean, gloves: Gloves, boots: boolean, flippers: boolean, moonPearl: boolean, swordLevel: Sword, shieldLevel: Shield, armorLevel: Armor, bottleContent1: Bottle, bottleContent2: Bottle, bottleContent3: Bottle, bottleContent4: Bottle, rupees: number, heartQuarters: number, bombCapacity: number, hearts: number, maxHearts: number, arrows: number, arrowCapacity: number, magicProgression: Magic, smallKeys: number, bigKey: BigKey, pendant: Pendant, crystal: Crystal, }

ui/src/server_types/Location.ts

@@ -1,4 +1,4 @@
-import type { LocationPosition } from "./LocationPosition";
 import type { Availability } from "./Availability";
+import type { LocationPosition } from "./LocationPosition";
 
 export interface Location { name: string, hoverText: string, position: LocationPosition, cleared: boolean, availability: Availability, }

ui/src/server_types/ServerConfig.ts

@@ -1,4 +1,4 @@
-import type { RandoLogic } from "./RandoLogic";
 import type { DataSource } from "./DataSource";
+import type { RandoLogic } from "./RandoLogic";
 
 export interface ServerConfig { dataPollRate: number, dataSource: DataSource, logic: RandoLogic, apiPort: number, }