Merge branch 'development' of github.com:FreeTubeApp/FreeTube into fe…

…at/hide-videos-containing-text
FreeTubeApp · Jan 4, 2024 · 1bbc75e · 1bbc75e
2 parents 1e4af02 + c40b4a6
commit 1bbc75e
Show file tree

Hide file tree

Showing 175 changed files with 6,630 additions and 2,630 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -90,16 +90,18 @@ body:
         - Flathub
         - .pacman
         - Portable
-        - .rpm 
+        - .rpm
         - .zip
         - .apk (Android, FreeTubeCordova Unofficial)
         - AUR (Unofficial)
         - Chocolatey (Unofficial)
+        - Homebrew (Unofficial)
         - MPR (Unofficial)
         - Nix (Unofficial)
         - PortableApps (Unofficial)
         - Scoop (Unofficial)
         - Snapcraft (Unofficial)
+        - WAPT (Unofficial)
         - winget (Unofficial)
         - other
     validations:

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

diff --git a/.github/pr-labeler.yml b/.github/pr-labeler.yml
@@ -1,19 +1,8 @@
 'PR: waiting for review':
-  - '*'  
-  - '.babelrc'        
-  - '.editorconfig'
-  - '.eslintignore'
-  - '.eslintrc.js'
-  - '.gitignore'
-  - '.prettierrc'       
-  - '.whitesource'       
-  - '.github/**/*'         
-  - '.vscode/**/*'          
-  - '_icons/**/*'          
-  - '_scripts/**/*'         
-  - 'src/**/*'          
-  - 'static/**/*'       
+- changed-files:
+  - any-glob-to-any-file: '**'
 
 'PR: dependencies':
-  - 'yarn.lock'
-  - 'package.json'
+- any:
+  - changed-files:
+    - any-glob-to-any-file: ['yarn.lock', 'package.json']
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -31,7 +31,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -45,7 +45,7 @@ jobs:
     # 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
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@v3
 
     # ℹ️ 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
@@ -58,6 +58,6 @@ jobs:
     #   ./location_of_script_within_repo/buildscript.sh
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3
       with:
         category: "/language:${{matrix.language}}"
diff --git a/.github/workflows/label-pr.yml b/.github/workflows/label-pr.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ !github.event.pull_request.draft }}
     steps:
-    - uses: actions/labeler@v4
+    - uses: actions/labeler@v5
       with:
         repo-token: "${{ secrets.GITHUB_TOKEN }}"
         configuration-path: .github/pr-labeler.yml
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
@@ -11,7 +11,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v8
+      - uses: actions/stale@v9
         with:
           stale-issue-message: 'This issue is stale because it has been open 28 days with no activity. Remove stale label or comment or this will be closed in 7 days.'
           stale-pr-message: 'This PR is stale because it has been open 28 days with no activity. Remove stale label or comment or this will be closed in 14 days.'

diff --git a/README.md b/README.md
@@ -89,6 +89,8 @@ These builds are maintained by the community. While they should be safe, downloa
 
 * FreeTubeCordova (FreeTube port for Android and PWA): [Download](https://github.com/MarmadileManteater/FreeTubeCordova/releases) and [Source Code](https://github.com/MarmadileManteater/FreeTubeCordova)
 
+* Homebrew Formulae (Mac only): [Download](https://formulae.brew.sh/cask/freetube)
+
 * makedeb Package Repository (MPR): [Download](https://mpr.makedeb.org/packages/freetube-bin)
 
 * Nix Packages: [Download](https://search.nixos.org/packages?query=freetube)
@@ -99,6 +101,8 @@ These builds are maintained by the community. While they should be safe, downloa
 
 * Snap: [Download](https://snapcraft.io/freetube) and [Source Code](https://git.launchpad.net/freetube)
 
+* WAPT: [Download](https://wapt.tranquil.it/store/tis-freetube)
+
 * Windows Package Manager (winget): [Usage](https://docs.microsoft.com/en-us/windows/package-manager/winget/)
 
 ## Contributing

diff --git a/_scripts/build.js b/_scripts/build.js
@@ -1,9 +1,9 @@
 const os = require('os')
 const builder = require('electron-builder')
+const config = require('./ebuilder.config.js')
 
 const Platform = builder.Platform
 const Arch = builder.Arch
-const { name, productName } = require('../package.json')
 const args = process.argv
 
 let targets
@@ -39,97 +39,6 @@ if (platform === 'darwin') {
   targets = Platform.LINUX.createTarget(['deb', 'zip', '7z', 'apk', 'rpm', 'AppImage', 'pacman'], arch)
 }
 
-const config = {
-  appId: `io.freetubeapp.${name}`,
-  copyright: 'Copyleft © 2020-2023 [email protected]',
-  // asar: false,
-  // compression: 'store',
-  productName,
-  directories: {
-    output: './build/',
-  },
-  protocols: [
-    {
-      name: "FreeTube",
-      schemes: [
-        "freetube"
-      ]
-    }
-  ],
-  files: [
-    '_icons/iconColor.*',
-    'icon.svg',
-    './dist/**/*',
-    '!dist/web/*',
-    '!node_modules/**/*',
-  ],
-  dmg: {
-    contents: [
-      {
-        path: '/Applications',
-        type: 'link',
-        x: 410,
-        y: 230,
-      },
-      {
-        type: 'file',
-        x: 130,
-        y: 230,
-      },
-    ],
-    window: {
-      height: 380,
-      width: 540,
-    }
-  },
-  linux: {
-    category: 'Network',
-    icon: '_icons/icon.svg',
-    target: ['deb', 'zip', '7z', 'apk', 'rpm', 'AppImage', 'pacman'],
-  },
-  // See the following issues for more information
-  // https://github.com/jordansissel/fpm/issues/1503
-  // https://github.com/jgraph/drawio-desktop/issues/259
-  rpm: {
-    fpm: [`--rpm-rpmbuild-define=_build_id_links none`]
-  },
-  deb: {
-    depends: [
-      "libgtk-3-0",
-      "libnotify4",
-      "libnss3",
-      "libxss1",
-      "libxtst6",
-      "xdg-utils",
-      "libatspi2.0-0",
-      "libuuid1",
-      "libsecret-1-0"
-    ]
-  },
-  mac: {
-    category: 'public.app-category.utilities',
-    icon: '_icons/iconMac.icns',
-    target: ['dmg', 'zip', '7z'],
-    type: 'distribution',
-    extendInfo: {
-      CFBundleURLTypes: [
-        'freetube'
-      ],
-      CFBundleURLSchemes: [
-        'freetube'
-      ]
-    }
-  },
-  win: {
-    icon: '_icons/icon.ico',
-    target: ['nsis', 'zip', '7z', 'portable'],
-  },
-  nsis: {
-    allowToChangeInstallationDirectory: true,
-    oneClick: false,
-  },
-}
-
 builder
   .build({
     targets,

diff --git a/_scripts/ebuilder.config.js b/_scripts/ebuilder.config.js
@@ -0,0 +1,94 @@
+const { name, productName } = require('../package.json')
+
+const config = {
+  appId: `io.freetubeapp.${name}`,
+  copyright: 'Copyleft © 2020-2024 [email protected]',
+  // asar: false,
+  // compression: 'store',
+  productName,
+  directories: {
+    output: './build/',
+  },
+  protocols: [
+    {
+      name: "FreeTube",
+      schemes: [
+        "freetube"
+      ]
+    }
+  ],
+  files: [
+    '_icons/iconColor.*',
+    'icon.svg',
+    './dist/**/*',
+    '!dist/web/*',
+    '!node_modules/**/*',
+  ],
+  dmg: {
+    contents: [
+      {
+        path: '/Applications',
+        type: 'link',
+        x: 410,
+        y: 230,
+      },
+      {
+        type: 'file',
+        x: 130,
+        y: 230,
+      },
+    ],
+    window: {
+      height: 380,
+      width: 540,
+    }
+  },
+  linux: {
+    category: 'Network',
+    icon: '_icons/icon.svg',
+    target: ['deb', 'zip', '7z', 'apk', 'rpm', 'AppImage', 'pacman'],
+  },
+  // See the following issues for more information
+  // https://github.com/jordansissel/fpm/issues/1503
+  // https://github.com/jgraph/drawio-desktop/issues/259
+  rpm: {
+    fpm: [`--rpm-rpmbuild-define=_build_id_links none`]
+  },
+  deb: {
+    depends: [
+      "libgtk-3-0",
+      "libnotify4",
+      "libnss3",
+      "libxss1",
+      "libxtst6",
+      "xdg-utils",
+      "libatspi2.0-0",
+      "libuuid1",
+      "libsecret-1-0"
+    ]
+  },
+  mac: {
+    category: 'public.app-category.utilities',
+    icon: '_icons/iconMac.icns',
+    target: ['dmg', 'zip', '7z'],
+    type: 'distribution',
+    extendInfo: {
+      CFBundleURLTypes: [
+        'freetube'
+      ],
+      CFBundleURLSchemes: [
+        'freetube'
+      ]
+    }
+  },
+  win: {
+    icon: '_icons/icon.ico',
+    target: ['nsis', 'zip', '7z', 'portable'],
+  },
+  nsis: {
+    allowToChangeInstallationDirectory: true,
+    oneClick: false,
+  },
+}
+
+module.exports = config
diff --git a/_scripts/webpack.renderer.config.js b/_scripts/webpack.renderer.config.js
@@ -7,6 +7,7 @@ const MiniCssExtractPlugin = require('mini-css-extract-plugin')
 const CssMinimizerPlugin = require('css-minimizer-webpack-plugin')
 const ProcessLocalesPlugin = require('./ProcessLocalesPlugin')
 const WatchExternalFilesPlugin = require('webpack-watch-external-files-plugin')
+const CopyWebpackPlugin = require('copy-webpack-plugin')
 
 const isDevMode = process.env.NODE_ENV === 'development'
 
@@ -131,6 +132,18 @@ const config = {
       filename: isDevMode ? '[name].css' : '[name].[contenthash].css',
       chunkFilename: isDevMode ? '[id].css' : '[id].[contenthash].css',
     }),
+    new CopyWebpackPlugin({
+      patterns: [
+        {
+          from: path.join(__dirname, '../node_modules/swiper/modules/{a11y,navigation,pagination}-element.css').replaceAll('\\', '/'),
+          to: 'swiper.css',
+          context: path.join(__dirname, '../node_modules/swiper/modules'),
+          transformAll: (assets) => {
+            return Buffer.concat(assets.map(asset => asset.data))
+          }
+        }
+      ]
+    })
   ],
   resolve: {
     alias: {

diff --git a/_scripts/webpack.web.config.js b/_scripts/webpack.web.config.js
@@ -140,6 +140,18 @@ const config = {
     new MiniCssExtractPlugin({
       filename: isDevMode ? '[name].css' : '[name].[contenthash].css',
       chunkFilename: isDevMode ? '[id].css' : '[id].[contenthash].css',
+    }),
+    new CopyWebpackPlugin({
+      patterns: [
+        {
+          from: path.join(__dirname, '../node_modules/swiper/modules/{a11y,navigation,pagination}-element.css').replaceAll('\\', '/'),
+          to: 'swiper.css',
+          context: path.join(__dirname, '../node_modules/swiper/modules'),
+          transformAll: (assets) => {
+            return Buffer.concat(assets.map(asset => asset.data))
+          }
+        }
+      ]
     })
   ],
   resolve: {