Merge remote-tracking branch 'origin/develop' into release

1 files changed, 25 insertions, 26 deletions

diff --git a/package.json b/package.json
index 564b6c032..91e0731ed 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "productName": "Ferdi",
   "desktopName": "ferdi.desktop",
   "appId": "com.kytwb.ferdi",
-  "version": "5.6.1-beta.1",
+  "version": "5.6.1-nightly.37",
   "description": "Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more.",
   "copyright": "kytwb",
   "main": "index.js",
@@ -18,18 +18,16 @@
   "engine-strict": true,
   "scripts": {
     "prepare": "husky install",
-    "prestart": "npm run rebuild",
     "start": "electron ./build",
     "start:local": "cross-env USE_LOCAL_API=1 npm start",
     "start:live": "cross-env USE_LIVE_API=1 npm start",
     "dev": "cross-env NODE_ENV=development gulp dev",
     "test": "jest",
     "test:watch": "jest --watch",
-    "lint": "eslint \"{src,packages,uidev}/**/*.{js,jsx,ts,tsx}\" --quiet --fix",
+    "lint": "eslint \"{src,scripts,packages,uidev}/**/*.{js,jsx,ts,tsx}\" --quiet --fix",
     "manage-translations": "node ./src/i18n/manage-translations.js",
     "prebuild": "preval-build-info-cli && gulp build",
     "build": "electron-builder",
-    "rebuild": "electron-rebuild --force-abi=98",
     "commit": "git-cz",
     "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -u",
     "contributors": "all-contributors",
@@ -40,8 +38,8 @@
     "apply-branding": "node ./src/i18n/apply-branding.js",
     "update-submodules": "git submodule update --remote --force",
     "prepare-code": "npm run lint && npm run reformat-files && npm run manage-translations && npm run apply-branding",
-    "build-theme-info": "node src/scripts/build-theme-info.js",
-    "link-readme": "node src/scripts/link-readme.js",
+    "build-theme-info": "node scripts/build-theme-info.js",
+    "link-readme": "node scripts/link-readme.js",
     "minify-images": "./scripts/minify-images.sh",
     "start:server": "node src/internal-server/test.js"
   },
@@ -64,7 +62,6 @@
     "@electron/remote": "1.2.1",
     "@mdi/font": "5.9.55",
     "@mdi/js": "4.6.95",
-    "@meetfranz/electron-notification-state": "1.0.0",
     "@meetfranz/forms": "file:packages/forms",
     "@meetfranz/theme": "file:packages/theme",
     "@meetfranz/ui": "file:packages/ui",
@@ -80,7 +77,7 @@
     "darkreader": "4.9.34",
     "dbus-next": "0.9.2",
     "debug": "4.3.2",
-    "du": "0.1.0",
+    "du": "1.0.0",
     "electron-dl": "3.2.1",
     "electron-fetch": "1.7.3",
     "electron-find": "1.0.7",
@@ -89,13 +86,10 @@
     "electron-util": "0.17.0",
     "electron-window-state": "5.0.3",
     "fs-extra": "10.0.0",
-    "gulp-csso": "4.0.1",
-    "gulp-htmlmin": "5.0.1",
-    "gulp-if": "3.0.0",
-    "gulp-uglify": "3.0.2",
     "jsonwebtoken": "8.5.1",
     "jss": "10.7.1",
     "lodash": "4.17.21",
+    "macos-notification-state": "1.3.5",
     "macos-version": "5.2.1",
     "marked": "0.7.0",
     "mime-types": "2.1.32",
@@ -128,12 +122,9 @@
     "react-tooltip": "4.2.21",
     "route-parser": "0.0.5",
     "semver": "7.3.5",
-    "smoothscroll-polyfill": "0.4.4",
     "sqlite3": "5.0.0",
     "tar": "4.4.15",
-    "targz": "1.0.1",
-    "terser": "4.4.0",
-    "tslib": "2.3.0",
+    "tslib": "2.3.1",
     "useragent-generator": "1.1.1-amkt-22079-finish.0",
     "uuid": "3.3.3",
     "validator": "11.0.0",
@@ -151,18 +142,22 @@
     "@babel/plugin-syntax-dynamic-import": "7.8.3",
     "@babel/preset-env": "7.15.0",
     "@babel/preset-react": "7.14.5",
-    "@babel/register": "7.14.5",
+    "@babel/register": "7.15.3",
     "@commitlint/cli": "13.1.0",
     "@commitlint/config-conventional": "13.1.0",
+    "@tsconfig/node14": "1.0.1",
     "@types/color": "3.0.2",
+    "@types/du": "1.0.0",
     "@types/fs-extra": "9.0.12",
     "@types/lodash": "4.14.172",
     "@types/node": "14.17.6",
     "@types/react": "16.14.6",
     "@types/react-dom": "16.9.13",
+    "@types/route-parser": "0.1.3",
+    "@types/tar": "4.0.5",
     "@types/uuid": "3.4.9",
-    "@typescript-eslint/eslint-plugin": "4.29.0",
-    "@typescript-eslint/parser": "4.29.0",
+    "@typescript-eslint/eslint-plugin": "4.29.1",
+    "@typescript-eslint/parser": "4.29.1",
     "all-contributors-cli": "6.20.0",
     "babel-plugin-react-intl": "3.5.1",
     "commitizen": "4.2.4",
@@ -170,15 +165,14 @@
     "cross-env": "7.0.3",
     "cz-conventional-changelog": "3.3.0",
     "dotenv": "10.0.0",
-    "electron": "13.1.9",
-    "electron-builder": "22.12.0",
+    "electron": "13.2.2",
+    "electron-builder": "22.12.1",
     "electron-notarize": "1.1.0",
-    "electron-rebuild": "2.3.5",
     "eslint": "7.32.0",
     "eslint-config-airbnb": "18.2.1",
     "eslint-config-airbnb-typescript": "12.3.1",
     "eslint-config-prettier": "8.3.0",
-    "eslint-plugin-import": "2.23.4",
+    "eslint-plugin-import": "2.24.0",
     "eslint-plugin-jest": "24.4.0",
     "eslint-plugin-jsx-a11y": "6.4.1",
     "eslint-plugin-prettier": "3.4.0",
@@ -189,22 +183,27 @@
     "gulp-babel": "8.0.0",
     "gulp-cli": "2.3.0",
     "gulp-connect": "5.7.0",
+    "gulp-csso": "4.0.1",
+    "gulp-htmlmin": "5.0.1",
+    "gulp-if": "3.0.0",
     "gulp-sass": "5.0.0",
     "gulp-sass-variables": "1.2.0",
-    "hex-rgb": "3.0.0",
+    "gulp-typescript": "6.0.0-alpha.1",
+    "gulp-uglify": "3.0.2",
+    "hex-rgb": "4.3.0",
     "html-webpack-plugin": "4.5.2",
     "husky": "7.0.1",
     "jest": "27.0.6",
     "kebab-case": "1.0.1",
     "lerna": "4.0.0",
-    "mobx-react-devtools": "6.1.1",
     "mocha": "9.0.3",
     "node-abi": "2.30.0",
     "prettier": "2.3.2",
     "preval-build-info": "1.0.3",
     "react-intl-translations-manager": "5.0.3",
     "sass": "1.37.5",
-    "simple-git": "2.42.0",
+    "simple-git": "2.44.0",
+    "terser": "4.8.0",
     "ts-loader": "5.4.5",
     "typescript": "3.9.10",
     "webpack": "4.46.0",