From 7f8f8ecd626ceff574e631bede8c90f3a7e5b1ae Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Tue, 22 Dec 2020 15:33:15 +0100 Subject: [PATCH] :sparkles: Fix incompatibilities. --- frontend/package.json | 2 +- frontend/src/app/util/time.cljs | 15 ++++++++------- frontend/yarn.lock | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index 34208b024..d70cac062 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -29,7 +29,7 @@ "postcss-clean": "^1.1.0", "rimraf": "^3.0.0", "sass": "^1.30.0", - "shadow-cljs": "^2.11.9" + "shadow-cljs": "^2.11.10" }, "dependencies": { "date-fns": "^2.15.0", diff --git a/frontend/src/app/util/time.cljs b/frontend/src/app/util/time.cljs index d1b6e6f80..5fd7a0b7f 100644 --- a/frontend/src/app/util/time.cljs +++ b/frontend/src/app/util/time.cljs @@ -9,15 +9,16 @@ (ns app.util.time (:require - ["date-fns/format" :as df-format] - ["date-fns/formatDistanceToNow" :as df-format-distance] - ["date-fns/formatDistanceToNowStrict" :as df-format-distance-strict] - ["date-fns/locale/fr" :as df-fr-locale] - ["date-fns/locale/en-US" :as df-en-locale] - ["date-fns/locale/es" :as df-es-locale] - ["date-fns/locale/ru" :as df-ru-locale] + ["date-fns/format" :default df-format] + ["date-fns/formatDistanceToNow" :default df-format-distance] + ["date-fns/formatDistanceToNowStrict" :default df-format-distance-strict] + ["date-fns/locale/fr" :default df-fr-locale] + ["date-fns/locale/en-US" :default df-en-locale] + ["date-fns/locale/es" :default df-es-locale] + ["date-fns/locale/ru" :default df-ru-locale] [goog.object :as gobj])) + (def ^:private locales #js {:default df-en-locale :en df-en-locale diff --git a/frontend/yarn.lock b/frontend/yarn.lock index 3a97208b1..0178c97bd 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -4416,7 +4416,7 @@ shadow-cljs-jar@1.3.2: resolved "https://registry.yarnpkg.com/shadow-cljs-jar/-/shadow-cljs-jar-1.3.2.tgz#97273afe1747b6a2311917c1c88d9e243c81957b" integrity sha512-XmeffAZHv8z7451kzeq9oKh8fh278Ak+UIOGGrapyqrFBB773xN8vMQ3O7J7TYLnb9BUwcqadKkmgaq7q6fhZg== -shadow-cljs@^2.11.9: +shadow-cljs@^2.11.10: version "2.11.10" resolved "https://registry.yarnpkg.com/shadow-cljs/-/shadow-cljs-2.11.10.tgz#0d55263a5ad31cac48d07fe9c719821122ec969d" integrity sha512-/QbBjT75Dn+SY5C7ntu0VSYrId9Jj2EjncxpnB9E9OJn7mpdbmK3zs+PIC/6gpPdBr4gUhfagauD6AJEmsI6xg==