Remove @vizality/core and @vizality/api imports

package.json

@@ -42,13 +42,23 @@
     "@vizality/root": ".",
     "@vizality/src": "src",
     "@vizality/api": "src/core/api",
-    "@vizality": "src/core/modules",
+    "@vizality/managers": "src/core/aliases/Managers",
+    "@vizality/plugins": "src/core/aliases/Plugins",
+    "@vizality/themes": "src/core/aliases/Themes",
     "@vizality/modules": "src/core/modules",
     "@vizality/builtins": "src/core/builtins",
     "@vizality/typedefs": "src/core/typedefs",
     "@vizality/compilers": "src/core/compilers",
-    "@vizality/core": "src/core/entities",
     "@vizality/entities": "src/core/entities",
+    "@vizality/constants": "src/core/modules/constants",
+    "@vizality/components": "src/core/modules/components",
+    "@vizality/discord": "src/core/modules/discord",
+    "@vizality/http": "src/core/modules/http",
+    "@vizality/i18n": "src/core/modules/i18n",
+    "@vizality/patcher": "src/core/modules/patcher",
+    "@vizality/react": "src/core/modules/react",
+    "@vizality/webpack": "src/core/modules/webpack",
+    "@vizality/util": "src/core/modules/util",
     "@vizality/util/performance": "src/core/modules/util/Performance",
     "@vizality/util/security": "src/core/modules/util/Security",
     "@vizality/util/logger": "src/core/modules/util/Logger",
@@ -62,6 +72,7 @@
     "@vizality/util/file": "src/core/modules/util/File",
     "@vizality/util/time": "src/core/modules/util/Time",
     "@vizality/util/dom": "src/core/modules/util/DOM",
+    "@vizality": "src/core/modules",
     "react": "src/core/modules/react/React",
     "react-dom": "src/core/modules/react/ReactDOM",
     "react-router": "src/core/modules/react/Router"

src/core/api/actions/index.js

@@ -1,5 +1,7 @@
 import { error } from '@vizality/util/logger';
-import { API } from '@vizality/core';
+import { API } from '@vizality/entities';
+
+console.log(API);
 
 const _module = 'Module';
 const _submodule = 'API:Actions';

src/core/api/commands/index.js

@@ -1,4 +1,4 @@
-import { API } from '@vizality/core';
+import { API } from '@vizality/entities';
 
 /**
  * @typedef VizalityChatCommand

src/core/api/connections/index.js

@@ -1,4 +1,4 @@
-import { API } from '@vizality/core';
+import { API } from '@vizality/entities';
 
 export default class ConnectionsAPI extends API {
   constructor () {

src/core/api/i18n/index.js

@@ -1,6 +1,6 @@
 import { Directories } from '@vizality/constants';
 import { getModule } from '@vizality/webpack';
-import { API } from '@vizality/core';
+import { API } from '@vizality/entities';
 import i18n from '@vizality/i18n';
 
 export default class I18nAPI extends API {

src/core/api/index.js

@@ -1,18 +0,0 @@
-const { connections, settings, commands, keybinds, actions, notices, popups, router, i18n, rpc } = vizality.api;
-
-export {
-  connections,
-  settings,
-  commands,
-  keybinds,
-  actions,
-  notices,
-  popups,
-  router,
-  i18n,
-  rpc
-};
-
-export default this;
-
-console.log(this);

src/core/api/keybinds/index.js

@@ -1,6 +1,6 @@
 import { getModule } from '@vizality/webpack';
+import { API } from '@vizality/entities';
 import { error } from '@vizality/util';
-import { API } from '@vizality/core';
 
 const _module = 'API';
 const _submodule = 'Keybinds';

src/core/api/notices/index.js

@@ -1,4 +1,4 @@
-import { API } from '@vizality/core';
+import { API } from '@vizality/entities';
 
 /*
  * @todo:

src/core/api/popups/index.js

@@ -3,7 +3,6 @@ import React, { memo, useState, useEffect } from 'react';
 import { PopupWindow, Titlebar, Spinner } from '@vizality/components';
 import { getModule } from '@vizality/webpack';
 import { Events } from '@vizality/constants';
-import { API } from '@vizality/core';
 
 const PopupContent = memo(props => {
   const [ loading, setLoading ] = useState(true);
@@ -42,6 +41,7 @@ const PopupContent = memo(props => {
     </div>
   );
 });
+import { API } from '@vizality/entities';
 
 export default class PopupsAPI extends API {
   constructor () {

src/core/api/router/index.js

@@ -1,6 +1,6 @@
 import { error } from '@vizality/util/logger';
 import { getModule } from '@vizality/webpack';
-import { API } from '@vizality/core';
+import { API } from '@vizality/entities';
 
 import Sidebar from '@vizality/builtins/dashboard/components/parts/sidebar/Sidebar';
 import Routes from '@vizality/builtins/dashboard/routes/Routes';

src/core/api/rpc/index.js

@@ -1,4 +1,4 @@
-import { API } from '@vizality/core';
+import { API } from '@vizality/entities';
 
 /* @todo: Use logger. */
 

src/core/api/settings/index.js

@@ -2,7 +2,7 @@ import React from 'react';
 
 import { error } from '@vizality/util/logger';
 import { Flux } from '@vizality/webpack';
-import { API } from '@vizality/core';
+import { API } from '@vizality/entities';
 
 import actions from './store/actions';
 import store from './store/store';

src/core/builtins/addon-manager/index.js

@@ -3,8 +3,8 @@ import React from 'react';
 import { open as openModal, close as closeModal } from '@vizality/modal';
 import { Confirm, Text, LazyImage } from '@vizality/components';
 import { toTitleCase, toPlural } from '@vizality/util/string';
+import { Builtin } from '@vizality/entities';
 import { Messages } from '@vizality/i18n';
-import { Builtin } from '@vizality/core';
 
 import * as commands from './commands';
 import * as i18n from './i18n';

src/core/builtins/attributes/index.js

@@ -1,6 +1,6 @@
 import { ipcRenderer } from 'electron';
 
-import { Builtin } from '@vizality/core';
+import { Builtin } from '@vizality/entities';
 
 import modules from './modules';
 

src/core/builtins/commands/commands/index.js

@@ -1 +0,0 @@
-export { default as help } from './help';

src/core/builtins/commands/index.js

@@ -1,5 +1,5 @@
 import { unpatch } from '@vizality/patcher';
-import { Builtin } from '@vizality/core';
+import { Builtin } from '@vizality/entities';
 
 import monkeypatchMessages from './monkeypatchMessages';
 import injectAutocomplete from './injectAutocomplete';

src/core/builtins/dashboard/index.js

@@ -3,8 +3,8 @@ import React from 'react';
 import { patch, unpatch } from '@vizality/patcher';
 import { getModule } from '@vizality/webpack';
 import { Regexes } from '@vizality/constants';
+import { Builtin } from '@vizality/entities';
 import { Icon } from '@vizality/components';
-import { Builtin } from '@vizality/core';
 
 import Sidebar from './components/parts/sidebar/Sidebar';
 import Routes from './routes/Routes';

src/core/builtins/enhancements/index.js

@@ -1,4 +1,4 @@
-import { Builtin } from '@vizality/core';
+import { Builtin } from '@vizality/entities';
 
 import * as modules from './modules';
 

src/core/builtins/notices/index.js

@@ -7,7 +7,7 @@ import { getModule, getModuleByDisplayName } from '@vizality/webpack';
 import { Guild, Directories } from '@vizality/constants';
 import { waitForElement } from '@vizality/util/dom';
 import { patch, unpatch } from '@vizality/patcher';
-import { Builtin } from '@vizality/core';
+import { Builtin } from '@vizality/entities';
 
 import AnnouncementContainer from './components/AnnouncementContainer';
 import ToastContainer from './components/ToastContainer';

src/core/builtins/privacy/index.js

@@ -24,7 +24,7 @@
 
 
 import { getModule } from '@vizality/webpack';
-import { Builtin } from '@vizality/core';
+import { Builtin } from '@vizality/entities';
 
 let Analytics, Reporter, Sentry;
 

src/core/builtins/quick-code/index.js

@@ -3,7 +3,7 @@ import { join } from 'path';
 import React from 'react';
 
 import { getModule } from '@vizality/webpack';
-import { Builtin } from '@vizality/core';
+import { Builtin } from '@vizality/entities';
 
 import QuickCodePage from './components/QuickCode';
 

src/core/builtins/router/index.js

@@ -4,7 +4,7 @@ import { findInReactTree, findInTree, getOwnerInstance } from '@vizality/util/re
 import { getModule, getModules, getModuleByDisplayName } from '@vizality/webpack';
 import { waitForElement } from '@vizality/util/dom';
 import { patch, unpatch } from '@vizality/patcher';
-import { Builtin } from '@vizality/core';
+import { Builtin } from '@vizality/entities';
 
 export default class Router extends Builtin {
   async onStart () {

src/core/builtins/updater/index.js

@@ -9,8 +9,8 @@ import { getModule, getModuleByDisplayName } from '@vizality/webpack';
 import { joinClassNames } from '@vizality/util/dom';
 import { Directories } from '@vizality/constants';
 import { Confirm } from '@vizality/components';
+import { Builtin } from '@vizality/entities';
 import { Messages } from '@vizality/i18n';
-import { Builtin } from '@vizality/core';
 
 import Settings from './components/Settings';
 

src/core/index.js

@@ -3,8 +3,8 @@ import cp from 'child_process';
 
 import { initialize, getModule } from '@vizality/webpack';
 import { Directories, HTTP } from '@vizality/constants';
+import { Updatable } from '@vizality/entities';
 import { sleep } from '@vizality/util/time';
-import { Updatable } from '@vizality/core';
 
 import BuiltinManager from './managers/Builtin';
 import PluginManager from './managers/Plugin';

src/core/modules/index.js

@@ -1,10 +1,10 @@
-export { default as Discord } from './discord';
-export * as util from './util';
 export * as components from './components';
 export * as constants from './constants';
 export * as webpack from './webpack';
 export * as patcher from './patcher';
+export * as discord from './discord';
 export * as react from './react';
 export * as modal from './modal';
 export * as i18n from './i18n';
 export * as http from './http';
+export * as util from './util';

src/preload/splash.js

@@ -8,7 +8,7 @@ require('../ipc/renderer');
  */
 const initialize = () => {
   document.documentElement.setAttribute('vizality', '');
-  const ThemeManager = require('../core/managers/addon/theme');
+  const ThemeManager = require('../core/managers/Theme');
   global.sm = new ThemeManager();
   global.sm.start();
 };