Merge branch 'development'

Author: PrestonN

.eslintrc.js

@@ -11,35 +11,72 @@ module.exports = {
   // https://eslint.org/docs/user-guide/configuring#specifying-parser
   parser: 'vue-eslint-parser',
 
-  // https://vuejs.github.io/eslint-plugin-vue/user-guide/#faq
+  // https://eslint.vuejs.org/user-guide/#faq
   parserOptions: {
-    parser: 'babel-eslint',
-    ecmaVersion: 2018,
+    parser: '@babel/eslint-parser',
+    ecmaVersion: 2022,
     sourceType: 'module'
   },
 
+  overrides: [
+    {
+      files: ['*.json'],
+      parser: 'jsonc-eslint-parser',
+      extends: ['plugin:jsonc/base'],
+      rules: {
+        'no-tabs': 'off',
+        'comma-spacing': 'off'
+      }
+    },
+    {
+      files: ['*.yaml', '*.yml'],
+      parser: 'yaml-eslint-parser',
+      extends: ['plugin:yml/recommended'],
+      rules: {
+        'yml/no-irregular-whitespace': 'off'
+      }
+    }
+  ],
+
   // https://eslint.org/docs/user-guide/configuring#extending-configuration-files
   // order matters: from least important to most important in terms of overriding
   // Prettier + Vue: https://medium.com/@gogl.alex/how-to-properly-set-up-eslint-with-prettier-for-vue-or-nuxt-in-vscode-e42532099a9c
   extends: [
     'prettier',
     'eslint:recommended',
     'plugin:vue/recommended',
-    'standard'
+    'standard',
+    'plugin:jsonc/recommended-with-json',
+    'plugin:vuejs-accessibility/recommended'
   ],
 
   // https://eslint.org/docs/user-guide/configuring#configuring-plugins
-  plugins: ['vue'],
+  plugins: ['vue', 'vuejs-accessibility', 'n', 'unicorn'],
 
   rules: {
     'space-before-function-paren': 'off',
-    'comma-dangle': ['error', 'never'],
+    'comma-dangle': ['error', 'only-multiline'],
     'vue/no-v-html': 'off',
     'no-console': ['error', { allow: ['warn', 'error'] }],
     'no-unused-vars': 'warn',
     'no-undef': 'warn',
+    'object-shorthand': 'off',
     'vue/no-template-key': 'warn',
     'vue/no-useless-template-attributes': 'off',
-    'vue/multi-word-component-names': 'off'
+    'vue/multi-word-component-names': 'off',
+    'vuejs-accessibility/no-onchange': 'off',
+    'vuejs-accessibility/label-has-for': ['error', {
+      required: {
+        some: ['nesting', 'id']
+      }
+    }],
+    'vuejs-accessibility/no-static-element-interactions': 'off',
+    'n/no-callback-literal': 'warn',
+    'n/no-path-concat': 'warn',
+    'unicorn/better-regex': 'error',
+    'unicorn/no-array-push-push': 'error',
+    'unicorn/prefer-keyboard-event-key': 'error',
+    'unicorn/prefer-regexp-test': 'error',
+    'unicorn/prefer-string-replace-all': 'error'
   }
 }

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -1,7 +1,7 @@
 name: Bug Report
 description: Report an issue or unexpected behavior that occurs within the application
 title: "[Bug]: "
-labels: "bug"
+labels: ["bug"]
 body:
   - type: markdown
     attributes:
@@ -14,11 +14,15 @@ body:
       description: Please ensure you've completed all of the following.
       options:
         - label: I have encountered this bug in the [latest release of FreeTube](https://github.com/FreeTubeApp/FreeTube/releases).
-          required: true  
-        - label: I have searched the [issue tracker](https://github.com/FreeTubeApp/FreeTube/issues) for open and closed issues that are similar to the bug report I want to file, without success.
+          required: true
+        - label: I have encountered this bug in the [official downloads of FreeTube](https://github.com/FreeTubeApp/FreeTube#official-downloads).
+          required: true
+        - label: I have searched the issue tracker for [open](https://github.com/FreeTubeApp/FreeTube/issues?q=is%3Aopen+is%3Aissue) and [closed](https://github.com/FreeTubeApp/FreeTube/issues?q=is%3Aissue+is%3Aclosed) issues that are similar to the bug report 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
+        - label: This issue contains only one bug.
+          required: true
   - type: textarea
     attributes:
       label: Describe the bug
@@ -29,7 +33,7 @@ body:
           3. Scroll down to '....'
           4. See error
     validations:
-      required: true   
+      required: true
   - type: textarea
     attributes:
       label: Expected Behavior
@@ -77,7 +81,8 @@ body:
     attributes:
       label: Installation Method
       options:
-        - .apk
+        - .apk (Alpine Linux Package)
+        - .apk (Android, FreeTubeCordova)
         - .AppImage
         - AUR
         - Chocolatey
@@ -86,18 +91,20 @@ body:
         - .exe
         - Flathub
         - MPR
+        - Nix
         - .pacman
         - Portable
         - PortableApps
         - .rpm
         - Scoop
+        - Snapcraft
         - winget
         - .zip
         - other
     validations:
       required: true
   - type: dropdown
-    attributes: 
+    attributes:
       label: Primary API used
       description: What is the primary API being used?
       multiple: false

.github/ISSUE_TEMPLATE/feature_request.yaml

@@ -13,10 +13,12 @@ body:
       label: Guidelines
       description: Please ensure you've completed all of the following.
       options:
-          - label: I have searched the [issue tracker](https://github.com/FreeTubeApp/FreeTube/issues) for open and closed issues that are similar to the feature request I want to file, without success.
+          - label: I have searched the issue tracker for [open](https://github.com/FreeTubeApp/FreeTube/issues?q=is%3Aopen+is%3Aissue) and [closed](https://github.com/FreeTubeApp/FreeTube/issues?q=is%3Aissue+is%3Aclosed) issues that are similar to the feature request 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
+          - label: This issue contains only one feature request.
+            required: true
   - type: textarea
     attributes:
       label: Problem Description

.github/dependabot.yml

@@ -7,6 +7,7 @@ updates:
     labels:
       - "PR: waiting for review"
       - "PR: dependencies"
+    open-pull-requests-limit: 15
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:

.github/workflows/autoLabelDuplicate.yml

@@ -7,8 +7,10 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-      - uses: Amwam/[email protected]
+      - name: Check Comment Author
+        if: github.event.comment.author_association == 'MEMBER' || github.event.comment.author_association == 'OWNER' 
+        uses: Amwam/[email protected]
         with:
-          keywords: '["duplicate of"]'
+          keywords: '["duplicate of #", "duplicate of https://github.com/FreeTubeApp/FreeTube/issues/", "duplicate of https://github.com/FreeTubeApp/FreeTube/pulls/"]'
           labels: '["U: duplicate"]'
           github-token: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/autoLabelIssue.yaml

@@ -9,15 +9,15 @@ jobs:
     steps:
       - uses: Naturalclar/[email protected]
         with:
-          body: "both"
+          title-or-body: "body"
           parameters: >-
             [
               {
                 "keywords": ["visual bug"],
                 "labels": ["B: visual"]
               },
               {
-                "keywords": ["AUR", "Chocolatey", "PortableApps", "winget", "Scoop", "MPR"],
+                "keywords": ["AUR", "Chocolatey", "FreeTubeCordova", "PortableApps", "winget", "Scoop", "Snapcraft", "MPR", "Nix"],
                 "labels": ["B: Unofficial Download"]
               },
               {

.github/workflows/autoMerge.yml

@@ -1,15 +1,15 @@
 name: Auto Merge PR
 on:
   pull_request_target:
-    types: [opened, synchronize, reopened, auto_merge_disabled]
+    types: [opened, synchronize, reopened, auto_merge_disabled, ready_for_review]
 
 jobs:
   build:
     runs-on: ubuntu-latest
 
     steps:
     - name: Auto Merge PR
-      if: contains(${{ github.event.pull_request.base.ref }}, 'development') || contains(${{ github.event.pull_request.base.ref }}, 'RC')
+      if: ${{ !github.event.pull_request.draft && (contains(github.event.pull_request.base.ref, 'development') || contains(github.event.pull_request.base.ref, 'RC')) }}
       run: |
         echo ${{ secrets.PUSH_TOKEN }} >> auth.txt
         gh auth login --with-token < auth.txt

.github/workflows/build.yml

@@ -12,7 +12,7 @@ jobs:
   build:
     strategy:
       matrix:
-        node-version: [16.x]
+        node-version: [18.x]
         runtime:
           - linux-x64
           - linux-armv7l
@@ -57,7 +57,7 @@ jobs:
     - run: yarn run ci
     - run: yarn run lint
     - name: Get Version Number
-      uses: nyaayaya/package-version@v1
+      uses: jozsefsallai/node-package-version@v1.0.4
       with:
         path: 'package.json'
         follow-symlinks: false
@@ -84,7 +84,7 @@ jobs:
         # script: if ${{ env.IS_DEV }} then echo "::set-output name=VERSION_NUMBER::${{ env.VERSION_NUMBER_NIGHTLY }}" else echo "::set-output name=VERSION_NUMBER::${{ env.VERSION_NUMBER }}" fi
 
     - name: Update package.json version
-      uses: jossef/action-set-json-field@v2
+      uses: jossef/action-set-json-field@v2.1
       with:
         file: package.json
         field: version

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

@@ -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@v4
+        uses: peter-evans/create-pull-request@v5
         with:
           title: Compressed Images Nightly
           branch-suffix: timestamp

.github/workflows/conflicts.yml

@@ -7,9 +7,6 @@ on:
   # In `pull_request` we wouldn't be able to change labels of fork PRs
   pull_request_target:
     types: [synchronize]
-  workflow_run:
-    workflows: ['Dummy workflow for conflicts']
-    types: [requested]
 
 jobs:
   main:
@@ -23,3 +20,4 @@ jobs:
           repoToken: "${{ secrets.GITHUB_TOKEN }}"
           commentOnDirty: "This pull request has conflicts, please resolve those before we can evaluate the pull request."
           commentOnClean: "Conflicts have been resolved. A maintainer will review the pull request shortly."
+

.github/workflows/dummy-conflicts.yml

@@ -77,13 +77,25 @@ jobs:
         date +"%Y-%m-%d" >> $GITHUB_ENV
         echo 'EOF' >> $GITHUB_ENV
     - name: Update x64 File Location in yml File
-      run: yq w -i io.freetubeapp.FreeTube.yml 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'
+      uses: mikefarah/[email protected]
+      with:
+        # The Command which should be run
+        cmd: yq w -i io.freetubeapp.FreeTube.yml 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'
     - name: Update x64 Hash in yml File
-      run: yq w -i io.freetubeapp.FreeTube.yml modules[0].sources[0].sha256 ${{ env.HASH_X64 }}
+      uses: mikefarah/[email protected]
+      with:
+        # The Command which should be run
+        cmd: yq w -i io.freetubeapp.FreeTube.yml modules[0].sources[0].sha256 ${{ env.HASH_X64 }}
     - name: Update ARM File Location in yml File
-      run: yq w -i io.freetubeapp.FreeTube.yml 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'
+      uses: mikefarah/[email protected]
+      with:
+        # The Command which should be run
+        cmd: yq w -i io.freetubeapp.FreeTube.yml 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'
     - name: Update ARM Hash in yml File
-      run: yq w -i io.freetubeapp.FreeTube.yml modules[0].sources[1].sha256 ${{ env.HASH_ARM64 }}
+      uses: mikefarah/[email protected]
+      with:
+        # The Command which should be run
+        cmd: yq w -i io.freetubeapp.FreeTube.yml modules[0].sources[1].sha256 ${{ env.HASH_ARM64 }}
     - name: Add Patch Notes to XML File
       run: xmlstarlet ed -L -i /application/releases/release[1] -t elem -n releaseTMP -v "" -i //releaseTMP -t attr -n version -v "${{ steps.sub.outputs.result }} Beta" -i //releaseTMP -t attr -n date -v "${{ env.CURRENT_DATE }}" -s //releaseTMP -t elem -n url -v "" -s //releaseTMP/url -t text -n "" -v "https://github.com/FreeTubeApp/FreeTube/releases/tag/v${{ steps.sub.outputs.result }}-beta" -r //releaseTMP -v "release" io.freetubeapp.FreeTube.metainfo.xml
     - name: Remove Release Files

.github/workflows/flatpak.yml

@@ -1,14 +1,15 @@
 name: "Pull Request Labeler"
 on:
   pull_request_target:
-    types: [opened, reopened]
+    types: [opened, reopened, ready_for_review]
 
 jobs:
   triage:
     permissions:
       contents: read
       pull-requests: write
     runs-on: ubuntu-latest
+    if: ${{ !github.event.pull_request.draft }}
     steps:
     - uses: actions/labeler@v4
       with:

.github/workflows/label-pr.yml

@@ -18,10 +18,10 @@ jobs:
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
     - uses: actions/checkout@v3
-    - name: Use Node.js 16.x
+    - name: Use Node.js 18.x
       uses: actions/setup-node@v3
       with:
-        node-version: 16.x
+        node-version: 18.x
         cache: "yarn"
     - run: yarn run ci
     - run: yarn run lint

.github/workflows/linter.yml

@@ -12,7 +12,7 @@ jobs:
   build:
     strategy:
       matrix:
-        node-version: [16.x]
+        node-version: [18.x]
         runtime:
           - linux-x64
           - linux-armv7l
@@ -58,7 +58,7 @@ jobs:
     - run: yarn run lint
 
     - name: Get Version Number
-      uses: nyaayaya/package-version@v1
+      uses: jozsefsallai/node-package-version@v1.0.4
       with:
         path: 'package.json'
         follow-symlinks: false