Merge branch 'yt-master'

# Conflicts:
#	src/plugins/synced-lyrics/providers/LRCLib.ts

Author: AARP41298

.github/workflows/build.yml

@@ -6,7 +6,7 @@ on:
   pull_request:
 
 env:
-  NODE_VERSION: "20.x"
+  NODE_VERSION: "22.x"
 
 jobs:
   build:
@@ -162,7 +162,7 @@ jobs:
 
       - name: Commit changelog
         if: ${{ env.VERSION_HASH == '' }}
-        uses: stefanzweifel/git-auto-commit-action@v5
+        uses: stefanzweifel/git-auto-commit-action@v6
         with:
           commit_message: Update changelog for ${{ env.VERSION_TAG }}
           file_pattern: "changelog.md"

.gitignore

@@ -1,7 +1,6 @@
 node_modules
 /dist
 /pack
-electron-builder.yml
 .vscode/settings.json
 .idea
 

.prettierrc

@@ -1,5 +1,7 @@
 {
   "tabWidth": 2,
   "useTabs": false,
-  "singleQuote": true
+  "singleQuote": true,
+  "trailingComma": "all",
+  "quoteProps": "consistent"
 }

README.md

@@ -153,6 +153,8 @@ Read this in other languages: [한국어](./docs/readme/README-ko.md), [Françai
 - **Tuna OBS**: Integration with [OBS](https://obsproject.com/)'s
   plugin [Tuna](https://obsproject.com/forum/resources/tuna.843/)
 
+- **Unobtrusive Player**: Prevents the player from popping up when playing a song
+
 - **Video Quality Changer**: Allows changing the video quality with
   a [button](https://user-images.githubusercontent.com/78568641/138574366-70324a5e-2d64-4f6a-acdd-dc2a2b9cecc5.png) on
   the video overlay

changelog.md

@@ -0,0 +1,125 @@
+appId: com.github.th-ch.youtube-music
+productName: YouTube Music
+files:
+  - '!*'
+  - dist
+  - assets
+  - license
+  - '!node_modules'
+  - 'node_modules/custom-electron-prompt/**'
+  - 'node_modules/@ghostery/adblocker-electron-preload/**'
+  - 'node_modules/@ffmpeg.wasm/core-mt/**'
+  - '!node_modules/**/*.map'
+  - '!node_modules/**/*.ts'
+asarUnpack:
+  - assets
+mac:
+  identity: null
+  target:
+    - target: dmg
+      arch:
+        - x64
+        - arm64
+  icon: assets/generated/icons/mac/icon.icns
+  compression: maximum
+win:
+  icon: assets/generated/icons/win/icon.ico
+  target:
+    - target: nsis-web
+      arch:
+        - x64
+        - ia32
+        - arm64
+    - target: portable
+      arch:
+        - x64
+        - ia32
+        - arm64
+  compression: maximum
+nsisWeb:
+  runAfterFinish: false
+linux:
+  icon: assets/generated/icons/png
+  category: AudioVideo
+  desktop:
+    entry:
+      StartupWMClass: com.github.th_ch.youtube_music
+  target:
+    - target: AppImage
+      arch:
+        - x64
+        - arm64
+        - armv7l
+    - target: flatpak
+      arch:
+        - x64
+    - target: deb
+      arch:
+        - x64
+        - arm64
+        - armv7l
+    - target: rpm
+      arch:
+        - x64
+        - arm64
+    - target: snap
+      arch:
+        - x64
+    - target: freebsd
+      arch:
+        - x64
+        - arm64
+        - armv7l
+    - target: tar.gz
+      arch:
+        - x64
+        - arm64
+        - armv7l
+appImage:
+  description: >-
+    YouTube Music Desktop App bundled with custom plugins (and built-in ad
+    blocker / downloader)
+  category: AudioVideo
+flatpak:
+  description: >-
+    YouTube Music Desktop App bundled with custom plugins (and built-in ad
+    blocker / downloader)
+  category: AudioVideo
+  runtimeVersion: '24.08'
+  baseVersion: '24.08'
+  finishArgs:
+    - '--socket=wayland'
+    - '--socket=x11'
+    - '--share=ipc'
+    - '--device=dri'
+    - '--socket=pulseaudio'
+    - '--share=network'
+    - '--filesystem=xdg-music:rw'
+    - '--talk-name=org.freedesktop.Notifications'
+    - '--talk-name=org.gnome.SessionManager'
+    - '--talk-name=org.kde.StatusNotifierWatcher'
+    - '--own-name=org.mpris.MediaPlayer2.YoutubeMusic.*'
+deb:
+  depends:
+    - libgtk-3-0
+    - libnotify4
+    - libnss3
+    - libxss1
+    - libxtst6
+    - xdg-utils
+    - libatspi2.0-0
+    - libuuid1
+    - libasound2
+    - libgbm1
+rpm:
+  depends:
+    - /usr/lib64/libuuid.so.1
+  fpm:
+    - '--rpm-rpmbuild-define'
+    - _build_id_links none
+snap:
+  slots:
+    - mpris:
+        interface: mpris
+directories:
+  output: ./pack/

electron-builder.yml

@@ -1,16 +1,17 @@
 import { dirname, join, resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
 
-import { UserConfig } from 'vite';
 import { defineConfig, defineViteConfig } from 'electron-vite';
 import builtinModules from 'builtin-modules';
-import viteResolve from 'vite-plugin-resolve';
+
 import Inspect from 'vite-plugin-inspect';
 import solidPlugin from 'vite-plugin-solid';
+import viteResolve from 'vite-plugin-resolve';
+
+import { withFilter, type UserConfig } from 'vite';
 
 import { pluginVirtualModuleGenerator } from './vite-plugins/plugin-importer.mjs';
 import pluginLoader from './vite-plugins/plugin-loader.mjs';
-
 import { i18nImporter } from './vite-plugins/i18n-importer.mjs';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
@@ -23,6 +24,9 @@ const resolveAlias = {
 export default defineConfig({
   main: defineViteConfig(({ mode }) => {
     const commonConfig: UserConfig = {
+      experimental: {
+        enableNativePlugin: true,
+      },
       plugins: [
         pluginLoader('backend'),
         viteResolve({
@@ -31,15 +35,16 @@ export default defineConfig({
         }),
       ],
       publicDir: 'assets',
+      define: {
+        '__dirname': 'import.meta.dirname',
+        '__filename': 'import.meta.filename',
+      },
       build: {
         lib: {
           entry: 'src/index.ts',
-          formats: ['cjs'],
+          formats: ['es'],
         },
         outDir: 'dist/main',
-        commonjsOptions: {
-          ignoreDynamicRequires: true,
-        },
         rollupOptions: {
           external: ['electron', 'custom-electron-prompt', ...builtinModules],
           input: './src/index.ts',
@@ -72,6 +77,9 @@ export default defineConfig({
   }),
   preload: defineViteConfig(({ mode }) => {
     const commonConfig: UserConfig = {
+      experimental: {
+        enableNativePlugin: true,
+      },
       plugins: [
         pluginLoader('preload'),
         viteResolve({
@@ -120,13 +128,18 @@ export default defineConfig({
   }),
   renderer: defineViteConfig(({ mode }) => {
     const commonConfig: UserConfig = {
+      experimental: {
+        enableNativePlugin: mode !== 'development', // Disable native plugin in development mode to avoid issues with HMR (bug in rolldown-vite)
+      },
       plugins: [
         pluginLoader('renderer'),
         viteResolve({
           'virtual:i18n': i18nImporter(),
           'virtual:plugins': pluginVirtualModuleGenerator('renderer'),
         }),
-        solidPlugin(),
+        withFilter(solidPlugin(), {
+          load: { id: [/\.(tsx|jsx)$/, '/@solid-refresh'] },
+        }),
       ],
       root: './src/',
       build: {
@@ -136,9 +149,6 @@ export default defineConfig({
           name: 'renderer',
         },
         outDir: 'dist/renderer',
-        commonjsOptions: {
-          ignoreDynamicRequires: true,
-        },
         rollupOptions: {
           external: ['electron', ...builtinModules],
           input: './src/index.html',

electron.vite.config.mts

@@ -2,7 +2,8 @@
 
 import eslint from '@eslint/js';
 import prettier from 'eslint-plugin-prettier/recommended';
-import stylistic from '@stylistic/eslint-plugin-js';
+import solid from 'eslint-plugin-solid/configs/recommended';
+import stylistic from '@stylistic/eslint-plugin';
 import tsEslint from 'typescript-eslint';
 
 import * as importPlugin from 'eslint-plugin-import';
@@ -12,6 +13,7 @@ export default tsEslint.config(
   tsEslint.configs.eslintRecommended,
   ...tsEslint.configs.recommendedTypeChecked,
   prettier,
+  solid,
   { ignores: ['dist', 'node_modules', '*.config.*js', '*.test.*js'] },
   {
     plugins: {