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

⬆️ Update frontend dependencies

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))

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]
-   ["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]
+   ["./time_impl.js" :as impl]
    [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)}
-            (dateFnsFormatDistanceToNowStrict v))))))
+                 :locale (obj/get impl/locales locale)}
+            (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;