Skip to content

Commit c566b2a

Browse files
Merge dev
2 parents 07c66e8 + 2dd13a9 commit c566b2a

File tree

158 files changed

+1206
-979
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

158 files changed

+1206
-979
lines changed

fission/.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,6 @@ dist-ssr
2828
*.sw?
2929

3030
yarn.lock
31+
32+
test-results
33+
src/test/**/__screenshots__

fission/biome.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"$schema": "https://biomejs.dev/schemas/2.1.2/schema.json",
3-
"vcs": { "enabled": false, "clientKind": "git", "useIgnoreFile": false },
2+
"$schema": "https://biomejs.dev/schemas/2.1.3/schema.json",
3+
"vcs": { "enabled": true, "clientKind": "git", "useIgnoreFile": true, "defaultBranch": "dev" },
44
"files": { "ignoreUnknown": false },
55
"formatter": {
66
"enabled": true,

fission/bun.lock

Lines changed: 311 additions & 370 deletions
Large diffs are not rendered by default.

fission/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
"electron-squirrel-startup": "^1.0.1",
4646
"framer-motion": "^10.18.0",
4747
"lygia": "^1.3.3",
48+
"msw": "^2.10.4",
4849
"notistack": "^3.0.2",
4950
"playwright": "^1.54.2",
5051
"postprocessing": "^6.37.6",

fission/src/GA.d.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,6 @@ declare module "@haensl/google-analytics" {
77
function event(e: GaEvent)
88
function exception(e: GaException)
99
function setUserId({ id }: { id: string })
10-
function setUserProperty({ name, value }: { name: string; value: string })
10+
function setUserProperty({ name, value }: { name: string; value: unknown })
11+
function install()
1112
}

fission/src/Synthesis.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@ import { UIRenderer } from "@/ui/UIRenderer.tsx"
88
import PreferencesSystem from "./systems/preferences/PreferencesSystem.ts"
99
import AnalyticsConsent from "./ui/components/AnalyticsConsent.tsx"
1010
import ContextMenu from "./ui/components/ContextMenu.tsx"
11+
import DragModeIndicator from "./ui/components/DragModeIndicator.tsx"
1112
import GlobalUIComponent from "./ui/components/GlobalUIComponent.tsx"
13+
import { globalOpenModal } from "./ui/components/GlobalUIControls.ts"
1214
import ProgressNotifications from "./ui/components/ProgressNotification.tsx"
1315
import SceneOverlay from "./ui/components/SceneOverlay.tsx"
1416
import WPILibConnectionStatus from "./ui/components/WPILibConnectionStatus.tsx"
1517
import MainMenuModal from "./ui/modals/MainMenuModal.tsx"
1618
import { StateProvider } from "./ui/StateProvider.tsx"
1719
import { ThemeProvider } from "./ui/ThemeProvider.tsx"
1820
import { UIProvider } from "./ui/UIProvider.tsx"
19-
import { globalOpenModal } from "./ui/components/GlobalUIControls.ts"
20-
import DragModeIndicator from "./ui/components/DragModeIndicator.tsx"
2121

2222
function Synthesis() {
2323
const [consentPopupDisable, setConsentPopupDisable] = useState<boolean>(true)

fission/src/Window.d.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
declare interface Window {
22
convertAuthToken(code: string): void
3-
gtag: () => void
3+
gtag?: (command: "config" | "set" | "get" | "event" | "consent", ...args: unknown[]) => void
4+
dataLayer?: unknown[][]
45
}

fission/src/aps/APSDataManagement.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Mutex } from "async-mutex"
22
import { globalAddToast } from "@/ui/components/GlobalUIControls"
3-
import TaskStatus from "@/util/TaskStatus"
3+
import type TaskStatus from "@/util/TaskStatus"
44
import APS from "./APS"
55

66
export const FOLDER_DATA_TYPE = "folders"

fission/src/mirabuf/EjectableSceneObject.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import Jolt from "@azaleacolburn/jolt-physics"
1+
import type Jolt from "@azaleacolburn/jolt-physics"
22
import * as THREE from "three"
33
import SceneObject from "@/systems/scene/SceneObject"
44
import World from "@/systems/World"
@@ -10,7 +10,7 @@ import {
1010
convertThreeVector3ToJoltRVec3,
1111
convertThreeVector3ToJoltVec3,
1212
} from "@/util/TypeConversions"
13-
import MirabufSceneObject from "./MirabufSceneObject"
13+
import type MirabufSceneObject from "./MirabufSceneObject"
1414
import ScoringZoneSceneObject from "./ScoringZoneSceneObject"
1515

1616
class EjectableSceneObject extends SceneObject {

fission/src/mirabuf/FieldMiraEditor.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { ScoringZonePreferences } from "@/systems/preferences/PreferenceTypes"
1+
import type { ScoringZonePreferences } from "@/systems/preferences/PreferenceTypes"
22
import { mirabuf } from "../proto/mirabuf"
33

44
interface DevtoolMiraData {

0 commit comments

Comments
 (0)