Merge pull request #250418 from Scrumplex/vencord-1.4.5

vencord: 1.3.4 -> 1.4.5
2023-08-25 11:19:11 +02:00 · 2023-08-25 11:19:11 +02:00 · 1d570ff75e
commit 1d570ff75e
parent 980501dde6 cc8283b5c4
4 changed files with 93 additions and 137 deletions
--- a/pkgs/misc/vencord/default.nix
+++ b/pkgs/misc/vencord/default.nix
@ -1,20 +1,24 @@
 { buildNpmPackage
 , fetchFromGitHub
+, fetchpatch2
 , lib
-, substituteAll
 , esbuild
 , buildGoModule
 , buildWebExtension ? false
 }:
+let
+  version = "1.4.5";
+  gitHash = "98a03c8";
+in
 buildNpmPackage rec {
  pname = "vencord";
-  version = "1.3.4";
+  inherit version;

  src = fetchFromGitHub {
    owner = "Vendicated";
    repo = "Vencord";
    rev = "v${version}";
-    sha256 = "sha256-r+VgxXwsBOfMggcVlr5q1/ONfp13CpX4ssrLQtmdLe8=";
+    sha256 = "sha256-ZoHOCl0j+RBSl2lL9wO2rJ8VR+GNIeWJYe65c3lVoz8=";
  };

  ESBUILD_BINARY_PATH = lib.getExe (esbuild.override {
@ -33,23 +37,36 @@ buildNpmPackage rec {
  # Supresses an error about esbuild's version.
  npmRebuildFlags = [ "|| true" ];

-  npmDepsHash = "sha256-HJK88z4Gs8mqd28zKrsTtk34VcRqIyb6aURbvRZLN0I=";
+  npmDepsHash = "sha256-51IK95QY9YX0WerGu4GuOrYKoj8Uoo0R1b6WZpC5v4U=";
  npmFlags = [ "--legacy-peer-deps" ];
  npmBuildScript = if buildWebExtension then "buildWeb" else "build";
-  npmBuildFlags = [ "--" "--standalone" ];
+  npmBuildFlags = [ "--" "--standalone" "--disable-updater" ];

  prePatch = ''
    cp ${./package-lock.json} ./package-lock.json
  '';

  patches = [
-    (substituteAll {
-      src = ./replace-git.patch;
-      inherit version;
+    (fetchpatch2 {
+      name = "allow-git-hash-remote-preset.patch";
+      url = "https://github.com/Vendicated/Vencord/commit/d9f55664428007199348123b05818f9e08c4f64d.patch";
+      hash = "sha256-l4PP8nVtyQJYUqtU9xYGT4j1Oayy08DE6TfbwPun0pY=";
+    })
+    (fetchpatch2 {
+      name = "use-source-date-epoch.patch";
+      url = "https://github.com/Vendicated/Vencord/commit/28247c88a949eeaac75b13a8d6653164d9659f56.patch";
+      hash = "sha256-mMpsB3GkI9LUiMQ/NFOiRw4z+wVkktmWgUHNTgxUFPU=";
+    })
+    (fetchpatch2 {
+      name = "allow-disabling-updater.patch";
+      url = "https://github.com/Vendicated/Vencord/commit/bad1fa0c766b2d42cd2eb0e0d1ab2e0c381bab98.patch";
+      hash = "sha256-yp453kFvVC02QEB3Op8PfopnLt3xGkjp4WfP6kPeIJ0=";
    })
-    ./disable-updater-ui.patch
  ];

+  VENCORD_HASH = gitHash;
+  VENCORD_REMOTE = "${src.owner}/${src.repo}";
+
  installPhase =
    if buildWebExtension then ''
      cp -r dist/chromium-unpacked/ $out
--- a/pkgs/misc/vencord/disable-updater-ui.patch
+++ b/pkgs/misc/vencord/disable-updater-ui.patch
@ -1,35 +0,0 @@
-diff --git a/src/components/VencordSettings/UpdaterTab.tsx b/src/components/VencordSettings/UpdaterTab.tsx
-index 4d0b86c..0f1d87f 100644
--- a/src/components/VencordSettings/UpdaterTab.tsx
-+++ b/src/components/VencordSettings/UpdaterTab.tsx
-@@ -249,4 +249,4 @@ function Updater() {
-     );
- }
- 
-export default IS_WEB ? null : wrapTab(Updater, "Updater");
-+export default null;
-diff --git a/src/plugins/_core/settings.tsx b/src/plugins/_core/settings.tsx
-index 3ea5a43..da63213 100644
--- a/src/plugins/_core/settings.tsx
-+++ b/src/plugins/_core/settings.tsx
-@@ -105,7 +105,7 @@ export default definePlugin({
-                 label: "Themes",
-                 element: require("@components/VencordSettings/ThemesTab").default,
-             },
-            !IS_WEB && {
-+            false && !IS_WEB && {
-                 section: "VencordUpdater",
-                 label: "Updater",
-                 element: require("@components/VencordSettings/UpdaterTab").default,
-diff --git a/src/utils/updater.ts b/src/utils/updater.ts
-index 2e2bfe1..5ebd06e 100644
--- a/src/utils/updater.ts
-+++ b/src/utils/updater.ts
-@@ -38,6 +38,7 @@ async function Unwrap<T>(p: Promise<IpcRes<T>>) {
- }
- 
- export async function checkForUpdates() {
-+    return false;
-     changes = await Unwrap(VencordNative.updater.getUpdates());
-     if (changes.some(c => c.hash === gitHash)) {
-         isNewer = true;
--- a/pkgs/misc/vencord/package-lock.json
+++ b/pkgs/misc/vencord/package-lock.json
@ -1,16 +1,18 @@
 {
    "name": "vencord",
-    "version": "1.3.4",
+    "version": "1.4.5",
    "lockfileVersion": 3,
    "requires": true,
    "packages": {
        "": {
            "name": "vencord",
-            "version": "1.3.4",
-            "license": "GPL-3.0",
+            "version": "1.4.5",
+            "license": "GPL-3.0-or-later",
            "dependencies": {
+                "@sapphi-red/web-noise-suppressor": "0.3.3",
                "@vap/core": "0.0.12",
                "@vap/shiki": "0.10.5",
+                "eslint-plugin-simple-header": "^1.0.2",
                "fflate": "^0.7.4",
                "nanoid": "^4.0.2",
                "virtual-merge": "^1.0.1"
@ -27,9 +29,8 @@
                "diff": "^5.1.0",
                "discord-types": "^1.3.26",
                "esbuild": "^0.15.18",
-                "eslint": "^8.28.0",
+                "eslint": "^8.46.0",
                "eslint-import-resolver-alias": "^1.1.2",
-                "eslint-plugin-header": "^3.1.1",
                "eslint-plugin-path-alias": "^1.0.0",
                "eslint-plugin-simple-import-sort": "^10.0.0",
                "eslint-plugin-unused-imports": "^2.0.0",
@ -48,6 +49,15 @@
                "pnpm": ">=8"
            }
        },
+        "node_modules/@aashutoshrathi/word-wrap": {
+            "version": "1.2.6",
+            "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz",
+            "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==",
+            "dev": true,
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
        "node_modules/@babel/code-frame": {
            "version": "7.22.5",
            "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.5.tgz",
@ -695,23 +705,23 @@
            }
        },
        "node_modules/@eslint-community/regexpp": {
-            "version": "4.5.1",
-            "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.5.1.tgz",
-            "integrity": "sha512-Z5ba73P98O1KUYCCJTUeVpja9RcGoMdncZ6T49FCUl2lN38JtCJ+3WgIDBv0AuY4WChU5PmtJmOCTlN6FZTFKQ==",
+            "version": "4.6.2",
+            "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.6.2.tgz",
+            "integrity": "sha512-pPTNuaAG3QMH+buKyBIGJs3g/S5y0caxw0ygM3YyE6yJFySwiGGSzA+mM3KJ8QQvzeLh3blwgSonkFjgQdxzMw==",
            "dev": true,
            "engines": {
                "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
            }
        },
        "node_modules/@eslint/eslintrc": {
-            "version": "2.0.3",
-            "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.0.3.tgz",
-            "integrity": "sha512-+5gy6OQfk+xx3q0d6jGZZC3f3KzAkXc/IanVxd1is/VIIziRqqt3ongQz0FiTUXqTk0c7aDB3OaFuKnuSoJicQ==",
+            "version": "2.1.2",
+            "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.2.tgz",
+            "integrity": "sha512-+wvgpDsrB1YqAMdEUCcnTlpfVBH7Vqn6A/NT3D8WVXFIaKMlErPIZT3oCIAVCOtarRpMtelZLqJeU3t7WY6X6g==",
            "dev": true,
            "dependencies": {
                "ajv": "^6.12.4",
                "debug": "^4.3.2",
-                "espree": "^9.5.2",
+                "espree": "^9.6.0",
                "globals": "^13.19.0",
                "ignore": "^5.2.0",
                "import-fresh": "^3.2.1",
@ -727,9 +737,9 @@
            }
        },
        "node_modules/@eslint/js": {
-            "version": "8.43.0",
-            "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.43.0.tgz",
-            "integrity": "sha512-s2UHCoiXfxMvmfzqoN+vrQ84ahUSYde9qNO1MdxmoEhyHWsfmwOpFlwYV+ePJEVc7gFnATGUi376WowX1N7tFg==",
+            "version": "8.47.0",
+            "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.47.0.tgz",
+            "integrity": "sha512-P6omY1zv5MItm93kLM8s2vr1HICJH8v0dvddDhysbIuZ+vcjOHg5Zbkf1mTkcmi2JA9oBG2anOkRnW8WJTS8Og==",
            "dev": true,
            "engines": {
                "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@ -833,6 +843,11 @@
                }
            }
        },
+        "node_modules/@sapphi-red/web-noise-suppressor": {
+            "version": "0.3.3",
+            "resolved": "https://registry.npmjs.org/@sapphi-red/web-noise-suppressor/-/web-noise-suppressor-0.3.3.tgz",
+            "integrity": "sha512-gAC33DCXYwNTI/k1PxOVHmbbzakUSMbb/DHpoV6rn4pKZtPI1dduULSmAAm/y1ipgIlArnk2JcnQzw4n2tCZHw=="
+        },
        "node_modules/@types/diff": {
            "version": "5.0.3",
            "resolved": "https://registry.npmjs.org/@types/diff/-/diff-5.0.3.tgz",
@ -1133,9 +1148,9 @@
            }
        },
        "node_modules/acorn": {
-            "version": "8.9.0",
-            "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.9.0.tgz",
-            "integrity": "sha512-jaVNAFBHNLXspO543WnNNPZFRtavh3skAkITqD0/2aeMkKZTN+254PyhwxFYrk3vQ1xfY+2wbesJMs/JC8/PwQ==",
+            "version": "8.10.0",
+            "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz",
+            "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==",
            "dev": true,
            "bin": {
                "acorn": "bin/acorn"
@ -2295,27 +2310,27 @@
            }
        },
        "node_modules/eslint": {
-            "version": "8.43.0",
-            "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.43.0.tgz",
-            "integrity": "sha512-aaCpf2JqqKesMFGgmRPessmVKjcGXqdlAYLLC3THM8t5nBRZRQ+st5WM/hoJXkdioEXLLbXgclUpM0TXo5HX5Q==",
+            "version": "8.47.0",
+            "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.47.0.tgz",
+            "integrity": "sha512-spUQWrdPt+pRVP1TTJLmfRNJJHHZryFmptzcafwSvHsceV81djHOdnEeDmkdotZyLNjDhrOasNK8nikkoG1O8Q==",
            "dev": true,
            "dependencies": {
                "@eslint-community/eslint-utils": "^4.2.0",
-                "@eslint-community/regexpp": "^4.4.0",
-                "@eslint/eslintrc": "^2.0.3",
-                "@eslint/js": "8.43.0",
+                "@eslint-community/regexpp": "^4.6.1",
+                "@eslint/eslintrc": "^2.1.2",
+                "@eslint/js": "^8.47.0",
                "@humanwhocodes/config-array": "^0.11.10",
                "@humanwhocodes/module-importer": "^1.0.1",
                "@nodelib/fs.walk": "^1.2.8",
-                "ajv": "^6.10.0",
+                "ajv": "^6.12.4",
                "chalk": "^4.0.0",
                "cross-spawn": "^7.0.2",
                "debug": "^4.3.2",
                "doctrine": "^3.0.0",
                "escape-string-regexp": "^4.0.0",
-                "eslint-scope": "^7.2.0",
-                "eslint-visitor-keys": "^3.4.1",
-                "espree": "^9.5.2",
+                "eslint-scope": "^7.2.2",
+                "eslint-visitor-keys": "^3.4.3",
+                "espree": "^9.6.1",
                "esquery": "^1.4.2",
                "esutils": "^2.0.2",
                "fast-deep-equal": "^3.1.3",
@ -2325,7 +2340,6 @@
                "globals": "^13.19.0",
                "graphemer": "^1.4.0",
                "ignore": "^5.2.0",
-                "import-fresh": "^3.0.0",
                "imurmurhash": "^0.1.4",
                "is-glob": "^4.0.0",
                "is-path-inside": "^3.0.3",
@ -2335,9 +2349,8 @@
                "lodash.merge": "^4.6.2",
                "minimatch": "^3.1.2",
                "natural-compare": "^1.4.0",
-                "optionator": "^0.9.1",
+                "optionator": "^0.9.3",
                "strip-ansi": "^6.0.1",
-                "strip-json-comments": "^3.1.0",
                "text-table": "^0.2.0"
            },
            "bin": {
@ -2362,15 +2375,6 @@
                "eslint-plugin-import": ">=1.4.0"
            }
        },
-        "node_modules/eslint-plugin-header": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/eslint-plugin-header/-/eslint-plugin-header-3.1.1.tgz",
-            "integrity": "sha512-9vlKxuJ4qf793CmeeSrZUvVClw6amtpghq3CuWcB5cUNnWHQhgcqy5eF8oVKFk1G3Y/CbchGfEaw3wiIJaNmVg==",
-            "dev": true,
-            "peerDependencies": {
-                "eslint": ">=7.7.0"
-            }
-        },
        "node_modules/eslint-plugin-path-alias": {
            "version": "1.0.0",
            "resolved": "https://registry.npmjs.org/eslint-plugin-path-alias/-/eslint-plugin-path-alias-1.0.0.tgz",
@ -2383,6 +2387,11 @@
                "eslint": "^7"
            }
        },
+        "node_modules/eslint-plugin-simple-header": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/eslint-plugin-simple-header/-/eslint-plugin-simple-header-1.0.2.tgz",
+            "integrity": "sha512-K1EJ/ueBIjPRA8qR44Ymo+GDmPYYmfoODtainGxVr7PSbX6QiaY+pTuGCrOhO+AtVsYJs8GLSVdGUTXyAxAtOA=="
+        },
        "node_modules/eslint-plugin-simple-import-sort": {
            "version": "10.0.0",
            "resolved": "https://registry.npmjs.org/eslint-plugin-simple-import-sort/-/eslint-plugin-simple-import-sort-10.0.0.tgz",
@ -2436,9 +2445,9 @@
            }
        },
        "node_modules/eslint-visitor-keys": {
-            "version": "3.4.1",
-            "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz",
-            "integrity": "sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==",
+            "version": "3.4.3",
+            "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+            "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
            "dev": true,
            "engines": {
                "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@ -2448,9 +2457,9 @@
            }
        },
        "node_modules/eslint/node_modules/eslint-scope": {
-            "version": "7.2.0",
-            "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.0.tgz",
-            "integrity": "sha512-DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw==",
+            "version": "7.2.2",
+            "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
+            "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
            "dev": true,
            "dependencies": {
                "esrecurse": "^4.3.0",
@ -2473,12 +2482,12 @@
            }
        },
        "node_modules/espree": {
-            "version": "9.5.2",
-            "resolved": "https://registry.npmjs.org/espree/-/espree-9.5.2.tgz",
-            "integrity": "sha512-7OASN1Wma5fum5SrNhFMAMJxOUAbhyfQ8dQ//PJaJbNw0URTPWqIghHWt1MmAANKhHZIYOHruW4Kw4ruUWOdGw==",
+            "version": "9.6.1",
+            "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
+            "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
            "dev": true,
            "dependencies": {
-                "acorn": "^8.8.0",
+                "acorn": "^8.9.0",
                "acorn-jsx": "^5.3.2",
                "eslint-visitor-keys": "^3.4.1"
            },
@ -2893,9 +2902,9 @@
            }
        },
        "node_modules/globals": {
-            "version": "13.20.0",
-            "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz",
-            "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
+            "version": "13.21.0",
+            "resolved": "https://registry.npmjs.org/globals/-/globals-13.21.0.tgz",
+            "integrity": "sha512-ybyme3s4yy/t/3s35bewwXKOf7cvzfreG2lH0lZl0JB7I4GxRP2ghxOK/Nb9EkRXdbBXZLfq/p/0W2JUONB/Gg==",
            "dev": true,
            "dependencies": {
                "type-fest": "^0.20.2"
@ -3866,17 +3875,17 @@
            }
        },
        "node_modules/optionator": {
-            "version": "0.9.1",
-            "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
-            "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
+            "version": "0.9.3",
+            "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz",
+            "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==",
            "dev": true,
            "dependencies": {
+                "@aashutoshrathi/word-wrap": "^1.2.3",
                "deep-is": "^0.1.3",
                "fast-levenshtein": "^2.0.6",
                "levn": "^0.4.1",
                "prelude-ls": "^1.2.1",
-                "type-check": "^0.4.0",
-                "word-wrap": "^1.2.3"
+                "type-check": "^0.4.0"
            },
            "engines": {
                "node": ">= 0.8.0"
@ -5600,15 +5609,6 @@
                "node": ">= 8"
            }
        },
-        "node_modules/word-wrap": {
-            "version": "1.2.3",
-            "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-            "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
-            "dev": true,
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
        "node_modules/wrap-ansi": {
            "version": "7.0.0",
            "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
--- a/pkgs/misc/vencord/replace-git.patch
+++ b/pkgs/misc/vencord/replace-git.patch
@ -1,26 +0,0 @@
-diff --git a/scripts/build/common.mjs b/scripts/build/common.mjs
-index 7ff599a..85b3bfa 100644
--- a/scripts/build/common.mjs
-+++ b/scripts/build/common.mjs
-@@ -24,7 +24,7 @@ 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 gitHash = "v@version@";
- export const banner = {
-     js: `
- // Vencord ${gitHash}
-@@ -124,11 +124,7 @@ export const gitRemotePlugin = {
-             namespace: "git-remote", path: args.path
-         }));
-         build.onLoad({ filter, namespace: "git-remote" }, async () => {
-            const res = await promisify(exec)("git remote get-url origin", { encoding: "utf-8" });
-            const remote = res.stdout.trim()
-                .replace("https://github.com/", "")
-                .replace("git@github.com:", "")
-                .replace(/.git$/, "");
-+            const remote = "Vendicated/Vencord";
- 
-             return { contents: `export default "${remote}"` };
-         });