diff --git a/frontend/src/lib/components/ui/alert-dialog/index.ts b/frontend/src/lib/components/ui/alert-dialog/index.ts index eab1331..4450c64 100644 --- a/frontend/src/lib/components/ui/alert-dialog/index.ts +++ b/frontend/src/lib/components/ui/alert-dialog/index.ts @@ -1,40 +1,27 @@ import { AlertDialog as AlertDialogPrimitive } from 'bits-ui'; -import Title from './alert-dialog-title.svelte'; import Action from './alert-dialog-action.svelte'; import Cancel from './alert-dialog-cancel.svelte'; -import Portal from './alert-dialog-portal.svelte'; +import Content from './alert-dialog-content.svelte'; +import Description from './alert-dialog-description.svelte'; import Footer from './alert-dialog-footer.svelte'; import Header from './alert-dialog-header.svelte'; import Overlay from './alert-dialog-overlay.svelte'; -import Content from './alert-dialog-content.svelte'; -import Description from './alert-dialog-description.svelte'; +import Portal from './alert-dialog-portal.svelte'; +import Title from './alert-dialog-title.svelte'; const Root = AlertDialogPrimitive.Root; const Trigger = AlertDialogPrimitive.Trigger; export { - Root, - Title, - Action, - Cancel, - Portal, - Footer, - Header, - Trigger, - Overlay, - Content, - Description, - // - Root as AlertDialog, - Title as AlertDialogTitle, - Action as AlertDialogAction, - Cancel as AlertDialogCancel, - Portal as AlertDialogPortal, - Footer as AlertDialogFooter, - Header as AlertDialogHeader, - Trigger as AlertDialogTrigger, - Overlay as AlertDialogOverlay, - Content as AlertDialogContent, - Description as AlertDialogDescription, + Action, + // + Root as AlertDialog, Action as AlertDialogAction, + Cancel as AlertDialogCancel, Content as AlertDialogContent, + Description as AlertDialogDescription, Footer as AlertDialogFooter, + Header as AlertDialogHeader, Overlay as AlertDialogOverlay, Portal as AlertDialogPortal, Title as AlertDialogTitle, Trigger as AlertDialogTrigger, Cancel, Content, + Description, Footer, + Header, Overlay, Portal, Root, + Title, Trigger }; + diff --git a/frontend/src/lib/components/ui/alert/index.ts b/frontend/src/lib/components/ui/alert/index.ts index 4f95393..f13e5fe 100644 --- a/frontend/src/lib/components/ui/alert/index.ts +++ b/frontend/src/lib/components/ui/alert/index.ts @@ -1,8 +1,8 @@ import { type VariantProps, tv } from 'tailwind-variants'; -import Root from './alert.svelte'; import Description from './alert-description.svelte'; import Title from './alert-title.svelte'; +import Root from './alert.svelte'; export const alertVariants = tv({ base: 'relative w-full rounded-lg border p-4 [&:has(svg)]:pl-11 [&>svg+div]:translate-y-[-3px] [&>svg]:absolute [&>svg]:left-4 [&>svg]:top-4 [&>svg]:text-foreground', @@ -24,11 +24,9 @@ export type Variant = VariantProps['variant']; export type HeadingLevel = 'h1' | 'h2' | 'h3' | 'h4' | 'h5' | 'h6'; export { - Root, - Description, - Title, - // - Root as Alert, - Description as AlertDescription, - Title as AlertTitle, + // + Root as Alert, + Description as AlertDescription, + Title as AlertTitle, Description, Root, Title }; + diff --git a/frontend/src/lib/components/ui/breadcrumb/index.ts b/frontend/src/lib/components/ui/breadcrumb/index.ts index be61b50..5e33d97 100644 --- a/frontend/src/lib/components/ui/breadcrumb/index.ts +++ b/frontend/src/lib/components/ui/breadcrumb/index.ts @@ -1,25 +1,20 @@ -import Root from './breadcrumb.svelte'; import Ellipsis from './breadcrumb-ellipsis.svelte'; import Item from './breadcrumb-item.svelte'; -import Separator from './breadcrumb-separator.svelte'; import Link from './breadcrumb-link.svelte'; import List from './breadcrumb-list.svelte'; import Page from './breadcrumb-page.svelte'; +import Separator from './breadcrumb-separator.svelte'; +import Root from './breadcrumb.svelte'; export { - Root, - Ellipsis, - Item, - Separator, - Link, - List, - Page, - // - Root as Breadcrumb, - Ellipsis as BreadcrumbEllipsis, - Item as BreadcrumbItem, - Separator as BreadcrumbSeparator, - Link as BreadcrumbLink, - List as BreadcrumbList, - Page as BreadcrumbPage, + // + Root as Breadcrumb, + Ellipsis as BreadcrumbEllipsis, + Item as BreadcrumbItem, Link as BreadcrumbLink, + List as BreadcrumbList, + Page as BreadcrumbPage, Separator as BreadcrumbSeparator, Ellipsis, + Item, Link, + List, + Page, Root, Separator }; + diff --git a/frontend/src/lib/components/ui/button/index.ts b/frontend/src/lib/components/ui/button/index.ts index af832fc..cd3cbcc 100644 --- a/frontend/src/lib/components/ui/button/index.ts +++ b/frontend/src/lib/components/ui/button/index.ts @@ -1,5 +1,5 @@ -import { type VariantProps, tv } from 'tailwind-variants'; import type { Button as ButtonPrimitive } from 'bits-ui'; +import { type VariantProps, tv } from 'tailwind-variants'; import Root from './button.svelte'; const buttonVariants = tv({ @@ -37,12 +37,7 @@ type Props = ButtonPrimitive.Props & { type Events = ButtonPrimitive.Events; export { - Root, - type Props, - type Events, - // - Root as Button, - type Props as ButtonProps, - type Events as ButtonEvents, - buttonVariants, + // + Root as Button, Root, buttonVariants, type Events as ButtonEvents, type Props as ButtonProps, type Events, type Props }; + diff --git a/frontend/src/lib/components/ui/card/index.ts b/frontend/src/lib/components/ui/card/index.ts index ed0c468..6714bba 100644 --- a/frontend/src/lib/components/ui/card/index.ts +++ b/frontend/src/lib/components/ui/card/index.ts @@ -1,24 +1,21 @@ -import Root from './card.svelte'; import Content from './card-content.svelte'; import Description from './card-description.svelte'; import Footer from './card-footer.svelte'; import Header from './card-header.svelte'; import Title from './card-title.svelte'; +import Root from './card.svelte'; export { - Root, - Content, - Description, - Footer, - Header, - Title, - // - Root as Card, - Content as CardContent, - Description as CardDescription, - Footer as CardFooter, - Header as CardHeader, - Title as CardTitle, + // + Root as Card, + Content as CardContent, + Description as CardDescription, + Footer as CardFooter, + Header as CardHeader, + Title as CardTitle, Content, + Description, + Footer, + Header, Root, Title }; export type HeadingLevel = 'h1' | 'h2' | 'h3' | 'h4' | 'h5' | 'h6'; diff --git a/frontend/src/lib/components/ui/checkbox/index.ts b/frontend/src/lib/components/ui/checkbox/index.ts index b256da5..4395200 100644 --- a/frontend/src/lib/components/ui/checkbox/index.ts +++ b/frontend/src/lib/components/ui/checkbox/index.ts @@ -1,6 +1,6 @@ import Root from './checkbox.svelte'; export { - Root, - // - Root as Checkbox, + // + Root as Checkbox, Root }; + diff --git a/frontend/src/lib/components/ui/command/index.ts b/frontend/src/lib/components/ui/command/index.ts index d756799..4542d67 100644 --- a/frontend/src/lib/components/ui/command/index.ts +++ b/frontend/src/lib/components/ui/command/index.ts @@ -1,37 +1,26 @@ import { Command as CommandPrimitive } from 'cmdk-sv'; -import Root from './command.svelte'; import Dialog from './command-dialog.svelte'; import Empty from './command-empty.svelte'; import Group from './command-group.svelte'; -import Item from './command-item.svelte'; import Input from './command-input.svelte'; +import Item from './command-item.svelte'; import List from './command-list.svelte'; import Separator from './command-separator.svelte'; import Shortcut from './command-shortcut.svelte'; +import Root from './command.svelte'; const Loading = CommandPrimitive.Loading; export { - Root, - Dialog, - Empty, - Group, - Item, - Input, - List, - Separator, - Shortcut, - Loading, - // - Root as Command, - Dialog as CommandDialog, - Empty as CommandEmpty, - Group as CommandGroup, - Item as CommandItem, - Input as CommandInput, - List as CommandList, - Separator as CommandSeparator, - Shortcut as CommandShortcut, - Loading as CommandLoading, + // + Root as Command, + Dialog as CommandDialog, + Empty as CommandEmpty, + Group as CommandGroup, Input as CommandInput, Item as CommandItem, List as CommandList, Loading as CommandLoading, Separator as CommandSeparator, + Shortcut as CommandShortcut, Dialog, + Empty, + Group, Input, Item, List, Loading, Root, Separator, + Shortcut }; + diff --git a/frontend/src/lib/components/ui/dialog/index.ts b/frontend/src/lib/components/ui/dialog/index.ts index c743438..bc6cf5c 100644 --- a/frontend/src/lib/components/ui/dialog/index.ts +++ b/frontend/src/lib/components/ui/dialog/index.ts @@ -1,37 +1,25 @@ import { Dialog as DialogPrimitive } from 'bits-ui'; -import Title from './dialog-title.svelte'; -import Portal from './dialog-portal.svelte'; +import Content from './dialog-content.svelte'; +import Description from './dialog-description.svelte'; import Footer from './dialog-footer.svelte'; import Header from './dialog-header.svelte'; import Overlay from './dialog-overlay.svelte'; -import Content from './dialog-content.svelte'; -import Description from './dialog-description.svelte'; +import Portal from './dialog-portal.svelte'; +import Title from './dialog-title.svelte'; const Root = DialogPrimitive.Root; const Trigger = DialogPrimitive.Trigger; const Close = DialogPrimitive.Close; export { - Root, - Title, - Portal, - Footer, - Header, - Trigger, - Overlay, - Content, - Description, - Close, - // - Root as Dialog, - Title as DialogTitle, - Portal as DialogPortal, - Footer as DialogFooter, - Header as DialogHeader, - Trigger as DialogTrigger, - Overlay as DialogOverlay, - Content as DialogContent, - Description as DialogDescription, - Close as DialogClose, + Close, Content, + Description, + // + Root as Dialog, Close as DialogClose, Content as DialogContent, + Description as DialogDescription, Footer as DialogFooter, + Header as DialogHeader, Overlay as DialogOverlay, Portal as DialogPortal, Title as DialogTitle, Trigger as DialogTrigger, Footer, + Header, Overlay, Portal, Root, + Title, Trigger }; + diff --git a/frontend/src/lib/components/ui/dropdown-menu/index.ts b/frontend/src/lib/components/ui/dropdown-menu/index.ts index c13f955..27de719 100644 --- a/frontend/src/lib/components/ui/dropdown-menu/index.ts +++ b/frontend/src/lib/components/ui/dropdown-menu/index.ts @@ -1,14 +1,14 @@ import { DropdownMenu as DropdownMenuPrimitive } from 'bits-ui'; +import CheckboxItem from './dropdown-menu-checkbox-item.svelte'; +import Content from './dropdown-menu-content.svelte'; import Item from './dropdown-menu-item.svelte'; import Label from './dropdown-menu-label.svelte'; -import Content from './dropdown-menu-content.svelte'; -import Shortcut from './dropdown-menu-shortcut.svelte'; +import RadioGroup from './dropdown-menu-radio-group.svelte'; import RadioItem from './dropdown-menu-radio-item.svelte'; import Separator from './dropdown-menu-separator.svelte'; -import RadioGroup from './dropdown-menu-radio-group.svelte'; +import Shortcut from './dropdown-menu-shortcut.svelte'; import SubContent from './dropdown-menu-sub-content.svelte'; import SubTrigger from './dropdown-menu-sub-trigger.svelte'; -import CheckboxItem from './dropdown-menu-checkbox-item.svelte'; const Sub = DropdownMenuPrimitive.Sub; const Root = DropdownMenuPrimitive.Root; @@ -16,33 +16,13 @@ const Trigger = DropdownMenuPrimitive.Trigger; const Group = DropdownMenuPrimitive.Group; export { - Sub, - Root, - Item, - Label, - Group, - Trigger, - Content, - Shortcut, - Separator, - RadioItem, - SubContent, - SubTrigger, - RadioGroup, - CheckboxItem, - // - Root as DropdownMenu, - Sub as DropdownMenuSub, - Item as DropdownMenuItem, - Label as DropdownMenuLabel, - Group as DropdownMenuGroup, - Content as DropdownMenuContent, - Trigger as DropdownMenuTrigger, - Shortcut as DropdownMenuShortcut, - RadioItem as DropdownMenuRadioItem, - Separator as DropdownMenuSeparator, - RadioGroup as DropdownMenuRadioGroup, - SubContent as DropdownMenuSubContent, - SubTrigger as DropdownMenuSubTrigger, - CheckboxItem as DropdownMenuCheckboxItem, + CheckboxItem, Content, + // + Root as DropdownMenu, CheckboxItem as DropdownMenuCheckboxItem, Content as DropdownMenuContent, Group as DropdownMenuGroup, Item as DropdownMenuItem, + Label as DropdownMenuLabel, RadioGroup as DropdownMenuRadioGroup, RadioItem as DropdownMenuRadioItem, + Separator as DropdownMenuSeparator, Shortcut as DropdownMenuShortcut, Sub as DropdownMenuSub, SubContent as DropdownMenuSubContent, + SubTrigger as DropdownMenuSubTrigger, Trigger as DropdownMenuTrigger, Group, Item, + Label, RadioGroup, RadioItem, Root, Separator, Shortcut, Sub, SubContent, + SubTrigger, Trigger }; + diff --git a/frontend/src/lib/components/ui/input/index.ts b/frontend/src/lib/components/ui/input/index.ts index a72b0db..6faf6ac 100644 --- a/frontend/src/lib/components/ui/input/index.ts +++ b/frontend/src/lib/components/ui/input/index.ts @@ -21,7 +21,7 @@ export type InputEvents = { }; export { - Root, - // - Root as Input, + // + Root as Input, Root }; + diff --git a/frontend/src/lib/components/ui/label/index.ts b/frontend/src/lib/components/ui/label/index.ts index 64bfc83..d1bf025 100644 --- a/frontend/src/lib/components/ui/label/index.ts +++ b/frontend/src/lib/components/ui/label/index.ts @@ -1,7 +1,7 @@ import Root from './label.svelte'; export { - Root, - // - Root as Label, + // + Root as Label, Root }; + diff --git a/frontend/src/lib/components/ui/popover/index.ts b/frontend/src/lib/components/ui/popover/index.ts index ad2a68e..76d312e 100644 --- a/frontend/src/lib/components/ui/popover/index.ts +++ b/frontend/src/lib/components/ui/popover/index.ts @@ -5,13 +5,9 @@ const Trigger = PopoverPrimitive.Trigger; const Close = PopoverPrimitive.Close; export { - Root, - Content, - Trigger, - Close, - // - Root as Popover, - Content as PopoverContent, - Trigger as PopoverTrigger, - Close as PopoverClose, + Close, Content, + // + Root as Popover, Close as PopoverClose, Content as PopoverContent, + Trigger as PopoverTrigger, Root, Trigger }; + diff --git a/frontend/src/lib/components/ui/progress/index.ts b/frontend/src/lib/components/ui/progress/index.ts index 3dea846..e09f228 100644 --- a/frontend/src/lib/components/ui/progress/index.ts +++ b/frontend/src/lib/components/ui/progress/index.ts @@ -1,7 +1,7 @@ import Root from './progress.svelte'; export { - Root, - // - Root as Progress, + // + Root as Progress, Root }; + diff --git a/frontend/src/lib/components/ui/scroll-area/index.ts b/frontend/src/lib/components/ui/scroll-area/index.ts index 9f7f3fe..b51c51a 100644 --- a/frontend/src/lib/components/ui/scroll-area/index.ts +++ b/frontend/src/lib/components/ui/scroll-area/index.ts @@ -2,9 +2,9 @@ import Scrollbar from './scroll-area-scrollbar.svelte'; import Root from './scroll-area.svelte'; export { - Root, - Scrollbar, - //, - Root as ScrollArea, - Scrollbar as ScrollAreaScrollbar, + Root, + //, + Root as ScrollArea, + Scrollbar as ScrollAreaScrollbar, Scrollbar }; + diff --git a/frontend/src/lib/components/ui/select/index.ts b/frontend/src/lib/components/ui/select/index.ts index 7e9a4b7..e1813c9 100644 --- a/frontend/src/lib/components/ui/select/index.ts +++ b/frontend/src/lib/components/ui/select/index.ts @@ -1,10 +1,10 @@ import { Select as SelectPrimitive } from 'bits-ui'; -import Label from './select-label.svelte'; -import Item from './select-item.svelte'; import Content from './select-content.svelte'; -import Trigger from './select-trigger.svelte'; +import Item from './select-item.svelte'; +import Label from './select-label.svelte'; import Separator from './select-separator.svelte'; +import Trigger from './select-trigger.svelte'; const Root = SelectPrimitive.Root; const Group = SelectPrimitive.Group; @@ -12,23 +12,10 @@ const Input = SelectPrimitive.Input; const Value = SelectPrimitive.Value; export { - Root, - Group, - Input, - Label, - Item, - Value, - Content, - Trigger, - Separator, - // - Root as Select, - Group as SelectGroup, - Input as SelectInput, - Label as SelectLabel, - Item as SelectItem, - Value as SelectValue, - Content as SelectContent, - Trigger as SelectTrigger, - Separator as SelectSeparator, + Content, Group, + Input, Item, Label, Root, + // + Root as Select, Content as SelectContent, Group as SelectGroup, + Input as SelectInput, Item as SelectItem, Label as SelectLabel, Separator as SelectSeparator, Trigger as SelectTrigger, Value as SelectValue, Separator, Trigger, Value }; + diff --git a/frontend/src/lib/components/ui/separator/index.ts b/frontend/src/lib/components/ui/separator/index.ts index b2ea76a..ca4b033 100644 --- a/frontend/src/lib/components/ui/separator/index.ts +++ b/frontend/src/lib/components/ui/separator/index.ts @@ -1,7 +1,8 @@ import Root from './separator.svelte'; export { - Root, - // - Root as Separator, + Root, + // + Root as Separator }; + diff --git a/frontend/src/lib/components/ui/skeleton/index.ts b/frontend/src/lib/components/ui/skeleton/index.ts index c54b615..d31676a 100644 --- a/frontend/src/lib/components/ui/skeleton/index.ts +++ b/frontend/src/lib/components/ui/skeleton/index.ts @@ -1,7 +1,8 @@ import Root from './skeleton.svelte'; export { - Root, - // - Root as Skeleton, + Root, + // + Root as Skeleton }; + diff --git a/frontend/src/lib/components/ui/slider/index.ts b/frontend/src/lib/components/ui/slider/index.ts index fa4c3fd..fd7b301 100644 --- a/frontend/src/lib/components/ui/slider/index.ts +++ b/frontend/src/lib/components/ui/slider/index.ts @@ -1,7 +1,8 @@ import Root from './slider.svelte'; export { - Root, - // - Root as Slider, + Root, + // + Root as Slider }; + diff --git a/frontend/src/lib/components/ui/switch/index.ts b/frontend/src/lib/components/ui/switch/index.ts index 888ffa0..ea6011d 100644 --- a/frontend/src/lib/components/ui/switch/index.ts +++ b/frontend/src/lib/components/ui/switch/index.ts @@ -1,7 +1,8 @@ import Root from './switch.svelte'; export { - Root, - // - Root as Switch, + Root, + // + Root as Switch }; + diff --git a/frontend/src/lib/components/ui/table/index.ts b/frontend/src/lib/components/ui/table/index.ts index 5173776..3669967 100644 --- a/frontend/src/lib/components/ui/table/index.ts +++ b/frontend/src/lib/components/ui/table/index.ts @@ -1,4 +1,3 @@ -import Root from './table.svelte'; import Body from './table-body.svelte'; import Caption from './table-caption.svelte'; import Cell from './table-cell.svelte'; @@ -6,23 +5,23 @@ import Footer from './table-footer.svelte'; import Head from './table-head.svelte'; import Header from './table-header.svelte'; import Row from './table-row.svelte'; +import Root from './table.svelte'; export { - Root, - Body, - Caption, - Cell, - Footer, - Head, - Header, - Row, - // - Root as Table, - Body as TableBody, - Caption as TableCaption, - Cell as TableCell, - Footer as TableFooter, - Head as TableHead, - Header as TableHeader, - Row as TableRow, + Body, + Caption, + Cell, + Footer, + Head, + Header, Root, Row, + // + Root as Table, + Body as TableBody, + Caption as TableCaption, + Cell as TableCell, + Footer as TableFooter, + Head as TableHead, + Header as TableHeader, + Row as TableRow }; + diff --git a/frontend/src/lib/components/ui/textarea/index.ts b/frontend/src/lib/components/ui/textarea/index.ts index a66e8d9..f0b06ab 100644 --- a/frontend/src/lib/components/ui/textarea/index.ts +++ b/frontend/src/lib/components/ui/textarea/index.ts @@ -20,9 +20,8 @@ type TextareaEvents = { }; export { - Root, - // - Root as Textarea, - type TextareaEvents, - type FormTextareaEvent, + Root, + // + Root as Textarea, type FormTextareaEvent, type TextareaEvents }; + diff --git a/frontend/src/lib/components/ui/tooltip/index.ts b/frontend/src/lib/components/ui/tooltip/index.ts index 5b39a48..9aa3e02 100644 --- a/frontend/src/lib/components/ui/tooltip/index.ts +++ b/frontend/src/lib/components/ui/tooltip/index.ts @@ -5,11 +5,10 @@ const Root = TooltipPrimitive.Root; const Trigger = TooltipPrimitive.Trigger; export { - Root, - Trigger, - Content, - // - Root as Tooltip, - Content as TooltipContent, - Trigger as TooltipTrigger, + Content, Root, + // + Root as Tooltip, + Content as TooltipContent, + Trigger as TooltipTrigger, Trigger }; + diff --git a/frontend/src/windows/main/components/settings/files.ts b/frontend/src/windows/main/components/settings/files.ts index 88bb058..b929e9d 100644 --- a/frontend/src/windows/main/components/settings/files.ts +++ b/frontend/src/windows/main/components/settings/files.ts @@ -1,7 +1,7 @@ import { filesystem, os } from '@neutralinojs/lib'; import path from 'path-browserify'; -import type { SettingsOutput } from './types'; import shellFS from '../../ts/tools/shellfs'; +import type { SettingsOutput } from './types'; export async function getConfigPath(): Promise { return path.join(await os.getPath('data'), 'AppleBlox', 'config'); diff --git a/frontend/src/windows/main/main.ts b/frontend/src/windows/main/main.ts index ffc4123..1cf5b85 100644 --- a/frontend/src/windows/main/main.ts +++ b/frontend/src/windows/main/main.ts @@ -5,12 +5,12 @@ import './ts/roblox'; import './ts/window'; // Imports -import { events, init, app as neuApp, os } from '@neutralinojs/lib'; +import { events, init, app as neuApp } from '@neutralinojs/lib'; import { version } from '../../../../package.json'; import App from './App.svelte'; import { RPCController } from './ts/tools/rpc'; -import { AbloxWatchdog } from './ts/watchdog'; import { shell } from './ts/tools/shell'; +import { AbloxWatchdog } from './ts/watchdog'; // Initialize NeutralinoJS init(); diff --git a/frontend/src/windows/main/ts/roblox/delegate.ts b/frontend/src/windows/main/ts/roblox/delegate.ts index c3121ed..eb757ed 100644 --- a/frontend/src/windows/main/ts/roblox/delegate.ts +++ b/frontend/src/windows/main/ts/roblox/delegate.ts @@ -1,7 +1,7 @@ -import { shell } from '../tools/shell'; +import { toast } from 'svelte-sonner'; import { getValue } from '../../components/settings'; import { libraryPath } from '../libraries'; -import { toast } from 'svelte-sonner'; +import { shell } from '../tools/shell'; const urlscheme = libraryPath('urlscheme'); diff --git a/frontend/src/windows/main/ts/roblox/index.ts b/frontend/src/windows/main/ts/roblox/index.ts index 1177c42..b87f4e6 100644 --- a/frontend/src/windows/main/ts/roblox/index.ts +++ b/frontend/src/windows/main/ts/roblox/index.ts @@ -1,3 +1,4 @@ +import { RobloxDelegate } from './delegate'; import { RobloxFFlags } from './fflags'; import { RobloxInstance } from './instance'; import { launchRoblox } from './launch'; @@ -5,7 +6,6 @@ import { RobloxMods } from './mods'; import { robloxPath } from './path'; import { RobloxUtils } from './utils'; import { RobloxWindow } from './window'; -import { RobloxDelegate } from './delegate'; // Simple export class Roblox { diff --git a/frontend/src/windows/main/ts/roblox/instance.ts b/frontend/src/windows/main/ts/roblox/instance.ts index bd36ee5..4f458ea 100644 --- a/frontend/src/windows/main/ts/roblox/instance.ts +++ b/frontend/src/windows/main/ts/roblox/instance.ts @@ -1,9 +1,9 @@ -import { clipboard, events, filesystem, os } from '@neutralinojs/lib'; +import { events, filesystem, os } from '@neutralinojs/lib'; import path from 'path-browserify'; import Roblox from '.'; -import { isProcessAlive, sleep } from '../utils'; import { getValue } from '../../components/settings'; import { shell } from '../tools/shell'; +import { isProcessAlive, sleep } from '../utils'; type EventHandler = (data?: any) => void; type Event = 'exit' | 'gameInfo' | 'gameEvent'; diff --git a/frontend/src/windows/main/ts/roblox/launch.ts b/frontend/src/windows/main/ts/roblox/launch.ts index b66d7ab..9ebf4be 100644 --- a/frontend/src/windows/main/ts/roblox/launch.ts +++ b/frontend/src/windows/main/ts/roblox/launch.ts @@ -1,4 +1,3 @@ -import { os } from '@neutralinojs/lib'; import beautify from 'json-beautify'; import path from 'path-browserify'; import { toast } from 'svelte-sonner'; diff --git a/frontend/src/windows/main/ts/roblox/utils.ts b/frontend/src/windows/main/ts/roblox/utils.ts index 40d859f..7c34639 100644 --- a/frontend/src/windows/main/ts/roblox/utils.ts +++ b/frontend/src/windows/main/ts/roblox/utils.ts @@ -4,9 +4,8 @@ import { filesystem, os } from '@neutralinojs/lib'; import path from 'path-browserify'; import { toast } from 'svelte-sonner'; import Roblox from '.'; -import { libraryPath } from '../libraries'; -import shellFS from '../tools/shellfs'; import { shell } from '../tools/shell'; +import shellFS from '../tools/shellfs'; export class RobloxUtils { /** Checks if roblox is installed, and if not show a popup */ diff --git a/frontend/src/windows/main/ts/roblox/window.ts b/frontend/src/windows/main/ts/roblox/window.ts index 5e4be64..ef2dd18 100644 --- a/frontend/src/windows/main/ts/roblox/window.ts +++ b/frontend/src/windows/main/ts/roblox/window.ts @@ -1,4 +1,4 @@ -import { computer, os } from '@neutralinojs/lib'; +import { computer } from '@neutralinojs/lib'; import { libraryPath } from '../libraries'; import { shell } from '../tools/shell'; diff --git a/frontend/src/windows/main/ts/utils.ts b/frontend/src/windows/main/ts/utils.ts index 2cc033b..f908291 100644 --- a/frontend/src/windows/main/ts/utils.ts +++ b/frontend/src/windows/main/ts/utils.ts @@ -1,4 +1,3 @@ -import { os } from '@neutralinojs/lib'; import { shell } from './tools/shell'; export function getMode(): 'dev' | 'prod' { diff --git a/frontend/src/windows/main/ts/window.ts b/frontend/src/windows/main/ts/window.ts index 0220fe4..b8a3576 100644 --- a/frontend/src/windows/main/ts/window.ts +++ b/frontend/src/windows/main/ts/window.ts @@ -1,10 +1,8 @@ // Set up keyboard shortcuts and add extra commands to neutralino -import { events, os } from '@neutralinojs/lib'; -import { getMode } from './utils'; +import { events } from '@neutralinojs/lib'; import hotkeys from 'hotkeys-js'; import { shell } from './tools/shell'; -import shellFS from './tools/shellfs'; // Shortcuts like copy, paste, quit, etc... (they are unimplemented by default in NeuJS) hotkeys('ctrl+c,cmd+c', (e) => { diff --git a/scripts/build/ts/index.ts b/scripts/build/ts/index.ts index 748c730..0847fb7 100644 --- a/scripts/build/ts/index.ts +++ b/scripts/build/ts/index.ts @@ -2,9 +2,9 @@ import BuildConfig from '@root/build.config'; import { $ } from 'bun'; import { resolve } from 'node:path'; import { Signale } from 'signale'; -import { buildSidecar } from './sidecar'; import { linuxBuild } from './linux-bundle'; import { macBuild } from './mac-bundle'; +import { buildSidecar } from './sidecar'; import { buildViteAndNeu } from './utils'; import { winBuild } from './win-bundle'; diff --git a/scripts/build/ts/mac-bundle.ts b/scripts/build/ts/mac-bundle.ts index b44e662..0116564 100644 --- a/scripts/build/ts/mac-bundle.ts +++ b/scripts/build/ts/mac-bundle.ts @@ -3,7 +3,7 @@ import neuConfig from '@root/neutralino.config.json'; import { version } from '@root/package.json'; import { $ } from 'bun'; import { chmodSync, existsSync } from 'node:fs'; -import { resolve, join } from 'node:path'; +import { join, resolve } from 'node:path'; import { Signale } from 'signale'; export async function macBuild() { diff --git a/scripts/build/ts/sidecar.ts b/scripts/build/ts/sidecar.ts index b53fb8a..5768a2b 100644 --- a/scripts/build/ts/sidecar.ts +++ b/scripts/build/ts/sidecar.ts @@ -1,6 +1,6 @@ import { $ } from 'bun'; import { chmodSync } from 'node:fs'; -import { resolve, join } from 'node:path'; +import { join, resolve } from 'node:path'; import { Signale } from 'signale'; import { extract } from 'tar'; diff --git a/scripts/package/dev.ts b/scripts/package/dev.ts index bb2330e..89b4a7d 100644 --- a/scripts/package/dev.ts +++ b/scripts/package/dev.ts @@ -1,6 +1,6 @@ import { $ } from 'bun'; import { chmodSync, existsSync } from 'node:fs'; -import { resolve, join } from 'node:path'; +import { join, resolve } from 'node:path'; import { buildSidecar } from '../build/ts/sidecar'; import { checkNeutralino } from '../build/ts/utils';