From eafd9eed5884d36cd6e9339ea5329793843bd004 Mon Sep 17 00:00:00 2001 From: Pauline Date: Sun, 15 Sep 2024 06:03:48 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A8=20chore:=20reformat=20imports?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Pauline --- Cargo.lock | 45 +++++++++---------- .../src/ui/components/ErrorBoundary.tsx | 2 +- .../src/ui/components/ScrollableContainer.tsx | 2 +- apps/frontend/src/ui/components/Sidebar.tsx | 2 +- .../src/ui/components/WindowFrame.tsx | 2 +- .../src/ui/components/base/Button.tsx | 2 +- .../src/ui/components/base/TextField.tsx | 2 +- .../ui/components/content/FormattedLog.tsx | 4 +- .../src/ui/components/content/Markdown.tsx | 2 +- .../ui/components/content/SearchResults.tsx | 4 +- .../src/ui/components/game/ClusterCover.tsx | 2 +- .../src/ui/components/game/LoaderIcon.tsx | 2 +- .../src/ui/components/game/PlayerHead.tsx | 2 +- .../components/overlay/FullscreenOverlay.tsx | 2 +- .../src/ui/components/overlay/Modal.tsx | 8 ++-- .../src/ui/components/overlay/Popup.tsx | 6 +-- .../overlay/account/AccountsPopup.tsx | 2 +- .../overlay/account/AddAccountModal.tsx | 2 +- .../overlay/cluster/ClusterCreationModal.tsx | 2 +- .../overlay/cluster/ClusterGameSetup.tsx | 2 +- .../notifications/NotificationComponent.tsx | 2 +- apps/frontend/src/ui/hooks/useBrowser.tsx | 4 +- apps/frontend/src/ui/hooks/useCluster.tsx | 2 +- apps/frontend/src/ui/hooks/useCommand.ts | 2 +- .../frontend/src/ui/hooks/usePreventLeave.tsx | 2 +- apps/frontend/src/ui/pages/App.tsx | 2 +- apps/frontend/src/ui/pages/Home.tsx | 4 +- .../src/ui/pages/browser/BrowserMain.tsx | 2 +- .../src/ui/pages/browser/BrowserPackage.tsx | 2 +- .../src/ui/pages/cluster/ClusterGame.tsx | 4 +- .../src/ui/pages/cluster/ClusterMods.tsx | 2 +- .../src/ui/pages/cluster/ClusterOverview.tsx | 2 +- .../src/ui/pages/cluster/ClusterRoot.tsx | 2 +- .../src/ui/pages/cluster/ClusterSettings.tsx | 2 +- .../src/ui/pages/onboarding/Onboarding.tsx | 2 +- .../pages/settings/game/SettingsMinecraft.tsx | 2 +- apps/frontend/src/utils/index.ts | 2 +- apps/frontend/vite.config.ts | 4 +- packages/client/src/hooks/usePlausible.ts | 6 +-- .../src/library/createPersistedMutable.ts | 2 +- packages/client/src/library/useObserver.ts | 2 +- packages/scripts/utils/patch.ts | 2 +- 42 files changed, 76 insertions(+), 77 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index de85933f..55f281d4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -149,9 +149,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.87" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10f00e1f6e58a40e807377c75c6a7f97bf9044fab57816f2414e6f5f4499d7b8" +checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" [[package]] name = "arbitrary" @@ -164,9 +164,9 @@ dependencies = [ [[package]] name = "arboard" -version = "3.4.0" +version = "3.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb4009533e8ff8f1450a5bcbc30f4242a1d34442221f72314bea1f5dc9c7f89" +checksum = "df099ccb16cd014ff054ac1bf392c67feeef57164b05c42f037cd40f5d4357f4" dependencies = [ "clipboard-win", "core-graphics 0.23.2", @@ -182,9 +182,9 @@ dependencies = [ [[package]] name = "arrayref" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a" +checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb" [[package]] name = "arrayvec" @@ -315,9 +315,9 @@ dependencies = [ [[package]] name = "async-process" -version = "2.2.4" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8a07789659a4d385b79b18b9127fc27e1a59e1e89117c78c5ea3b806f016374" +checksum = "63255f1dc2381611000436537bbedfe83183faa303a5a0edaf191edef06526bb" dependencies = [ "async-channel", "async-io", @@ -330,7 +330,6 @@ dependencies = [ "futures-lite", "rustix", "tracing", - "windows-sys 0.59.0", ] [[package]] @@ -3511,7 +3510,7 @@ checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ "bitflags 2.6.0", "libc", - "redox_syscall 0.5.3", + "redox_syscall 0.5.4", ] [[package]] @@ -4341,9 +4340,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.19.0" +version = "1.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "33ea5043e58958ee56f3e15a90aee535795cd7dfd319846288d93c5b57d85cbe" [[package]] name = "onelauncher" @@ -4741,7 +4740,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.5.3", + "redox_syscall 0.5.4", "smallvec", "windows-targets 0.52.6", ] @@ -5692,9 +5691,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" +checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853" dependencies = [ "bitflags 2.6.0", ] @@ -6011,9 +6010,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.36" +version = "0.38.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f55e80d50763938498dd5ebb18647174e0c76dc38c5505294bb224624f30f36" +checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" dependencies = [ "bitflags 2.6.0", "errno", @@ -6621,7 +6620,7 @@ dependencies = [ "objc2-foundation", "objc2-quartz-core", "raw-window-handle", - "redox_syscall 0.5.3", + "redox_syscall 0.5.4", "wasm-bindgen", "web-sys", "windows-sys 0.59.0", @@ -8194,9 +8193,9 @@ checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" [[package]] name = "unicode-normalization" @@ -8209,9 +8208,9 @@ dependencies = [ [[package]] name = "unicode-segmentation" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" [[package]] name = "unicode-width" @@ -8645,7 +8644,7 @@ version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "372d5b87f58ec45c384ba03563b03544dc5fadc3983e434b286913f5b4a9bb6d" dependencies = [ - "redox_syscall 0.5.3", + "redox_syscall 0.5.4", "wasite", "web-sys", ] diff --git a/apps/frontend/src/ui/components/ErrorBoundary.tsx b/apps/frontend/src/ui/components/ErrorBoundary.tsx index dfa2c74e..19161654 100644 --- a/apps/frontend/src/ui/components/ErrorBoundary.tsx +++ b/apps/frontend/src/ui/components/ErrorBoundary.tsx @@ -1,5 +1,5 @@ -import { ErrorBoundary as Boundary, Match, Switch } from 'solid-js'; import type { ParentProps } from 'solid-js'; +import { ErrorBoundary as Boundary, Match, Switch } from 'solid-js'; function ErrorBoundary(props: ParentProps) { return ( diff --git a/apps/frontend/src/ui/components/ScrollableContainer.tsx b/apps/frontend/src/ui/components/ScrollableContainer.tsx index 100a8d95..e2d2e36b 100644 --- a/apps/frontend/src/ui/components/ScrollableContainer.tsx +++ b/apps/frontend/src/ui/components/ScrollableContainer.tsx @@ -1,5 +1,5 @@ -import { OverlayScrollbarsComponent } from 'overlayscrollbars-solid'; import type { ParentProps } from 'solid-js'; +import { OverlayScrollbarsComponent } from 'overlayscrollbars-solid'; function ScrollableContainer(props: ParentProps) { return ( diff --git a/apps/frontend/src/ui/components/Sidebar.tsx b/apps/frontend/src/ui/components/Sidebar.tsx index 2db912df..edbc6d66 100644 --- a/apps/frontend/src/ui/components/Sidebar.tsx +++ b/apps/frontend/src/ui/components/Sidebar.tsx @@ -1,6 +1,6 @@ +import type { JSX, ParentProps } from 'solid-js'; import { useLocation, useNavigate } from '@solidjs/router'; import { createEffect, For, splitProps } from 'solid-js'; -import type { JSX, ParentProps } from 'solid-js'; type SidebarProps = ParentProps & { base: string; diff --git a/apps/frontend/src/ui/components/WindowFrame.tsx b/apps/frontend/src/ui/components/WindowFrame.tsx index 15d8bbfd..695af462 100644 --- a/apps/frontend/src/ui/components/WindowFrame.tsx +++ b/apps/frontend/src/ui/components/WindowFrame.tsx @@ -1,8 +1,8 @@ +import type { JSX } from 'solid-js'; import { Window } from '@tauri-apps/api/window'; import { ChevronLeftIcon, Maximize02Icon, MinusIcon, XCloseIcon } from '@untitled-theme/icons-solid'; import useSettings from '~ui/hooks/useSettings'; import { onMount } from 'solid-js'; -import type { JSX } from 'solid-js'; import Button from './base/Button'; import Modal, { createModal } from './overlay/Modal'; diff --git a/apps/frontend/src/ui/components/base/Button.tsx b/apps/frontend/src/ui/components/base/Button.tsx index 9aef52aa..62a378a5 100644 --- a/apps/frontend/src/ui/components/base/Button.tsx +++ b/apps/frontend/src/ui/components/base/Button.tsx @@ -1,5 +1,5 @@ -import { createEffect, createSignal, mergeProps, on, splitProps, untrack } from 'solid-js'; import type { Accessor, JSX, ParentProps } from 'solid-js'; +import { createEffect, createSignal, mergeProps, on, splitProps, untrack } from 'solid-js'; import styles from './Button.module.scss'; type ButtonProps = JSX.ButtonHTMLAttributes & ParentProps & { diff --git a/apps/frontend/src/ui/components/base/TextField.tsx b/apps/frontend/src/ui/components/base/TextField.tsx index 1b4fc032..6f702295 100644 --- a/apps/frontend/src/ui/components/base/TextField.tsx +++ b/apps/frontend/src/ui/components/base/TextField.tsx @@ -1,5 +1,5 @@ -import { createSignal, createUniqueId, onMount, splitProps } from 'solid-js'; import type { JSX } from 'solid-js'; +import { createSignal, createUniqueId, onMount, splitProps } from 'solid-js'; import styles from './TextField.module.scss'; type TextFieldProps = { diff --git a/apps/frontend/src/ui/components/content/FormattedLog.tsx b/apps/frontend/src/ui/components/content/FormattedLog.tsx index eb2fa428..1333dcb5 100644 --- a/apps/frontend/src/ui/components/content/FormattedLog.tsx +++ b/apps/frontend/src/ui/components/content/FormattedLog.tsx @@ -1,8 +1,8 @@ +import type { Ref } from '@solid-primitives/refs'; +import type { OnUpdatedEventListenerArgs, OverlayScrollbars } from 'overlayscrollbars'; import { AlignBottom01Icon } from '@untitled-theme/icons-solid'; import { OverlayScrollbarsComponent, type OverlayScrollbarsComponentRef } from 'overlayscrollbars-solid'; import { createEffect, createMemo, createSignal, Index, Show, untrack } from 'solid-js'; -import type { Ref } from '@solid-primitives/refs'; -import type { OnUpdatedEventListenerArgs, OverlayScrollbars } from 'overlayscrollbars'; import Button from '../base/Button'; import styles from './FormattedLog.module.scss'; diff --git a/apps/frontend/src/ui/components/content/Markdown.tsx b/apps/frontend/src/ui/components/content/Markdown.tsx index 8b06c2af..1176ef45 100644 --- a/apps/frontend/src/ui/components/content/Markdown.tsx +++ b/apps/frontend/src/ui/components/content/Markdown.tsx @@ -1,6 +1,6 @@ +import type { ParentProps } from 'solid-js'; import { renderHighlightedString } from '@onelauncher/client'; import usePromptOpener from '~ui/hooks/usePromptOpener'; -import type { ParentProps } from 'solid-js'; import styles from './Markdown.module.scss'; export type MarkdownProps = ParentProps & { diff --git a/apps/frontend/src/ui/components/content/SearchResults.tsx b/apps/frontend/src/ui/components/content/SearchResults.tsx index da7317c8..c3b0422f 100644 --- a/apps/frontend/src/ui/components/content/SearchResults.tsx +++ b/apps/frontend/src/ui/components/content/SearchResults.tsx @@ -1,10 +1,10 @@ +import type { Providers, SearchResult } from '@onelauncher/client/bindings'; +import type { JSX } from 'solid-js'; import { ChevronDownIcon, Download01Icon, HeartIcon } from '@untitled-theme/icons-solid'; import useBrowser from '~ui/hooks/useBrowser'; import useSettings from '~ui/hooks/useSettings'; import { abbreviateNumber } from '~utils'; import { createSignal, For, Match, Show, Switch } from 'solid-js'; -import type { Providers, SearchResult } from '@onelauncher/client/bindings'; -import type { JSX } from 'solid-js'; import Button from '../base/Button'; interface SearchResultsContainerProps { diff --git a/apps/frontend/src/ui/components/game/ClusterCover.tsx b/apps/frontend/src/ui/components/game/ClusterCover.tsx index d83d955a..b0464be5 100644 --- a/apps/frontend/src/ui/components/game/ClusterCover.tsx +++ b/apps/frontend/src/ui/components/game/ClusterCover.tsx @@ -1,7 +1,7 @@ +import type { Cluster } from '@onelauncher/client/bindings'; import { convertFileSrc } from '@tauri-apps/api/core'; import defaultCover from '~assets/images/default_instance_cover.jpg'; import { type JSX, type ParentProps, Show, splitProps } from 'solid-js'; -import type { Cluster } from '@onelauncher/client/bindings'; import styles from './ClusterCover.module.scss'; type ClusterCoverProps = JSX.HTMLAttributes & { diff --git a/apps/frontend/src/ui/components/game/LoaderIcon.tsx b/apps/frontend/src/ui/components/game/LoaderIcon.tsx index 9b598583..105ce51e 100644 --- a/apps/frontend/src/ui/components/game/LoaderIcon.tsx +++ b/apps/frontend/src/ui/components/game/LoaderIcon.tsx @@ -1,9 +1,9 @@ +import type { Cluster, Loader } from '@onelauncher/client/bindings'; import FabricImage from '~assets/logos/fabric.png'; import ForgeImage from '~assets/logos/forge.png'; import QuiltImage from '~assets/logos/quilt.png'; import VanillaImage from '~assets/logos/vanilla.png'; import { type JSX, splitProps } from 'solid-js'; -import type { Cluster, Loader } from '@onelauncher/client/bindings'; export function getLoaderLogoSrc(loader: Cluster | Loader): string { const loaderName = (typeof loader === 'string' ? loader : loader.meta.loader)?.toLowerCase() as Loader; diff --git a/apps/frontend/src/ui/components/game/PlayerHead.tsx b/apps/frontend/src/ui/components/game/PlayerHead.tsx index 81a4c6c0..3e07b064 100644 --- a/apps/frontend/src/ui/components/game/PlayerHead.tsx +++ b/apps/frontend/src/ui/components/game/PlayerHead.tsx @@ -1,5 +1,5 @@ -import { createEffect, createSignal, on, Show, splitProps } from 'solid-js'; import type { JSX } from 'solid-js'; +import { createEffect, createSignal, on, Show, splitProps } from 'solid-js'; import steveSrc from '../../../assets/images/steve.png'; type PlayerHeadProps = JSX.IntrinsicElements['img'] & { diff --git a/apps/frontend/src/ui/components/overlay/FullscreenOverlay.tsx b/apps/frontend/src/ui/components/overlay/FullscreenOverlay.tsx index 5471030b..fe565a9c 100644 --- a/apps/frontend/src/ui/components/overlay/FullscreenOverlay.tsx +++ b/apps/frontend/src/ui/components/overlay/FullscreenOverlay.tsx @@ -1,9 +1,9 @@ -import { Portal } from 'solid-js/web'; import type { Accessor, ParentProps, Setter, } from 'solid-js'; +import { Portal } from 'solid-js/web'; export type FullscreenOverlayProps = { visible: Accessor; diff --git a/apps/frontend/src/ui/components/overlay/Modal.tsx b/apps/frontend/src/ui/components/overlay/Modal.tsx index eead5135..9dfe7b69 100644 --- a/apps/frontend/src/ui/components/overlay/Modal.tsx +++ b/apps/frontend/src/ui/components/overlay/Modal.tsx @@ -1,7 +1,3 @@ -import { mergeRefs } from '@solid-primitives/refs'; -import { createContext, createSignal, For, onCleanup, onMount, Show, splitProps, useContext } from 'solid-js'; -import { createStore } from 'solid-js/store'; -import { Transition } from 'solid-transition-group'; import type { MakeOptional } from '@onelauncher/client'; import type { Context, @@ -9,6 +5,10 @@ import type { ParentProps, Ref, } from 'solid-js'; +import { mergeRefs } from '@solid-primitives/refs'; +import { createContext, createSignal, For, onCleanup, onMount, Show, splitProps, useContext } from 'solid-js'; +import { createStore } from 'solid-js/store'; +import { Transition } from 'solid-transition-group'; import Button from '../base/Button'; import FullscreenOverlay from './FullscreenOverlay'; diff --git a/apps/frontend/src/ui/components/overlay/Popup.tsx b/apps/frontend/src/ui/components/overlay/Popup.tsx index b97d8d68..02bb08e4 100644 --- a/apps/frontend/src/ui/components/overlay/Popup.tsx +++ b/apps/frontend/src/ui/components/overlay/Popup.tsx @@ -1,12 +1,12 @@ -import { mergeRefs } from '@solid-primitives/refs'; -import { createEffect } from 'solid-js'; -import { Portal } from 'solid-js/web'; import type { Accessor, JSX, ParentProps, Setter, } from 'solid-js'; +import { mergeRefs } from '@solid-primitives/refs'; +import { createEffect } from 'solid-js'; +import { Portal } from 'solid-js/web'; export type PopupProps = Omit[0], 'children'> & ParentProps & { visible: Accessor; diff --git a/apps/frontend/src/ui/components/overlay/account/AccountsPopup.tsx b/apps/frontend/src/ui/components/overlay/account/AccountsPopup.tsx index 314d30ea..30323cec 100644 --- a/apps/frontend/src/ui/components/overlay/account/AccountsPopup.tsx +++ b/apps/frontend/src/ui/components/overlay/account/AccountsPopup.tsx @@ -1,7 +1,7 @@ +import type { MinecraftCredentials } from '@onelauncher/client/bindings'; import { useNavigate } from '@solidjs/router'; import { PlusIcon, Settings01Icon } from '@untitled-theme/icons-solid'; import { For, Show } from 'solid-js'; -import type { MinecraftCredentials } from '@onelauncher/client/bindings'; import Button from '../../base/Button'; import PlayerHead from '../../game/PlayerHead'; import Popup, { type PopupProps } from '../Popup'; diff --git a/apps/frontend/src/ui/components/overlay/account/AddAccountModal.tsx b/apps/frontend/src/ui/components/overlay/account/AddAccountModal.tsx index 451dfd84..a880827d 100644 --- a/apps/frontend/src/ui/components/overlay/account/AddAccountModal.tsx +++ b/apps/frontend/src/ui/components/overlay/account/AddAccountModal.tsx @@ -1,9 +1,9 @@ +import type { MinecraftCredentials } from '@onelauncher/client/bindings'; import { LinkExternal01Icon } from '@untitled-theme/icons-solid'; import { bridge } from '~imports'; import Button from '~ui/components/base/Button'; import useCommand, { tryResult } from '~ui/hooks/useCommand'; import { type Context, createContext, createSignal, Match, type ParentProps, type Resource, Switch, useContext } from 'solid-js'; -import type { MinecraftCredentials } from '@onelauncher/client/bindings'; import Modal, { createModal, type ModalProps } from '../Modal'; interface AccountControllerContextFunc { diff --git a/apps/frontend/src/ui/components/overlay/cluster/ClusterCreationModal.tsx b/apps/frontend/src/ui/components/overlay/cluster/ClusterCreationModal.tsx index d4dfe4fe..a45c232b 100644 --- a/apps/frontend/src/ui/components/overlay/cluster/ClusterCreationModal.tsx +++ b/apps/frontend/src/ui/components/overlay/cluster/ClusterCreationModal.tsx @@ -1,9 +1,9 @@ +import type { CreateCluster } from '@onelauncher/client/bindings'; import { ArrowRightIcon, Server01Icon } from '@untitled-theme/icons-solid'; import { bridge } from '~imports'; import Button from '~ui/components/base/Button'; import { type Accessor, type Context, createContext, createSignal, type JSX, type ParentProps, type Setter, Show, untrack, useContext } from 'solid-js'; import { createStore } from 'solid-js/store'; -import type { CreateCluster } from '@onelauncher/client/bindings'; import HeaderImage from '../../../../assets/images/header.png'; import { createModal } from '../Modal'; import ClusterGameSetup from './ClusterGameSetup'; diff --git a/apps/frontend/src/ui/components/overlay/cluster/ClusterGameSetup.tsx b/apps/frontend/src/ui/components/overlay/cluster/ClusterGameSetup.tsx index 078ec61c..3387b901 100644 --- a/apps/frontend/src/ui/components/overlay/cluster/ClusterGameSetup.tsx +++ b/apps/frontend/src/ui/components/overlay/cluster/ClusterGameSetup.tsx @@ -1,3 +1,4 @@ +import type { Loader, VersionType } from '@onelauncher/client/bindings'; import { TextInputIcon } from '@untitled-theme/icons-solid'; import { bridge } from '~imports'; import Checkbox from '~ui/components/base/Checkbox'; @@ -8,7 +9,6 @@ import LoaderIcon from '~ui/components/game/LoaderIcon'; import useCommand from '~ui/hooks/useCommand'; import { formatVersionRelease, LOADERS } from '~utils'; import { createEffect, createSignal, For, Index, type JSX, onMount, Show, splitProps, untrack } from 'solid-js'; -import type { Loader, VersionType } from '@onelauncher/client/bindings'; import { type ClusterStepProps, createClusterStep } from './ClusterCreationModal'; export default createClusterStep({ diff --git a/apps/frontend/src/ui/components/overlay/notifications/NotificationComponent.tsx b/apps/frontend/src/ui/components/overlay/notifications/NotificationComponent.tsx index 71294bc7..dad43ddd 100644 --- a/apps/frontend/src/ui/components/overlay/notifications/NotificationComponent.tsx +++ b/apps/frontend/src/ui/components/overlay/notifications/NotificationComponent.tsx @@ -1,7 +1,7 @@ +import type { IngressPayload, IngressType } from '@onelauncher/client/bindings'; import { PausableTimer } from '@onelauncher/client'; import { InfoCircleIcon } from '@untitled-theme/icons-solid'; import { type ComponentProps, createEffect, createSignal, type JSX, Match, Show, Switch } from 'solid-js'; -import type { IngressPayload, IngressType } from '@onelauncher/client/bindings'; type NotificationComponentProps = IngressPayload & { overlay: boolean; diff --git a/apps/frontend/src/ui/hooks/useBrowser.tsx b/apps/frontend/src/ui/hooks/useBrowser.tsx index 473ca0e5..5de57a25 100644 --- a/apps/frontend/src/ui/hooks/useBrowser.tsx +++ b/apps/frontend/src/ui/hooks/useBrowser.tsx @@ -1,3 +1,5 @@ +import type { Cluster, ManagedPackage, PackageType, Providers, ProviderSearchQuery, ProviderSearchResults } from '@onelauncher/client/bindings'; +import type { ModalProps } from '~ui/components/overlay/Modal'; import { useNavigate } from '@solidjs/router'; import { bridge } from '~imports'; import Button from '~ui/components/base/Button'; @@ -5,8 +7,6 @@ import Dropdown from '~ui/components/base/Dropdown'; import Modal, { createModal } from '~ui/components/overlay/Modal'; import BrowserPackage from '~ui/pages/browser/BrowserPackage'; import { type Accessor, type Context, createContext, createEffect, createSignal, For, on, onMount, type ParentProps, type Setter, Show, untrack, useContext } from 'solid-js'; -import type { Cluster, ManagedPackage, PackageType, Providers, ProviderSearchQuery, ProviderSearchResults } from '@onelauncher/client/bindings'; -import type { ModalProps } from '~ui/components/overlay/Modal'; import { useRecentCluster } from './useCluster'; import useCommand, { tryResult } from './useCommand'; diff --git a/apps/frontend/src/ui/hooks/useCluster.tsx b/apps/frontend/src/ui/hooks/useCluster.tsx index b39c98b5..95dcb9ec 100644 --- a/apps/frontend/src/ui/hooks/useCluster.tsx +++ b/apps/frontend/src/ui/hooks/useCluster.tsx @@ -1,9 +1,9 @@ +import type { Cluster } from '@onelauncher/client/bindings'; import { useNavigate } from '@solidjs/router'; import { bridge } from '~imports'; import Modal, { createModal } from '~ui/components/overlay/Modal'; import ClusterGame from '~ui/pages/cluster/ClusterGame'; import { type Accessor, type Context, createContext, createEffect, createSignal, type ParentProps, type ResourceReturn, Show, useContext } from 'solid-js'; -import type { Cluster } from '@onelauncher/client/bindings'; import useCommand, { tryResult } from './useCommand'; const ClusterContext = createContext() as Context>; diff --git a/apps/frontend/src/ui/hooks/useCommand.ts b/apps/frontend/src/ui/hooks/useCommand.ts index aa76f13b..8d4e047f 100644 --- a/apps/frontend/src/ui/hooks/useCommand.ts +++ b/apps/frontend/src/ui/hooks/useCommand.ts @@ -1,5 +1,5 @@ -import { createResource, type ResourceOptions, type ResourceReturn, type ResourceSource } from 'solid-js'; import type { Result } from '@onelauncher/client/bindings'; +import { createResource, type ResourceOptions, type ResourceReturn, type ResourceSource } from 'solid-js'; type Command = () => Promise>; diff --git a/apps/frontend/src/ui/hooks/usePreventLeave.tsx b/apps/frontend/src/ui/hooks/usePreventLeave.tsx index 4ea43342..c90f7dbe 100644 --- a/apps/frontend/src/ui/hooks/usePreventLeave.tsx +++ b/apps/frontend/src/ui/hooks/usePreventLeave.tsx @@ -1,6 +1,6 @@ +import type { BeforeLeaveEventArgs } from '@solidjs/router'; import { useBeforeLeave } from '@solidjs/router'; import { createSignal } from 'solid-js'; -import type { BeforeLeaveEventArgs } from '@solidjs/router'; interface PreventLeaveContext { continue: () => void; diff --git a/apps/frontend/src/ui/pages/App.tsx b/apps/frontend/src/ui/pages/App.tsx index a38f8541..794609e9 100644 --- a/apps/frontend/src/ui/pages/App.tsx +++ b/apps/frontend/src/ui/pages/App.tsx @@ -1,7 +1,7 @@ +import type { ParentProps } from 'solid-js'; import { useNavigate } from '@solidjs/router'; import useSettings from '~ui/hooks/useSettings'; import { OverlayScrollbarsComponent } from 'overlayscrollbars-solid'; -import type { ParentProps } from 'solid-js'; import AnimatedRoutes from '../components/AnimatedRoutes'; import Navbar from '../components/Navbar'; diff --git a/apps/frontend/src/ui/pages/Home.tsx b/apps/frontend/src/ui/pages/Home.tsx index 96634ac2..d5b494b7 100644 --- a/apps/frontend/src/ui/pages/Home.tsx +++ b/apps/frontend/src/ui/pages/Home.tsx @@ -1,3 +1,4 @@ +import type { Cluster } from '@onelauncher/client/bindings'; import { useNavigate } from '@solidjs/router'; import { DotsVerticalIcon, @@ -12,9 +13,8 @@ import { useClusterCreator } from '~ui/components/overlay/cluster/ClusterCreatio import { useLaunchCluster, useRecentCluster } from '~ui/hooks/useCluster'; import useCommand from '~ui/hooks/useCommand'; import { formatAsDuration, upperFirst } from '~utils'; -import { For, onMount, Show } from 'solid-js'; -import type { Cluster } from '@onelauncher/client/bindings'; +import { For, onMount, Show } from 'solid-js'; import BannerBackground from '../../assets/images/header.png'; import Button from '../components/base/Button'; import TextField from '../components/base/TextField'; diff --git a/apps/frontend/src/ui/pages/browser/BrowserMain.tsx b/apps/frontend/src/ui/pages/browser/BrowserMain.tsx index 9b1f0885..cd601ad0 100644 --- a/apps/frontend/src/ui/pages/browser/BrowserMain.tsx +++ b/apps/frontend/src/ui/pages/browser/BrowserMain.tsx @@ -1,10 +1,10 @@ +import type { ManagedPackage } from '@onelauncher/client/bindings'; import { ChevronRightIcon } from '@untitled-theme/icons-solid'; import OneConfigLogo from '~assets/logos/oneconfig.svg?component-solid'; import Button from '~ui/components/base/Button'; import SearchResultsContainer from '~ui/components/content/SearchResults'; import useBrowser from '~ui/hooks/useBrowser'; import { onMount, Show } from 'solid-js'; -import type { ManagedPackage } from '@onelauncher/client/bindings'; import { BrowserContent } from './BrowserRoot'; function BrowserMain() { diff --git a/apps/frontend/src/ui/pages/browser/BrowserPackage.tsx b/apps/frontend/src/ui/pages/browser/BrowserPackage.tsx index a9b05310..163d7f69 100644 --- a/apps/frontend/src/ui/pages/browser/BrowserPackage.tsx +++ b/apps/frontend/src/ui/pages/browser/BrowserPackage.tsx @@ -1,3 +1,4 @@ +import type { Cluster, ManagedPackage, ManagedUser, ManagedVersion, Providers } from '@onelauncher/client/bindings'; import { A, type Params, Route, useSearchParams } from '@solidjs/router'; import { CalendarIcon, ChevronDownIcon, ClockRewindIcon, Download01Icon, File02Icon, HeartIcon, LinkExternal01Icon } from '@untitled-theme/icons-solid'; import SteveHead from '~assets/images/steve.png'; @@ -15,7 +16,6 @@ import usePagination from '~ui/hooks/usePagination'; import usePromptOpener from '~ui/hooks/usePromptOpener'; import { abbreviateNumber, formatAsRelative } from '~utils'; import { createContext, createEffect, createSignal, For, Match, on, type ParentProps, Show, Switch, useContext } from 'solid-js'; -import type { Cluster, ManagedPackage, ManagedUser, ManagedVersion, Providers } from '@onelauncher/client/bindings'; import { getLicenseUrl, getPackageUrl, upperFirst } from '../../../utils'; interface BrowserModParams extends Params { diff --git a/apps/frontend/src/ui/pages/cluster/ClusterGame.tsx b/apps/frontend/src/ui/pages/cluster/ClusterGame.tsx index 95836827..740df6ec 100644 --- a/apps/frontend/src/ui/pages/cluster/ClusterGame.tsx +++ b/apps/frontend/src/ui/pages/cluster/ClusterGame.tsx @@ -1,3 +1,5 @@ +import type { DetailedProcess } from '@onelauncher/client/bindings'; +import type { UnlistenFn } from '@tauri-apps/api/event'; import { type Params, useSearchParams } from '@solidjs/router'; import { SlashOctagonIcon } from '@untitled-theme/icons-solid'; import { bridge } from '~imports'; @@ -11,8 +13,6 @@ import useClusterContext from '~ui/hooks/useCluster'; import useCommand from '~ui/hooks/useCommand'; import { createSignal, onCleanup, onMount } from 'solid-js'; import { render } from 'solid-js/web'; -import type { DetailedProcess } from '@onelauncher/client/bindings'; -import type { UnlistenFn } from '@tauri-apps/api/event'; interface ClusterGameParams extends Params { process_uuid: string; diff --git a/apps/frontend/src/ui/pages/cluster/ClusterMods.tsx b/apps/frontend/src/ui/pages/cluster/ClusterMods.tsx index 9abb8489..ed268f6b 100644 --- a/apps/frontend/src/ui/pages/cluster/ClusterMods.tsx +++ b/apps/frontend/src/ui/pages/cluster/ClusterMods.tsx @@ -1,3 +1,4 @@ +import type { ManagedPackage, Package, Providers } from '@onelauncher/client/bindings'; import UFuzzy from '@leeoniya/ufuzzy'; import { FilterFunnel01Icon, SearchMdIcon, Trash03Icon } from '@untitled-theme/icons-solid'; import { bridge } from '~imports'; @@ -10,7 +11,6 @@ import useBrowser from '~ui/hooks/useBrowser'; import useClusterContext from '~ui/hooks/useCluster'; import useCommand, { tryResult } from '~ui/hooks/useCommand'; import { createEffect, createResource, createSignal, For, Match, Show, Switch } from 'solid-js'; -import type { ManagedPackage, Package, Providers } from '@onelauncher/client/bindings'; // TODO: Possibly optimise this as it has 2 cloned lists, and another containing only the names function ClusterMods() { diff --git a/apps/frontend/src/ui/pages/cluster/ClusterOverview.tsx b/apps/frontend/src/ui/pages/cluster/ClusterOverview.tsx index 75cbf5b5..c8b524f1 100644 --- a/apps/frontend/src/ui/pages/cluster/ClusterOverview.tsx +++ b/apps/frontend/src/ui/pages/cluster/ClusterOverview.tsx @@ -1,3 +1,4 @@ +import type { Cluster } from '@onelauncher/client/bindings'; import { useNavigate } from '@solidjs/router'; import * as dialog from '@tauri-apps/plugin-dialog'; import { open } from '@tauri-apps/plugin-shell'; @@ -14,7 +15,6 @@ import useSettings from '~ui/hooks/useSettings'; import { formatAsDuration, upperFirst } from '~utils'; import { join } from 'pathe'; import { type Accessor, createSignal, type Setter, Show, untrack } from 'solid-js'; -import type { Cluster } from '@onelauncher/client/bindings'; import Button from '../../components/base/Button'; import ClusterCover from '../../components/game/ClusterCover'; import LoaderIcon from '../../components/game/LoaderIcon'; diff --git a/apps/frontend/src/ui/pages/cluster/ClusterRoot.tsx b/apps/frontend/src/ui/pages/cluster/ClusterRoot.tsx index 2d3e56e9..56dd7156 100644 --- a/apps/frontend/src/ui/pages/cluster/ClusterRoot.tsx +++ b/apps/frontend/src/ui/pages/cluster/ClusterRoot.tsx @@ -1,3 +1,4 @@ +import type { UnlistenFn } from '@tauri-apps/api/event'; import { type Navigator, Route, useIsRouting, useSearchParams } from '@solidjs/router'; import { EyeIcon, File06Icon, Globe04Icon, Image03Icon, PackagePlusIcon, Settings04Icon } from '@untitled-theme/icons-solid'; import { bridge } from '~imports'; @@ -6,7 +7,6 @@ import useClusterContext, { ClusterProvider } from '~ui/hooks/useCluster'; import { tryResult } from '~ui/hooks/useCommand'; import { supportsMods } from '~utils'; import { createEffect, createResource, createSignal, onCleanup, onMount, type ParentProps, Show } from 'solid-js'; -import type { UnlistenFn } from '@tauri-apps/api/event'; import AnimatedRoutes from '../../components/AnimatedRoutes'; import ErrorBoundary from '../../components/ErrorBoundary'; import Sidebar from '../../components/Sidebar'; diff --git a/apps/frontend/src/ui/pages/cluster/ClusterSettings.tsx b/apps/frontend/src/ui/pages/cluster/ClusterSettings.tsx index 4a6efed8..a11ac04a 100644 --- a/apps/frontend/src/ui/pages/cluster/ClusterSettings.tsx +++ b/apps/frontend/src/ui/pages/cluster/ClusterSettings.tsx @@ -1,3 +1,4 @@ +import type { Cluster } from '@onelauncher/client/bindings'; import { useBeforeLeave } from '@solidjs/router'; import { bridge } from '~imports'; import ScrollableContainer from '~ui/components/ScrollableContainer'; @@ -6,7 +7,6 @@ import useClusterContext from '~ui/hooks/useCluster'; import { tryResult } from '~ui/hooks/useCommand'; import useSettings from '~ui/hooks/useSettings'; import { type Accessor, Show } from 'solid-js'; -import type { Cluster } from '@onelauncher/client/bindings'; import { createSetting, GameSettings, JvmSettings, LauncherSettings, ProcessSettings } from '../settings/game/SettingsMinecraft'; function ClusterSettings() { diff --git a/apps/frontend/src/ui/pages/onboarding/Onboarding.tsx b/apps/frontend/src/ui/pages/onboarding/Onboarding.tsx index 2e4f76d3..8e6f4215 100644 --- a/apps/frontend/src/ui/pages/onboarding/Onboarding.tsx +++ b/apps/frontend/src/ui/pages/onboarding/Onboarding.tsx @@ -1,3 +1,4 @@ +import type { ImportType } from '@onelauncher/client/bindings'; import { Route, useBeforeLeave, useLocation, useNavigate } from '@solidjs/router'; import { ChevronLeftIcon, ChevronRightIcon } from '@untitled-theme/icons-solid'; import AnimatedRoutes from '~ui/components/AnimatedRoutes'; @@ -5,7 +6,6 @@ import Button from '~ui/components/base/Button'; import useSettings from '~ui/hooks/useSettings'; import { setAsyncTimeout } from '~utils'; import { type Accessor, type Context, createContext, createEffect, createSignal, type JSX, on, type ParentProps, useContext } from 'solid-js'; -import type { ImportType } from '@onelauncher/client/bindings'; import OnboardingComplete from './OnboardingComplete'; import OnboardingImport from './OnboardingImport'; import OnboardingLanguage, { type Language, LanguagesList } from './OnboardingLanguage'; diff --git a/apps/frontend/src/ui/pages/settings/game/SettingsMinecraft.tsx b/apps/frontend/src/ui/pages/settings/game/SettingsMinecraft.tsx index bd0bce15..9104fcdc 100644 --- a/apps/frontend/src/ui/pages/settings/game/SettingsMinecraft.tsx +++ b/apps/frontend/src/ui/pages/settings/game/SettingsMinecraft.tsx @@ -1,3 +1,4 @@ +import type { JavaVersion, JavaVersions, Memory, Resolution } from '@onelauncher/client/bindings'; import { ActivityIcon, CpuChip01Icon, Database01Icon, EyeIcon, FilePlus02Icon, FileX02Icon, LayoutTopIcon, Maximize01Icon, ParagraphWrapIcon, VariableIcon, XIcon } from '@untitled-theme/icons-solid'; import Button from '~ui/components/base/Button'; import TextField from '~ui/components/base/TextField'; @@ -9,7 +10,6 @@ import Sidebar from '~ui/components/Sidebar'; import useSettings from '~ui/hooks/useSettings'; import { asEnvVariables } from '~utils'; import { type Accessor, createSignal, For, onMount, type Setter, Show, splitProps, untrack } from 'solid-js'; -import type { JavaVersion, JavaVersions, Memory, Resolution } from '@onelauncher/client/bindings'; function SettingsMinecraft() { return ( diff --git a/apps/frontend/src/utils/index.ts b/apps/frontend/src/utils/index.ts index 43caa421..e55f8368 100644 --- a/apps/frontend/src/utils/index.ts +++ b/apps/frontend/src/utils/index.ts @@ -1,6 +1,6 @@ +import type { Cluster, ImportType, License, Loader, PackageType, Providers, VersionType } from '@onelauncher/client/bindings'; import { DurationFormat } from '@formatjs/intl-durationformat'; import { open } from '@tauri-apps/plugin-shell'; -import type { Cluster, ImportType, License, Loader, PackageType, Providers, VersionType } from '@onelauncher/client/bindings'; export function setAsyncTimeout(ms: number): Promise; export function setAsyncTimeout(callback: () => any, ms: number): Promise; diff --git a/apps/frontend/vite.config.ts b/apps/frontend/vite.config.ts index dcb96cc4..630c407a 100644 --- a/apps/frontend/vite.config.ts +++ b/apps/frontend/vite.config.ts @@ -1,12 +1,12 @@ +import type { UserConfig } from 'vite'; import process from 'node:process'; import { sentryVitePlugin as sentry } from '@sentry/vite-plugin'; -import unocss from 'unocss/vite'; +import unocss from 'unocss/vite'; import { defineConfig, loadEnv } from 'vite'; import solid from 'vite-plugin-solid'; import solidSvg from 'vite-plugin-solid-svg'; import paths from 'vite-tsconfig-paths'; -import type { UserConfig } from 'vite'; export default defineConfig(async ({ mode }) => { process.env = { ...process.env, ...loadEnv(mode, process.cwd(), '') }; diff --git a/packages/client/src/hooks/usePlausible.ts b/packages/client/src/hooks/usePlausible.ts index deac699d..5e1d5876 100644 --- a/packages/client/src/hooks/usePlausible.ts +++ b/packages/client/src/hooks/usePlausible.ts @@ -1,12 +1,12 @@ +import type { PlausibleOptions as PlausibleTrackerOptions } from 'plausible-tracker'; +import type { ProgramInfo } from '../types'; + import Plausible from 'plausible-tracker'; import { createEffect, createSignal } from 'solid-js'; - import { createMutable } from 'solid-js/store'; -import type { PlausibleOptions as PlausibleTrackerOptions } from 'plausible-tracker'; import { PROGRAM_INFO } from '../bindings'; import { createPersistedMutable, useSolidStore } from '../library'; import { useDebugState } from './useDebug'; -import type { ProgramInfo } from '../types'; /** * Possible platform types for Plausible. diff --git a/packages/client/src/library/createPersistedMutable.ts b/packages/client/src/library/createPersistedMutable.ts index 85061d19..32ef0fa1 100644 --- a/packages/client/src/library/createPersistedMutable.ts +++ b/packages/client/src/library/createPersistedMutable.ts @@ -1,6 +1,6 @@ +import type { StoreNode } from 'solid-js/store'; import { trackDeep } from '@solid-primitives/deep'; import { createEffect, createRoot } from 'solid-js'; -import type { StoreNode } from 'solid-js/store'; export interface CreatePersistedMutableOpts { onSave?: (value: T) => T; diff --git a/packages/client/src/library/useObserver.ts b/packages/client/src/library/useObserver.ts index 7e06959e..0c5af77d 100644 --- a/packages/client/src/library/useObserver.ts +++ b/packages/client/src/library/useObserver.ts @@ -1,5 +1,5 @@ -import { createEffect, createReaction, createRoot, createSignal, onCleanup, runWithOwner } from 'solid-js'; import type { Owner } from 'solid-js'; +import { createEffect, createReaction, createRoot, createSignal, onCleanup, runWithOwner } from 'solid-js'; export interface Observer { dispose: () => void; diff --git a/packages/scripts/utils/patch.ts b/packages/scripts/utils/patch.ts index 6f4eb48a..fb65dad9 100644 --- a/packages/scripts/utils/patch.ts +++ b/packages/scripts/utils/patch.ts @@ -1,3 +1,4 @@ +import type { CheckedEnvironment } from '.'; import fs from 'node:fs/promises'; import { type } from 'node:os'; import process from 'node:process'; @@ -5,7 +6,6 @@ import { consola } from 'consola'; import { execa } from 'execa'; import { join, resolve } from 'pathe'; import semver from 'semver'; -import type { CheckedEnvironment } from '.'; export async function tauriUpdateKey(env: CheckedEnvironment): Promise { if (process.env.TAURI_SIGNING_PRIVATE_KEY)