Merge branch 'main' into main

2025-02-23 13:45:09 +00:00 · 2024-11-06 01:34:59 -08:00 · 2024-11-06 01:34:59 -08:00 · 17739bd585
commit 17739bd585
parent 4ac701f05a 5d675efb64
5 changed files with 24 additions and 23 deletions
--- a/.github/workflows/meta.yml
+++ b/.github/workflows/meta.yml
@ -33,6 +33,6 @@ jobs:
                  git add meta/dev.vencord.Vesktop.metainfo.xml
                  git commit -m "Insert release changes for ${{ github.event.release.tag_name }}"
                  git push origin ci/meta-update
-                  gh pr create -B main -H ci/meta-update -t "Metainfo for ${{ github.event.release.tag_name }}" -b "This PR updates the metainfo for release ${{ github.event.release.tag_name }}. @lewisakura @Vendicated"
+                  gh pr create -B main -H ci/meta-update -t "Metainfo for ${{ github.event.release.tag_name }}" -b "This PR updates the metainfo for release ${{ github.event.release.tag_name }}."
              env:
                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
--- a/package.json
+++ b/package.json
@ -37,7 +37,7 @@
        "@types/react": "^18.3.8",
        "@vencord/types": "^1.8.4",
        "dotenv": "^16.4.5",
-        "electron": "^32.1.2",
+        "electron": "^33.0.2",
        "electron-builder": "^25.0.5",
        "esbuild": "^0.23.1",
        "eslint": "^9.11.0",
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@ -43,8 +43,8 @@ importers:
        specifier: ^16.4.5
        version: 16.4.5
      electron:
-        specifier: ^32.1.2
-        version: 32.1.2
+        specifier: ^33.0.2
+        version: 33.0.2
      electron-builder:
        specifier: ^25.0.5
        version: 25.0.5(electron-builder-squirrel-windows@25.0.5(dmg-builder@25.0.5))
@ -413,8 +413,8 @@ packages:
  '@types/node@18.19.50':
    resolution: {integrity: sha512-xonK+NRrMBRtkL1hVCc3G+uXtjh1Al4opBLjqVmipe5ZAaBYWW6cNAiBVZ1BvmkBhep698rP3UM3aRAdSALuhg==}

-  '@types/node@20.16.5':
-    resolution: {integrity: sha512-VwYCweNo3ERajwy0IUlqqcyZ8/A7Zwa9ZP3MnENWcB11AejO+tLy3pu850goUW2FC/IJMdZUfKpX/yxL1gymCA==}
+  '@types/node@20.17.1':
+    resolution: {integrity: sha512-j2VlPv1NnwPJbaCNv69FO/1z4lId0QmGvpT41YxitRtWlg96g/j8qcv2RKsLKe2F6OJgyXhupN1Xo17b2m139Q==}

  '@types/node@22.5.5':
    resolution: {integrity: sha512-Xjs4y5UPO/CLdzpgR6GirZJx36yScjh73+2NlLlkFRSoQN8B0DpfXPdZGnvVmLRLOsqDpOfTNv7D9trgGhmOIA==}
@ -694,6 +694,7 @@ packages:

  boolean@3.2.0:
    resolution: {integrity: sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw==}
+    deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.

  brace-expansion@1.1.11:
    resolution: {integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==}
@ -1010,8 +1011,8 @@ packages:
  electron-updater@6.3.4:
    resolution: {integrity: sha512-uZUo7p1Y53G4tl6Cgw07X1yF8Jlz6zhaL7CQJDZ1fVVkOaBfE2cWtx80avwDVi8jHp+I/FWawrMgTAeCCNIfAg==}

-  electron@32.1.2:
-    resolution: {integrity: sha512-CXe6doFzhmh1U7daOvUzmF6Cj8hssdYWMeEPRnRO6rB9/bbwMlWctcQ7P8NJXhLQ88/vYUJQrJvlJPh8qM0BRQ==}
+  electron@33.0.2:
+    resolution: {integrity: sha512-C2WksfP0COsMHbYXSJG68j6S3TjuGDrw/YT42B526yXalIlNQZ2GeAYKryg6AEMkIp3p8TUfDRD0+HyiyCt/nw==}
    engines: {node: '>= 12.20.55'}
    hasBin: true

@ -1092,8 +1093,8 @@ packages:
  eslint-import-resolver-node@0.3.9:
    resolution: {integrity: sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==}

-  eslint-module-utils@2.11.0:
-    resolution: {integrity: sha512-gbBE5Hitek/oG6MUVj6sFuzEjA/ClzNflVrLovHi/JgLdC7fiN5gLAY1WIPW1a0V5I999MnsrvVrCOGmmVqDBQ==}
+  eslint-module-utils@2.12.0:
+    resolution: {integrity: sha512-wALZ0HFoytlyh/1+4wuZ9FJCD/leWHQzzrxJ8+rebyReSLk7LApMyd3WJaLVoN+D5+WIdJyDK1c6JnE65V4Zyg==}
    engines: {node: '>=4'}
    peerDependencies:
      '@typescript-eslint/parser': '*'
@ -2204,8 +2205,8 @@ packages:
    resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
    engines: {node: '>=0.10.0'}

-  regexp.prototype.flags@1.5.2:
-    resolution: {integrity: sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==}
+  regexp.prototype.flags@1.5.3:
+    resolution: {integrity: sha512-vqlC04+RQoFalODCbCumG2xIOvapzVMHwsyIGM/SIE8fRhFFsXeH8/QQ+s0T0kDAhKc4k30s73/0ydkHQz6HlQ==}
    engines: {node: '>= 0.4'}

  require-directory@2.1.1:
@ -3024,7 +3025,7 @@ snapshots:
    dependencies:
      undici-types: 5.26.5

-  '@types/node@20.16.5':
+  '@types/node@20.17.1':
    dependencies:
      undici-types: 6.19.8

@ -3841,10 +3842,10 @@ snapshots:
    transitivePeerDependencies:
      - supports-color

-  electron@32.1.2:
+  electron@33.0.2:
    dependencies:
      '@electron/get': 2.0.3
-      '@types/node': 20.16.5
+      '@types/node': 20.17.1
      extract-zip: 2.0.1
    transitivePeerDependencies:
      - supports-color
@ -3902,7 +3903,7 @@ snapshots:
      object-inspect: 1.13.2
      object-keys: 1.1.1
      object.assign: 4.1.5
-      regexp.prototype.flags: 1.5.2
+      regexp.prototype.flags: 1.5.3
      safe-array-concat: 1.1.2
      safe-regex-test: 1.0.3
      string.prototype.trim: 1.2.9
@ -3992,7 +3993,7 @@ snapshots:
    transitivePeerDependencies:
      - supports-color

-  eslint-module-utils@2.11.0(@typescript-eslint/parser@8.6.0(eslint@9.11.0)(typescript@5.6.2))(eslint-import-resolver-node@0.3.9)(eslint@9.11.0):
+  eslint-module-utils@2.12.0(@typescript-eslint/parser@8.6.0(eslint@9.11.0)(typescript@5.6.2))(eslint-import-resolver-node@0.3.9)(eslint@9.11.0):
    dependencies:
      debug: 3.2.7
    optionalDependencies:
@ -4013,7 +4014,7 @@ snapshots:
      doctrine: 2.1.0
      eslint: 9.11.0
      eslint-import-resolver-node: 0.3.9
-      eslint-module-utils: 2.11.0(@typescript-eslint/parser@8.6.0(eslint@9.11.0)(typescript@5.6.2))(eslint-import-resolver-node@0.3.9)(eslint@9.11.0)
+      eslint-module-utils: 2.12.0(@typescript-eslint/parser@8.6.0(eslint@9.11.0)(typescript@5.6.2))(eslint-import-resolver-node@0.3.9)(eslint@9.11.0)
      hasown: 2.0.2
      is-core-module: 2.15.1
      is-glob: 4.0.3
@ -5176,7 +5177,7 @@ snapshots:
      extend-shallow: 3.0.2
      safe-regex: 1.1.0

-  regexp.prototype.flags@1.5.2:
+  regexp.prototype.flags@1.5.3:
    dependencies:
      call-bind: 1.0.7
      define-properties: 1.2.1
--- a/src/renderer/components/screenSharePicker.css
+++ b/src/renderer/components/screenSharePicker.css
@ -33,15 +33,16 @@

 .vcd-screen-picker-grid label {
    overflow: hidden;
-    padding: 4px 0px;
+    padding: 8px;
    cursor: pointer;
+    display: grid;
+    justify-items: center;
 }

 .vcd-screen-picker-grid label:hover {
    outline: 2px solid var(--brand-500);
 }

-
 .vcd-screen-picker-grid div {
    white-space: nowrap;
    text-overflow: ellipsis;
@ -101,7 +102,6 @@
 .vcd-screen-picker-quality {
    display: flex;
    gap: 1em;
-
    margin-bottom: 0.5em;
 }

--- a/src/renderer/components/settings/Settings.tsx
+++ b/src/renderer/components/settings/Settings.tsx
@ -104,7 +104,7 @@ const SettingsOptions: Record<string, Array<BooleanSetting | SettingsComponent>>
        }
    ],
    Notifications: [NotificationBadgeToggle],
-    Miscelleanous: [
+    Miscellaneous: [
        {
            key: "arRPC",
            title: "Rich Presence",