Merge branch 'develop' of github.com:vector-im/element-desktop into t3chguy/types

# Conflicts:
#	yarn.lock
This commit is contained in:
Michael Telatynski 2022-12-01 06:31:25 +00:00
commit 95b600e49d
No known key found for this signature in database
GPG key ID: 98BC6A2B829297FE
2 changed files with 421 additions and 415 deletions

View file

@ -58,7 +58,7 @@
"@types/auto-launch": "^5.0.1", "@types/auto-launch": "^5.0.1",
"@types/counterpart": "^0.18.1", "@types/counterpart": "^0.18.1",
"@types/detect-libc": "^1.0.0", "@types/detect-libc": "^1.0.0",
"@types/jest": "^28", "@types/jest": "^29.0.0",
"@types/minimist": "^1.2.1", "@types/minimist": "^1.2.1",
"@types/mkdirp": "^1.0.2", "@types/mkdirp": "^1.0.2",
"@types/node": "^16", "@types/node": "^16",
@ -69,7 +69,7 @@
"allchange": "^1.0.6", "allchange": "^1.0.6",
"app-builder-lib": "^22.14.10", "app-builder-lib": "^22.14.10",
"asar": "^2.0.1", "asar": "^2.0.1",
"babel-jest": "^28.1.3", "babel-jest": "^29.0.0",
"chokidar": "^3.5.2", "chokidar": "^3.5.2",
"detect-libc": "^1.0.3", "detect-libc": "^1.0.3",
"electron": "^21", "electron": "^21",
@ -80,12 +80,12 @@
"eslint-config-google": "^0.14.0", "eslint-config-google": "^0.14.0",
"eslint-plugin-import": "^2.25.4", "eslint-plugin-import": "^2.25.4",
"eslint-plugin-matrix-org": "^0.7.0", "eslint-plugin-matrix-org": "^0.7.0",
"eslint-plugin-unicorn": "^44.0.2", "eslint-plugin-unicorn": "^45.0.0",
"expect-playwright": "^0.8.0", "expect-playwright": "^0.8.0",
"find-npm-prefix": "^1.0.2", "find-npm-prefix": "^1.0.2",
"fs-extra": "^8.1.0", "fs-extra": "^10.0.0",
"glob": "^7.1.6", "glob": "^7.1.6",
"jest": "^28", "jest": "^29.0.0",
"matrix-web-i18n": "^1.3.0", "matrix-web-i18n": "^1.3.0",
"mkdirp": "^1.0.3", "mkdirp": "^1.0.3",
"needle": "^2.5.0", "needle": "^2.5.0",
@ -94,7 +94,7 @@
"playwright": "^1.25.0", "playwright": "^1.25.0",
"rimraf": "^3.0.2", "rimraf": "^3.0.2",
"tar": "^6.1.2", "tar": "^6.1.2",
"ts-jest": "^28.0.8", "ts-jest": "^29.0.0",
"ts-node": "^10.9.1", "ts-node": "^10.9.1",
"typescript": "4.5.5" "typescript": "4.5.5"
}, },

824
yarn.lock

File diff suppressed because it is too large Load diff