Merge branch 'develop'

Author: adlk

.eslintrc

@@ -14,14 +14,32 @@
       "extensions": [".js", ".jsx"]
     }],
     "react/forbid-prop-types": 1,
+    "react/destructuring-assignment": 1,
+    "prefer-destructuring": 1,
     "no-underscore-dangle": 0,
     "max-len": 0,
     "class-methods-use-this": 0,
     "no-console": 0,
     "react/jsx-no-bind": 0,
     "jsx-a11y/no-static-element-interactions": 0,
     "react/jsx-no-target-blank": 0,
-    "no-restricted-syntax": [0, "ForInStatement"]
+    "no-restricted-syntax": [0, "ForInStatement"],
+    "jsx-a11y/no-noninteractive-element-interactions": 1,
+    "jsx-a11y/label-has-for": [
+      2,
+      {
+        "components": [
+          "Label"
+        ],
+        "required": {
+          "every": [
+            "id"
+          ]
+        },
+        "allowChildren": false
+      }
+    ],
+    "jsx-a11y/click-events-have-key-events": 1
   },
   "globals": {
     "window": true,

.travis.yml

@@ -16,11 +16,10 @@ language: node_js
 
 before_script:
 - npm install node-sass -g
-- npm ci
 
 script:
 - npm run lint
-- travis_wait npm run build
+- travis_wait 30 npm run build
 
 cache: npm
 

CHANGELOG.md

@@ -1,3 +1,28 @@
+<a name="5.0.0-beta.21"></a>
+# [5.0.0-beta.21](https://github.com/meetfranz/franz/compare/5.0.0-beta.20...5.0.0-beta.21) (2018-12-11)
+
+### General
+
+* **Translations:** Improved translations. **[A million thanks to the amazing community. 🎉](http://i18n.meetfranz.com/)**
+
+### Features
+
+* **Service:** Add option to change spellchecking language by service ([baf7d60](https://github.com/meetfranz/franz/commit/baf7d60))
+* **Context Menu:** Quickly change the spellchecker language for the active service
+* **Service:** Add error screen for services that failed to load ([a5e7171](https://github.com/meetfranz/franz/commit/a5e7171))
+* **Service:** Add port option for proxy configuration ([baf7d60](https://github.com/meetfranz/franz/commit/baf7d60))
+
+
+### Bug Fixes
+
+* **Spellchecker:** Fix issue with dictionary download ([0cdc165](https://github.com/meetfranz/franz/commit/0cdc165))
+
+### Improvements
+
+* **Dark Mode:** Dark Mode polishing
+* **App:** Updated a ton of dependencies
+
+
 <a name="5.0.0-beta.20"></a>
 # [5.0.0-beta.20](https://github.com/meetfranz/franz/compare/v5.0.0-beta.19...v5.0.0-beta.20) (2018-12-05)
 

electron-builder.yml

@@ -42,3 +42,5 @@ nsis:
 protocols: 
   name: Franz
   schemes: [franz] 
+
+asarUnpack: "./dictionaries"

gulpfile.babel.js

@@ -25,6 +25,7 @@ const paths = {
   src: 'src',
   dest: 'build',
   tmp: '.tmp',
+  dictionaries: 'dictionaries',
   package: `out/${config.version}`,
   html: {
     src: 'src/**/*.html',
@@ -73,15 +74,17 @@ export function mvSrc() {
       `${paths.src}/*/**`,
       `!${paths.scripts.watch}`,
       `!${paths.src}/styles/**`,
-    ], { since: gulp.lastRun(mvSrc) })
+    ], { since: gulp.lastRun(mvSrc) },
+  )
     .pipe(gulp.dest(paths.dest));
 }
 
 export function mvPackageJson() {
   return gulp.src(
     [
       './package.json',
-    ])
+    ],
+  )
     .pipe(gulp.dest(paths.dest));
 }
 
@@ -132,6 +135,21 @@ export function webserver() {
     }));
 }
 
+export function dictionaries(done) {
+  const { SPELLCHECKER_LOCALES } = require('./build/i18n/languages');
+
+  let packages = '';
+  Object.keys(SPELLCHECKER_LOCALES).forEach((key) => { packages = `${packages} hunspell-dict-${key}`; });
+
+  _shell(`
+    rm -rf ${paths.dictionaries}
+    npm install --prefix ${paths.dictionaries} ${packages}
+    mv ${paths.dictionaries}/node_modules/* ${paths.dictionaries}
+    rm -rf ${paths.dictionaries}/node_modules ${paths.dictionaries}/package-lock.json
+    pwd`,
+  done);
+}
+
 export function sign(done) {
   _shell(`codesign --verbose=4 --deep --strict --force --sign "${process.env.SIGNING_IDENTITY}" "${__dirname}/node_modules/electron/dist/Electron.app"`, done);
 }
@@ -140,6 +158,7 @@ const build = gulp.series(
   clean,
   gulp.parallel(mvSrc, mvPackageJson),
   gulp.parallel(html, scripts, styles),
+  dictionaries,
 );
 export { build };