Adjust common module import

renderer/.babelrc.js

@@ -1,22 +1,24 @@
-{
+const path = require("path");
-    "presets": [
+
+module.exports = {
+    presets: [
         "@babel/react",
         ["@babel/env",
         {
-            "targets": {
+            targets: {
-                "node": "14.16.0",
+                node: "14.16.0",
-                "chrome": "91"
+                chrome: "91"
             }
         }]
     ],
-    "plugins": [[
+    plugins: [[
         "module-resolver",
         {
-            "alias": {
+            alias: {
                 "builtins": "./src/builtins/builtins.js",
                 "data": "./src/data/data.js",
                 "modules": "./src/modules/modules.js",
-                "common": "../common"
+                "@common": path.join(__dirname, "..", "common"),
             }
         }
     ]]

renderer/jsconfig.json

@@ -7,7 +7,7 @@
         "modules": ["./src/modules/modules.js"],
         "builtins": ["./src/builtins/builtins.js"],
         "data": ["./src/data/data.js"],
-        "common": ["../common"]
+        "@common/*": ["../common/*"]
       }
     },
     "exclude": ["node_modules"]

renderer/src/modules/addonmanager.js

@@ -1,4 +1,4 @@
-import Logger from "common/logger";
+import Logger from "@common/logger";
 import Settings from "./settingsmanager";
 import Events from "./emitter";
 import DataStore from "./datastore";

renderer/src/modules/api/contextmenu.js

@@ -1,6 +1,6 @@
 import WebpackModules from "../webpackmodules";
 import Patcher from "../patcher";
-import Logger from "common/logger";
+import Logger from "@common/logger";
 import {React} from "../modules";
 
 let startupComplete = false;

renderer/src/modules/api/index.js

@@ -1,6 +1,6 @@
 import PluginManager from "../pluginmanager";
 import ThemeManager from "../thememanager";
-import Logger from "common/logger";
+import Logger from "@common/logger";
 
 import AddonAPI from "./addonapi";
 import Data from "./data";

renderer/src/modules/api/legacy.js

@@ -7,7 +7,7 @@ import Toasts from "../../ui/toasts";
 import Notices from "../../ui/notices";
 import Modals from "../../ui/modals";
 import Settings from "../settingsmanager";
-import Logger from "common/logger";
+import Logger from "@common/logger";
 import Patcher from "../patcher";
 import ipc from "../ipc";
 

renderer/src/modules/api/patcher.js

@@ -1,4 +1,4 @@
-import Logger from "common/logger";
+import Logger from "@common/logger";
 import {default as MainPatcher} from "../patcher";
 
 /**

renderer/src/modules/api/webpack.js

@@ -1,4 +1,4 @@
-import Logger from "common/logger";
+import Logger from "@common/logger";
 import WebpackModules, {Filters} from "../webpackmodules";
 
 /**

renderer/src/modules/core.js

@@ -1,6 +1,6 @@
 import LocaleManager from "./localemanager";
 
-import Logger from "common/logger";
+import Logger from "@common/logger";
 import {Config, Changelog} from "data";
 import DOMManager from "./dommanager";
 import PluginManager from "./pluginmanager";

renderer/src/modules/datastore.js

@@ -1,5 +1,5 @@
 import {Config} from "data";
-import Logger from "common/logger";
+import Logger from "@common/logger";
 const fs = require("fs");
 const path = require("path");
 const releaseChannel = window?.DiscordNative?.app?.getReleaseChannel?.() ?? "stable";

renderer/src/modules/ipc.js

@@ -2,7 +2,7 @@ import {ipcRenderer as ipc} from "electron";
 
 import Events from "./emitter";
 
-import * as IPCEvents from "common/constants/ipcevents";
+import * as IPCEvents from "@common/constants/ipcevents";
 
 export default new class IPCRenderer {
 

renderer/src/modules/modules.js

@@ -14,5 +14,5 @@ export {default as Patcher} from "./patcher";
 export {default as LocaleManager} from "./localemanager";
 export {default as Strings} from "./strings";
 export {default as IPC} from "./ipc";
-export {default as Logger} from "common/logger";
+export {default as Logger} from "@common/logger";
 export {default as DiscordClasses} from "./discordclasses";

renderer/src/modules/patcher.js

@@ -3,7 +3,7 @@
  * instead of the original function. Can also alter arguments and return values.
  */
 
- import Logger from "common/logger";
+ import Logger from "@common/logger";
  import DiscordModules from "./discordmodules";
  import WebpackModules from "./webpackmodules";
  

renderer/src/modules/pluginmanager.js

@@ -1,5 +1,5 @@
 import {Config} from "data";
-import Logger from "common/logger";
+import Logger from "@common/logger";
 import AddonManager from "./addonmanager";
 import AddonError from "../structs/addonerror";
 import Settings from "./settingsmanager";

renderer/src/modules/settingsmanager.js

@@ -1,5 +1,5 @@
 import {SettingsConfig} from "data";
-import Logger from "common/logger";
+import Logger from "@common/logger";
 import DataStore from "./datastore";
 import Events from "./emitter";
 import DiscordModules from "./discordmodules";

renderer/src/modules/updater.js

@@ -3,7 +3,7 @@ import fileSystem from "fs";
 import {Config} from "data";
 import path from "path";
 
-import Logger from "common/logger";
+import Logger from "@common/logger";
 
 import Events from "./emitter";
 import IPC from "./ipc";

renderer/src/modules/utilities.js

@@ -1,4 +1,4 @@
-import Logger from "../../../common/logger";
+import Logger from "@common/logger";
 
 export default class Utilities {
     /**

renderer/src/polyfill/https.js

@@ -1,4 +1,4 @@
-import EventEmitter from "common/events";
+import EventEmitter from "@common/events";
 import Remote from "./remote";
 
 export function get(url, options = {}, callback) {

renderer/src/polyfill/index.js

@@ -2,7 +2,7 @@ import Module from "./module";
 import * as vm from "./vm";
 import * as fs from "./fs";
 import request from "./request";
-import EventEmitter from "common/events";
+import EventEmitter from "@common/events";
 import * as https from "./https";
 import Buffer from "./buffer";
 import crypto from "./crypto";

renderer/src/polyfill/module.js

@@ -1,4 +1,4 @@
-import Logger from "common/logger";
+import Logger from "@common/logger";
 import {compileFunction} from "./vm";
 import Remote from "./remote";
 import fs from "./fs";

renderer/src/structs/builtin.js

@@ -1,4 +1,4 @@
-import Logger from "common/logger";
+import Logger from "@common/logger";
 import Events from "../modules/emitter";
 import Settings from "../modules/settingsmanager";
 import Patcher from "../modules/patcher";

renderer/src/ui/errorboundary.jsx

@@ -1,4 +1,4 @@
-import Logger from "common/logger";
+import Logger from "@common/logger";
 import {React, IPC} from "modules";
 
 export default class ErrorBoundary extends React.Component {

renderer/src/ui/modals.js

@@ -1,5 +1,5 @@
 import {Config} from "data";
-import Logger from "common/logger";
+import Logger from "@common/logger";
 import {WebpackModules, React, ReactDOM, Settings, Strings, DOMManager, DiscordModules, DiscordClasses} from "modules";
 import FormattableString from "../structs/string";
 import AddonErrorModal from "./addonerrormodal";

renderer/src/ui/notices.js

@@ -1,4 +1,5 @@
-import {WebpackModules, DOMManager} from "modules";
+import WebpackModules from "@modules/webpackmodules";
+import DOMManager from "@modules/dommanager";
 
 export default class Notices {
     static get baseClass() {return this.__baseClass ??= WebpackModules.getByProps("container", "base")?.base;}

renderer/src/ui/settings/addoncard.jsx

@@ -1,4 +1,4 @@
-import Logger from "common/logger";
+import Logger from "@common/logger";
 import {React, Strings, WebpackModules, DiscordModules} from "modules";
 import SimpleMarkdown from "../../structs/markdown";
 import EditIcon from "../icons/edit";

renderer/src/ui/toasts.js

@@ -1,4 +1,4 @@
-import Logger from "common/logger";
+import Logger from "@common/logger";
 import {WebpackModules, Settings, DOMManager} from "modules";
 
 export default class Toasts {

renderer/src/ui/tooltip.js

@@ -1,4 +1,4 @@
-import Logger from "common/logger";
+import Logger from "@common/logger";
 import {DOMManager} from "modules";