Skip to content

Commit 752b475

Browse files
committed
Merge branch 'development' of github.com:FreeTubeApp/FreeTube into fix-filter-accessibility
2 parents b136e15 + 27eecb9 commit 752b475

File tree

414 files changed

+29467
-10574
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

414 files changed

+29467
-10574
lines changed

.babelrc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
"@babel/env",
55
{
66
"targets": {
7-
"chrome": "106",
8-
"node": "16.16.0"
7+
"chrome": "122",
8+
"node": "20.9.0"
99
}
1010
}
1111
]

.eslintrc.js

Lines changed: 45 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
const path = require('path')
2+
const { readFileSync } = require('fs')
3+
4+
const activeLocales = JSON.parse(readFileSync(path.join(__dirname, './static/locales/activeLocales.json')))
5+
16
module.exports = {
27
// https://eslint.org/docs/user-guide/configuring#using-configuration-files-1
38
root: true,
@@ -47,11 +52,12 @@ module.exports = {
4752
'plugin:vue/recommended',
4853
'standard',
4954
'plugin:jsonc/recommended-with-json',
50-
'plugin:vuejs-accessibility/recommended'
55+
'plugin:vuejs-accessibility/recommended',
56+
'plugin:@intlify/vue-i18n/recommended'
5157
],
5258

5359
// https://eslint.org/docs/user-guide/configuring#configuring-plugins
54-
plugins: ['vue', 'vuejs-accessibility', 'n', 'unicorn'],
60+
plugins: ['vue', 'vuejs-accessibility', 'n', 'unicorn', '@intlify/vue-i18n'],
5561

5662
rules: {
5763
'space-before-function-paren': 'off',
@@ -77,6 +83,42 @@ module.exports = {
7783
'unicorn/no-array-push-push': 'error',
7884
'unicorn/prefer-keyboard-event-key': 'error',
7985
'unicorn/prefer-regexp-test': 'error',
80-
'unicorn/prefer-string-replace-all': 'error'
86+
'unicorn/prefer-string-replace-all': 'error',
87+
'@intlify/vue-i18n/no-dynamic-keys': 'error',
88+
// TODO: enable at a later date. currently disabled to prevent massive conflicts for initial PR
89+
// '@intlify/vue-i18n/no-unused-keys': [
90+
// 'error',
91+
// {
92+
// extensions: ['.js', '.vue', 'yaml']
93+
// }
94+
// ],
95+
'@intlify/vue-i18n/no-duplicate-keys-in-locale': 'error',
96+
'@intlify/vue-i18n/no-raw-text': [
97+
'error',
98+
{
99+
attributes: {
100+
'/.+/': [
101+
'title',
102+
'aria-label',
103+
'aria-placeholder',
104+
'aria-roledescription',
105+
'aria-valuetext',
106+
'tooltip',
107+
'message'
108+
],
109+
input: ['placeholder', 'value'],
110+
img: ['alt']
111+
},
112+
ignoreText: ['-', '•', '/', 'YouTube', 'Invidious', 'FreeTube']
113+
}
114+
],
115+
'vue/require-explicit-emits': 'error',
116+
'vue/no-unused-emit-declarations': 'error',
117+
},
118+
settings: {
119+
'vue-i18n': {
120+
localeDir: `./static/locales/{${activeLocales.join(',')}}.yaml`,
121+
messageSyntaxVersion: '^8.0.0'
122+
}
81123
}
82124
}

.github/ISSUE_TEMPLATE/bug_report.yaml

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -80,26 +80,29 @@ body:
8080
- type: dropdown
8181
attributes:
8282
label: Installation Method
83+
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.
8384
options:
8485
- .apk (Alpine Linux Package)
85-
- .apk (Android, FreeTubeCordova)
8686
- .AppImage
87-
- AUR
88-
- Chocolatey
8987
- .deb
9088
- .dmg
9189
- .exe
9290
- Flathub
93-
- MPR
94-
- Nix
9591
- .pacman
9692
- Portable
97-
- PortableApps
9893
- .rpm
99-
- Scoop
100-
- Snapcraft
101-
- winget
10294
- .zip
95+
- .apk (FreeTubeAndroid Unofficial)
96+
- AUR (Unofficial)
97+
- Chocolatey (Unofficial)
98+
- Homebrew (Unofficial)
99+
- MPR (Unofficial)
100+
- Nix (Unofficial)
101+
- PortableApps (Unofficial)
102+
- Scoop (Unofficial)
103+
- Snapcraft (Unofficial)
104+
- WAPT (Unofficial)
105+
- winget (Unofficial)
103106
- other
104107
validations:
105108
required: true

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,17 @@
11
blank_issues_enabled: false
2+
contact_links:
3+
- name: Discussions
4+
url: https://github.com/FreeTubeApp/FreeTube/discussions/categories/general
5+
about: View discussions or start one yourself
6+
- name: Questions
7+
url: https://github.com/FreeTubeApp/FreeTube/discussions/categories/q-a
8+
about: Ask and answer questions
9+
- name: Matrix Community
10+
url: https://matrix.to/#/+freetube:matrix.org
11+
about: 'Join our Matrix chatroom - "Note: Bugs and Feature requests should be made on GitHub and not in the Matrix room"'
12+
- name: Translate FreeTube
13+
url: https://hosted.weblate.org/engage/free-tube/
14+
about: Help translate FreeTube on Weblate
15+
- name: FreeTube Documentation
16+
url: https://docs.freetubeapp.io/
17+
about: View the Documentation to find all relevant information about FreeTube

.github/dependabot.yml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,27 @@ updates:
88
- "PR: waiting for review"
99
- "PR: dependencies"
1010
open-pull-requests-limit: 15
11+
groups:
12+
babel:
13+
patterns:
14+
- "@babel/*"
15+
- "babel-*"
16+
eslint:
17+
patterns:
18+
- "eslint"
19+
- "eslint-*"
20+
- "yaml-eslint-parser"
21+
- "vue-eslint-parser"
22+
stylelint:
23+
patterns:
24+
- "stylelint"
25+
- "stylelint-*"
26+
- "postcss"
27+
- "postcss-*"
28+
- "@double-great/stylelint-a11y"
29+
fortawesome:
30+
patterns:
31+
- "@fortawesome/*"
1132
- package-ecosystem: "github-actions"
1233
directory: "/"
1334
schedule:

.github/issue-labeler.yml

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
'B: visual':
2+
- '(visual bug)'
3+
4+
'B: Unofficial Download':
5+
- '(AUR \(Unofficial\)|Chocolatey \(Unofficial\)|\.apk \(FreeTubeAndroid Unofficial\)|Homebrew \(Unofficial\)|PortableApps \(Unofficial\)|WAPT \(Unofficial\)|winget \(Unofficial\)|Scoop \(Unofficial\)|Snapcraft \(Unofficial\)|MPR \(Unofficial\)|Nix \(Unofficial\))'
6+
7+
'B: keyboard control':
8+
- '(keyboard control not working)'
9+
10+
'B: text/string':
11+
- '(text/string issue)'
12+
13+
'B: content not loading':
14+
- '(content not loading)'
15+
16+
'B: accessibility':
17+
- '(accessibility issue)'
18+
19+
'B: usability':
20+
- '(usability issue)'
21+
22+
'B: crash':
23+
- '(causes crash)'
24+
25+
'B: feature stopped working':
26+
- '(feature stopped working)'
27+
28+
'B: inconsistent behavior':
29+
- '(inconsistent behavior)'
30+
31+
'B: data loss':
32+
- '(data loss)'
33+
34+
'B: race condition':
35+
- '(race condition)'
36+
37+
'B: API issue':
38+
- '(API issue)'
39+
40+
'B: developer mode':
41+
- '(only happens in developer mode)'
42+
43+
'E: improvement existing feature':
44+
- '(improvement to existing feature)'
45+
46+
'E: new optional setting':
47+
- '(new optional setting)'
48+
49+
'E: visual improvement':
50+
- '(visual improvement)'
51+
52+
'E: display more information':
53+
- '(display more information to user)'
54+
55+
'E: ease of use improvement':
56+
- '(ease of use improvement)'
57+
58+
'E: support external software':
59+
- '(support for external software)'
60+
61+
'E: new feature':
62+
- '(new feature)'
63+
64+
'E: keyboard shortcut':
65+
- '(new keyboard shortcut)'

.github/labeler.yml

Lines changed: 0 additions & 19 deletions
This file was deleted.

.github/pr-labeler.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
'PR: waiting for review':
2+
- changed-files:
3+
- any-glob-to-any-file: '**'
4+
5+
'PR: dependencies':
6+
- any:
7+
- changed-files:
8+
- any-glob-to-any-file: ['yarn.lock', 'package.json']

.github/workflows/autoLabelDuplicate.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ on:
55

66
jobs:
77
test:
8+
if: github.event.comment.author_association == 'MEMBER' || github.event.comment.author_association == 'OWNER'
89
runs-on: ubuntu-latest
910
steps:
1011
- name: Check Comment Author
11-
if: github.event.comment.author_association == 'MEMBER' || github.event.comment.author_association == 'OWNER'
1212
uses: Amwam/[email protected]
1313
with:
1414
keywords: '["duplicate of #", "duplicate of https://github.com/FreeTubeApp/FreeTube/issues/", "duplicate of https://github.com/FreeTubeApp/FreeTube/pulls/"]'

.github/workflows/autoLabelIssue.yaml

Lines changed: 0 additions & 104 deletions
This file was deleted.

.github/workflows/autoMerge.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ on:
55

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

1011
steps:
1112
- name: Auto Merge PR
12-
if: ${{ !github.event.pull_request.draft && (contains(github.event.pull_request.base.ref, 'development') || contains(github.event.pull_request.base.ref, 'RC')) }}
1313
run: |
1414
echo ${{ secrets.PUSH_TOKEN }} >> auth.txt
1515
gh auth login --with-token < auth.txt

0 commit comments

Comments
 (0)