Skip to content

Commit c92d2b7

Browse files
author
Bruce Hauman
committed
fixes for cljs 1.10.844
1 parent cedbfd2 commit c92d2b7

File tree

5 files changed

+9
-12
lines changed

5 files changed

+9
-12
lines changed

deps.edn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
{:extra-deps {com.bhauman/rebel-readline-cljs {:mvn/version "0.1.3"}}}
5050
:dev
5151
{:extra-deps
52-
{org.clojure/clojurescript {:mvn/version #_"1.10.339" "1.10.773"}
52+
{org.clojure/clojurescript {:mvn/version #_"1.10.339" "1.10.773" #_"1.10.844"}
5353
com.bhauman/figwheel-core {:local/root "/Users/bhauman/workspace/figwheel/figwheel-core"}
5454
com.bhauman/figwheel-repl {:local/root "/Users/bhauman/workspace/figwheel/figwheel-repl"}
5555
com.bhauman/certifiable {:local/root "/Users/bhauman/workspace/certifiable"}

src/figwheel/main/css_reload.cljc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
(:require
33
[clojure.string :as string]
44
#?@(:cljs [[goog.Uri :as guri]
5-
[goog.log :as glog]
65
[goog.object :as gobj]
76
[goog.cssom :as gcss]
8-
[goog.events :as gevent]]
7+
[goog.events :as gevent]
8+
[figwheel.repl.logging :as log]]
99
:clj [[clojure.data.json :as json]
1010
[cljs.env]
1111
[cljs.repl]
@@ -29,7 +29,7 @@
2929
;; set level (.setLevel logger goog.debug.Logger.Level.INFO)
3030
;; disable (.setCapturing log-console false)
3131

32-
(defonce logger (glog/getLogger "Figwheel CSS Reload"))
32+
(defonce logger (log/get-logger "Figwheel CSS Reload"))
3333

3434
(defn ^:export console-logging []
3535
(when-not (gobj/get goog.debug.Console "instance")
@@ -138,10 +138,10 @@
138138
(.then prom
139139
(fn [loaded-files]
140140
(when (not-empty loaded-files)
141-
(glog/info logger (str "loaded " (pr-str loaded-files)))
141+
(log/info logger (str "loaded " (pr-str loaded-files)))
142142
(dispatch-on-css-load loaded-files))
143143
(when-let [not-loaded (not-empty (remove (set loaded-files) (set files)))]
144-
(glog/warning logger (str "Unable to reload " (pr-str not-loaded))))
144+
(log/warning logger (str "Unable to reload " (pr-str not-loaded))))
145145
;; reset
146146
[])))))
147147

src/figwheel/main/editor.cljc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
(:require
33
[clojure.string :as string]
44
[figwheel.repl]
5-
#?@(:cljs [[figwheel.tools.heads-up :as heads-up]
6-
[goog.log :as glog]]
5+
#?@(:cljs [[figwheel.tools.heads-up :as heads-up]]
76
:clj [[clojure.java.io :as io]
87
[clojure.java.shell :as shell]])))
98

src/figwheel/main/evalback.cljc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
(:require
33
[clojure.string :as string]
44
[figwheel.repl :as frepl]
5-
#?@(:cljs [[goog.log :as glog]]
6-
:clj [[figwheel.main.logging :as log]
5+
#?@(:clj [[figwheel.main.logging :as log]
76
[clojure.java.io :as io]
87
[cljs.tagged-literals :as tags]
98
[clojure.tools.reader :as reader]

src/figwheel/main/system_exit.cljc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
(:require
33
[clojure.string :as string]
44
[figwheel.repl]
5-
#?@(:cljs [[figwheel.tools.heads-up :as heads-up]
6-
[goog.log :as glog]]
5+
#?@(:cljs [[figwheel.tools.heads-up :as heads-up]]
76
:clj [[clojure.java.io :as io]
87
[clojure.java.shell :as shell]])))
98

0 commit comments

Comments
 (0)