Use await/async on shared directory

src/shared/settings/storage.js

@@ -1,30 +1,28 @@
 import DefaultSettings from './default';
 import * as settingsValues from './values';
 
-const loadRaw = () => {
+const loadRaw = async() => {
-  return browser.storage.local.get('settings').then(({ settings }) => {
+  let { settings } = await browser.storage.local.get('settings');
-    if (!settings) {
+  if (!settings) {
-      return DefaultSettings;
+    return DefaultSettings;
-    }
+  }
-    return Object.assign({}, DefaultSettings, settings);
+  return Object.assign({}, DefaultSettings, settings);
-  });
 };
 
-const loadValue = () => {
+const loadValue = async() => {
-  return loadRaw().then((settings) => {
+  let settings = await loadRaw();
-    let value = JSON.parse(DefaultSettings.json);
+  let value = JSON.parse(DefaultSettings.json);
-    if (settings.source === 'json') {
+  if (settings.source === 'json') {
-      value = settingsValues.valueFromJson(settings.json);
+    value = settingsValues.valueFromJson(settings.json);
-    } else if (settings.source === 'form') {
+  } else if (settings.source === 'form') {
-      value = settingsValues.valueFromForm(settings.form);
+    value = settingsValues.valueFromForm(settings.form);
-    }
+  }
-    if (!value.properties) {
+  if (!value.properties) {
-      value.properties = {};
+    value.properties = {};
-    }
+  }
-    return Object.assign({},
+  return Object.assign({},
-      settingsValues.valueFromJson(DefaultSettings.json),
+    settingsValues.valueFromJson(DefaultSettings.json),
-      value);
+    value);
-  });
 };
 
 const save = (settings) => {

src/shared/versions/index.js

@@ -13,13 +13,12 @@ const notificationClickListener = (id) => {
   browser.notifications.onClicked.removeListener(notificationClickListener);
 };
 
-const checkUpdated = () => {
+const checkUpdated = async() => {
-  return storage.load().then((prev) => {
+  let prev = await storage.load();
-    if (!prev) {
+  if (!prev) {
-      return true;
+    return true;
-    }
+  }
-    return manifest.version !== prev;
+  return manifest.version !== prev;
-  });
 };
 
 const notify = () => {

src/shared/versions/storage.js

@@ -1,7 +1,6 @@
-const load = () => {
+const load = async() => {
-  return browser.storage.local.get('version').then(({ version }) => {
+  let { version } = await browser.storage.local.get('version');
-    return version;
+  return version;
-  });
 };
 
 const save = (version) => {