Adjust module import namespace

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"),
             }
         }

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/*"]
       }
     },

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";

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";}

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";}

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";}

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";}

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);

renderer/src/modules/react.js

@@ -0,0 +1,3 @@
+import DiscordModules from "./discordmodules";
+export default DiscordModules.React;
+export const ReactDOM = DiscordModules.ReactDOM;

renderer/src/modules/reactdom.js

@@ -0,0 +1,2 @@
+import DiscordModules from "./discordmodules";
+export default DiscordModules.ReactDOM;

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) {

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";

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) {

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) {

renderer/src/ui/customcss/checkbox.jsx

@@ -1,4 +1,4 @@
-import {React} from "modules";
+import React from "@modules/react";
 
 const {useState, useCallback} = React;
 

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";

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";
 

renderer/src/ui/divider.jsx

@@ -1,3 +1,3 @@
-import {React} from "modules";
+import React from "@modules/react";
 
 export default ({className}) => <div className={`bd-divider ${className || ""}`}></div>;

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) {

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";
 

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";

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 */

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 <svg className={"bd-logo " + props.className} height="100%" width={props.size || "16px"} viewBox="0 0 2000 2000">

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";

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";

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";

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";

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";

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";

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";

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";

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";

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";

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";

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";

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";

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";

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";

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";

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";

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";

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";

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";

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";

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";

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";

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";

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";

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";

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";

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";

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";

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";

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";

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";

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";

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";

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;
 

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;

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 <div className={"bd-setting-item" + (inline ? " inline" : "")}>

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";

renderer/src/ui/settings/components/number.jsx

@@ -1,4 +1,4 @@
-import {React} from "modules";
+import React from "@modules/react";
 
 const {useState, useCallback} = React;
 

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";
 

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;

renderer/src/ui/settings/components/slider.jsx

@@ -1,4 +1,4 @@
-import {React} from "modules";
+import React from "@modules/react";
 
 const {useState, useCallback} = React;
 

renderer/src/ui/settings/components/switch.jsx

@@ -1,4 +1,4 @@
-import {React} from "modules";
+import React from "@modules/react";
 
 const {useState, useCallback} = React;
 

renderer/src/ui/settings/components/textbox.jsx

@@ -1,4 +1,4 @@
-import {React} from "modules";
+import React from "@modules/react";
 
 const {useState, useCallback} = React;
 

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";
 

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";

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";
 

renderer/src/ui/settings/title.jsx

@@ -1,4 +1,4 @@
-import {React} from "modules";
+import React from "@modules/react";
 
 const {useCallback} = React;
 

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 {
 

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) {

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";