From 94a3c5853bbf6bbf7f4336f28fe4d0db546a8401 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Tue, 20 Apr 2021 14:26:59 +0200 Subject: [PATCH] :arrow_up: Update frontend dependencies. And fix breaking changes on logging library. --- frontend/deps.edn | 17 ++- frontend/package.json | 2 - frontend/src/app/util/logging.cljs | 142 ++++++++++++-------------- frontend/yarn.lock | 159 +++++++---------------------- 4 files changed, 111 insertions(+), 209 deletions(-) diff --git a/frontend/deps.edn b/frontend/deps.edn index 5783b856b..bb86cf042 100644 --- a/frontend/deps.edn +++ b/frontend/deps.edn @@ -1,6 +1,6 @@ {:paths ["src" "vendor" "resources" "../common"] :deps - {org.clojure/clojurescript {:mvn/version "1.10.773"} + {org.clojure/clojurescript {:mvn/version "1.10.844"} org.clojure/clojure {:mvn/version "1.10.3"} com.cognitect/transit-cljs {:mvn/version "0.8.264"} @@ -30,22 +30,21 @@ :extra-deps {com.bhauman/rebel-readline-cljs {:mvn/version "0.1.4"} com.bhauman/rebel-readline {:mvn/version "0.1.4"} - org.clojure/tools.namespace {:mvn/version "0.3.1"} + org.clojure/tools.namespace {:mvn/version "1.1.0"} hashp/hashp {:mvn/version "RELEASE"} - metosin/jsonista {:mvn/version "0.2.5"} + metosin/jsonista {:mvn/version "0.3.1"} funcool/datoteka {:mvn/version "1.2.0"} binaryage/devtools {:mvn/version "RELEASE"} - - thheller/shadow-cljs {:mvn/version "2.11.20"} + thheller/shadow-cljs {:mvn/version "2.12.5"} ;; i18n parsing - carocad/parcera {:mvn/version "0.11.0"} - org.antlr/antlr4-runtime {:mvn/version "4.7"}}} + carocad/parcera {:mvn/version "0.11.6"} + org.antlr/antlr4-runtime {:mvn/version "4.9.2"}}} :outdated - {:extra-deps {olical/depot {:mvn/version "RELEASE"}} - :main-opts ["-m" "depot.outdated.main"]} + {:extra-deps {com.github.liquidz/antq {:mvn/version "RELEASE"}} + :main-opts ["-m" "antq.core"]} :repl {:main-opts ["-m" "rebel-readline.main"]} diff --git a/frontend/package.json b/frontend/package.json index efb975945..dbc09258c 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -45,8 +45,6 @@ "react": "~17.0.1", "react-dom": "~17.0.1", "rxjs": "~7.0.0-beta.12", - "slate": "^0.59.0", - "slate-react": "^0.59.0", "source-map-support": "^0.5.16", "tdigest": "^0.1.1", "xregexp": "^5.0.1" diff --git a/frontend/src/app/util/logging.cljs b/frontend/src/app/util/logging.cljs index d54e1d818..559c911b0 100644 --- a/frontend/src/app/util/logging.cljs +++ b/frontend/src/app/util/logging.cljs @@ -12,14 +12,10 @@ (ns app.util.logging (:require [goog.log :as glog] - [goog.debug.Logger :as Logger] - [goog.debug.Logger.Level :as Level] [goog.debug.Console :as Console] [cuerdas.core :as str] [goog.object :as gobj]) - (:import - [goog.debug Logger Console LogRecord] - [goog.debug.Logger Level]) + (:import [goog.debug Console]) (:require-macros [app.util.logging])) (defn- logger-name @@ -33,27 +29,23 @@ (defn get-logger [n] - (if (instance? Logger n) - n - (glog/getLogger (logger-name n)))) - -(def root (get-logger :root)) + (glog/getLogger (logger-name n))) (def levels - {:off Level/OFF - :shout Level/SHOUT - :error Level/SEVERE - :severe Level/SEVERE - :warning Level/WARNING - :warn Level/WARNING - :info Level/INFO - :config Level/CONFIG - :debug Level/FINE - :fine Level/FINE - :finer Level/FINER - :trace Level/FINER - :finest Level/FINEST - :all Level/ALL}) + {:off (.-OFF ^js glog/Level) + :shout (.-SHOUT ^js glog/Level) + :error (.-SEVERE ^js glog/Level) + :severe (.-SEVERE ^js glog/Level) + :warning (.-WARNING ^js glog/Level) + :warn (.-WARNING ^js glog/Level) + :info (.-INFO ^js glog/Level) + :config (.-CONFIG ^js glog/Level) + :debug (.-FINE ^js glog/Level) + :fine (.-FINE ^js glog/Level) + :finer (.-FINER ^js glog/Level) + :trace (.-FINER ^js glog/Level) + :finest (.-FINEST ^js glog/Level) + :all (.-ALL ^js glog/Level)}) (def colors {:gray3 "#8e908c" @@ -67,9 +59,9 @@ (defn- get-level-value [level] - (if (instance? Level level) - (.-value ^Level level) - (.-value ^Level (get levels level)))) + (if (instance? glog/Level level) + (.-value ^js level) + (.-value ^js (get levels level)))) (defn- level->color [level] @@ -92,13 +84,12 @@ :warn "WRN" :warning "WRN" :error "ERR" - (subs (.-name ^Level (get levels l)) 0 3))) + (subs (.-name ^js (get levels l)) 0 3))) (defn- make-log-record [level message name exception] - (let [record (LogRecord. level message name)] - (when exception - (.setException record exception)) + (let [record (glog/LogRecord. level message name)] + (when exception (.setException record exception)) record)) (defn log @@ -109,14 +100,14 @@ ([name lvl message exception] (when glog/ENABLED (when-let [l (get-logger name)] - (.logRecord ^Logger l (make-log-record (get levels lvl) message name exception)))))) + (glog/publishLogRecord l (make-log-record (get levels lvl) message name exception)))))) (defn set-level* "Set the level (a keyword) of the given logger, identified by name." [name lvl] (assert (contains? levels lvl)) - (when-let [l (get-logger name)] - (.setLevel ^Logger l (get levels lvl)))) + (some-> (get-logger name) + (glog/setLevel (get levels lvl)))) (defn set-levels! [lvls] @@ -124,29 +115,22 @@ :let [level (if (string? level) (keyword level) level)]] (set-level* logger level))) +(defn record->map + [^js record] + {:seqn (.-sequenceNumber_ record) + :time (.-time_ record) + :level (keyword (str/lower (.-name (.-level_ record)))) + :message (.-msg_ record) + :logger-name (.-loggerName_ record) + :exception (.-exception_ record)}) + (defn add-handler! ([handler-fn] - (add-handler! root handler-fn)) + (add-handler! :root handler-fn)) ([logger-or-name handler-fn] (when-let [l (get-logger logger-or-name)] - (letfn [(handler [^LogRecord record] - (handler-fn {:seqn (.-sequenceNumber_ record) - :time (.-time_ record) - :level (keyword (str/lower (.-name (.-level_ record)))) - :message (.-msg_ record) - :logger-name (.-loggerName_ record) - :exception (.-exception_ record)}))] - (unchecked-set handler "handler-fn" handler-fn) - (.addHandler ^Logger l handler))))) - -(defn add-handler-once! - ([handler-fn] - (add-handler-once! root handler-fn)) - ([logger-or-name handler-fn] - (when-let [l (get-logger logger-or-name)] - (when-not (some (comp #{handler-fn} #(gobj/get % "handler-fn")) - (.-handlers_ l)) - (add-handler! l handler-fn))))) + (glog/removeHandler l handler-fn) + (glog/addHandler l handler-fn)))) (defn- prepare-message [message] @@ -173,33 +157,35 @@ (assoc message k v) specials)))))) -(defonce default-console-handler - (fn [{:keys [message exception level logger-name]}] - (let [header-styles (str "font-weight: 600; color: " (level->color level)) - normal-styles (str "font-weight: 300; color: " (get colors :gray6)) - level-name (level->short-name level) - header (str "%c" level-name " [" logger-name "] ")] +(defn default-handler + [{:keys [message exception level logger-name]}] + (let [header-styles (str "font-weight: 600; color: " (level->color level)) + normal-styles (str "font-weight: 300; color: " (get colors :gray6)) + level-name (level->short-name level) + header (str "%c" level-name " [" logger-name "] ")] - (if (string? message) - (let [message (str header "%c" message)] - (js/console.log message header-styles normal-styles)) - (let [[message specials] (prepare-message message)] - (if (seq specials) - (let [message (str header "%c" (pr-str message))] - (js/console.group message header-styles normal-styles) - (doseq [[type n v] specials] - (case type - :js (js/console.log n v) - :error (if (instance? cljs.core.ExceptionInfo v) - (js/console.error (pr-str v)) - (js/console.error v)))) - (js/console.groupEnd message)) - (let [message (str header "%c" (pr-str message))] - (js/console.log message header-styles normal-styles)))))))) + (if (string? message) + (let [message (str header "%c" message)] + (js/console.log message header-styles normal-styles)) + (let [[message specials] (prepare-message message)] + (if (seq specials) + (let [message (str header "%c" (pr-str message))] + (js/console.group message header-styles normal-styles) + (doseq [[type n v] specials] + (case type + :js (js/console.log n v) + :error (if (instance? cljs.core.ExceptionInfo v) + (js/console.error (pr-str v)) + (js/console.error v)))) + (js/console.groupEnd message)) + (let [message (str header "%c" (pr-str message))] + (js/console.log message header-styles normal-styles))))))) + +(defonce default-console-handler + #(default-handler (record->map %))) (defn initialize! [] - (when-let [instance Console/instance] - (.setCapturing ^Console instance false)) + (add-handler! :root default-console-handler) + nil) - (add-handler-once! default-console-handler)) diff --git a/frontend/yarn.lock b/frontend/yarn.lock index 1d05ca47f..021d9aff6 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -38,21 +38,6 @@ normalize-path "^2.0.1" through2 "^2.0.3" -"@types/esrever@^0.2.0": - version "0.2.0" - resolved "https://registry.yarnpkg.com/@types/esrever/-/esrever-0.2.0.tgz#96404a2284b2c7527f08a1e957f8a31705f9880f" - integrity sha512-5NI6TeGzVEy/iBcuYtcPzzIC6EqlfQ2+UZ54vT0ulq8bPNGAy8UJD+XcsAyEOcnYFUjOVWuUV+k4/rVkxt9/XQ== - -"@types/is-hotkey@^0.1.1": - version "0.1.2" - resolved "https://registry.yarnpkg.com/@types/is-hotkey/-/is-hotkey-0.1.2.tgz#94f00793b5a297a7f7e69c1ef49613da2243a987" - integrity sha512-SUw9LpI3AIwbRNXS7FYy9AlXrTPIdBZGI7y4XxfIEYqgSW1UfFCUM9cMwHE/yCfTl0qeI0UQ/q8TdIxsIFgKPg== - -"@types/lodash@^4.14.149": - version "4.14.168" - resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.168.tgz#fe24632e79b7ade3f132891afff86caa5e5ce008" - integrity sha512-oVfRvqHV/V6D1yifJbVRU3TMp8OT6o6BG+U9MkwuJ3U8/CsDHvalRpsxBqivn71ztOFZBTfJMvETbqHiaNSj7Q== - "@types/q@^1.5.1": version "1.5.4" resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.4.tgz#15925414e0ad2cd765bfef58842f7e26a7accb24" @@ -143,9 +128,9 @@ anymatch@^2.0.0: normalize-path "^2.1.1" anymatch@~3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz#c55ecf02185e2469259399310c173ce31233b142" - integrity sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg== + version "3.1.2" + resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716" + integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg== dependencies: normalize-path "^3.0.0" picomatch "^2.0.4" @@ -387,9 +372,9 @@ bach@^1.0.0: now-and-later "^2.0.0" balanced-match@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" - integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c= + version "1.0.2" + resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" + integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== base64-js@^1.0.2: version "1.5.1" @@ -707,7 +692,7 @@ chalk@^2.3.0, chalk@^2.4.1, chalk@^2.4.2: escape-string-regexp "^1.0.5" supports-color "^5.3.0" -"chokidar@>=2.0.0 <4.0.0": +"chokidar@>=3.0.0 <4.0.0": version "3.5.1" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.1.tgz#ee9ce7bbebd2b79f49f304799d5468e31e14e68a" integrity sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw== @@ -926,11 +911,6 @@ component-emitter@^1.2.1: resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0" integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg== -compute-scroll-into-view@^1.0.17: - version "1.0.17" - resolved "https://registry.yarnpkg.com/compute-scroll-into-view/-/compute-scroll-into-view-1.0.17.tgz#6a88f18acd9d42e9cf4baa6bec7e0522607ab7ab" - integrity sha512-j4dx+Fb0URmzbwwMUrhqWM2BEWHdFGx+qZ9qqASHRPqvTYdqvWnHg0H1hIbcyLnvgnoNAVMlwkepyqM3DaIFUg== - concat-map@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" @@ -1002,9 +982,9 @@ copy-props@^2.0.1: is-plain-object "^5.0.0" core-js-pure@^3.0.0: - version "3.10.0" - resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.10.0.tgz#dab9d6b141779b622b40567e7a536d2276646c15" - integrity sha512-CC582enhrFZStO4F8lGI7QL3SYx7/AIRc+IdSi3btrQGrVsTawo5K/crmKbRrQ+MOMhNX4v+PATn0k2NN6wI7A== + version "3.10.2" + resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.10.2.tgz#065304f8547bf42008d4528dfff973c38bd6a332" + integrity sha512-uu18pVHQ21n4mzfuSlCXpucu5VKsck3j2m5fjrBOBqqdgWAxwdCgUuGWj6cDDPN1zLj/qtiqKvBMxWgDeeu49Q== core-js@^3.6.4: version "3.10.0" @@ -1322,11 +1302,6 @@ diffie-hellman@^5.0.0: miller-rabin "^4.0.0" randombytes "^2.0.0" -direction@^1.0.3: - version "1.0.4" - resolved "https://registry.yarnpkg.com/direction/-/direction-1.0.4.tgz#2b86fb686967e987088caf8b89059370d4837442" - integrity sha512-GYqKi1aH7PJXxdhTeZBFrg8vUBeKXi+cNprXsC1kpJcbcVnV9wBsrOu1cQEdG0WeQwlfHiy3XvnKfIrJ2R0NzQ== - dom-serializer@0: version "0.2.2" resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.2.2.tgz#1afb81f533717175d478655debc5e332d9f9bb51" @@ -1549,11 +1524,6 @@ esprima@^4.0.0: resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== -esrever@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/esrever/-/esrever-0.2.0.tgz#96e9d28f4f1b1a76784cd5d490eaae010e7407b8" - integrity sha1-lunSj08bGnZ4TNXUkOquAQ50B7g= - event-emitter@^0.3.5: version "0.3.5" resolved "https://registry.yarnpkg.com/event-emitter/-/event-emitter-0.3.5.tgz#df8c69eef1647923c7157b9ce83840610b02cc39" @@ -2329,9 +2299,9 @@ he@1.1.1: integrity sha1-k0EP0hsAlzUVH4howvJx80J+I/0= highlight.js@^10.6.0: - version "10.7.1" - resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.7.1.tgz#a8ec4152db24ea630c90927d6cae2a45f8ecb955" - integrity sha512-S6G97tHGqJ/U8DsXcEdnACbirtbx58Bx9CzIVeYli8OuswCfYI/LsXH2EiGcoGio1KAC3x4mmUwulOllJ2ZyRA== + version "10.7.2" + resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.7.2.tgz#89319b861edc66c48854ed1e6da21ea89f847360" + integrity sha512-oFLl873u4usRM9K63j4ME9u3etNF0PLiJhSQ8rdfuL51Wn3zkD6drf9ZW0dOzjnZI22YYG24z30JcmfCZjMgYg== hmac-drbg@^1.0.1: version "1.0.1" @@ -2380,11 +2350,6 @@ ieee754@^1.1.4: resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== -immer@^5.0.0: - version "5.3.6" - resolved "https://registry.yarnpkg.com/immer/-/immer-5.3.6.tgz#51eab8cbbeb13075fe2244250f221598818cac04" - integrity sha512-pqWQ6ozVfNOUDjrLfm4Pt7q4Q12cGw2HUZgry4Q5+Myxu9nmHRkWBpI0J4+MK0AxbdFtdMTwEGVl7Vd+vEiK+A== - immutable@~3.7.4: version "3.7.6" resolved "https://registry.yarnpkg.com/immutable/-/immutable-3.7.6.tgz#13b4d3cb12befa15482a26fe1b2ebae640071e4b" @@ -2632,11 +2597,6 @@ is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1: dependencies: is-extglob "^2.1.1" -is-hotkey@^0.1.6: - version "0.1.8" - resolved "https://registry.yarnpkg.com/is-hotkey/-/is-hotkey-0.1.8.tgz#6b1f4b2d0e5639934e20c05ed24d623a21d36d25" - integrity sha512-qs3NZ1INIS+H+yeo7cD9pDfwYV/jqRh1JG9S9zYrNudkoUQg7OL7ziXqRKu+InFjUIDoP2o6HIkLYMh1pcWgyQ== - is-negated-glob@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-negated-glob/-/is-negated-glob-1.0.0.tgz#6910bca5da8c95e784b5751b976cf5a10fee36d2" @@ -2676,11 +2636,6 @@ is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4: dependencies: isobject "^3.0.1" -is-plain-object@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-3.0.1.tgz#662d92d24c0aa4302407b0d45d21f2251c85f85b" - integrity sha512-Xnpx182SBMrr/aBik8y+GuR4U1L9FqMSojwDQwPMmxyC6bvEqly9UBCxhauBF5vNh2gwWJNX6oDV7O+OM4z34g== - is-plain-object@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344" @@ -2788,9 +2743,9 @@ js-base64@^2.1.8: integrity sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ== js-beautify@^1.13.5: - version "1.13.5" - resolved "https://registry.yarnpkg.com/js-beautify/-/js-beautify-1.13.5.tgz#a08a97890cae55daf1d758d3f6577bd4a64d7014" - integrity sha512-MsXlH6Z/BiRYSkSRW3clNDqDjSpiSNOiG8xYVUBXt4k0LnGvDhlTGOlHX1VFtAdoLmtwjxMG5qiWKy/g+Ipv5w== + version "1.13.13" + resolved "https://registry.yarnpkg.com/js-beautify/-/js-beautify-1.13.13.tgz#756907d1728f329f2b84c42efd56ad17514620bf" + integrity sha512-oH+nc0U5mOAqX8M5JO1J0Pw/7Q35sAdOsM5W3i87pir9Ntx6P/5Gx1xLNoK+MGyvHk4rqqRCE4Oq58H6xl2W7A== dependencies: config-chain "^1.1.12" editorconfig "^0.15.3" @@ -3078,7 +3033,7 @@ lodash.pluck@^3.1.2: lodash.isarray "^3.0.0" lodash.map "^3.0.0" -lodash@^4.0.0, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.4, lodash@~4.17.10: +lodash@^4.0.0, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@~4.17.10: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -3883,9 +3838,9 @@ path-type@^1.0.0: pinkie-promise "^2.0.0" pbkdf2@^3.0.3: - version "3.1.1" - resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.1.1.tgz#cb8724b0fada984596856d1a6ebafd3584654b94" - integrity sha512-4Ejy1OPxi9f2tt1rRV7Go7zmfDQ+ZectEQz3VGUQhgq62HtIRPDyG/JtnwIxs6x3uNMwo2V7q1fMvKjb+Tnpqg== + version "3.1.2" + resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.1.2.tgz#dd822aa0887580e52f1a039dc3eda108efae3075" + integrity sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA== dependencies: create-hash "^1.1.2" create-hmac "^1.1.4" @@ -3919,9 +3874,9 @@ phantomjs-prebuilt@^2.1.16: which "^1.2.10" picomatch@^2.0.4, picomatch@^2.2.1: - version "2.2.2" - resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad" - integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg== + version "2.2.3" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.3.tgz#465547f359ccc206d3c48e46a1bcb89bf7ee619d" + integrity sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg== pify@^2.0.0: version "2.3.0" @@ -3995,9 +3950,9 @@ postcss@^7.0.16: supports-color "^6.1.0" postcss@^8.2.7: - version "8.2.9" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.2.9.tgz#fd95ff37b5cee55c409b3fdd237296ab4096fba3" - integrity sha512-b+TmuIL4jGtCHtoLi+G/PisuIl9avxs8IZMSmlABRwNz5RLUUACrC+ws81dcomz1nRezm5YPdXiMEzBEKgYn+Q== + version "8.2.10" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.2.10.tgz#ca7a042aa8aff494b334d0ff3e9e77079f6f702b" + integrity sha512-b/h7CPV7QEdrqIxtAf2j31U5ef05uBDuvoXv6L51Q4rcS1jdlXAVKJv+atCFdUXYl9dyTHGyoMzIepwowRJjFw== dependencies: colorette "^1.2.2" nanoid "^3.1.22" @@ -4409,9 +4364,9 @@ ripemd160@^2.0.0, ripemd160@^2.0.1: inherits "^2.0.1" rxjs@~7.0.0-beta.12: - version "7.0.0-beta.14" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.0.0-beta.14.tgz#03f9d10d0b923715fc1a75c1e1d119b5a3882157" - integrity sha512-mXvWwjgZiZwka0r5dIbZnsYjx2WqeSpvFejNs8aJkxAP6lzy8xsjKpcsxasX5AnVXCKeTt/8rGrIG8N+8HR3qA== + version "7.0.0-rc.1" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.0.0-rc.1.tgz#11f368e740e2b3cfe805891be127d07391673654" + integrity sha512-FVFOeT+eGdbcPe+uH+cWnEElrU4LiDMrlstNSUpI3MPErICLtVoUCbKrF+n+8DYemHDe7wPqYtuNEYTM3ur3xw== dependencies: tslib "~2.1.0" @@ -4448,11 +4403,11 @@ sass-graph@2.2.5: yargs "^13.3.2" sass@^1.32.8: - version "1.32.8" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.32.8.tgz#f16a9abd8dc530add8834e506878a2808c037bdc" - integrity sha512-Sl6mIeGpzjIUZqvKnKETfMf0iDAswD9TNlv13A7aAF3XZlRPMq4VvJWBC2N2DXbp94MQVdNSFG6LfF/iOXrPHQ== + version "1.32.11" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.32.11.tgz#b236b3ea55c76602c2ef2bd0445f0db581baa218" + integrity sha512-O9tRcob/fegUVSIV1ihLLZcftIOh0AF1VpKgusUfLqnb2jQ0GLDwI5ivv1FYWivGv8eZ/AwntTyTzjcHu0c/qw== dependencies: - chokidar ">=2.0.0 <4.0.0" + chokidar ">=3.0.0 <4.0.0" sax@~1.2.4: version "1.2.4" @@ -4467,13 +4422,6 @@ scheduler@^0.20.2: loose-envify "^1.1.0" object-assign "^4.1.1" -scroll-into-view-if-needed@^2.2.20: - version "2.2.28" - resolved "https://registry.yarnpkg.com/scroll-into-view-if-needed/-/scroll-into-view-if-needed-2.2.28.tgz#5a15b2f58a52642c88c8eca584644e01703d645a" - integrity sha512-8LuxJSuFVc92+0AdNv4QOxRL4Abeo1DgLnGNkn1XlaujPH/3cCFz3QI60r2VNu4obJJROzgnIUw5TKQkZvZI1w== - dependencies: - compute-scroll-into-view "^1.0.17" - scss-tokenizer@^0.2.3: version "0.2.3" resolved "https://registry.yarnpkg.com/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz#8eb06db9a9723333824d3f5530641149847ce5d1" @@ -4533,9 +4481,9 @@ shadow-cljs-jar@1.3.2: integrity sha512-XmeffAZHv8z7451kzeq9oKh8fh278Ak+UIOGGrapyqrFBB773xN8vMQ3O7J7TYLnb9BUwcqadKkmgaq7q6fhZg== shadow-cljs@^2.11.20: - version "2.12.0" - resolved "https://registry.yarnpkg.com/shadow-cljs/-/shadow-cljs-2.12.0.tgz#468903b2eaff9e3c9c52c3db2c756e55cb7f0e0a" - integrity sha512-w/YaFdB3IFYMe6av+1JwLQg1PPfDfnkeF537X5t1seYB3nRw9NWXgIfGtyZ7d0Iavw+0HQi7iWWiVMt6+yrWyA== + version "2.12.5" + resolved "https://registry.yarnpkg.com/shadow-cljs/-/shadow-cljs-2.12.5.tgz#d3cf29fc1f1e02dd875939549419979e0feadbf4" + integrity sha512-o3xo3coRgnlkI/iI55ccHjj6AU3F1+ovk3hhK86e3P2JGGOpNTAwsGNxUpMC5JAwS9Nz0v6sSk73hWjEOnm6fQ== dependencies: node-libs-browser "^2.2.1" readline-sync "^1.4.7" @@ -4617,30 +4565,6 @@ simple-swizzle@^0.2.2: dependencies: is-arrayish "^0.3.1" -slate-react@^0.59.0: - version "0.59.0" - resolved "https://registry.yarnpkg.com/slate-react/-/slate-react-0.59.0.tgz#c8043dce7ea71279f314d9951c32e4f548b1ea0b" - integrity sha512-Fx5vfTi0s1fY5PaXzPH8uA9mW8aevVVYrGGvqX/k363tlPDnQSs/QTibIyFl1Y3MPJ+GdocoyOGjAaZMUIXfIg== - dependencies: - "@types/is-hotkey" "^0.1.1" - "@types/lodash" "^4.14.149" - direction "^1.0.3" - is-hotkey "^0.1.6" - is-plain-object "^3.0.0" - lodash "^4.17.4" - scroll-into-view-if-needed "^2.2.20" - -slate@^0.59.0: - version "0.59.0" - resolved "https://registry.yarnpkg.com/slate/-/slate-0.59.0.tgz#3169daf2f036e84aa149f60e0d12ef2fc4c0839e" - integrity sha512-M4UTMkXExxuq8tCD+knn7BtV2pmY8pepay++EF59rmg/v4RB6X1gNzA0xP3aw2rqYl8TmWdOBdy9InFrm3WyXw== - dependencies: - "@types/esrever" "^0.2.0" - esrever "^0.2.0" - immer "^5.0.0" - is-plain-object "^3.0.0" - tiny-warning "^1.0.3" - snapdragon-node@^2.0.1: version "2.1.1" resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b" @@ -5097,11 +5021,6 @@ timers-ext@^0.1.7: es5-ext "~0.10.46" next-tick "1" -tiny-warning@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/tiny-warning/-/tiny-warning-1.0.3.tgz#94a30db453df4c643d0fd566060d60a875d84754" - integrity sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA== - to-absolute-glob@^2.0.0: version "2.0.2" resolved "https://registry.yarnpkg.com/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz#1865f43d9e74b0822db9f145b78cff7d0f7c849b" @@ -5546,9 +5465,9 @@ xpath@^0.0.27: integrity sha512-fg03WRxtkCV6ohClePNAECYsmpKKTv5L8y/X3Dn1hQrec3POx2jHZ/0P2qQ6HvsrU1BmeqXcof3NGGueG6LxwQ== xregexp@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-5.0.1.tgz#b2f20e87790876585fb4103e91cb163a63cd2547" - integrity sha512-flG0ykxHQLOfF886GpnY26WQkj4/RmcxYvoVcSFbg+1lPMdnXEPoTKuLzw1olKnJ+o2Wc1+RCD1oktV4bYzVlQ== + version "5.0.2" + resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-5.0.2.tgz#798aa7757836f39cdbdeeba3daf94d75f7a9dcc1" + integrity sha512-JPNfN40YMNSDxZrahMrmtNH1QqPJp0/qNeEJM2nnOlhcBdfCCjekPYFV2OnwKxwvpEYglH1RBotbpRRaEuCG8Q== dependencies: "@babel/runtime-corejs3" "^7.12.1"