From fcf1889419b83b3b21d9842e30d402f80437777a Mon Sep 17 00:00:00 2001
From: norbiros <norbiros@protonmail.com>
Date: Tue, 20 Aug 2024 19:21:04 +0200
Subject: [PATCH] fix(theseus): Lint & more

---
 .editorconfig                                 |   3 +
 apps/app-frontend/src/App.vue                 |  13 +-
 .../src/components/ui/SplashScreen.vue        |   2 +-
 .../app-frontend/src/composables/macCssFix.js |  20 ++
 apps/app-frontend/src/main.js                 |   2 -
 apps/app-frontend/src/mixins/macCssFix.js     |  27 ---
 apps/app-frontend/src/routes.js               |   2 +-
 apps/app/build.rs                             | 194 ++++++++++++++++--
 apps/app/capabilities/plugins.json            |   3 +
 apps/app/gen/schemas/capabilities.json        |   2 +-
 apps/app/src/api/auth.rs                      |   4 +-
 apps/app/src/main.rs                          |  10 +-
 packages/app-lib/src/event/emit.rs            |   6 +-
 packages/app-lib/src/event/mod.rs             |   3 +-
 packages/ui/src/components/base/Card.vue      |  24 ++-
 15 files changed, 241 insertions(+), 74 deletions(-)
 create mode 100644 apps/app-frontend/src/composables/macCssFix.js
 delete mode 100644 apps/app-frontend/src/mixins/macCssFix.js

diff --git a/.editorconfig b/.editorconfig
index 63dfdc715..72764c8e8 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -13,3 +13,6 @@ max_line_length = 100
 [*.md]
 max_line_length = off
 trim_trailing_whitespace = false
+
+[*.rs]
+indent_size = 4
\ No newline at end of file
diff --git a/apps/app-frontend/src/App.vue b/apps/app-frontend/src/App.vue
index d1a5c1f59..3122667b9 100644
--- a/apps/app-frontend/src/App.vue
+++ b/apps/app-frontend/src/App.vue
@@ -24,12 +24,13 @@ import {
   mixpanel_is_loaded,
 } from '@/helpers/mixpanel'
 import { saveWindowState, StateFlags } from '@tauri-apps/plugin-window-state'
-import { getCurrentWindow } from '@tauri-apps/api/window';
+import { getCurrentWindow } from '@tauri-apps/api/window'
 import { getVersion } from '@tauri-apps/api/app'
 import { TauriEvent } from '@tauri-apps/api/event'
 import URLConfirmModal from '@/components/ui/URLConfirmModal.vue'
 import { install_from_file } from './helpers/pack'
 import { useError } from '@/store/error.js'
+import { useCheckDisableMouseover } from '@/composables/macCssFix.js'
 import ModInstallModal from '@/components/ui/install_flow/ModInstallModal.vue'
 import IncompatibilityWarningModal from '@/components/ui/install_flow/IncompatibilityWarningModal.vue'
 import InstallConfirmModal from '@/components/ui/install_flow/InstallConfirmModal.vue'
@@ -56,6 +57,10 @@ const os = ref('')
 
 const stateInitialized = ref(false)
 
+onMounted(async () => {
+  await useCheckDisableMouseover()
+})
+
 async function setupApp() {
   stateInitialized.value = true
   const {
@@ -289,7 +294,11 @@ async function handleCommand(e) {
           <Button class="titlebar-button" icon-only @click="() => getCurrentWindow().minimize()">
             <MinimizeIcon />
           </Button>
-          <Button class="titlebar-button" icon-only @click="() => getCurrentWindow().toggleMaximize()">
+          <Button
+            class="titlebar-button"
+            icon-only
+            @click="() => getCurrentWindow().toggleMaximize()"
+          >
             <MaximizeIcon />
           </Button>
           <Button
diff --git a/apps/app-frontend/src/components/ui/SplashScreen.vue b/apps/app-frontend/src/components/ui/SplashScreen.vue
index 7075424ad..a62e753f4 100644
--- a/apps/app-frontend/src/components/ui/SplashScreen.vue
+++ b/apps/app-frontend/src/components/ui/SplashScreen.vue
@@ -85,7 +85,7 @@
 import { ref, watch } from 'vue'
 import ProgressBar from '@/components/ui/ProgressBar.vue'
 import { loading_listener } from '@/helpers/events.js'
-import { getCurrentWindow } from '@tauri-apps/api/window';
+import { getCurrentWindow } from '@tauri-apps/api/window'
 import { XIcon } from '@modrinth/assets'
 import { MaximizeIcon, MinimizeIcon } from '@/assets/icons/index.js'
 import { TauriEvent } from '@tauri-apps/api/event'
diff --git a/apps/app-frontend/src/composables/macCssFix.js b/apps/app-frontend/src/composables/macCssFix.js
new file mode 100644
index 000000000..c4ce417a2
--- /dev/null
+++ b/apps/app-frontend/src/composables/macCssFix.js
@@ -0,0 +1,20 @@
+import { invoke } from '@tauri-apps/api/core'
+import cssContent from '@/assets/stylesheets/macFix.css?inline'
+
+export async function useCheckDisableMouseover() {
+  try {
+    // Fetch the CSS content from the Rust backend
+    let should_disable_mouseover = await invoke('plugin:utils|should_disable_mouseover')
+
+    if (should_disable_mouseover) {
+      // Create a style element and set its content
+      const styleElement = document.createElement('style')
+      styleElement.innerHTML = cssContent
+
+      // Append the style element to the document's head
+      document.head.appendChild(styleElement)
+    }
+  } catch (error) {
+    console.error('Error checking OS version from Rust backend', error)
+  }
+}
diff --git a/apps/app-frontend/src/main.js b/apps/app-frontend/src/main.js
index 881c3b51c..04d4efdbe 100644
--- a/apps/app-frontend/src/main.js
+++ b/apps/app-frontend/src/main.js
@@ -4,7 +4,6 @@ import App from '@/App.vue'
 import { createPinia } from 'pinia'
 import FloatingVue from 'floating-vue'
 import 'floating-vue/dist/style.css'
-import loadCssMixin from './mixins/macCssFix.js'
 import { createPlugin } from '@vintl/vintl/plugin'
 
 const VIntlPlugin = createPlugin({
@@ -30,7 +29,6 @@ let app = createApp(App)
 app.use(router)
 app.use(pinia)
 app.use(FloatingVue)
-app.mixin(loadCssMixin)
 app.use(VIntlPlugin)
 
 app.mount('#app')
diff --git a/apps/app-frontend/src/mixins/macCssFix.js b/apps/app-frontend/src/mixins/macCssFix.js
deleted file mode 100644
index 91cd7e0aa..000000000
--- a/apps/app-frontend/src/mixins/macCssFix.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import { invoke } from '@tauri-apps/api/core'
-import cssContent from '@/assets/stylesheets/macFix.css?inline'
-
-export default {
-  async mounted() {
-    await this.checkDisableMouseover()
-  },
-  methods: {
-    async checkDisableMouseover() {
-      try {
-        // Fetch the CSS content from the Rust backend
-        const should_disable_mouseover = await invoke('plugin:utils|should_disable_mouseover')
-
-        if (should_disable_mouseover) {
-          // Create a style element and set its content
-          const styleElement = document.createElement('style')
-          styleElement.innerHTML = cssContent
-
-          // Append the style element to the document's head
-          document.head.appendChild(styleElement)
-        }
-      } catch (error) {
-        console.error('Error checking OS version from Rust backend', error)
-      }
-    },
-  },
-}
diff --git a/apps/app-frontend/src/routes.js b/apps/app-frontend/src/routes.js
index 26141adbe..fade309a4 100644
--- a/apps/app-frontend/src/routes.js
+++ b/apps/app-frontend/src/routes.js
@@ -139,7 +139,7 @@ export default new createRouter({
   linkExactActiveClass: 'router-link-exact-active',
   scrollBehavior() {
     // Sometimes Vue's scroll behavior is not working as expected, so we need to manually scroll to top (especially on Linux)
-    document.querySelector('.router-view').scrollTop = 0
+    document.querySelector('.router-view')?.scrollTo(0, 0)
     return {
       el: '.router-view',
       top: 0,
diff --git a/apps/app/build.rs b/apps/app/build.rs
index d5ea3be2d..a0989c749 100644
--- a/apps/app/build.rs
+++ b/apps/app/build.rs
@@ -9,60 +9,222 @@ fn main() {
             .codegen(tauri_build::CodegenContext::new())
             .plugin(
                 "auth",
-                InlinedPlugin::new().commands(&["login", "get_default_user", "set_default_user", "remove_user", "get_users"]).default_permission(DefaultPermissionRule::AllowAllCommands),
+                InlinedPlugin::new()
+                    .commands(&[
+                        "login",
+                        "get_default_user",
+                        "set_default_user",
+                        "remove_user",
+                        "get_users",
+                    ])
+                    .default_permission(
+                        DefaultPermissionRule::AllowAllCommands,
+                    ),
             )
             .plugin(
                 "import",
-                InlinedPlugin::new().commands(&["get_importable_instances", "import_instance", "is_valid_importable_instance", "get_default_launcher_path"]).default_permission(DefaultPermissionRule::AllowAllCommands),
+                InlinedPlugin::new()
+                    .commands(&[
+                        "get_importable_instances",
+                        "import_instance",
+                        "is_valid_importable_instance",
+                        "get_default_launcher_path",
+                    ])
+                    .default_permission(
+                        DefaultPermissionRule::AllowAllCommands,
+                    ),
             )
             .plugin(
                 "jre",
-                InlinedPlugin::new().commands(&["jre_find_filtered_jres", "jre_get_jre", "jre_test_jre", "jre_auto_install_java", "jre_get_max_memory", "get_java_versions"]).default_permission(DefaultPermissionRule::AllowAllCommands),
+                InlinedPlugin::new()
+                    .commands(&[
+                        "jre_find_filtered_jres",
+                        "jre_get_jre",
+                        "jre_test_jre",
+                        "jre_auto_install_java",
+                        "jre_get_max_memory",
+                        "get_java_versions",
+                    ])
+                    .default_permission(
+                        DefaultPermissionRule::AllowAllCommands,
+                    ),
             )
             .plugin(
                 "logs",
-                InlinedPlugin::new().commands(&["logs_get_logs", "logs_get_logs_by_filename", "logs_get_output_by_filename", "logs_delete_logs", "logs_delete_logs_by_filename", "logs_get_latest_log_cursor"]).default_permission(DefaultPermissionRule::AllowAllCommands),
+                InlinedPlugin::new()
+                    .commands(&[
+                        "logs_get_logs",
+                        "logs_get_logs_by_filename",
+                        "logs_get_output_by_filename",
+                        "logs_delete_logs",
+                        "logs_delete_logs_by_filename",
+                        "logs_get_latest_log_cursor",
+                    ])
+                    .default_permission(
+                        DefaultPermissionRule::AllowAllCommands,
+                    ),
             )
             .plugin(
                 "metadata",
-                InlinedPlugin::new().commands(&["metadata_get_game_versions", "metadata_get_loader_versions"]).default_permission(DefaultPermissionRule::AllowAllCommands)
+                InlinedPlugin::new()
+                    .commands(&[
+                        "metadata_get_game_versions",
+                        "metadata_get_loader_versions",
+                    ])
+                    .default_permission(
+                        DefaultPermissionRule::AllowAllCommands,
+                    ),
             )
             .plugin(
                 "mr-auth",
-                InlinedPlugin::new().commands(&["authenticate_begin_flow", "authenticate_await_completion", "cancel_flow", "login_pass", "login_2fa", "create_account", "refresh", "logout", "get"]).default_permission(DefaultPermissionRule::AllowAllCommands)
+                InlinedPlugin::new()
+                    .commands(&[
+                        "authenticate_begin_flow",
+                        "authenticate_await_completion",
+                        "cancel_flow",
+                        "login_pass",
+                        "login_2fa",
+                        "create_account",
+                        "refresh",
+                        "logout",
+                        "get",
+                    ])
+                    .default_permission(
+                        DefaultPermissionRule::AllowAllCommands,
+                    ),
             )
             .plugin(
                 "pack",
-                InlinedPlugin::new().commands(&["pack_install", "pack_get_profile_from_pack"]).default_permission(DefaultPermissionRule::AllowAllCommands)
+                InlinedPlugin::new()
+                    .commands(&["pack_install", "pack_get_profile_from_pack"])
+                    .default_permission(
+                        DefaultPermissionRule::AllowAllCommands,
+                    ),
             )
             .plugin(
                 "process",
-                InlinedPlugin::new().commands(&["process_get_all", "process_get_by_profile_path", "process_kill", "process_wait_for"]).default_permission(DefaultPermissionRule::AllowAllCommands)
+                InlinedPlugin::new()
+                    .commands(&[
+                        "process_get_all",
+                        "process_get_by_profile_path",
+                        "process_kill",
+                        "process_wait_for",
+                    ])
+                    .default_permission(
+                        DefaultPermissionRule::AllowAllCommands,
+                    ),
             )
             .plugin(
                 "profile",
-                InlinedPlugin::new().commands(&["profile_remove", "profile_get", "profile_get_optimal_jre_key", "profile_get_full_path", "profile_get_mod_full_path", "profile_list", "profile_check_installed", "profile_install", "profile_update_all", "profile_update_project", "profile_add_project_from_version", "profile_add_project_from_path", "profile_toggle_disable_project", "profile_remove_project", "profile_update_managed_modrinth_version", "profile_repair_managed_modrinth", "profile_run", "profile_run_credentials", "profile_kill", "profile_edit", "profile_edit_icon", "profile_export_mrpack", "profile_get_pack_export_candidates", "profile_get_many", "profile_get_projects"]).default_permission(DefaultPermissionRule::AllowAllCommands)
+                InlinedPlugin::new()
+                    .commands(&[
+                        "profile_remove",
+                        "profile_get",
+                        "profile_get_optimal_jre_key",
+                        "profile_get_full_path",
+                        "profile_get_mod_full_path",
+                        "profile_list",
+                        "profile_check_installed",
+                        "profile_install",
+                        "profile_update_all",
+                        "profile_update_project",
+                        "profile_add_project_from_version",
+                        "profile_add_project_from_path",
+                        "profile_toggle_disable_project",
+                        "profile_remove_project",
+                        "profile_update_managed_modrinth_version",
+                        "profile_repair_managed_modrinth",
+                        "profile_run",
+                        "profile_run_credentials",
+                        "profile_kill",
+                        "profile_edit",
+                        "profile_edit_icon",
+                        "profile_export_mrpack",
+                        "profile_get_pack_export_candidates",
+                        "profile_get_many",
+                        "profile_get_projects",
+                    ])
+                    .default_permission(
+                        DefaultPermissionRule::AllowAllCommands,
+                    ),
             )
             .plugin(
                 "profile-create",
-                InlinedPlugin::new().commands(&["profile_create", "profile_duplicate"]).default_permission(DefaultPermissionRule::AllowAllCommands)
+                InlinedPlugin::new()
+                    .commands(&["profile_create", "profile_duplicate"])
+                    .default_permission(
+                        DefaultPermissionRule::AllowAllCommands,
+                    ),
             )
             .plugin(
                 "settings",
-                InlinedPlugin::new().commands(&["settings_get", "settings_set", "settings_change_config_dir", "settings_is_dir_writeable"]).default_permission(DefaultPermissionRule::AllowAllCommands)
+                InlinedPlugin::new()
+                    .commands(&[
+                        "settings_get",
+                        "settings_set",
+                        "settings_change_config_dir",
+                        "settings_is_dir_writeable",
+                    ])
+                    .default_permission(
+                        DefaultPermissionRule::AllowAllCommands,
+                    ),
             )
             .plugin(
                 "tags",
-                InlinedPlugin::new().commands(&["tags_get_categories", "tags_get_report_types", "tags_get_loaders", "tags_get_game_versions", "tags_get_donation_platforms", "tags_get_tag_bundle"]).default_permission(DefaultPermissionRule::AllowAllCommands)
+                InlinedPlugin::new()
+                    .commands(&[
+                        "tags_get_categories",
+                        "tags_get_report_types",
+                        "tags_get_loaders",
+                        "tags_get_game_versions",
+                        "tags_get_donation_platforms",
+                        "tags_get_tag_bundle",
+                    ])
+                    .default_permission(
+                        DefaultPermissionRule::AllowAllCommands,
+                    ),
             )
             .plugin(
                 "utils",
-                InlinedPlugin::new().commands(&["get_os", "should_disable_mouseover", "show_in_folder", "show_launcher_logs_folder", "progress_bars_list", "safety_check_safe_loading_bars", "get_opening_command", "await_sync", "is_offline", "refresh_offline"]).default_permission(DefaultPermissionRule::AllowAllCommands)
+                InlinedPlugin::new()
+                    .commands(&[
+                        "get_os",
+                        "should_disable_mouseover",
+                        "show_in_folder",
+                        "show_launcher_logs_folder",
+                        "progress_bars_list",
+                        "safety_check_safe_loading_bars",
+                        "get_opening_command",
+                        "await_sync",
+                        "is_offline",
+                        "refresh_offline",
+                    ])
+                    .default_permission(
+                        DefaultPermissionRule::AllowAllCommands,
+                    ),
             )
             .plugin(
                 "cache",
-                InlinedPlugin::new().commands(&["get_project", "get_project_many", "get_version", "get_version_many", "get_user", "get_user_many", "get_team", "get_team_many", "get_organization", "get_organization_many", "get_search_results", "get_search_results_many", "purge_cache_bytes"]).default_permission(DefaultPermissionRule::AllowAllCommands)
-            )
+                InlinedPlugin::new()
+                    .commands(&[
+                        "get_project",
+                        "get_project_many",
+                        "get_version",
+                        "get_version_many",
+                        "get_user",
+                        "get_user_many",
+                        "get_team",
+                        "get_team_many",
+                        "get_organization",
+                        "get_organization_many",
+                        "get_search_results",
+                        "get_search_results_many",
+                        "purge_cache_bytes",
+                    ])
+                    .default_permission(
+                        DefaultPermissionRule::AllowAllCommands,
+                    ),
+            ),
     )
-        .expect("Failed to run tauri-build");
+    .expect("Failed to run tauri-build");
 }
diff --git a/apps/app/capabilities/plugins.json b/apps/app/capabilities/plugins.json
index 4dc2f1d1e..a3aff7bfd 100644
--- a/apps/app/capabilities/plugins.json
+++ b/apps/app/capabilities/plugins.json
@@ -18,6 +18,9 @@
     "os:allow-locale",
     "os:allow-hostname",
     "deep-link:default",
+    "window-state:default",
+    "window-state:allow-restore-state",
+    "window-state:allow-save-window-state",
 
     "auth:default",
     "import:default",
diff --git a/apps/app/gen/schemas/capabilities.json b/apps/app/gen/schemas/capabilities.json
index 956c571f4..b66f4d93b 100644
--- a/apps/app/gen/schemas/capabilities.json
+++ b/apps/app/gen/schemas/capabilities.json
@@ -1 +1 @@
-{"core":{"identifier":"core","description":"","local":true,"windows":["main"],"permissions":["core:default","core:path:default","core:event:default","core:window:default","core:app:default","core:resources:default","core:menu:default","core:tray:default","core:window:allow-create","core:window:allow-maximize","core:window:allow-unmaximize","core:window:allow-minimize","core:window:allow-unminimize","core:window:allow-show","core:window:allow-hide","core:window:allow-close","core:window:allow-set-decorations","core:window:allow-start-dragging","core:webview:allow-set-webview-zoom"]},"plugins":{"identifier":"plugins","description":"","local":true,"windows":["main"],"permissions":["dialog:allow-open","dialog:allow-confirm","shell:allow-open","os:allow-platform","os:allow-version","os:allow-os-type","os:allow-family","os:allow-arch","os:allow-exe-extension","os:allow-locale","os:allow-hostname","deep-link:default","auth:default","import:default","jre:default","logs:default","metadata:default","mr-auth:default","profile-create:default","pack:default","process:default","profile:default","cache:default","settings:default","tags:default","utils:default"]}}
\ No newline at end of file
+{"core":{"identifier":"core","description":"","local":true,"windows":["main"],"permissions":["core:default","core:path:default","core:event:default","core:window:default","core:app:default","core:resources:default","core:menu:default","core:tray:default","core:window:allow-create","core:window:allow-maximize","core:window:allow-unmaximize","core:window:allow-minimize","core:window:allow-unminimize","core:window:allow-show","core:window:allow-hide","core:window:allow-close","core:window:allow-set-decorations","core:window:allow-start-dragging","core:webview:allow-set-webview-zoom"]},"plugins":{"identifier":"plugins","description":"","local":true,"windows":["main"],"permissions":["dialog:allow-open","dialog:allow-confirm","shell:allow-open","os:allow-platform","os:allow-version","os:allow-os-type","os:allow-family","os:allow-arch","os:allow-exe-extension","os:allow-locale","os:allow-hostname","deep-link:default","window-state:default","window-state:allow-restore-state","window-state:allow-save-window-state","auth:default","import:default","jre:default","logs:default","metadata:default","mr-auth:default","profile-create:default","pack:default","process:default","profile:default","cache:default","settings:default","tags:default","utils:default"]}}
\ No newline at end of file
diff --git a/apps/app/src/api/auth.rs b/apps/app/src/api/auth.rs
index e0865f866..b084feb4d 100644
--- a/apps/app/src/api/auth.rs
+++ b/apps/app/src/api/auth.rs
@@ -19,7 +19,9 @@ pub fn init<R: Runtime>() -> TauriPlugin<R> {
 /// Authenticate a user with Hydra - part 1
 /// This begins the authentication flow quasi-synchronously, returning a URL to visit (that the user will sign in at)
 #[tauri::command]
-pub async fn login<R: Runtime>(app: tauri::AppHandle<R>) -> Result<Option<Credentials>> {
+pub async fn login<R: Runtime>(
+    app: tauri::AppHandle<R>,
+) -> Result<Option<Credentials>> {
     let flow = minecraft_auth::begin_login().await?;
 
     let start = Utc::now();
diff --git a/apps/app/src/main.rs b/apps/app/src/main.rs
index ad7d3f1f5..cc3f801dc 100644
--- a/apps/app/src/main.rs
+++ b/apps/app/src/main.rs
@@ -3,7 +3,7 @@
     windows_subsystem = "windows"
 )]
 
-use tauri::{Emitter, EventTarget, Listener, Manager};
+use tauri::{Listener, Manager};
 use theseus::prelude::*;
 
 mod api;
@@ -52,12 +52,6 @@ async fn toggle_decorations(b: bool, window: tauri::Window) -> api::Result<()> {
     Ok(())
 }
 
-#[derive(Clone, serde::Serialize)]
-struct Payload {
-    args: Vec<String>,
-    cwd: String,
-}
-
 // if Tauri app is called with arguments, then those arguments will be treated as commands
 // ie: deep links or filepaths for .mrpacks
 fn main() {
@@ -143,7 +137,7 @@ fn main() {
 
             if let Some(window) = app.get_webview_window("main") {
                 // Hide window to prevent white flash on startup
-                // TODO: window.hide().unwrap();
+                window.hide().unwrap();
 
                 #[cfg(not(target_os = "linux"))]
                 {
diff --git a/packages/app-lib/src/event/emit.rs b/packages/app-lib/src/event/emit.rs
index cf54eb613..4be35d513 100644
--- a/packages/app-lib/src/event/emit.rs
+++ b/packages/app-lib/src/event/emit.rs
@@ -3,13 +3,13 @@ use crate::event::{
     CommandPayload, EventError, LoadingBar, LoadingBarType, ProcessPayloadType,
     ProfilePayloadType,
 };
-use futures::prelude::*;
-#[cfg(feature = "tauri")]
-use tauri::Emitter;
 #[cfg(feature = "tauri")]
 use crate::event::{
     LoadingPayload, ProcessPayload, ProfilePayload, WarningPayload,
 };
+use futures::prelude::*;
+#[cfg(feature = "tauri")]
+use tauri::Emitter;
 use uuid::Uuid;
 
 #[cfg(feature = "cli")]
diff --git a/packages/app-lib/src/event/mod.rs b/packages/app-lib/src/event/mod.rs
index 79cd235ae..cee498417 100644
--- a/packages/app-lib/src/event/mod.rs
+++ b/packages/app-lib/src/event/mod.rs
@@ -64,7 +64,8 @@ impl EventState {
     }
 
     #[cfg(feature = "tauri")]
-    pub async fn get_main_window() -> crate::Result<Option<tauri::WebviewWindow>> {
+    pub async fn get_main_window() -> crate::Result<Option<tauri::WebviewWindow>>
+    {
         use tauri::Manager;
         let value = Self::get().await?;
         Ok(value.app.get_webview_window("main"))
diff --git a/packages/ui/src/components/base/Card.vue b/packages/ui/src/components/base/Card.vue
index db7c5fb9f..32e8d4d7a 100644
--- a/packages/ui/src/components/base/Card.vue
+++ b/packages/ui/src/components/base/Card.vue
@@ -3,18 +3,20 @@ import { DropdownIcon } from '@modrinth/assets'
 import { reactive } from 'vue'
 import Button from './Button.vue'
 
-const props = withDefaults(
-  defineProps<{
-    collapsible: boolean
-    defaultCollapsed: boolean
-    noAutoBody: boolean
-  }>(),
-  {
-    collapsible: false,
-    defaultCollapsed: false,
-    noAutoBody: false,
+const props = defineProps({
+  collapsible: {
+    type: Boolean,
+    default: false,
   },
-)
+  defaultCollapsed: {
+    type: Boolean,
+    default: false,
+  },
+  noAutoBody: {
+    type: Boolean,
+    default: false,
+  },
+})
 
 const state = reactive({
   collapsed: props.defaultCollapsed,