switch from figwheel to shadow-devtools

emnh · May 6, 2017 · e117de2 · e117de2
1 parent 8ab10d2
commit e117de2
Show file tree

Hide file tree

Showing 8 changed files with 61 additions and 18 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,7 @@
 # Introduction (Legacy version)
 
+My blog about the project [is here](https://emnh.github.io/rts-blog/).
+
 Unfinished project.
 You can see a [demo displaying only free 3D models, not from SC2](http://emh.lart.no/publish/rts-free.git/).
 The SC2 demo is not working because SC2 file host is not hosting them anymore,
@@ -11,9 +13,6 @@ SC2 files were retrieved from
 [viewer.hiveworkshop.com](http://viewer.hiveworkshop.com/?q=Assets/units/zerg/baneling/baneling.m3)
 (not mine) through a [heroku CORS proxy](http://crossorigin.herokuapp.com/).
 
-Works best in Firefox, also in Chrome, not in IE and not tested with Safari.
-Only tested on Windows.
-
 If the demo doesn't work for you, you can watch videos of it at YouTube:
  - [StarCraft 2 on WebGL](https://www.youtube.com/watch?v=PoPNrz2LUG0)
  - [Starcraft 2 on WebGL with colorful UV mapping](https://www.youtube.com/watch?v=EvhUteDp3o8)
@@ -41,13 +40,33 @@ customize these for testing social logins or running a production server.
 
 You will need a mongodb instance running on the default port (27017).
 
- - Then open 2 terminals and run the following:
+## Alternative 1: Using shadow-devtools build system
+
+ - Open 2 terminals and run the following:
+```bash
+./scripts/shadow-dev.sh
+```
+```bash
+node node/server.js
+```
+
+ - Now you can open [the dev page](http://localhost:3451/index.html#game-test)
+
+I switched to shadow-devtools because the author, Thomas Heller, approached me personally if I wanted to use it.
+The advantage is that it compiles in parallel and thus is faster than figwheel if you have a system with enough RAM.
+The setup also needs a lot less configuration than figwheel, having good defaults.
+
+## Alternative 2 (deprecated): Using figwheel build system
+ - Open 2 terminals and run the following:
 ```bash
 ./scripts/dev.sh
 ```
 ```bash
 node js/figwheel.js
 ```
+
+You will need to change index.html to comment in the figwheel stuff.
+
  - Server figwheel runs on port 3450
  - Node (with ClojureScript connected to figwheel on 3450) runs on port 3451
  - Now you can open [the dev page](http://localhost:3451/index.html#game-test)

diff --git a/resources/public/index.html b/resources/public/index.html
@@ -36,21 +36,25 @@
   </head>
   <body>
     <div id="pages" />
-    <script type="text/javascript" src="game.js"></script>
+    <!-- For figwheel -->
+    <!--<script type="text/javascript" src="game.js"></script>-->
+    <!-- For shadow-devtools -->
+    <script type="text/javascript" src="js/client.js"></script>
     <script>
     if (!window.location.hash || window.location.hash && window.location.hash == "#") {
         window.location.hash = '#lobby';
     }
     if (window.location.hash && window.location.hash == '#_=_') {
         window.location.hash = '#lobby';
     }
-    if (document.location.hostname == 'localhost') {
-      console.log("dev mode");
-      goog.require('game.client.dev');
-    } else {
-      console.log("prod mode");
-      goog.require('game.client.core');
-    }
+    // For figwheel
+    // if (document.location.hostname == 'localhost') {
+    //   console.log("dev mode");
+    //   goog.require('game.client.dev');
+    // } else {
+    //   console.log("prod mode");
+    //   goog.require('game.client.core');
+    // }
     </script>
   </body>
 </html>
diff --git a/scripts/shadow-dev.clj b/scripts/shadow-dev.clj
@@ -4,4 +4,6 @@
 (cljs/start-worker :client)
 (cljs/start-worker :server)
 
+(cljs/sync :client)
+
 (clojure.main/repl)
diff --git a/scripts/shadow-dev.sh b/scripts/shadow-dev.sh
@@ -0,0 +1 @@
+lein run -m clojure.main -i scripts/shadow-dev.clj -r
diff --git a/shadow-cljs.edn b/shadow-cljs.edn
@@ -3,6 +3,10 @@
   :public-dir "resources/public/js"
   :public-path "/js"
 
+  :devtools
+  {:before-load game.client.core/shadow-before
+   :after-load game.client.core/shadow-after}
+
   :modules
   {:client
    {:entries [game.client.core]}

diff --git a/src.client/game/client/core.cljs b/src.client/game/client/core.cljs
@@ -129,3 +129,13 @@
                  (new-page :not-found (page-not-found/new-page-not-found)))
 
 (if (> @run-count 0) (main) (js/$ (main)))
+
+(println "core")
+
+(defn shadow-before
+  []
+  (println "shadow-before"))
+
+(defn shadow-after
+  []
+  (println "shadow-after"))
diff --git a/src/game/server/config.cljs b/src/game/server/config.cljs
@@ -13,9 +13,12 @@
     (-> process .-env .-HOME))
 
 (def jsconfig
-  (let
-    [config-data (-> js/global .-rtsconfig)]
-    (-> config-data (js->clj :keywordize-keys true))))
+  (or
+    (let
+      [config-data (-> js/global .-rtsconfig)]
+      (-> config-data (js->clj :keywordize-keys true)))
+    {
+      :production false}))
 
 (println "config2" jsconfig)
 

diff --git a/src/game/server/core.cljs b/src/game/server/core.cljs
@@ -65,11 +65,11 @@
       (assoc :passport passport)
       component/start)))
 
-(defn -main
+(defn main
   []
   (println "Main")
   (with-simple-cause #(swap! system component/stop-system))
   (with-simple-cause #(swap! system component/start-system)))
 
-(-main)
-(set! *main-cli-fn* -main)
+;(-main)
+;(set! *main-cli-fn* -main)