From c80da1bbace2784242b210a63fece02b385c47ac Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Mon, 26 Feb 2024 17:19:43 +0100 Subject: [PATCH] :arrow_up: Update rumext and shadow-cljs --- common/deps.edn | 6 +++--- common/package.json | 2 +- common/yarn.lock | 10 +++++----- exporter/deps.edn | 2 +- exporter/package.json | 2 +- exporter/yarn.lock | 10 +++++----- frontend/deps.edn | 6 +++--- frontend/package.json | 2 +- frontend/src/app/main/ui/components/radio_buttons.cljs | 7 ++++--- .../workspace/sidebar/options/menus/layout_item.cljs | 2 +- frontend/yarn.lock | 10 +++++----- 11 files changed, 30 insertions(+), 29 deletions(-) diff --git a/common/deps.edn b/common/deps.edn index 32a9f3473..9819697cf 100644 --- a/common/deps.edn +++ b/common/deps.edn @@ -2,7 +2,7 @@ {org.clojure/clojure {:mvn/version "1.11.1"} org.clojure/data.json {:mvn/version "2.5.0"} org.clojure/tools.cli {:mvn/version "1.0.219"} - org.clojure/clojurescript {:mvn/version "1.11.60"} + org.clojure/clojurescript {:mvn/version "1.11.132"} org.clojure/test.check {:mvn/version "1.1.1"} org.clojure/data.fressian {:mvn/version "1.0.0"} @@ -19,7 +19,7 @@ criterium/criterium {:mvn/version "0.4.6"} metosin/jsonista {:mvn/version "0.3.8"} - metosin/malli {:mvn/version "0.13.0"} + metosin/malli {:mvn/version "0.14.0"} expound/expound {:mvn/version "0.9.0"} com.cognitect/transit-clj {:mvn/version "1.0.333"} @@ -63,7 +63,7 @@ {:dev {:extra-deps {org.clojure/tools.namespace {:mvn/version "RELEASE"} - thheller/shadow-cljs {:mvn/version "2.26.2"} + thheller/shadow-cljs {:mvn/version "2.27.4"} com.clojure-goes-fast/clj-async-profiler {:mvn/version "RELEASE"} com.bhauman/rebel-readline {:mvn/version "RELEASE"} criterium/criterium {:mvn/version "RELEASE"} diff --git a/common/package.json b/common/package.json index 59e9ae56b..4d2e78a79 100644 --- a/common/package.json +++ b/common/package.json @@ -15,7 +15,7 @@ "sax": "^1.2.4" }, "devDependencies": { - "shadow-cljs": "2.26.2", + "shadow-cljs": "2.27.4", "source-map-support": "^0.5.21", "ws": "^8.13.0" }, diff --git a/common/yarn.lock b/common/yarn.lock index 9e6ecf17c..75220279c 100644 --- a/common/yarn.lock +++ b/common/yarn.lock @@ -352,7 +352,7 @@ __metadata: dependencies: luxon: "npm:^3.4.2" sax: "npm:^1.2.4" - shadow-cljs: "npm:2.26.2" + shadow-cljs: "npm:2.27.4" source-map-support: "npm:^0.5.21" ws: "npm:^8.13.0" languageName: unknown @@ -1437,9 +1437,9 @@ __metadata: languageName: node linkType: hard -"shadow-cljs@npm:2.26.2": - version: 2.26.2 - resolution: "shadow-cljs@npm:2.26.2" +"shadow-cljs@npm:2.27.4": + version: 2.27.4 + resolution: "shadow-cljs@npm:2.27.4" dependencies: node-libs-browser: "npm:^2.2.1" readline-sync: "npm:^1.4.7" @@ -1449,7 +1449,7 @@ __metadata: ws: "npm:^7.4.6" bin: shadow-cljs: cli/runner.js - checksum: d504969ea28bcf3d5fc879c8111cb630a8ae910ea692bbfb0d73097fb336e13e642116db9fcc91524686a6824e71d439ef0df31941eabb6331feb4aa4146e830 + checksum: bae23e71df9c2b2979259a0cde8747c923ee295f58ab4637c9d6b103d82542b40ef39172d4be2dbb94af2e6458a177d1ec96c1eb1e73b1d8f3a4ddb5eaaba7d4 languageName: node linkType: hard diff --git a/exporter/deps.edn b/exporter/deps.edn index ff538c79c..01c4cefcc 100644 --- a/exporter/deps.edn +++ b/exporter/deps.edn @@ -15,7 +15,7 @@ :dev {:extra-deps - {thheller/shadow-cljs {:mvn/version "2.26.2"}}} + {thheller/shadow-cljs {:mvn/version "2.27.4"}}} :shadow-cljs {:main-opts ["-m" "shadow.cljs.devtools.cli"]} diff --git a/exporter/package.json b/exporter/package.json index 1dd53fa66..86cb78c8d 100644 --- a/exporter/package.json +++ b/exporter/package.json @@ -22,7 +22,7 @@ "xregexp": "^5.1.1" }, "devDependencies": { - "shadow-cljs": "2.26.2", + "shadow-cljs": "2.27.4", "source-map-support": "^0.5.21" }, "scripts": { diff --git a/exporter/yarn.lock b/exporter/yarn.lock index f7016c8b4..d5c7dfe79 100644 --- a/exporter/yarn.lock +++ b/exporter/yarn.lock @@ -735,7 +735,7 @@ __metadata: luxon: "npm:^3.4.4" playwright: "npm:^1.40.1" raw-body: "npm:^2.5.2" - shadow-cljs: "npm:2.26.2" + shadow-cljs: "npm:2.27.4" source-map-support: "npm:^0.5.21" xml-js: "npm:^1.6.11" xregexp: "npm:^5.1.1" @@ -1842,9 +1842,9 @@ __metadata: languageName: node linkType: hard -"shadow-cljs@npm:2.26.2": - version: 2.26.2 - resolution: "shadow-cljs@npm:2.26.2" +"shadow-cljs@npm:2.27.4": + version: 2.27.4 + resolution: "shadow-cljs@npm:2.27.4" dependencies: node-libs-browser: "npm:^2.2.1" readline-sync: "npm:^1.4.7" @@ -1854,7 +1854,7 @@ __metadata: ws: "npm:^7.4.6" bin: shadow-cljs: cli/runner.js - checksum: d504969ea28bcf3d5fc879c8111cb630a8ae910ea692bbfb0d73097fb336e13e642116db9fcc91524686a6824e71d439ef0df31941eabb6331feb4aa4146e830 + checksum: bae23e71df9c2b2979259a0cde8747c923ee295f58ab4637c9d6b103d82542b40ef39172d4be2dbb94af2e6458a177d1ec96c1eb1e73b1d8f3a4ddb5eaaba7d4 languageName: node linkType: hard diff --git a/frontend/deps.edn b/frontend/deps.edn index a626ecbd9..e5a822dea 100644 --- a/frontend/deps.edn +++ b/frontend/deps.edn @@ -19,8 +19,8 @@ :git/url "https://github.com/funcool/beicon.git"} funcool/rumext - {:git/tag "v2.10" - :git/sha "d96ea18" + {:git/tag "v2.11.1" + :git/sha "c9197b0" :git/url "https://github.com/funcool/rumext.git"} instaparse/instaparse {:mvn/version "1.4.12"} @@ -41,7 +41,7 @@ :dev {:extra-paths ["dev"] :extra-deps - {thheller/shadow-cljs {:mvn/version "2.26.2"} + {thheller/shadow-cljs {:mvn/version "2.27.4"} org.clojure/tools.namespace {:mvn/version "RELEASE"} cider/cider-nrepl {:mvn/version "0.44.0"}}} diff --git a/frontend/package.json b/frontend/package.json index 4365ae1a3..9463ef80f 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -75,7 +75,7 @@ "prop-types": "^15.8.1", "rimraf": "^5.0.5", "sass": "^1.69.7", - "shadow-cljs": "2.26.2", + "shadow-cljs": "2.27.4", "storybook": "^7.6.7", "typescript": "^5.3.3", "vite": "^5.0.11", diff --git a/frontend/src/app/main/ui/components/radio_buttons.cljs b/frontend/src/app/main/ui/components/radio_buttons.cljs index 6c7d3c73a..811848d54 100644 --- a/frontend/src/app/main/ui/components/radio_buttons.cljs +++ b/frontend/src/app/main/ui/components/radio_buttons.cljs @@ -88,9 +88,10 @@ (dom/blur! input)))) context-value - (mf/spread-obj props {:on-change on-change' - :encode-fn encode-fn - :decode-fn decode-fn})] + (mf/spread props + :on-change on-change' + :encode-fn encode-fn + :decode-fn decode-fn)] [:& (mf/provider context) {:value context-value} [:div {:class (dm/str class " " (stl/css :radio-btn-wrapper)) diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/menus/layout_item.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/menus/layout_item.cljs index dff99e0a9..4221c9d7a 100644 --- a/frontend/src/app/main/ui/workspace/sidebar/options/menus/layout_item.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/options/menus/layout_item.cljs @@ -190,7 +190,7 @@ [{:keys [type on-type-change] :as props}] (let [type (d/nilv type :simple) on-blur (mf/use-fn #(select-margins false false false false)) - props (mf/spread-obj props {:on-blur on-blur}) + props (mf/spread props :on-blur on-blur) on-type-change' (mf/use-fn diff --git a/frontend/yarn.lock b/frontend/yarn.lock index 2fd8502ec..f1a082bfa 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -7921,7 +7921,7 @@ __metadata: rxjs: "npm:8.0.0-alpha.13" sass: "npm:^1.69.7" sax: "npm:^1.3.0" - shadow-cljs: "npm:2.26.2" + shadow-cljs: "npm:2.27.4" source-map-support: "npm:^0.5.21" storybook: "npm:^7.6.7" tdigest: "npm:^0.1.2" @@ -13319,9 +13319,9 @@ __metadata: languageName: node linkType: hard -"shadow-cljs@npm:2.26.2": - version: 2.26.2 - resolution: "shadow-cljs@npm:2.26.2" +"shadow-cljs@npm:2.27.4": + version: 2.27.4 + resolution: "shadow-cljs@npm:2.27.4" dependencies: node-libs-browser: "npm:^2.2.1" readline-sync: "npm:^1.4.7" @@ -13331,7 +13331,7 @@ __metadata: ws: "npm:^7.4.6" bin: shadow-cljs: cli/runner.js - checksum: d504969ea28bcf3d5fc879c8111cb630a8ae910ea692bbfb0d73097fb336e13e642116db9fcc91524686a6824e71d439ef0df31941eabb6331feb4aa4146e830 + checksum: bae23e71df9c2b2979259a0cde8747c923ee295f58ab4637c9d6b103d82542b40ef39172d4be2dbb94af2e6458a177d1ec96c1eb1e73b1d8f3a4ddb5eaaba7d4 languageName: node linkType: hard