diff options
| -rw-r--r-- | browser/manifest.json | 7 | ||||
| -rwxr-xr-x | scripts/build/build.mjs | 6 | ||||
| -rw-r--r-- | scripts/build/buildWeb.mjs | 12 | ||||
| -rw-r--r-- | scripts/build/common.mjs | 6 | ||||
| -rw-r--r-- | src/globals.d.ts | 2 | ||||
| -rw-r--r-- | src/plugins/supportHelper.tsx | 21 |
6 files changed, 32 insertions, 22 deletions
diff --git a/browser/manifest.json b/browser/manifest.json index cb7ecc7..49536a7 100644 --- a/browser/manifest.json +++ b/browser/manifest.json @@ -41,12 +41,5 @@ "path": "modifyResponseHeaders.json" } ] - }, - - "browser_specific_settings": { - "gecko": { - "id": "vencord-firefox@vendicated.dev", - "strict_min_version": "109.0" - } } } diff --git a/scripts/build/build.mjs b/scripts/build/build.mjs index 45cda74..e37feb5 100755 --- a/scripts/build/build.mjs +++ b/scripts/build/build.mjs @@ -19,11 +19,13 @@ import esbuild from "esbuild"; -import { commonOpts, globPlugins, isStandalone, watch } from "./common.mjs"; +import { commonOpts, globPlugins, isStandalone, VERSION, watch } from "./common.mjs"; const defines = { IS_STANDALONE: isStandalone, - IS_DEV: JSON.stringify(watch) + IS_DEV: JSON.stringify(watch), + VERSION: JSON.stringify(VERSION), + BUILD_TIMESTAMP: Date.now(), }; if (defines.IS_STANDALONE === "false") // If this is a local build (not standalone), optimise diff --git a/scripts/build/buildWeb.mjs b/scripts/build/buildWeb.mjs index cc27ea8..5c1cc78 100644 --- a/scripts/build/buildWeb.mjs +++ b/scripts/build/buildWeb.mjs @@ -24,9 +24,7 @@ import { readFileSync } from "fs"; import { appendFile, mkdir, readFile, rm, writeFile } from "fs/promises"; import { join } from "path"; -// wtf is this assert syntax -import PackageJSON from "../../package.json" assert { type: "json" }; -import { commonOpts, globPlugins, watch } from "./common.mjs"; +import { commonOpts, globPlugins, VERSION, watch } from "./common.mjs"; /** * @type {esbuild.BuildOptions} @@ -47,7 +45,9 @@ const commonOptions = { IS_STANDALONE: "true", IS_DEV: JSON.stringify(watch), IS_DISCORD_DESKTOP: "false", - IS_VENCORD_DESKTOP: "false" + IS_VENCORD_DESKTOP: "false", + VERSION: JSON.stringify(VERSION), + BUILD_TIMESTAMP: Date.now(), } }; @@ -67,7 +67,7 @@ await Promise.all( }, outfile: "dist/Vencord.user.js", banner: { - js: readFileSync("browser/userscript.meta.js", "utf-8").replace("%version%", `${PackageJSON.version}.${new Date().getTime()}`) + js: readFileSync("browser/userscript.meta.js", "utf-8").replace("%version%", `${VERSION}.${new Date().getTime()}`) }, footer: { // UserScripts get wrapped in an iife, so define Vencord prop on window that returns our local @@ -88,7 +88,7 @@ async function buildPluginZip(target, files, shouldZip) { let content = await readFile(join("browser", f)); if (f.startsWith("manifest")) { const json = JSON.parse(content.toString("utf-8")); - json.version = PackageJSON.version; + json.version = VERSION; content = new TextEncoder().encode(JSON.stringify(json)); } diff --git a/scripts/build/common.mjs b/scripts/build/common.mjs index a6b170a..2875a9c 100644 --- a/scripts/build/common.mjs +++ b/scripts/build/common.mjs @@ -16,6 +16,7 @@ * along with this program. If not, see <https://www.gnu.org/licenses/>. */ +import "../suppressExperimentalWarnings.js"; import "../checkNodeVersion.js"; import { exec, execSync } from "child_process"; @@ -24,6 +25,11 @@ import { readdir, readFile } from "fs/promises"; import { join, relative } from "path"; import { promisify } from "util"; +// wtf is this assert syntax +import PackageJSON from "../../package.json" assert { type: "json" }; + +export const VERSION = PackageJSON.version; +export const BUILD_TIMESTAMP = Date.now(); export const watch = process.argv.includes("--watch"); export const isStandalone = JSON.stringify(process.argv.includes("--standalone")); export const gitHash = execSync("git rev-parse --short HEAD", { encoding: "utf-8" }).trim(); diff --git a/src/globals.d.ts b/src/globals.d.ts index 3d9e176..a1f6efc 100644 --- a/src/globals.d.ts +++ b/src/globals.d.ts @@ -37,6 +37,8 @@ declare global { export var IS_STANDALONE: boolean; export var IS_DISCORD_DESKTOP: boolean; export var IS_VENCORD_DESKTOP: boolean; + export var VERSION: string; + export var BUILD_TIMESTAMP: number; export var VencordNative: typeof import("./VencordNative").default; export var Vencord: typeof import("./Vencord"); diff --git a/src/plugins/supportHelper.tsx b/src/plugins/supportHelper.tsx index 9bade49..a90c13c 100644 --- a/src/plugins/supportHelper.tsx +++ b/src/plugins/supportHelper.tsx @@ -55,7 +55,10 @@ export default definePlugin({ if (IS_DISCORD_DESKTOP) return `Discord Desktop v${DiscordNative.app.getVersion()}`; if (IS_VENCORD_DESKTOP) return `Vencord Desktop v${VencordDesktopNative.app.getVersion()}`; if ("armcord" in window) return `ArmCord v${window.armcord.version}`; - return `Web (${navigator.userAgent})`; + + // @ts-expect-error + const name = typeof unsafeWindow !== "undefined" ? "UserScript" : "Web"; + return `${name} (${navigator.userAgent})`; })(); const isApiPlugin = (plugin: string) => plugin.endsWith("API") || plugins[plugin].required; @@ -63,14 +66,18 @@ export default definePlugin({ const enabledPlugins = Object.keys(plugins).filter(p => Vencord.Plugins.isPluginEnabled(p) && !isApiPlugin(p)); const enabledApiPlugins = Object.keys(plugins).filter(p => Vencord.Plugins.isPluginEnabled(p) && isApiPlugin(p)); + const info = { + Vencord: `v${VERSION} • ${gitHash}${settings.additionalInfo} - ${Intl.DateTimeFormat("en-GB", { dateStyle: "medium" }).format(BUILD_TIMESTAMP)}`, + "Discord Branch": RELEASE_CHANNEL, + Client: client, + Platform: window.navigator.platform, + Outdated: isOutdated, + OpenAsar: "openasar" in window, + }; + const debugInfo = ` **Vencord Debug Info** ->>> Discord Branch: ${RELEASE_CHANNEL} -Client: ${client} -Platform: ${window.navigator.platform} -Vencord: ${gitHash}${settings.additionalInfo} -Outdated: ${isOutdated} -OpenAsar: ${"openasar" in window} +>>> ${Object.entries(info).map(([k, v]) => `${k}: ${v}`).join("\n")} Enabled Plugins (${enabledPlugins.length + enabledApiPlugins.length}): ${makeCodeblock(enabledPlugins.join(", ") + "\n\n" + enabledApiPlugins.join(", "))} |