Merge branch 'v0.17.0-RC'

.babelrc

@@ -4,15 +4,13 @@
       "@babel/env",
       {
         "targets": {
-          "chrome": "73",
-          "node": 12
+          "chrome": "96",
+          "node": 16
         }
       }
-    ],
-    "@babel/typescript"
+    ]
   ],
   "plugins": [
-    "@babel/proposal-class-properties",
-    "@babel/proposal-object-rest-spread"
+    "@babel/proposal-class-properties"
   ]
 }

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -17,6 +17,8 @@ body:
           required: true  
         - label: I have searched the [issue tracker](https://github.com/FreeTubeApp/FreeTube/issues) for a bug report that matches the one I want to file, without success.
           required: true
+        - label: I have searched the [documentation](https://docs.freetubeapp.io/) for information that matches the description of the bug I want to file, without success.
+          required: true
   - type: textarea
     attributes:
       label: Describe the bug
@@ -113,4 +115,4 @@ body:
       description: Please ensure you've completed the following, if applicable.
       options:
         - label: I have encountered this bug in the latest [nightly build](https://docs.freetubeapp.io/development/nightly-builds).
-          required: false
+          required: false

.github/ISSUE_TEMPLATE/feature_request.yaml

@@ -15,6 +15,8 @@ body:
       options:
           - label: I have searched the [issue tracker](https://github.com/FreeTubeApp/FreeTube/issues) for a feature request that matches the one I want to file, without success.
             required: true
+          - label: I have searched the [documentation](https://docs.freetubeapp.io/) for information that matches the description of the feature request I want to file, without success.
+            required: true
   - type: textarea
     attributes:
       label: Problem Description

.github/workflows/autoLabelDuplicate.yml

@@ -0,0 +1,14 @@
+name: "Label Duplicate"
+on:
+  issue_comment:
+    types: [created]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: Amwam/[email protected]
+        with:
+          keywords: '["duplicate of"]'
+          labels: '["U: duplicate"]'
+          github-token: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/build.yml

@@ -11,11 +11,11 @@ jobs:
   build:
     strategy:
       matrix:
-        node-version: [14.x]
+        node-version: [16.x]
         runtime: [ linux-x64, linux-arm64, win-x64, osx-x64 ]
         include:
         - runtime: linux-x64
-          os: ubuntu-latest
+          os: ubuntu-18.04
 
         - runtime: linux-arm64
           os: ubuntu-latest

.github/workflows/linter.yml

@@ -6,7 +6,7 @@ name: Linter
 # events but only for the master branch
 on:
   pull_request:
-    branches: [ master, development ]
+    branches: [ master, development, '**-RC' ]
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
@@ -18,10 +18,10 @@ jobs:
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
     - uses: actions/checkout@v2
-    - name: Use Node.js 14.x
+    - name: Use Node.js 16.x
       uses: actions/setup-node@v2
       with:
-        node-version: 14.x
+        node-version: 16.x
         cache: "yarn"
     - run: npm run ci
     - run: npm run lint

.github/workflows/release.yml

@@ -12,7 +12,7 @@ jobs:
   build:
     strategy:
       matrix:
-        node-version: [14.x]
+        node-version: [16.x]
         runtime: [ linux-x64, linux-arm64, win-x64, osx-x64 ]
         include:
         - runtime: linux-x64

.github/workflows/remove-outdated-labels.yml

@@ -0,0 +1,36 @@
+name: Remove outdated labels
+on:
+  # https://github.jparrowsec.cnmunity/t/github-actions-are-severely-limited-on-prs/18179/15
+  pull_request_target:
+    types:
+      - closed
+jobs:
+  remove-merged-pr-labels:
+    name: Remove merged pull request labels
+    if: github.event.pull_request.merged
+    runs-on: ubuntu-latest
+    steps:
+      - uses: mondeja/[email protected]
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          labels: |
+            PR: waiting for review
+            PR: WIP
+            PR: changes requested
+            PR: merge conflicts / rebase needed
+            PR/Issue: dependent
+
+  remove-closed-pr-labels:
+    name: Remove closed pull request labels
+    if: github.event_name == 'pull_request_target' && (! github.event.pull_request.merged)
+    runs-on: ubuntu-latest
+    steps:
+      - uses: mondeja/[email protected]
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          labels: |
+            PR: waiting for review
+            PR: WIP
+            PR: changes requested
+            PR: merge conflicts / rebase needed
+            PR/Issue: dependent      

README.md

@@ -18,6 +18,8 @@ FreeTube is supported by the [Privacy Redirect](https://github.com/SimonBrazell/
 
 Download Privacy Redirect for [Firefox](https://addons.mozilla.org/en-US/firefox/addon/privacy-redirect/) or [Google Chrome](https://chrome.google.com/webstore/detail/privacy-redirect/pmcmeagblkinmogikoikkdjiligflglb).
 
+Disclaimer: Learn more about why a browser extension is bad for your [privacy](https://www.privacyguides.org/browsers/#extensions).
+
 If you have issues with the extension working with FreeTube, please create an issue in this repository instead of the extension repository.
 
 ## How does it work?
@@ -62,6 +64,8 @@ Chocolatey: [Download](https://chocolatey.org/packages/freetube/)
 
 Windows Portable: [Download](https://github.com/rddim/FreeTubePortable/releases) [Source](https://github.com/rddim/FreeTubePortable)
 
+Windows Package Manager (winget): [Usage](https://docs.microsoft.com/en-us/windows/package-manager/winget/)
+
 ### Automated Builds (Nightly / Weekly)
 
 Builds are automatically created from changes to our development branch via [GitHub Actions](https://github.com/FreeTubeApp/FreeTube/actions?query=workflow%3ABuild).

_scripts/build.js

@@ -7,13 +7,22 @@ const { name, productName } = require('../package.json')
 const args = process.argv
 
 let targets
-var platform = os.platform()
+const platform = os.platform()
+const cpus = os.cpus()
 
-if (platform == 'darwin') {
-  targets = Platform.MAC.createTarget()
-} else if (platform == 'win32') {
+if (platform === 'darwin') {
+  let arch = Arch.x64
+
+// Macbook Air 2020 with M1 = 'Apple M1'
+  // Macbook Pro 2021 with M1 Pro = 'Apple M1 Pro'
+  if (cpus[0].model.startsWith('Apple')) {
+    arch = Arch.arm64
+  }
+
+  targets = Platform.MAC.createTarget(['dmg'], arch)
+} else if (platform === 'win32') {
   targets = Platform.WINDOWS.createTarget()
-} else if (platform == 'linux') {
+} else if (platform === 'linux') {
   let arch = Arch.x64
 
   if (args[2] === 'arm64') {

_scripts/dev-runner.js

@@ -115,17 +115,20 @@ function startRenderer(callback) {
     console.log(`\nWatching file changes for ${name} script...`)
   })
 
-  const server = new WebpackDevServer(compiler, {
+  const server = new WebpackDevServer({
     static: {
       directory: path.join(process.cwd(), 'static'),
       watch: {
-        ignored: /(dashFiles|storyboards)\/*/
+        ignored: [
+          /(dashFiles|storyboards)\/*/,
+          '/**/.DS_Store',
+        ]
       }
     },
     port
-  })
+  }, compiler)
 
-  server.listen(port, '', err => {
+  server.startCallback(err => {
     if (err) console.error(err)
 
     callback()

_scripts/webpack.main.config.js

@@ -49,7 +49,7 @@ const config = {
     path: path.join(__dirname, '../dist'),
   },
   resolve: {
-    extensions: ['.ts', '.js', '.json'],
+    extensions: ['.js', '.json'],
     alias: {
       '@': path.join(__dirname, '../src/'),
       src: path.join(__dirname, '../src/'),

_scripts/webpack.renderer.config.js

@@ -138,7 +138,7 @@ const config = {
       images: path.join(__dirname, '../src/renderer/assets/img/'),
       static: path.join(__dirname, '../static/'),
     },
-    extensions: ['.ts', '.js', '.vue', '.json'],
+    extensions: ['.js', '.vue', '.json'],
   },
   target: 'electron-renderer',
 }

_scripts/webpack.workers.config.js

@@ -15,7 +15,7 @@ const config = {
   mode: process.env.NODE_ENV,
   devtool: isDevMode ? 'eval-cheap-module-source-map' : false,
   entry: {
-    workerSample: path.join(__dirname, '../src/utilities/workerSample.ts'),
+    workerSample: path.join(__dirname, '../src/utilities/workerSample.js'),
   },
   output: {
     libraryTarget: 'commonjs2',
@@ -52,7 +52,7 @@ const config = {
       '@': path.join(__dirname, '../src/'),
       src: path.join(__dirname, '../src/'),
     },
-    extensions: ['.ts', '.js', '.json'],
+    extensions: ['.js', '.json'],
   },
   target: 'node',
 }

package.json

@@ -2,7 +2,7 @@
   "name": "freetube",
   "productName": "FreeTube",
   "description": "A private YouTube client",
-  "version": "0.16.0",
+  "version": "0.17.0",
   "license": "AGPL-3.0-or-later",
   "main": "./dist/main.js",
   "private": true,
@@ -30,23 +30,18 @@
     "debug-runner": "node _scripts/dev-runner.js --remote-debug",
     "dev": "run-s rebuild:electron dev-runner",
     "dev-runner": "node _scripts/dev-runner.js",
-    "jest": "jest",
-    "jest:coverage": "jest --collect-coverage",
-    "jest:watch": "jest --watch",
-    "lint-fix": "eslint --fix --ext .js,.ts,.vue ./",
-    "lint": "eslint --ext .js,.ts,.vue ./",
+    "lint-fix": "eslint --fix --ext .js,.vue ./",
+    "lint": "eslint --ext .js,.vue ./",
     "pack": "run-p pack:main pack:renderer pack:workers",
     "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:web": "webpack --mode=production --node-env=production --config _scripts/webpack.web.config.js",
     "pack:workers": "webpack --mode=production --node-env=production --config _scripts/webpack.workers.config.js",
     "postinstall": "npm run rebuild:electron",
-    "prettier": "prettier --write \"{src,_scripts}/**/*.{js,ts,vue}\"",
+    "prettier": "prettier --write \"{src,_scripts}/**/*.{js,vue}\"",
     "rebuild:electron": "electron-builder install-app-deps",
     "rebuild:node": "npm rebuild",
     "release": "run-s test build",
-    "test": "run-s rebuild:node pack:workers jest",
-    "test:watch": "run-s rebuild:node pack:workers jest:watch",
     "ci": "yarn install --frozen-lockfile"
   },
   "dependencies": {
@@ -55,60 +50,48 @@
     "@fortawesome/free-solid-svg-icons": "^5.15.4",
     "@fortawesome/vue-fontawesome": "^2.0.2",
     "@freetube/youtube-chat": "^1.1.2",
-    "@freetube/yt-comment-scraper": "^6.0.0",
+    "@freetube/yt-comment-scraper": "^6.1.0",
     "@silvermine/videojs-quality-selector": "^1.2.5",
-    "autolinker": "^3.14.3",
-    "bulma-pro": "^0.2.0",
-    "dateformat": "^4.5.1",
-    "electron-context-menu": "^3.1.1",
+    "autolinker": "^3.15.0",
+    "electron-context-menu": "^3.1.2",
     "http-proxy-agent": "^4.0.1",
     "https-proxy-agent": "^5.0.0",
     "jquery": "^3.6.0",
     "js-yaml": "^4.1.0",
     "lodash.debounce": "^4.0.8",
     "lodash.isequal": "^4.5.0",
-    "lodash.uniqwith": "^4.5.0",
-    "marked": "^4.0.10",
-    "material-design-icons": "^3.0.1",
+    "marked": "^4.0.15",
     "nedb-promises": "^5.0.1",
-    "node-forge": "^1.0.0",
     "opml-to-json": "^1.0.1",
     "rss-parser": "^3.12.0",
     "socks-proxy-agent": "^6.0.0",
-    "video.js": "7.14.3",
-    "videojs-abloop": "^1.2.0",
+    "video.js": "7.18.1",
     "videojs-contrib-quality-levels": "^2.1.0",
     "videojs-http-source-selector": "^1.1.6",
     "videojs-overlay": "^2.1.4",
-    "videojs-replay": "^1.1.0",
     "videojs-vtt-thumbnails-freetube": "0.0.15",
     "vue": "^2.6.14",
-    "vue-electron": "^1.0.6",
     "vue-i18n": "^8.25.0",
     "vue-observe-visibility": "^1.0.0",
     "vue-router": "^3.5.2",
     "vuex": "^3.6.2",
     "youtube-suggest": "^1.1.2",
-    "yt-channel-info": "^2.2.0",
+    "yt-channel-info": "^3.0.4",
     "yt-dash-manifest-generator": "1.1.0",
     "yt-trending-scraper": "^2.0.1",
-    "ytdl-core": "^4.10.1",
-    "ytpl": "^2.2.3",
-    "ytsr": "^3.5.3"
+    "ytdl-core": "^4.11.0",
+    "ytpl": "^2.3.0",
+    "ytsr": "^3.8.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.15.0",
-    "@babel/plugin-proposal-class-properties": "^7.14.5",
-    "@babel/plugin-proposal-object-rest-spread": "^7.14.7",
-    "@babel/preset-env": "^7.15.0",
-    "@babel/preset-typescript": "^7.15.0",
-    "@typescript-eslint/eslint-plugin": "^4.30.0",
-    "@typescript-eslint/parser": "^4.30.0",
+    "@babel/core": "^7.17.10",
+    "@babel/plugin-proposal-class-properties": "^7.16.7",
+    "@babel/preset-env": "^7.17.10",
     "babel-eslint": "^10.1.0",
-    "babel-loader": "^8.2.2",
+    "babel-loader": "^8.2.5",
     "copy-webpack-plugin": "^9.0.1",
     "css-loader": "5.2.6",
-    "electron": "^16.0.8",
+    "electron": "^16.2.7",
     "electron-builder": "^22.11.7",
     "electron-builder-squirrel-windows": "^22.13.1",
     "electron-debug": "^3.2.0",
@@ -124,7 +107,6 @@
     "fast-glob": "^3.2.7",
     "file-loader": "^6.2.0",
     "html-webpack-plugin": "^5.3.2",
-    "jest": "^27.1.0",
     "mini-css-extract-plugin": "^2.2.2",
     "node-abi": "^2.30.1",
     "node-loader": "^2.0.0",
@@ -135,7 +117,6 @@
     "sass-loader": "^12.1.0",
     "style-loader": "^3.2.1",
     "tree-kill": "1.2.2",
-    "typescript": "^4.4.2",
     "url-loader": "^4.1.1",
     "vue-devtools": "^5.1.4",
     "vue-eslint-parser": "^7.10.0",