Merge pull request #4193 from penpot/niwinz-staging-update-deps

⬆️ Update frontend dependencies

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"}

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"
   },

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":
+"shadow-cljs@npm:2.27.4":
-  version: 2.26.2
+  version: 2.27.4
-  resolution: "shadow-cljs@npm:2.26.2"
+  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
 

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"]}

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": {

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":
+"shadow-cljs@npm:2.27.4":
-  version: 2.26.2
+  version: 2.27.4
-  resolution: "shadow-cljs@npm:2.26.2"
+  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
 

frontend/deps.edn

@@ -19,8 +19,8 @@
    :git/url "https://github.com/funcool/beicon.git"}
 
   funcool/rumext
-  {:git/tag "v2.10"
+  {:git/tag "v2.11.1"
-   :git/sha "d96ea18"
+   :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"}}}
 

frontend/package.json

@@ -39,53 +39,53 @@
     "storybook:build": "npm run storybook:compile && storybook build"
   },
   "devDependencies": {
-    "@storybook/addon-essentials": "^7.6.7",
+    "@storybook/addon-essentials": "^7.6.17",
-    "@storybook/addon-interactions": "^7.6.7",
+    "@storybook/addon-interactions": "^7.6.17",
-    "@storybook/addon-links": "^7.6.7",
+    "@storybook/addon-links": "^7.6.17",
-    "@storybook/addon-onboarding": "^1.0.10",
+    "@storybook/addon-onboarding": "^1.0.11",
-    "@storybook/blocks": "^7.6.7",
+    "@storybook/blocks": "^7.6.17",
-    "@storybook/react": "^7.6.7",
+    "@storybook/react": "^7.6.17",
-    "@storybook/react-vite": "^7.6.7",
+    "@storybook/react-vite": "^7.6.17",
     "@storybook/testing-library": "^0.2.2",
-    "@types/node": "^20.10.6",
+    "@types/node": "^20.11.20",
     "animate.css": "^4.1.1",
-    "autoprefixer": "^10.4.16",
+    "autoprefixer": "^10.4.17",
     "concurrently": "^8.2.2",
     "draft-js": "git+https://github.com/penpot/draft-js.git",
     "fancy-log": "^2.0.0",
-    "gettext-parser": "^7.0.1",
+    "gettext-parser": "^8.0.0",
     "gulp": "4.0.2",
     "gulp-concat": "^2.6.1",
     "gulp-gzip": "^1.4.2",
     "gulp-mustache": "^5.0.0",
-    "gulp-postcss": "^9.0.1",
+    "gulp-postcss": "^10.0.0",
     "gulp-rename": "^2.0.0",
     "gulp-sass": "^5.1.0",
     "gulp-sourcemaps": "^3.0.0",
     "gulp-svg-sprite": "^2.0.3",
-    "jsdom": "^23.1.0",
+    "jsdom": "^24.0.0",
     "map-stream": "0.0.7",
-    "marked": "^7.0.5",
+    "marked": "^12.0.0",
     "mkdirp": "^3.0.1",
-    "nodemon": "^3.0.2",
+    "nodemon": "^3.1.0",
     "npm-run-all": "^4.1.5",
-    "postcss": "^8.4.33",
+    "postcss": "^8.4.35",
     "postcss-clean": "^1.2.2",
-    "prettier": "^3.1.1",
+    "prettier": "^3.2.5",
     "prop-types": "^15.8.1",
     "rimraf": "^5.0.5",
-    "sass": "^1.69.7",
+    "sass": "^1.71.1",
-    "shadow-cljs": "2.26.2",
+    "shadow-cljs": "2.27.4",
-    "storybook": "^7.6.7",
+    "storybook": "^7.6.17",
     "typescript": "^5.3.3",
-    "vite": "^5.0.11",
+    "vite": "^5.1.4",
-    "vitest": "^1.1.3"
+    "vitest": "^1.3.1"
   },
   "dependencies": {
-    "date-fns": "^2.30.0",
+    "date-fns": "^3.3.1",
-    "eventsource-parser": "^1.1.1",
+    "eventsource-parser": "^1.1.2",
     "highlight.js": "^11.9.0",
-    "js-beautify": "^1.14.11",
+    "js-beautify": "^1.15.1",
     "jszip": "^3.10.1",
     "luxon": "^3.4.4",
     "mousetrap": "^1.6.5",
@@ -95,7 +95,7 @@
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-virtualized": "^9.22.5",
-    "rxjs": "8.0.0-alpha.13",
+    "rxjs": "8.0.0-alpha.14",
     "sax": "^1.3.0",
     "source-map-support": "^0.5.21",
     "tdigest": "^0.1.2",

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'
+        (mf/spread props
-                              :encode-fn encode-fn
+                   :on-change on-change'
-                              :decode-fn decode-fn})]
+                   :encode-fn encode-fn
+                   :decode-fn decode-fn)]
 
     [:& (mf/provider context) {:value context-value}
      [:div {:class (dm/str class " " (stl/css :radio-btn-wrapper))

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

frontend/src/app/util/time.cljs

@@ -6,22 +6,7 @@
 
 (ns app.util.time
   (:require
-   ["date-fns/format" :default dateFnsFormat]
+   ["./time_impl.js" :as impl]
-   ["date-fns/formatDistanceToNowStrict" :default dateFnsFormatDistanceToNowStrict]
-   ["date-fns/locale/ar-SA" :default dateFnsLocalesAr]
-   ["date-fns/locale/ca" :default dateFnsLocalesCa]
-   ["date-fns/locale/de" :default dateFnsLocalesDe]
-   ["date-fns/locale/el" :default dateFnsLocalesEl]
-   ["date-fns/locale/en-US" :default dateFnsLocalesEnUs]
-   ["date-fns/locale/es" :default dateFnsLocalesEs]
-   ["date-fns/locale/fa-IR" :default dateFnsLocalesFa]
-   ["date-fns/locale/fr" :default dateFnsLocalesFr]
-   ["date-fns/locale/he" :default dateFnsLocalesHe]
-   ["date-fns/locale/pt-BR" :default dateFnsLocalesPtBr]
-   ["date-fns/locale/ro" :default dateFnsLocalesRo]
-   ["date-fns/locale/ru" :default dateFnsLocalesRu]
-   ["date-fns/locale/tr" :default dateFnsLocalesTr]
-   ["date-fns/locale/zh-CN" :default dateFnsLocalesZhCn]
    [app.common.data.macros :as dm]
    [app.common.time :as common-time]
    [app.util.object :as obj]
@@ -207,22 +192,6 @@
       :json (.toJSON it)
       (.toFormat ^js it fmt))))
 
-(def ^:private locales
-  #js {:en dateFnsLocalesEnUs
-       :ar dateFnsLocalesAr
-       :he dateFnsLocalesHe
-       :fr dateFnsLocalesFr
-       :tr dateFnsLocalesTr
-       :es dateFnsLocalesEs
-       :ca dateFnsLocalesCa
-       :el dateFnsLocalesEl
-       :ru dateFnsLocalesRu
-       :ro dateFnsLocalesRo
-       :de dateFnsLocalesDe
-       :fa dateFnsLocalesFa
-       :pt_br dateFnsLocalesPtBr
-       :zh_cn dateFnsLocalesZhCn})
-
 (defn timeago
   ([v] (timeago v nil))
   ([v {:keys [locale] :or {locale "en"}}]
@@ -230,19 +199,18 @@
      (let [v (if (datetime? v) (format v :date) v)]
        (->> #js {:includeSeconds true
                  :addSuffix true
-                 :locale (obj/get locales locale)}
+                 :locale (obj/get impl/locales locale)}
-            (dateFnsFormatDistanceToNowStrict v))))))
+            (impl/format-distance-to-now v))))))
 
 (defn format-date-locale
   ([v] (format-date-locale v nil))
   ([v {:keys [locale] :or {locale "en"}}]
    (when v
      (let [v (if (datetime? v) (format v :date) v)
-           locale (obj/get locales locale)
+           locale (obj/get impl/locales locale)
            f (.date (.-formatLong ^js locale) v)]
        (->> #js {:locale locale}
-            (dateFnsFormat v f))))))
+            (impl/format v f))))))
-
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Measurement Helpers

frontend/src/app/util/time_impl.js

@@ -0,0 +1,71 @@
+import fmt1 from "date-fns/format";
+import fmt2 from "date-fns/formatDistanceToNowStrict";
+
+import {arSA} from "date-fns/locale/ar-SA";
+import {ca} from "date-fns/locale/ca";
+import {de} from "date-fns/locale/de";
+import {el} from "date-fns/locale/el";
+import {enUS} from "date-fns/locale/en-US";
+import {es} from "date-fns/locale/es";
+import {faIR} from "date-fns/locale/fa-IR";
+import {fr} from "date-fns/locale/fr";
+import {he} from "date-fns/locale/he";
+import {pt} from "date-fns/locale/pt";
+import {ptBR} from "date-fns/locale/pt-BR";
+import {ro} from "date-fns/locale/ro";
+import {ru} from "date-fns/locale/ru";
+import {tr} from "date-fns/locale/tr";
+import {zhCN} from "date-fns/locale/zh-CN";
+import {nl} from "date-fns/locale/nl";
+import {eu} from "date-fns/locale/eu";
+import {gl} from "date-fns/locale/gl";
+import {hr} from "date-fns/locale/hr";
+import {it} from "date-fns/locale/it";
+import {nb} from "date-fns/locale/nb";
+import {pl} from "date-fns/locale/pl";
+import {id} from "date-fns/locale/id";
+import {uk} from "date-fns/locale/uk";
+import {cs} from "date-fns/locale/cs";
+import {lv} from "date-fns/locale/lv";
+import {ko} from "date-fns/locale/ko";
+import {ja} from "date-fns/locale/ja";
+
+export const locales = {
+  "ar": arSA,
+  "ca": ca,
+  "de": de,
+  "el": el,
+  "en": enUS,
+  "en_us": enUS,
+  "es": es,
+  "es_es": es,
+  "fa": faIR,
+  "fa_ir": faIR,
+  "fr": fr,
+  "he": he,
+  "pt": pt,
+  "pt_pt": pt,
+  "pt_br": ptBR,
+  "ro": ro,
+  "ru": ru,
+  "tr": tr,
+  "zh_cn": zhCN,
+  "nl": nl,
+  "eu": eu,
+  "gl": gl,
+  "hr": hr,
+  "it": it,
+  "nb": nb,
+  "nb_no": nb,
+  "pl": pl,
+  "id": id,
+  "uk": uk,
+  "cs": cs,
+  "lv": lv,
+  "ko": ko,
+  "ja": ja,
+  "ja_jp": ja,
+};
+
+export const format = fmt1.format;
+export const format_distance_to_now = fmt2.formatDistanceToNowStrict;