diff --git a/scripts/build/build.mjs b/scripts/build/build.mjs index a4b06f536..45cda74ad 100755 --- a/scripts/build/build.mjs +++ b/scripts/build/build.mjs @@ -80,7 +80,7 @@ await Promise.all([ globalName: "Vencord", sourcemap, plugins: [ - globPlugins, + globPlugins("discordDesktop"), ...commonOpts.plugins ], define: { @@ -114,7 +114,7 @@ await Promise.all([ globalName: "Vencord", sourcemap, plugins: [ - globPlugins, + globPlugins("vencordDesktop"), ...commonOpts.plugins ], define: { diff --git a/scripts/build/buildWeb.mjs b/scripts/build/buildWeb.mjs index df75d35a5..98d56b0d4 100644 --- a/scripts/build/buildWeb.mjs +++ b/scripts/build/buildWeb.mjs @@ -38,7 +38,7 @@ const commonOptions = { format: "iife", external: ["plugins", "git-hash", "/assets/*"], plugins: [ - globPlugins, + globPlugins("web"), ...commonOpts.plugins, ], target: ["esnext"], diff --git a/scripts/build/common.mjs b/scripts/build/common.mjs index 53eb23f71..7ff599aa5 100644 --- a/scripts/build/common.mjs +++ b/scripts/build/common.mjs @@ -48,9 +48,9 @@ export const makeAllPackagesExternalPlugin = { }; /** - * @type {import("esbuild").Plugin} + * @type {(kind: "web" | "discordDesktop" | "vencordDesktop") => import("esbuild").Plugin} */ -export const globPlugins = { +export const globPlugins = kind => ({ name: "glob-plugins", setup: build => { const filter = /^~plugins$/; @@ -76,8 +76,10 @@ export const globPlugins = { if (fileBits.length > 2 && ["ts", "tsx"].includes(fileBits.at(-1))) { const mod = fileBits.at(-2); if (mod === "dev" && !watch) continue; - if (mod === "web" && !isWeb) continue; - if (mod === "desktop" && isWeb) continue; + if (mod === "web" && kind === "discordDesktop") continue; + if (mod === "desktop" && kind === "web") continue; + if (mod === "discordDesktop" && kind !== "discordDesktop") continue; + if (mod === "vencordDesktop" && kind !== "vencordDesktop") continue; } const mod = `p${i}`; @@ -93,7 +95,7 @@ export const globPlugins = { }; }); } -}; +}); /** * @type {import("esbuild").Plugin} diff --git a/src/components/VencordSettings/VencordTab.tsx b/src/components/VencordSettings/VencordTab.tsx index 8b8696843..3bdd9b76f 100644 --- a/src/components/VencordSettings/VencordTab.tsx +++ b/src/components/VencordSettings/VencordTab.tsx @@ -26,7 +26,7 @@ import { ErrorCard } from "@components/ErrorCard"; import IpcEvents from "@utils/IpcEvents"; import { Margins } from "@utils/margins"; import { identity, useAwaiter } from "@utils/misc"; -import { relaunch } from "@utils/native"; +import { relaunch, showItemInFolder } from "@utils/native"; import { Button, Card, Forms, React, Select, Slider, Switch } from "@webpack/common"; const cl = classNameFactory("vc-settings-"); @@ -65,7 +65,7 @@ function VencordSettings() { title: "Enable React Developer Tools", note: "Requires a full restart" }, - !IS_WEB && (!isWindows ? { + !IS_WEB && (!IS_DISCORD_DESKTOP || !isWindows ? { key: "frameless", title: "Disable the window frame", note: "Requires a full restart" @@ -112,8 +112,7 @@ function VencordSettings() { Open QuickCSS File