Fix some weird broken mappings

Author: NotNite

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moonlight-mod/mappings",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "license": "MIT",
   "repository": {
     "type": "git",

src/mappings/discord/Dispatcher.ts

@@ -1,32 +1,8 @@
 import register from "../../registry";
-import { Dispatcher as OrigDispatcher } from "flux";
-
-type Dispatcher = OrigDispatcher<any> & {
-  dispatch: (payload: any) => void;
-  isDispatching: () => boolean;
-
-  addInterceptor: (interceptor: (event: any) => boolean | void) => void;
-
-  flushWaitQueue: () => void;
-  wait: (callback: () => void) => void;
-
-  subscribe: (eventType: string, callback: (event: any) => void) => void;
-  unsubscribe: (eventType: string, callback: (event: any) => void) => void;
-
-  register: (
-    name: string,
-    actionHandlers: Record<string, (event: any) => void>,
-    storeDidChange: (event: any) => void,
-    band: number,
-    token: string
-  ) => number;
-
-  createToken: () => string;
-  addDependencies: (id: string, deps: string[]) => void;
-};
+import type { Dispatcher } from "./packages/flux/Dispatcher";
 
 type Exports = {
-  default: Dispatcher;
+  default: Dispatcher<any>;
 };
 export default Exports;
 

src/mappings/discord/components/common/index.ts

@@ -24,8 +24,8 @@ export type IconSize = "xxs" | "xs" | "sm" | "md" | "lg" | "custom" | "refresh_s
 
 export type IconProps = {
   size?: IconSize;
-  width: number;
-  height: number;
+  width?: number;
+  height?: number;
   color?: CSS.DataType.Color;
   colorClass?: string;
   [index: string]: any;

src/mappings/discord/packages/flux/PersistedStore.ts

@@ -32,7 +32,7 @@ export declare abstract class PersistedStore<T extends BasePayload> extends Stor
   /**
    * Returns `this.constructor`
    */
-  getClass(): (dispatcher: typeof Dispatcher, actionHandlers?: Record<T["type"], ActionHandler<T>>) => this;
+  getClass(): (dispatcher: Dispatcher<any>, actionHandlers?: Record<T["type"], ActionHandler<T>>) => this;
   static clearAll(toClear: ClearAll): Promise<void> | null | undefined;
   static shouldClear(toClear: ClearAll, store: string): boolean;
   static clearPersistQueue(store: string): void;
@@ -49,7 +49,7 @@ export declare abstract class PersistedStore<T extends BasePayload> extends Stor
   initialize(state?: T): void;
   getState(): T;
 
-  constructor(dispatcher: typeof Dispatcher, actionHandlers?: Record<T["type"], ActionHandler<T>>);
+  constructor(dispatcher: Dispatcher<any>, actionHandlers?: Record<T["type"], ActionHandler<T>>);
 }
 
 declare abstract class UserAgnosticStore<T extends BasePayload> extends PersistedStore<T> {

src/mappings/discord/packages/flux/Store.ts

@@ -15,7 +15,7 @@ export declare abstract class Store<T extends BasePayload> {
   _reactChangeCallbacks: ChangeListeners;
   _syncsWith: SyncsWith[];
   _dispatchToken: string;
-  _dispatcher: typeof Dispatcher;
+  _dispatcher: Dispatcher<any>;
   _mustEmitChanges: () => boolean;
   _isInitialized: boolean;
   __getLocalVars(): any; // most discord stores dont add it anymore o7
@@ -41,7 +41,7 @@ export declare abstract class Store<T extends BasePayload> {
   getDispatchToken(): string;
   mustEmitChanges(should?: () => boolean): void;
 
-  constructor(dispatcher: typeof Dispatcher, actionHandlers?: Record<T["type"], ActionHandler<T>>, band?: number);
+  constructor(dispatcher: Dispatcher<any>, actionHandlers?: Record<T["type"], ActionHandler<T>>, band?: number);
 }
 
 export type Exports = {

src/types.ts

@@ -92,13 +92,11 @@ export type MappedModules = {
   "discord/utils/NativeUtils": NativeUtils;
   "highlight.js": HighlightJS;
   "highlight.js/lib/core": HighlightJSCore;
-  "lodash": lodash;
-  "murmurhash": murmurhash;
+  lodash: lodash;
+  murmurhash: murmurhash;
   "platform.js": PlatformJS;
-  "react": React;
+  react: React;
   "uuid/v4": UUID;
 };
 
-export declare function WebpackRequire<T extends keyof MappedModules>(
-  module: T
-): MappedModules[T];
+export declare function WebpackRequire<T extends keyof MappedModules>(module: T): MappedModules[T];