updated dependencies and pulled new changes from vencord/vesktop
This commit is contained in:
parent
e90250592e
commit
a7249ec5a6
2 changed files with 4 additions and 12 deletions
|
@ -34,19 +34,11 @@
|
|||
"@typescript-eslint/parser": "^6.7.3",
|
||||
"@vencord/types": "^0.1.2",
|
||||
"dotenv": "^16.3.1",
|
||||
<<<<<<< HEAD
|
||||
"electron": "^26.2.2",
|
||||
"electron-builder": "^24.6.4",
|
||||
"esbuild": "^0.18.20",
|
||||
"eslint": "^8.50.0",
|
||||
"eslint-config-prettier": "^8.10.0",
|
||||
=======
|
||||
"electron": "^25.8.2",
|
||||
"electron-builder": "^24.6.3",
|
||||
"esbuild": "^0.18.17",
|
||||
"eslint": "^8.46.0",
|
||||
"eslint-config-prettier": "^8.9.0",
|
||||
>>>>>>> c2476a71eb56d29e0f12034965f6140cd88b3a39
|
||||
"eslint-import-resolver-alias": "^1.1.2",
|
||||
"eslint-plugin-license-header": "^0.6.0",
|
||||
"eslint-plugin-path-alias": "^1.0.0",
|
||||
|
|
|
@ -35,8 +35,8 @@ devDependencies:
|
|||
specifier: ^16.3.1
|
||||
version: 16.3.1
|
||||
electron:
|
||||
specifier: ^25.8.2
|
||||
version: 25.8.2
|
||||
specifier: ^26.2.2
|
||||
version: 26.2.2
|
||||
electron-builder:
|
||||
specifier: ^24.6.4
|
||||
version: 24.6.4
|
||||
|
@ -1610,8 +1610,8 @@ packages:
|
|||
- supports-color
|
||||
dev: true
|
||||
|
||||
/electron@25.8.2:
|
||||
resolution: {integrity: sha512-AM1ra6b16EQuO1bJtiA8ZiWqqFLLgVfxD56ykiy+EA5C63Hkx8OmIbe+5JAsLiTwRVvBZ4oCAj6wa2qT+iq8ww==}
|
||||
/electron@26.2.2:
|
||||
resolution: {integrity: sha512-Ihb3Zt4XYnHF52DYSq17ySkgFqJV4OT0VnfhUYZASAql7Vembz3VsAq7mB3OALBHXltAW34P8BxTIwTqZaMS3g==}
|
||||
engines: {node: '>= 12.20.55'}
|
||||
hasBin: true
|
||||
requiresBuild: true
|
||||
|
|
Reference in a new issue