commit f52b1d6ad5c60ce5e46f18bc3b7e420967828456 · notnite.com/moonlight

+3 -3

packages/core-extensions/src/moonbase/ui/card.tsx packages/core-extensions/src/moonbase/ui/extensions/card.tsx

···

       4
       4
        
         DownloadIconSVG,

     

       5
       5
        
         ExtensionState,

     

       6
       6
        
         TrashIconSVG

     

       7
       7
       -
       } from "../types";

     

       8
       8
       -
       import { ExtensionLoadSource } from "types/src";

     

       7
       7
       +
       } from "../../types";

     

       8
       8
       +
       import { ExtensionLoadSource } from "@moonlight-mod/types";

     

       9
       9
        
       import info from "./info";

     

       10
       10
        
       import settings from "./settings";

     

       11
       11
        
       

     
···

       24
       24
        
         const { ExtensionInfo } = info(require);

     

       25
       25
        
         const Settings = settings(require);

     

       26
       26
        
         const { MoonbaseSettingsStore } =

     

       27
       27
       -
           require("moonbase_stores") as typeof import("../webpackModules/stores");

     

       27
       27
       +
           require("moonbase_stores") as typeof import("../../webpackModules/stores");

     

       28
       28
        
       

     

       29
       29
        
         const UserProfileClasses = spacepack.findByCode(

     

       30
       30
        
           "tabBarContainer",

+150

packages/core-extensions/src/moonbase/ui/config/index.tsx

···

       1
       1
       +
       import { LogLevel, WebpackRequireType } from "@moonlight-mod/types";

     

       2
       2
       +
       import { CircleXIconSVG } from "../../types";

     

       3
       3
       +
       

     

       4
       4
       +
       const logLevels = Object.values(LogLevel).filter(

     

       5
       5
       +
         (v) => typeof v === "string"

     

       6
       6
       +
       ) as string[];

     

       7
       7
       +
       

     

       8
       8
       +
       export default (require: WebpackRequireType) => {

     

       9
       9
       +
         const React = require("common_react");

     

       10
       10
       +
         const spacepack = require("spacepack_spacepack").spacepack;

     

       11
       11
       +
         const CommonComponents = require("common_components");

     

       12
       12
       +
         const {

     

       13
       13
       +
           FormDivider,

     

       14
       14
       +
           FormItem,

     

       15
       15
       +
           FormText,

     

       16
       16
       +
           FormSwitch,

     

       17
       17
       +
           TextInput,

     

       18
       18
       +
           Flex,

     

       19
       19
       +
           Button,

     

       20
       20
       +
           SingleSelect

     

       21
       21
       +
         } = CommonComponents;

     

       22
       22
       +
       

     

       23
       23
       +
         const { MoonbaseSettingsStore } =

     

       24
       24
       +
           require("moonbase_stores") as typeof import("../../webpackModules/stores");

     

       25
       25
       +
       

     

       26
       26
       +
         const FormClasses = spacepack.findByCode("dividerDefault:")[0].exports;

     

       27
       27
       +
         const Margins = spacepack.findByCode("marginCenterHorz:")[0].exports;

     

       28
       28
       +
       

     

       29
       29
       +
         const RemoveButtonClasses = spacepack.findByCode("removeButtonContainer")[0]

     

       30
       30
       +
           .exports;

     

       31
       31
       +
         const CircleXIcon = spacepack.findByCode(CircleXIconSVG)[0].exports.default;

     

       32
       32
       +
         function RemoveEntryButton({ onClick }: { onClick: () => void }) {

     

       33
       33
       +
           const { Tooltip, Clickable } = CommonComponents;

     

       34
       34
       +
           return (

     

       35
       35
       +
             <div className={RemoveButtonClasses.removeButtonContainer}>

     

       36
       36
       +
               <Tooltip text="Remove entry" position="top">

     

       37
       37
       +
                 {(props: any) => (

     

       38
       38
       +
                   <Clickable

     

       39
       39
       +
                     {...props}

     

       40
       40
       +
                     className={RemoveButtonClasses.removeButton}

     

       41
       41
       +
                     onClick={onClick}

     

       42
       42
       +
                   >

     

       43
       43
       +
                     <CircleXIcon width={16} height={16} />

     

       44
       44
       +
                   </Clickable>

     

       45
       45
       +
                 )}

     

       46
       46
       +
               </Tooltip>

     

       47
       47
       +
             </div>

     

       48
       48
       +
           );

     

       49
       49
       +
         }

     

       50
       50
       +
       

     

       51
       51
       +
         function ArrayFormItem({

     

       52
       52
       +
           config

     

       53
       53
       +
         }: {

     

       54
       54
       +
           config: "repositories" | "devSearchPaths";

     

       55
       55
       +
         }) {

     

       56
       56
       +
           const items = MoonbaseSettingsStore.getConfigOption(config) ?? [];

     

       57
       57
       +
           return (

     

       58
       58
       +
             <Flex direction={Flex.Direction.VERTICAL}>

     

       59
       59
       +
               {items.map((val, i) => (

     

       60
       60
       +
                 <div

     

       61
       61
       +
                   key={i}

     

       62
       62
       +
                   style={{

     

       63
       63
       +
                     display: "grid",

     

       64
       64
       +
                     height: "32px",

     

       65
       65
       +
                     gap: "8px",

     

       66
       66
       +
                     gridTemplateColumns: "1fr 32px",

     

       67
       67
       +
                     alignItems: "center"

     

       68
       68
       +
                   }}

     

       69
       69
       +
                 >

     

       70
       70
       +
                   <TextInput

     

       71
       71
       +
                     size={TextInput.Sizes.MINI}

     

       72
       72
       +
                     value={val}

     

       73
       73
       +
                     onChange={(newVal: string) => {

     

       74
       74
       +
                       items[i] = newVal;

     

       75
       75
       +
                       MoonbaseSettingsStore.setConfigOption(config, items);

     

       76
       76
       +
                     }}

     

       77
       77
       +
                   />

     

       78
       78
       +
                   <RemoveEntryButton

     

       79
       79
       +
                     onClick={() => {

     

       80
       80
       +
                       items.splice(i, 1);

     

       81
       81
       +
                       MoonbaseSettingsStore.setConfigOption(config, items);

     

       82
       82
       +
                     }}

     

       83
       83
       +
                   />

     

       84
       84
       +
                 </div>

     

       85
       85
       +
               ))}

     

       86
       86
       +
       

     

       87
       87
       +
               <Button

     

       88
       88
       +
                 look={Button.Looks.FILLED}

     

       89
       89
       +
                 color={Button.Colors.GREEN}

     

       90
       90
       +
                 size={Button.Sizes.SMALL}

     

       91
       91
       +
                 className={Margins.marginTop8}

     

       92
       92
       +
                 onClick={() => {

     

       93
       93
       +
                   items.push("");

     

       94
       94
       +
                   MoonbaseSettingsStore.setConfigOption(config, items);

     

       95
       95
       +
                 }}

     

       96
       96
       +
               >

     

       97
       97
       +
                 Add new entry

     

       98
       98
       +
               </Button>

     

       99
       99
       +
             </Flex>

     

       100
       100
       +
           );

     

       101
       101
       +
         }

     

       102
       102
       +
       

     

       103
       103
       +
         return function ConfigPage() {

     

       104
       104
       +
           return (

     

       105
       105
       +
             <>

     

       106
       106
       +
               <FormItem title="Repositories">

     

       107
       107
       +
                 <FormText className={Margins.marginBottom4}>

     

       108
       108
       +
                   A list of remote repositories to display extensions from

     

       109
       109
       +
                 </FormText>

     

       110
       110
       +
                 <ArrayFormItem config="repositories" />

     

       111
       111
       +
               </FormItem>

     

       112
       112
       +
               <FormDivider className={FormClasses.dividerDefault} />

     

       113
       113
       +
               <FormItem

     

       114
       114
       +
                 title="Extension search paths"

     

       115
       115
       +
                 className={Margins.marginTop20}

     

       116
       116
       +
               >

     

       117
       117
       +
                 <FormText className={Margins.marginBottom4}>

     

       118
       118
       +
                   A list of local directories to search for built extensions

     

       119
       119
       +
                 </FormText>

     

       120
       120
       +
                 <ArrayFormItem config="devSearchPaths" />

     

       121
       121
       +
               </FormItem>

     

       122
       122
       +
               <FormDivider className={FormClasses.dividerDefault} />

     

       123
       123
       +
               <FormSwitch

     

       124
       124
       +
                 className={Margins.marginTop20}

     

       125
       125
       +
                 value={MoonbaseSettingsStore.getConfigOption("patchAll")}

     

       126
       126
       +
                 onChange={(value: boolean) => {

     

       127
       127
       +
                   MoonbaseSettingsStore.setConfigOption("patchAll", value);

     

       128
       128
       +
                 }}

     

       129
       129
       +
                 note="Wraps every webpack module in a function, separating them in DevTools"

     

       130
       130
       +
               >

     

       131
       131
       +
                 Patch all

     

       132
       132
       +
               </FormSwitch>

     

       133
       133
       +
               <FormItem title="Log level">

     

       134
       134
       +
                 <SingleSelect

     

       135
       135
       +
                   autofocus={false}

     

       136
       136
       +
                   clearable={false}

     

       137
       137
       +
                   value={MoonbaseSettingsStore.getConfigOption("loggerLevel")}

     

       138
       138
       +
                   options={logLevels.map((o) => ({

     

       139
       139
       +
                     value: o.toLowerCase(),

     

       140
       140
       +
                     label: o[0] + o.slice(1).toLowerCase()

     

       141
       141
       +
                   }))}

     

       142
       142
       +
                   onChange={(v) =>

     

       143
       143
       +
                     MoonbaseSettingsStore.setConfigOption("loggerLevel", v)

     

       144
       144
       +
                   }

     

       145
       145
       +
                 />

     

       146
       146
       +
               </FormItem>

     

       147
       147
       +
             </>

     

       148
       148
       +
           );

     

       149
       149
       +
         };

     

       150
       150
       +
       };

+99

packages/core-extensions/src/moonbase/ui/extensions/index.tsx

···

       1
       1
       +
       import {

     

       2
       2
       +
         ExtensionLoadSource,

     

       3
       3
       +
         ExtensionTag,

     

       4
       4
       +
         WebpackRequireType

     

       5
       5
       +
       } from "@moonlight-mod/types";

     

       6
       6
       +
       import { ExtensionState } from "../../types";

     

       7
       7
       +
       import filterBar, { defaultFilter } from "./filterBar";

     

       8
       8
       +
       import card from "./card";

     

       9
       9
       +
       

     

       10
       10
       +
       export default (require: WebpackRequireType) => {

     

       11
       11
       +
         const React = require("common_react");

     

       12
       12
       +
         const spacepack = require("spacepack_spacepack").spacepack;

     

       13
       13
       +
         const Flux = require("common_flux");

     

       14
       14
       +
       

     

       15
       15
       +
         const { MoonbaseSettingsStore } =

     

       16
       16
       +
           require("moonbase_stores") as typeof import("../../webpackModules/stores");

     

       17
       17
       +
       

     

       18
       18
       +
         const ExtensionCard = card(require);

     

       19
       19
       +
         const FilterBar = React.lazy(() =>

     

       20
       20
       +
           filterBar(require).then((c) => ({ default: c }))

     

       21
       21
       +
         );

     

       22
       22
       +
       

     

       23
       23
       +
         const Margins = spacepack.findByCode("marginCenterHorz:")[0].exports;

     

       24
       24
       +
         const SearchBar = spacepack.findByCode("Messages.SEARCH", "hideSearchIcon")[0]

     

       25
       25
       +
           .exports.default;

     

       26
       26
       +
       

     

       27
       27
       +
         return function ExtensionsPage() {

     

       28
       28
       +
           const { extensions } = Flux.useStateFromStoresObject(

     

       29
       29
       +
             [MoonbaseSettingsStore],

     

       30
       30
       +
             () => {

     

       31
       31
       +
               return { extensions: MoonbaseSettingsStore.extensions };

     

       32
       32
       +
             }

     

       33
       33
       +
           );

     

       34
       34
       +
       

     

       35
       35
       +
           const [query, setQuery] = React.useState("");

     

       36
       36
       +
           const [filter, setFilter] = React.useState({ ...defaultFilter });

     

       37
       37
       +
           const [selectedTags, setSelectedTags] = React.useState(new Set<string>());

     

       38
       38
       +
       

     

       39
       39
       +
           const sorted = Object.values(extensions).sort((a, b) => {

     

       40
       40
       +
             const aName = a.manifest.meta?.name ?? a.id;

     

       41
       41
       +
             const bName = b.manifest.meta?.name ?? b.id;

     

       42
       42
       +
             return aName.localeCompare(bName);

     

       43
       43
       +
           });

     

       44
       44
       +
       

     

       45
       45
       +
           const filtered = sorted.filter(

     

       46
       46
       +
             (ext) =>

     

       47
       47
       +
               (ext.manifest.meta?.name?.toLowerCase().includes(query) ||

     

       48
       48
       +
                 ext.manifest.meta?.tagline?.toLowerCase().includes(query) ||

     

       49
       49
       +
                 ext.manifest.meta?.description?.toLowerCase().includes(query)) &&

     

       50
       50
       +
               [...selectedTags.values()].every(

     

       51
       51
       +
                 (tag) => ext.manifest.meta?.tags?.includes(tag as ExtensionTag)

     

       52
       52
       +
               ) &&

     

       53
       53
       +
               // This seems very bad, sorry

     

       54
       54
       +
               !(

     

       55
       55
       +
                 (!filter.core && ext.source.type === ExtensionLoadSource.Core) ||

     

       56
       56
       +
                 (!filter.normal && ext.source.type === ExtensionLoadSource.Normal) ||

     

       57
       57
       +
                 (!filter.developer &&

     

       58
       58
       +
                   ext.source.type === ExtensionLoadSource.Developer) ||

     

       59
       59
       +
                 (!filter.enabled &&

     

       60
       60
       +
                   MoonbaseSettingsStore.getExtensionEnabled(ext.id)) ||

     

       61
       61
       +
                 (!filter.disabled &&

     

       62
       62
       +
                   !MoonbaseSettingsStore.getExtensionEnabled(ext.id)) ||

     

       63
       63
       +
                 (!filter.installed && ext.state !== ExtensionState.NotDownloaded) ||

     

       64
       64
       +
                 (!filter.repository && ext.state === ExtensionState.NotDownloaded)

     

       65
       65
       +
               )

     

       66
       66
       +
           );

     

       67
       67
       +
       

     

       68
       68
       +
           return (

     

       69
       69
       +
             <>

     

       70
       70
       +
               <SearchBar

     

       71
       71
       +
                 size={SearchBar.Sizes.MEDIUM}

     

       72
       72
       +
                 query={query}

     

       73
       73
       +
                 onChange={(v: string) => setQuery(v.toLowerCase())}

     

       74
       74
       +
                 onClear={() => setQuery("")}

     

       75
       75
       +
                 autoFocus={true}

     

       76
       76
       +
                 autoComplete="off"

     

       77
       77
       +
                 inputProps={{

     

       78
       78
       +
                   autoCapitalize: "none",

     

       79
       79
       +
                   autoCorrect: "off",

     

       80
       80
       +
                   spellCheck: "false"

     

       81
       81
       +
                 }}

     

       82
       82
       +
               />

     

       83
       83
       +
               <React.Suspense

     

       84
       84
       +
                 fallback={<div className={Margins.marginBottom20}></div>}

     

       85
       85
       +
               >

     

       86
       86
       +
                 <FilterBar

     

       87
       87
       +
                   filter={filter}

     

       88
       88
       +
                   setFilter={setFilter}

     

       89
       89
       +
                   selectedTags={selectedTags}

     

       90
       90
       +
                   setSelectedTags={setSelectedTags}

     

       91
       91
       +
                 />

     

       92
       92
       +
               </React.Suspense>

     

       93
       93
       +
               {filtered.map((ext) => (

     

       94
       94
       +
                 <ExtensionCard id={ext.id} key={ext.id} />

     

       95
       95
       +
               ))}

     

       96
       96
       +
             </>

     

       97
       97
       +
           );

     

       98
       98
       +
         };

     

       99
       99
       +
       };

+1 -1

packages/core-extensions/src/moonbase/ui/filterBar.tsx packages/core-extensions/src/moonbase/ui/extensions/filterBar.tsx

···

       4
       4
        
         ArrowsUpDownIconSVG,

     

       5
       5
        
         ChevronSmallDownIconSVG,

     

       6
       6
        
         ChevronSmallUpIconSVG

     

       7
       7
       -
       } from "../types";

     

       7
       7
       +
       } from "../../types";

     

       8
       8
        
       

     

       9
       9
        
       export const defaultFilter = {

     

       10
       10
        
         core: true,

+50 -93

packages/core-extensions/src/moonbase/ui/index.tsx

···

       1
       1
       -
       import {

     

       2
       2
       -
         ExtensionLoadSource,

     

       3
       3
       -
         ExtensionTag,

     

       4
       4
       -
         WebpackRequireType

     

       5
       5
       -
       } from "@moonlight-mod/types";

     

       6
       6
       -
       import card from "./card";

     

       7
       7
       -
       import filterBar, { defaultFilter } from "./filterBar";

     

       8
       8
       -
       import { ExtensionState } from "../types";

     

       1
       1
       +
       import { WebpackRequireType } from "@moonlight-mod/types";

     

       2
       2
       +
       import extensionsPage from "./extensions";

     

       3
       3
       +
       import configPage from "./config";

     

       9
       4
        
       

     

       10
       10
       -
       export enum ExtensionPage {

     

       11
       11
       -
         Info,

     

       12
       12
       -
         Description,

     

       13
       13
       -
         Settings

     

       5
       5
       +
       export enum MoonbasePage {

     

       6
       6
       +
         Extensions,

     

       7
       7
       +
         Config

     

       14
       8
        
       }

     

       15
       9
        
       

     

       16
       10
        
       export default (require: WebpackRequireType) => {

     

       17
       11
        
         const React = require("common_react");

     

       18
       12
        
         const spacepack = require("spacepack_spacepack").spacepack;

     

       19
       19
       -
         const Flux = require("common_flux");

     

       20
       13
        
       

     

       21
       21
       -
         const { MoonbaseSettingsStore } =

     

       22
       22
       -
           require("moonbase_stores") as typeof import("../webpackModules/stores");

     

       14
       14
       +
         const Margins = spacepack.findByCode("marginCenterHorz:")[0].exports;

     

       23
       15
        
       

     

       24
       24
       -
         const ExtensionCard = card(require);

     

       25
       25
       -
         const FilterBar = React.lazy(() =>

     

       26
       26
       -
           filterBar(require).then((c) => ({ default: c }))

     

       27
       27
       -
         );

     

       16
       16
       +
         const { Divider } = spacepack.findByCode(".default.HEADER_BAR")[0].exports

     

       17
       17
       +
           .default;

     

       18
       18
       +
         const TitleBarClasses = spacepack.findByCode("iconWrapper:", "children:")[0]

     

       19
       19
       +
           .exports;

     

       20
       20
       +
         const TabBarClasses = spacepack.findByCode("nowPlayingColumn:")[0].exports;

     

       28
       21
        
       

     

       29
       29
       -
         const Margins = spacepack.findByCode("marginCenterHorz:")[0].exports;

     

       30
       30
       -
         const SearchBar = spacepack.findByCode("Messages.SEARCH", "hideSearchIcon")[0]

     

       31
       31
       -
           .exports.default;

     

       22
       22
       +
         const ExtensionsPage = extensionsPage(require);

     

       23
       23
       +
         const ConfigPage = configPage(require);

     

       32
       24
        
       

     

       33
       25
        
         return function Moonbase() {

     

       34
       34
       -
           const { Text } = require("common_components");

     

       26
       26
       +
           const { Text, TabBar } = require("common_components");

     

       35
       27
        
       

     

       36
       36
       -
           const { extensions } = Flux.useStateFromStoresObject(

     

       37
       37
       -
             [MoonbaseSettingsStore],

     

       38
       38
       -
             () => {

     

       39
       39
       -
               return { extensions: MoonbaseSettingsStore.extensions };

     

       40
       40
       -
             }

     

       41
       41
       -
           );

     

       42
       42
       -
       

     

       43
       43
       -
           const [query, setQuery] = React.useState("");

     

       44
       44
       -
           const [filter, setFilter] = React.useState({ ...defaultFilter });

     

       45
       45
       -
           const [selectedTags, setSelectedTags] = React.useState(new Set<string>());

     

       46
       46
       -
       

     

       47
       47
       -
           const sorted = Object.values(extensions).sort((a, b) => {

     

       48
       48
       -
             const aName = a.manifest.meta?.name ?? a.id;

     

       49
       49
       -
             const bName = b.manifest.meta?.name ?? b.id;

     

       50
       50
       -
             return aName.localeCompare(bName);

     

       51
       51
       -
           });

     

       52
       52
       -
       

     

       53
       53
       -
           const filtered = sorted.filter(

     

       54
       54
       -
             (ext) =>

     

       55
       55
       -
               (ext.manifest.meta?.name?.toLowerCase().includes(query) ||

     

       56
       56
       -
                 ext.manifest.meta?.tagline?.toLowerCase().includes(query) ||

     

       57
       57
       -
                 ext.manifest.meta?.description?.toLowerCase().includes(query)) &&

     

       58
       58
       -
               [...selectedTags.values()].every(

     

       59
       59
       -
                 (tag) => ext.manifest.meta?.tags?.includes(tag as ExtensionTag)

     

       60
       60
       -
               ) &&

     

       61
       61
       -
               // This seems very bad, sorry

     

       62
       62
       -
               !(

     

       63
       63
       -
                 (!filter.core && ext.source.type === ExtensionLoadSource.Core) ||

     

       64
       64
       -
                 (!filter.normal && ext.source.type === ExtensionLoadSource.Normal) ||

     

       65
       65
       -
                 (!filter.developer &&

     

       66
       66
       -
                   ext.source.type === ExtensionLoadSource.Developer) ||

     

       67
       67
       -
                 (!filter.enabled &&

     

       68
       68
       -
                   MoonbaseSettingsStore.getExtensionEnabled(ext.id)) ||

     

       69
       69
       -
                 (!filter.disabled &&

     

       70
       70
       -
                   !MoonbaseSettingsStore.getExtensionEnabled(ext.id)) ||

     

       71
       71
       -
                 (!filter.installed && ext.state !== ExtensionState.NotDownloaded) ||

     

       72
       72
       -
                 (!filter.repository && ext.state === ExtensionState.NotDownloaded)

     

       73
       73
       -
               )

     

       28
       28
       +
           const [selectedTab, setSelectedTab] = React.useState(

     

       29
       29
       +
             MoonbasePage.Extensions

     

       74
       30
        
           );

     

       75
       31
        
       

     

       76
       32
        
           return (

     

       77
       33
        
             <>

     

       78
       78
       -
               <Text

     

       79
       79
       -
                 className={Margins.marginBottom20}

     

       80
       80
       -
                 variant="heading-lg/semibold"

     

       81
       81
       -
                 tag="h2"

     

       34
       34
       +
               <div

     

       35
       35
       +
                 className={`${TitleBarClasses.children} ${Margins.marginBottom20}`}

     

       82
       36
        
               >

     

       83
       83
       -
                 Moonbase

     

       84
       84
       -
               </Text>

     

       85
       85
       -
               <SearchBar

     

       86
       86
       -
                 size={SearchBar.Sizes.MEDIUM}

     

       87
       87
       -
                 query={query}

     

       88
       88
       -
                 onChange={(v: string) => setQuery(v.toLowerCase())}

     

       89
       89
       -
                 onClear={() => setQuery("")}

     

       90
       90
       -
                 autoFocus={true}

     

       91
       91
       -
                 autoComplete="off"

     

       92
       92
       -
                 inputProps={{

     

       93
       93
       -
                   autoCapitalize: "none",

     

       94
       94
       -
                   autoCorrect: "off",

     

       95
       95
       -
                   spellCheck: "false"

     

       96
       96
       -
                 }}

     

       97
       97
       -
               />

     

       98
       98
       -
               <React.Suspense

     

       99
       99
       -
                 fallback={<div className={Margins.marginBottom20}></div>}

     

       100
       100
       -
               >

     

       101
       101
       -
                 <FilterBar

     

       102
       102
       -
                   filter={filter}

     

       103
       103
       -
                   setFilter={setFilter}

     

       104
       104
       -
                   selectedTags={selectedTags}

     

       105
       105
       -
                   setSelectedTags={setSelectedTags}

     

       106
       106
       -
                 />

     

       107
       107
       -
               </React.Suspense>

     

       108
       108
       -
               {filtered.map((ext) => (

     

       109
       109
       -
                 <ExtensionCard id={ext.id} key={ext.id} />

     

       110
       110
       -
               ))}

     

       37
       37
       +
                 <Text

     

       38
       38
       +
                   className={TitleBarClasses.titleWrapper}

     

       39
       39
       +
                   variant="heading-lg/semibold"

     

       40
       40
       +
                   tag="h2"

     

       41
       41
       +
                 >

     

       42
       42
       +
                   Moonbase

     

       43
       43
       +
                 </Text>

     

       44
       44
       +
                 <Divider />

     

       45
       45
       +
                 <TabBar

     

       46
       46
       +
                   selectedItem={selectedTab}

     

       47
       47
       +
                   onItemSelect={setSelectedTab}

     

       48
       48
       +
                   type="top-pill"

     

       49
       49
       +
                   className={TabBarClasses.tabBar}

     

       50
       50
       +
                 >

     

       51
       51
       +
                   <TabBar.Item

     

       52
       52
       +
                     id={MoonbasePage.Extensions}

     

       53
       53
       +
                     className={TabBarClasses.item}

     

       54
       54
       +
                   >

     

       55
       55
       +
                     Extensions

     

       56
       56
       +
                   </TabBar.Item>

     

       57
       57
       +
                   <TabBar.Item

     

       58
       58
       +
                     id={MoonbasePage.Config}

     

       59
       59
       +
                     className={TabBarClasses.item}

     

       60
       60
       +
                   >

     

       61
       61
       +
                     Config

     

       62
       62
       +
                   </TabBar.Item>

     

       63
       63
       +
                 </TabBar>

     

       64
       64
       +
               </div>

     

       65
       65
       +
       

     

       66
       66
       +
               {selectedTab === MoonbasePage.Extensions && <ExtensionsPage />}

     

       67
       67
       +
               {selectedTab === MoonbasePage.Config && <ConfigPage />}

     

       111
       68
        
             </>

     

       112
       69
        
           );

     

       113
       70
        
         };

+2 -2

packages/core-extensions/src/moonbase/ui/info.tsx packages/core-extensions/src/moonbase/ui/extensions/info.tsx

···

       1
       1
        
       import WebpackRequire from "@moonlight-mod/types/discord/require";

     

       2
       2
        
       import { ExtensionTag } from "@moonlight-mod/types";

     

       3
       3
       -
       import { MoonbaseExtension } from "../types";

     

       3
       3
       +
       import { MoonbaseExtension } from "../../types";

     

       4
       4
        
       

     

       5
       5
        
       type Dependency = {

     

       6
       6
        
         id: string;

     
···

       43
       43
        
         )[0].exports;

     

       44
       44
        
       

     

       45
       45
        
         const { MoonbaseSettingsStore } =

     

       46
       46
       -
           require("moonbase_stores") as typeof import("../webpackModules/stores");

     

       46
       46
       +
           require("moonbase_stores") as typeof import("../../webpackModules/stores");

     

       47
       47
        
       

     

       48
       48
        
         function InfoSection({

     

       49
       49
        
           title,

+2 -2

packages/core-extensions/src/moonbase/ui/settings.tsx packages/core-extensions/src/moonbase/ui/extensions/settings.tsx

···

       6
       6
        
         SelectSettingType

     

       7
       7
        
       } from "@moonlight-mod/types/config";

     

       8
       8
        
       import WebpackRequire from "@moonlight-mod/types/discord/require";

     

       9
       9
       -
       import { CircleXIconSVG, MoonbaseExtension } from "../types";

     

       9
       9
       +
       import { CircleXIconSVG, MoonbaseExtension } from "../../types";

     

       10
       10
        
       

     

       11
       11
        
       type SettingsProps = {

     

       12
       12
        
         ext: MoonbaseExtension;

     
···

       23
       23
        
         const spacepack = require("spacepack_spacepack").spacepack;

     

       24
       24
        
       

     

       25
       25
        
         const { MoonbaseSettingsStore } =

     

       26
       26
       -
           require("moonbase_stores") as typeof import("../webpackModules/stores");

     

       26
       26
       +
           require("moonbase_stores") as typeof import("../../webpackModules/stores");

     

       27
       27
        
       

     

       28
       28
        
         const Margins = spacepack.findByCode("marginCenterHorz:")[0].exports;

     

       29
       29

+10

packages/core-extensions/src/moonbase/webpackModules/stores.ts

···

       227
       227
        
           this.emitChange();

     

       228
       228
        
         }

     

       229
       229
        
       

     

       230
       230
       +
         getConfigOption<K extends keyof Config>(key: K): Config[K] {

     

       231
       231
       +
           return this.config[key];

     

       232
       232
       +
         }

     

       233
       233
       +
       

     

       234
       234
       +
         setConfigOption<K extends keyof Config>(key: K, value: Config[K]) {

     

       235
       235
       +
           this.config[key] = value;

     

       236
       236
       +
           this.modified = this.isModified();

     

       237
       237
       +
           this.emitChange();

     

       238
       238
       +
         }

     

       239
       239
       +
       

     

       230
       240
        
         writeConfig() {

     

       231
       241
        
           this.submitting = true;

     

       232
       242

packages/types/src/coreExtensions/components.ts

···

       238
       238
        
           }>

     

       239
       239
        
         >;

     

       240
       240
        
         TextInput: TextInput;

     

       241
       241
       +
         FormDivider: ComponentClass<any>;

     

       241
       242
        
         FormSection: ComponentClass<

     

       242
       243
        
           PropsWithChildren<{

     

       243
       244
        
             className?: string;