From 828ee3c0ccc6c3984df06cf500496b37c004504b Mon Sep 17 00:00:00 2001 From: thororen1234 <78185467+thororen1234@users.noreply.github.com> Date: Tue, 16 Dec 2025 23:57:41 -0500 Subject: [PATCH] Remove adm-zip --- package.json | 3 +-- pnpm-lock.yaml | 9 --------- scripts/build/buildWeb.mjs | 19 +++++++++---------- 3 files changed, 10 insertions(+), 21 deletions(-) diff --git a/package.json b/package.json index 2c1e75003..2babb391f 100644 --- a/package.json +++ b/package.json @@ -68,7 +68,6 @@ "@types/react-dom": "^19.0.4", "@types/yazl": "^3.3.0", "@vencord/discord-types": "link:packages/discord-types", - "adm-zip": "^0.5.16", "diff": "^8.0.2", "esbuild": "^0.27.0", "eslint": "9.39.1", @@ -93,7 +92,7 @@ "typescript-transform-paths": "^3.5.5", "zip-local": "^0.3.5" }, - "packageManager": "pnpm@10.22.0", + "packageManager": "pnpm@10.26.0", "pnpm": { "patchedDependencies": { "@types/less@3.0.8": "patches/@types__less@3.0.8.patch" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 3e4b4ce56..cc9f742fa 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -98,9 +98,6 @@ importers: '@vencord/discord-types': specifier: link:packages/discord-types version: link:packages/discord-types - adm-zip: - specifier: ^0.5.16 - version: 0.5.16 diff: specifier: ^8.0.2 version: 8.0.2 @@ -886,10 +883,6 @@ packages: engines: {node: '>=0.4.0'} hasBin: true - adm-zip@0.5.16: - resolution: {integrity: sha512-TGw5yVi4saajsSEgz25grObGHEUaDrniwvA2qwSC060KfqGPdglhvPMA2lPIoxs3PQIItj2iag35fONcQqgUaQ==} - engines: {node: '>=12.0'} - agent-base@7.1.3: resolution: {integrity: sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==} engines: {node: '>= 14'} @@ -3187,8 +3180,6 @@ snapshots: acorn@8.15.0: {} - adm-zip@0.5.16: {} - agent-base@7.1.3: {} ajv@6.12.6: diff --git a/scripts/build/buildWeb.mjs b/scripts/build/buildWeb.mjs index 7d7d5518e..fc2d6a863 100644 --- a/scripts/build/buildWeb.mjs +++ b/scripts/build/buildWeb.mjs @@ -22,9 +22,9 @@ import { readFileSync } from "fs"; import { appendFile, mkdir, readdir, readFile, rm, writeFile } from "fs/promises"; import path, { join } from "path"; +import Zip from "zip-local"; import { BUILD_TIMESTAMP, commonOpts, globPlugins, IS_DEV, IS_REPORTER, IS_COMPANION_TEST, VERSION, commonRendererPlugins, buildOrWatchAll, stringifyValues, IS_ANTI_CRASH_TEST } from "./common.mjs"; -import AdmZip from "adm-zip"; /** * @type {import("esbuild").BuildOptions} @@ -204,15 +204,14 @@ if (!process.argv.includes("--skip-extension")) { buildExtension("firefox-unpacked", ["background.js", "content.js", "manifestv2.json", "icon.png"]), ]); - const chromiumZip = new AdmZip(); - chromiumZip.addLocalFolder("dist/browser/chromium-unpacked"); - chromiumZip.writeZip(path.resolve("dist/extension-chrome.zip")); - console.info("Packed Chromium Extension written to dist/extension-chrome.zip"); - - const firefoxZip = new AdmZip(); - firefoxZip.addLocalFolder("dist/browser/firefox-unpacked"); - firefoxZip.writeZip(path.resolve("dist/extension-firefox.zip")); - console.info("Packed Firefox Extension written to dist/extension-firefox.zip"); + Zip.zip("dist/browser/chromium-unpacked", (_err, zip) => { + zip.compress().save("dist/extension-chrome.zip"); + console.info("Packed Chromium Extension written to dist/extension-chrome.zip"); + }); + Zip.zip("dist/browser/firefox-unpacked", (_err, zip) => { + zip.compress().save("dist/extension-firefox.zip"); + console.info("Packed Firefox Extension written to dist/extension-firefox.zip"); + }); } else { await appendCssRuntime; }