3 files changed, 33 insertions, 44 deletions

diff --git a/package-lock.json b/package-lock.json
index e670c2a03..b0cc72ec7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7190,12 +7190,11 @@
       }
     },
     "electron-hunspell": {
-      "version": "1.0.0-beta.7",
-      "resolved": "https://registry.npmjs.org/electron-hunspell/-/electron-hunspell-1.0.0-beta.7.tgz",
-      "integrity": "sha512-BByCXqU8sZbuzyoxKcBYjycp8ORiqjeYZd2OT8RNjVW+XGPmZkHewXUu4tUa1IXW6ij6IqojV5kr+xhYKLN1DA==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/electron-hunspell/-/electron-hunspell-1.0.0.tgz",
+      "integrity": "sha512-egyioCtGkkNMOYdKBrZsva63JxbPmNjmQVFCZCcmr+uIUs6et6OUvqd6ac9/ujuchiEPDrTfF9gdR9+lPbVyPA==",
       "requires": {
-        "hunspell-asm": "^2.0.0",
-        "tslib": "1.9.3"
+        "hunspell-asm": "^4.0.0"
       }
     },
     "electron-is-dev": {
@@ -11504,32 +11503,22 @@
       }
     },
     "hunspell-asm": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/hunspell-asm/-/hunspell-asm-2.0.0.tgz",
-      "integrity": "sha512-FMIUBpy+bRREFAvC63RcYEK9U6+FdlEojGSVsvMTpuZ2CekYyUBwEfG4+ExIQOQyEN0U6f1MoVgrFqvgPNSA2g==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/hunspell-asm/-/hunspell-asm-4.0.0.tgz",
+      "integrity": "sha512-EcNwMx0Byq1JHMZiuATmqpMk41bOo+NH4yD5xJ3H0X403MoDBory3zri2lJzYSGj+z/6Bqr3EZn24syCjZoY1w==",
       "requires": {
-        "emscripten-wasm-loader": "^2.2.3",
-        "nanoid": "^2.0.1",
-        "tslib": "^1.9.3",
-        "unixify": "^1.0.0"
+        "emscripten-wasm-loader": "^3.0.3",
+        "nanoid": "^2.1.1"
       },
       "dependencies": {
         "emscripten-wasm-loader": {
-          "version": "2.2.3",
-          "resolved": "https://registry.npmjs.org/emscripten-wasm-loader/-/emscripten-wasm-loader-2.2.3.tgz",
-          "integrity": "sha512-//gI0afvtVnY7smttrPOW/BM+pTJLmdIcXAQV3fgRdQ0o6wm2vdSI0kjLYVOeo/rbtRsGgVuMLu6fT+O//EfaA==",
+          "version": "3.0.3",
+          "resolved": "https://registry.npmjs.org/emscripten-wasm-loader/-/emscripten-wasm-loader-3.0.3.tgz",
+          "integrity": "sha512-fyq2maBt5LOou27LEBlL5H6G04BxgSamXkvmMsAuIT6rd8ioH4BxNQhuyl6jVPeODh6U8Wk1BoFZxzHpg3o8wA==",
           "requires": {
             "getroot": "^1.0.0",
-            "nanoid": "^1.3.4",
-            "tslib": "^1.9.3",
+            "nanoid": "^2.0.3",
             "unixify": "^1.0.0"
-          },
-          "dependencies": {
-            "nanoid": {
-              "version": "1.3.4",
-              "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-1.3.4.tgz",
-              "integrity": "sha512-4ug4BsuHxiVHoRUe1ud6rUFT3WUMmjXt1W0quL0CviZQANdan7D8kqN5/maw53hmAApY/jfzMRkC57BNNs60ZQ=="
-            }
           }
         }
       }
@@ -14525,9 +14514,9 @@
       "integrity": "sha512-JY7V6lRkStKcKTvHO5NVSQRv+RV+FIL5pvDoLiAtSL9pKlC5x9PKQcZDsq7m4FO4d57mkhC6Z+QhAh3Jdk5JFw=="
     },
     "nanoid": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-2.0.3.tgz",
-      "integrity": "sha512-NbaoqdhIYmY6FXDRB4eYtDVC9Z9eCbn8TyaiC16LNKtpPv/aqa0tOPD8y6gNE4yUNnaZ7LLhYtXOev/6+cBtfw=="
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-2.1.1.tgz",
+      "integrity": "sha512-0YbJdaL4JFoejIOoawgLcYValFGJ2iyUuVDIWL3g8Es87SSOWFbWdRUMV3VMSiyPs3SQ3QxCIxFX00q5DLkMCw=="
     },
     "nanomatch": {
       "version": "1.2.13",
diff --git a/package.json b/package.json
index 2814df2ab..09874bc59 100644
--- a/package.json
+++ b/package.json
@@ -48,7 +48,7 @@
     "du": "^0.1.0",
     "electron-dl": "1.12.0",
     "electron-fetch": "1.3.0",
-    "electron-hunspell": "1.0.0-beta.7",
+    "electron-hunspell": "1.0.0",
     "electron-is-dev": "1.0.1",
     "electron-react-titlebar": "0.8.1",
     "electron-updater": "4.0.6",
diff --git a/src/webview/spellchecker.js b/src/webview/spellchecker.js
index 64575753f..d7bb983dc 100644
--- a/src/webview/spellchecker.js
+++ b/src/webview/spellchecker.js
@@ -1,6 +1,5 @@
 import { webFrame } from 'electron';
 import { attachSpellCheckProvider, SpellCheckerProvider } from 'electron-hunspell';
-import { ENVIRONMENT } from 'hunspell-asm';
 import path from 'path';
 import { readFileSync } from 'fs';
 
@@ -14,6 +13,8 @@ let currentDict;
 let _isEnabled = false;
 let attached;
 
+const DEFAULT_LOCALE = 'en-us';
+
 async function loadDictionary(locale) {
   try {
     const fileLocation = path.join(DICTIONARY_PATH, `hunspell-dict-${locale}/${locale}`);
@@ -24,7 +25,7 @@ async function loadDictionary(locale) {
   }
 }
 
-export async function switchDict(locale) {
+export async function switchDict(locale = DEFAULT_LOCALE) {
   try {
     debug('Trying to load dictionary', locale);
 
@@ -55,13 +56,23 @@ export async function switchDict(locale) {
   }
 }
 
-export default async function initialize(languageCode = 'en-us') {
+export function getSpellcheckerLocaleByFuzzyIdentifier(identifier) {
+  const locales = Object.keys(SPELLCHECKER_LOCALES).filter(key => key === identifier.toLowerCase() || key.split('-')[0] === identifier.toLowerCase());
+
+  if (locales.length >= 1) {
+    return locales[0];
+  }
+
+  return null;
+}
+
+export default async function initialize(languageCode = DEFAULT_LOCALE) {
   try {
     provider = new SpellCheckerProvider();
-    const locale = languageCode.toLowerCase();
+    const locale = getSpellcheckerLocaleByFuzzyIdentifier(languageCode);
 
     debug('Init spellchecker');
-    await provider.initialize({ environment: ENVIRONMENT.NODE });
+    await provider.initialize();
 
     debug('Attaching spellcheck provider');
     attached = await attachSpellCheckProvider(provider);
@@ -69,7 +80,6 @@ export default async function initialize(languageCode = 'en-us') {
     debug('Available spellchecker dictionaries', provider.availableDictionaries);
 
     attached.switchLanguage(locale);
-    console.log('seas oida', attached, provider);
 
     return provider;
   } catch (err) {
@@ -89,13 +99,3 @@ export function disable() {
     currentDict = null;
   }
 }
-
-export function getSpellcheckerLocaleByFuzzyIdentifier(identifier) {
-  const locales = Object.keys(SPELLCHECKER_LOCALES).filter(key => key === identifier.toLowerCase() || key.split('-')[0] === identifier.toLowerCase());
-
-  if (locales.length >= 1) {
-    return locales[0];
-  }
-
-  return null;
-}