From 9bf16a8b981f998f900770eb3968bd46363dda1e Mon Sep 17 00:00:00 2001 From: Zack Rauen Date: Fri, 19 May 2023 17:14:55 -0400 Subject: [PATCH] Adjust module import namespace --- renderer/.babelrc.js | 2 +- renderer/jsconfig.json | 2 +- renderer/src/builtins/customcss.js | 9 ++++++++- renderer/src/builtins/developer/reactdevtools.js | 4 +++- renderer/src/builtins/general/mediakeys.js | 4 +++- renderer/src/builtins/general/voicedisconnect.js | 2 +- renderer/src/builtins/window/transparency.js | 4 +++- renderer/src/modules/api/index.js | 2 +- renderer/src/modules/react.js | 3 +++ renderer/src/modules/reactdom.js | 2 ++ renderer/src/structs/markdown.js | 3 ++- renderer/src/ui/addonerrormodal.jsx | 6 +++++- renderer/src/ui/blankslates/emptyimage.jsx | 3 ++- renderer/src/ui/blankslates/noresults.jsx | 3 ++- renderer/src/ui/customcss/checkbox.jsx | 2 +- renderer/src/ui/customcss/csseditor.jsx | 5 ++++- renderer/src/ui/customcss/editor.jsx | 4 +++- renderer/src/ui/divider.jsx | 2 +- renderer/src/ui/errorboundary.jsx | 3 ++- renderer/src/ui/floating/container.jsx | 3 ++- renderer/src/ui/floating/window.jsx | 3 ++- renderer/src/ui/floatingwindows.js | 6 +++++- renderer/src/ui/icons/bdlogo.jsx | 2 +- renderer/src/ui/icons/check.jsx | 2 +- renderer/src/ui/icons/close.jsx | 2 +- renderer/src/ui/icons/cog.jsx | 2 +- renderer/src/ui/icons/delete.jsx | 2 +- renderer/src/ui/icons/detach.jsx | 2 +- renderer/src/ui/icons/dollarsign.jsx | 2 +- renderer/src/ui/icons/downarrow.jsx | 2 +- renderer/src/ui/icons/edit.jsx | 2 +- renderer/src/ui/icons/error.jsx | 2 +- renderer/src/ui/icons/extension.jsx | 2 +- renderer/src/ui/icons/favorite.jsx | 2 +- renderer/src/ui/icons/fullscreen.jsx | 2 +- renderer/src/ui/icons/github.jsx | 2 +- renderer/src/ui/icons/globe.jsx | 2 +- renderer/src/ui/icons/grid.jsx | 2 +- renderer/src/ui/icons/history.jsx | 2 +- renderer/src/ui/icons/keyboard.jsx | 2 +- renderer/src/ui/icons/list.jsx | 2 +- renderer/src/ui/icons/magnifyingglass.jsx | 2 +- renderer/src/ui/icons/next.jsx | 2 +- renderer/src/ui/icons/patreon.jsx | 2 +- renderer/src/ui/icons/previous.jsx | 2 +- renderer/src/ui/icons/radio.jsx | 2 +- renderer/src/ui/icons/reload.jsx | 2 +- renderer/src/ui/icons/save.jsx | 2 +- renderer/src/ui/icons/search.jsx | 2 +- renderer/src/ui/icons/support.jsx | 2 +- renderer/src/ui/icons/theme.jsx | 2 +- renderer/src/ui/icons/twitch.jsx | 2 +- renderer/src/ui/misc/addoneditor.jsx | 3 ++- renderer/src/ui/modals.js | 9 ++++++++- renderer/src/ui/settings.js | 8 +++++++- renderer/src/ui/settings/addoncard.jsx | 5 ++++- renderer/src/ui/settings/addonlist.jsx | 6 +++++- renderer/src/ui/settings/components/color.jsx | 3 ++- renderer/src/ui/settings/components/dropdown.jsx | 2 +- renderer/src/ui/settings/components/item.jsx | 2 +- renderer/src/ui/settings/components/keybind.jsx | 2 +- renderer/src/ui/settings/components/number.jsx | 2 +- renderer/src/ui/settings/components/radio.jsx | 2 +- renderer/src/ui/settings/components/search.jsx | 2 +- renderer/src/ui/settings/components/slider.jsx | 2 +- renderer/src/ui/settings/components/switch.jsx | 2 +- renderer/src/ui/settings/components/textbox.jsx | 2 +- renderer/src/ui/settings/drawer.jsx | 2 +- renderer/src/ui/settings/group.jsx | 2 +- renderer/src/ui/settings/sidebarheader.jsx | 3 ++- renderer/src/ui/settings/title.jsx | 2 +- renderer/src/ui/toasts.js | 5 ++++- renderer/src/ui/tooltip.js | 2 +- renderer/src/ui/updater.jsx | 4 +++- 74 files changed, 137 insertions(+), 72 deletions(-) create mode 100644 renderer/src/modules/react.js create mode 100644 renderer/src/modules/reactdom.js diff --git a/renderer/.babelrc.js b/renderer/.babelrc.js index 35d42594..6ed6cb95 100644 --- a/renderer/.babelrc.js +++ b/renderer/.babelrc.js @@ -17,7 +17,7 @@ module.exports = { alias: { "builtins": "./src/builtins/builtins.js", "data": "./src/data/data.js", - "modules": "./src/modules/modules.js", + "@modules": path.join(__dirname, "src", "modules"), "@common": path.join(__dirname, "..", "common"), } } diff --git a/renderer/jsconfig.json b/renderer/jsconfig.json index 2de07da2..c98c9b52 100644 --- a/renderer/jsconfig.json +++ b/renderer/jsconfig.json @@ -4,9 +4,9 @@ "allowSyntheticDefaultImports": false, "baseUrl": "./", "paths": { - "modules": ["./src/modules/modules.js"], "builtins": ["./src/builtins/builtins.js"], "data": ["./src/data/data.js"], + "@modules/*": ["./src/modules/*"], "@common/*": ["../common/*"] } }, diff --git a/renderer/src/builtins/customcss.js b/renderer/src/builtins/customcss.js index 6f830f1c..04318093 100644 --- a/renderer/src/builtins/customcss.js +++ b/renderer/src/builtins/customcss.js @@ -1,5 +1,12 @@ import Builtin from "../structs/builtin"; -import {Settings, DataStore, React, WebpackModules, Events, DOMManager, Strings, DiscordModules} from "modules"; +import Settings from "@modules/settingsmanager"; +import DataStore from "@modules/datastore"; +import React from "@modules/react"; +import WebpackModules from "@modules/webpackmodules"; +import Events from "@modules/emitter"; +import DOMManager from "@modules/dommanager"; +import Strings from "@modules/strings"; +import DiscordModules from "@modules/discordmodules"; import CSSEditor from "../ui/customcss/csseditor"; import FloatingWindows from "../ui/floatingwindows"; import SettingsTitle from "../ui/settings/title"; diff --git a/renderer/src/builtins/developer/reactdevtools.js b/renderer/src/builtins/developer/reactdevtools.js index 418360a6..56635fef 100644 --- a/renderer/src/builtins/developer/reactdevtools.js +++ b/renderer/src/builtins/developer/reactdevtools.js @@ -1,6 +1,8 @@ import Builtin from "../../structs/builtin"; import Modals from "../../ui/modals"; -import {Strings, IPC} from "modules"; + +import Strings from "@modules/strings"; +import IPC from "@modules/ipc"; export default new class ReactDevTools extends Builtin { get name() {return "ReactDevTools";} diff --git a/renderer/src/builtins/general/mediakeys.js b/renderer/src/builtins/general/mediakeys.js index e2fe1a86..b1cb210b 100644 --- a/renderer/src/builtins/general/mediakeys.js +++ b/renderer/src/builtins/general/mediakeys.js @@ -1,6 +1,8 @@ import Builtin from "../../structs/builtin"; import Modals from "../../ui/modals"; -import {Strings, IPC} from "modules"; + +import Strings from "@modules/strings"; +import IPC from "@modules/ipc"; export default new class MediaKeys extends Builtin { get name() {return "DisableMediaKeys";} diff --git a/renderer/src/builtins/general/voicedisconnect.js b/renderer/src/builtins/general/voicedisconnect.js index bacd3eff..a8089996 100644 --- a/renderer/src/builtins/general/voicedisconnect.js +++ b/renderer/src/builtins/general/voicedisconnect.js @@ -1,5 +1,5 @@ import Builtin from "../../structs/builtin"; -import {DiscordModules} from "modules"; +import DiscordModules from "@modules/discordmodules"; export default new class VoiceDisconnect extends Builtin { get name() {return "VoiceDisconnect";} diff --git a/renderer/src/builtins/window/transparency.js b/renderer/src/builtins/window/transparency.js index 0b9ee3a5..e49e1efc 100644 --- a/renderer/src/builtins/window/transparency.js +++ b/renderer/src/builtins/window/transparency.js @@ -1,6 +1,8 @@ import Builtin from "../../structs/builtin"; import Modals from "../../ui/modals"; -import {Strings, IPC} from "modules"; + +import Strings from "@modules/strings"; +import IPC from "@modules/ipc"; export default new class WindowTransparency extends Builtin { get name() {return "WindowTransparency";} diff --git a/renderer/src/modules/api/index.js b/renderer/src/modules/api/index.js index 08b34b77..150c61f9 100644 --- a/renderer/src/modules/api/index.js +++ b/renderer/src/modules/api/index.js @@ -12,7 +12,7 @@ import Utils from "./utils"; import Webpack from "./webpack"; import * as Legacy from "./legacy"; import ContextMenu from "./contextmenu"; -import {DiscordModules} from "modules"; +import DiscordModules from "@modules/discordmodules"; const bounded = new Map(); const PluginAPI = new AddonAPI(PluginManager); diff --git a/renderer/src/modules/react.js b/renderer/src/modules/react.js new file mode 100644 index 00000000..b5720fbd --- /dev/null +++ b/renderer/src/modules/react.js @@ -0,0 +1,3 @@ +import DiscordModules from "./discordmodules"; +export default DiscordModules.React; +export const ReactDOM = DiscordModules.ReactDOM; \ No newline at end of file diff --git a/renderer/src/modules/reactdom.js b/renderer/src/modules/reactdom.js new file mode 100644 index 00000000..19d4e76c --- /dev/null +++ b/renderer/src/modules/reactdom.js @@ -0,0 +1,2 @@ +import DiscordModules from "./discordmodules"; +export default DiscordModules.ReactDOM; \ No newline at end of file diff --git a/renderer/src/structs/markdown.js b/renderer/src/structs/markdown.js index fc6464ba..b311407d 100644 --- a/renderer/src/structs/markdown.js +++ b/renderer/src/structs/markdown.js @@ -1,4 +1,5 @@ -import {DiscordModules, Utilities} from "modules"; +import DiscordModules from "@modules/discordmodules"; +import Utilities from "@modules/utilities"; export default class SimpleMarkdownExt { static parseToReact(str) { diff --git a/renderer/src/ui/addonerrormodal.jsx b/renderer/src/ui/addonerrormodal.jsx index 5ac9bfaa..9cd62a74 100644 --- a/renderer/src/ui/addonerrormodal.jsx +++ b/renderer/src/ui/addonerrormodal.jsx @@ -1,4 +1,8 @@ -import {React, Strings, WebpackModules, DiscordClasses} from "modules"; +import React from "@modules/react"; +import Strings from "@modules/strings"; +import DiscordClasses from "@modules/discordclasses"; +import WebpackModules from "@modules/webpackmodules"; + import Extension from "./icons/extension"; import ThemeIcon from "./icons/theme"; import Divider from "./divider"; diff --git a/renderer/src/ui/blankslates/emptyimage.jsx b/renderer/src/ui/blankslates/emptyimage.jsx index 7fd77004..536953f9 100644 --- a/renderer/src/ui/blankslates/emptyimage.jsx +++ b/renderer/src/ui/blankslates/emptyimage.jsx @@ -1,4 +1,5 @@ -import {React, DiscordClasses} from "modules"; +import React from "@modules/react"; +import DiscordClasses from "@modules/discordclasses"; import SimpleMarkdown from "../../structs/markdown"; export default function EmptyImage(props) { diff --git a/renderer/src/ui/blankslates/noresults.jsx b/renderer/src/ui/blankslates/noresults.jsx index 943f7102..005d7844 100644 --- a/renderer/src/ui/blankslates/noresults.jsx +++ b/renderer/src/ui/blankslates/noresults.jsx @@ -1,4 +1,5 @@ -import {React, DiscordModules} from "modules"; +import React from "@modules/react"; +import DiscordModules from "@modules/discordmodules"; import MagnifyingGlass from "../icons/magnifyingglass"; export default function NoResults(props) { diff --git a/renderer/src/ui/customcss/checkbox.jsx b/renderer/src/ui/customcss/checkbox.jsx index 390f00f4..a17e7cc6 100644 --- a/renderer/src/ui/customcss/checkbox.jsx +++ b/renderer/src/ui/customcss/checkbox.jsx @@ -1,4 +1,4 @@ -import {React} from "modules"; +import React from "@modules/react"; const {useState, useCallback} = React; diff --git a/renderer/src/ui/customcss/csseditor.jsx b/renderer/src/ui/customcss/csseditor.jsx index 3c7bd776..32b3cdc5 100644 --- a/renderer/src/ui/customcss/csseditor.jsx +++ b/renderer/src/ui/customcss/csseditor.jsx @@ -1,4 +1,7 @@ -import {React, Settings, Events, Strings} from "modules"; +import React from "@modules/react"; +import Strings from "@modules/strings"; +import Events from "@modules/emitter"; +import Settings from "@modules/settingsmanager"; import Editor from "./editor"; import Refresh from "../icons/reload"; diff --git a/renderer/src/ui/customcss/editor.jsx b/renderer/src/ui/customcss/editor.jsx index bc79399a..ffceeb8b 100644 --- a/renderer/src/ui/customcss/editor.jsx +++ b/renderer/src/ui/customcss/editor.jsx @@ -1,4 +1,6 @@ -import {React, DiscordModules, Settings} from "modules"; +import React from "@modules/react"; +import DiscordModules from "@modules/discordmodules"; +import Settings from "@modules/settingsmanager"; import Checkbox from "./checkbox"; diff --git a/renderer/src/ui/divider.jsx b/renderer/src/ui/divider.jsx index 7f9b2fbd..224619dc 100644 --- a/renderer/src/ui/divider.jsx +++ b/renderer/src/ui/divider.jsx @@ -1,3 +1,3 @@ -import {React} from "modules"; +import React from "@modules/react"; export default ({className}) =>
; \ No newline at end of file diff --git a/renderer/src/ui/errorboundary.jsx b/renderer/src/ui/errorboundary.jsx index e5ee5af7..91762f9f 100644 --- a/renderer/src/ui/errorboundary.jsx +++ b/renderer/src/ui/errorboundary.jsx @@ -1,5 +1,6 @@ import Logger from "@common/logger"; -import {React, IPC} from "modules"; +import React from "@modules/react"; +import IPC from "@modules/ipc"; export default class ErrorBoundary extends React.Component { constructor(props) { diff --git a/renderer/src/ui/floating/container.jsx b/renderer/src/ui/floating/container.jsx index 50008ad3..2722f380 100644 --- a/renderer/src/ui/floating/container.jsx +++ b/renderer/src/ui/floating/container.jsx @@ -1,4 +1,5 @@ -import {React, Events} from "modules"; +import React from "@modules/react"; +import Events from "@modules/emitter"; import FloatingWindow from "./window"; diff --git a/renderer/src/ui/floating/window.jsx b/renderer/src/ui/floating/window.jsx index 220b9844..6474f8aa 100644 --- a/renderer/src/ui/floating/window.jsx +++ b/renderer/src/ui/floating/window.jsx @@ -1,4 +1,5 @@ -import {React, Strings} from "modules"; +import React from "@modules/react"; +import Strings from "@modules/strings"; import Screen from "../../structs/screen"; import CloseButton from "../icons/close"; diff --git a/renderer/src/ui/floatingwindows.js b/renderer/src/ui/floatingwindows.js index c6d1d1cd..2ca0a5d8 100644 --- a/renderer/src/ui/floatingwindows.js +++ b/renderer/src/ui/floatingwindows.js @@ -1,4 +1,8 @@ -import {WebpackModules, React, ReactDOM, DOMManager, Events} from "modules"; +import React from "@modules/react"; +import ReactDOM from "@modules/reactdom"; +import Events from "@modules/emitter"; +import DOMManager from "@modules/dommanager"; +import WebpackModules from "@modules/webpackmodules"; import FloatingWindowContainer from "./floating/container"; /* eslint-disable new-cap */ diff --git a/renderer/src/ui/icons/bdlogo.jsx b/renderer/src/ui/icons/bdlogo.jsx index d6dc74d1..112fec76 100644 --- a/renderer/src/ui/icons/bdlogo.jsx +++ b/renderer/src/ui/icons/bdlogo.jsx @@ -1,4 +1,4 @@ -import {React} from "modules"; +import React from "@modules/react"; export default function BDLogo(props) { return diff --git a/renderer/src/ui/icons/check.jsx b/renderer/src/ui/icons/check.jsx index d994ea89..97900b22 100644 --- a/renderer/src/ui/icons/check.jsx +++ b/renderer/src/ui/icons/check.jsx @@ -1,4 +1,4 @@ -import {React} from "modules"; +import React from "@modules/react"; export default function Checkmark(props) { const size = props.size || "24px"; diff --git a/renderer/src/ui/icons/close.jsx b/renderer/src/ui/icons/close.jsx index 55a45c0a..964b11a8 100644 --- a/renderer/src/ui/icons/close.jsx +++ b/renderer/src/ui/icons/close.jsx @@ -1,4 +1,4 @@ -import {React} from "modules"; +import React from "@modules/react"; export default function Close(props) { const size = props.size || "18px"; diff --git a/renderer/src/ui/icons/cog.jsx b/renderer/src/ui/icons/cog.jsx index 9a929bf5..25dacd26 100644 --- a/renderer/src/ui/icons/cog.jsx +++ b/renderer/src/ui/icons/cog.jsx @@ -1,4 +1,4 @@ -import {React} from "modules"; +import React from "@modules/react"; export default function Cog(props) { const size = props.size || "20px"; diff --git a/renderer/src/ui/icons/delete.jsx b/renderer/src/ui/icons/delete.jsx index 92f4d79d..c1e712d0 100644 --- a/renderer/src/ui/icons/delete.jsx +++ b/renderer/src/ui/icons/delete.jsx @@ -1,4 +1,4 @@ -import {React} from "modules"; +import React from "@modules/react"; export default function Delete(props) { const size = props.size || "24px"; diff --git a/renderer/src/ui/icons/detach.jsx b/renderer/src/ui/icons/detach.jsx index 8e5ade9f..42107a7c 100644 --- a/renderer/src/ui/icons/detach.jsx +++ b/renderer/src/ui/icons/detach.jsx @@ -1,4 +1,4 @@ -import {React} from "modules"; +import React from "@modules/react"; export default function Detach(props) { const size = props.size || "24px"; diff --git a/renderer/src/ui/icons/dollarsign.jsx b/renderer/src/ui/icons/dollarsign.jsx index 5634e440..e1907ac4 100644 --- a/renderer/src/ui/icons/dollarsign.jsx +++ b/renderer/src/ui/icons/dollarsign.jsx @@ -1,4 +1,4 @@ -import {React} from "modules"; +import React from "@modules/react"; export default function DollarSign(props) { const size = props.size || "18px"; diff --git a/renderer/src/ui/icons/downarrow.jsx b/renderer/src/ui/icons/downarrow.jsx index 96d40694..d559aef1 100644 --- a/renderer/src/ui/icons/downarrow.jsx +++ b/renderer/src/ui/icons/downarrow.jsx @@ -1,4 +1,4 @@ -import {React} from "modules"; +import React from "@modules/react"; export default function DownArrow(props) { const size = props.size || "16px"; diff --git a/renderer/src/ui/icons/edit.jsx b/renderer/src/ui/icons/edit.jsx index e7cf3109..33112063 100644 --- a/renderer/src/ui/icons/edit.jsx +++ b/renderer/src/ui/icons/edit.jsx @@ -1,4 +1,4 @@ -import {React} from "modules"; +import React from "@modules/react"; export default function Edit(props) { const size = props.size || "24px"; diff --git a/renderer/src/ui/icons/error.jsx b/renderer/src/ui/icons/error.jsx index 5c6a7e5f..904e4606 100644 --- a/renderer/src/ui/icons/error.jsx +++ b/renderer/src/ui/icons/error.jsx @@ -1,4 +1,4 @@ -import {React} from "modules"; +import React from "@modules/react"; export default function Error(props) { const size = props.size || "24px"; diff --git a/renderer/src/ui/icons/extension.jsx b/renderer/src/ui/icons/extension.jsx index d908cd2c..e0e01ce4 100644 --- a/renderer/src/ui/icons/extension.jsx +++ b/renderer/src/ui/icons/extension.jsx @@ -1,4 +1,4 @@ -import {React} from "modules"; +import React from "@modules/react"; export default function Extension(props) { const size = props.size || "24px"; diff --git a/renderer/src/ui/icons/favorite.jsx b/renderer/src/ui/icons/favorite.jsx index 929bb316..4d35b6a7 100644 --- a/renderer/src/ui/icons/favorite.jsx +++ b/renderer/src/ui/icons/favorite.jsx @@ -1,4 +1,4 @@ -import {React} from "modules"; +import React from "@modules/react"; export default function Favorite(props) { const size = props.size || "24px"; diff --git a/renderer/src/ui/icons/fullscreen.jsx b/renderer/src/ui/icons/fullscreen.jsx index 41ee8d71..61b858ff 100644 --- a/renderer/src/ui/icons/fullscreen.jsx +++ b/renderer/src/ui/icons/fullscreen.jsx @@ -1,4 +1,4 @@ -import {React} from "modules"; +import React from "@modules/react"; export default function FullScreen(props) { const size = props.size || "24px"; diff --git a/renderer/src/ui/icons/github.jsx b/renderer/src/ui/icons/github.jsx index 851bc2cd..6c4b3f24 100644 --- a/renderer/src/ui/icons/github.jsx +++ b/renderer/src/ui/icons/github.jsx @@ -1,4 +1,4 @@ -import {React} from "modules"; +import React from "@modules/react"; export default function GitHub(props) { const size = props.size || "18px"; diff --git a/renderer/src/ui/icons/globe.jsx b/renderer/src/ui/icons/globe.jsx index b89a3d53..9d0f4881 100644 --- a/renderer/src/ui/icons/globe.jsx +++ b/renderer/src/ui/icons/globe.jsx @@ -1,4 +1,4 @@ -import {React} from "modules"; +import React from "@modules/react"; export default function Globe(props) { const size = props.size || "18px"; diff --git a/renderer/src/ui/icons/grid.jsx b/renderer/src/ui/icons/grid.jsx index 1e926576..feba09ab 100644 --- a/renderer/src/ui/icons/grid.jsx +++ b/renderer/src/ui/icons/grid.jsx @@ -1,4 +1,4 @@ -import {React} from "modules"; +import React from "@modules/react"; export default function Grid(props) { const size = props.size || "20px"; diff --git a/renderer/src/ui/icons/history.jsx b/renderer/src/ui/icons/history.jsx index 92999de0..d9951a77 100644 --- a/renderer/src/ui/icons/history.jsx +++ b/renderer/src/ui/icons/history.jsx @@ -1,4 +1,4 @@ -import {React} from "modules"; +import React from "@modules/react"; export default function History(props) { const size = props.size || "18px"; diff --git a/renderer/src/ui/icons/keyboard.jsx b/renderer/src/ui/icons/keyboard.jsx index 52161f60..53e2f2f4 100644 --- a/renderer/src/ui/icons/keyboard.jsx +++ b/renderer/src/ui/icons/keyboard.jsx @@ -1,4 +1,4 @@ -import {React} from "modules"; +import React from "@modules/react"; export default function Keyboard(props) { const size = props.size || "24px"; diff --git a/renderer/src/ui/icons/list.jsx b/renderer/src/ui/icons/list.jsx index b6011e1a..6a7f5e16 100644 --- a/renderer/src/ui/icons/list.jsx +++ b/renderer/src/ui/icons/list.jsx @@ -1,4 +1,4 @@ -import {React} from "modules"; +import React from "@modules/react"; export default function List(props) { const size = props.size || "20px"; diff --git a/renderer/src/ui/icons/magnifyingglass.jsx b/renderer/src/ui/icons/magnifyingglass.jsx index 1d838d50..a2a45ece 100644 --- a/renderer/src/ui/icons/magnifyingglass.jsx +++ b/renderer/src/ui/icons/magnifyingglass.jsx @@ -1,4 +1,4 @@ -import {React} from "modules"; +import React from "@modules/react"; export default function MagnifyingGlass(props) { const size = props.size || "160px"; diff --git a/renderer/src/ui/icons/next.jsx b/renderer/src/ui/icons/next.jsx index c2e01393..149c9502 100644 --- a/renderer/src/ui/icons/next.jsx +++ b/renderer/src/ui/icons/next.jsx @@ -1,4 +1,4 @@ -import {React} from "modules"; +import React from "@modules/react"; export default function ArrowRight(props) { const size = props.size || "24px"; diff --git a/renderer/src/ui/icons/patreon.jsx b/renderer/src/ui/icons/patreon.jsx index 573d8c2a..7e323ccc 100644 --- a/renderer/src/ui/icons/patreon.jsx +++ b/renderer/src/ui/icons/patreon.jsx @@ -1,4 +1,4 @@ -import {React} from "modules"; +import React from "@modules/react"; export default function Patreon(props) { const size = props.size || "18px"; diff --git a/renderer/src/ui/icons/previous.jsx b/renderer/src/ui/icons/previous.jsx index 36407172..6592ba16 100644 --- a/renderer/src/ui/icons/previous.jsx +++ b/renderer/src/ui/icons/previous.jsx @@ -1,4 +1,4 @@ -import {React} from "modules"; +import React from "@modules/react"; export default function ArrowLeft(props) { const size = props.size || "24px"; diff --git a/renderer/src/ui/icons/radio.jsx b/renderer/src/ui/icons/radio.jsx index b08f2445..63688619 100644 --- a/renderer/src/ui/icons/radio.jsx +++ b/renderer/src/ui/icons/radio.jsx @@ -1,4 +1,4 @@ -import {React} from "modules"; +import React from "@modules/react"; export default function Radio(props) { const size = props.size || "24px"; diff --git a/renderer/src/ui/icons/reload.jsx b/renderer/src/ui/icons/reload.jsx index 4ff81a98..8100984f 100644 --- a/renderer/src/ui/icons/reload.jsx +++ b/renderer/src/ui/icons/reload.jsx @@ -1,4 +1,4 @@ -import {React} from "modules"; +import React from "@modules/react"; export default function ReloadIcon(props) { const size = props.size || "24px"; diff --git a/renderer/src/ui/icons/save.jsx b/renderer/src/ui/icons/save.jsx index 5a02f66c..73ca9c22 100644 --- a/renderer/src/ui/icons/save.jsx +++ b/renderer/src/ui/icons/save.jsx @@ -1,4 +1,4 @@ -import {React} from "modules"; +import React from "@modules/react"; export default function Save(props) { const size = props.size || "24px"; diff --git a/renderer/src/ui/icons/search.jsx b/renderer/src/ui/icons/search.jsx index 3a936e90..5cc3c044 100644 --- a/renderer/src/ui/icons/search.jsx +++ b/renderer/src/ui/icons/search.jsx @@ -1,4 +1,4 @@ -import {React} from "modules"; +import React from "@modules/react"; export default function Search(props) { const size = props.size || "16px"; diff --git a/renderer/src/ui/icons/support.jsx b/renderer/src/ui/icons/support.jsx index 732c6409..29ea5ef3 100644 --- a/renderer/src/ui/icons/support.jsx +++ b/renderer/src/ui/icons/support.jsx @@ -1,4 +1,4 @@ -import {React} from "modules"; +import React from "@modules/react"; export default function Support(props) { const size = props.size || "18px"; diff --git a/renderer/src/ui/icons/theme.jsx b/renderer/src/ui/icons/theme.jsx index cccae69b..3c642dbc 100644 --- a/renderer/src/ui/icons/theme.jsx +++ b/renderer/src/ui/icons/theme.jsx @@ -1,4 +1,4 @@ -import {React} from "modules"; +import React from "@modules/react"; export default function Theme(props) { const size = props.size || "24px"; diff --git a/renderer/src/ui/icons/twitch.jsx b/renderer/src/ui/icons/twitch.jsx index 04a313d4..2800b4e3 100644 --- a/renderer/src/ui/icons/twitch.jsx +++ b/renderer/src/ui/icons/twitch.jsx @@ -1,4 +1,4 @@ -import {React} from "modules"; +import React from "@modules/react"; export default function Twitch(props) { const size = props.size || "18px"; diff --git a/renderer/src/ui/misc/addoneditor.jsx b/renderer/src/ui/misc/addoneditor.jsx index 43a1048a..65da77c9 100644 --- a/renderer/src/ui/misc/addoneditor.jsx +++ b/renderer/src/ui/misc/addoneditor.jsx @@ -1,4 +1,5 @@ -import {React, Strings} from "modules"; +import React from "@modules/react"; +import Strings from "@modules/strings"; import Editor from "../customcss/editor"; import Save from "../icons/save"; diff --git a/renderer/src/ui/modals.js b/renderer/src/ui/modals.js index 620e7edf..55f5f6d7 100644 --- a/renderer/src/ui/modals.js +++ b/renderer/src/ui/modals.js @@ -1,6 +1,13 @@ import {Config} from "data"; import Logger from "@common/logger"; -import {WebpackModules, React, ReactDOM, Settings, Strings, DOMManager, DiscordModules, DiscordClasses} from "modules"; +import React from "@modules/react"; +import ReactDOM from "@modules/reactdom"; +import Strings from "@modules/strings"; +import Settings from "@modules/settingsmanager"; +import DiscordModules from "@modules/discordmodules"; +import WebpackModules from "@modules/webpackmodules"; +import DiscordClasses from "@modules/discordclasses"; +import DOMManager from "@modules/dommanager"; import FormattableString from "../structs/string"; import AddonErrorModal from "./addonerrormodal"; import ErrorBoundary from "./errorboundary"; diff --git a/renderer/src/ui/settings.js b/renderer/src/ui/settings.js index 3d6c9f4d..3b5f84cc 100644 --- a/renderer/src/ui/settings.js +++ b/renderer/src/ui/settings.js @@ -1,4 +1,10 @@ -import {React, WebpackModules, Patcher, Utilities, Settings, Events, DataStore} from "modules"; +import React from "@modules/react"; +import Utilities from "@modules/utilities"; +import Events from "@modules/emitter"; +import Settings from "@modules/settingsmanager"; +import DataStore from "@modules/datastore"; +import WebpackModules from "@modules/webpackmodules"; +import Patcher from "@modules/patcher"; import AddonList from "./settings/addonlist"; import SettingsGroup from "./settings/group"; diff --git a/renderer/src/ui/settings/addoncard.jsx b/renderer/src/ui/settings/addoncard.jsx index c0d2f9b6..5ce0b3f0 100644 --- a/renderer/src/ui/settings/addoncard.jsx +++ b/renderer/src/ui/settings/addoncard.jsx @@ -1,5 +1,8 @@ import Logger from "@common/logger"; -import {React, Strings, WebpackModules, DiscordModules} from "modules"; +import React from "@modules/react"; +import Strings from "@modules/strings"; +import WebpackModules from "@modules/webpackmodules"; +import DiscordModules from "@modules/discordmodules"; import SimpleMarkdown from "../../structs/markdown"; import EditIcon from "../icons/edit"; import DeleteIcon from "../icons/delete"; diff --git a/renderer/src/ui/settings/addonlist.jsx b/renderer/src/ui/settings/addonlist.jsx index 2b7b9084..04b1a29b 100644 --- a/renderer/src/ui/settings/addonlist.jsx +++ b/renderer/src/ui/settings/addonlist.jsx @@ -1,4 +1,8 @@ -import {React, Strings, Events, DataStore, DiscordModules} from "modules"; +import React from "@modules/react"; +import Strings from "@modules/strings"; +import Events from "@modules/emitter"; +import DataStore from "@modules/datastore"; +import DiscordModules from "@modules/discordmodules"; import Modals from "../modals"; import SettingsTitle from "./title"; diff --git a/renderer/src/ui/settings/components/color.jsx b/renderer/src/ui/settings/components/color.jsx index 86040ca5..924d4ca5 100644 --- a/renderer/src/ui/settings/components/color.jsx +++ b/renderer/src/ui/settings/components/color.jsx @@ -1,4 +1,5 @@ -import {DiscordModules, React} from "modules"; +import React from "@modules/react"; +import DiscordModules from "@modules/discordmodules"; const {useState, useCallback} = React; diff --git a/renderer/src/ui/settings/components/dropdown.jsx b/renderer/src/ui/settings/components/dropdown.jsx index d4d52946..55d38977 100644 --- a/renderer/src/ui/settings/components/dropdown.jsx +++ b/renderer/src/ui/settings/components/dropdown.jsx @@ -1,4 +1,4 @@ -import {React} from "modules"; +import React from "@modules/react"; import Arrow from "../../icons/downarrow"; const {useState, useCallback} = React; diff --git a/renderer/src/ui/settings/components/item.jsx b/renderer/src/ui/settings/components/item.jsx index 0fdb40e0..c7679cc4 100644 --- a/renderer/src/ui/settings/components/item.jsx +++ b/renderer/src/ui/settings/components/item.jsx @@ -1,4 +1,4 @@ -import {React} from "modules"; +import React from "@modules/react"; export default function SettingItem({id, name, note, inline, children}) { return
diff --git a/renderer/src/ui/settings/components/keybind.jsx b/renderer/src/ui/settings/components/keybind.jsx index 6db46c86..5a6eaa17 100644 --- a/renderer/src/ui/settings/components/keybind.jsx +++ b/renderer/src/ui/settings/components/keybind.jsx @@ -1,4 +1,4 @@ -import {React} from "modules"; +import React from "@modules/react"; import Keyboard from "../../icons/keyboard"; import Close from "../../icons/close"; diff --git a/renderer/src/ui/settings/components/number.jsx b/renderer/src/ui/settings/components/number.jsx index f6e31db0..01180e8e 100644 --- a/renderer/src/ui/settings/components/number.jsx +++ b/renderer/src/ui/settings/components/number.jsx @@ -1,4 +1,4 @@ -import {React} from "modules"; +import React from "@modules/react"; const {useState, useCallback} = React; diff --git a/renderer/src/ui/settings/components/radio.jsx b/renderer/src/ui/settings/components/radio.jsx index 02d5da89..93968825 100644 --- a/renderer/src/ui/settings/components/radio.jsx +++ b/renderer/src/ui/settings/components/radio.jsx @@ -1,4 +1,4 @@ -import {React} from "modules"; +import React from "@modules/react"; import RadioIcon from "../../icons/radio"; diff --git a/renderer/src/ui/settings/components/search.jsx b/renderer/src/ui/settings/components/search.jsx index 77ac05d0..fbb3f3df 100644 --- a/renderer/src/ui/settings/components/search.jsx +++ b/renderer/src/ui/settings/components/search.jsx @@ -1,4 +1,4 @@ -import {React} from "modules"; +import React from "@modules/react"; import SearchIcon from "../../icons/search"; const {useState, useCallback} = React; diff --git a/renderer/src/ui/settings/components/slider.jsx b/renderer/src/ui/settings/components/slider.jsx index 75f833ac..3483d535 100644 --- a/renderer/src/ui/settings/components/slider.jsx +++ b/renderer/src/ui/settings/components/slider.jsx @@ -1,4 +1,4 @@ -import {React} from "modules"; +import React from "@modules/react"; const {useState, useCallback} = React; diff --git a/renderer/src/ui/settings/components/switch.jsx b/renderer/src/ui/settings/components/switch.jsx index a0fdf278..d72099a0 100644 --- a/renderer/src/ui/settings/components/switch.jsx +++ b/renderer/src/ui/settings/components/switch.jsx @@ -1,4 +1,4 @@ -import {React} from "modules"; +import React from "@modules/react"; const {useState, useCallback} = React; diff --git a/renderer/src/ui/settings/components/textbox.jsx b/renderer/src/ui/settings/components/textbox.jsx index 3997ea6e..60bf97ad 100644 --- a/renderer/src/ui/settings/components/textbox.jsx +++ b/renderer/src/ui/settings/components/textbox.jsx @@ -1,4 +1,4 @@ -import {React} from "modules"; +import React from "@modules/react"; const {useState, useCallback} = React; diff --git a/renderer/src/ui/settings/drawer.jsx b/renderer/src/ui/settings/drawer.jsx index 97425c5e..3d362301 100644 --- a/renderer/src/ui/settings/drawer.jsx +++ b/renderer/src/ui/settings/drawer.jsx @@ -1,4 +1,4 @@ -import {React} from "modules"; +import React from "@modules/react"; import Title from "./title"; import Divider from "../divider"; diff --git a/renderer/src/ui/settings/group.jsx b/renderer/src/ui/settings/group.jsx index 0b98e8f8..eed0de8f 100644 --- a/renderer/src/ui/settings/group.jsx +++ b/renderer/src/ui/settings/group.jsx @@ -1,4 +1,4 @@ -import {React} from "modules"; +import React from "@modules/react"; import Drawer from "./drawer"; import Switch from "./components/switch"; import Dropdown from "./components/dropdown"; diff --git a/renderer/src/ui/settings/sidebarheader.jsx b/renderer/src/ui/settings/sidebarheader.jsx index ad99ade4..1eaa88e3 100644 --- a/renderer/src/ui/settings/sidebarheader.jsx +++ b/renderer/src/ui/settings/sidebarheader.jsx @@ -1,5 +1,6 @@ import {Changelog} from "data"; -import {DiscordModules, React} from "modules"; +import React from "@modules/react"; +import DiscordModules from "@modules/discordmodules"; import HistoryIcon from "../icons/history"; import Modals from "../modals"; diff --git a/renderer/src/ui/settings/title.jsx b/renderer/src/ui/settings/title.jsx index cd81f6d7..e42dba86 100644 --- a/renderer/src/ui/settings/title.jsx +++ b/renderer/src/ui/settings/title.jsx @@ -1,4 +1,4 @@ -import {React} from "modules"; +import React from "@modules/react"; const {useCallback} = React; diff --git a/renderer/src/ui/toasts.js b/renderer/src/ui/toasts.js index a8a023fb..c4ab1150 100644 --- a/renderer/src/ui/toasts.js +++ b/renderer/src/ui/toasts.js @@ -1,5 +1,8 @@ import Logger from "@common/logger"; -import {WebpackModules, Settings, DOMManager} from "modules"; + +import Settings from "@modules/settingsmanager"; +import WebpackModules from "@modules/webpackmodules"; +import DOMManager from "@modules/dommanager"; export default class Toasts { diff --git a/renderer/src/ui/tooltip.js b/renderer/src/ui/tooltip.js index 25a19cbf..ad956a78 100644 --- a/renderer/src/ui/tooltip.js +++ b/renderer/src/ui/tooltip.js @@ -1,5 +1,5 @@ import Logger from "@common/logger"; -import {DOMManager} from "modules"; +import DOMManager from "@modules/dommanager"; const toPx = function(value) { diff --git a/renderer/src/ui/updater.jsx b/renderer/src/ui/updater.jsx index 79f88b91..e0edbddf 100644 --- a/renderer/src/ui/updater.jsx +++ b/renderer/src/ui/updater.jsx @@ -1,5 +1,7 @@ import {Config} from "data"; -import {React, Events, Strings} from "modules"; +import React from "@modules/react"; +import Strings from "@modules/strings"; +import Events from "@modules/emitter"; import Drawer from "./settings/drawer"; import SettingItem from "./settings/components/item"; import SettingsTitle from "./settings/title";