Merge tag 'v5.1.0'

# Conflicts:
#	README.md
#	src/components/layout/AppLayout.js

1 files changed, 57 insertions, 23 deletions

diff --git a/package.json b/package.json
index a3788a51d..c1a8c310f 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "franz",
   "productName": "Franz",
   "appId": "com.meetfranz.franz",
-  "version": "5.0.0-beta.24",
+  "version": "5.1.0",
   "description": "Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more.",
   "copyright": "adlk x franz - Stefan Malzner",
   "main": "index.js",
@@ -15,14 +15,20 @@
     "start:local": "cross-env LOCAL_API=1 npm start",
     "start:live": "cross-env LIVE_API=1 npm start",
     "dev": "cross-env NODE_ENV=development gulp dev",
+    "test": "jest",
+    "test:watch": "jest --watch",
     "lint": "eslint src",
+    "manage-translations": "node ./src/i18n/manage-translations.js",
     "sign": "gulp sign",
     "prebuild": "gulp build",
     "build": "npx electron-builder --publish onTag",
-    "rebuild": "npx electron-builder install-app-deps",
+    "rebuild": "npx electron-rebuild",
     "commit": "git-cz",
     "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s",
-    "reformat-files": "npx prettier --ignore-path .eslintignore --write --require-pragma \"**/*.{js,jsx,scss}\""
+    "reformat-files": "./node_modules/.bin/prettier --ignore-path .eslintignore --write --require-pragma \"**/*.{js,jsx,scss}\"",
+    "packages": "npx lerna publish --no-git-tag-version",
+    "uidev": "cd uidev && webpack-dev-server",
+    "postinstall": "npx lerna run prepare"
   },
   "keywords": [],
   "author": "Stefan Malzner <stefan@adlk.io>",
@@ -31,38 +37,38 @@
     "@babel/polyfill": "^7.0.0",
     "@babel/runtime": "^7.0.0",
     "@meetfranz/electron-notification-state": "^1.0.0",
+    "@meetfranz/forms": "file:packages/forms",
+    "@meetfranz/theme": "file:packages/theme",
+    "@meetfranz/ui": "file:packages/ui",
     "address-rfc2822": "^2.0.1",
     "auto-launch": "https://github.com/meetfranz/node-auto-launch.git",
     "classnames": "2.2.6",
-    "debug-electron": "^0.0.4",
+    "cld3-asm": "1.0.1",
     "du": "^0.1.0",
     "electron-dl": "1.12.0",
     "electron-fetch": "1.3.0",
     "electron-hunspell": "0.1.1",
+    "electron-is-dev": "1.0.1",
     "electron-react-titlebar": "0.8.1",
     "electron-updater": "4.0.6",
-    "electron-window-state": "^4.1.0",
+    "electron-window-state": "5.0.3",
     "fs-extra": "7.0.1",
-    "gulp-cli": "1.2.2",
     "hex-to-rgba": "1.0.2",
-    "ini": "^1.3.4",
-    "jsonwebtoken": "^7.4.1",
-    "keymaster": "^1.6.2",
+    "jsonwebtoken": "8.5.1",
     "lodash": "^4.17.4",
+    "marked": "0.6.1",
     "mdi": "^1.9.33",
     "mime-types": "2.1.21",
-    "minimist": "^1.2.0",
-    "mkdirp": "^0.5.1",
     "mobx": "5.7.0",
     "mobx-localstorage": "1.1.0",
     "mobx-react": "5.4.2",
     "mobx-react-form": "1.35.1",
     "mobx-react-router": "3.1.2",
     "moment": "^2.17.1",
+    "ms": "2.1.1",
     "normalize-url": "^1.9.1",
     "pretty-bytes": "^4.0.2",
     "prop-types": "^15.5.10",
-    "prop-types-extended": "^0.2.1",
     "react": "16.6.3",
     "react-addons-css-transition-group": "15.6.2",
     "react-dom": "16.6.3",
@@ -79,12 +85,13 @@
     "semver": "^5.4.1",
     "smoothscroll-polyfill": "^0.3.4",
     "tar": "^4.0.2",
-    "uuid": "^3.0.1"
+    "uuid": "^3.0.1",
+    "ws": "6.2.1"
   },
   "devDependencies": {
     "@adlk/misty": "^0.1.1",
     "@babel/cli": "7.0.0",
-    "@babel/core": "7.0.0",
+    "@babel/core": "^7.2.2",
     "@babel/plugin-proposal-class-properties": "^7.0.0",
     "@babel/plugin-proposal-decorators": "^7.0.0",
     "@babel/plugin-proposal-export-default-from": "^7.0.0",
@@ -94,32 +101,59 @@
     "@babel/preset-env": "^7.0.0",
     "@babel/preset-react": "^7.0.0",
     "@babel/register": "7.0.0",
+    "@types/classnames": "^2.2.6",
+    "@types/color": "^3.0.0",
+    "@types/color-convert": "^1.9.0",
+    "@types/jss": "^9.5.7",
+    "@types/lodash": "^4.14.119",
+    "@types/react": "^16.7.18",
+    "@types/react-dom": "16.0.11",
+    "@types/react-jss": "^8.6.0",
+    "@types/uuid": "3.4.4",
     "babel-eslint": "10.0.1",
+    "babel-loader": "^8.0.4",
+    "babel-plugin-react-intl": "3.0.1",
     "conventional-changelog-cli": "2.0.11",
     "cross-env": "^5.0.5",
     "cz-conventional-changelog": "2.1.0",
     "dotenv": "^4.0.0",
-    "electron": "4.0.2",
+    "electron": "4.1.4",
     "electron-builder": "20.38.4",
-    "electron-rebuild": "^1.6.0",
+    "electron-rebuild": "1.8.4",
     "eslint": "5.10.0",
     "eslint-config-airbnb": "17.1.0",
     "eslint-loader": "^1.9.0",
     "eslint-plugin-import": "2.14.0",
+    "eslint-plugin-jest": "22.4.1",
     "eslint-plugin-jsx-a11y": "6.1.2",
     "eslint-plugin-react": "7.11.1",
+    "expect.js": "0.3.1",
     "gulp": "^4.0.0",
     "gulp-babel": "^8.0.0",
+    "gulp-cli": "1.2.2",
     "gulp-sass": "^4.0.2",
-    "gulp-sass-variables": "^1.1.1",
+    "gulp-sass-variables": "1.1.1",
     "gulp-server-livereload": "^1.9.2",
     "hex-rgb": "3.0.0",
+    "html-webpack-plugin": "4.0.0-beta.5",
     "husky": "^1.1.4",
-    "install": "0.12.2",
+    "jest": "24.7.1",
     "kebab-case": "1.0.0",
-    "node-sass": "^4.7.2",
-    "npm": "6.5.0",
-    "prettier": "1.15.2"
+    "lerna": "^3.8.0",
+    "mobx-react-devtools": "6.0.3",
+    "mocha": "5.2.0",
+    "node-sass": "4.11.0",
+    "prettier": "1.15.2",
+    "react-intl-translations-manager": "5.0.3",
+    "terser-webpack-plugin": "1.2.1",
+    "ts-loader": "5.3.2",
+    "tslint": "5.12.0",
+    "tslint-config-airbnb": "5.11.1",
+    "typescript": "3.2.2",
+    "webpack": "4.28.3",
+    "webpack-cli": "3.2.1",
+    "webpack-dev-server": "3.1.14",
+    "webpack-node-externals": "1.7.2"
   },
   "config": {
     "commitizen": {
@@ -127,11 +161,11 @@
     }
   },
   "browserslist": [
-    "Chrome 66"
+    "Chrome 69"
   ],
   "husky": {
     "hooks": {
-      "pre-push": "npm run lint && npm run reformat-files"
+      "pre-push": "npm run lint && npm run reformat-files && npm run manage-translations"
     }
   }
 }