fix(electron): some but not all warnings gone (#345)

athensresearch · Aug 21, 2020 · d414f59 · d414f59
1 parent 8f5cc55
commit d414f59
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -144,6 +144,7 @@ jobs:
 #           publish_dir: ./resources/public
 
    dist:
+     if: github.event_name == 'push'
      runs-on: ${{ matrix.os }}
      env:
        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
@@ -211,5 +212,4 @@ jobs:
            # If the commit is tagged with a version (e.g. "v1.0.0"),
            # release the app after building
            release: ${{ startsWith(github.ref, 'refs/tags/v') }}
-           args: "-p always"
 
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "athens",
   "author": "athensresearch",
-  "version": "1.0.0-beta.2",
+  "version": "1.0.0-beta.3",
   "description": "Open-Source Networked Thought",
   "main": "resources/main.js",
   "build": {

diff --git a/shadow-cljs.edn b/shadow-cljs.edn
@@ -27,10 +27,11 @@
                      :modules {:renderer {:init-fn athens.core/init}}
 
                      :compiler-options {:closure-warnings {:global-this :off}
+                                        :infer-externs :auto
                                         :closure-defines {re-frame.trace.trace-enabled? true}}
 
                      :devtools {:preloads [devtools.preload
-                                           day8.re-frame.trace.preload]}}
+                                           day8.re-frame-10x.preload]}}
 
           :main {:target :node-script
                  :output-to "resources/main.js"

diff --git a/src/cljs/athens/listeners.cljs b/src/cljs/athens/listeners.cljs
@@ -145,7 +145,7 @@
 
 (defn copy
   "If blocks are selected, copy blocks as markdown list."
-  [e]
+  [^js e]
   (let [blocks @(subscribe [:selected/items])]
     (when (not-empty blocks)
       (.. e preventDefault)
@@ -155,7 +155,7 @@
 
 ;; do same as copy AND delete selected blocks
 (defn cut
-  [e]
+  [^js e]
   (let [blocks @(subscribe [:selected/items])]
     (when (not-empty blocks)
       (.. e preventDefault)

diff --git a/src/cljs/athens/main/core.cljs b/src/cljs/athens/main/core.cljs
@@ -19,7 +19,7 @@
 (defn send-status-to-window
   [text]
   (.. log (info text))
-  (.. @main-window -webContents (send text)))
+  (.. ^js @main-window -webContents (send text)))
 
 
 (defn init-browser
@@ -28,11 +28,14 @@
                         (clj->js {:width 800
                                   :height 600
                                   :autoHideMenuBar true
+                                  :enableRemoteModule true
                                   :webPreferences {:nodeIntegration true
+                                                   :worldSafeExecuteJavaScript true
+                                                   :enableRemoteModule true
                                                    :nodeIntegrationWorker true}})))
   ; Path is relative to the compiled js file (main.js in our case)
-  (.loadURL @main-window (str "file://" js/__dirname "/public/index.html"))
-  (.on @main-window "closed" #(reset! main-window nil)))
+  (.loadURL ^js @main-window (str "file://" js/__dirname "/public/index.html"))
+  (.on ^js @main-window "closed" #(reset! main-window nil)))
 
 
 (defn init-updater