Skip to content

Commit

Permalink
Merge branch 'development' of github.com:FreeTubeApp/FreeTube into fi…
Browse files Browse the repository at this point in the history
…x-filter-accessibility
  • Loading branch information
kommunarr committed Apr 18, 2024
2 parents b136e15 + 27eecb9 commit 752b475
Show file tree
Hide file tree
Showing 414 changed files with 29,467 additions and 10,574 deletions.
4 changes: 2 additions & 2 deletions .babelrc
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"@babel/env",
{
"targets": {
"chrome": "106",
"node": "16.16.0"
"chrome": "122",
"node": "20.9.0"
}
}
]
Expand Down
48 changes: 45 additions & 3 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -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,
Expand Down Expand Up @@ -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',
Expand All @@ -77,6 +83,42 @@ 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']
}
],
'vue/require-explicit-emits': 'error',
'vue/no-unused-emit-declarations': 'error',
},
settings: {
'vue-i18n': {
localeDir: `./static/locales/{${activeLocales.join(',')}}.yaml`,
messageSyntaxVersion: '^8.0.0'
}
}
}
21 changes: 12 additions & 9 deletions .github/ISSUE_TEMPLATE/bug_report.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -80,26 +80,29 @@ body:
- type: dropdown
attributes:
label: Installation Method
description: When you select an unofficial installation method, you must have verified that the bug is also present in one of the official installation methods. Please make sure you uninstall the unofficial installation before installing one of the official installations. If you can't reproduce this in one of the official installation methods, you should report the bug to the maintainer of the unofficial installation method you used.
options:
- .apk (Alpine Linux Package)
- .apk (Android, FreeTubeCordova)
- .AppImage
- AUR
- Chocolatey
- .deb
- .dmg
- .exe
- Flathub
- MPR
- Nix
- .pacman
- Portable
- PortableApps
- .rpm
- Scoop
- Snapcraft
- winget
- .zip
- .apk (FreeTubeAndroid Unofficial)
- AUR (Unofficial)
- Chocolatey (Unofficial)
- Homebrew (Unofficial)
- MPR (Unofficial)
- Nix (Unofficial)
- PortableApps (Unofficial)
- Scoop (Unofficial)
- Snapcraft (Unofficial)
- WAPT (Unofficial)
- winget (Unofficial)
- other
validations:
required: true
Expand Down
16 changes: 16 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1 +1,17 @@
blank_issues_enabled: false
contact_links:
- name: Discussions
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
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"'
- name: Translate FreeTube
url: https://hosted.weblate.org/engage/free-tube/
about: Help translate FreeTube on Weblate
- name: FreeTube Documentation
url: https://docs.freetubeapp.io/
about: View the Documentation to find all relevant information about FreeTube
21 changes: 21 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,27 @@ updates:
- "PR: waiting for review"
- "PR: dependencies"
open-pull-requests-limit: 15
groups:
babel:
patterns:
- "@babel/*"
- "babel-*"
eslint:
patterns:
- "eslint"
- "eslint-*"
- "yaml-eslint-parser"
- "vue-eslint-parser"
stylelint:
patterns:
- "stylelint"
- "stylelint-*"
- "postcss"
- "postcss-*"
- "@double-great/stylelint-a11y"
fortawesome:
patterns:
- "@fortawesome/*"
- package-ecosystem: "github-actions"
directory: "/"
schedule:
Expand Down
65 changes: 65 additions & 0 deletions .github/issue-labeler.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
'B: visual':
- '(visual bug)'

'B: Unofficial Download':
- '(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)'

'B: text/string':
- '(text/string issue)'

'B: content not loading':
- '(content not loading)'

'B: accessibility':
- '(accessibility issue)'

'B: usability':
- '(usability issue)'

'B: crash':
- '(causes crash)'

'B: feature stopped working':
- '(feature stopped working)'

'B: inconsistent behavior':
- '(inconsistent behavior)'

'B: data loss':
- '(data loss)'

'B: race condition':
- '(race condition)'

'B: API issue':
- '(API issue)'

'B: developer mode':
- '(only happens in developer mode)'

'E: improvement existing feature':
- '(improvement to existing feature)'

'E: new optional setting':
- '(new optional setting)'

'E: visual improvement':
- '(visual improvement)'

'E: display more information':
- '(display more information to user)'

'E: ease of use improvement':
- '(ease of use improvement)'

'E: support external software':
- '(support for external software)'

'E: new feature':
- '(new feature)'

'E: keyboard shortcut':
- '(new keyboard shortcut)'
19 changes: 0 additions & 19 deletions .github/labeler.yml

This file was deleted.

8 changes: 8 additions & 0 deletions .github/pr-labeler.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
'PR: waiting for review':
- changed-files:
- any-glob-to-any-file: '**'

'PR: dependencies':
- any:
- changed-files:
- any-glob-to-any-file: ['yarn.lock', 'package.json']
2 changes: 1 addition & 1 deletion .github/workflows/autoLabelDuplicate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ on:

jobs:
test:
if: github.event.comment.author_association == 'MEMBER' || github.event.comment.author_association == 'OWNER'
runs-on: ubuntu-latest
steps:
- name: Check Comment Author
if: github.event.comment.author_association == 'MEMBER' || github.event.comment.author_association == 'OWNER'
uses: Amwam/issue-comment-action@v1.3.1
with:
keywords: '["duplicate of #", "duplicate of https://github.com/FreeTubeApp/FreeTube/issues/", "duplicate of https://github.com/FreeTubeApp/FreeTube/pulls/"]'
Expand Down
104 changes: 0 additions & 104 deletions .github/workflows/autoLabelIssue.yaml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/autoMerge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ on:

jobs:
build:
if: ${{ !github.event.pull_request.draft && (contains(github.event.pull_request.base.ref, 'development') || contains(github.event.pull_request.base.ref, 'RC')) }}
runs-on: ubuntu-latest

steps:
- name: Auto Merge PR
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
Expand Down
Loading

0 comments on commit 752b475

Please sign in to comment.