Merge branch 'release/5.0.0-beta.19'

.babelrc

@@ -1,19 +1,14 @@
 {
   "presets": [
-    [
-      "babel-preset-env",
-      {
-        "targets": {
-          "electron": "1.7.2"
-        }
-      }
-    ],
-    "babel-preset-react"
+    "@babel/env",
+    "@babel/react"
   ],
   "plugins": [
-    "transform-decorators-legacy",
-    "transform-flow-strip-types",
-    "transform-class-properties",
+    ["@babel/plugin-proposal-decorators", { "legacy": true }],
+    "@babel/proposal-export-default-from",
+    ["@babel/proposal-class-properties", { "loose": true }],
+    "@babel/proposal-throw-expressions",
+    "@babel/syntax-dynamic-import"
   ],
   "sourceMaps": "inline"
 }

.eslintignore

@@ -1 +1,2 @@
 build/
+out/

.eslintrc

@@ -6,12 +6,14 @@
     "import/no-extraneous-dependencies": 0,
     "import/no-unresolved": [2, {
       "ignore": ["electron"]
-    }],
+      }],
+    "import/prefer-default-export": 0,
     "linebreak-style": 0,
     "react/prefer-stateless-function": 0,
     "react/jsx-filename-extension": [1, {
       "extensions": [".js", ".jsx"]
     }],
+    "react/forbid-prop-types": 1,
     "no-underscore-dangle": 0,
     "max-len": 0,
     "class-methods-use-this": 0,

.gitignore

@@ -7,3 +7,4 @@ build
 .stage
 .env
 yarn-error.log
+npm-debug.log*

.npmrc

@@ -0,0 +1 @@
+save-exact = true

.nvmrc

@@ -1 +1 @@
-8.2.1
+10.13.0

.travis.yml

@@ -1,28 +1,28 @@
 matrix:
   include:
   - os: linux
-    dist: trusty
-    sudo: required
+    dist: xenial
+    addons:
+      apt:
+        packages:
+        - libx11-dev
+        - libxext-dev
+        - libxss-dev
+        - libxkbfile-dev
   - os: osx
     osx_image: xcode8.3
 
 language: node_js
 
 before_script:
-- yarn add global node-sass
-- yarn install
+- npm install node-sass -g
+- npm ci
 
 script:
-- yarn lint
-- travis_wait yarn build
+- npm run lint
+- travis_wait npm run build
 
-node_js:
-- '8'
-
-before_install:
-- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt install libx11-dev libxext-dev libxss-dev libxkbfile-dev; fi
-
-cache: yarn
+cache: npm
 
 notifications:
   email: false

CHANGELOG.md

@@ -45,7 +45,7 @@
 
 ### General
 * **App:** Update Electron version to 1.7.12 (fixes critical security vulnerability CVE-2018–1000006 ) ([c67d7d1](https://github.com/meetfranz/franz/commit/c67d7d1))
-* **Translations:** Improved translations. **[A million thanks to the amazing community. 🎉](http://i18n.meetfranz.com/)**
+* **Translations:** Improved translations. **[A million thanks to the amazing community. 🎉](https://i18n.meetfranz.com/)**
 
 ### Features
 * **App:** Invite Friends in Settings ([ab33c44](https://github.com/meetfranz/franz/commit/ab33c44))
@@ -116,7 +116,7 @@ fix(App): Bugfix Fix memory leak in recipe polling loop
 * **Service:** Add option to display disabled services in tabs ([1839eff](https://github.com/meetfranz/franz/commit/1839eff))
 * **Service:** Add option to mute service ([b405ba1](https://github.com/meetfranz/franz/commit/b405ba1))
 * **Service:** Add dialog to reload crashed services ([259d40c](https://github.com/meetfranz/franz/commit/259d40c)) ([dannyqiu](https://github.com/dannyqiu))
-* **Translations:** Added new translations and improved existing ones. **[A million thanks to the amazing community.](http://i18n.meetfranz.com/)**
+* **Translations:** Added new translations and improved existing ones. **[A million thanks to the amazing community.](https://i18n.meetfranz.com/)**
 
 
 ### Bug Fixes

CONTRIBUTING.md

@@ -33,4 +33,4 @@ As a basic rule, before filing issues, feature requests or anything else. Take a
 * When only changing documentation, include `[ci skip]` in the commit description
 
 ### Javascript
-* Please use `es-lint` and the defined rules to maintain a consistent style  
+* Please use `es-lint` and the defined rules to maintain a consistent style

README.md

@@ -5,7 +5,7 @@
 
 # Franz 5 (beta)
 [![Build status Windows](https://ci.appveyor.com/api/projects/status/9yman4ye19x4274o/branch/master?svg=true)](https://ci.appveyor.com/project/adlk/franz/branch/master)
- [![Build Status Mac](https://travis-ci.org/meetfranz/franz.svg?branch=master)](https://travis-ci.org/meetfranz/franz) [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](http://meetfranz.com/payment.html)
+ [![Build Status Mac](https://travis-ci.org/meetfranz/franz.svg?branch=master)](https://travis-ci.org/meetfranz/franz) [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://meetfranz.com/payment.html)
 
 Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more.
 
@@ -25,34 +25,23 @@ Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many mor
 #### Install Linux OS dependencies
 [Guide: Linux distribution specific dependencies](docs/linux.md)
 
-#### Install yarn
-##### MacOS
-```bash
-$ brew install yarn
-```
-##### Windows
-[Download installer](https://yarnpkg.com/latest.msi)
-
-##### Linux
-[Install Yarn on Linux](https://yarnpkg.com/lang/en/docs/install/)
-
 #### Fix native modules to match current electron node version
 ```bash
-$ yarn run rebuild
+$ npm run rebuild
 ```
 
 ### Run Franz Development App
 Run these two commands __simultaneously__ in different console tabs.
 
 ```bash
-$ yarn run dev
-$ yarn start
+$ npm run dev
+$ npm run start
 ```
 Be aware that the development database will be reset regularly.
 
 ## Packaging
 ```bash
-$ yarn build
+$ npm run build
 ```
 
 ## How can I support the project?

appveyor.yml

@@ -9,18 +9,20 @@ environment:
 version: 5.0.0.{build}
 
 install:
-  - ps: Install-Product node 8
-  - yarn cache clean
-  - yarn install
+  - ps: $version = Get-Content .\.nvmrc -Raw 
+  - ps: Install-Product node $version
+  - npm ci
+  - node --version
+  - npm --version
 
-# cache:
-#  - "%LOCALAPPDATA%\\Yarn"
+cache:
+ - '%APPDATA%\npm-cache'
 
 before_build:
-  - yarn lint
+  - npm run lint
 
 build_script:
-  - yarn build
+  - npm run build
 
 notifications:
   - provider: Slack

gulpfile.babel.js

@@ -3,15 +3,24 @@ import gulp from 'gulp';
 import babel from 'gulp-babel';
 import sass from 'gulp-sass';
 import server from 'gulp-server-livereload';
-import del from 'del';
 import { exec } from 'child_process';
 import dotenv from 'dotenv';
 import sassVariables from 'gulp-sass-variables';
+import { removeSync } from 'fs-extra';
+import kebabCase from 'kebab-case';
+import hexRgb from 'hex-rgb';
 
 import config from './package.json';
 
+import * as rawStyleConfig from './src/theme/default/legacy.js';
+
 dotenv.config();
 
+const styleConfig = Object.keys(rawStyleConfig).map((key) => {
+  const isHex = /^#[0-9A-F]{6}$/i.test(rawStyleConfig[key]);
+  return ({ [`$raw_${kebabCase(key)}`]: isHex ? hexRgb(rawStyleConfig[key], { format: 'array' }).splice(0, 3).join(',') : rawStyleConfig[key] });
+});
+
 const paths = {
   src: 'src',
   dest: 'build',
@@ -49,7 +58,12 @@ function _shell(cmd, cb) {
   });
 }
 
-const clean = () => del([paths.tmp, paths.dest]);
+const clean = (done) => {
+  removeSync(paths.tmp);
+  removeSync(paths.dest);
+
+  done();
+};
 export { clean };
 
 export function mvSrc() {
@@ -78,9 +92,9 @@ export function html() {
 
 export function styles() {
   return gulp.src(paths.styles.src)
-    .pipe(sassVariables({
+    .pipe(sassVariables(Object.assign({
       $env: process.env.NODE_ENV === 'development' ? 'development' : 'production',
-    }))
+    }, ...styleConfig)))
     .pipe(sass({
       includePaths: [
         './node_modules',

misty.yml

@@ -0,0 +1,6 @@
+code:
+  cmd: npm run dev
+
+app:
+  cmd: npx electron ./build
+  waitOn: http://localhost:8000