Skip to content

Commit 89cd236

Browse files
committed
formatters: fix browser detection code
clojurescript currently bundles[1] pretty old closure library 0.0-20211011-0726fdeb[2] so we cannot use `isAtLeast`. [1] https://github.com/clojure/clojurescript/blob/6dac3165d4bc8f785741ea86aef946b11c9d7d0f/project.clj#L17 [2] google/closure-library@0726fdeb
1 parent 6c4d17f commit 89cd236

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/lib/devtools/formatters.cljs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
(ns devtools.formatters
22
(:require-macros [devtools.oops :refer [unchecked-aget unchecked-aset]])
3-
(:require [goog.labs.userAgent.browser :refer [isAtLeast]]
3+
(:require [goog.labs.userAgent.browser :refer [isVersionOrHigher isChrome isFirefox isEdge isEdgeChromium]]
44
[devtools.prefs :as prefs]
55
[devtools.util :refer [get-formatters-safe set-formatters-safe! in-node-context?]]
66
[devtools.context :as context]
@@ -13,10 +13,10 @@
1313
(def obsolete-formatter-key "devtoolsFormatter")
1414

1515
(defn ^:dynamic available? []
16-
(or (in-node-context?) ; node.js or Chrome 47+
17-
(isAtLeast "CHROMIUM" 47)
18-
(isAtLeast "EDGE" 79) ;; First Edge to use Blink, has Blink 79.
19-
(isAtLeast "FIREFOX" 111)))
16+
(or (in-node-context?)
17+
(and (isChrome) (isVersionOrHigher 47))
18+
(and (isFirefox) (isVersionOrHigher 111))
19+
(and (or (isEdge) (isEdgeChromium)) (isVersionOrHigher 79))))
2020

2121
(deftype CLJSDevtoolsFormatter [])
2222

0 commit comments

Comments
 (0)