Skip to content

Commit 8882f80

Browse files
ScyyeScyye
committed
Merge branch 'Vendicated-main'
2 parents 236da7a + d1824dd commit 8882f80

File tree

39 files changed

+856
-1275
lines changed

39 files changed

+856
-1275
lines changed

‎.github/ISSUE_TEMPLATE/blank.yml

+18-24
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,24 @@ name: Blank Issue
22
description: Create a blank issue. ALWAYS FIRST USE OUR SUPPORT CHANNEL! ONLY USE THIS FORM IF YOU ARE A CONTRIBUTOR OR WERE TOLD TO DO SO IN THE SUPPORT CHANNEL.
33

44
body:
5-
- type: markdown
6-
attributes:
7-
value: |
8-
# READ THIS BEFORE OPENING AN ISSUE
5+
- type: markdown
6+
attributes:
7+
value: |
8+
![Are you a developer? No? This form is not for you!](https://github.com/Vendicated/Vencord/blob/main/.github/ISSUE_TEMPLATE/developer-banner.png?raw=true)
99
10-
This form is ONLY FOR DEVELOPERS. YOUR ISSUE WILL BE CLOSED AND YOU WILL POSSIBLY BE BLOCKED FROM THE REPOSITORY IF YOU IGNORE THIS.
11-
12-
DO NOT USE THIS FORM, unless
13-
- you are a vencord contributor
14-
- you were given explicit permission to use this form by a moderator in our support server
15-
16-
DO NOT USE THIS FORM FOR SECURITY RELATED ISSUES. [CREATE A SECURITY ADVISORY INSTEAD.](https://github.com/Vendicated/Vencord/security/advisories/new)
10+
GitHub Issues are for development, not support! Please use our [support server](https://vencord.dev/discord) unless you are a Vencord Developer.
1711
18-
- type: textarea
19-
id: content
20-
attributes:
21-
label: Content
22-
validations:
23-
required: true
24-
25-
- type: checkboxes
26-
id: agreement-check
27-
attributes:
28-
label: Request Agreement
29-
options:
30-
- label: I have read the requirements for opening an issue above
12+
- type: textarea
13+
id: content
14+
attributes:
15+
label: Content
16+
validations:
3117
required: true
18+
19+
- type: checkboxes
20+
id: agreement-check
21+
attributes:
22+
label: Request Agreement
23+
options:
24+
- label: I have read the requirements for opening an issue above
25+
required: true

‎.github/ISSUE_TEMPLATE/bug_report.yml

+54-69
Original file line numberDiff line numberDiff line change
@@ -4,78 +4,63 @@ labels: [bug]
44
title: "[Bug] <title>"
55

66
body:
7-
- type: markdown
8-
attributes:
9-
value: |
10-
# READ THIS BEFORE OPENING AN ISSUE
7+
- type: markdown
8+
attributes:
9+
value: |
10+
![Are you a developer? No? This form is not for you!](https://github.com/Vendicated/Vencord/blob/main/.github/ISSUE_TEMPLATE/developer-banner.png?raw=true)
1111
12-
This form is ONLY FOR DEVELOPERS. YOUR ISSUE WILL BE CLOSED AND YOU WILL POSSIBLY BE BLOCKED FROM THE REPOSITORY IF YOU IGNORE THIS.
13-
14-
DO NOT USE THIS FORM, unless
15-
- you are a vencord contributor
16-
- you were given explicit permission to use this form by a moderator in our support server
17-
18-
DO NOT USE THIS FORM FOR SECURITY RELATED ISSUES. [CREATE A SECURITY ADVISORY INSTEAD.](https://github.com/Vendicated/Vencord/security/advisories/new)
19-
20-
- type: input
21-
id: discord
22-
attributes:
23-
label: Discord Account
24-
description: Who on Discord is making this request? Not required but encouraged for easier follow-up
25-
placeholder: username#0000
26-
validations:
27-
required: false
12+
GitHub Issues are for development, not support! Please use our [support server](https://vencord.dev/discord) unless you are a Vencord Developer.
2813
29-
- type: textarea
30-
id: bug-description
31-
attributes:
32-
label: What happens when the bug or crash occurs?
33-
description: Where does this bug or crash occur, when does it occur, etc.
34-
placeholder: The bug/crash happens sometimes when I do ..., causing this to not work/the app to crash. I think it happens because of ...
35-
validations:
36-
required: true
14+
- type: textarea
15+
id: bug-description
16+
attributes:
17+
label: What happens when the bug or crash occurs?
18+
description: Where does this bug or crash occur, when does it occur, etc.
19+
placeholder: The bug/crash happens sometimes when I do ..., causing this to not work/the app to crash. I think it happens because of ...
20+
validations:
21+
required: true
3722

38-
- type: textarea
39-
id: expected-behaviour
40-
attributes:
41-
label: What is the expected behaviour?
42-
description: Simply detail what the expected behaviour is.
43-
placeholder: I expect Vencord/Discord to open the ... page instead of ..., it prevents me from doing ...
44-
validations:
45-
required: true
23+
- type: textarea
24+
id: expected-behaviour
25+
attributes:
26+
label: What is the expected behaviour?
27+
description: Simply detail what the expected behaviour is.
28+
placeholder: I expect Vencord/Discord to open the ... page instead of ..., it prevents me from doing ...
29+
validations:
30+
required: true
4631

47-
- type: textarea
48-
id: steps-to-take
49-
attributes:
50-
label: How do you recreate this bug or crash?
51-
description: Give us a list of steps in order to recreate the bug or crash.
52-
placeholder: |
53-
1. Do ...
54-
2. Then ...
55-
3. Do this ..., ... and then ...
56-
4. Observe "the bug" or "the crash"
57-
validations:
58-
required: true
32+
- type: textarea
33+
id: steps-to-take
34+
attributes:
35+
label: How do you recreate this bug or crash?
36+
description: Give us a list of steps in order to recreate the bug or crash.
37+
placeholder: |
38+
1. Do ...
39+
2. Then ...
40+
3. Do this ..., ... and then ...
41+
4. Observe "the bug" or "the crash"
42+
validations:
43+
required: true
5944

60-
- type: textarea
61-
id: crash-log
62-
attributes:
63-
label: Errors
64-
description: Open the Developer Console with Ctrl/Cmd + Shift + i. Then look for any red errors (Ignore network errors like Failed to load resource) and paste them between the "```".
65-
value: |
66-
```
67-
Replace this text with your crash-log.
68-
```
69-
validations:
70-
required: false
45+
- type: textarea
46+
id: crash-log
47+
attributes:
48+
label: Errors
49+
description: Open the Developer Console with Ctrl/Cmd + Shift + i. Then look for any red errors (Ignore network errors like Failed to load resource) and paste them between the "```".
50+
value: |
51+
```
52+
Replace this text with your crash-log.
53+
```
54+
validations:
55+
required: false
7156

72-
- type: checkboxes
73-
id: agreement-check
74-
attributes:
75-
label: Request Agreement
76-
description: We only accept reports for bugs that happen on Discord Stable. Canary and PTB are Development branches and may be unstable
77-
options:
78-
- label: I am using Discord Stable or tried on Stable and this bug happens there as well
79-
required: true
80-
- label: I have read the requirements for opening an issue above
81-
required: true
57+
- type: checkboxes
58+
id: agreement-check
59+
attributes:
60+
label: Request Agreement
61+
description: We only accept reports for bugs that happen on Discord Stable. Canary and PTB are Development branches and may be unstable
62+
options:
63+
- label: I am using Discord Stable or tried on Stable and this bug happens there as well
64+
required: true
65+
- label: I am a Vencord Developer
66+
required: true

‎.github/ISSUE_TEMPLATE/developer-banner.png

31.2 KB
Loading

‎package.json

+19-23
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"dev": "pnpm watch",
2525
"watchWeb": "pnpm buildWeb --watch",
2626
"generatePluginJson": "tsx scripts/generatePluginList.ts",
27-
"generateTypes": "tspc --emitDeclarationOnly --declaration --outDir packages/vencord-types",
27+
"generateTypes": "tspc --emitDeclarationOnly --declaration --outDir packages/vencord-types --allowJs false",
2828
"inject": "node scripts/runInstaller.mjs",
2929
"uninject": "node scripts/runInstaller.mjs",
3030
"lint": "eslint",
@@ -45,31 +45,31 @@
4545
"virtual-merge": "^1.0.1"
4646
},
4747
"devDependencies": {
48-
"@stylistic/eslint-plugin": "^2.12.1",
49-
"@types/chrome": "^0.0.287",
50-
"@types/diff": "^6.0.0",
48+
"@stylistic/eslint-plugin": "^4.0.0",
49+
"@types/chrome": "^0.0.304",
50+
"@types/diff": "^7.0.1",
5151
"@types/lodash": "^4.17.14",
5252
"@types/node": "^22.10.5",
53-
"@types/react": "^19.0.2",
54-
"@types/react-dom": "^19.0.2",
53+
"@types/react": "^19.0.10",
54+
"@types/react-dom": "^19.0.4",
5555
"@types/yazl": "^2.4.5",
5656
"diff": "^7.0.0",
5757
"discord-types": "^1.3.26",
5858
"esbuild": "^0.25.0",
59-
"eslint": "^9.17.0",
59+
"eslint": "^9.20.1",
6060
"eslint-import-resolver-alias": "^1.1.2",
6161
"eslint-plugin-path-alias": "2.1.0",
6262
"eslint-plugin-react": "^7.37.3",
6363
"eslint-plugin-simple-header": "^1.2.1",
6464
"eslint-plugin-simple-import-sort": "^12.1.1",
6565
"eslint-plugin-unused-imports": "^4.1.4",
66-
"highlight.js": "11.7.0",
66+
"highlight.js": "11.11.1",
6767
"html-minifier-terser": "^7.2.0",
6868
"moment": "^2.22.2",
69-
"puppeteer-core": "^23.11.1",
70-
"standalone-electron-types": "^1.0.0",
69+
"puppeteer-core": "^24.2.1",
70+
"standalone-electron-types": "^34.2.0",
7171
"stylelint": "^16.12.0",
72-
"stylelint-config-standard": "^36.0.1",
72+
"stylelint-config-standard": "^37.0.0",
7373
"ts-patch": "^3.3.0",
7474
"ts-pattern": "^5.6.0",
7575
"tsx": "^4.19.2",
@@ -79,10 +79,10 @@
7979
"typescript-transform-paths": "^3.5.3",
8080
"zip-local": "^0.3.5"
8181
},
82-
"packageManager": "pnpm@9.1.0",
82+
"packageManager": "pnpm@10.4.1",
8383
"pnpm": {
8484
"patchedDependencies": {
85-
"eslint@9.17.0": "patches/eslint@9.17.0.patch",
85+
"eslint@9.20.1": "patches/eslint@9.20.1.patch",
8686
"[email protected]": "patches/[email protected]"
8787
},
8888
"peerDependencyRules": {
@@ -95,18 +95,14 @@
9595
"source-map-resolve": "*",
9696
"resolve-url": "*",
9797
"source-map-url": "*",
98-
"urix": "*"
99-
}
100-
},
101-
"webExt": {
102-
"artifactsDir": "./dist",
103-
"build": {
104-
"overwriteDest": true
98+
"urix": "*",
99+
"q": "*"
105100
},
106-
"sourceDir": "./dist/firefox-unpacked"
101+
"onlyBuiltDependencies": [
102+
"esbuild"
103+
]
107104
},
108105
"engines": {
109-
"node": ">=18",
110-
"pnpm": ">=9"
106+
"node": ">=18"
111107
}
112108
}

‎packages/vencord-types/package.json

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@vencord/types",
33
"private": false,
4-
"version": "0.1.3",
4+
"version": "1.11.5",
55
"description": "",
66
"types": "index.d.ts",
77
"scripts": {
@@ -13,16 +13,16 @@
1313
"license": "GPL-3.0",
1414
"devDependencies": {
1515
"@types/fs-extra": "^11.0.4",
16-
"fs-extra": "^11.2.0",
17-
"tsx": "^3.12.6"
16+
"fs-extra": "^11.3.0",
17+
"tsx": "^4.19.2"
1818
},
1919
"dependencies": {
20-
"@types/lodash": "^4.14.191",
21-
"@types/node": "^18.11.18",
22-
"@types/react": "^18.2.0",
23-
"@types/react-dom": "^18.0.10",
20+
"@types/lodash": "4.17.15",
21+
"@types/node": "^22.13.4",
22+
"@types/react": "18.3.1",
23+
"@types/react-dom": "18.3.1",
2424
"discord-types": "^1.3.26",
25-
"standalone-electron-types": "^1.0.0",
26-
"type-fest": "^3.5.3"
25+
"standalone-electron-types": "^34.2.0",
26+
"type-fest": "^4.35.0"
2727
}
2828
}

‎patches/[email protected] ‎patches/[email protected]

File renamed without changes.

0 commit comments

Comments
 (0)