Bundle dependencies with extensions for webstore rule compliance (#1740)

20 files changed, 0 insertions, 1232 deletions

diff --git a/src/plugins/shikiCodeblocks/api/languages.ts b/src/plugins/shikiCodeblocks/api/languages.ts
deleted file mode 100644
index f14a4dc..0000000
--- a/src/plugins/shikiCodeblocks/api/languages.ts
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Vencord, a modification for Discord's desktop app
- * Copyright (c) 2022 Vendicated and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import { ILanguageRegistration } from "@vap/shiki";
-
-export const VPC_REPO = "Vap0r1ze/vapcord";
-export const VPC_REPO_COMMIT = "88a7032a59cca40da170926651b08201ea3b965a";
-export const vpcRepoAssets = `https://raw.githubusercontent.com/${VPC_REPO}/${VPC_REPO_COMMIT}/assets/shiki-codeblocks`;
-export const vpcRepoGrammar = (fileName: string) => `${vpcRepoAssets}/${fileName}`;
-export const vpcRepoLanguages = `${vpcRepoAssets}/languages.json`;
-
-export interface Language {
-    name: string;
-    id: string;
-    devicon?: string;
-    grammarUrl: string,
-    grammar?: ILanguageRegistration["grammar"];
-    scopeName: string;
-    aliases?: string[];
-    custom?: boolean;
-}
-export interface LanguageJson {
-    name: string;
-    id: string;
-    fileName: string;
-    devicon?: string;
-    scopeName: string;
-    aliases?: string[];
-}
-
-export const languages: Record<string, Language> = {};
-
-export const loadLanguages = async () => {
-    const langsJson: LanguageJson[] = await fetch(vpcRepoLanguages).then(res => res.json());
-    const loadedLanguages = Object.fromEntries(
-        langsJson.map(lang => [lang.id, {
-            ...lang,
-            grammarUrl: vpcRepoGrammar(lang.fileName),
-        }])
-    );
-    Object.assign(languages, loadedLanguages);
-};
-
-export const getGrammar = (lang: Language): Promise<NonNullable<ILanguageRegistration["grammar"]>> => {
-    if (lang.grammar) return Promise.resolve(lang.grammar);
-    return fetch(lang.grammarUrl).then(res => res.json());
-};
-
-const aliasCache = new Map<string, Language>();
-export function resolveLang(idOrAlias: string) {
-    if (Object.prototype.hasOwnProperty.call(languages, idOrAlias)) return languages[idOrAlias];
-
-    const lang = Object.values(languages).find(lang => lang.aliases?.includes(idOrAlias));
-
-    if (!lang) return null;
-
-    aliasCache.set(idOrAlias, lang);
-    return lang;
-}
diff --git a/src/plugins/shikiCodeblocks/api/shiki.ts b/src/plugins/shikiCodeblocks/api/shiki.ts
deleted file mode 100644
index 91e179b..0000000
--- a/src/plugins/shikiCodeblocks/api/shiki.ts
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Vencord, a modification for Discord's desktop app
- * Copyright (c) 2022 Vendicated and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import { shikiOnigasmSrc, shikiWorkerSrc } from "@utils/dependencies";
-import { WorkerClient } from "@vap/core/ipc";
-import type { IShikiTheme, IThemedToken } from "@vap/shiki";
-
-import { dispatchTheme } from "../hooks/useTheme";
-import type { ShikiSpec } from "../types";
-import { getGrammar, languages, loadLanguages, resolveLang } from "./languages";
-import { themes } from "./themes";
-
-const themeUrls = Object.values(themes);
-
-let resolveClient: (client: WorkerClient<ShikiSpec>) => void;
-
-export const shiki = {
-    client: null as WorkerClient<ShikiSpec> | null,
-    currentTheme: null as IShikiTheme | null,
-    currentThemeUrl: null as string | null,
-    timeoutMs: 10000,
-    languages,
-    themes,
-    loadedThemes: new Set<string>(),
-    loadedLangs: new Set<string>(),
-    clientPromise: new Promise<WorkerClient<ShikiSpec>>(resolve => resolveClient = resolve),
-
-    init: async (initThemeUrl: string | undefined) => {
-        /** https://stackoverflow.com/q/58098143 */
-        const workerBlob = await fetch(shikiWorkerSrc).then(res => res.blob());
-
-        const client = shiki.client = new WorkerClient<ShikiSpec>(
-            "shiki-client",
-            "shiki-host",
-            workerBlob,
-            { name: "ShikiWorker" },
-        );
-        await client.init();
-
-        const themeUrl = initThemeUrl || themeUrls[0];
-
-        await loadLanguages();
-        await client.run("setOnigasm", { wasm: shikiOnigasmSrc });
-        await client.run("setHighlighter", { theme: themeUrl, langs: [] });
-        shiki.loadedThemes.add(themeUrl);
-        await shiki._setTheme(themeUrl);
-        resolveClient(client);
-    },
-    _setTheme: async (themeUrl: string) => {
-        shiki.currentThemeUrl = themeUrl;
-        const { themeData } = await shiki.client!.run("getTheme", { theme: themeUrl });
-        shiki.currentTheme = JSON.parse(themeData);
-        dispatchTheme({ id: themeUrl, theme: shiki.currentTheme });
-    },
-    loadTheme: async (themeUrl: string) => {
-        const client = await shiki.clientPromise;
-        if (shiki.loadedThemes.has(themeUrl)) return;
-
-        await client.run("loadTheme", { theme: themeUrl });
-
-        shiki.loadedThemes.add(themeUrl);
-    },
-    setTheme: async (themeUrl: string) => {
-        await shiki.clientPromise;
-        themeUrl ||= themeUrls[0];
-        if (!shiki.loadedThemes.has(themeUrl)) await shiki.loadTheme(themeUrl);
-
-        await shiki._setTheme(themeUrl);
-    },
-    loadLang: async (langId: string) => {
-        const client = await shiki.clientPromise;
-        const lang = resolveLang(langId);
-
-        if (!lang || shiki.loadedLangs.has(lang.id)) return;
-
-        await client.run("loadLanguage", {
-            lang: {
-                ...lang,
-                grammar: lang.grammar ?? await getGrammar(lang),
-            }
-        });
-        shiki.loadedLangs.add(lang.id);
-    },
-    tokenizeCode: async (code: string, langId: string): Promise<IThemedToken[][]> => {
-        const client = await shiki.clientPromise;
-        const lang = resolveLang(langId);
-        if (!lang) return [];
-
-        if (!shiki.loadedLangs.has(lang.id)) await shiki.loadLang(lang.id);
-
-        return await client.run("codeToThemedTokens", {
-            code,
-            lang: langId,
-            theme: shiki.currentThemeUrl ?? themeUrls[0],
-        });
-    },
-    destroy() {
-        shiki.currentTheme = null;
-        shiki.currentThemeUrl = null;
-        dispatchTheme({ id: null, theme: null });
-        shiki.client?.destroy();
-    }
-};
diff --git a/src/plugins/shikiCodeblocks/api/themes.ts b/src/plugins/shikiCodeblocks/api/themes.ts
deleted file mode 100644
index f31ce60..0000000
--- a/src/plugins/shikiCodeblocks/api/themes.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Vencord, a modification for Discord's desktop app
- * Copyright (c) 2022 Vendicated and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import { IShikiTheme } from "@vap/shiki";
-
-export const SHIKI_REPO = "shikijs/shiki";
-export const SHIKI_REPO_COMMIT = "0b28ad8ccfbf2615f2d9d38ea8255416b8ac3043";
-export const shikiRepoTheme = (name: string) => `https://raw.githubusercontent.com/${SHIKI_REPO}/${SHIKI_REPO_COMMIT}/packages/shiki/themes/${name}.json`;
-
-export const themes = {
-    // Default
-    DarkPlus: shikiRepoTheme("dark-plus"),
-
-    // Dev Choices
-    MaterialCandy: "https://raw.githubusercontent.com/millsp/material-candy/master/material-candy.json",
-
-    // More from Shiki repo
-    DraculaSoft: shikiRepoTheme("dracula-soft"),
-    Dracula: shikiRepoTheme("dracula"),
-    GithubDarkDimmed: shikiRepoTheme("github-dark-dimmed"),
-    GithubDark: shikiRepoTheme("github-dark"),
-    GithubLight: shikiRepoTheme("github-light"),
-    LightPlus: shikiRepoTheme("light-plus"),
-    MaterialDarker: shikiRepoTheme("material-darker"),
-    MaterialDefault: shikiRepoTheme("material-default"),
-    MaterialLighter: shikiRepoTheme("material-lighter"),
-    MaterialOcean: shikiRepoTheme("material-ocean"),
-    MaterialPalenight: shikiRepoTheme("material-palenight"),
-    MinDark: shikiRepoTheme("min-dark"),
-    MinLight: shikiRepoTheme("min-light"),
-    Monokai: shikiRepoTheme("monokai"),
-    Nord: shikiRepoTheme("nord"),
-    OneDarkPro: shikiRepoTheme("one-dark-pro"),
-    Poimandres: shikiRepoTheme("poimandres"),
-    RosePineDawn: shikiRepoTheme("rose-pine-dawn"),
-    RosePineMoon: shikiRepoTheme("rose-pine-moon"),
-    RosePine: shikiRepoTheme("rose-pine"),
-    SlackDark: shikiRepoTheme("slack-dark"),
-    SlackOchin: shikiRepoTheme("slack-ochin"),
-    SolarizedDark: shikiRepoTheme("solarized-dark"),
-    SolarizedLight: shikiRepoTheme("solarized-light"),
-    VitesseDark: shikiRepoTheme("vitesse-dark"),
-    VitesseLight: shikiRepoTheme("vitesse-light"),
-    CssVariables: shikiRepoTheme("css-variables"),
-};
-
-export const themeCache = new Map<string, IShikiTheme>();
-
-export const getTheme = (url: string): Promise<IShikiTheme> => {
-    if (themeCache.has(url)) return Promise.resolve(themeCache.get(url)!);
-    return fetch(url).then(res => res.json());
-};
diff --git a/src/plugins/shikiCodeblocks/components/ButtonRow.tsx b/src/plugins/shikiCodeblocks/components/ButtonRow.tsx
deleted file mode 100644
index e73eb72..0000000
--- a/src/plugins/shikiCodeblocks/components/ButtonRow.tsx
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Vencord, a modification for Discord's desktop app
- * Copyright (c) 2022 Vendicated and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import { Clipboard } from "@webpack/common";
-
-import { cl } from "../utils/misc";
-import { CopyButton } from "./CopyButton";
-
-export interface ButtonRowProps {
-    theme: import("./Highlighter").ThemeBase;
-    content: string;
-}
-
-export function ButtonRow({ content, theme }: ButtonRowProps) {
-    const buttons: JSX.Element[] = [];
-
-    if (Clipboard.SUPPORTS_COPY) {
-        buttons.push(
-            <CopyButton
-                content={content}
-                className={cl("btn")}
-                style={{
-                    backgroundColor: theme.accentBgColor,
-                    color: theme.accentFgColor,
-                }}
-            />
-        );
-    }
-
-    return <div className={cl("btns")}>{buttons}</div>;
-}
diff --git a/src/plugins/shikiCodeblocks/components/Code.tsx b/src/plugins/shikiCodeblocks/components/Code.tsx
deleted file mode 100644
index ce6a705..0000000
--- a/src/plugins/shikiCodeblocks/components/Code.tsx
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Vencord, a modification for Discord's desktop app
- * Copyright (c) 2022 Vendicated and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import type { IThemedToken } from "@vap/shiki";
-import { hljs } from "@webpack/common";
-
-import { cl } from "../utils/misc";
-import { ThemeBase } from "./Highlighter";
-
-export interface CodeProps {
-    theme: ThemeBase;
-    useHljs: boolean;
-    lang?: string;
-    content: string;
-    tokens: IThemedToken[][] | null;
-}
-
-export const Code = ({
-    theme,
-    useHljs,
-    lang,
-    content,
-    tokens,
-}: CodeProps) => {
-    let lines!: JSX.Element[];
-
-    if (useHljs) {
-        try {
-            const { value: hljsHtml } = hljs.highlight(lang!, content, true);
-            lines = hljsHtml
-                .split("\n")
-                .map((line, i) => <span key={i} dangerouslySetInnerHTML={{ __html: line }} />);
-        } catch {
-            lines = content.split("\n").map(line => <span>{line}</span>);
-        }
-    } else {
-        const renderTokens =
-            tokens ??
-            content
-                .split("\n")
-                .map(line => [{ color: theme.plainColor, content: line } as IThemedToken]);
-
-        lines = renderTokens.map(line => {
-            // [Cynthia] this makes it so when you highlight the codeblock
-            // empty lines are also selected and copied when you Ctrl+C.
-            if (line.length === 0) {
-                return <span>{"\n"}</span>;
-            }
-
-            return (
-                <>
-                    {line.map(({ content, color, fontStyle }, i) => (
-                        <span
-                            key={i}
-                            style={{
-                                color,
-                                fontStyle: (fontStyle ?? 0) & 1 ? "italic" : undefined,
-                                fontWeight: (fontStyle ?? 0) & 2 ? "bold" : undefined,
-                                textDecoration: (fontStyle ?? 0) & 4 ? "underline" : undefined,
-                            }}
-                        >
-                            {content}
-                        </span>
-                    ))}
-                </>
-            );
-        });
-    }
-
-    const codeTableRows = lines.map((line, i) => (
-        <tr key={i}>
-            <td style={{ color: theme.plainColor }}>{i + 1}</td>
-            <td>{line}</td>
-        </tr>
-    ));
-
-    return <table className={cl("table")}>{...codeTableRows}</table>;
-};
diff --git a/src/plugins/shikiCodeblocks/components/CopyButton.tsx b/src/plugins/shikiCodeblocks/components/CopyButton.tsx
deleted file mode 100644
index 153b3cd..0000000
--- a/src/plugins/shikiCodeblocks/components/CopyButton.tsx
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Vencord, a modification for Discord's desktop app
- * Copyright (c) 2022 Vendicated and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import { useCopyCooldown } from "../hooks/useCopyCooldown";
-
-export interface CopyButtonProps extends React.DetailedHTMLProps<React.ButtonHTMLAttributes<HTMLButtonElement>, HTMLButtonElement> {
-    content: string;
-}
-
-export function CopyButton({ content, ...props }: CopyButtonProps) {
-    const [copyCooldown, copy] = useCopyCooldown(1000);
-
-    return (
-        <button
-            {...props}
-            style={{
-                ...props.style,
-                cursor: copyCooldown ? "default" : undefined,
-            }}
-            onClick={() => copy(content)}
-        >
-            {copyCooldown ? "Copied!" : "Copy"}
-        </button>
-
-    );
-}
diff --git a/src/plugins/shikiCodeblocks/components/Header.tsx b/src/plugins/shikiCodeblocks/components/Header.tsx
deleted file mode 100644
index 320dde9..0000000
--- a/src/plugins/shikiCodeblocks/components/Header.tsx
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Vencord, a modification for Discord's desktop app
- * Copyright (c) 2022 Vendicated and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import { Language } from "../api/languages";
-import { DeviconSetting } from "../types";
-import { cl } from "../utils/misc";
-
-export interface HeaderProps {
-    langName?: string;
-    useDevIcon: DeviconSetting;
-    shikiLang: Language | null;
-}
-
-export function Header({ langName, useDevIcon, shikiLang }: HeaderProps) {
-    if (!langName) return <></>;
-
-    return (
-        <div className={cl("lang")}>
-            {useDevIcon !== DeviconSetting.Disabled && shikiLang?.devicon && (
-                <i
-                    className={`${cl("devicon")} devicon-${shikiLang.devicon}${useDevIcon === DeviconSetting.Color ? " colored" : ""}`}
-                />
-            )}
-            {langName}
-        </div>
-    );
-}
diff --git a/src/plugins/shikiCodeblocks/components/Highlighter.tsx b/src/plugins/shikiCodeblocks/components/Highlighter.tsx
deleted file mode 100644
index dd14019..0000000
--- a/src/plugins/shikiCodeblocks/components/Highlighter.tsx
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Vencord, a modification for Discord's desktop app
- * Copyright (c) 2022 Vendicated and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import ErrorBoundary from "@components/ErrorBoundary";
-import { useAwaiter, useIntersection } from "@utils/react";
-import { hljs, React } from "@webpack/common";
-
-import { resolveLang } from "../api/languages";
-import { shiki } from "../api/shiki";
-import { useShikiSettings } from "../hooks/useShikiSettings";
-import { useTheme } from "../hooks/useTheme";
-import { hex2Rgb } from "../utils/color";
-import { cl, shouldUseHljs } from "../utils/misc";
-import { ButtonRow } from "./ButtonRow";
-import { Code } from "./Code";
-import { Header } from "./Header";
-
-export interface ThemeBase {
-    plainColor: string;
-    accentBgColor: string;
-    accentFgColor: string;
-    backgroundColor: string;
-}
-
-export interface HighlighterProps {
-    lang?: string;
-    content: string;
-    isPreview: boolean;
-    tempSettings?: Record<string, any>;
-}
-
-export const createHighlighter = (props: HighlighterProps) => (
-    <pre className={cl("container")}>
-        <ErrorBoundary>
-            <Highlighter {...props} />
-        </ErrorBoundary>
-    </pre>
-);
-export const Highlighter = ({
-    lang,
-    content,
-    isPreview,
-    tempSettings,
-}: HighlighterProps) => {
-    const {
-        tryHljs,
-        useDevIcon,
-        bgOpacity,
-    } = useShikiSettings(["tryHljs", "useDevIcon", "bgOpacity"], tempSettings);
-    const { id: currentThemeId, theme: currentTheme } = useTheme();
-
-    const shikiLang = lang ? resolveLang(lang) : null;
-    const useHljs = shouldUseHljs({ lang, tryHljs });
-
-    const [rootRef, isIntersecting] = useIntersection(true);
-
-    const [tokens] = useAwaiter(async () => {
-        if (!shikiLang || useHljs || !isIntersecting) return null;
-        return await shiki.tokenizeCode(content, lang!);
-    }, {
-        fallbackValue: null,
-        deps: [lang, content, currentThemeId, isIntersecting],
-    });
-
-    const themeBase: ThemeBase = {
-        plainColor: currentTheme?.fg || "var(--text-normal)",
-        accentBgColor:
-            currentTheme?.colors?.["statusBar.background"] || (useHljs ? "#7289da" : "#007BC8"),
-        accentFgColor: currentTheme?.colors?.["statusBar.foreground"] || "#FFF",
-        backgroundColor:
-            currentTheme?.colors?.["editor.background"] || "var(--background-secondary)",
-    };
-
-    let langName;
-    if (lang) langName = useHljs ? hljs?.getLanguage?.(lang)?.name : shikiLang?.name;
-
-    return (
-        <div
-            ref={rootRef}
-            className={cl("root", { plain: !langName, preview: isPreview })}
-            style={{
-                backgroundColor: useHljs
-                    ? themeBase.backgroundColor
-                    : `rgba(${hex2Rgb(themeBase.backgroundColor)
-                        .concat(bgOpacity / 100)
-                        .join(", ")})`,
-                color: themeBase.plainColor,
-            }}
-        >
-            <code>
-                <Header
-                    langName={langName}
-                    useDevIcon={useDevIcon}
-                    shikiLang={shikiLang}
-                />
-                <Code
-                    theme={themeBase}
-                    useHljs={useHljs}
-                    lang={lang}
-                    content={content}
-                    tokens={tokens}
-                />
-                {!isPreview && <ButtonRow
-                    content={content}
-                    theme={themeBase}
-                />}
-            </code>
-        </div>
-    );
-};
-
diff --git a/src/plugins/shikiCodeblocks/devicon.css b/src/plugins/shikiCodeblocks/devicon.css
deleted file mode 100644
index ed1014e..0000000
--- a/src/plugins/shikiCodeblocks/devicon.css
+++ /dev/null
@@ -1 +0,0 @@
-@import url("https://cdn.jsdelivr.net/gh/devicons/devicon@v2.10.1/devicon.min.css");
diff --git a/src/plugins/shikiCodeblocks/hooks/useCopyCooldown.ts b/src/plugins/shikiCodeblocks/hooks/useCopyCooldown.ts
deleted file mode 100644
index 414500b..0000000
--- a/src/plugins/shikiCodeblocks/hooks/useCopyCooldown.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Vencord, a modification for Discord's desktop app
- * Copyright (c) 2022 Vendicated and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import { Clipboard, React } from "@webpack/common";
-
-export function useCopyCooldown(cooldown: number) {
-    const [copyCooldown, setCopyCooldown] = React.useState(false);
-
-    function copy(text: string) {
-        Clipboard.copy(text);
-        setCopyCooldown(true);
-
-        setTimeout(() => {
-            setCopyCooldown(false);
-        }, cooldown);
-    }
-
-    return [copyCooldown, copy] as const;
-}
diff --git a/src/plugins/shikiCodeblocks/hooks/useShikiSettings.ts b/src/plugins/shikiCodeblocks/hooks/useShikiSettings.ts
deleted file mode 100644
index 22954ce..0000000
--- a/src/plugins/shikiCodeblocks/hooks/useShikiSettings.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Vencord, a modification for Discord's desktop app
- * Copyright (c) 2022 Vendicated and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import { PartialExcept } from "@utils/types";
-import { React } from "@webpack/common";
-
-import { shiki } from "../api/shiki";
-import { settings as pluginSettings, ShikiSettings } from "../settings";
-
-export function useShikiSettings<F extends keyof ShikiSettings>(settingKeys: F[], overrides?: Partial<ShikiSettings>) {
-    const settings: Partial<ShikiSettings> = pluginSettings.use(settingKeys);
-    const [isLoading, setLoading] = React.useState(false);
-
-    const withOverrides = { ...settings, ...overrides } as PartialExcept<ShikiSettings, F>;
-    const themeUrl = withOverrides.customTheme || withOverrides.theme;
-
-    if (overrides) {
-        const willChangeTheme = shiki.currentThemeUrl && themeUrl && themeUrl !== shiki.currentThemeUrl;
-        const noOverrides = Object.keys(overrides).length === 0;
-
-        if (isLoading && (!willChangeTheme || noOverrides)) setLoading(false);
-        if (!isLoading && willChangeTheme) {
-            setLoading(true);
-            shiki.setTheme(themeUrl);
-        }
-    }
-
-    return {
-        ...withOverrides,
-        isThemeLoading: themeUrl !== shiki.currentThemeUrl,
-    };
-}
diff --git a/src/plugins/shikiCodeblocks/hooks/useTheme.ts b/src/plugins/shikiCodeblocks/hooks/useTheme.ts
deleted file mode 100644
index fae5796..0000000
--- a/src/plugins/shikiCodeblocks/hooks/useTheme.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Vencord, a modification for Discord's desktop app
- * Copyright (c) 2022 Vendicated and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import { React } from "@webpack/common";
-
-type Shiki = typeof import("../api/shiki").shiki;
-interface ThemeState {
-    id: Shiki["currentThemeUrl"],
-    theme: Shiki["currentTheme"],
-}
-
-const currentTheme: ThemeState = {
-    id: null,
-    theme: nu