Merge branch 'develop' into release

# Conflicts:
#	package-lock.json
#	package.json

1 files changed, 26 insertions, 26 deletions

diff --git a/package.json b/package.json
index 7cd375949..a8619bf15 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "productName": "Ferdi",
   "desktopName": "ferdi.desktop",
   "appId": "com.kytwb.ferdi",
-  "version": "5.6.3",
+  "version": "5.6.4-nightly.34",
   "description": "Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more.",
   "copyright": "kytwb",
   "main": "index.js",
@@ -35,8 +35,8 @@
     "contributors": "all-contributors",
     "reformat-files": "./node_modules/.bin/prettier --ignore-path .eslintignore --write --require-pragma \"**/*.{js,jsx,scss}\"",
     "apply-branding": "ts-node ./src/i18n/apply-branding.ts",
-    "update-submodules": "git submodule update --remote --force",
-    "prepare-code": "npm run lint && npm run reformat-files && npm run manage-translations && npm run apply-branding",
+    "update-submodules": "git submodule update --init --recursive --remote --rebase --force",
+    "prepare-code": "npm run lint:fix && npm run reformat-files && npm run manage-translations && npm run apply-branding",
     "link-readme": "ts-node scripts/link-readme.ts",
     "minify-images": "./scripts/minify-images.sh",
     "start:server": "ts-node src/internal-server/test.ts",
@@ -66,6 +66,7 @@
     "auto-launch": "^5.0.5",
     "btoa": "^1.2.1",
     "classnames": "^2.3.1",
+    "cld": "^2.7.1",
     "color": "^4.0.1",
     "csstype": "^3.0.9",
     "darkreader": "^4.9.39",
@@ -75,7 +76,7 @@
     "electron-fetch": "^1.7.4",
     "electron-find": "^1.0.7",
     "electron-react-titlebar": "^1.1.0",
-    "electron-updater": "^4.3.9",
+    "electron-updater": "^4.6.2",
     "electron-window-state": "^5.0.3",
     "fast-folder-size": "^1.5.0",
     "fs-extra": "^10.0.0",
@@ -87,8 +88,8 @@
     "minimist": "^1.2.5",
     "mobx": "^5.15.0",
     "mobx-localstorage": "^1.2.0",
-    "mobx-react": "^5.4.2",
-    "mobx-react-form": "1.35.1",
+    "mobx-react": "^6.3.1",
+    "mobx-react-form": "^2.0.9",
     "mobx-react-router": "^3.1.2",
     "moment": "^2.29.1",
     "ms": "^2.1.3",
@@ -104,7 +105,7 @@
     "react-dropzone": "^11.4.2",
     "react-electron-web-view": "^2.0.1",
     "react-intl": "^5.21.0",
-    "react-jss": "^8.6.1",
+    "react-jss": "^10.8.2",
     "react-loader": "^2.4.7",
     "react-modal": "^3.14.3",
     "react-router": "^3.2.6",
@@ -121,14 +122,14 @@
     "ws": "^8.2.3"
   },
   "devDependencies": {
-    "@babel/eslint-parser": "^7.16.0",
+    "@babel/eslint-parser": "^7.16.3",
     "@babel/plugin-proposal-class-properties": "^7.14.5",
     "@babel/plugin-proposal-decorators": "^7.16.0",
     "@babel/preset-env": "^7.16.0",
     "@babel/preset-react": "^7.14.5",
     "@babel/register": "^7.15.3",
-    "@commitlint/cli": "^14.1.0",
-    "@commitlint/config-conventional": "^14.1.0",
+    "@commitlint/cli": "^15.0.0",
+    "@commitlint/config-conventional": "^15.0.0",
     "@formatjs/cli": "^4.4.0",
     "@types/color": "^3.0.2",
     "@types/expect.js": "^0.3.29",
@@ -144,8 +145,8 @@
     "@types/tar": "^6.1.0",
     "@types/uuid": "^8.3.1",
     "@types/validator": "^13.6.4",
-    "@typescript-eslint/eslint-plugin": "^5.1.0",
-    "@typescript-eslint/parser": "^5.1.0",
+    "@typescript-eslint/eslint-plugin": "^5.3.1",
+    "@typescript-eslint/parser": "^5.3.1",
     "all-contributors-cli": "^6.20.0",
     "babel-plugin-formatjs": "^10.3.11",
     "commitizen": "^4.2.4",
@@ -153,20 +154,20 @@
     "cross-env": "^7.0.3",
     "cz-conventional-changelog": "^3.3.0",
     "dotenv": "^10.0.0",
-    "electron": "15.3.0",
-    "electron-builder": "22.14.5",
+    "electron": "15.3.3",
+    "electron-builder": "22.14.10",
     "electron-notarize": "^1.1.1",
-    "eslint": "^8.1.0",
-    "eslint-config-airbnb": "^18.2.1",
-    "eslint-config-airbnb-typescript": "^14.0.1",
+    "eslint": "^8.2.0",
+    "eslint-config-airbnb": "^19.0.0",
+    "eslint-config-airbnb-typescript": "^16.0.0",
     "eslint-config-prettier": "^8.3.0",
-    "eslint-plugin-import": "^2.25.2",
-    "eslint-plugin-jest": "^25.2.2",
-    "eslint-plugin-jsx-a11y": "^6.4.1",
+    "eslint-plugin-import": "^2.25.3",
+    "eslint-plugin-jest": "^25.2.4",
+    "eslint-plugin-jsx-a11y": "^6.5.1",
     "eslint-plugin-prettier": "^4.0.0",
-    "eslint-plugin-react": "^7.26.1",
-    "eslint-plugin-react-hooks": "^4.2.0",
-    "eslint-plugin-unicorn": "^37.0.1",
+    "eslint-plugin-react": "^7.27.0",
+    "eslint-plugin-react-hooks": "^4.3.0",
+    "eslint-plugin-unicorn": "^39.0.0",
     "expect.js": "^0.3.1",
     "gulp": "^4.0.2",
     "gulp-babel": "^8.0.0",
@@ -196,15 +197,14 @@
     "ts-loader": "^5.4.5",
     "ts-mocha": "^8.0.0",
     "ts-node": "^10.2.1",
-    "typescript": "4.2.4",
+    "typescript": "4.5.2",
     "wait-on": "^6.0.0",
     "webpack": "^4.46.0",
     "webpack-cli": "^3.3.12",
     "webpack-dev-server": "^3.11.2"
   },
   "optionalDependencies": {
-    "cld": "^2.7.0",
-    "node-mac-permissions": "^2.2.0"
+    "node-mac-permissions": "git@github.com:vraravam/node-mac-permissions.git#3cffec37379e6584627d831611a8ff12b57bbcdb"
   },
   "config": {
     "commitizen": {