Merge branch 'development' into feature/4497-hide-watched-videos

* development: (50 commits)
  add rules to issue templates (FreeTubeApp#7516)
  Translated using Weblate (Romanian)
  Translated using Weblate (Serbian)
  Translated using Weblate (Russian)
  Move settings to `more` menu on smaller mobile devices (FreeTubeApp#7506)
  Translated using Weblate (Russian)
  Migrate WatchVideoLiveChat to the composition API (FreeTubeApp#7494)
  Translated using Weblate (Basque)
  Translated using Weblate (Russian)
  Bump shaka-player from 4.14.14 to 4.14.15 (FreeTubeApp#7501)
  Bump electron from 36.3.1 to 36.3.2 (FreeTubeApp#7500)
  Bump sass from 1.89.0 to 1.89.1 (FreeTubeApp#7499)
  Bump the eslint group with 3 updates (FreeTubeApp#7498)
  Bump the stylelint group with 2 updates (FreeTubeApp#7497)
  Bump @babel/core from 7.27.1 to 7.27.4 in the babel group (FreeTubeApp#7496)
  Translated using Weblate (Japanese)
  Translated using Weblate (German)
  Implement context menu item "search X in new window" (FreeTubeApp#7477)
  Translated using Weblate (Portuguese (Brazil))
  Translated using Weblate (French)
  ...

# Conflicts:
#	static/locales/da.yaml

Author: PikachuEXE

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -23,6 +23,8 @@ body:
           required: true
         - label: This issue contains only one bug.
           required: true
+        - label: I have read and agree to follow the [rules](https://docs.freetubeapp.io/community/rules/).
+          required: true
   - type: textarea
     attributes:
       label: Describe the bug

.github/ISSUE_TEMPLATE/feature_request.yaml

@@ -19,6 +19,8 @@ body:
             required: true
           - label: This issue contains only one feature request.
             required: true
+          - label: I have read and agree to follow the [rules](https://docs.freetubeapp.io/community/rules/).
+            required: true
   - type: textarea
     attributes:
       label: Problem Description

_scripts/build.js _scripts/build.mjs_scripts/build.js renamed to _scripts/build.mjs

@@ -1,14 +1,11 @@
-const os = require('os')
-const builder = require('electron-builder')
-const config = require('./ebuilder.config.js')
+import { Arch, build, Platform } from 'electron-builder'
+import config from './ebuilder.config.mjs'
 
-const Platform = builder.Platform
-const Arch = builder.Arch
 const args = process.argv
 
 /** @type {Map<import('electron-builder').Platform, Map<import('electron-builder').Arch, Array<string>>>} */
 let targets
-const platform = os.platform()
+const platform = process.platform
 
 if (platform === 'darwin') {
   let arch = Arch.x64
@@ -40,15 +37,9 @@ if (platform === 'darwin') {
   targets = Platform.LINUX.createTarget(['deb', 'zip', '7z', 'rpm', 'AppImage', 'pacman'], arch)
 }
 
-builder
-  .build({
-    targets,
-    config,
-    publish: 'never'
-  })
-  .then(m => {
-    console.log(m)
-  })
-  .catch(e => {
-    console.error(e)
-  })
+try {
+  const output = await build({ targets, config, publish: 'never' })
+  console.log(output)
+} catch (error) {
+  console.error(error)
+}

_scripts/dev-runner.js

@@ -18,13 +18,15 @@ const web = process.argv.indexOf('--web') !== -1
 
 let mainConfig
 let rendererConfig
+let preloadConfig
 let botGuardScriptConfig
 let webConfig
 let SHAKA_LOCALES_TO_BE_BUNDLED
 
 if (!web) {
   mainConfig = require('./webpack.main.config')
   rendererConfig = require('./webpack.renderer.config')
+  preloadConfig = require('./webpack.preload.config.js')
   botGuardScriptConfig = require('./webpack.botGuardScript.config')
 
   SHAKA_LOCALES_TO_BE_BUNDLED = rendererConfig.SHAKA_LOCALES_TO_BE_BUNDLED
@@ -132,6 +134,36 @@ function startMain() {
   })
 }
 
+function startPreload() {
+  const compiler = webpack(preloadConfig)
+  const { name } = compiler
+
+  let firstTime = true
+
+  compiler.hooks.afterEmit.tap('afterEmit', async () => {
+    console.log(`\nCompiled ${name} script!`)
+
+    if (firstTime) {
+      firstTime = false
+    } else {
+      manualRestart = true
+      await restartElectron()
+      setTimeout(() => {
+        manualRestart = false
+      }, 2500)
+    }
+
+    console.log(`\nWatching file changes for ${name} script...`)
+  })
+
+  compiler.watch({
+    aggregateTimeout: 500,
+  },
+  err => {
+    if (err) console.error(err)
+  })
+}
+
 function startRenderer(callback) {
   const compiler = webpack(rendererConfig)
   const { name } = compiler
@@ -208,6 +240,7 @@ function startWeb () {
 if (!web) {
   startRenderer(() => {
     startBotGuardScript()
+    startPreload()
     startMain()
   })
 } else {

_scripts/ebuilder.config.js _scripts/ebuilder.config.mjs_scripts/ebuilder.config.js renamed to _scripts/ebuilder.config.mjs

@@ -1,12 +1,12 @@
-const { name, productName } = require('../package.json')
+import packageDetails from '../package.json' with { type: 'json' }
 
 /** @type {import('electron-builder').Configuration} */
-const config = {
-  appId: `io.freetubeapp.${name}`,
+export default {
+  appId: `io.freetubeapp.${packageDetails.name}`,
   copyright: 'Copyleft © 2020-2025 freetubeapp@protonmail.com',
   // asar: false,
   // compression: 'store',
-  productName,
+  productName: packageDetails.productName,
   directories: {
     output: './build/',
   },
@@ -96,5 +96,3 @@ const config = {
     oneClick: false,
   },
 }
-
-module.exports = config

_scripts/injectAllowedPaths.mjs

@@ -21,6 +21,8 @@ const paths = readdirSync(distDirectory, {
       // disallow the renderer process/browser windows to read the main.js file
       dirent.name !== 'main.js' &&
       dirent.name !== 'main.js.LICENSE.txt' &&
+      // disallow the renderer process/browser windows to read the preload.js file
+      dirent.name !== 'preload.js' &&
       // disallow the renderer process/browser windows to read the botGuardScript.js file
       dirent.name !== 'botGuardScript.js' &&
       // filter out any web build files, in case the dist directory contains a web build

_scripts/webpack.preload.config.js

@@ -0,0 +1,34 @@
+const path = require('path')
+
+const isDevMode = process.env.NODE_ENV === 'development'
+
+/** @type {import('webpack').Configuration} */
+const config = {
+  name: 'preload',
+  mode: process.env.NODE_ENV,
+  devtool: isDevMode ? 'eval-cheap-module-source-map' : false,
+  entry: {
+    preload: path.join(__dirname, '../src/preload/main.js'),
+  },
+  infrastructureLogging: {
+    // Only warnings and errors
+    // level: 'none' disable logging
+    // Please read https://webpack.js.org/configuration/other-options/#infrastructurelogginglevel
+    level: isDevMode ? 'info' : 'none'
+  },
+  output: {
+    path: path.join(__dirname, '../dist'),
+    filename: '[name].js'
+  },
+  externals: [
+    'electron/renderer'
+  ],
+  externalsType: 'commonjs',
+  node: {
+    __dirname: false,
+    __filename: false
+  },
+  target: 'electron-preload',
+}
+
+module.exports = config

_scripts/webpack.renderer.config.js

@@ -39,7 +39,7 @@ const config = {
     level: isDevMode ? 'info' : 'none'
   },
   output: {
-    libraryTarget: 'commonjs2',
+    scriptType: 'text/javascript',
     path: path.join(__dirname, '../dist'),
     filename: '[name].js',
   },
@@ -191,7 +191,7 @@ const config = {
     },
     extensions: ['.js', '.vue']
   },
-  target: 'electron-renderer',
+  target: 'web',
 }
 
 if (isDevMode) {

package.json

@@ -22,9 +22,9 @@
     "build": "run-s patch-shaka pack build-release",
     "build:arm64": "run-s patch-shaka pack build-release:arm64",
     "build:arm32": "run-s patch-shaka pack build-release:arm32",
-    "build-release": "node _scripts/build.js",
-    "build-release:arm64": "node _scripts/build.js arm64",
-    "build-release:arm32": "node _scripts/build.js arm32",
+    "build-release": "node _scripts/build.mjs",
+    "build-release:arm64": "node _scripts/build.mjs arm64",
+    "build-release:arm32": "node _scripts/build.mjs arm32",
     "clean": "node _scripts/clean.mjs",
     "debug": "run-s patch-shaka debug-runner",
     "debug-runner": "node _scripts/dev-runner.js --remote-debug",
@@ -43,13 +43,13 @@
     "lint-style": "stylelint \"src/**/*.{css,scss}\"",
     "lint-style-fix": "stylelint --fix \"src/**/*.{css,scss}\"",
     "lint-yml": "eslint --config eslint.config.mjs \"**/*.yml\" \"**/*.yaml\"",
-    "pack": "run-p pack:main pack:renderer pack:botGuardScript && node _scripts/injectAllowedPaths.mjs",
+    "pack": "run-p pack:main pack:renderer pack:preload pack:botGuardScript && node _scripts/injectAllowedPaths.mjs",
     "pack:main": "webpack --mode=production --node-env=production --config _scripts/webpack.main.config.js",
     "pack:renderer": "webpack --mode=production --node-env=production --config _scripts/webpack.renderer.config.js",
+    "pack:preload": "webpack --mode=production --node-env=production --config _scripts/webpack.preload.config.js",
     "pack:web": "webpack --mode=production --node-env=production --config _scripts/webpack.web.config.js",
     "pack:botGuardScript": "webpack --config _scripts/webpack.botGuardScript.config.js",
-    "postinstall": "run-s --silent patch-shaka",
-    "release": "run-s test build",
+    "postinstall": "yarn run --silent patch-shaka",
     "ci": "yarn install --silent --frozen-lockfile --network-concurrency 1"
   },
   "dependencies": {
@@ -65,7 +65,7 @@
     "marked": "^15.0.12",
     "portal-vue": "^2.1.7",
     "process": "^0.11.10",
-    "shaka-player": "^4.14.14",
+    "shaka-player": "^4.14.15",
     "swiper": "^11.2.8",
     "vue": "^2.7.16",
     "vue-i18n": "^8.28.2",
@@ -75,20 +75,20 @@
     "youtubei.js": "^13.4.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.27.1",
+    "@babel/core": "^7.27.4",
     "@babel/plugin-transform-class-properties": "^7.27.1",
     "@babel/preset-env": "^7.27.2",
     "@double-great/stylelint-a11y": "^3.0.4",
-    "@eslint/js": "^9.27.0",
+    "@eslint/js": "^9.28.0",
     "@intlify/eslint-plugin-vue-i18n": "^3.2.0",
     "babel-loader": "^10.0.0",
     "copy-webpack-plugin": "^13.0.0",
     "css-loader": "^7.1.2",
     "css-minimizer-webpack-plugin": "^7.0.2",
-    "electron": "^36.3.1",
+    "electron": "^36.3.2",
     "electron-builder": "^26.0.15",
-    "eslint": "^9.27.0",
-    "eslint-plugin-jsdoc": "^50.6.17",
+    "eslint": "^9.28.0",
+    "eslint-plugin-jsdoc": "^50.7.1",
     "eslint-plugin-jsonc": "^2.20.1",
     "eslint-plugin-unicorn": "^59.0.1",
     "eslint-plugin-vue": "^10.1.0",
@@ -102,11 +102,11 @@
     "mini-css-extract-plugin": "^2.9.2",
     "neostandard": "^0.12.1",
     "npm-run-all2": "^8.0.4",
-    "postcss": "^8.5.3",
+    "postcss": "^8.5.4",
     "postcss-scss": "^4.0.9",
-    "sass": "^1.89.0",
+    "sass": "^1.89.1",
     "sass-loader": "^16.0.5",
-    "stylelint": "^16.19.1",
+    "stylelint": "^16.20.0",
     "stylelint-config-sass-guidelines": "^12.1.0",
     "stylelint-config-standard": "^38.0.0",
     "stylelint-high-performance-animation": "^1.11.0",

src/constants.js

@@ -12,9 +12,6 @@ const IpcChannels = {
   APP_READY: 'app-ready',
   RELAUNCH_REQUEST: 'relaunch-request',
 
-  REQUEST_FULLSCREEN: 'request-fullscreen',
-  REQUEST_PIP: 'request-pip',
-
   SEARCH_INPUT_HANDLING_READY: 'search-input-handling-ready',
   UPDATE_SEARCH_INPUT_TEXT: 'update-search-input-text',
 
@@ -190,12 +187,16 @@ const KeyboardShortcuts = {
       SMALL_REWIND: 'arrowleft',
       SMALL_FAST_FORWARD: 'arrowright',
       DECREASE_VIDEO_SPEED: 'o',
+      DECREASE_VIDEO_SPEED_ALT: '<',
       INCREASE_VIDEO_SPEED: 'p',
+      INCREASE_VIDEO_SPEED_ALT: '>',
       SKIP_N_TENTHS: '0..9',
       LAST_CHAPTER: 'ctrl+arrowleft',
       NEXT_CHAPTER: 'ctrl+arrowright',
       LAST_FRAME: ',',
       NEXT_FRAME: '.',
+      HOME: 'home',
+      END: 'end',
     }
   },
 }