Merge branch 'development'

FreeTubeApp · Jun 20, 2024 · 3a33ece · 3a33ece
2 parents 54b49dc + 621617c
commit 3a33ece
Show file tree

Hide file tree

Showing 404 changed files with 10,497 additions and 6,167 deletions.
diff --git a/.babelrc b/.babelrc
@@ -4,8 +4,8 @@
       "@babel/env",
       {
         "targets": {
-          "chrome": "106",
-          "node": "16.16.0"
+          "chrome": "122",
+          "node": "20.9.0"
         }
       }
     ]

diff --git a/.eslintrc.js b/.eslintrc.js
@@ -1,3 +1,8 @@
+const path = require('path')
+const { readFileSync } = require('fs')
+
+const activeLocales = JSON.parse(readFileSync(path.join(__dirname, './static/locales/activeLocales.json')))
+
 module.exports = {
   // https://eslint.org/docs/user-guide/configuring#using-configuration-files-1
   root: true,
@@ -47,11 +52,12 @@ module.exports = {
     'plugin:vue/recommended',
     'standard',
     'plugin:jsonc/recommended-with-json',
-    'plugin:vuejs-accessibility/recommended'
+    'plugin:vuejs-accessibility/recommended',
+    'plugin:@intlify/vue-i18n/recommended'
   ],
 
   // https://eslint.org/docs/user-guide/configuring#configuring-plugins
-  plugins: ['vue', 'vuejs-accessibility', 'n', 'unicorn'],
+  plugins: ['vue', 'vuejs-accessibility', 'n', 'unicorn', '@intlify/vue-i18n'],
 
   rules: {
     'space-before-function-paren': 'off',
@@ -77,6 +83,45 @@ module.exports = {
     'unicorn/no-array-push-push': 'error',
     'unicorn/prefer-keyboard-event-key': 'error',
     'unicorn/prefer-regexp-test': 'error',
-    'unicorn/prefer-string-replace-all': 'error'
+    'unicorn/prefer-string-replace-all': 'error',
+    '@intlify/vue-i18n/no-dynamic-keys': 'error',
+    // TODO: enable at a later date. currently disabled to prevent massive conflicts for initial PR
+    // '@intlify/vue-i18n/no-unused-keys': [
+    //   'error',
+    //   {
+    //     extensions: ['.js', '.vue', 'yaml']
+    //   }
+    // ],
+    '@intlify/vue-i18n/no-duplicate-keys-in-locale': 'error',
+    '@intlify/vue-i18n/no-raw-text': [
+      'error',
+      {
+        attributes: {
+          '/.+/': [
+            'title',
+            'aria-label',
+            'aria-placeholder',
+            'aria-roledescription',
+            'aria-valuetext',
+            'tooltip',
+            'message'
+          ],
+          input: ['placeholder', 'value'],
+          img: ['alt']
+        },
+        ignoreText: ['-', '•', '/', 'YouTube', 'Invidious', 'FreeTube']
+      }
+    ],
+    // Only applicable when we upgrade to Vue 3 and vue-i18n 9+
+    '@intlify/vue-i18n/no-deprecated-tc': 'off',
+
+    'vue/require-explicit-emits': 'error',
+    'vue/no-unused-emit-declarations': 'error',
+  },
+  settings: {
+    'vue-i18n': {
+      localeDir: `./static/locales/{${activeLocales.join(',')}}.yaml`,
+      messageSyntaxVersion: '^8.0.0'
+    }
   }
 }
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -92,7 +92,7 @@ body:
         - Portable
         - .rpm
         - .zip
-        - .apk (Android, FreeTubeCordova Unofficial)
+        - .apk (FreeTubeAndroid Unofficial)
         - AUR (Unofficial)
         - Chocolatey (Unofficial)
         - Homebrew (Unofficial)

diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
@@ -8,7 +8,7 @@ contact_links:
     about: Ask and answer questions
   - name: Matrix Community
     url: https://matrix.to/#/+freetube:matrix.org
-    about: Join our Matrix chatroom - "Note: Bugs and Feature requests should be made on GitHub and not in the Matrix room"
+    about: 'Join our Matrix chatroom - "Note: Bugs and Feature requests should be made on GitHub and not in the Matrix room"'
   - name: Translate FreeTube
     url: https://hosted.weblate.org/engage/free-tube/
     about: Help translate FreeTube on Weblate

diff --git a/.github/issue-labeler.yml b/.github/issue-labeler.yml
@@ -2,7 +2,7 @@
     - '(visual bug)'
 
 'B: Unofficial Download':
-    - '(AUR \(Unofficial\)|Chocolatey \(Unofficial\)|\.apk \(Android, FreeTubeCordova Unofficial\)|Homebrew \(Unofficial\)|PortableApps \(Unofficial\)|WAPT \(Unofficial\)|winget \(Unofficial\)|Scoop \(Unofficial\)|Snapcraft \(Unofficial\)|MPR \(Unofficial\)|Nix \(Unofficial\))'
+    - '(AUR \(Unofficial\)|Chocolatey \(Unofficial\)|\.apk \(FreeTubeAndroid Unofficial\)|Homebrew \(Unofficial\)|PortableApps \(Unofficial\)|WAPT \(Unofficial\)|winget \(Unofficial\)|Scoop \(Unofficial\)|Snapcraft \(Unofficial\)|MPR \(Unofficial\)|Nix \(Unofficial\))'
 
 'B: keyboard control':
     - '(keyboard control not working)'

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -12,7 +12,7 @@ jobs:
   build:
     strategy:
       matrix:
-        node-version: [18.x]
+        node-version: [20.x]
         runtime:
           - linux-x64
           - linux-armv7l
@@ -57,20 +57,18 @@ jobs:
     - run: yarn run ci
     - run: yarn run lint
     - name: Get Version Number
-      uses: jozsefsallai/[email protected]
-      with:
-        path: 'package.json'
-        follow-symlinks: false
+      id: getPackageInfo
+      uses: jaywcjlove/github-action-package@main
 
     - name: Set Version Number Variable
       id: versionNumber
       uses: actions/github-script@v7
       env:
         IS_DEV: ${{ contains(github.ref, 'development') }}
         IS_RC: ${{ contains(github.ref, 'RC') }}
-        VERSION_NUMBER_NIGHTLY: ${{ env.PACKAGE_VERSION }}-nightly-${{ github.run_number }}
-        VERSION_NUMBER_RC: ${{ env.PACKAGE_VERSION }}-RC-${{ github.run_number }}
-        VERSION_NUMBER: ${{ env.PACKAGE_VERSION }}
+        VERSION_NUMBER_NIGHTLY: ${{ steps.getPackageInfo.outputs.version }}-nightly-${{ github.run_number }}
+        VERSION_NUMBER_RC: ${{ steps.getPackageInfo.outputs.version }}-RC-${{ github.run_number }}
+        VERSION_NUMBER: ${{ steps.getPackageInfo.outputs.version }}
       with:
         result-encoding: string
         script: |
@@ -79,16 +77,14 @@ jobs:
           } else if (${{ env.IS_RC }}) {
             return "${{ env.VERSION_NUMBER_RC }}"
           } else {
-           return "${{env.VERSION_NUMBER }}"
+            return "${{env.VERSION_NUMBER }}"
           }
         # 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-[email protected]
+      uses: jaywcjlove/github-action-package@main
       with:
-        file: package.json
-        field: version
-        value: ${{ steps.versionNumber.outputs.result }}
+        version: ${{ steps.versionNumber.outputs.result }}
 
 
     - name: Install libarchive-tools

diff --git a/.github/workflows/conflicts.yml b/.github/workflows/conflicts.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: check if prs are dirty
-        uses: eps1lon/actions-label-merge-conflict@releases/2.x
+        uses: eps1lon/actions-label-merge-conflict@v3
         with:
           dirtyLabel: "PR: merge conflicts / rebase needed"
           removeOnDirtyLabel: "PR: waiting for review"

diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml
@@ -77,25 +77,25 @@ jobs:
         date +"%Y-%m-%d" >> $GITHUB_ENV
         echo 'EOF' >> $GITHUB_ENV
     - name: Update x64 File Location in yml File
-      uses: mikefarah/yq@4.0.0-beta1
+      uses: mikefarah/yq@v4.44.2
       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'
+        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@4.0.0-beta1
+      uses: mikefarah/yq@v4.44.2
       with:
         # The Command which should be run
-        cmd: yq w -i io.freetubeapp.FreeTube.yml modules[0].sources[0].sha256 ${{ env.HASH_X64 }}
+        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@4.0.0-beta1
+      uses: mikefarah/yq@v4.44.2
       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'
+        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@4.0.0-beta1
+      uses: mikefarah/yq@v4.44.2
       with:
         # The Command which should be run
-        cmd: yq w -i io.freetubeapp.FreeTube.yml modules[0].sources[1].sha256 ${{ env.HASH_ARM64 }}
+        cmd: yq -i '.modules[0].sources[1].sha256 = "${{ env.HASH_ARM64 }}"' io.freetubeapp.FreeTube.yml
     - 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

diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
@@ -18,10 +18,14 @@ jobs:
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
     - uses: actions/checkout@v4
-    - name: Use Node.js 18.x
+    - name: Use Node.js 20.x
       uses: actions/setup-node@v4
       with:
-        node-version: 18.x
+        node-version: 20.x
         cache: "yarn"
     - run: yarn run ci
     - run: yarn run lint
+    # let's verify that webpack is able to package the project
+    - run: yarn run pack
+    # verify that webpack is able to package the project using the web config
+    - run: yarn run pack:web