From a13c0df1cdab5476b21aa8c0ec04f3778fe21e11 Mon Sep 17 00:00:00 2001 From: Vendicated Date: Mon, 7 Nov 2022 21:29:31 +0100 Subject: [PATCH] build: Add metadata header to all bundles --- .github/workflows/build.yml | 2 +- scripts/build/build.mjs | 11 +---------- scripts/build/common.mjs | 10 +++++++++- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7bfcc9e0..e3bb3bfa 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -31,7 +31,7 @@ jobs: run: pnpm install --frozen-lockfile - name: Build web - run: pnpm buildWeb + run: pnpm buildWeb --standalone - name: Build run: pnpm build --standalone diff --git a/scripts/build/build.mjs b/scripts/build/build.mjs index 82264ee5..3d432693 100755 --- a/scripts/build/build.mjs +++ b/scripts/build/build.mjs @@ -19,7 +19,7 @@ import esbuild from "esbuild"; -import { commonOpts, gitHash, globPlugins, isStandalone, watch } from "./common.mjs"; +import { commonOpts, globPlugins, isStandalone, watch } from "./common.mjs"; const defines = { IS_STANDALONE: isStandalone, @@ -30,12 +30,6 @@ if (defines.IS_STANDALONE === "false") // for the specific platform we're on defines["process.platform"] = JSON.stringify(process.platform); -const header = ` -// Vencord ${gitHash} -// Standalone: ${defines.IS_STANDALONE} -// Platform: ${defines["process.platform"] || "Universal"} -`.trim(); - /** * @type {esbuild.BuildOptions} */ @@ -48,9 +42,6 @@ const nodeCommonOpts = { bundle: true, external: ["electron", ...commonOpts.external], define: defines, - banner: { - js: header - } }; await Promise.all([ diff --git a/scripts/build/common.mjs b/scripts/build/common.mjs index 33763b27..11aaa81a 100644 --- a/scripts/build/common.mjs +++ b/scripts/build/common.mjs @@ -24,6 +24,14 @@ import { promisify } from "util"; 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(); +export const banner = { + js: ` +// Vencord ${gitHash} +// Standalone: ${isStandalone} +// Platform: ${isStandalone === "false" ? process.platform : "Universal"} +`.trim() +}; // https://github.com/evanw/esbuild/issues/619#issuecomment-751995294 /** @@ -78,7 +86,6 @@ export const globPlugins = { } }; -export const gitHash = execSync("git rev-parse --short HEAD", { encoding: "utf-8" }).trim(); /** * @type {esbuild.Plugin} */ @@ -150,6 +157,7 @@ export const commonOpts = { minify: !watch, sourcemap: watch ? "inline" : "", legalComments: "linked", + banner, plugins: [fileIncludePlugin, gitHashPlugin, gitRemotePlugin], external: ["~plugins", "~git-hash", "~git-remote"], inject: ["./scripts/build/inject/react.mjs"],