commit 0b12f1fc38e67d4a312180afda0c6fe9ff0e8e9b · notnite.com/moonlight

+1 -1

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

···

       14
       14
        
             { id: "react" },

     

       15
       15
        
             { id: "discord/components/common/index" },

     

       16
       16
        
             { ext: "moonbase", id: "stores" },

     

       17
       17
       +
             { id: "discord/modules/guild_settings/IntegrationCard.css" },

     

       17
       18
        
             "Masks.PANEL_BUTTON",

     

       18
       18
       -
             "renderArtisanalHack(){",

     

       19
       19
        
             '"Missing channel in Channel.openChannelContextMenu"',

     

       20
       20
        
             ".forumOrHome]:"

     

       21
       21
        
           ]

+3 -16

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

···

       7
       7
        
       import { useStateFromStores } from "@moonlight-mod/wp/discord/packages/flux";

     

       8
       8
        
       import Flex from "@moonlight-mod/wp/discord/uikit/Flex";

     

       9
       9
        
       import MarkupUtils from "@moonlight-mod/wp/discord/modules/markup/MarkupUtils";

     

       10
       10
       +
       import IntegrationCard from "@moonlight-mod/wp/discord/modules/guild_settings/IntegrationCard.css";

     

       10
       11
        
       

     

       11
       12
        
       import ExtensionInfo from "./info";

     

       12
       13
        
       import Settings from "./settings";

     
···

       28
       29
        
         "headerContentWrapper"

     

       29
       30
        
       )[0].exports;

     

       30
       31
        
       

     

       31
       31
       -
       const CardClasses: Record<string, string> = {};

     

       32
       32
       -
       spacepack

     

       33
       33
       -
         .lazyLoad(

     

       34
       34
       -
           "renderArtisanalHack",

     

       35
       35
       -
           /\[(?:.\.e\("\d+?"\),?)+\][^}]+?webpackId:\d+,name:"ChannelSettings"/,

     

       36
       36
       -
           /webpackId:(\d+),name:"ChannelSettings"/

     

       37
       37
       -
         )

     

       38
       38
       -
         .then(() =>

     

       39
       39
       -
           Object.assign(

     

       40
       40
       -
             CardClasses,

     

       41
       41
       -
             spacepack.findByExports("card", "cardHeader", "inModal")[0].exports

     

       42
       42
       -
           )

     

       43
       43
       -
         );

     

       44
       44
       -
       

     

       45
       32
        
       export default function ExtensionCard({ uniqueId }: { uniqueId: number }) {

     

       46
       33
        
         const [tab, setTab] = React.useState(ExtensionPage.Info);

     

       47
       34
        
         const [restartNeeded, setRestartNeeded] = React.useState(false);

     
···

       69
       56
        
         const description = ext.manifest?.meta?.description;

     

       70
       57
        
       

     

       71
       58
        
         return (

     

       72
       72
       -
           <Card editable={true} className={CardClasses.card}>

     

       73
       73
       -
             <div className={CardClasses.cardHeader}>

     

       59
       59
       +
           <Card editable={true} className={IntegrationCard.card}>

     

       60
       60
       +
             <div className={IntegrationCard.cardHeader}>

     

       74
       61
        
               <Flex direction={Flex.Direction.VERTICAL}>

     

       75
       62
        
                 <Flex direction={Flex.Direction.HORIZONTAL}>

     

       76
       63
        
                   <Text variant="text-md/semibold">

+1 -2

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

···

       15
       15
        
       import { useStateFromStores } from "@moonlight-mod/wp/discord/packages/flux";

     

       16
       16
        
       import Flex from "@moonlight-mod/wp/discord/uikit/Flex";

     

       17
       17
        
       

     

       18
       18
       -
       import Margins from "@moonlight-mod/wp/discord/styles/shared/Margins.css";

     

       19
       19
       -
       

     

       20
       18
        
       type SettingsProps = {

     

       21
       19
        
         ext: MoonbaseExtension;

     

       22
       20
        
         name: string;

     
···

       27
       25
        
       type SettingsComponent = React.ComponentType<SettingsProps>;

     

       28
       26
        
       

     

       29
       27
        
       import { MoonbaseSettingsStore } from "@moonlight-mod/wp/moonbase_stores";

     

       28
       28
       +
       const Margins = spacepack.require("discord/styles/shared/Margins.css");

     

       30
       29
        
       

     

       31
       30
        
       function useConfigEntry<T>(uniqueId: number, name: string) {

     

       32
       31
        
         return useStateFromStores(

+1 -1

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

···

       6
       6
        
       } from "@moonlight-mod/wp/discord/components/common/index";

     

       7
       7
        
       import { useStateFromStores } from "@moonlight-mod/wp/discord/packages/flux";

     

       8
       8
        
       import { UserSettingsModalStore } from "@moonlight-mod/wp/common_stores";

     

       9
       9
       -
       import Margins from "@moonlight-mod/wp/discord/styles/shared/Margins.css";

     

       10
       9
        
       

     

       11
       10
        
       import ExtensionsPage from "./extensions";

     

       12
       11
        
       import ConfigPage from "./config";

     
···

       19
       18
        
         "setSection",

     

       20
       19
        
         "clearSubsection"

     

       21
       20
        
       )[0].exports.Z;

     

       21
       21
       +
       const Margins = spacepack.require("discord/styles/shared/Margins.css");

     

       22
       22
        
       

     

       23
       23
        
       export const pages: {

     

       24
       24
        
         id: string;

+19 -1

packages/core/src/patch.ts

···

       6
       6
        
         IdentifiedWebpackModule,

     

       7
       7
        
         WebpackJsonp,

     

       8
       8
        
         WebpackJsonpEntry,

     

       9
       9
       -
         WebpackModuleFunc

     

       9
       9
       +
         WebpackModuleFunc,

     

       10
       10
       +
         WebpackRequireType

     

       10
       11
        
       } from "@moonlight-mod/types";

     

       11
       12
        
       import Logger from "./util/logger";

     

       12
       13
        
       import calculateDependencies, { Dependency } from "./util/dependency";

     
···

       18
       19
        
       // Can't be Set because we need splice

     

       19
       20
        
       const patches: IdentifiedPatch[] = [];

     

       20
       21
        
       let webpackModules: Set<IdentifiedWebpackModule> = new Set();

     

       22
       22
       +
       let webpackRequire: WebpackRequireType | null = null;

     

       21
       23
        
       

     

       22
       24
        
       const moduleLoadSubscriptions: Map<string, ((moduleId: string) => void)[]> =

     

       23
       25
        
         new Map();

     
···

       336
       338
        
           inject = true;

     

       337
       339
        
         }

     

       338
       340
        
       

     

       341
       341
       +
         if (webpackRequire != null) {

     

       342
       342
       +
           for (const id of moonlight.moonmap.getLazyModules()) {

     

       343
       343
       +
             webpackRequire.e(id);

     

       344
       344
       +
           }

     

       345
       345
       +
         }

     

       346
       346
       +
       

     

       339
       347
        
         if (inject) {

     

       340
       348
        
           logger.debug("Injecting modules:", modules, entrypoints);

     

       341
       349
        
           window.webpackChunkdiscord_app.push([

     
···

       369
       377
        
       

     

       370
       378
        
         moonlight.lunast.setModuleSourceGetter(moduleSourceGetter);

     

       371
       379
        
         moonlight.moonmap.setModuleSourceGetter(moduleSourceGetter);

     

       380
       380
       +
       

     

       381
       381
       +
         const wpRequireFetcher: WebpackModuleFunc = (module, exports, require) => {

     

       382
       382
       +
           webpackRequire = require;

     

       383
       383
       +
         };

     

       384
       384
       +
         wpRequireFetcher.__moonlight = true;

     

       385
       385
       +
         webpackModules.add({

     

       386
       386
       +
           id: "moonlight",

     

       387
       387
       +
           entrypoint: true,

     

       388
       388
       +
           run: wpRequireFetcher

     

       389
       389
       +
         });

     

       372
       390
        
       

     

       373
       391
        
         let realWebpackJsonp: WebpackJsonp | null = null;

     

       374
       392
        
         Object.defineProperty(window, "webpackChunkdiscord_app", {

+4 -4

packages/types/package.json

···

       9
       9
        
           "./*": "./src/*.ts"

     

       10
       10
        
         },

     

       11
       11
        
         "dependencies": {

     

       12
       12
       +
           "@moonlight-mod/lunast": "^1.0.0",

     

       13
       13
       +
           "@moonlight-mod/mappings": "github:moonlight-mod/mappings",

     

       14
       14
       +
           "@moonlight-mod/moonmap": "^1.0.2",

     

       12
       15
        
           "@types/react": "^18.3.10",

     

       13
       16
        
           "csstype": "^3.1.2",

     

       14
       14
       -
           "standalone-electron-types": "^1.0.0",

     

       15
       15
       -
           "@moonlight-mod/lunast": "^1.0.0",

     

       16
       16
       -
           "@moonlight-mod/moonmap": "^1.0.0",

     

       17
       17
       -
           "@moonlight-mod/mappings": "github:moonlight-mod/mappings"

     

       17
       17
       +
           "standalone-electron-types": "^1.0.0"

     

       18
       18
        
         }

     

       19
       19
        
       }

+2 -8

packages/types/src/mappings.d.ts

···

       29
       29
        
         export = _;

     

       30
       30
        
       }

     

       31
       31
        
       

     

       32
       32
       -
       declare module "@moonlight-mod/wp/react" {

     

       33
       33
       -
         import { MappedModules } from "@moonlight-mod/mappings";

     

       34
       34
       -
         const _: MappedModules.react;

     

       35
       35
       -
         export = _;

     

       36
       36
       -
       }

     

       37
       37
       -
       

     

       38
       32
        
       declare module "@moonlight-mod/wp/discord/uikit/Flex" {

     

       39
       33
        
         import { MappedModules } from "@moonlight-mod/mappings";

     

       40
       34
        
         const _: MappedModules["discord/uikit/Flex"];

     

       41
       35
        
         export = _;

     

       42
       36
        
       }

     

       43
       37
        
       

     

       44
       44
       -
       declare module "@moonlight-mod/wp/discord/styles/shared/Margins.css" {

     

       38
       38
       +
       declare module "@moonlight-mod/wp/react" {

     

       45
       39
        
         import { MappedModules } from "@moonlight-mod/mappings";

     

       46
       46
       -
         const _: MappedModules["discord/styles/shared/Margins.css"];

     

       40
       40
       +
         const _: MappedModules["react"];

     

       47
       41
        
         export = _;

     

       48
       42
        
       }

+3 -3

packages/web-preload/package.json

···

       3
       3
        
         "private": true,

     

       4
       4
        
         "dependencies": {

     

       5
       5
        
           "@moonlight-mod/core": "workspace:*",

     

       6
       6
       -
           "@moonlight-mod/types": "workspace:*",

     

       7
       6
        
           "@moonlight-mod/lunast": "^1.0.0",

     

       8
       8
       -
           "@moonlight-mod/moonmap": "^1.0.0",

     

       9
       9
       -
           "@moonlight-mod/mappings": "github:moonlight-mod/mappings"

     

       7
       7
       +
           "@moonlight-mod/mappings": "github:moonlight-mod/mappings",

     

       8
       8
       +
           "@moonlight-mod/moonmap": "^1.0.2",

     

       9
       9
       +
           "@moonlight-mod/types": "workspace:*"

     

       10
       10
        
         }

     

       11
       11
        
       }

+13 -13

pnpm-lock.yaml

···

       82
       82
        
               version: 1.0.0

     

       83
       83
        
             '@moonlight-mod/mappings':

     

       84
       84
        
               specifier: github:moonlight-mod/mappings

     

       85
       85
       -
               version: https://codeload.github.com/moonlight-mod/mappings/tar.gz/da935616b5a7efa9555fb49bce1ec4f0a0f8f921(@moonlight-mod/lunast@1.0.0)(@moonlight-mod/moonmap@1.0.1)

     

       85
       85
       +
               version: https://codeload.github.com/moonlight-mod/mappings/tar.gz/f49ed20e7ea87a022113550aaa2959d070a5e506(@moonlight-mod/lunast@1.0.0)(@moonlight-mod/moonmap@1.0.2)

     

       86
       86
        
             '@moonlight-mod/moonmap':

     

       87
       87
       -
               specifier: ^1.0.0

     

       88
       88
       -
               version: 1.0.1

     

       87
       87
       +
               specifier: ^1.0.2

     

       88
       88
       +
               version: 1.0.2

     

       89
       89
        
             '@types/react':

     

       90
       90
        
               specifier: ^18.3.10

     

       91
       91
        
               version: 18.3.10

     
···

       106
       106
        
               version: 1.0.0

     

       107
       107
        
             '@moonlight-mod/mappings':

     

       108
       108
        
               specifier: github:moonlight-mod/mappings

     

       109
       109
       -
               version: https://codeload.github.com/moonlight-mod/mappings/tar.gz/da935616b5a7efa9555fb49bce1ec4f0a0f8f921(@moonlight-mod/lunast@1.0.0)(@moonlight-mod/moonmap@1.0.1)

     

       109
       109
       +
               version: https://codeload.github.com/moonlight-mod/mappings/tar.gz/f49ed20e7ea87a022113550aaa2959d070a5e506(@moonlight-mod/lunast@1.0.0)(@moonlight-mod/moonmap@1.0.2)

     

       110
       110
        
             '@moonlight-mod/moonmap':

     

       111
       111
       -
               specifier: ^1.0.0

     

       112
       112
       -
               version: 1.0.1

     

       111
       111
       +
               specifier: ^1.0.2

     

       112
       112
       +
               version: 1.0.2

     

       113
       113
        
             '@moonlight-mod/types':

     

       114
       114
        
               specifier: workspace:*

     

       115
       115
        
               version: link:../types

     
···

       291
       291
        
         '@moonlight-mod/lunast@1.0.0':

     

       292
       292
        
           resolution: {integrity: sha512-kJgf41K12i6/2LbXK97CNO+pNO7ADGh9N4bCQcOPwosocKMcwKHDEZUgPqeihNshY3c3AEW1LiyXjlsl24PdDw==}

     

       293
       293
        
       

     

       294
       294
       -
         '@moonlight-mod/mappings@https://codeload.github.com/moonlight-mod/mappings/tar.gz/da935616b5a7efa9555fb49bce1ec4f0a0f8f921':

     

       295
       295
       -
           resolution: {tarball: https://codeload.github.com/moonlight-mod/mappings/tar.gz/da935616b5a7efa9555fb49bce1ec4f0a0f8f921}

     

       294
       294
       +
         '@moonlight-mod/mappings@https://codeload.github.com/moonlight-mod/mappings/tar.gz/f49ed20e7ea87a022113550aaa2959d070a5e506':

     

       295
       295
       +
           resolution: {tarball: https://codeload.github.com/moonlight-mod/mappings/tar.gz/f49ed20e7ea87a022113550aaa2959d070a5e506}

     

       296
       296
        
           version: 1.0.0

     

       297
       297
        
           peerDependencies:

     

       298
       298
        
             '@moonlight-mod/lunast': ^1.0.0

     

       299
       299
        
             '@moonlight-mod/moonmap': ^1.0.0

     

       300
       300
        
       

     

       301
       301
       -
         '@moonlight-mod/moonmap@1.0.1':

     

       302
       302
       -
           resolution: {integrity: sha512-8pPUn6ShQSGZWKGnrP4A0ngQMldE9RaIxTJ9/XwawGosk72zTKYhjfkfqe/pJS25WXIv79CaMn4TPRRG0LNeOA==}

     

       301
       301
       +
         '@moonlight-mod/moonmap@1.0.2':

     

       302
       302
       +
           resolution: {integrity: sha512-dqMFwk8o0duRfvBNYo6EwalEUWWR3bNF5V2N04ogHp4gYON6/5+XOUrTlQ9BFBDj9anZwGgVwGqnxV42Qs9pPw==}

     

       303
       303
        
       

     

       304
       304
        
         '@nodelib/fs.scandir@2.1.5':

     

       305
       305
        
           resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==}

     
···

       1471
       1471
        
             estree-toolkit: 1.7.8

     

       1472
       1472
        
             meriyah: 6.0.1

     

       1473
       1473
        
       

     

       1474
       1474
       -
         '@moonlight-mod/mappings@https://codeload.github.com/moonlight-mod/mappings/tar.gz/da935616b5a7efa9555fb49bce1ec4f0a0f8f921(@moonlight-mod/lunast@1.0.0)(@moonlight-mod/moonmap@1.0.1)':

     

       1474
       1474
       +
         '@moonlight-mod/mappings@https://codeload.github.com/moonlight-mod/mappings/tar.gz/f49ed20e7ea87a022113550aaa2959d070a5e506(@moonlight-mod/lunast@1.0.0)(@moonlight-mod/moonmap@1.0.2)':

     

       1475
       1475
        
           dependencies:

     

       1476
       1476
        
             '@moonlight-mod/lunast': 1.0.0

     

       1477
       1477
       -
             '@moonlight-mod/moonmap': 1.0.1

     

       1477
       1477
       +
             '@moonlight-mod/moonmap': 1.0.2

     

       1478
       1478
        
             '@types/flux': 3.1.14

     

       1479
       1479
        
             '@types/react': 18.3.10

     

       1480
       1480
        
             csstype: 3.1.3

     

       1481
       1481
        
       

     

       1482
       1482
       -
         '@moonlight-mod/moonmap@1.0.1': {}

     

       1482
       1482
       +
         '@moonlight-mod/moonmap@1.0.2': {}

     

       1483
       1483
        
       

     

       1484
       1484
        
         '@nodelib/fs.scandir@2.1.5':

     

       1485
       1485
        
           dependencies: