Merge pull request #1259 from organization/feat/fork-to-main

Author: JellyBrick

.eslintignore

@@ -1 +1,3 @@
 .eslintrc.js
+rollup.main.config.ts
+rollup.preload.config.ts

.github/workflows/build.yml

@@ -40,21 +40,21 @@ jobs:
       - name: Build and release on Mac
         if: startsWith(matrix.os, 'macOS') && github.repository == 'th-ch/youtube-music'
         env:
-          GH_TOKEN: ${{ secrets.GH_TOKEN }}
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           npm run release:mac
 
       - name: Build and release on Linux
         if: startsWith(matrix.os, 'ubuntu') && github.repository == 'th-ch/youtube-music'
         env:
-          GH_TOKEN: ${{ secrets.GH_TOKEN }}
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           npm run release:linux
 
       - name: Build and release on Windows
         if: startsWith(matrix.os, 'windows') && github.repository == 'th-ch/youtube-music'
         env:
-          GH_TOKEN: ${{ secrets.GH_TOKEN }}
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           npm run release:win
 
@@ -107,7 +107,7 @@ jobs:
         uses: cardinalby/git-get-release-action@v1
         id: get_draft_release
         env:
-          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           latest: true
           draft: true
@@ -117,7 +117,7 @@ jobs:
         if: ${{ env.VERSION_HASH == '' }}
         uses: irongut/[email protected]
         with:
-          token: ${{ secrets.GH_TOKEN }}
+          token: ${{ secrets.GITHUB_TOKEN }}
           id: ${{ steps.get_draft_release.outputs.id }}
           draft: false
           prerelease: false
@@ -136,7 +136,7 @@ jobs:
 
       - name: Commit changelog
         if: ${{ env.VERSION_HASH == '' }}
-        uses: stefanzweifel/git-auto-commit-action@v4
+        uses: stefanzweifel/git-auto-commit-action@v5
         with:
           commit_message: Update changelog for ${{ env.VERSION_TAG }}
           file_pattern: "changelog.md"

.github/workflows/dependency-review.yml

@@ -15,6 +15,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: "Checkout Repository"
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: "Dependency Review"
         uses: actions/dependency-review-action@v3

assets/menu.svg

@@ -65,37 +65,46 @@ const defaultConfig = {
     proxy: '',
     startingPage: '',
     overrideUserAgent: false,
-    themes: {} as string[],
+    themes: [] as string[],
   },
+  /** please order alphabetically */
   'plugins': {
-    // Enabled plugins
-    'navigation': {
-      enabled: true,
-    },
     'adblocker': {
       enabled: true,
       cache: true,
       blocker: 'With blocklists',
       additionalBlockLists: [], // Additional list of filters, e.g "https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/filters.txt"
-      disableDefaultLists: [],
+      disableDefaultLists: false,
     },
     'album-color-theme': {},
     'ambient-mode': {},
-    'lumiastream': {},
-    // Disabled plugins
-    'shortcuts': {
+    'audio-compressor': {},
+    'blur-nav-bar': {},
+    'bypass-age-restrictions': {},
+    'captions-selector': {
       enabled: false,
-      overrideMediaKeys: false,
-      global: {
-        previous: '',
-        playPause: '',
-        next: '',
-      } as Record<string, string>,
-      local: {
-        previous: '',
-        playPause: '',
-        next: '',
-      } as Record<string, string>,
+      disableCaptions: false,
+      autoload: false,
+      lastCaptionsCode: '',
+    },
+    'compact-sidebar': {},
+    'crossfade': {
+      enabled: false,
+      fadeInDuration: 1500, // Ms
+      fadeOutDuration: 5000, // Ms
+      secondsBeforeEnd: 10, // S
+      fadeScaling: 'linear', // 'linear', 'logarithmic' or a positive number in dB
+    },
+    'disable-autoplay': {
+      applyOnce: false,
+    },
+    'discord': {
+      enabled: false,
+      autoReconnect: true, // If enabled, will try to reconnect to discord every 5 seconds after disconnecting or failing to connect
+      activityTimoutEnabled: true, // If enabled, the discord rich presence gets cleared when music paused after the time specified below
+      activityTimoutTime: 10 * 60 * 1000, // 10 minutes
+      listenAlong: true, // Add a "listen along" button to rich presence
+      hideDurationLeft: false, // Hides the start and end time of the song to rich presence
     },
     'downloader': {
       enabled: false,
@@ -105,6 +114,8 @@ const defaultConfig = {
       skipExisting: false,
       playlistMaxItems: undefined as number | undefined,
     },
+    'exponential-volume': {},
+    'in-app-menu': {},
     'last-fm': {
       enabled: false,
       token: undefined as string | undefined, // Token used for authentication
@@ -113,17 +124,14 @@ const defaultConfig = {
       api_key: '04d76faaac8726e60988e14c105d421a', // Api key registered by @semvis123
       secret: 'a5d2a36fdf64819290f6982481eaffa2',
     },
-    'lyric-genius': {
+    'lumiastream': {},
+    'lyrics-genius': {
       romanizedLyrics: false,
     },
-    'discord': {
-      enabled: false,
-      autoReconnect: true, // If enabled, will try to reconnect to discord every 5 seconds after disconnecting or failing to connect
-      activityTimoutEnabled: true, // If enabled, the discord rich presence gets cleared when music paused after the time specified below
-      activityTimoutTime: 10 * 60 * 1000, // 10 minutes
-      listenAlong: true, // Add a "listen along" button to rich presence
-      hideDurationLeft: false, // Hides the start and end time of the song to rich presence
+    'navigation': {
+      enabled: true,
     },
+    'no-google-login': {},
     'notifications': {
       enabled: false,
       unpauseNotification: false,
@@ -135,6 +143,18 @@ const defaultConfig = {
       trayControls: true,
       hideButtonText: false,
     },
+    'picture-in-picture': {
+      'enabled': false,
+      'alwaysOnTop': true,
+      'savePosition': true,
+      'saveSize': false,
+      'hotkey': 'P',
+      'pip-position': [10, 10],
+      'pip-size': [450, 275],
+      'isInPiP': false,
+      'useNativePiP': false,
+    },
+    'playback-speed': {},
     'precise-volume': {
       enabled: false,
       steps: 1, // Percentage of volume to change
@@ -145,6 +165,24 @@ const defaultConfig = {
       },
       savedVolume: undefined as number | undefined, // Plugin save volume between session here
     },
+    'quality-changer': {},
+    'shortcuts': {
+      enabled: false,
+      overrideMediaKeys: false,
+      global: {
+        previous: '',
+        playPause: '',
+        next: '',
+      } as Record<string, string>,
+      local: {
+        previous: '',
+        playPause: '',
+        next: '',
+      } as Record<string, string>,
+    },
+    'skip-silences': {
+      onlySkipBeginning: false,
+    },
     'sponsorblock': {
       enabled: false,
       apiURL: 'https://sponsor.ajay.app',
@@ -157,41 +195,16 @@ const defaultConfig = {
         'music_offtopic',
       ],
     },
+    'taskbar-mediacontrol': {},
+    'touchbar': {},
+    'tuna-obs': {},
     'video-toggle': {
       enabled: false,
       hideVideo: false,
       mode: 'custom',
       forceHide: false,
       align: '',
     },
-    'picture-in-picture': {
-      'enabled': false,
-      'alwaysOnTop': true,
-      'savePosition': true,
-      'saveSize': false,
-      'hotkey': 'P',
-      'pip-position': [10, 10],
-      'pip-size': [450, 275],
-      'isInPiP': false,
-      'useNativePiP': false,
-    },
-    'captions-selector': {
-      enabled: false,
-      disableCaptions: false,
-      autoload: false,
-      lastCaptionsCode: '',
-      disabledCaptions: false,
-    },
-    'skip-silences': {
-      onlySkipBeginning: false,
-    },
-    'crossfade': {
-      enabled: false,
-      fadeInDuration: 1500, // Ms
-      fadeOutDuration: 5000, // Ms
-      secondsBeforeEnd: 10, // S
-      fadeScaling: 'linear', // 'linear', 'logarithmic' or a positive number in dB
-    },
     'visualizer': {
       enabled: false,
       type: 'butterchurn',

assets/youtube-music.svg

@@ -10,9 +10,9 @@ import { getOptions, setMenuOptions, setOptions } from './plugins';
 import { sendToFront } from '../providers/app-controls';
 import { Entries } from '../utils/type-utils';
 
-type DefaultPluginsConfig = typeof defaultConfig.plugins;
-type OneOfDefaultConfigKey = keyof DefaultPluginsConfig;
-type OneOfDefaultConfig = typeof defaultConfig.plugins[OneOfDefaultConfigKey];
+export type DefaultPluginsConfig = typeof defaultConfig.plugins;
+export type OneOfDefaultConfigKey = keyof DefaultPluginsConfig;
+export type OneOfDefaultConfig = typeof defaultConfig.plugins[OneOfDefaultConfigKey];
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const activePlugins: { [key in OneOfDefaultConfigKey]?: PluginConfig<any> } = {};