Merge branch 'development' into upgrade/electron-26

* development: (66 commits)
  Group dependabot created updates for some packages in fewer PRs (FreeTubeApp#3968)
  Chore: Update vscode configurations (FreeTubeApp#3986)
  Bump youtubei.js from 6.1.0 to 6.3.0 (FreeTubeApp#3994)
  Bump postcss from 8.4.28 to 8.4.29 (FreeTubeApp#3995)
  Bump @babel/preset-env from 7.22.10 to 7.22.14 (FreeTubeApp#3996)
  Bump marked from 7.0.5 to 8.0.0 (FreeTubeApp#3993)
  Bump electron-builder from 24.6.3 to 24.6.4 (FreeTubeApp#3992)
  Translated using Weblate (Italian)
  Translated using Weblate (Dutch)
  Translated using Weblate (Swedish)
  Translated using Weblate (Swedish)
  Translated using Weblate (Dutch)
  Translated using Weblate (Chinese (Traditional))
  Translated using Weblate (Japanese)
  Translated using Weblate (Romanian)
  Translated using Weblate (Estonian)
  Compressed Images (FreeTubeApp#3988)
  Translated using Weblate (Hungarian)
  Translated using Weblate (Hungarian)
  Translated using Weblate (Czech)
  ...

# Conflicts:
#	package.json

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -80,26 +80,27 @@ body:
   - type: dropdown
     attributes:
       label: Installation Method
+      description: When you select an unofficial installation method, you must have verified that the bug is also present in one of the official installation methods. Please make sure you uninstall the unofficial installation before installing one of the official installations. If you can't reproduce this in one of the official installation methods, you should report the bug to the maintainer of the unofficial installation method you used.
       options:
         - .apk (Alpine Linux Package)
-        - .apk (Android, FreeTubeCordova)
         - .AppImage
-        - AUR
-        - Chocolatey
         - .deb
         - .dmg
         - .exe
         - Flathub
-        - MPR
-        - Nix
         - .pacman
         - Portable
-        - PortableApps
-        - .rpm
-        - Scoop
-        - Snapcraft
-        - winget
+        - .rpm 
         - .zip
+        - .apk (Android, FreeTubeCordova Unofficial)
+        - AUR (Unofficial)
+        - Chocolatey (Unofficial)
+        - MPR (Unofficial)
+        - Nix (Unofficial)
+        - PortableApps (Unofficial)
+        - Scoop (Unofficial)
+        - Snapcraft (Unofficial)
+        - winget (Unofficial)
         - other
     validations:
       required: true

.github/dependabot.yml

@@ -8,6 +8,27 @@ updates:
       - "PR: waiting for review"
       - "PR: dependencies"
     open-pull-requests-limit: 15
+    groups:
+      babel:
+        patterns:
+          - "@babel/*"
+          - "babel-*"
+      eslint:
+        patterns:
+          - "eslint"
+          - "eslint-*"
+          - "yaml-eslint-parser"
+          - "vue-eslint-parser"
+      stylelint:
+        patterns:
+          - "stylelint"
+          - "stylelint-*"
+          - "postcss"
+          - "postcss-*"
+          - "@double-great/stylelint-a11y"
+      fortawesome:
+        patterns:
+          - "@fortawesome/*"
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:

.github/issue-labeler.yml

@@ -0,0 +1,65 @@
+'B: visual':
+    - '(visual bug)'
+
+'B: Unofficial Download':
+    - '(AUR \(Unofficial\)|Chocolatey \(Unofficial\)|\.apk \(Android, FreeTubeCordova Unofficial\)|PortableApps \(Unofficial\)|winget \(Unofficial\)|Scoop \(Unofficial\)|Snapcraft \(Unofficial\)|MPR \(Unofficial\)|Nix \(Unofficial\))'
+
+'B: keyboard control':
+    - '(keyboard control not working)' 
+
+'B: text/string':
+    - '(text/string issue)'
+
+'B: content not loading':
+    - '(content not loading)'
+
+'B: accessibility':
+    - '(accessibility issue)'
+
+'B: usability':
+    - '(usability issue)'
+
+'B: crash':
+    - '(causes crash)'
+
+'B: feature stopped working':
+    - '(feature stopped working)'
+
+'B: inconsistent behavior':
+    - '(inconsistent behavior)'
+
+'B: data loss':
+    - '(data loss)'
+
+'B: race condition':
+    - '(race condition)'
+
+'B: API issue':
+    - '(API issue)'
+
+'B: developer mode':
+    - '(only happens in developer mode)'
+
+'E: improvement existing feature':
+    - '(improvement to existing feature)'
+
+'E: new optional setting':
+    - '(new optional setting)'
+
+'E: visual improvement':
+    - '(visual improvement)'
+
+'E: display more information':
+    - '(display more information to user)'
+
+'E: ease of use improvement':
+    - '(ease of use improvement)'
+
+'E: support external software':
+    - '(support for external software)'
+
+'E: new feature':
+    - '(new feature)'
+
+'E: keyboard shortcut':
+    - '(new keyboard shortcut)'

.github/workflows/label-issue.yml

@@ -0,0 +1,18 @@
+name: "Issue Labeler"
+on:
+  issues:
+    types: [opened]
+
+permissions:
+  issues: write
+  contents: read
+
+jobs:
+  triage:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: github/[email protected]
+      with:
+        configuration-path: .github/issue-labeler.yml
+        enable-versioned-regex: 0
+        repo-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/label-pr.yml

@@ -14,3 +14,4 @@ jobs:
     - uses: actions/labeler@v4
       with:
         repo-token: "${{ secrets.GITHUB_TOKEN }}"
+        configuration-path: .github/pr-labeler.yml

.vscode/launch.json

@@ -0,0 +1,23 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "dev-runner (Electron)",
+      "type": "node",
+      "request": "launch",
+      "program": "${workspaceFolder}/_scripts/dev-runner.js",
+      "args": ["--remote-debug"]
+    },
+    {
+      "name": "Attach to renderer process (Electron)",
+      "type": "chrome",
+      "request": "attach",
+      "port": 9223,
+      "webRoot": "http://localhost:9080",
+      "sourceMapPathOverrides": {
+        "webpack://freetube/./~/*": "${workspaceFolder}/node_modules/*",
+        "webpack://freetube/./*": "${workspaceFolder}/*"
+      }
+    }
+  ]
+}

package.json

@@ -63,7 +63,7 @@
     "autolinker": "^4.0.0",
     "electron-context-menu": "^3.6.1",
     "lodash.debounce": "^4.0.8",
-    "marked": "^7.0.5",
+    "marked": "^8.0.0",
     "path-browserify": "^1.0.1",
     "process": "^0.11.10",
     "video.js": "7.21.5",
@@ -78,20 +78,20 @@
     "vue-router": "^3.6.5",
     "vue-tiny-slider": "^0.1.39",
     "vuex": "^3.6.2",
-    "youtubei.js": "^6.1.0"
+    "youtubei.js": "^6.3.0"
   },
   "devDependencies": {
     "@babel/core": "^7.22.11",
     "@babel/eslint-parser": "^7.22.11",
     "@babel/plugin-proposal-class-properties": "^7.18.6",
-    "@babel/preset-env": "^7.22.10",
+    "@babel/preset-env": "^7.22.14",
     "@double-great/stylelint-a11y": "^2.0.2",
     "babel-loader": "^9.1.3",
     "copy-webpack-plugin": "^11.0.0",
     "css-loader": "^6.8.1",
     "css-minimizer-webpack-plugin": "^5.0.1",
     "electron": "^26.1.0",
-    "electron-builder": "^24.6.3",
+    "electron-builder": "^24.6.4",
     "eslint": "^8.48.0",
     "eslint-config-prettier": "^9.0.0",
     "eslint-config-standard": "^17.1.0",
@@ -110,7 +110,7 @@
     "lefthook": "^1.4.9",
     "mini-css-extract-plugin": "^2.7.6",
     "npm-run-all": "^4.1.5",
-    "postcss": "^8.4.26",
+    "postcss": "^8.4.29",
     "postcss-scss": "^4.0.7",
     "prettier": "^2.8.8",
     "rimraf": "^5.0.1",

src/main/index.js

@@ -449,8 +449,12 @@ function runApp() {
       searchQueryText = null
     } = { }) {
     // Syncing new window background to theme choice.
-    const windowBackground = await baseHandlers.settings._findTheme().then(({ value }) => {
-      switch (value) {
+    const windowBackground = await baseHandlers.settings._findTheme().then((setting) => {
+      if (!setting) {
+        return nativeTheme.shouldUseDarkColors ? '#212121' : '#f1f1f1'
+      }
+
+      switch (setting.value) {
         case 'dark':
           return '#212121'
         case 'light':
@@ -461,6 +465,10 @@ function runApp() {
           return '#282a36'
         case 'catppuccin-mocha':
           return '#1e1e2e'
+        case 'pastel-pink':
+          return '#ffd1dc'
+        case 'hot-pink':
+          return '#de1c85'
         case 'system':
         default:
           return nativeTheme.shouldUseDarkColors ? '#212121' : '#f1f1f1'

src/renderer/components/channel-about/channel-about.css

@@ -27,8 +27,8 @@
 
 .aboutTagLink {
   background-color: var(--secondary-card-bg-color);
+  color: var(--primary-text-color);
   border-radius: 7px;
-  color: inherit;
   padding: 7px;
   text-decoration: none;
 }