nikrozman/element-desktop
1
0
Fork 0
Code Issues Pull Requests 1 Actions 2 Packages Projects Releases Activity

Merge remote-tracking branch 'github.com/develop' into develop

Browse Source 
# Conflicts:
#	.github/workflows/build_and_deploy.yaml
#	.github/workflows/build_and_test.yaml
#	.github/workflows/build_linux.yaml
#	.github/workflows/build_macos.yaml
#	.github/workflows/build_prepare.yaml
#	.github/workflows/dockerbuild.yaml
#	.github/workflows/static_analysis.yaml
#	.github/workflows/triage-stale.yml
#	package.json
This commit is contained in:
Nik Rozman
2025-06-01 20:25:31 +02:00
parent 22fc0e624e b4c2bc7165
commit 62fd040641
51 changed files with 3587 additions and 1663 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
package.json
View File

@@ -3,7 +3,7 @@
"productName": "Element Piskot",
"main": "lib/electron-main.js",
"exports": "./lib/electron-main.js",
"version": "1.11.97-piskot",
"version": "1.11.101-piskot",
"description": "Element: the future of secure communication",
"author": "Element",
"homepage": "https://element.io",
@@ -74,22 +74,22 @@
"@babel/core": "^7.18.10",
"@babel/preset-env": "^7.18.10",
"@babel/preset-typescript": "^7.18.6",
"@electron/asar": "3.4.1",
"@playwright/test": "1.51.1",
"@electron/asar": "4.0.0",
"@playwright/test": "1.52.0",
"@stylistic/eslint-plugin": "^4.0.0",
"@types/auto-launch": "^5.0.1",
"@types/counterpart": "^0.18.1",
"@types/minimist": "^1.2.1",
"@types/node": "18.19.86",
"@types/node": "18.19.105",
"@types/pacote": "^11.1.1",
"@typescript-eslint/eslint-plugin": "^8.0.0",
"@typescript-eslint/parser": "^8.0.0",
"app-builder-lib": "26.0.12",
"app-builder-lib": "26.0.15",
"chokidar": "^4.0.0",
"detect-libc": "^2.0.0",
"electron": "35.1.5",
"electron-builder": "26.0.12",
"electron-builder-squirrel-windows": "26.0.12",
"electron": "36.3.2",
"electron-builder": "26.0.15",
"electron-builder-squirrel-windows": "26.0.15",
"electron-devtools-installer": "^4.0.0",
"eslint": "^8.26.0",
"eslint-config-google": "^0.14.0",
@@ -101,11 +101,10 @@
"glob": "^11.0.0",
"husky": "^9.1.6",
"knip": "^5.0.0",
"lint-staged": "^15.2.10",
"lint-staged": "^16.0.0",
"matrix-web-i18n": "^3.2.1",
"mkdirp": "^3.0.0",
"pacote": "^21.0.0",
"plist": "^3.1.0",
"prettier": "^3.0.0",
"rimraf": "^6.0.0",
"tar": "^7.0.0",
@@ -116,7 +115,8 @@
"matrix-seshat": "^4.0.1"
},
"resolutions": {
"@types/node": "18.19.86",
"config-file-ts": "0.2.8-rc1"
"@types/node": "18.19.105",
"config-file-ts": "0.2.8-rc1",
"node-abi": "4.9.0"
}
}