Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump to cider/piggieback #730

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Bump to cider/piggieback #730

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sidecar/project.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@

:jvm-opts ^:replace ["-Xms256m" "-Xmx2g"]

:profiles {:dev {:dependencies [[com.cemerick/piggieback "0.2.2"]]
:profiles {:dev {:dependencies [[cider/piggieback "0.4.0"]]
:source-paths ["cljs_src" "src" "dev"]
:plugins [[lein-cljsbuild "1.1.3" :exclusions [[org.clojure/clojure]]]
[lein-ancient "0.6.15"]]}
Expand Down
2 changes: 1 addition & 1 deletion sidecar/resources/conf-fig-docs/FigwheelOptions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ specifies which local network interface you want to launch the server on.
A vector of strings indicating the nREPL middleware you want included
when nREPL launches.

:nrepl-middleware ["cider.nrepl/cider-middleware" "cemerick.piggieback/wrap-cljs-repl"]
:nrepl-middleware ["cider.nrepl/cider-middleware" "cider.piggieback/wrap-cljs-repl"]

:validate-config

Expand Down
6 changes: 3 additions & 3 deletions sidecar/src/figwheel_sidecar/components/nrepl_server.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
(cond
(utils/require? 'cider.piggieback)
["cider.piggieback/wrap-cljs-repl"]
(utils/require? 'cemerick.piggieback)
["cemerick.piggieback/wrap-cljs-repl"]
(utils/require? 'cider.piggieback)
["cider.piggieback/wrap-cljs-repl"]
:else nil))
resolve-mw (fn [name]
(let [s (symbol name)
Expand Down Expand Up @@ -66,7 +66,7 @@
:nrepl-middleware a optional list of nREPL middleware to include

This function will attempt to require/load the
cemerick.piggieback/wrap-cljs-repl middleware which is needed to
cider.piggieback/wrap-cljs-repl middleware which is needed to
start a ClojureSript REPL over nREPL."
[options]
(map->NreplComponent options))
6 changes: 3 additions & 3 deletions sidecar/src/figwheel_sidecar/repl.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,9 +172,9 @@
(let [cljs-repl (resolve 'cider.piggieback/cljs-repl)
opts' (:repl-opts figwheel-env)]
(apply cljs-repl figwheel-env (apply concat opts')))
(and (require? 'cemerick.piggieback)
(bound-var? 'cemerick.piggieback/*cljs-repl-env*))
(let [cljs-repl (resolve 'cemerick.piggieback/cljs-repl)
(and (require? 'cider.piggieback)
(bound-var? 'cider.piggieback/*cljs-repl-env*))
(let [cljs-repl (resolve 'cider.piggieback/cljs-repl)
opts' (:repl-opts figwheel-env)]
(apply cljs-repl figwheel-env (apply concat opts')))
:else (throw (ex-info "Unable to load a ClojureScript nREPL middleware library" {})))
Expand Down
2 changes: 1 addition & 1 deletion sidecar/src/figwheel_sidecar/schemas/config.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ specifies which local network interface you want to launch the server on.
"A vector of strings indicating the nREPL middleware you want included
when nREPL launches.

:nrepl-middleware [\"cider.nrepl/cider-middleware\" \"cemerick.piggieback/wrap-cljs-repl\"]")
:nrepl-middleware [\"cider.nrepl/cider-middleware\" \"cider.piggieback/wrap-cljs-repl\"]")

(def-key ::validate-config (some-fn boolean? #{:warn-unknown-keys :ignore-unknown-keys})

Expand Down