init module loader by hand

as suggested by @thheller
binaryage · Feb 3, 2020 · afe9407 · afe9407
1 parent 6b3405d
commit afe9407
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 7 deletions.
diff --git a/examples/shadow-cljs.edn b/examples/shadow-cljs.edn
@@ -12,8 +12,9 @@
                              :devtools   {; TODO: remove after https://github.com/thheller/shadow-cljs/issues/637
                                           :loader-mode :script}}
              :module-loader true
+             :module-loader-init false
              :modules       {:main             {:entries [react-three-fiber.examples.index]
-                                                :init-fn react-three-fiber.examples.index/main!}
+                                                :init-fn react-three-fiber.examples.index/init!}
                              :demo-box         {:entries    [react-three-fiber.examples.demos.box]
                                                 :depends-on #{:main}}
                              :demo-refraction  {:entries    [react-three-fiber.examples.demos.refraction]

diff --git a/examples/src/app/react_three_fiber/examples/index.cljs b/examples/src/app/react_three_fiber/examples/index.cljs
@@ -1,17 +1,20 @@
 (ns react-three-fiber.examples.index
-  (:require [react-three-fiber.examples.lib.ui :as ui :refer [defnc $]]
+  (:require [shadow.loader :as shadow-loader]
+            [applied-science.js-interop :as j]
+            [react-three-fiber.examples.lib.ui :as ui :refer [defnc $]]
             [react-three-fiber.examples.lib.react-router-dom :refer [<router>]]
             [react-three-fiber.examples.lib.dom :refer [get-element-by-id]]
             [react-three-fiber.examples.pages.intro :refer [<intro>]]
             [react-three-fiber.core :refer [use-frame <canvas>]]
-            [react-three-fiber.examples.styles :refer [<global-styles>]]))
+            [react-three-fiber.examples.styles :refer [<global-styles>]]
+            [react-three-fiber.examples.lib.helpers :refer [remove-trailing-slashes]]))
 
 ; -- app --------------------------------------------------------------------------------------------------------------------
 
 (defnc <app> []
   ($ <router>
-     ($ <global-styles>)
-     ($ <intro>)))
+    ($ <global-styles>)
+    ($ <intro>)))
 
 ; ---------------------------------------------------------------------------------------------------------------------------
 
@@ -20,7 +23,15 @@
 (defn render! []
   (ui/render! ($ <app>) root-el))
 
-(defn main! []
+(defn init-module-loader! []
+  ; https://github.com/thheller/shadow-cljs/pull/646
+  (let [origin (j/get-in goog/global [:window :location :origin])
+        pathname (j/get-in goog/global [:window :location :pathname])
+        prefix (remove-trailing-slashes (str origin pathname))]
+    (shadow-loader/init prefix)))
+
+(defn init! []
+  (init-module-loader!)
   (render!))
 
 (defn ^:dev/after-load reload! []

diff --git a/examples/src/app/react_three_fiber/examples/lib/helpers.cljs b/examples/src/app/react_three_fiber/examples/lib/helpers.cljs
@@ -1,6 +1,7 @@
 (ns react-three-fiber.examples.lib.helpers
   (:require [cljs-bean.core :refer [bean]]
-            [applied-science.js-interop :as j]))
+            [applied-science.js-interop :as j]
+            [clojure.string :as string]))
 
 (defn sin [x]
   (Math/sin x))
@@ -182,3 +183,6 @@
 
 (defn get-points [o subs]
   (.getPoints o subs))
+
+(defn remove-trailing-slashes [s]
+  (string/replace s #"/+$" ""))