commit d4c793e8aad485d6103c642255d9387008e8f2e9 · notnite.com/moonlight

+4 -21

packages/core-extensions/src/common/index.ts

···

       9
       9
        
           ]

     

       10
       10
        
         },

     

       11
       11
        
       

     

       12
       12
       -
         flux: {

     

       13
       13
       -
           dependencies: [{ ext: "spacepack", id: "spacepack" }, "connectStores:"]

     

       14
       14
       -
         },

     

       15
       15
       -
       

     

       16
       16
       -
         fluxDispatcher: {

     

       12
       12
       +
         stores: {

     

       17
       13
        
           dependencies: [

     

       18
       18
       -
             { ext: "spacepack", id: "spacepack" },

     

       19
       19
       -
             "isDispatching",

     

       20
       20
       -
             "dispatch"

     

       14
       14
       +
             {

     

       15
       15
       +
               id: "discord/packages/flux"

     

       16
       16
       +
             }

     

       21
       17
        
           ]

     

       22
       22
       -
         },

     

       23
       23
       -
       

     

       24
       24
       -
         react: {

     

       25
       25
       -
           dependencies: [

     

       26
       26
       -
             { ext: "spacepack", id: "spacepack" },

     

       27
       27
       -
             "__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED",

     

       28
       28
       -
             /\.?version(?:=|:)/,

     

       29
       29
       -
             /\.?createElement(?:=|:)/

     

       30
       30
       -
           ]

     

       31
       31
       -
         },

     

       32
       32
       -
       

     

       33
       33
       -
         stores: {

     

       34
       34
       -
           dependencies: [{ ext: "common", id: "flux" }]

     

       35
       18
        
         }

     

       36
       19
        
       };

-28

packages/core-extensions/src/common/webpackModules/flux.ts

···

       1
       1
       -
       import spacepack from "@moonlight-mod/wp/spacepack_spacepack";

     

       2
       2
       -
       

     

       3
       3
       -
       const mod = spacepack.findByCode("connectStores:")[0].exports;

     

       4
       4
       -
       

     

       5
       5
       -
       const useStateFromStores = spacepack.findFunctionByStrings(

     

       6
       6
       -
         mod,

     

       7
       7
       -
         '"useStateFromStores"'

     

       8
       8
       -
       )!;

     

       9
       9
       -
       

     

       10
       10
       -
       module.exports = {

     

       11
       11
       -
         BatchedStoreListener: spacepack.findFunctionByStrings(

     

       12
       12
       -
           mod,

     

       13
       13
       -
           " tried to load a non-existent store."

     

       14
       14
       -
         ),

     

       15
       15
       -
         Dispatcher: spacepack.findFunctionByStrings(mod, "_dispatchWithDevtools("),

     

       16
       16
       -
         Store: spacepack.findFunctionByStrings(mod, "registerActionHandlers("),

     

       17
       17
       -
         default: mod.ZP,

     

       18
       18
       -
         statesWillNeverBeEqual: spacepack.findFunctionByStrings(mod, "return!1"),

     

       19
       19
       -
         useStateFromStores,

     

       20
       20
       -
         useStateFromStoresArray: spacepack.findFunctionByStrings(

     

       21
       21
       -
           mod,

     

       22
       22
       -
           new RegExp(`return ${useStateFromStores.name}\\(.+?\\.[^Z]\\)`)

     

       23
       23
       -
         ),

     

       24
       24
       -
         useStateFromStoresObject: spacepack.findFunctionByStrings(

     

       25
       25
       -
           mod,

     

       26
       26
       -
           new RegExp(`return ${useStateFromStores.name}\\(.+?\\.Z\\)`)

     

       27
       27
       -
         )

     

       28
       28
       -
       };

-6

packages/core-extensions/src/common/webpackModules/fluxDispatcher.ts

···

       1
       1
       -
       import spacepack from "@moonlight-mod/wp/spacepack_spacepack";

     

       2
       2
       -
       

     

       3
       3
       -
       module.exports = spacepack.findByExports(

     

       4
       4
       -
         "isDispatching",

     

       5
       5
       -
         "dispatch"

     

       6
       6
       -
       )[0].exports.Z;

-7

packages/core-extensions/src/common/webpackModules/react.ts

···

       1
       1
       -
       import spacepack from "@moonlight-mod/wp/spacepack_spacepack";

     

       2
       2
       -
       

     

       3
       3
       -
       module.exports = spacepack.findByCode(

     

       4
       4
       -
         "__SECRET_INTERNALS_DO_NOT_USE" + "_OR_YOU_WILL_BE_FIRED",

     

       5
       5
       -
         /\.?version(?:=|:)/,

     

       6
       6
       -
         /\.?createElement(?:=|:)/

     

       7
       7
       -
       )[0].exports;

+1 -1

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

···

       1
       1
       -
       import Flux from "@moonlight-mod/wp/common_flux";

     

       1
       1
       +
       import Flux from "@moonlight-mod/wp/discord/packages/flux";

     

       2
       2
        
       

     

       3
       3
        
       module.exports = new Proxy(

     

       4
       4
        
         {},

+4 -4

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

···

       3
       3
        
       export const webpackModules: ExtensionWebExports["webpackModules"] = {

     

       4
       4
        
         stores: {

     

       5
       5
        
           dependencies: [

     

       6
       6
       -
             { ext: "common", id: "flux" },

     

       7
       7
       -
             { ext: "common", id: "fluxDispatcher" }

     

       6
       6
       +
             { id: "discord/packages/flux" },

     

       7
       7
       +
             { id: "discord/Dispatcher" }

     

       8
       8
        
           ]

     

       9
       9
        
         },

     

       10
       10
        
       

     

       11
       11
        
         ui: {

     

       12
       12
        
           dependencies: [

     

       13
       13
        
             { ext: "spacepack", id: "spacepack" },

     

       14
       14
       -
             { ext: "common", id: "react" },

     

       14
       14
       +
             { id: "discord/packages/react" },

     

       15
       15
        
             { ext: "common", id: "components" },

     

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

     

       17
       17
        
             "Masks.PANEL_BUTTON",

     
···

       25
       25
        
           dependencies: [

     

       26
       26
        
             { ext: "spacepack", id: "spacepack" },

     

       27
       27
        
             { ext: "settings", id: "settings" },

     

       28
       28
       -
             { ext: "common", id: "react" },

     

       28
       28
       +
             { id: "discord/packages/react" },

     

       29
       29
        
             { ext: "moonbase", id: "ui" }

     

       30
       30
        
           ],

     

       31
       31
        
           entrypoint: true

+1 -1

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

···

       1
       1
        
       import settings from "@moonlight-mod/wp/settings_settings";

     

       2
       2
       -
       import React from "@moonlight-mod/wp/common_react";

     

       2
       2
       +
       import React from "@moonlight-mod/wp/discord/packages/react";

     

       3
       3
        
       import spacepack from "@moonlight-mod/wp/spacepack_spacepack";

     

       4
       4
        
       import { Moonbase, pages } from "@moonlight-mod/wp/moonbase_ui";

     

       5
       5

+2 -2

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

···

       1
       1
        
       import { Config, ExtensionLoadSource } from "@moonlight-mod/types";

     

       2
       2
        
       import { ExtensionState, MoonbaseExtension, MoonbaseNatives } from "../types";

     

       3
       3
       -
       import Flux from "@moonlight-mod/wp/common_flux";

     

       4
       4
       -
       import Dispatcher from "@moonlight-mod/wp/common_fluxDispatcher";

     

       3
       3
       +
       import Flux from "@moonlight-mod/wp/discord/packages/flux";

     

       4
       4
       +
       import { Dispatcher } from "@moonlight-mod/wp/discord/Dispatcher";

     

       5
       5
        
       

     

       6
       6
        
       const natives: MoonbaseNatives = moonlight.getNatives("moonbase");

     

       7
       7
        
       const logger = moonlight.getLogger("moonbase");

+1 -1

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

···

       4
       4
        
         (v) => typeof v === "string"

     

       5
       5
        
       ) as string[];

     

       6
       6
        
       

     

       7
       7
       -
       import React from "@moonlight-mod/wp/common_react";

     

       7
       7
       +
       import React from "@moonlight-mod/wp/discord/packages/react";

     

       8
       8
        
       import spacepack from "@moonlight-mod/wp/spacepack_spacepack";

     

       9
       9
        
       import {

     

       10
       10
        
         FormDivider,

+2 -2

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

···

       1
       1
        
       import { ExtensionState } from "../../../types";

     

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

     

       3
       3
        
       

     

       4
       4
       -
       import React from "@moonlight-mod/wp/common_react";

     

       5
       4
        
       import spacepack from "@moonlight-mod/wp/spacepack_spacepack";

     

       6
       5
        
       import CommonComponents from "@moonlight-mod/wp/common_components";

     

       7
       7
       -
       import * as Flux from "@moonlight-mod/wp/common_flux";

     

       6
       6
       +
       import React from "@moonlight-mod/wp/discord/packages/react";

     

       7
       7
       +
       import Flux from "@moonlight-mod/wp/discord/packages/flux";

     

       8
       8
        
       

     

       9
       9
        
       import ExtensionInfo from "./info";

     

       10
       10
        
       import Settings from "./settings";

+2 -2

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

···

       1
       1
        
       import { tagNames } from "./info";

     

       2
       2
        
       

     

       3
       3
        
       import spacepack from "@moonlight-mod/wp/spacepack_spacepack";

     

       4
       4
       -
       import React from "@moonlight-mod/wp/common_react";

     

       5
       5
       -
       import * as Flux from "@moonlight-mod/wp/common_flux";

     

       4
       4
       +
       import React from "@moonlight-mod/wp/discord/packages/react";

     

       5
       5
       +
       import Flux from "@moonlight-mod/wp/discord/packages/flux";

     

       6
       6
        
       import { WindowStore } from "@moonlight-mod/wp/common_stores";

     

       7
       7
        
       import {

     

       8
       8
        
         Button,

+2 -2

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

···

       3
       3
        
       import FilterBar, { Filter, defaultFilter } from "./filterBar";

     

       4
       4
        
       import ExtensionCard from "./card";

     

       5
       5
        
       

     

       6
       6
       -
       import React from "@moonlight-mod/wp/common_react";

     

       6
       6
       +
       import React from "@moonlight-mod/wp/discord/packages/react";

     

       7
       7
        
       import spacepack from "@moonlight-mod/wp/spacepack_spacepack";

     

       8
       8
       -
       import * as Flux from "@moonlight-mod/wp/common_flux";

     

       8
       8
       +
       import Flux from "@moonlight-mod/wp/discord/packages/flux";

     

       9
       9
        
       

     

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

     

       11
       11

+1 -1

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

···

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

     

       2
       2
        
       import { MoonbaseExtension } from "../../../types";

     

       3
       3
        
       

     

       4
       4
       -
       import React from "@moonlight-mod/wp/common_react";

     

       4
       4
       +
       import React from "@moonlight-mod/wp/discord/packages/react";

     

       5
       5
        
       import CommonComponents from "@moonlight-mod/wp/common_components";

     

       6
       6
        
       import spacepack from "@moonlight-mod/wp/spacepack_spacepack";

     

       7
       7

+2 -2

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

···

       9
       9
        
       

     

       10
       10
        
       import { ExtensionState, MoonbaseExtension } from "../../../types";

     

       11
       11
        
       

     

       12
       12
       -
       import React from "@moonlight-mod/wp/common_react";

     

       12
       12
       +
       import React from "@moonlight-mod/wp/discord/packages/react";

     

       13
       13
        
       import CommonComponents from "@moonlight-mod/wp/common_components";

     

       14
       14
       -
       import * as Flux from "@moonlight-mod/wp/common_flux";

     

       14
       14
       +
       import Flux from "@moonlight-mod/wp/discord/packages/flux";

     

       15
       15
        
       import spacepack from "@moonlight-mod/wp/spacepack_spacepack";

     

       16
       16
        
       

     

       17
       17
        
       type SettingsProps = {

+2 -2

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

···

       1
       1
       -
       import React from "@moonlight-mod/wp/common_react";

     

       1
       1
       +
       import React from "@moonlight-mod/wp/discord/packages/react";

     

       2
       2
        
       import spacepack from "@moonlight-mod/wp/spacepack_spacepack";

     

       3
       3
        
       import { Text, TabBar } from "@moonlight-mod/wp/common_components";

     

       4
       4
       -
       import * as Flux from "@moonlight-mod/wp/common_flux";

     

       4
       4
       +
       import Flux from "@moonlight-mod/wp/discord/packages/flux";

     

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

     

       6
       6
        
       

     

       7
       7
        
       import ExtensionsPage from "./extensions";

+1 -3

packages/core/src/extension.ts

···

       8
       8
        
       import requireImport from "./util/import";

     

       9
       9
        
       import { getCoreExtensionsPath, getExtensionsPath } from "./util/data";

     

       10
       10
        
       

     

       11
       11
       -
       export const API_LEVEL: number = 2;

     

       12
       12
       -
       

     

       13
       11
        
       function findManifests(dir: string): string[] {

     

       14
       12
        
         const fs = requireImport("fs");

     

       15
       13
        
         const path = requireImport("path");

     
···

       47
       45
        
             fs.readFileSync(manifestPath, "utf8")

     

       48
       46
        
           );

     

       49
       47
        
           const level = manifest.apiLevel ?? 1;

     

       50
       50
       -
           if (level < API_LEVEL) {

     

       48
       48
       +
           if (level < constants.apiLevel) {

     

       51
       49
        
             continue;

     

       52
       50
        
           }

     

       53
       51

+24 -15

packages/core/src/patch.ts

···

       199
       199
        
       */

     

       200
       200
        
       let chunkId = Number.MAX_SAFE_INTEGER;

     

       201
       201
        
       

     

       202
       202
       +
       function depToString(x: ExplicitExtensionDependency) {

     

       203
       203
       +
         return x.ext != null ? `${x.ext}_${x.id}` : x.id;

     

       204
       204
       +
       }

     

       205
       205
       +
       

     

       202
       206
        
       function handleModuleDependencies() {

     

       203
       207
        
         const modules = Array.from(webpackModules.values());

     

       204
       208
        
       

     

       205
       209
        
         const dependencies: Dependency<string, IdentifiedWebpackModule>[] =

     

       206
       210
        
           modules.map((wp) => {

     

       207
       211
        
             return {

     

       208
       208
       -
               id: `${wp.ext}_${wp.id}`,

     

       212
       212
       +
               id: depToString(wp),

     

       209
       213
        
               data: wp

     

       210
       214
        
             };

     

       211
       215
        
           });

     

       212
       216
        
       

     

       213
       217
        
         const [sorted, _] = calculateDependencies(dependencies, {

     

       214
       218
        
           fetchDep: (id) => {

     

       215
       215
       -
             return modules.find((x) => id === `${x.ext}_${x.id}`) ?? null;

     

       219
       219
       +
             return modules.find((x) => id === depToString(x)) ?? null;

     

       216
       220
        
           },

     

       217
       221
        
       

     

       218
       222
        
           getDeps: (item) => {

     

       219
       223
        
             const deps = item.data?.dependencies ?? [];

     

       220
       224
        
             return (

     

       221
       225
        
               deps.filter(

     

       222
       222
       -
                 (dep) => !(dep instanceof RegExp || typeof dep === "string")

     

       226
       226
       +
                 (dep) =>

     

       227
       227
       +
                   !(dep instanceof RegExp || typeof dep === "string") &&

     

       228
       228
       +
                   dep.ext != null

     

       223
       229
        
               ) as ExplicitExtensionDependency[]

     

       224
       224
       -
             ).map((x) => `${x.ext}_${x.id}`);

     

       230
       230
       +
             ).map(depToString);

     

       225
       231
        
           }

     

       226
       232
        
         });

     

       227
       233
        
       

     
···

       234
       240
        
         const entrypoints: string[] = [];

     

       235
       241
        
         let inject = false;

     

       236
       242
        
       

     

       237
       237
       -
         for (const [name, func] of Object.entries(

     

       238
       238
       -
           moonlight.moonmap.getWebpackModules("window.moonlight.moonmap")

     

       239
       239
       -
         )) {

     

       240
       240
       -
           modules[name] = func;

     

       241
       241
       -
           inject = true;

     

       242
       242
       -
         }

     

       243
       243
       -
       

     

       244
       243
        
         for (const [_modId, mod] of Object.entries(entry)) {

     

       245
       244
        
           const modStr = mod.toString();

     

       246
       245
        
           for (const wpModule of webpackModules) {

     

       247
       247
       -
             const id = wpModule.ext + "_" + wpModule.id;

     

       246
       246
       +
             const id = depToString(wpModule);

     

       248
       247
        
             if (wpModule.dependencies) {

     

       249
       248
        
               const deps = new Set(wpModule.dependencies);

     

       250
       249
        
       

     
···

       257
       256
        
                   } else if (dep instanceof RegExp) {

     

       258
       257
        
                     if (dep.test(modStr)) deps.delete(dep);

     

       259
       258
        
                   } else if (

     

       260
       260
       -
                     injectedWpModules.find(

     

       261
       261
       -
                       (x) => x.ext === dep.ext && x.id === dep.id

     

       262
       262
       -
                     )

     

       259
       259
       +
                     dep.ext != null

     

       260
       260
       +
                       ? injectedWpModules.find(

     

       261
       261
       +
                           (x) => x.ext === dep.ext && x.id === dep.id

     

       262
       262
       +
                         )

     

       263
       263
       +
                       : injectedWpModules.find((x) => x.id === dep.id)

     

       263
       264
        
                   ) {

     

       264
       265
        
                     deps.delete(dep);

     

       265
       266
        
                   }

     
···

       287
       288
        
             if (wpModule.entrypoint) entrypoints.push(id);

     

       288
       289
        
           }

     

       289
       290
        
           if (!webpackModules.size) break;

     

       291
       291
       +
         }

     

       292
       292
       +
       

     

       293
       293
       +
         for (const [name, func] of Object.entries(

     

       294
       294
       +
           moonlight.moonmap.getWebpackModules("window.moonlight.moonmap")

     

       295
       295
       +
         )) {

     

       296
       296
       +
           injectedWpModules.push({ id: name, run: func });

     

       297
       297
       +
           modules[name] = func;

     

       298
       298
       +
           inject = true;

     

       290
       299
        
         }

     

       291
       300
        
       

     

       292
       301
        
         if (inject) {

+1 -2

packages/types/package.json

···

       11
       11
        
         "dependencies": {

     

       12
       12
        
           "@moonlight-mod/lunast": "git+https://github.com/moonlight-mod/lunast.git",

     

       13
       13
        
           "@moonlight-mod/moonmap": "git+https://github.com/moonlight-mod/moonmap.git",

     

       14
       14
       -
           "@types/flux": "^3.1.12",

     

       15
       15
       -
           "@types/react": "^18.2.22",

     

       14
       14
       +
           "@moonlight-mod/mappings": "git+https://github.com/moonlight-mod/mappings.git",

     

       16
       15
        
           "csstype": "^3.1.2",

     

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

     

       18
       17
        
         }

+2

packages/types/src/constants.ts

···

       8
       8
        
       export const ipcGetIsMoonlightDesktop = "_moonlight_getIsMoonlightDesktop";

     

       9
       9
        
       export const ipcMessageBox = "_moonlight_messageBox";

     

       10
       10
        
       export const ipcSetCorsList = "_moonlight_setCorsList";

     

       11
       11
       +
       

     

       12
       12
       +
       export const apiLevel = 2;

+1 -27

packages/types/src/coreExtensions.ts

···

       1
       1
       -
       import { FluxDefault, Store } from "./discord/common/Flux";

     

       2
       1
        
       import { CommonComponents as CommonComponents_ } from "./coreExtensions/components";

     

       3
       3
       -
       import { Dispatcher } from "flux";

     

       4
       2
        
       import React, { ReactElement } from "react";

     

       5
       3
        
       import {

     

       6
       4
        
         WebpackModule,

     

       7
       5
        
         WebpackModuleFunc,

     

       8
       6
        
         WebpackRequireType

     

       9
       7
        
       } from "./discord";

     

       8
       8
       +
       import type { Store } from "@moonlight-mod/mappings/discord/packages/flux";

     

       10
       9
        
       

     

       11
       10
        
       export type Spacepack = {

     

       12
       11
        
         inspect: (module: number | string) => WebpackModuleFunc | null;

     
···

       73
       72
        
         _mutateSections: (sections: SettingsSection[]) => SettingsSection[];

     

       74
       73
        
       };

     

       75
       74
        
       

     

       76
       76
       -
       export type CommonReact = typeof import("react");

     

       77
       77
       -
       export type CommonFlux = FluxDefault;

     

       78
       75
        
       export type CommonComponents = CommonComponents_; // lol

     

       79
       79
       -
       export type CommonFluxDispatcher = Dispatcher<any> & {

     

       80
       80
       -
         dispatch: (payload: any) => void;

     

       81
       81
       -
         isDispatching: () => boolean;

     

       82
       82
       -
       

     

       83
       83
       -
         addInterceptor: (interceptor: (event: any) => boolean | undefined) => void;

     

       84
       84
       -
       

     

       85
       85
       -
         flushWaitQueue: () => void;

     

       86
       86
       -
         wait: (callback: () => void) => void;

     

       87
       87
       -
       

     

       88
       88
       -
         subscribe: (eventType: string, callback: (event: any) => void) => void;

     

       89
       89
       -
         unsubscribe: (eventType: string, callback: (event: any) => void) => void;

     

       90
       90
       -
       

     

       91
       91
       -
         register: (

     

       92
       92
       -
           name: string,

     

       93
       93
       -
           actionHandlers: Record<string, (event: any) => void>,

     

       94
       94
       -
           storeDidChange: (event: any) => void,

     

       95
       95
       -
           band: number,

     

       96
       96
       -
           token: string

     

       97
       97
       -
         ) => number;

     

       98
       98
       -
       

     

       99
       99
       -
         createToken: () => string;

     

       100
       100
       -
         addDependencies: (id: string, deps: string[]) => void;

     

       101
       101
       -
       };

     

       102
       76
        
       

     

       103
       77
        
       export * as Markdown from "./coreExtensions/markdown";

     

       104
       78
        
       export * as ContextMenu from "./coreExtensions/contextMenu";

-57

packages/types/src/discord/common/Flux.ts

···

       1
       1
       -
       /*

     

       2
       2
       -
         It seems like Discord maintains their own version of Flux that doesn't match

     

       3
       3
       -
         the types on NPM. This is a heavy work in progress - if you encounter rough

     

       4
       4
       -
         edges, please contribute!

     

       5
       5
       -
       */

     

       6
       6
       -
       

     

       7
       7
       -
       import { DependencyList } from "react";

     

       8
       8
       -
       import { Store as FluxStore } from "flux/utils";

     

       9
       9
       -
       import { Dispatcher as FluxDispatcher } from "flux";

     

       10
       10
       -
       import { ComponentConstructor } from "flux/lib/FluxContainer";

     

       11
       11
       -
       

     

       12
       12
       -
       export declare abstract class Store<T> extends FluxStore<T> {

     

       13
       13
       -
         static getAll: () => Store<any>[];

     

       14
       14
       -
         getName: () => string;

     

       15
       15
       -
         emitChange: () => void;

     

       16
       16
       -
       }

     

       17
       17
       -
       

     

       18
       18
       -
       interface ConnectStores {

     

       19
       19
       -
         <T>(

     

       20
       20
       -
           stores: Store<any>[],

     

       21
       21
       -
           callback: T,

     

       22
       22
       -
           context?: any

     

       23
       23
       -
         ): ComponentConstructor<T>;

     

       24
       24
       -
       }

     

       25
       25
       -
       

     

       26
       26
       -
       export type FluxDefault = {

     

       27
       27
       -
         DeviceSettingsStore: any; // TODO

     

       28
       28
       -
         Emitter: any; // @types/fbemitter

     

       29
       29
       -
         OfflineCacheStore: any; // TODO

     

       30
       30
       -
         PersistedStore: any; // TODO

     

       31
       31
       -
         Store: typeof Store;

     

       32
       32
       -
         Dispatcher: typeof FluxDispatcher;

     

       33
       33
       -
         connectStores: ConnectStores;

     

       34
       34
       -
         initialize: () => void;

     

       35
       35
       -
         initialized: Promise<boolean>;

     

       36
       36
       -
         destroy: () => void;

     

       37
       37
       -
         useStateFromStores: UseStateFromStores;

     

       38
       38
       -
         useStateFromStoresArray: UseStateFromStoresArray;

     

       39
       39
       -
         useStateFromStoresObject: UseStateFromStoresObject;

     

       40
       40
       -
       };

     

       41
       41
       -
       

     

       42
       42
       -
       interface UseStateFromStores {

     

       43
       43
       -
         <T>(

     

       44
       44
       -
           stores: Store<any>[],

     

       45
       45
       -
           callback: () => T,

     

       46
       46
       -
           deps?: DependencyList,

     

       47
       47
       -
           shouldUpdate?: (oldState: T, newState: T) => boolean

     

       48
       48
       -
         ): T;

     

       49
       49
       -
       }

     

       50
       50
       -
       

     

       51
       51
       -
       interface UseStateFromStoresArray {

     

       52
       52
       -
         <T>(stores: Store<any>[], callback: () => T, deps?: DependencyList): T;

     

       53
       53
       -
       }

     

       54
       54
       -
       

     

       55
       55
       -
       interface UseStateFromStoresObject {

     

       56
       56
       -
         <T>(stores: Store<any>[], callback: () => T, deps?: DependencyList): T;

     

       57
       57
       -
       }

+1 -13

packages/types/src/discord/require.ts

···

       1
       1
       -
       import {

     

       2
       2
       -
         Spacepack,

     

       3
       3
       -
         CommonReact,

     

       4
       4
       -
         CommonFlux,

     

       5
       5
       -
         Settings,

     

       6
       6
       -
         CommonComponents,

     

       7
       7
       -
         CommonFluxDispatcher

     

       8
       8
       -
       } from "../coreExtensions";

     

       1
       1
       +
       import { Spacepack, Settings, CommonComponents } from "../coreExtensions";

     

       9
       2
        
       import { ContextMenu, EvilItemParser } from "../coreExtensions/contextMenu";

     

       10
       3
        
       import { Markdown } from "../coreExtensions/markdown";

     

       11
       4
        
       

     
···

       16
       9
        
       };

     

       17
       10
        
       

     

       18
       11
        
       declare function WebpackRequire(id: "common_components"): CommonComponents;

     

       19
       19
       -
       declare function WebpackRequire(id: "common_flux"): CommonFlux;

     

       20
       20
       -
       declare function WebpackRequire(

     

       21
       21
       -
         id: "common_fluxDispatcher"

     

       22
       22
       -
       ): CommonFluxDispatcher;

     

       23
       23
       -
       declare function WebpackRequire(id: "common_react"): CommonReact;

     

       24
       12
        
       

     

       25
       13
        
       declare function WebpackRequire(id: "settings_settings"): {

     

       26
       14
        
         Settings: Settings;

+1 -1

packages/types/src/extension.ts

···

       101
       101
        
       };

     

       102
       102
        
       

     

       103
       103
        
       export type ExplicitExtensionDependency = {

     

       104
       104
       -
         ext: string;

     

       104
       104
       +
         ext?: string;

     

       105
       105
        
         id: string;

     

       106
       106
        
       };

     

       107
       107

-18

packages/types/src/import.d.ts

···

       10
       10
        
         export = CommonComponent;

     

       11
       11
        
       }

     

       12
       12
        
       

     

       13
       13
       -
       declare module "@moonlight-mod/wp/common_flux" {

     

       14
       14
       -
         import { CoreExtensions } from "@moonlight-mod/types";

     

       15
       15
       -
         const Flux: CoreExtensions.CommonFlux;

     

       16
       16
       -
         // FIXME: This is wrong, the default export differs from the named exports.

     

       17
       17
       -
         export = Flux;

     

       18
       18
       -
       }

     

       19
       19
       -
       

     

       20
       20
       -
       declare module "@moonlight-mod/wp/common_fluxDispatcher" {

     

       21
       21
       -
         import { CoreExtensions } from "@moonlight-mod/types";

     

       22
       22
       -
         const Dispatcher: CoreExtensions.CommonFluxDispatcher;

     

       23
       23
       -
         export default Dispatcher;

     

       24
       24
       -
       }

     

       25
       25
       -
       

     

       26
       13
        
       declare module "@moonlight-mod/wp/common_stores";

     

       27
       27
       -
       

     

       28
       28
       -
       declare module "@moonlight-mod/wp/common_react" {

     

       29
       29
       -
         import React from "react";

     

       30
       30
       -
         export = React;

     

       31
       31
       -
       }

     

       32
       14
        
       

     

       33
       15
        
       declare module "@moonlight-mod/wp/settings_settings" {

     

       34
       16
        
         import { CoreExtensions } from "@moonlight-mod/types";

+1 -1

packages/types/src/index.ts

···

       1
       1
        
       /// <reference types="standalone-electron-types" />

     

       2
       2
        
       /// <reference types="react" />

     

       3
       3
       -
       /// <reference types="flux" />

     

       4
       3
        
       /// <reference types="./import" />

     

       4
       4
       +
       /// <reference types="./mappings" />

     

       5
       5
        
       /* eslint-disable no-var */

     

       6
       6
        
       

     

       7
       7
        
       import {

+18

packages/types/src/mappings.d.ts

···

       1
       1
       +
       // auto-generated

     

       2
       2
       +
       declare module "@moonlight-mod/wp/discord/Dispatcher" {

     

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

     

       4
       4
       +
         const _: MappedModules["discord/Dispatcher"];

     

       5
       5
       +
         export = _;

     

       6
       6
       +
       }

     

       7
       7
       +
       

     

       8
       8
       +
       declare module "@moonlight-mod/wp/discord/packages/flux" {

     

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

     

       10
       10
       +
         const _: MappedModules["discord/packages/flux"];

     

       11
       11
       +
         export = _;

     

       12
       12
       +
       }

     

       13
       13
       +
       

     

       14
       14
       +
       declare module "@moonlight-mod/wp/discord/packages/react" {

     

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

     

       16
       16
       +
         const _: MappedModules["discord/packages/react"];

     

       17
       17
       +
         export = _;

     

       18
       18
       +
       }

+1

packages/web-preload/package.json

···

       3
       3
        
         "private": true,

     

       4
       4
        
         "dependencies": {

     

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

     

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

     

       6
       7
        
           "@moonlight-mod/lunast": "git+https://github.com/moonlight-mod/lunast.git",

     

       7
       8
        
           "@moonlight-mod/moonmap": "git+https://github.com/moonlight-mod/moonmap.git",

     

       8
       9
        
           "@moonlight-mod/mappings": "git+https://github.com/moonlight-mod/mappings.git"

+2 -2

packages/web-preload/src/index.ts

···

       1
       1
        
       import { loadProcessedExtensions } from "@moonlight-mod/core/extension/loader";

     

       2
       2
       -
       import { API_LEVEL } from "@moonlight-mod/core/extension";

     

       3
       2
        
       import { installWebpackPatcher } from "@moonlight-mod/core/patch";

     

       3
       3
       +
       import { constants } from "@moonlight-mod/types";

     

       4
       4
        
       import { installStyles } from "@moonlight-mod/core/styles";

     

       5
       5
        
       import Logger from "@moonlight-mod/core/util/logger";

     

       6
       6
        
       import LunAST from "@moonlight-mod/lunast";

     
···

       11
       11
        
         const logger = new Logger("web-preload");

     

       12
       12
        
       

     

       13
       13
        
         window.moonlight = {

     

       14
       14
       -
           apiLevel: API_LEVEL,

     

       14
       14
       +
           apiLevel: constants.apiLevel,

     

       15
       15
        
           unpatched: new Set(),

     

       16
       16
        
           pendingModules: new Set(),

     

       17
       17
        
           enabledExtensions: new Set(),

+18 -50

pnpm-lock.yaml

···

       49
       49
        
               version: https://codeload.github.com/moonlight-mod/lunast/tar.gz/af98b963bf8b6d00301229b094811a55f96eca0a

     

       50
       50
        
             '@moonlight-mod/moonmap':

     

       51
       51
        
               specifier: git+https://github.com/moonlight-mod/moonmap.git

     

       52
       52
       -
               version: https://codeload.github.com/moonlight-mod/moonmap/tar.gz/79cfb0f84f62c910ff6eb3cf314e045110b9d319

     

       52
       52
       +
               version: https://codeload.github.com/moonlight-mod/moonmap/tar.gz/ad6ee2686333058e5547b0de3f541549a15e964d

     

       53
       53
        
             '@moonlight-mod/types':

     

       54
       54
        
               specifier: workspace:*

     

       55
       55
        
               version: link:../types

     
···

       86
       86
        
             '@moonlight-mod/lunast':

     

       87
       87
        
               specifier: git+https://github.com/moonlight-mod/lunast.git

     

       88
       88
        
               version: https://codeload.github.com/moonlight-mod/lunast/tar.gz/af98b963bf8b6d00301229b094811a55f96eca0a

     

       89
       89
       +
             '@moonlight-mod/mappings':

     

       90
       90
       +
               specifier: git+https://github.com/moonlight-mod/mappings.git

     

       91
       91
       +
               version: https://codeload.github.com/moonlight-mod/mappings/tar.gz/ef58fe14b233837ab55ac2713785a4cfb73178cb(@moonlight-mod/lunast@https://codeload.github.com/moonlight-mod/lunast/tar.gz/af98b963bf8b6d00301229b094811a55f96eca0a)(@moonlight-mod/moonmap@https://codeload.github.com/moonlight-mod/moonmap/tar.gz/ad6ee2686333058e5547b0de3f541549a15e964d)

     

       89
       92
        
             '@moonlight-mod/moonmap':

     

       90
       93
        
               specifier: git+https://github.com/moonlight-mod/moonmap.git

     

       91
       91
       -
               version: https://codeload.github.com/moonlight-mod/moonmap/tar.gz/79cfb0f84f62c910ff6eb3cf314e045110b9d319

     

       92
       92
       -
             '@types/flux':

     

       93
       93
       -
               specifier: ^3.1.12

     

       94
       94
       -
               version: 3.1.12

     

       95
       95
       -
             '@types/react':

     

       96
       96
       -
               specifier: ^18.2.22

     

       97
       97
       -
               version: 18.2.22

     

       94
       94
       +
               version: https://codeload.github.com/moonlight-mod/moonmap/tar.gz/ad6ee2686333058e5547b0de3f541549a15e964d

     

       98
       95
        
             csstype:

     

       99
       96
        
               specifier: ^3.1.2

     

       100
       97
        
               version: 3.1.2

     
···

       112
       109
        
               version: https://codeload.github.com/moonlight-mod/lunast/tar.gz/af98b963bf8b6d00301229b094811a55f96eca0a

     

       113
       110
        
             '@moonlight-mod/mappings':

     

       114
       111
        
               specifier: git+https://github.com/moonlight-mod/mappings.git

     

       115
       115
       -
               version: https://codeload.github.com/moonlight-mod/mappings/tar.gz/8512c9df931a4a62a03e23c64a7d378602806128(@moonlight-mod/lunast@https://codeload.github.com/moonlight-mod/lunast/tar.gz/af98b963bf8b6d00301229b094811a55f96eca0a)(@moonlight-mod/moonmap@https://codeload.github.com/moonlight-mod/moonmap/tar.gz/79cfb0f84f62c910ff6eb3cf314e045110b9d319)

     

       112
       112
       +
               version: https://codeload.github.com/moonlight-mod/mappings/tar.gz/ef58fe14b233837ab55ac2713785a4cfb73178cb(@moonlight-mod/lunast@https://codeload.github.com/moonlight-mod/lunast/tar.gz/af98b963bf8b6d00301229b094811a55f96eca0a)(@moonlight-mod/moonmap@https://codeload.github.com/moonlight-mod/moonmap/tar.gz/ad6ee2686333058e5547b0de3f541549a15e964d)

     

       116
       113
        
             '@moonlight-mod/moonmap':

     

       117
       114
        
               specifier: git+https://github.com/moonlight-mod/moonmap.git

     

       118
       118
       -
               version: https://codeload.github.com/moonlight-mod/moonmap/tar.gz/79cfb0f84f62c910ff6eb3cf314e045110b9d319

     

       115
       115
       +
               version: https://codeload.github.com/moonlight-mod/moonmap/tar.gz/ad6ee2686333058e5547b0de3f541549a15e964d

     

       116
       116
       +
             '@moonlight-mod/types':

     

       117
       117
       +
               specifier: workspace:*

     

       118
       118
       +
               version: link:../types

     

       119
       119
        
       

     

       120
       120
        
       packages:

     

       121
       121
        
       

     
···

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

     

       296
       296
        
           version: 1.0.0

     

       297
       297
        
       

     

       298
       298
       -
         '@moonlight-mod/mappings@https://codeload.github.com/moonlight-mod/mappings/tar.gz/8512c9df931a4a62a03e23c64a7d378602806128':

     

       299
       299
       -
           resolution: {tarball: https://codeload.github.com/moonlight-mod/mappings/tar.gz/8512c9df931a4a62a03e23c64a7d378602806128}

     

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

     

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

     

       300
       300
        
           version: 1.0.0

     

       301
       301
        
           peerDependencies:

     

       302
       302
        
             '@moonlight-mod/lunast': git+https://github.com/moonlight-mod/lunast.git

     

       303
       303
        
             '@moonlight-mod/moonmap': git+https://github.com/moonlight-mod/moonmap.git

     

       304
       304
        
       

     

       305
       305
       -
         '@moonlight-mod/moonmap@https://codeload.github.com/moonlight-mod/moonmap/tar.gz/79cfb0f84f62c910ff6eb3cf314e045110b9d319':

     

       306
       306
       -
           resolution: {tarball: https://codeload.github.com/moonlight-mod/moonmap/tar.gz/79cfb0f84f62c910ff6eb3cf314e045110b9d319}

     

       305
       305
       +
         '@moonlight-mod/moonmap@https://codeload.github.com/moonlight-mod/moonmap/tar.gz/ad6ee2686333058e5547b0de3f541549a15e964d':

     

       306
       306
       +
           resolution: {tarball: https://codeload.github.com/moonlight-mod/moonmap/tar.gz/ad6ee2686333058e5547b0de3f541549a15e964d}

     

       307
       307
        
           version: 1.0.0

     

       308
       308
        
       

     

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

     
···

       328
       328
        
         '@types/estree@1.0.6':

     

       329
       329
        
           resolution: {integrity: sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==}

     

       330
       330
        
       

     

       331
       331
       -
         '@types/fbemitter@2.0.33':

     

       332
       332
       -
           resolution: {integrity: sha512-KcSilwdl0D8YgXGL6l9d+rTBm2W7pDyTZrDEw0+IzqQ724676KJtMeO+xHodJewKFWZT+GFWaJubA5mpMxSkcg==}

     

       333
       333
       -
       

     

       334
       334
       -
         '@types/flux@3.1.12':

     

       335
       335
       -
           resolution: {integrity: sha512-HZ8o/DTVNgcgnXoDyn0ZnjqEZMT4Chr4w5ktMQSbQAnqVDklasmRqNGd2agZDsk5i0jYHQLgQQuM782bWG7fUA==}

     

       336
       336
       -
       

     

       337
       331
        
         '@types/json-schema@7.0.15':

     

       338
       332
        
           resolution: {integrity: sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==}

     

       339
       333
        
       

     

       340
       334
        
         '@types/node@18.17.17':

     

       341
       335
        
           resolution: {integrity: sha512-cOxcXsQ2sxiwkykdJqvyFS+MLQPLvIdwh5l6gNg8qF6s+C7XSkEWOZjK+XhUZd+mYvHV/180g2cnCcIl4l06Pw==}

     

       342
       342
       -
       

     

       343
       343
       -
         '@types/prop-types@15.7.6':

     

       344
       344
       -
           resolution: {integrity: sha512-RK/kBbYOQQHLYj9Z95eh7S6t7gq4Ojt/NT8HTk8bWVhA5DaF+5SMnxHKkP4gPNN3wAZkKP+VjAf0ebtYzf+fxg==}

     

       345
       345
       -
       

     

       346
       346
       -
         '@types/react@18.2.22':

     

       347
       347
       -
           resolution: {integrity: sha512-60fLTOLqzarLED2O3UQImc/lsNRgG0jE/a1mPW9KjMemY0LMITWEsbS4VvZ4p6rorEHd5YKxxmMKSDK505GHpA==}

     

       348
       348
       -
       

     

       349
       349
       -
         '@types/scheduler@0.16.3':

     

       350
       350
       -
           resolution: {integrity: sha512-5cJ8CB4yAx7BH1oMvdU0Jh9lrEXyPkar6F9G/ERswkCuvP4KQZfZkSjcMbAICCpQTN4OuZn8tz0HiKv9TGZgrQ==}

     

       351
       336
        
       

     

       352
       337
        
         '@types/semver@7.5.6':

     

       353
       338
        
           resolution: {integrity: sha512-dn1l8LaMea/IjDoHNd9J52uBbInB796CDffS6VdIxvqYCPSG0V0DzHp76GpaWnlhg88uYyPbXCDIowa86ybd5A==}

     
···

       519
       504
        
           engines: {node: '>= 6'}

     

       520
       505
        
       

     

       521
       506
        
         concat-map@0.0.1:

     

       522
       522
       -
           resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=}

     

       507
       507
       +
           resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==}

     

       523
       508
        
       

     

       524
       509
        
         cross-spawn@7.0.3:

     

       525
       510
        
           resolution: {integrity: sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==}

     
···

       1476
       1461
        
             estree-toolkit: 1.7.8

     

       1477
       1462
        
             meriyah: 6.0.1

     

       1478
       1463
        
       

     

       1479
       1479
       -
         '@moonlight-mod/mappings@https://codeload.github.com/moonlight-mod/mappings/tar.gz/8512c9df931a4a62a03e23c64a7d378602806128(@moonlight-mod/lunast@https://codeload.github.com/moonlight-mod/lunast/tar.gz/af98b963bf8b6d00301229b094811a55f96eca0a)(@moonlight-mod/moonmap@https://codeload.github.com/moonlight-mod/moonmap/tar.gz/79cfb0f84f62c910ff6eb3cf314e045110b9d319)':

     

       1464
       1464
       +
         '@moonlight-mod/mappings@https://codeload.github.com/moonlight-mod/mappings/tar.gz/ef58fe14b233837ab55ac2713785a4cfb73178cb(@moonlight-mod/lunast@https://codeload.github.com/moonlight-mod/lunast/tar.gz/af98b963bf8b6d00301229b094811a55f96eca0a)(@moonlight-mod/moonmap@https://codeload.github.com/moonlight-mod/moonmap/tar.gz/ad6ee2686333058e5547b0de3f541549a15e964d)':

     

       1480
       1465
        
           dependencies:

     

       1481
       1466
        
             '@moonlight-mod/lunast': https://codeload.github.com/moonlight-mod/lunast/tar.gz/af98b963bf8b6d00301229b094811a55f96eca0a

     

       1482
       1482
       -
             '@moonlight-mod/moonmap': https://codeload.github.com/moonlight-mod/moonmap/tar.gz/79cfb0f84f62c910ff6eb3cf314e045110b9d319

     

       1467
       1467
       +
             '@moonlight-mod/moonmap': https://codeload.github.com/moonlight-mod/moonmap/tar.gz/ad6ee2686333058e5547b0de3f541549a15e964d

     

       1483
       1468
        
       

     

       1484
       1484
       -
         '@moonlight-mod/moonmap@https://codeload.github.com/moonlight-mod/moonmap/tar.gz/79cfb0f84f62c910ff6eb3cf314e045110b9d319': {}

     

       1469
       1469
       +
         '@moonlight-mod/moonmap@https://codeload.github.com/moonlight-mod/moonmap/tar.gz/ad6ee2686333058e5547b0de3f541549a15e964d': {}

     

       1485
       1470
        
       

     

       1486
       1471
        
         '@nodelib/fs.scandir@2.1.5':

     

       1487
       1472
        
           dependencies:

     
···

       1510
       1495
        
       

     

       1511
       1496
        
         '@types/estree@1.0.6': {}

     

       1512
       1497
        
       

     

       1513
       1513
       -
         '@types/fbemitter@2.0.33': {}

     

       1514
       1514
       -
       

     

       1515
       1515
       -
         '@types/flux@3.1.12':

     

       1516
       1516
       -
           dependencies:

     

       1517
       1517
       -
             '@types/fbemitter': 2.0.33

     

       1518
       1518
       -
             '@types/react': 18.2.22

     

       1519
       1519
       -
       

     

       1520
       1498
        
         '@types/json-schema@7.0.15': {}

     

       1521
       1499
        
       

     

       1522
       1500
        
         '@types/node@18.17.17': {}

     

       1523
       1523
       -
       

     

       1524
       1524
       -
         '@types/prop-types@15.7.6': {}

     

       1525
       1525
       -
       

     

       1526
       1526
       -
         '@types/react@18.2.22':

     

       1527
       1527
       -
           dependencies:

     

       1528
       1528
       -
             '@types/prop-types': 15.7.6

     

       1529
       1529
       -
             '@types/scheduler': 0.16.3

     

       1530
       1530
       -
             csstype: 3.1.2

     

       1531
       1531
       -
       

     

       1532
       1532
       -
         '@types/scheduler@0.16.3': {}

     

       1533
       1501
        
       

     

       1534
       1502
        
         '@types/semver@7.5.6': {}

     

       1535
       1503