Merge branch 'fix/open-input-url-in-new-window' into custom-builds/current

* fix/open-input-url-in-new-window:
  ! Fix opening URL in a new window restores main window (in Windows)
  Translated using Weblate (Danish)
  Translated using Weblate (Japanese)
  Fix parsing grid channels without a subscriber count (FreeTubeApp#7486)
  Local API: Add PO tokens to the caption URLs (FreeTubeApp#7484)
  Add preload script and disable node integration in renderer processes (FreeTubeApp#7424)

Author: PikachuEXE

_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/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

@@ -43,9 +43,10 @@
     "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": "yarn run --silent patch-shaka",

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',