Skip to content

Commit 1b6d4e5

Browse files
authored
switch to require from load for loading cljs.vendor.bridge, fixes Figwheel issue (#179)
reported by Bruce Hauman
1 parent e30e26d commit 1b6d4e5

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ Official web site: http://clojurescript.org
66

77
## Releases and dependency information ##
88

9-
Latest stable release: 1.11.51
9+
Latest stable release: 1.11.52
1010

1111
* [All released versions](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22org.clojure%22%20AND%20a%3A%22clojurescript%22)
1212

1313
[Leiningen](http://github.com/technomancy/leiningen/) dependency information:
1414

1515
```
16-
[org.clojure/clojurescript "1.11.51"]
16+
[org.clojure/clojurescript "1.11.52"]
1717
```
1818

1919
[Maven](http://maven.apache.org) dependency information:
@@ -22,7 +22,7 @@ Latest stable release: 1.11.51
2222
<dependency>
2323
<groupId>org.clojure</groupId>
2424
<artifactId>clojurescript</artifactId>
25-
<version>1.11.51</version>
25+
<version>1.11.52</version>
2626
</dependency>
2727
```
2828

changes.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
## 1.11.52
2+
3+
### Changes
4+
* use `require` instead of `load` for `cljs.vendor.bridge`, addresses issue
5+
reported by Bruce Hauman wrt. Figwheel
6+
17
## 1.11.51
28

39
### Changes

src/main/clojure/cljs/repl.cljc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1057,7 +1057,7 @@
10571057
;; bridge clojure.tools.reader to satisfy the old contract
10581058
(when (and (find-ns 'clojure.tools.reader)
10591059
(not (find-ns 'cljs.vendor.bridge)))
1060-
(clojure.core/load "vendor/bridge"))
1060+
(require 'cljs.vendor.bridge))
10611061
(doseq [[unknown-opt suggested-opt] (util/unknown-opts (set (keys opts)) (set/union known-repl-opts cljsc/known-opts))]
10621062
(when suggested-opt
10631063
(println (str "WARNING: Unknown option '" unknown-opt "'. Did you mean '" suggested-opt "'?"))))

0 commit comments

Comments
 (0)