From ec9243c12d8bebf4eb78e9095ad52d97d6cb819d Mon Sep 17 00:00:00 2001 From: Zack Rauen Date: Wed, 14 Jun 2023 22:17:10 -0400 Subject: [PATCH] Fix new imports --- renderer/src/ui/base/button.jsx | 3 ++- renderer/src/ui/base/flex.jsx | 3 ++- renderer/src/ui/base/markdown.jsx | 4 +++- renderer/src/ui/base/text.jsx | 3 ++- renderer/src/ui/modals.js | 2 +- renderer/src/ui/modals/backdrop.jsx | 4 +++- renderer/src/ui/modals/changelog.jsx | 7 +++++-- renderer/src/ui/modals/close.jsx | 3 ++- renderer/src/ui/modals/confirmation.jsx | 4 +++- renderer/src/ui/modals/content.jsx | 3 ++- renderer/src/ui/modals/footer.jsx | 4 +++- renderer/src/ui/modals/header.jsx | 4 +++- renderer/src/ui/modals/root.jsx | 4 +++- renderer/src/ui/modals/stack.jsx | 5 ++++- 14 files changed, 38 insertions(+), 15 deletions(-) diff --git a/renderer/src/ui/base/button.jsx b/renderer/src/ui/base/button.jsx index 22e5021e..8e428cb9 100644 --- a/renderer/src/ui/base/button.jsx +++ b/renderer/src/ui/base/button.jsx @@ -1,4 +1,5 @@ -import {React, Utilities} from "modules"; +import React from "@modules/react"; +import Utilities from "@modules/utilities"; // S.Looks = y; // S.Colors = I; diff --git a/renderer/src/ui/base/flex.jsx b/renderer/src/ui/base/flex.jsx index 572afbc4..3ef4cabc 100644 --- a/renderer/src/ui/base/flex.jsx +++ b/renderer/src/ui/base/flex.jsx @@ -1,4 +1,5 @@ -import {React, Utilities} from "modules"; +import React from "@modules/react"; +import Utilities from "@modules/utilities"; export const Direction = Object.freeze({ diff --git a/renderer/src/ui/base/markdown.jsx b/renderer/src/ui/base/markdown.jsx index dc38494e..e01902bd 100644 --- a/renderer/src/ui/base/markdown.jsx +++ b/renderer/src/ui/base/markdown.jsx @@ -1,4 +1,6 @@ -import {React, WebpackModules, DiscordModules} from "modules"; +import React from "@modules/react"; +import WebpackModules from "@modules/webpackmodules"; +import DiscordModules from "@modules/discordmodules"; const DiscordMarkdown = WebpackModules.find(m => m?.prototype?.render && m.rules); diff --git a/renderer/src/ui/base/text.jsx b/renderer/src/ui/base/text.jsx index 693678e0..38f706c2 100644 --- a/renderer/src/ui/base/text.jsx +++ b/renderer/src/ui/base/text.jsx @@ -1,4 +1,5 @@ -import {React, Utilities} from "modules"; +import React from "@modules/react"; +import Utilities from "@modules/utilities"; export const Colors = Object.freeze({ diff --git a/renderer/src/ui/modals.js b/renderer/src/ui/modals.js index 01663a55..5e5426a2 100644 --- a/renderer/src/ui/modals.js +++ b/renderer/src/ui/modals.js @@ -7,9 +7,9 @@ import React from "@modules/react"; import ReactDOM from "@modules/reactdom"; import Strings from "@modules/strings"; import Settings from "@modules/settingsmanager"; +import Events from "@modules/emitter"; import DiscordModules from "@modules/discordmodules"; import WebpackModules from "@modules/webpackmodules"; -import DiscordClasses from "@modules/discordclasses"; import DOMManager from "@modules/dommanager"; import AddonErrorModal from "./modals/addonerrormodal"; diff --git a/renderer/src/ui/modals/backdrop.jsx b/renderer/src/ui/modals/backdrop.jsx index 066a7e41..38befc11 100644 --- a/renderer/src/ui/modals/backdrop.jsx +++ b/renderer/src/ui/modals/backdrop.jsx @@ -1,4 +1,6 @@ -import {React, Utilities, WebpackModules} from "modules"; +import React from "@modules/react"; +import WebpackModules from "@modules/webpackmodules"; +import Utilities from "@modules/utilities"; const Spring = WebpackModules.getByProps("useSpring", "animated"); diff --git a/renderer/src/ui/modals/changelog.jsx b/renderer/src/ui/modals/changelog.jsx index ac948771..7f4083e8 100644 --- a/renderer/src/ui/modals/changelog.jsx +++ b/renderer/src/ui/modals/changelog.jsx @@ -1,4 +1,7 @@ -import {React, DiscordModules, WebpackModules} from "modules"; +import React from "@modules/react"; +import WebpackModules from "@modules/webpackmodules"; +import DiscordModules from "@modules/discordmodules"; + import Root from "./root"; import Header from "./header"; import Footer from "./footer"; @@ -8,7 +11,7 @@ import Flex from "../base/flex"; import Text from "../base/text"; import CloseButton from "./close"; -import SimpleMarkdownExt from "../../structs/markdown"; +import SimpleMarkdownExt from "@structs/markdown"; const {useMemo} = React; diff --git a/renderer/src/ui/modals/close.jsx b/renderer/src/ui/modals/close.jsx index 9703b9c5..9a27991a 100644 --- a/renderer/src/ui/modals/close.jsx +++ b/renderer/src/ui/modals/close.jsx @@ -1,4 +1,5 @@ -import {React} from "modules"; +import React from "@modules/react"; + import Button from "../base/button"; import Close from "../icons/close"; diff --git a/renderer/src/ui/modals/confirmation.jsx b/renderer/src/ui/modals/confirmation.jsx index ceb9eb57..981b8d67 100644 --- a/renderer/src/ui/modals/confirmation.jsx +++ b/renderer/src/ui/modals/confirmation.jsx @@ -1,4 +1,6 @@ -import {React, Strings} from "modules"; +import React from "@modules/react"; +import Strings from "@modules/strings"; + import Root from "./root"; import Header from "./header"; import Footer from "./footer"; diff --git a/renderer/src/ui/modals/content.jsx b/renderer/src/ui/modals/content.jsx index 999a25e2..dae0aebb 100644 --- a/renderer/src/ui/modals/content.jsx +++ b/renderer/src/ui/modals/content.jsx @@ -1,4 +1,5 @@ -import {React, Utilities} from "modules"; +import React from "@modules/react"; +import Utilities from "@modules/utilities"; export default function Content({id, className, children, scroller = true}) { diff --git a/renderer/src/ui/modals/footer.jsx b/renderer/src/ui/modals/footer.jsx index 1e5baadf..59c56b9f 100644 --- a/renderer/src/ui/modals/footer.jsx +++ b/renderer/src/ui/modals/footer.jsx @@ -1,4 +1,6 @@ -import {React, Utilities} from "modules"; +import React from "@modules/react"; +import Utilities from "@modules/utilities"; + import Flex from "../base/flex"; diff --git a/renderer/src/ui/modals/header.jsx b/renderer/src/ui/modals/header.jsx index 4ba003c1..05fa24a3 100644 --- a/renderer/src/ui/modals/header.jsx +++ b/renderer/src/ui/modals/header.jsx @@ -1,4 +1,6 @@ -import {React, Utilities} from "modules"; +import React from "@modules/react"; +import Utilities from "@modules/utilities"; + import Flex from "../base/flex"; diff --git a/renderer/src/ui/modals/root.jsx b/renderer/src/ui/modals/root.jsx index ad74eedb..8f25a087 100644 --- a/renderer/src/ui/modals/root.jsx +++ b/renderer/src/ui/modals/root.jsx @@ -1,4 +1,6 @@ -import {React, Utilities, WebpackModules} from "modules"; +import React from "@modules/react"; +import Utilities from "@modules/utilities"; +import WebpackModules from "@modules/webpackmodules"; const Spring = WebpackModules.getByProps("useSpring", "animated"); const Anims = WebpackModules.getByProps("Easing"); diff --git a/renderer/src/ui/modals/stack.jsx b/renderer/src/ui/modals/stack.jsx index 37bcc857..79886e87 100644 --- a/renderer/src/ui/modals/stack.jsx +++ b/renderer/src/ui/modals/stack.jsx @@ -1,4 +1,7 @@ -import {React, Events, WebpackModules} from "modules"; +import React from "@modules/react"; +import Events from "@modules/emitter"; +import WebpackModules from "@modules/webpackmodules"; + import Backdrop from "./backdrop"; const {Fragment, useState, useCallback, useEffect} = React;