Skip to content

Commit 7c8c414

Browse files
committed
Merge branch 'development' into custom-builds/dragdrop
* development: (29 commits) enhance issue templates (FreeTubeApp#8770) Bump vue-i18n from 11.2.8 to 11.3.0 (FreeTubeApp#8769) Bump lefthook from 2.1.2 to 2.1.3 (FreeTubeApp#8768) Bump babel-loader from 10.0.0 to 10.1.0 in the babel group (FreeTubeApp#8767) Fix build script not failing on error (FreeTubeApp#8761) Create a dependabot group for webpack dependencies (FreeTubeApp#8760) Translated using Weblate (Spanish) Bump the eslint group across 1 directory with 11 updates (FreeTubeApp#8755) Translated using Weblate (Swedish) Translated using Weblate (Swedish) Bump webpack from 5.105.3 to 5.105.4 (FreeTubeApp#8753) Bump electron from 40.6.1 to 40.8.0 (FreeTubeApp#8747) Bump marked from 17.0.3 to 17.0.4 (FreeTubeApp#8750) Bump lefthook from 2.1.1 to 2.1.2 (FreeTubeApp#8749) Bump shaka-player from 4.16.19 to 4.16.20 (FreeTubeApp#8748) Bump globals from 17.3.0 to 17.4.0 (FreeTubeApp#8752) Bump copy-webpack-plugin from 13.0.1 to 14.0.0 (FreeTubeApp#8751) Bump css-minimizer-webpack-plugin from 7.0.4 to 8.0.0 (FreeTubeApp#8746) Translated using Weblate (Spanish) Bump the stylelint group with 2 updates (FreeTubeApp#8745) ...
2 parents 59f83a6 + f71b960 commit 7c8c414

File tree

33 files changed

+1197
-1871
lines changed

33 files changed

+1197
-1871
lines changed

.github/ISSUE_TEMPLATE/bug_report.yaml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,12 +122,19 @@ body:
122122
label: 'Last Known Working FreeTube Version (If Any)'
123123
description: What is the last version of FreeTube this worked in, if applicable?
124124
placeholder: v0.14.0
125+
- type: upload
126+
id: screenshots
127+
attributes:
128+
label: Upload screenshots or videos
129+
description: If applicable, add screenshots or videos to help explain your problem.
130+
validations:
131+
required: false
125132
- type: textarea
126133
attributes:
127134
label: Additional Information
128135
description: |
129136
Add additional information here.
130-
You may drag-and-drop screenshots/videos and log files here, or paste the log file in code blocks.
137+
You may drag-and-drop log files here, or paste the log file in code blocks.
131138
- type: checkboxes
132139
attributes:
133140
label: Nightly Build

.github/ISSUE_TEMPLATE/feature_request.yaml

Lines changed: 52 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,59 @@ body:
5555
- visual improvement
5656
validations:
5757
required: true
58+
- type: input
59+
attributes:
60+
label: FreeTube Version
61+
description: |
62+
If using releases, enter the version.
63+
If using nightly builds, enter commit hash or build number, you can find it via about page in the FreeTube application.
64+
placeholder: v0.14.0, 8c4278
65+
validations:
66+
required: true
67+
- type: input
68+
attributes:
69+
label: Operating System Version
70+
description: What operating system version are you using? On Windows, click Start button > Settings > System > About. On macOS, click the Apple Menu > About This Mac. On Linux, use lsb_release or uname -a.
71+
placeholder: "e.g. Windows 10 version 1909, macOS Catalina 10.15.7, or Ubuntu 20.04"
72+
validations:
73+
required: true
74+
- type: dropdown
75+
attributes:
76+
label: Installation Method
77+
description: If you are using an unofficial installation method, please verify that the requested feature is not already available in one of the official installation methods. If the feature only relates to an unofficial installation, please direct the request to the maintainer of that installation method instead.
78+
options:
79+
- .AppImage
80+
- .deb
81+
- .dmg
82+
- .exe
83+
- Flathub
84+
- .pacman
85+
- Portable
86+
- .rpm
87+
- .zip / .7z
88+
- .apk (FreeTubeAndroid Unofficial)
89+
- .apk (Alpine Linux Package Unofficial)
90+
- AUR (Unofficial)
91+
- Chocolatey (Unofficial)
92+
- Homebrew (Unofficial)
93+
- Nix (Unofficial)
94+
- PortableApps (Unofficial)
95+
- Scoop (Unofficial)
96+
- Snapcraft (Unofficial)
97+
- WAPT (Unofficial)
98+
- winget (Unofficial)
99+
- other
100+
validations:
101+
required: true
102+
- type: upload
103+
id: screenshots
104+
attributes:
105+
label: Upload screenshots or videos
106+
description: If applicable, add screenshots or videos to help explain your request.
107+
validations:
108+
required: false
58109
- type: textarea
59110
attributes:
60111
label: Additional Information
61112
description: |
62-
Add any other context or screenshots/videos about the feature request here.
63-
You may drag-and-drop screenshots.
113+
Add any other context about the feature request here.

.github/dependabot.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ updates:
2121
- "vue-eslint-parser"
2222
- "neostandard"
2323
- "@intlify/eslint-plugin-vue-i18n"
24+
- "@stylistic/eslint-plugin"
2425
stylelint:
2526
patterns:
2627
- "stylelint"
@@ -31,6 +32,15 @@ updates:
3132
fortawesome:
3233
patterns:
3334
- "@fortawesome/*"
35+
webpack:
36+
patterns:
37+
- "css-loader"
38+
- "mini-css-extract-plugin"
39+
- "sass"
40+
- "sass-loader"
41+
- "webpack"
42+
- "webpack-*"
43+
- "*-webpack-plugin"
3444
- package-ecosystem: "github-actions"
3545
directory: "/"
3646
schedule:

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ jobs:
7979
persist-credentials: false
8080

8181
- name: Use Node.js ${{ matrix.node-version }}
82-
uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 #v6.2.0
82+
uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f #v6.3.0
8383
with:
8484
node-version: ${{ matrix.node-version }}
8585
package-manager-cache: false

.github/workflows/codeql.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,12 @@ jobs:
4343
persist-credentials: false
4444

4545
- name: Initialize CodeQL
46-
uses: github/codeql-action/init@89a39a4e59826350b863aa6b6252a07ad50cf83e # v4.32.4
46+
uses: github/codeql-action/init@0d579ffd059c29b07949a3cce3983f0780820c98 # v4.32.6
4747
with:
4848
languages: ${{ matrix.language }}
4949
build-mode: ${{ matrix.build-mode }}
5050

5151
- name: Perform CodeQL Analysis
52-
uses: github/codeql-action/analyze@89a39a4e59826350b863aa6b6252a07ad50cf83e # v4.32.4
52+
uses: github/codeql-action/analyze@0d579ffd059c29b07949a3cce3983f0780820c98 # v4.32.6
5353
with:
5454
category: "/language:${{matrix.language}}"

.github/workflows/linter.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
persist-credentials: false
3838

3939
- name: Use Node.js 24.x
40-
uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 #v6.2.0
40+
uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f #v6.3.0
4141
with:
4242
node-version: 24.x
4343
package-manager-cache: false

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363

6464
# Do not restore the yarn cache, to avoid cache poisoning affecting releases
6565
- name: Use Node.js ${{ matrix.node-version }}
66-
uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 #v6.2.0
66+
uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f #v6.3.0
6767
with:
6868
node-version: ${{ matrix.node-version }}
6969
package-manager-cache: false

_scripts/build.mjs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,5 @@ if (platform === 'darwin') {
3737
targets = Platform.LINUX.createTarget(['deb', 'zip', '7z', 'rpm', 'AppImage', 'pacman'], arch)
3838
}
3939

40-
try {
41-
const output = await build({ targets, config, publish: 'never' })
42-
console.log(output)
43-
} catch (error) {
44-
console.error(error)
45-
}
40+
const output = await build({ targets, config, publish: 'never' })
41+
console.log(output)

_scripts/ebuilder.config.mjs

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,15 @@ export default {
8484
],
8585
CFBundleURLSchemes: [
8686
'freetube'
87-
]
87+
],
88+
89+
// Clear the default usage descriptions in the Info.plist file set by Electron that we don't need
90+
// see: https://github.com/electron/electron/blob/main/shell/browser/resources/mac/Info.plist
91+
NSAudioCaptureUsageDescription: undefined,
92+
NSBluetoothAlwaysUsageDescription: undefined,
93+
NSBluetoothPeripheralUsageDescription: undefined,
94+
NSCameraUsageDescription: undefined,
95+
NSMicrophoneUsageDescription: undefined,
8896
}
8997
},
9098
win: {

0 commit comments

Comments
 (0)