fix: bump dependencies

index.ts

@@ -1,14 +1,12 @@
 import path from 'node:path';
 
 import { BrowserWindow, app, screen, globalShortcut, session, shell, dialog, ipcMain } from 'electron';
-import enhanceWebRequest from 'electron-better-web-request';
+import enhanceWebRequest, { BetterSession } from '@jellybrick/electron-better-web-request';
 import is from 'electron-is';
 import unhandled from 'electron-unhandled';
 import { autoUpdater } from 'electron-updater';
 import electronDebug from 'electron-debug';
 
-import { BetterWebRequest } from 'electron-better-web-request/lib/electron-better-web-request';
-
 import config from './config';
 import { setApplicationMenu } from './menu';
 import { fileExists, injectCSS, injectCSSAsFile } from './plugins/utils';
@@ -603,8 +601,6 @@ function showUnresponsiveDialog(win: BrowserWindow, details: Electron.RenderProc
   });
 }
 
-// HACK: electron-better-web-request's typing is wrong
-type BetterSession = Omit<Electron.Session, 'webRequest'> & { webRequest: BetterWebRequest & Electron.WebRequest };
 function removeContentSecurityPolicy(
   betterSession: BetterSession = session.defaultSession as BetterSession,
 ) {
@@ -624,11 +620,10 @@ function removeContentSecurityPolicy(
     callback({ cancel: false, responseHeaders: details.responseHeaders });
   });
 
-  type ResolverListener = { apply: () => Promise<Record<string, unknown>>; context: unknown };
   // When multiple listeners are defined, apply them all
-  betterSession.webRequest.setResolver('onHeadersReceived', async (listeners: ResolverListener[]) => {
-    return listeners.reduce<Promise<Record<string, unknown>>>(
-      async (accumulator: Promise<Record<string, unknown>>, listener: ResolverListener) => {
+  betterSession.webRequest.setResolver('onHeadersReceived', async (listeners) => {
+    return listeners.reduce(
+      async (accumulator, listener) => {
         const acc = await accumulator;
         if (acc.cancel) {
           return acc;

package.json

@@ -96,8 +96,7 @@
     "build": "npm run rollup:preload && npm run rollup:main",
     "start": "npm run build && electron ./dist/index.js",
     "start:debug": "ELECTRON_ENABLE_LOGGING=1 npm run start",
-    "generate:package": "node utils/generate-package-json.js",
-    "postinstall": "patch-package && npm run plugins && npm run clean",
+    "postinstall": "patch-package",
     "clean": "del-cli dist && del-cli pack",
     "dist": "npm run clean && npm run build && electron-builder --win --mac --linux -p never",
     "dist:linux": "npm run clean && npm run build && electron-builder --linux -p never",
@@ -107,8 +106,6 @@
     "dist:win:x64": "npm run clean && npm run build && electron-builder --win nsis-web:x64 -p never",
     "lint": "eslint .",
     "changelog": "auto-changelog",
-    "plugins": "npm run plugin:bypass-age-restrictions",
-    "plugin:bypass-age-restrictions": "del-cli node_modules/simple-youtube-age-restriction-bypass/package.json && npm run generate:package simple-youtube-age-restriction-bypass",
     "release:linux": "npm run clean && npm run build && electron-builder --linux -p always -c.snap.publish=github",
     "release:mac": "npm run clean && npm run build && electron-builder --mac -p always",
     "release:win": "npm run clean && npm run build && electron-builder --win -p always",
@@ -122,14 +119,14 @@
     "@ffmpeg.wasm/core-mt": "0.12.0",
     "@ffmpeg.wasm/main": "0.12.0",
     "@foobar404/wave": "2.0.4",
+    "@jellybrick/electron-better-web-request": "1.0.4",
     "@jellybrick/mpris-service": "2.1.4",
     "@xhayper/discord-rpc": "1.0.23",
     "async-mutex": "0.4.0",
-    "butterchurn": "2.6.7",
-    "butterchurn-presets": "2.4.7",
+    "butterchurn": "3.0.0-beta.4",
+    "butterchurn-presets": "3.0.0-beta.4",
     "conf": "10.2.0",
     "custom-electron-prompt": "1.5.7",
-    "electron-better-web-request": "1.0.1",
     "electron-debug": "3.2.0",
     "electron-is": "3.0.0",
     "electron-localshortcut": "3.2.1",
@@ -143,7 +140,7 @@
     "keyboardevent-from-electron-accelerator": "2.0.0",
     "keyboardevents-areequal": "0.2.2",
     "node-id3": "0.2.6",
-    "simple-youtube-age-restriction-bypass": "git+https://github.com/MiepHD/Simple-YouTube-Age-Restriction-Bypass.git#v2.5.5",
+    "simple-youtube-age-restriction-bypass": "git+https://github.com/organization/Simple-YouTube-Age-Restriction-Bypass.git#v2.5.8",
     "vudio": "2.1.1",
     "x11": "2.3.0",
     "youtubei.js": "6.4.1",
@@ -155,7 +152,7 @@
     "xml2js": "0.6.2",
     "node-fetch": "2.7.0",
     "@electron/universal": "1.4.2",
-    "electron": "27.0.0"
+    "@babel/runtime": "7.23.1"
   },
   "devDependencies": {
     "@playwright/test": "1.38.1",
@@ -178,7 +175,7 @@
     "electron-devtools-installer": "3.2.0",
     "eslint": "8.51.0",
     "eslint-plugin-import": "2.28.1",
-    "eslint-plugin-prettier": "5.0.0",
+    "eslint-plugin-prettier": "5.0.1",
     "node-gyp": "9.4.0",
     "patch-package": "8.0.0",
     "playwright": "1.38.1",

plugins/bypass-age-restrictions/front.ts

@@ -1,4 +1,4 @@
 export default () => {
   // See https://github.com/zerodytrash/Simple-YouTube-Age-Restriction-Bypass#userscript
-  require('simple-youtube-age-restriction-bypass/dist/Simple-YouTube-Age-Restriction-Bypass.user.js');
+  import('simple-youtube-age-restriction-bypass');
 };

plugins/bypass-age-restrictions/simple-youtube-age-restriction-bypass.d.ts

@@ -0,0 +1,4 @@
+declare module 'simple-youtube-age-restriction-bypass' {
+  const nothing: never;
+  export default nothing;
+}

plugins/visualizer/butterchurn.d.ts

@@ -49,5 +49,7 @@ declare module 'butterchurn' {
 }
 
 declare module 'butterchurn-presets' {
-  export function getPresets(): Record<string, unknown>;
+  const presets: Record<string, unknown>;
+
+  export default presets;
 }