From 0dfcd36bf43910dfb846bf8e8d2a9b6315d1801a Mon Sep 17 00:00:00 2001 From: Filipe Silva Date: Wed, 20 Apr 2022 10:12:20 +0100 Subject: [PATCH] build: update shadow-cljs, cljs, tick Tried running an Athens dev build on Windows and ran into https://github.com/thheller/shadow-cljs/issues/966, which is solved by updating Shadow-CLJS. Shadow-CLJS and CLJS have to be updated together because that's just how Shadow-CLJS works. Tick had to be updated because it broke when updating the other two. --- deps.edn | 6 +++--- package.json | 2 +- src/cljc/athens/dates.cljc | 8 ++++---- yarn.lock | 8 ++++---- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/deps.edn b/deps.edn index 72a003586f..bef33bd532 100644 --- a/deps.edn +++ b/deps.edn @@ -2,9 +2,9 @@ :deps {org.clojure/clojure #:mvn{:version "1.11.1"} - org.clojure/clojurescript #:mvn{:version "1.10.879"} + org.clojure/clojurescript #:mvn{:version "1.11.4"} org.clojure/tools.cli #:mvn{:version "1.0.206"} - thheller/shadow-cljs #:mvn{:version "2.15.3"} + thheller/shadow-cljs #:mvn{:version "2.18.0"} reagent/reagent #:mvn{:version "1.0.0"} re-frame/re-frame #:mvn{:version "1.2.0"} day8.re-frame/async-flow-fx #:mvn{:version "0.3.0"} @@ -17,7 +17,7 @@ metosin/komponentit #:mvn{:version "0.3.10"} instaparse/instaparse #:mvn{:version "1.4.10"} borkdude/sci #:mvn{:version "0.2.5"} - tick/tick #:mvn{:version "0.4.26-alpha"} + tick/tick #:mvn{:version "0.5.0-RC5"} cljc.java-time/cljc.java-time #:mvn{:version "0.1.9"} com.rpl/specter #:mvn{:version "1.1.3"} com.taoensso/sente #:mvn{:version "1.16.2"} diff --git a/package.json b/package.json index 45587f09ed..6b45460f37 100644 --- a/package.json +++ b/package.json @@ -168,7 +168,7 @@ "playwright": "^1.17.1", "rimraf": "^3.0.2", "serve": "^13.0.2", - "shadow-cljs": "^2.15.3", + "shadow-cljs": "^2.18.0", "source-map-support": "^0.5.19", "standard-version": "^9.3.1", "storybook-dark-mode": "^1.0.8", diff --git a/src/cljc/athens/dates.cljc b/src/cljc/athens/dates.cljc index 59ac2bac28..db5b8d3481 100644 --- a/src/cljc/athens/dates.cljc +++ b/src/cljc/athens/dates.cljc @@ -2,7 +2,7 @@ (:require [cljc.java-time.local-date :as local-date] [clojure.string :as string] - [tick.alpha.api :as t] + [tick.core :as t] [tick.locale-en-us])) @@ -15,14 +15,14 @@ "Returns today's date or a date OFFSET days before today" ([] (get-day 0)) ([offset] - (let [day (t/- + (let [day (t/<< (t/date-time) (t/new-duration offset :days))] {:uid (t/format US-format day) :title (t/format title-format day)})) ([date offset] - (let [day (t/- - (-> date (t/at "0")) + (let [day (t/<< + (-> date (t/at "00:00")) (t/new-duration offset :days))] {:uid (t/format US-format day) :title (t/format title-format day)}))) diff --git a/yarn.lock b/yarn.lock index 688a3aa12c..39b19262f8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -13158,10 +13158,10 @@ 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.15.3: - version "2.15.9" - resolved "https://registry.yarnpkg.com/shadow-cljs/-/shadow-cljs-2.15.9.tgz#cb256a9af12c3df1f0b2bbef344e365dab74b519" - integrity sha512-t2KrrMvJZtUFf2xIAL+OL76ahYHPT8VAKxhDic3kloTgOYfZpHRm/S/3C0iW982U3ZJdLUZxmBeluH4Q7564dg== +shadow-cljs@^2.18.0: + version "2.18.0" + resolved "https://registry.yarnpkg.com/shadow-cljs/-/shadow-cljs-2.18.0.tgz#f0dfeb7b52829b1e8058ded19b346cb6f9e454c3" + integrity sha512-yjANuBbKskNZMA8/+GznPC9xnfpAhFnx8ifuSYwzFfJeDwmQLhNOFoqw5I2lzL6I8FMJZFEnLC1oiVWdh88OuQ== dependencies: node-libs-browser "^2.2.1" readline-sync "^1.4.7"