sorb/ThreadNet-Web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

Merge branch 'develop' into staging

Browse Source 
# Conflicts:
#	package.json
#	src/components/views/settings/tabs/user/GeneralUserSettingsTab.tsx
This commit is contained in:
ElementRobot
2023-06-01 16:50:29 +01:00
parent f988a930d3 610ee53257
commit c494e3c049
441 changed files with 11045 additions and 7350 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package.json
+10 -11
View File
@@ -68,7 +68,6 @@
"@testing-library/react-hooks": "^8.0.1",
"await-lock": "^2.1.0",
"blurhash": "^1.1.3",
"cheerio": "^1.0.0-rc.9",
"classnames": "^2.2.6",
"commonmark": "^0.30.0",
"counterpart": "^0.18.6",
@@ -83,6 +82,7 @@
"focus-visible": "^5.2.0",
"gfm.css": "^1.1.2",
"glob-to-regexp": "^0.4.1",
"grapheme-splitter": "^1.0.4",
"highlight.js": "^11.3.1",
"html-entities": "^2.0.0",
"is-ip": "^3.1.0",
@@ -96,16 +96,16 @@
"maplibre-gl": "^2.0.0",
"matrix-encrypt-attachment": "^1.0.3",
"matrix-events-sdk": "0.0.1",
"matrix-js-sdk": "25.2.0-rc.5",
"matrix-widget-api": "^1.3.1",
"matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
"matrix-widget-api": "^1.4.0",
"memoize-one": "^6.0.0",
"minimist": "^1.2.5",
"opus-recorder": "^8.0.3",
"pako": "^2.0.3",
"png-chunks-extract": "^1.0.0",
"posthog-js": "1.53.2",
"posthog-js": "1.57.2",
"proposal-temporal": "^0.9.0",
"qrcode": "1.5.1",
"qrcode": "1.5.3",
"re-resizable": "^6.9.0",
"react": "17.0.2",
"react-beautiful-dnd": "^13.1.0",
@@ -118,7 +118,6 @@
"sanitize-html": "2.10.0",
"tar-js": "^0.3.0",
"ua-parser-js": "^1.0.2",
"url": "^0.11.0",
"what-input": "^5.2.10",
"zxcvbn": "^4.4.2"
},
@@ -175,7 +174,7 @@
"@typescript-eslint/eslint-plugin": "^5.35.1",
"@typescript-eslint/parser": "^5.6.0",
"allchange": "^1.1.0",
"axe-core": "4.7.0",
"axe-core": "4.7.1",
"babel-jest": "^29.0.0",
"blob-polyfill": "^7.0.0",
"chokidar": "^3.5.1",
@@ -183,7 +182,7 @@
"cypress-axe": "^1.0.0",
"cypress-multi-reporters": "^1.6.1",
"cypress-real-events": "^1.7.1",
"eslint": "8.38.0",
"eslint": "8.40.0",
"eslint-config-google": "^0.14.0",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-deprecate": "^0.7.0",
@@ -193,7 +192,7 @@
"eslint-plugin-matrix-org": "1.1.0",
"eslint-plugin-react": "^7.28.0",
"eslint-plugin-react-hooks": "^4.3.0",
"eslint-plugin-unicorn": "^46.0.0",
"eslint-plugin-unicorn": "^47.0.0",
"fetch-mock-jest": "^1.5.1",
"fs-extra": "^11.0.0",
"jest": "29.3.1",
@@ -206,11 +205,11 @@
"mocha-junit-reporter": "^2.2.0",
"node-fetch": "2",
"postcss-scss": "^4.0.4",
"prettier": "2.8.7",
"prettier": "2.8.8",
"raw-loader": "^4.0.2",
"rimraf": "^5.0.0",
"stylelint": "^15.0.0",
"stylelint-config-standard": "^32.0.0",
"stylelint-config-standard": "^33.0.0",
"stylelint-scss": "^5.0.0",
"ts-node": "^10.9.1",
"typescript": "5.0.4",