Merge branch 'develop' into 'release' and bump version to 6.2.3v6.2.3

1 files changed, 31 insertions, 65 deletions

diff --git a/package.json b/package.json
index 0b2a50c07..834112a29 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "productName": "Ferdium",
   "desktopName": "ferdium.desktop",
   "appId": "org.ferdium.ferdium-app",
-  "version": "6.2.2",
+  "version": "6.2.3",
   "description": "Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more.",
   "author": "Ferdium Contributors <hello@ferdium.org> (https://ferdium.org/)",
   "license": "Apache-2.0",
@@ -14,7 +14,7 @@
   "private": true,
   "engines": {
     "node": "16.18.1",
-    "pnpm": "7.17.1"
+    "pnpm": "7.18.2"
   },
   "engine-strict": true,
   "scripts": {
@@ -22,19 +22,18 @@
     "start": "electron ./build",
     "start:local": "cross-env USE_LOCAL_API=1 pnpm start",
     "start:live": "cross-env USE_LIVE_API=1 pnpm start",
-    "start:all-dev": "concurrently \"pnpm dev\" \"wait-on http://localhost:8080 && pnpm start\"",
-    "dev": "cross-env NODE_ENV=development gulp dev",
+    "start:all-dev": "concurrently \"pnpm dev\" \"wait-on http-get://localhost:8080 && pnpm start\"",
+    "dev": "node esbuild.mjs --watch",
     "test": "jest",
     "test:watch": "jest --watch",
-    "lint": "tsc --noEmit && eslint \"{src,test,scripts}/**/*.{js,jsx,ts,tsx}\"",
-    "lint:fix": "eslint --fix \"{src,test,scripts}/**/*.{js,jsx,ts,tsx}\"",
-    "extract": "formatjs extract \"src/**/*.{js,jsx,ts,tsx}\" --ignore=\"**/*.d.ts\" --out-file temp.json --flatten --id-interpolation-pattern '[sha512:contenthash:base64:6]' --preserve-whitespace",
+    "lint": "tsc --noEmit && eslint \"{src,test,scripts}/**/*.{js,jsx,mjs,ts,tsx}\"",
+    "lint:fix": "eslint --fix \"{src,test,scripts}/**/*.{js,jsx,mjs,ts,tsx}\"",
+    "extract": "formatjs extract \"src/**/*.{js,jsx,mjs,ts,tsx}\" --ignore=\"**/*.d.ts\" --out-file temp.json --flatten --id-interpolation-pattern '[sha512:contenthash:base64:6]' --preserve-whitespace",
     "compile": "formatjs compile \"temp.json\" --out-file src/i18n/locales/en-US.json",
     "manage-translations": "pnpm extract && pnpm compile && rimraf temp.json",
-    "build": "preval-build-info-cli && gulp build && electron-builder",
+    "build": "preval-build-info-cli && node esbuild.mjs && electron-builder",
     "contributors": "all-contributors",
-    "reformat-files": "prettier --ignore-path .eslintignore --write --require-pragma \"**/*.{js,jsx,scss}\"",
-    "update-submodules": "git submodule update --init --recursive --remote --rebase --force",
+    "reformat-files": "prettier --ignore-path .eslintignore --write --require-pragma \"**/*.{js,jsx,mjs,ts,tsx,scss}\"",
     "prepare-code": "pnpm lint:fix && pnpm reformat-files && pnpm manage-translations",
     "link-readme": "ts-node scripts/link-readme.ts",
     "minify-images": "./scripts/minify-images.sh",
@@ -56,7 +55,7 @@
     "@adonisjs/session": "1.1.0",
     "@adonisjs/shield": "1.1.0",
     "@adonisjs/validator": "5.1.0",
-    "@electron/remote": "2.0.8",
+    "@electron/remote": "2.0.9",
     "@krisdages/electron-process-manager": "3.0.0",
     "@mdi/js": "6.9.96",
     "@mdi/react": "1.6.1",
@@ -86,7 +85,7 @@
     "languagedetect": "2.0.0",
     "lodash": "4.17.21",
     "macos-version": "5.2.1",
-    "markdown-to-jsx": "7.1.7",
+    "markdown-to-jsx": "7.1.8",
     "mime-types": "2.1.35",
     "minimist": "1.2.7",
     "mobx": "6.7.0",
@@ -106,7 +105,7 @@
     "react-dom": "17.0.2",
     "react-dropzone": "11.7.1",
     "react-electron-web-view": "2.0.1",
-    "react-intl": "6.2.1",
+    "react-intl": "6.2.5",
     "react-jss": "10.9.2",
     "react-loader": "2.4.7",
     "react-modal": "3.16.1",
@@ -118,8 +117,8 @@
     "route-parser": "0.0.5",
     "sanitize-filename": "1.6.3",
     "semver": "7.3.8",
-    "sqlite3": "5.1.2",
-    "tar": "6.1.12",
+    "sqlite3": "5.1.4",
+    "tar": "6.1.13",
     "tslib": "2.4.1",
     "useragent-generator": "1.1.1-amkt-22079-finish.0",
     "uuid": "8.3.2",
@@ -127,32 +126,15 @@
     "ws": "8.11.0"
   },
   "devDependencies": {
-    "@babel/core": "7.20.5",
-    "@babel/eslint-parser": "7.19.1",
-    "@babel/plugin-proposal-class-properties": "7.18.6",
-    "@babel/plugin-proposal-decorators": "7.20.5",
-    "@babel/preset-env": "7.20.2",
-    "@babel/preset-react": "7.18.6",
-    "@babel/preset-typescript": "7.18.6",
-    "@babel/register": "7.18.9",
     "@commitlint/cli": "17.3.0",
     "@commitlint/config-conventional": "17.3.0",
     "@electron/notarize": "1.2.3",
-    "@formatjs/cli": "5.1.3",
+    "@formatjs/cli": "5.1.10",
     "@types/color": "3.0.3",
     "@types/expect.js": "0.3.29",
     "@types/fs-extra": "9.0.13",
-    "@types/gulp": "4.0.10",
-    "@types/gulp-babel": "6.1.30",
-    "@types/gulp-connect": "5.0.5",
-    "@types/gulp-csso": "4.0.1",
-    "@types/gulp-htmlmin": "1.3.32",
-    "@types/gulp-if": "0.0.34",
-    "@types/gulp-sass": "5.0.0",
-    "@types/gulp-sass-variables": "1.2.2",
-    "@types/gulp-terser": "1.2.1",
     "@types/jest": "28.1.4",
-    "@types/lodash": "4.14.190",
+    "@types/lodash": "4.14.191",
     "@types/mime-types": "2.1.1",
     "@types/ms": "0.7.31",
     "@types/node": "16.11.33",
@@ -163,16 +145,19 @@
     "@types/tar": "6.1.3",
     "@types/uuid": "8.3.4",
     "@types/validator": "13.7.10",
-    "@typescript-eslint/eslint-plugin": "5.45.0",
-    "@typescript-eslint/parser": "5.45.0",
+    "@typescript-eslint/eslint-plugin": "5.46.1",
+    "@typescript-eslint/parser": "5.46.1",
     "all-contributors-cli": "6.24.0",
-    "babel-plugin-formatjs": "10.3.31",
+    "chalk": "5.2.0",
     "concurrently": "7.6.0",
     "cross-env": "7.0.3",
-    "dotenv": "16.0.3",
     "electron": "21.3.3",
     "electron-builder": "24.0.0-alpha.4",
-    "eslint": "8.28.0",
+    "esbuild": "0.16.8",
+    "esbuild-plugin-copy": "2.0.1",
+    "esbuild-runner": "2.2.2",
+    "esbuild-sass-plugin": "2.4.4",
+    "eslint": "8.30.0",
     "eslint-config-airbnb": "19.0.4",
     "eslint-config-airbnb-typescript": "17.0.0",
     "eslint-config-prettier": "8.5.0",
@@ -183,36 +168,17 @@
     "eslint-plugin-react": "7.31.11",
     "eslint-plugin-react-hooks": "4.6.0",
     "eslint-plugin-unicorn": "42.0.0",
-    "gulp": "4.0.2",
-    "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-rename": "2.0.0",
-    "gulp-sass": "5.1.0",
-    "gulp-sass-variables": "1.2.0",
-    "gulp-terser": "2.1.0",
-    "gulp-typescript": "6.0.0-alpha.1",
-    "gulp-uglify": "3.0.2",
-    "hex-rgb": "4.3.0",
+    "gulp-livereload": "4.0.2",
     "husky": "8.0.2",
     "is-ci": "3.0.1",
     "jest": "28.1.2",
-    "kebab-case": "1.0.2",
-    "prettier": "2.8.0",
+    "prettier": "2.8.1",
     "preval-build-info": "1.0.3",
     "rimraf": "3.0.2",
-    "sass": "1.56.1",
-    "simple-git": "3.15.0",
-    "ts-loader": "9.4.1",
-    "ts-node": "10.9.1",
-    "typescript": "4.9.3",
-    "wait-on": "6.0.1",
-    "webpack": "5.75.0",
-    "webpack-cli": "4.10.0",
-    "webpack-dev-server": "4.11.1"
+    "simple-git": "3.15.1",
+    "tiny-glob": "0.2.9",
+    "typescript": "4.9.4",
+    "wait-on": "6.0.1"
   },
   "pnpm": {
     "overrides": {
@@ -223,7 +189,7 @@
     "usocket": "_EXCLUDED_"
   },
   "optionalDependencies": {
-    "macos-notification-state": "github:ferdium/macos-notification-state#394f33c2546960391bde2519aa30180dd3506492",
+    "macos-notification-state": "github:ferdium/macos-notification-state#27a024c367c6eef71047a3c7b30a845839c96c67",
     "node-mac-permissions": "2.2.1"
   },
   "browserslist": [