Merge branch 'development' of https://github.com/FreeTubeApp/FreeTube into feat/add-full-width-layout

Author: pkrasicki

.babelrc

@@ -4,7 +4,7 @@
       "@babel/env",
       {
         "targets": {
-          "chrome": "122",
+          "chrome": "130",
           "node": "20.9.0"
         }
       }

.eslintignore

@@ -1,10 +1,10 @@
 blank_issues_enabled: false
 contact_links:
   - name: Discussions
-    url:  https://github.com/FreeTubeApp/FreeTube/discussions/categories/general
+    url: https://github.com/FreeTubeApp/FreeTube/discussions/categories/general
     about: View discussions or start one yourself
   - name: Questions
-    url:  https://github.com/FreeTubeApp/FreeTube/discussions/categories/q-a
+    url: https://github.com/FreeTubeApp/FreeTube/discussions/categories/q-a
     about: Ask and answer questions
   - name: Matrix Community
     url: https://matrix.to/#/+freetube:matrix.org

.eslintrc.js

@@ -34,7 +34,7 @@ body:
   - type: textarea
     attributes:
       label: Alternatives Considered
-      description: A clear and concise description of any alternative solutions or features you've considered. 
+      description: A clear and concise description of any alternative solutions or features you've considered.
     validations:
       required: true
   - type: dropdown

.github/ISSUE_TEMPLATE/config.yml

@@ -17,8 +17,10 @@ updates:
         patterns:
           - "eslint"
           - "eslint-*"
+          - "@eslint/*"
           - "yaml-eslint-parser"
           - "vue-eslint-parser"
+          - "neostandard"
       stylelint:
         patterns:
           - "stylelint"

.github/ISSUE_TEMPLATE/feature_request.yaml

@@ -20,9 +20,7 @@ jobs:
           - win-x64
           - win-arm64
           - osx-x64
-          # `osx-arm64` disabled due to "macOS gatekeeper"
-          # See details in https://github.com/FreeTubeApp/FreeTube/pull/2113
-          # - osx-arm64
+          - osx-arm64
         include:
         - runtime: linux-x64
           os: ubuntu-latest
@@ -36,8 +34,8 @@ jobs:
         - runtime: osx-x64
           os: macOS-latest
 
-#        - runtime: osx-arm64
-#          os: macOS-latest
+        - runtime: osx-arm64
+          os: macOS-latest
 
         - runtime: win-x64
           os: windows-latest
@@ -86,10 +84,9 @@ jobs:
       with:
         version: ${{ steps.versionNumber.outputs.result }}
 
-
     - name: Install libarchive-tools
       if: startsWith(matrix.os, 'ubuntu')
-      run: sudo apt -y install libarchive-tools; echo "Version Number ${{ toJson(job) }} ${{ toJson(needs) }}"
+      run: sudo apt update; sudo apt -y install libarchive-tools; echo "Version Number ${{ toJson(job) }} ${{ toJson(needs) }}"
 
     - name: Build x64 with Node.js ${{ matrix.node-version}}
       if: contains(matrix.runtime, 'x64')
@@ -103,6 +100,19 @@ jobs:
       if: contains(matrix.runtime, 'arm64')
       run: yarn run build:arm64
 
+    - name: Convert X64 AppImage to static runtime
+      if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64')
+      run: |
+        sudo apt install desktop-file-utils
+        cd build
+        appimage="FreeTube-${{ steps.versionNumber.outputs.result }}.AppImage"
+        wget "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage" -O ./appimagetool.AppImage
+        chmod +x ./"$appimage" ./appimagetool.AppImage
+        ./"$appimage" --appimage-extract && rm -f ./"$appimage"
+        ./appimagetool.AppImage --comp zstd --mksquashfs-opt -Xcompression-level --mksquashfs-opt 20 \
+          -n ./squashfs-root ./"$appimage"
+        rm -rf ./squashfs-root ./appimagetool.AppImage
+
     - name: Upload Linux .zip x64 Artifact
       uses: actions/upload-artifact@v4
       if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64')
@@ -301,12 +311,12 @@ jobs:
         name: freetube-${{ steps.versionNumber.outputs.result }}-mac-x64.dmg
         path: build/freetube-${{ steps.versionNumber.outputs.result }}.dmg
 
-#    - name: Upload Mac arm64 .dmg Artifact
-#      uses: actions/upload-artifact@v4
-#      if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-arm64')
-#      with:
-#        name: freetube-${{ steps.versionNumber.outputs.result }}-mac-arm64.dmg
-#        path: build/freetube-${{ steps.versionNumber.outputs.result }}-arm64.dmg
+    - name: Upload Mac arm64 .dmg Artifact
+      uses: actions/upload-artifact@v4
+      if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-arm64')
+      with:
+        name: freetube-${{ steps.versionNumber.outputs.result }}-mac-arm64.dmg
+        path: build/freetube-${{ steps.versionNumber.outputs.result }}-arm64.dmg
 
     - name: Upload Mac x64 .zip Artifact
       uses: actions/upload-artifact@v4
@@ -322,9 +332,16 @@ jobs:
         name: freetube-${{ steps.versionNumber.outputs.result }}-mac-x64.7z
         path: build/freetube-${{ steps.versionNumber.outputs.result }}-mac.7z
 
-#    - name: Upload Mac arm64 .zip Artifact
-#      uses: actions/upload-artifact@v4
-#      if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-arm64')
-#      with:
-#        name: freetube-${{ steps.versionNumber.outputs.result }}-mac-arm64.zip
-#        path: build/freetube-${{ steps.versionNumber.outputs.result }}-arm64-mac.zip
+    - name: Upload Mac arm64 .zip Artifact
+      uses: actions/upload-artifact@v4
+      if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-arm64')
+      with:
+        name: freetube-${{ steps.versionNumber.outputs.result }}-mac-arm64.zip
+        path: build/freetube-${{ steps.versionNumber.outputs.result }}-arm64-mac.zip
+
+    - name: Upload Mac arm64 .7z Artifact
+      uses: actions/upload-artifact@v4
+      if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-arm64')
+      with:
+        name: freetube-${{ steps.versionNumber.outputs.result }}-mac-arm64.7z
+        path: build/freetube-${{ steps.versionNumber.outputs.result }}-arm64-mac.7z

.github/dependabot.yml

@@ -37,11 +37,10 @@ jobs:
         # If you wish to specify custom queries, you can do so here or in a config file.
         # By default, queries listed here will override any specified in a config file.
         # Prefix the list here with "+" to use these queries and those in the config file.
-        
+
         # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
         # queries: security-extended,security-and-quality
 
-        
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
@@ -50,7 +49,7 @@ jobs:
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
 
-    #   If the Autobuild fails above, remove it and uncomment the following three lines. 
+    #   If the Autobuild fails above, remove it and uncomment the following three lines.
     #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
 
     # - run: |

.github/workflows/build.yml

@@ -20,4 +20,3 @@ 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/codeql.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/[email protected].3
+      uses: mikefarah/[email protected].6
       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/[email protected].3
+      uses: mikefarah/[email protected].6
       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/[email protected].3
+      uses: mikefarah/[email protected].6
       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/[email protected].3
+      uses: mikefarah/[email protected].6
       with:
         # The Command which should be run
         cmd: yq -i '.modules[0].sources[1].sha256 = "${{ env.HASH_ARM64 }}"' io.freetubeapp.FreeTube.yml

.github/workflows/conflicts.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:

.github/workflows/flatpak.yml

@@ -1,24 +1,24 @@
-name: No Response
-
-# Both `issue_comment` and `scheduled` event types are required for this Action
-# to work properly.
-on:
-  issue_comment:
-    types: [created]
-  schedule:
-    # Run daily at midnight.
-    - cron: '0 0 * * *'
-
-jobs:
-  noResponse:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: lee-dohm/[email protected]
-        with:
-          token: ${{ github.token }}
-          closeComment: >
-            This issue has been automatically closed because there has been no response to our request for more information from the original author. 
-            With only the information that is currently in the issue, we don't have enough information to take action. 
-            Please reach out if you have or find the answers we need so that we can investigate further.
-          daysUntilClose: 14
-          responseRequiredLabel: "U: Waiting for Response from Author"
+name: No Response
+
+# Both `issue_comment` and `scheduled` event types are required for this Action
+# to work properly.
+on:
+  issue_comment:
+    types: [created]
+  schedule:
+    # Run daily at midnight.
+    - cron: '0 0 * * *'
+
+jobs:
+  noResponse:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: lee-dohm/[email protected]
+        with:
+          token: ${{ github.token }}
+          closeComment: >
+            This issue has been automatically closed because there has been no response to our request for more information from the original author.
+            With only the information that is currently in the issue, we don't have enough information to take action.
+            Please reach out if you have or find the answers we need so that we can investigate further.
+          daysUntilClose: 7
+          responseRequiredLabel: "U: Waiting for Response from Author"