CLJS-2598: Socket REPL does not compose with cljs.main

Author: dnolen

src/main/clojure/cljs/server/browser.clj

@@ -11,8 +11,10 @@
             [cljs.repl.browser :as browser]
             [cljs.core.server :as server]))
 
-(defn repl []
-  (repl/repl (browser/repl-env)))
+(defn repl [{:keys [opts env-opts]}]
+  (repl/repl* (browser/repl-env* env-opts) opts))
 
-(defn prepl []
-  (server/io-prepl :repl-env (browser/repl-env)))
+(defn prepl [{:keys [opts env-opts]}]
+  (apply server/io-prepl
+    (mapcat identity
+      (merge {:repl-env (browser/repl-env* env-opts)} opts))))

src/main/clojure/cljs/server/nashorn.clj

@@ -11,8 +11,10 @@
             [cljs.repl.nashorn :as nashorn]
             [cljs.core.server :as server]))
 
-(defn repl []
-  (repl/repl (nashorn/repl-env)))
+(defn repl [{:keys [opts env-opts]}]
+  (repl/repl* (nashorn/repl-env* env-opts) opts))
 
-(defn prepl []
-  (server/io-prepl :repl-env (nashorn/repl-env)))
+(defn prepl [{:keys [opts env-opts]}]
+  (apply server/io-prepl
+    (mapcat identity
+      (merge {:repl-env (nashorn/repl-env* env-opts)} opts))))

src/main/clojure/cljs/server/node.clj

@@ -11,8 +11,10 @@
             [cljs.repl.node :as node]
             [cljs.core.server :as server]))
 
-(defn repl []
-  (repl/repl (node/repl-env)))
+(defn repl [{:keys [opts env-opts]}]
+  (repl/repl* (node/repl-env* env-opts) opts))
 
-(defn prepl []
-  (server/io-prepl :repl-env (node/repl-env)))
+(defn prepl [{:keys [opts env-opts]}]
+  (apply server/io-prepl
+    (mapcat identity
+      (merge {:repl-env (node/repl-env* env-opts)} opts))))

src/main/clojure/cljs/server/rhino.clj

@@ -11,8 +11,10 @@
             [cljs.repl.rhino :as rhino]
             [cljs.core.server :as server]))
 
-(defn repl []
-  (repl/repl (rhino/repl-env)))
+(defn repl [{:keys [opts env-opts]}]
+  (repl/repl* (rhino/repl-env* env-opts) opts))
 
-(defn prepl []
-  (server/io-prepl :repl-env (rhino/repl-env)))
+(defn prepl [{:keys [opts env-opts]}]
+  (apply server/io-prepl
+    (mapcat identity
+      (merge {:repl-env (rhino/repl-env* env-opts)} opts))))