Release/5.0.1 beta.1 (#1344)

* Add lerna

* Add theme

* Add forms

* Add misty config to build theme & forms

* reset packages version

* Publish

 - @meetfranz/forms@1.0.0
 - @meetfranz/theme@1.0.0

* Reset package version

* restructure packages

* try ci with lerna

* Fix missing packages in build

* move storybook to root + typescript

TODO: fix modules

* Add lerna instructions

* Merge

* wip

* Make packages work in electron, node and web

* Finalize packages & replace storybook with homegrown `uidev`

* Bring package-lock back in sync

* Publish

 - @meetfranz/forms@1.0.1
 - @meetfranz/theme@1.0.1

* fix webpack issue

* expose legacy styles

* Add toggle element to @meetfranz/forms

* start typings package

* Update package.json

* Add buttons

* Update theme

* add types

* Add mdi icons to buttons

* Publish

 - @meetfranz/forms@1.0.2
 - @meetfranz/theme@1.0.2
 - @meetfranz/typings@0.0.1

* Button, add missing success state

* Update lerna packages

* Try to disable automatic npm ci

* Try to get a working bundle

* Add href and type to button component

* Update packages

* update versions

* cleanup

* Update package versions

[ci skip]

* Update versions

* Add withTheme context to button

* Update & reuse electron-rebuild

* feat(Windows): Add option to quit Franz from Taskbar icon

* Add missing withTheme

* Fix package versions

* Update versions

* Add pageview event

* Simplify analytics calls

* Pin gulp-sass-variables to 1.1.1

* Add onFocus event

* Add modal overlay color

* remove legacy theme files

* remove code

* Add dialog to share franz on social media

* Fix service count

* remove ping

* replace ms time strings with ms module

* remove unused packages

* fix value setter

* new payment flow

* fix module reference

* feat(Spell check): Add en-gb spell check languages (#1306)

* move devmode info

* fix(Windows): Fix losing window when "Keep Franz in background" is enabled

* fix(Service): Fix service zoom (cmd/ctrl+ & cmd/ctrl-)

* fixes appveyor build issue

* feat(App): Update electron to 4.0.7

* ignore intellij idea project files

* Automatic i18n update (i18n.meetfranz.com)

* feat(App): Add security checks for external URLs

* setup react-intl translations managing script

* use same zooming logic for all os

* feat(Linux): Add auto updater for Linux AppImage builds

* Add ctrl+ for zoom in on Windows

* move translation scripts into src/i18n folder

* only manage en-US translations

* manage translations before git pushes

* Fix unused i18n strings

* Bump version to 5.0.1-beta.1

* fix(Service) shortcuts for activating prev/next service fixes #1298

* fix(Service): Fix shortcut for (un)muting notifications & audio

* add missing react-intl files

* correctly update services submenu on language change

* fix(Windows): Fix copy & paste in service context menus

Closes #1316

* fix(Linux): Fix minimized window focusing (#1304) (@skoruppa)

* trigger build

* Check if window is minimized before restoring it

* restore() should be executed only when window is minimized

* fix(Notifications): Fix notifications & notification click when icon is blob

* Fix/service webview unmounting (#1328)

* detach service when underlying webview unmounts

* disable no-param-reassign eslint rule

* Add notification debug events

* Update electron to 4.0.8

Update required in order to fix performance degradation due to memory leak issue electron/electron#16772.

* Automatic i18n update (i18n.meetfranz.com)

* Automatic i18n update (i18n.meetfranz.com)

* 5.0.1-beta.1

.babelrc

@@ -25,7 +25,12 @@
       }
     ],
     "@babel/proposal-throw-expressions",
-    "@babel/syntax-dynamic-import"
+    "@babel/syntax-dynamic-import",
+    ["react-intl", {
+      "messagesDir": "./src/i18n/messages/",
+      "enforceDescriptions": false,
+      "extractSourceLocation": true
+    }]
   ],
   "sourceMaps": "inline"
-}
+}

.eslintignore

@@ -1,2 +1,3 @@
 build/
 out/
+packages/*/lib

.eslintrc

@@ -2,6 +2,7 @@
   "parser": "babel-eslint",
   "extends": "eslint-config-airbnb",
   "rules": {
+    "no-param-reassign": 0,
     "import/extensions": 0,
     "import/no-extraneous-dependencies": 0,
     "import/no-unresolved": [2, {
@@ -51,6 +52,7 @@
     "Worker": true,
     "atob": true,
     "btoa": true,
-    "ga": true
+    "ga": true,
+    "mocha": true
   }
 }

.gitignore

@@ -2,9 +2,12 @@ node_modules
 flow-typed
 out
 .DS_Store
+.idea
 build
 .tmp
 .stage
 .env
 yarn-error.log
-npm-debug.log*
+npm-debug.log*
+lerna-debug.log
+uidev/lib

.nvmrc

@@ -1 +1 @@
-10.13.0
+10.14.0

.travis.yml

@@ -14,11 +14,15 @@ matrix:
 
 language: node_js
 
+install: 
+- echo do nothing
+
 before_script:
+- npx lerna bootstrap
 - npm install node-sass -g
 
 script:
-- npm run lint
+# - npm run lint
 - travis_wait 30 npm run build
 
 cache: npm

CHANGELOG.md

@@ -1,3 +1,30 @@
+## [5.0.1-beta.1](https://github.com/meetfranz/franz/compare/v5.0.0...v5.0.1-beta.1) (2019-03-18)
+
+
+### General
+
+* **Translations:** Improved translations. **[A million thanks to the amazing community. 🎉](http://i18n.meetfranz.com/)**
+
+
+### Features
+
+* **App:** Add security checks for external URLs ([6e5531a](https://github.com/meetfranz/franz/commit/6e5531a))
+* **App:** Update electron to 4.0.8 ([8336d17](https://github.com/meetfranz/franz/commit/8336d17))
+* **Linux:** Add auto updater for Linux AppImage builds ([d641b4e](https://github.com/meetfranz/franz/commit/d641b4e))
+* **Spell check:** Add British English as spell check language ([#1306](https://github.com/meetfranz/franz/issues/1306)) ([67fa325](https://github.com/meetfranz/franz/commit/67fa325))
+* **Windows:** Add option to quit Franz from Taskbar icon ([952fc8b](https://github.com/meetfranz/franz/commit/952fc8b))
+
+### Bug Fixes
+
+* **Linux:** Fix minimized window focusing ([#1304](https://github.com/meetfranz/franz/issues/1304)) ([@skoruppa](https://github.com/skoruppa)) ([5b02c4d](https://github.com/meetfranz/franz/commit/5b02c4d))
+* **Notifications:** Fix notifications & notification click when icon is blob ([03589f6](https://github.com/meetfranz/franz/commit/03589f6))
+* **Service:** Fix service zoom (cmd/ctrl+ & cmd/ctrl-) ([91a0f59](https://github.com/meetfranz/franz/commit/91a0f59))
+* **Service:** Fix shortcut for (un)muting notifications & audio ([1df3342](https://github.com/meetfranz/franz/commit/1df3342))
+* **Windows:** Fix copy & paste in service context menus ([e66fcaa](https://github.com/meetfranz/franz/commit/e66fcaa)), closes [#1316](https://github.com/meetfranz/franz/issues/1316)
+* **Windows:** Fix losing window when "Keep Franz in background" is enabled ([78a3722](https://github.com/meetfranz/franz/commit/78a3722))
+
+
+
 # [5.0.0](https://github.com/meetfranz/franz/compare/5.0.0-beta.24...5.0.0) (2019-02-15)
 
 ### General

README.md

@@ -30,6 +30,14 @@ Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many mor
 $ npm run rebuild
 ```
 
+### Install dependencies
+Run the following command to install all dependencies, and link sibling modules with Franz.
+```bash
+$ npx lerna bootstrap
+```
+
+If you previously ran `npm install` it sometimes is necessary to delete your `node_modules` folder before running `npx lerna bootstrap`. 
+
 ### Run Franz Development App
 Run these two commands __simultaneously__ in different console tabs.
 

appveyor.yml

@@ -6,14 +6,11 @@ environment:
   CSC_KEY_PASSWORD:
     secure: t8ypNTPKTmvRfd3hHA4aMOtC5KOFqOw3AsKhpU7140Q=
 
-version: 5.0.0.{build}
+version: 5.0.1.{build}
 
 install:
-  - ps: $version = Get-Content .\.nvmrc -Raw 
-  - ps: Install-Product node $version
-  - npm ci
-  - node --version
-  - npm --version
+  - ps: Install-Product node 10
+  - npx lerna bootstrap
 
 cache:
  - '%APPDATA%\npm-cache'

gulpfile.babel.js

@@ -41,7 +41,18 @@ const paths = {
   scripts: {
     src: 'src/**/*.js',
     dest: 'build/',
-    watch: 'src/**/*.js',
+    watch: [
+      // 'packages/**/*.js',
+      'src/**/*.js',
+    ],
+  },
+  packages: {
+    watch: 'packages/**/*',
+    // dest: 'build/',
+    // watch: [
+    //   // 'packages/**/*.js',
+    //   'src/**/*.js',
+    // ],
   },
 };
 
@@ -74,8 +85,9 @@ export function mvSrc() {
     [
       `${paths.src}/*`,
       `${paths.src}/*/**`,
-      `!${paths.scripts.watch}`,
+      `!${paths.scripts.watch[1]}`,
       `!${paths.src}/styles/**`,
+      `!${paths.src}/**/*.js`,
     ], { since: gulp.lastRun(mvSrc) },
   )
     .pipe(gulp.dest(paths.dest));
@@ -90,6 +102,15 @@ export function mvPackageJson() {
     .pipe(gulp.dest(paths.dest));
 }
 
+export function mvLernaPackages() {
+  return gulp.src(
+    [
+      'packages/**',
+    ],
+  )
+    .pipe(gulp.dest(`${paths.dest}/packages`));
+}
+
 export function html() {
   return gulp.src(paths.html.src, { since: gulp.lastRun(html) })
     .pipe(gulp.dest(paths.html.dest));
@@ -118,14 +139,16 @@ export function scripts() {
 }
 
 export function watch() {
-  gulp.watch(paths.scripts.watch, scripts);
+  gulp.watch(paths.packages.watch, mvLernaPackages);
   gulp.watch(paths.styles.watch, styles);
 
   gulp.watch([
     paths.src,
     `${paths.scripts.src}`,
     `${paths.styles.src}`,
   ], mvSrc);
+
+  gulp.watch(paths.scripts.watch, scripts);
 }
 
 export function webserver() {
@@ -161,7 +184,7 @@ export function sign(done) {
 
 const build = gulp.series(
   clean,
-  gulp.parallel(mvSrc, mvPackageJson),
+  gulp.parallel(mvSrc, mvPackageJson, mvLernaPackages),
   gulp.parallel(html, scripts, styles),
   dictionaries,
 );

lerna.json

@@ -0,0 +1,11 @@
+{
+  "packages": [
+    "packages/*"
+  ],
+  "version": "independent",
+  "ignoreChanges": [
+    "**/*.md",
+    "**/.eslintrc.{js,json,yaml,yml}",
+    "**/package-lock.json"
+  ]
+}