[devkit] entrypoint cleanup

behrica · May 9, 2022 · ac474eb · ac474eb
1 parent d90e246
commit ac474eb
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 59 deletions.
diff --git a/resources/public/index.html b/resources/public/index.html
@@ -17,13 +17,13 @@
         <link rel="stylesheet" href="/assets/browser.css" type="text/css" media="screen" />
     </head>
     <body>
-        <div id="hf-ui-dev-root"></div>
+        <div id="root"></div>
 
         <script type="text/javascript" src="/assets/js/shared.js"></script>
         <script type="text/javascript" src="/assets/js/main.js"></script>
 
         <script type="text/javascript">
-         hyperfiddle.client.start_BANG_();
+         user.entrypoint.start_BANG_();
         </script>
     </body>
 </html>
diff --git a/shadow-cljs.edn b/shadow-cljs.edn
@@ -18,7 +18,7 @@
                                                              ;; but for some reason it doesn't.
                                                              shadow.cljs.bootstrap.env
                                                              shadow.cljs.bootstrap.browser]}
-                                          :main   {:entries    [hyperfiddle.client]
+                                          :main   {:entries    [user.entrypoint]
                                                    :depends-on #{:shared}}}}
             :test     {:target           :node-test
                        :output-to        "out/node-tests.js"

diff --git a/src-docs/user/entrypoint.cljs b/src-docs/user/entrypoint.cljs
@@ -0,0 +1,38 @@
+(ns user.entrypoint
+  (:require [hyperfiddle.client :refer [client]]
+            [hyperfiddle.photon :as p]
+            [hyperfiddle.photon-dom :as dom]
+            [hyperfiddle.dev.logger :as log]
+            user.hytradboi
+            user.orders-ui))
+
+(def main
+  (client
+   (p/main
+    (binding [dom/parent (dom/by-id "root")]
+      (dom/div
+       (dom/attribute "id" "main")
+       (dom/class "browser")
+       (dom/div
+        (dom/class "view")
+        (new user.hytradboi/view)
+        #_(new user.orders-ui/Orders)))))))
+
+(def ^:export reactor)
+
+(defn ^:dev/before-load stop! []
+  (if reactor
+    (do (log/info "Stopping reactor…")
+        (reactor) ;; dispose
+        (set! reactor nil)
+        (log/info "Reactor stopped"))
+    (log/info "Reactor already stopped")))
+
+(defn ^:dev/after-load ^:export start! []
+  (if-not reactor
+    (do (log/info "Starting reactor…")
+        (set! reactor (main js/console.log #(do (log/error "Uncaugh error in main process" %)
+                                                #_(stop!))))
+        (log/info "Reactor started."))
+    (log/info "Reactor already started")))
+
diff --git a/src/hyperfiddle/client.cljs b/src/hyperfiddle/client.cljs
@@ -1,14 +1,8 @@
 (ns hyperfiddle.client
-  (:require [hyperfiddle.api :as hf]
-            [hyperfiddle.common.transit :as transit]
+  (:require [hyperfiddle.common.transit :as transit]
             [hyperfiddle.dev.logger :as log]
-            [hyperfiddle.photon :as p]
-            [hyperfiddle.photon-dom :as dom]
             [missionary.core :as m]
             ["reconnecting-websocket" :as ReconnectingWebSocket]
-            user.browser
-            user.hytradboi
-            user.orders-ui
             hyperfiddle.ui ; hot-reload p/defs on save
             ))
 
@@ -70,35 +64,3 @@
              (write-chan) ; close channel socket
              (throw err)
              )))))
-
-(def main
-  (client
-    (p/main
-      (binding [dom/parent (dom/by-id "hf-ui-dev-root")]
-        (dom/div
-         (dom/attribute "id" "main")
-         (dom/class "browser")
-         (dom/div
-          (dom/class "view")
-          (new user.browser/View)
-          #_~user.hytradboi/view
-          #_(new user.orders-ui/Orders)))))))
-
-(def ^:export reactor)
-
-(defn ^:dev/before-load stop! []
-  (if reactor
-    (do (log/info "Stopping reactor…")
-        (reactor) ;; dispose
-        (set! reactor nil)
-        (log/info "Reactor stopped"))
-    (log/info "Reactor already stopped")))
-
-(defn ^:dev/after-load ^:export start! []
-  (if-not reactor
-    (do (log/info "Starting reactor…")
-        (set! reactor (main js/console.log #(do (log/error "Uncaugh error in main process" %)
-                                                #_(stop!))))
-        (log/info "Reactor started."))
-    (log/info "Reactor already started") ))
-
diff --git a/src/hyperfiddle/server.clj b/src/hyperfiddle/server.clj
@@ -1,7 +1,7 @@
 (ns hyperfiddle.server
   (:require
     [hyperfiddle.common.transit :as transit]
-    [hyperfiddle.server.websockets :as ws]                  ;; TODO restore
+    [hyperfiddle.server.websockets :as ws]
     [hyperfiddle.server.interceptors :as i]
     [io.pedestal.http :as http]
     [io.pedestal.http.ring-middlewares :as middlewares]
@@ -11,15 +11,7 @@
     [ring.middleware.file :as file]
     [hyperfiddle.dev.logger :as log]
     [missionary.core :as m]
-    [hyperfiddle.photon :as p]
-    [user.todomvc :as t]
-    [hyperfiddle.api :as h]
-    [hyperfiddle.photon-dom :as dom]
-    [hyperfiddle.zero :as z]
-    user.browser
-    user.hytradboi
-    user.orders-ui
-    [hyperfiddle.ui :as ui])
+    [hyperfiddle.photon :as p])
   (:import org.eclipse.jetty.server.handler.gzip.GzipHandler
            (org.eclipse.jetty.servlet ServletContextHandler)
            (java.util.concurrent Executors ThreadFactory Executor)
@@ -122,10 +114,7 @@
                                           (finally (m/? (m/via el))))))
                               program (m/? ?read)]
                           (prn :booting-reactor #_program)
-                          (m/? ((p/eval
-                                  #_(p/merge-vars p/exports h/exports dom/exports z/exports t/exports ui/exports
-                                    user.browser/exports user.hytradboi/exports (p/vars log/js-log*))
-                                  program) write ?read)))
+                          (m/? ((p/eval program) write ?read)))
                         (catch Cancelled _))) success failure)))))})
 
 (defn gzip-handler [& methods]
@@ -178,6 +167,8 @@
       server)
     server))
 
-(def default-config {:host   "localhost"
-                     :port   8080
-                     :scheme "http"})
+(comment
+  ;; Default config example
+  {:host   "localhost"
+   :port   8080
+   :scheme "http"})