Merge branch 'development'

Conflicts:
	package.json
	src/main/index.js
	src/renderer/helpers/api/local.js
	src/renderer/helpers/utils.js
	src/renderer/views/Watch/Watch.js
	yarn.lock

Author: PrestonN

.babelrc

@@ -11,6 +11,6 @@
     ]
   ],
   "plugins": [
-    "@babel/proposal-class-properties"
+    "@babel/plugin-transform-class-properties"
   ]
 }

.eslintignore

@@ -17,6 +17,7 @@ updates:
         patterns:
           - "eslint"
           - "eslint-*"
+          - "@eslint/*"
           - "yaml-eslint-parser"
           - "vue-eslint-parser"
       stylelint:

.eslintrc.js

@@ -20,7 +20,7 @@ jobs:
           compressOnly: true
       - name: Create New Pull Request If Needed
         if: steps.calibre.outputs.markdown != ''
-        uses: peter-evans/create-pull-request@v6
+        uses: peter-evans/create-pull-request@v7
         with:
           title: Compressed Images Nightly
           branch-suffix: timestamp

.github/dependabot.yml

@@ -77,22 +77,22 @@ jobs:
         date +"%Y-%m-%d" >> $GITHUB_ENV
         echo 'EOF' >> $GITHUB_ENV
     - name: Update x64 File Location in yml File
-      uses: mikefarah/yq@v4.44.2
+      uses: mikefarah/yq@v4.44.3
       with:
         # The Command which should be run
         cmd: yq -i '.modules[0].sources[0].url = "https://github.com/FreeTubeApp/FreeTube/releases/download/v${{ steps.sub.outputs.result }}-beta/freetube-${{ steps.sub.outputs.result }}-linux-portable-x64.zip"' io.freetubeapp.FreeTube.yml
     - name: Update x64 Hash in yml File
-      uses: mikefarah/yq@v4.44.2
+      uses: mikefarah/yq@v4.44.3
       with:
         # The Command which should be run
         cmd: yq -i '.modules[0].sources[0].sha256 = "${{ env.HASH_X64 }}"' io.freetubeapp.FreeTube.yml
     - name: Update ARM File Location in yml File
-      uses: mikefarah/yq@v4.44.2
+      uses: mikefarah/yq@v4.44.3
       with:
         # The Command which should be run
         cmd: yq -i '.modules[0].sources[1].url = "https://github.com/FreeTubeApp/FreeTube/releases/download/v${{ steps.sub.outputs.result }}-beta/freetube-${{ steps.sub.outputs.result }}-linux-portable-arm64.zip"' io.freetubeapp.FreeTube.yml
     - name: Update ARM Hash in yml File
-      uses: mikefarah/yq@v4.44.2
+      uses: mikefarah/yq@v4.44.3
       with:
         # The Command which should be run
         cmd: yq -i '.modules[0].sources[1].sha256 = "${{ env.HASH_ARM64 }}"' io.freetubeapp.FreeTube.yml

.github/workflows/calibreapp-image-actions.yml

@@ -26,7 +26,7 @@
     "selector-pseudo-class-no-unknown": [
       true,
       {
-        "ignorePseudoClasses": ["deep"]
+        "ignorePseudoClasses": ["deep", "global"]
       }
     ],
     "a11y/no-outline-none": true,

.github/workflows/flatpak.yml

@@ -59,7 +59,6 @@ longer track you using cookies or JavaScript. Your subscriptions and history are
 * Option to show only family friendly content
 * Show/hide functionality or elements within the app using the distraction free settings
 * View channel community posts
-* View most age restricted videos
 
 ### Browser Extension
 FreeTube is supported by the [Privacy Redirect](https://github.com/SimonBrazell/privacy-redirect) and [LibRedirect](https://github.com/libredirect/libredirect) extensions, which will allow you to open YouTube links into FreeTube. 

.github/workflows/report.yml

@@ -40,17 +40,17 @@ class ProcessLocalesPlugin {
     /** @type {(updatedLocales: [string, string][]) => void|null} */
     this.notifyLocaleChange = null
 
-    if (this.hotReload) {
-      this.hotReloadScript = readFileSync(`${__dirname}/_hotReloadLocalesScript.js`, 'utf-8')
-    }
-
     this.loadLocales()
   }
 
   /** @param {import('webpack').Compiler} compiler  */
   apply(compiler) {
     const { CachedSource, RawSource } = compiler.webpack.sources;
-    const { Compilation } = compiler.webpack
+    const { Compilation, DefinePlugin } = compiler.webpack
+
+    new DefinePlugin({
+      'process.env.HOT_RELOAD_LOCALES': this.hotReload
+    }).apply(compiler)
 
     compiler.hooks.thisCompilation.tap(PLUGIN_NAME, (compilation) => {
       const IS_DEV_SERVER = !!compiler.watching
@@ -72,6 +72,7 @@ class ProcessLocalesPlugin {
         }
 
         for (let [locale, data] of this.locales) {
+          // eslint-disable-next-line no-async-promise-executor
           promises.push(new Promise(async (resolve) => {
             if (IS_DEV_SERVER && compiler.fileTimestamps) {
               const filePath = join(this.inputDir, `${locale}.yaml`)
@@ -131,24 +132,12 @@ class ProcessLocalesPlugin {
     })
 
     compiler.hooks.afterCompile.tap(PLUGIN_NAME, (compilation) => {
+      // eslint-disable-next-line no-extra-boolean-cast
       if (!!compiler.watching) {
         // watch locale files for changes
         compilation.fileDependencies.addAll(this.filePaths)
       }
     })
-
-    compiler.hooks.emit.tap(PLUGIN_NAME, (compilation) => {
-      if (this.hotReload) {
-        // Find generated JavaScript output file (e.g. renderer.js or web.js)
-        // and inject the code snippet that listens for locale updates and replaces vue-i18n's locales
-
-        /** @type {string} */
-        const filename = [...[...compilation.chunks][0].files]
-          .find(file => file.endsWith('.js'))
-
-        compilation.assets[filename]._source._children.push(`\n${this.hotReloadScript}`)
-      }
-    })
   }
 
   loadLocales() {