Current changes according to discovery

Author: exdis

core/build.js

@@ -35,7 +35,10 @@ async function build(browser) {
         bundle: true,
         // minify: true,
         format: 'esm',
-        outdir
+        outdir,
+        define: {
+            global: 'window'
+        }
     })
         .then(() => {
             const css = fs.readFileSync(path.join(outdir, 'index.css'), 'utf8');

safari/JsonDiscovery.xcodeproj/project.xcworkspace/xcuserdata/denis.kolesnikov.xcuserdatad/UserInterfaceState.xcuserstate

@@ -1,18 +1,18 @@
+import { Widget, router, utils } from '@discoveryjs/discovery';
+import settingsPage from '../settings';
+
 /**
  * Discovery initialization
  * @param {Object} options
  * @param {Object} data
  * @returns {Discovery}
  */
 export function initDiscovery(options, data) {
-    const { Widget, router, utils } = require('@discoveryjs/discovery/dist/discovery.js');
-    const settingsPage = require('../settings').default;
-
     const { settings } = options;
     const { darkmode = 'auto' } = settings;
     const discovery = new Widget(options.node, null, {
         darkmode,
-        styles: [{ type: 'link', data: chrome.runtime.getURL('index.css') }]
+        styles: [{ type: 'link', href: chrome.runtime.getURL('index.css') }]
     });
 
     discovery.apply(router);

src/content/init-discovery.js

@@ -54,30 +54,31 @@ export const init = initDiscoveryBundled => {
 
             // Firefox bundled version
             if (typeof initDiscoveryBundled === 'function') {
-                getSettings(settings => {
-                    initDiscoveryBundled({
-                        node: document.body,
-                        raw: textContent,
-                        settings,
-                        styles: [chrome.runtime.getURL('index.css')]
-                    }, json);
-                });
+                const settings = await getSettings();
+
+                initDiscoveryBundled({
+                    node: document.body,
+                    raw: textContent,
+                    settings,
+                    styles: [chrome.runtime.getURL('index.css')]
+                }, json);
             }
 
             try {
+                const settings = await getSettings();
+                const data = await loader({
+                    data: json,
+                    darkmode: settings.darkmode
+                });
+
                 const { initDiscovery } = await import(chrome.runtime.getURL('init-discovery.js'));
 
-                getSettings(settings => {
-                    loader({
-                        module: initDiscovery,
-                        data: json,
-                        options: {
-                            node: document.body,
-                            raw: textContent,
-                            settings
-                        }
-                    });
-                });
+                initDiscovery({
+                    node: document.body,
+                    raw: textContent,
+                    settings,
+                    styles: [chrome.runtime.getURL('index.css')]
+                }, data);
             } catch (_) {}
         }
     });
@@ -87,13 +88,15 @@ export const init = initDiscoveryBundled => {
 
 /**
  * Restores settings from storage
- * @param {Function} cb
+ * @returns {Promise}
  */
-function getSettings(cb) {
-    chrome.storage.sync.get({
-        expandLevel: 3,
-        darkmode: 'auto'
-    }, settings => {
-        cb(settings);
+function getSettings() {
+    return new Promise(resolve => {
+        chrome.storage.sync.get({
+            expandLevel: 3,
+            darkmode: 'auto'
+        }, settings => {
+            resolve(settings);
+        });
     });
 }

src/content/init.js

@@ -1,3 +1,5 @@
+import { utils } from '@discoveryjs/discovery';
+
 export default discovery => {
     discovery.view.define('label', function(el, config = {}) {
         const { text } = config;
@@ -34,7 +36,9 @@ export default discovery => {
                 let selfValue;
 
                 detachToggleDarkMode();
-                detachToggleDarkMode = discovery.darkmode.on((value, mode) => {
+                detachToggleDarkMode = discovery.darkmode.subscribe((value, mode) => {
+                    utils.applyContainerStyles(discovery.dom.wrapper.parentNode, { darkmode: value });
+
                     const newValue = mode === 'auto' ? 'auto' : value;
 
                     if (newValue === selfValue) {