diff --git a/env/dev/env/main.cljs b/env/dev/env/main.cljs index afe0ca2..3b30f74 100644 --- a/env/dev/env/main.cljs +++ b/env/dev/env/main.cljs @@ -9,8 +9,10 @@ (defn reloader [] @cnt [core/app-root]) (def root-el (r/as-element [reloader])) +(def dev-env (js/require "dev-env")) + (figwheel/watch-and-reload - :websocket-url "ws://c98fe99d.ngrok.io/figwheel-ws" + :websocket-url (str "ws://" (.-ip dev-env) ":3449/figwheel-ws") :heads-up-display false :jsload-callback #(swap! cnt inc)) diff --git a/env/dev/user.clj b/env/dev/user.clj index dad450a..88bcf4c 100644 --- a/env/dev/user.clj +++ b/env/dev/user.clj @@ -12,12 +12,23 @@ (def cljs-builds (get-in profiles [:dev :cljsbuild :builds])) +(defn write-dev-env-js + "Update target/dev-env.js with dev server info (hostname etc.)" + [] + (spit "target/dev-env.js" + (str "/* @providesModule dev-env */\n" + "module.exports = {\n" + " hostname: '" (.getHostName (java.net.InetAddress/getLocalHost)) "',\n" + " ip: '" (.getHostAddress (java.net.InetAddress/getLocalHost)) "',\n" + "};\n"))) + (defn start-figwheel "Start figwheel for one or more builds" [& build-ids] (ra/start-figwheel! {:build-ids build-ids :all-builds cljs-builds}) + (write-dev-env-js) (ra/cljs-repl)) (defn stop-figwheel diff --git a/js/main.js b/js/main.js index 092179e..4e26069 100644 --- a/js/main.js +++ b/js/main.js @@ -4,6 +4,8 @@ const figwheel = true; if (figwheel) { require('figwheel-bridge').withModules({ + 'dev-env': require('../target/dev-env.js'), + 'react-native': require('react-native'), 'react': require('react'), }).start('main');