1 files changed, 42 insertions, 31 deletions

diff --git a/package.json b/package.json
index a14367bf2..ee2b12e99 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "franz",
   "productName": "Franz",
   "appId": "com.meetfranz.franz",
-  "version": "5.0.0-beta.15",
+  "version": "5.0.0-beta.18",
   "description": "Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more.",
   "copyright": "adlk x franz - Stefan Malzner",
   "main": "index.js",
@@ -10,35 +10,38 @@
   "repository": "https://github.com/meetfranz/franz.git",
   "private": true,
   "scripts": {
-    "start": "electron ./build",
-    "start:local": "cross-env LOCAL_API=1 yarn start",
-    "start:live": "cross-env LIVE_API=1 yarn start",
+    "prestart": "npm run rebuild",
+    "start": "DEBUG=Franz:* electron ./build",
+    "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",
     "lint": "eslint src",
     "sign": "gulp sign",
     "prebuild": "gulp build",
     "build": "node_modules/.bin/electron-builder --publish onTag",
     "rebuild": "node_modules/.bin/electron-rebuild",
-    "precommit": "yarn lint",
     "commit": "git-cz",
-    "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s"
+    "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s",
+    "reformat-files": "./node_modules/.bin/prettier --ignore-path .eslintignore --write --require-pragma \"**/*.{js,jsx,scss}\""
   },
   "keywords": [],
   "author": "Stefan Malzner <stefan@adlk.io>",
   "license": "Apache-2.0",
   "dependencies": {
+    "@babel/polyfill": "^7.0.0",
+    "@babel/runtime": "^7.0.0",
     "@meetfranz/electron-notification-state": "^1.0.0",
     "address-rfc2822": "^2.0.1",
     "auto-launch": "https://github.com/meetfranz/node-auto-launch.git",
-    "babel-polyfill": "^6.23.0",
-    "babel-runtime": "^6.23.0",
     "classnames": "^2.2.5",
+    "debug-electron": "^0.0.4",
     "du": "^0.1.0",
-    "electron-fetch": "^1.1.0",
+    "electron-fetch": "1.3.0",
+    "electron-react-titlebar": "0.8.1",
     "electron-spellchecker": "^1.1.2",
-    "electron-updater": "^2.4.3",
+    "electron-updater": "^4.0.4",
     "electron-window-state": "^4.1.0",
-    "fs-extra": "^3.0.1",
+    "fs-extra": "7.0.1",
     "gulp-cli": "1.2.2",
     "ini": "^1.3.4",
     "jshashes": "^1.0.6",
@@ -76,24 +79,23 @@
     "uuid": "^3.0.1"
   },
   "devDependencies": {
-    "babel-eslint": "^7.1.1",
-    "babel-plugin-transform-class-properties": "^6.19.0",
-    "babel-plugin-transform-decorators-legacy": "^1.3.4",
-    "babel-plugin-transform-flow-strip-types": "^6.22.0",
-    "babel-preset-env": "^1.5.2",
-    "babel-preset-es2015": "^6.22.0",
-    "babel-preset-es2016": "^6.16.0",
-    "babel-preset-es2017": "^6.16.0",
-    "babel-preset-react": "^6.23.0",
-    "babel-preset-stage-0": "^6.22.0",
-    "babel-preset-stage-1": "^6.22.0",
+    "@adlk/misty": "^0.1.1",
+    "@babel/core": "^7.0.0",
+    "@babel/plugin-proposal-class-properties": "^7.0.0",
+    "@babel/plugin-proposal-decorators": "^7.0.0",
+    "@babel/plugin-proposal-export-default-from": "^7.0.0",
+    "@babel/plugin-proposal-throw-expressions": "^7.0.0",
+    "@babel/plugin-syntax-dynamic-import": "^7.0.0",
+    "@babel/plugin-transform-regenerator": "^7.0.0",
+    "@babel/preset-env": "^7.0.0",
+    "@babel/preset-react": "^7.0.0",
+    "@babel/register": "^7.0.0",
+    "babel-eslint": "^10.0.1",
     "cross-env": "^5.0.5",
     "cz-conventional-changelog": "^2.0.0",
-    "del": "^2.2.2",
     "dotenv": "^4.0.0",
-    "electron": "^1.7.12",
-    "electron-builder": "19.15.1",
-    "electron-packager": "^8.7.0",
+    "electron": "^2.0.13",
+    "electron-builder": "^20.36.2",
     "electron-rebuild": "^1.6.0",
     "eslint": "^4.7.1",
     "eslint-config-airbnb": "^14.1.0",
@@ -101,17 +103,26 @@
     "eslint-plugin-import": "^2.2.0",
     "eslint-plugin-jsx-a11y": "^3.0.0",
     "eslint-plugin-react": "^6.10.0",
-    "gulp": "gulpjs/gulp#4.0",
-    "gulp-babel": "^6.1.2",
-    "gulp-github-release": "^1.2.1",
-    "gulp-sass": "^3.1.0",
+    "gulp": "^4.0.0",
+    "gulp-babel": "^8.0.0",
+    "gulp-sass": "^4.0.2",
     "gulp-sass-variables": "^1.1.1",
     "gulp-server-livereload": "^1.9.2",
-    "node-sass": "^4.7.2"
+    "husky": "^1.1.4",
+    "node-sass": "^4.7.2",
+    "prettier": "1.15.2"
   },
   "config": {
     "commitizen": {
       "path": "./node_modules/cz-conventional-changelog"
     }
+  },
+  "browserslist": [
+    "Chrome 66"
+  ],
+  "husky": {
+    "hooks": {
+      "pre-push": "npm run lint && npm run reformat-files"
+    }
   }
 }