Skip to content

Commit afbc487

Browse files
committed
make REPL bootstrap helper idempotent - don't try to backup goog.isProvided_ or goog.require if already done
1 parent 69b6637 commit afbc487

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

script/test

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ if ! bin/cljsc src/test/cljs "{:optimizations :advanced
2222
:npm-deps {:lodash \"4.17.4\"}
2323
:closure-warnings {:non-standard-jsdoc :off :global-this :off}
2424
:install-deps true
25+
:pseudo-names true
2526
:language-in :es6
2627
:language-out :es5
2728
:foreign-libs [{:file \"src/test/cljs/calculator_global.js\"

src/main/clojure/cljs/repl/bootstrap.clj

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,14 @@
1717
;; we never care how many times a namespace is loaded it doesn't matter if
1818
;; Google Closure Library or ClojureScript
1919
(repl/evaluate-form repl-env env "<cljs repl>"
20-
'(set! (.-isProvided__ js/goog) js/goog.isProvided_))
20+
'(when-not (.-isProvided__ js/goog)
21+
(set! (.-isProvided__ js/goog) js/goog.isProvided_)))
2122
(repl/evaluate-form repl-env env "<cljs repl>"
2223
'(set! (.-isProvided_ js/goog) (fn [x] false)))
2324
;; monkey-patch goog.require
2425
(repl/evaluate-form repl-env env "<cljs repl>"
25-
'(set! (.-require__ js/goog) js/goog.require))
26+
'(when-not (.-require__ js/goog)
27+
(set! (.-require__ js/goog) js/goog.require)))
2628
(repl/evaluate-form repl-env env "<cljs repl>"
2729
'(set! (.-require js/goog)
2830
(fn [src reload]

0 commit comments

Comments
 (0)