Browse Source

Fix startup error introduced in dd0169b068d69b3b01c133eadd2288b256a43c75

uncaughtException TypeError:
module$electron$utils.safe_decode_uri_component is not a function

Interesting that kondo doesn't catch invalid fns from js requires
Gabriel Horner 2 years ago
parent
commit
2ed7d82a02
2 changed files with 6 additions and 3 deletions
  1. 2 0
      .clj-kondo/config.edn
  2. 4 3
      src/electron/electron/core.cljs

+ 2 - 0
.clj-kondo/config.edn

@@ -30,6 +30,8 @@
              datascript.transit dt
              datascript.db ddb
              electron.ipc ipc
+             electron.utils utils
+             "/electron/utils" js-utils
              frontend.commands commands
              frontend.config config
              frontend.date date

+ 4 - 3
src/electron/electron/core.cljs

@@ -3,7 +3,8 @@
             [electron.search :as search]
             [electron.updater :refer [init-updater] :as updater]
             [electron.utils :refer [*win mac? linux? dev? get-win-from-sender restore-user-fetch-agent
-                                    decode-protected-assets-schema-path get-graph-name send-to-renderer]]
+                                    decode-protected-assets-schema-path get-graph-name send-to-renderer]
+             :as utils]
             [electron.url :refer [logseq-url-handler]]
             [electron.logger :as logger]
             [clojure.string :as string]
@@ -20,7 +21,7 @@
             [electron.git :as git]
             [electron.window :as win]
             [electron.exceptions :as exceptions]
-            ["/electron/utils" :as utils]))
+            ["/electron/utils" :as js-utils]))
 
 ;; Keep same as main/frontend.util.url
 (defonce LSP_SCHEME "logseq")
@@ -301,7 +302,7 @@
 
                (restore-user-fetch-agent)
 
-               (utils/disableXFrameOptions win)
+               (js-utils/disableXFrameOptions win)
 
                (search/ensure-search-dir!)