Skip to content

Commit 215cc65

Browse files
committed
Merge branch 'development' into sabr-pika-2
* development: (192 commits) Translated using Weblate (Japanese) Fix scroll to seek/change volume/playback rate changing too fast with touchpad (FreeTubeApp#6666) Move General section within the Distraction Free Settings to top (FreeTubeApp#7719) Fix deleted videos appears when another video added to another playlist (FreeTubeApp#7681) Change Settings order (FreeTubeApp#7722) Migrate Subscriptions{Videos,Live,Shorts,Posts} to the composition API (FreeTubeApp#7717) Translated using Weblate (Romanian) Translated using Weblate (German) Migrate the FtToggleSwitch component to the composition API (FreeTubeApp#7740) Add missing FontAwesomeIcon imports to `<script setup>` components (FreeTubeApp#7739) Translated using Weblate (Spanish) Translated using Weblate (French) Translated using Weblate (Basque) Translated using Weblate (Chinese (Simplified Han script)) Translated using Weblate (Breton) Translated using Weblate (Estonian) Translated using Weblate (Italian) Translated using Weblate (Tamil) Translated using Weblate (Czech) Translated using Weblate (Hungarian) ... # Conflicts: # package.json # src/renderer/components/ft-shaka-video-player/ft-shaka-video-player.js # src/renderer/helpers/api/local.js # yarn.lock
2 parents 25f115e + b89a08d commit 215cc65

File tree

148 files changed

+9795
-12968
lines changed

Some content is hidden

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

148 files changed

+9795
-12968
lines changed

.babelrc

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,5 @@
99
}
1010
}
1111
]
12-
],
13-
"plugins": [
14-
"@babel/plugin-transform-class-properties"
1512
]
1613
}

.github/workflows/autoLabelDuplicate.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
runs-on: ubuntu-latest
1010
steps:
1111
- name: Check Comment Author
12-
uses: Amwam/issue-comment-action@v1.3.1
12+
uses: Amwam/issue-comment-action@v1.5.0
1313
with:
1414
keywords: '["duplicate of #", "duplicate of https://github.com/FreeTubeApp/FreeTube/issues/", "duplicate of https://github.com/FreeTubeApp/FreeTube/pulls/"]'
1515
labels: '["U: duplicate"]'

.github/workflows/autoMerge.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ on:
33
pull_request_target:
44
types: [opened, synchronize, reopened, auto_merge_disabled, ready_for_review]
55

6+
permissions: {}
7+
68
jobs:
79
build:
810
if: ${{ !github.event.pull_request.draft && (contains(github.event.pull_request.base.ref, 'development') || contains(github.event.pull_request.base.ref, 'RC')) }}
911
runs-on: ubuntu-latest
1012

1113
steps:
1214
- name: Auto Merge PR
13-
run: |
14-
echo ${{ secrets.PUSH_TOKEN }} >> auth.txt
15-
gh auth login --with-token < auth.txt
16-
rm auth.txt
17-
gh pr merge https://github.com/FreeTubeApp/FreeTube/pull/${{ github.event.pull_request.number }} --auto --squash
15+
env:
16+
GH_TOKEN: ${{ secrets.PUSH_TOKEN }}
17+
run: gh pr merge https://github.com/FreeTubeApp/FreeTube/pull/${{ github.event.pull_request.number }} --auto --squash

.github/workflows/build.yml

Lines changed: 35 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,11 @@ jobs:
4747

4848
steps:
4949
- uses: actions/checkout@v4
50+
51+
- name: 'Use faster D: drive for yarn cache on Windows'
52+
if: startsWith(matrix.os, 'windows')
53+
run: yarn config set cache-folder D:\ft_yarn_cache
54+
5055
- name: Use Node.js ${{ matrix.node-version }}
5156
uses: actions/setup-node@v4
5257
with:
@@ -117,91 +122,91 @@ jobs:
117122
uses: actions/upload-artifact@v4
118123
if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64')
119124
with:
120-
name: freetube-${{ steps.versionNumber.outputs.result }}-beta-linux-x64-portable.zip
125+
name: freetube-${{ steps.versionNumber.outputs.result }}-linux-x64-portable.zip
121126
path: build/freetube-${{ steps.versionNumber.outputs.result }}.zip
122127

123128
- name: Upload Linux .7z x64 Artifact
124129
uses: actions/upload-artifact@v4
125130
if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64')
126131
with:
127-
name: freetube-${{ steps.versionNumber.outputs.result }}-beta-linux-x64-portable.7z
132+
name: freetube-${{ steps.versionNumber.outputs.result }}-linux-x64-portable.7z
128133
path: build/freetube-${{ steps.versionNumber.outputs.result }}.7z
129134

130135
- name: Upload Linux .zip ARMv7l Artifact
131136
uses: actions/upload-artifact@v4
132137
if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-armv7l')
133138
with:
134-
name: freetube-${{ steps.versionNumber.outputs.result }}-beta-linux-armv7l-portable.zip
139+
name: freetube-${{ steps.versionNumber.outputs.result }}-linux-armv7l-portable.zip
135140
path: build/freetube-${{ steps.versionNumber.outputs.result }}-armv7l.zip
136141

137142
- name: Upload Linux .7z ARMv7l Artifact
138143
uses: actions/upload-artifact@v4
139144
if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-armv7l')
140145
with:
141-
name: freetube-${{ steps.versionNumber.outputs.result }}-beta-linux-armv7l-portable.7z
146+
name: freetube-${{ steps.versionNumber.outputs.result }}-linux-armv7l-portable.7z
142147
path: build/freetube-${{ steps.versionNumber.outputs.result }}-armv7l.7z
143148

144149
- name: Upload Linux .zip ARM64 Artifact
145150
uses: actions/upload-artifact@v4
146151
if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-arm64')
147152
with:
148-
name: freetube-${{ steps.versionNumber.outputs.result }}-beta-linux-arm64-portable.zip
153+
name: freetube-${{ steps.versionNumber.outputs.result }}-linux-arm64-portable.zip
149154
path: build/freetube-${{ steps.versionNumber.outputs.result }}-arm64.zip
150155

151156
- name: Upload Linux .7z ARM64 Artifact
152157
uses: actions/upload-artifact@v4
153158
if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-arm64')
154159
with:
155-
name: freetube-${{ steps.versionNumber.outputs.result }}-beta-linux-arm64-portable.7z
160+
name: freetube-${{ steps.versionNumber.outputs.result }}-linux-arm64-portable.7z
156161
path: build/freetube-${{ steps.versionNumber.outputs.result }}-arm64.7z
157162

158163
- name: Upload .deb x64 Artifact
159164
uses: actions/upload-artifact@v4
160165
if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64')
161166
with:
162-
name: freetube_${{ steps.versionNumber.outputs.result }}_beta_amd64.deb
167+
name: freetube_${{ steps.versionNumber.outputs.result }}_amd64.deb
163168
path: build/freetube_${{ steps.versionNumber.outputs.result }}_amd64.deb
164169

165170
- name: Upload .deb ARMv7l Artifact
166171
uses: actions/upload-artifact@v4
167172
if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-armv7l')
168173
with:
169-
name: freetube_${{ steps.versionNumber.outputs.result }}_beta_armv7l.deb
174+
name: freetube_${{ steps.versionNumber.outputs.result }}_armv7l.deb
170175
path: build/freetube_${{ steps.versionNumber.outputs.result }}_armv7l.deb
171176

172177
- name: Upload .deb ARM64 Artifact
173178
uses: actions/upload-artifact@v4
174179
if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-arm64')
175180
with:
176-
name: freetube_${{ steps.versionNumber.outputs.result }}_beta_arm64.deb
181+
name: freetube_${{ steps.versionNumber.outputs.result }}_arm64.deb
177182
path: build/freetube_${{ steps.versionNumber.outputs.result }}_arm64.deb
178183

179184
- name: Upload AppImage x64 Artifact
180185
uses: actions/upload-artifact@v4
181186
if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64')
182187
with:
183-
name: freetube-${{ steps.versionNumber.outputs.result }}-beta-amd64.AppImage
188+
name: freetube-${{ steps.versionNumber.outputs.result }}-amd64.AppImage
184189
path: build/FreeTube-${{ steps.versionNumber.outputs.result }}.AppImage
185190

186191
- name: Upload AppImage ARMv7l Artifact
187192
uses: actions/upload-artifact@v4
188193
if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-armv7l')
189194
with:
190-
name: freetube-${{ steps.versionNumber.outputs.result }}-beta-armv7l.AppImage
195+
name: freetube-${{ steps.versionNumber.outputs.result }}-armv7l.AppImage
191196
path: build/FreeTube-${{ steps.versionNumber.outputs.result }}-armv7l.AppImage
192197

193198
- name: Upload AppImage ARM64 Artifact
194199
uses: actions/upload-artifact@v4
195200
if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-arm64')
196201
with:
197-
name: freetube-${{ steps.versionNumber.outputs.result }}-beta-arm64.AppImage
202+
name: freetube-${{ steps.versionNumber.outputs.result }}-arm64.AppImage
198203
path: build/FreeTube-${{ steps.versionNumber.outputs.result }}-arm64.AppImage
199204

200205
- name: Upload .rpm x64 Artifact
201206
uses: actions/upload-artifact@v4
202207
if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64')
203208
with:
204-
name: freetube-${{ steps.versionNumber.outputs.result }}-beta.amd64.rpm
209+
name: freetube-${{ steps.versionNumber.outputs.result }}.amd64.rpm
205210
path: build/freetube-${{ steps.versionNumber.outputs.result }}.x86_64.rpm
206211

207212
# rpm are not built for armv7l
@@ -210,117 +215,117 @@ jobs:
210215
uses: actions/upload-artifact@v4
211216
if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-arm64')
212217
with:
213-
name: freetube-${{ steps.versionNumber.outputs.result }}-beta.arm64.rpm
218+
name: freetube-${{ steps.versionNumber.outputs.result }}.arm64.rpm
214219
path: build/freetube-${{ steps.versionNumber.outputs.result }}.aarch64.rpm
215220

216221
- name: Upload Pacman .pacman x64 Artifact
217222
uses: actions/upload-artifact@v4
218223
if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64')
219224
with:
220-
name: freetube-${{ steps.versionNumber.outputs.result }}-beta-amd64.pacman
225+
name: freetube-${{ steps.versionNumber.outputs.result }}-amd64.pacman
221226
path: build/freetube-${{ steps.versionNumber.outputs.result }}.pacman
222227

223228
# - name: Upload Web Build
224229
# uses: actions/upload-artifact@v4
225230
# if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64')
226231
# with:
227-
# name: freetube-${{ steps.versionNumber.outputs.result }}-beta-static-web
232+
# name: freetube-${{ steps.versionNumber.outputs.result }}-static-web
228233
# path: dist/web
229234

230235
- name: Upload Windows x64 .exe Artifact
231236
uses: actions/upload-artifact@v4
232237
if: startsWith(matrix.os, 'windows') && startsWith(matrix.runtime, 'win-x64')
233238
with:
234-
name: freetube-${{ steps.versionNumber.outputs.result }}-beta-setup-x64.exe
239+
name: freetube-${{ steps.versionNumber.outputs.result }}-setup-x64.exe
235240
path: build/freetube Setup ${{ steps.versionNumber.outputs.result }}.exe
236241

237242
- name: Upload Windows x64 Portable Artifact
238243
uses: actions/upload-artifact@v4
239244
if: startsWith(matrix.os, 'windows') && startsWith(matrix.runtime, 'win-x64')
240245
with:
241-
name: freetube-${{ steps.versionNumber.outputs.result }}-beta-win-x64-portable.exe
246+
name: freetube-${{ steps.versionNumber.outputs.result }}-win-x64-portable.exe
242247
path: build/freetube ${{ steps.versionNumber.outputs.result }}.exe
243248

244249
- name: Upload Windows x64 .zip Artifact
245250
uses: actions/upload-artifact@v4
246251
if: startsWith(matrix.os, 'windows') && startsWith(matrix.runtime, 'win-x64')
247252
with:
248-
name: freetube-${{ steps.versionNumber.outputs.result }}-beta-win-x64-portable.zip
253+
name: freetube-${{ steps.versionNumber.outputs.result }}-win-x64-portable.zip
249254
path: build/freetube-${{ steps.versionNumber.outputs.result }}-win.zip
250255

251256
- name: Upload Windows x64 .7z Artifact
252257
uses: actions/upload-artifact@v4
253258
if: startsWith(matrix.os, 'windows') && startsWith(matrix.runtime, 'win-x64')
254259
with:
255-
name: freetube-${{ steps.versionNumber.outputs.result }}-beta-win-x64-portable.7z
260+
name: freetube-${{ steps.versionNumber.outputs.result }}-win-x64-portable.7z
256261
path: build/freetube-${{ steps.versionNumber.outputs.result }}-win.7z
257262

258263
- name: Upload Windows arm64 .exe Artifact
259264
uses: actions/upload-artifact@v4
260265
if: startsWith(matrix.os, 'windows') && startsWith(matrix.runtime, 'win-arm64')
261266
with:
262-
name: freetube-${{ steps.versionNumber.outputs.result }}-beta-setup-arm64.exe
267+
name: freetube-${{ steps.versionNumber.outputs.result }}-setup-arm64.exe
263268
path: build/freetube Setup ${{ steps.versionNumber.outputs.result }}.exe
264269

265270
- name: Upload Windows arm64 Portable Artifact
266271
uses: actions/upload-artifact@v4
267272
if: startsWith(matrix.os, 'windows') && startsWith(matrix.runtime, 'win-arm64')
268273
with:
269-
name: freetube-${{ steps.versionNumber.outputs.result }}-beta-win-arm64-portable.exe
274+
name: freetube-${{ steps.versionNumber.outputs.result }}-win-arm64-portable.exe
270275
path: build/freetube ${{ steps.versionNumber.outputs.result }}.exe
271276

272277
- name: Upload Windows arm64 .zip Artifact
273278
uses: actions/upload-artifact@v4
274279
if: startsWith(matrix.os, 'windows') && startsWith(matrix.runtime, 'win-arm64')
275280
with:
276-
name: freetube-${{ steps.versionNumber.outputs.result }}-beta-win-arm64-portable.zip
281+
name: freetube-${{ steps.versionNumber.outputs.result }}-win-arm64-portable.zip
277282
path: build/freetube-${{ steps.versionNumber.outputs.result }}-arm64-win.zip
278283

279284
- name: Upload Windows arm64 .7z Artifact
280285
uses: actions/upload-artifact@v4
281286
if: startsWith(matrix.os, 'windows') && startsWith(matrix.runtime, 'win-arm64')
282287
with:
283-
name: freetube-${{ steps.versionNumber.outputs.result }}-beta-win-arm64-portable.7z
288+
name: freetube-${{ steps.versionNumber.outputs.result }}-win-arm64-portable.7z
284289
path: build/freetube-${{ steps.versionNumber.outputs.result }}-arm64-win.7z
285290

286291
- name: Upload Mac x64 .dmg Artifact
287292
uses: actions/upload-artifact@v4
288293
if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-x64')
289294
with:
290-
name: freetube-${{ steps.versionNumber.outputs.result }}-beta-mac-x64.dmg
295+
name: freetube-${{ steps.versionNumber.outputs.result }}-mac-x64.dmg
291296
path: build/freetube-${{ steps.versionNumber.outputs.result }}.dmg
292297

293298
- name: Upload Mac x64 .zip Artifact
294299
uses: actions/upload-artifact@v4
295300
if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-x64')
296301
with:
297-
name: freetube-${{ steps.versionNumber.outputs.result }}-beta-mac-x64.zip
302+
name: freetube-${{ steps.versionNumber.outputs.result }}-mac-x64.zip
298303
path: build/freetube-${{ steps.versionNumber.outputs.result }}-mac.zip
299304

300305
- name: Upload Mac x64 .7z Artifact
301306
uses: actions/upload-artifact@v4
302307
if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-x64')
303308
with:
304-
name: freetube-${{ steps.versionNumber.outputs.result }}-beta-mac-x64.7z
309+
name: freetube-${{ steps.versionNumber.outputs.result }}-mac-x64.7z
305310
path: build/freetube-${{ steps.versionNumber.outputs.result }}-mac.7z
306311

307312
- name: Upload Mac arm64 .dmg Artifact
308313
uses: actions/upload-artifact@v4
309314
if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-arm64')
310315
with:
311-
name: freetube-${{ steps.versionNumber.outputs.result }}-beta-mac-arm64.dmg
316+
name: freetube-${{ steps.versionNumber.outputs.result }}-mac-arm64.dmg
312317
path: build/freetube-${{ steps.versionNumber.outputs.result }}-arm64.dmg
313318

314319
- name: Upload Mac arm64 .zip Artifact
315320
uses: actions/upload-artifact@v4
316321
if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-arm64')
317322
with:
318-
name: freetube-${{ steps.versionNumber.outputs.result }}-beta-mac-arm64.zip
323+
name: freetube-${{ steps.versionNumber.outputs.result }}-mac-arm64.zip
319324
path: build/freetube-${{ steps.versionNumber.outputs.result }}-arm64-mac.zip
320325

321326
- name: Upload Mac arm64 .7z Artifact
322327
uses: actions/upload-artifact@v4
323328
if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-arm64')
324329
with:
325-
name: freetube-${{ steps.versionNumber.outputs.result }}-beta-mac-arm64.7z
330+
name: freetube-${{ steps.versionNumber.outputs.result }}-mac-arm64.7z
326331
path: build/freetube-${{ steps.versionNumber.outputs.result }}-arm64-mac.7z

.github/workflows/flatpak.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,22 +76,22 @@ jobs:
7676
date +"%Y-%m-%d" >> $GITHUB_ENV
7777
echo 'EOF' >> $GITHUB_ENV
7878
- name: Update x64 File Location in yml File
79-
uses: mikefarah/yq@v4.45.4
79+
uses: mikefarah/yq@v4.46.1
8080
with:
8181
# The Command which should be run
8282
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 }}-beta-linux-x64-portable.zip"' io.freetubeapp.FreeTube.yml
8383
- name: Update x64 Hash in yml File
84-
uses: mikefarah/yq@v4.45.4
84+
uses: mikefarah/yq@v4.46.1
8585
with:
8686
# The Command which should be run
8787
cmd: yq -i '.modules[0].sources[0].sha256 = "${{ env.HASH_X64 }}"' io.freetubeapp.FreeTube.yml
8888
- name: Update ARM File Location in yml File
89-
uses: mikefarah/yq@v4.45.4
89+
uses: mikefarah/yq@v4.46.1
9090
with:
9191
# The Command which should be run
9292
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 }}-beta-linux-arm64-portable.zip"' io.freetubeapp.FreeTube.yml
9393
- name: Update ARM Hash in yml File
94-
uses: mikefarah/yq@v4.45.4
94+
uses: mikefarah/yq@v4.46.1
9595
with:
9696
# The Command which should be run
9797
cmd: yq -i '.modules[0].sources[1].sha256 = "${{ env.HASH_ARM64 }}"' io.freetubeapp.FreeTube.yml

.github/workflows/release.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,11 @@ jobs:
5252

5353
steps:
5454
- uses: actions/checkout@v4
55+
56+
- name: 'Use faster D: drive for yarn cache on Windows'
57+
if: startsWith(matrix.os, 'windows')
58+
run: yarn config set cache-folder D:\ft_yarn_cache
59+
5560
- name: Use Node.js ${{ matrix.node-version }}
5661
uses: actions/setup-node@v4
5762
with:

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,5 @@ debug/
2828

2929
# Lefthook
3030
lefthook-local.yml
31+
32+
locale-errors.json

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Please follow these guidelines before sending your pull request and making contr
1414
* Make sure your pull request is set up to merge your branch to FreeTube's development branch.
1515
* Make sure your branch is up to date with the development branch before submitting your pull request.
1616
* Stick to a similar style of code already in the project. Please look at current code to get an idea on how to do this.
17-
* Follow [ES6](http://es6-features.org/) standards in your code. Ex: Use `let` and `const` instead of `var`. Do not use `function(response){//code}` for callbacks, use `(response) => {//code}`.
17+
* Follow [ES6](https://rse.github.io/es6-features/) standards in your code. Ex: Use `let` and `const` instead of `var`. Do not use `function(response){//code}` for callbacks, use `(response) => {//code}`.
1818
* Comment your code when necessary. Follow the [JavaScript Documentation and Comments Standard](https://www.drupal.org/docs/develop/standards/javascript/javascript-api-documentation-and-comment-standards) for functions.
1919
* Please follow proper Vue structure when creating new code / components. Use existing code as well as the [Vue.js Guide](https://vuejs.org/v2/guide/) for reference.
2020
* Please test your code. Make sure new features work as well as existing core features such as watching videos or loading subscriptions. New features need to work with both the Local API as well as the Invidious API

0 commit comments

Comments
 (0)