The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
Fix timezones in date ranges (via `@date-fns/tz`)
Steven Tey114dedfb7209
diff --git a/apps/web/lib/analytics/utils/get-start-end-dates.ts b/apps/web/lib/analytics/utils/get-start-end-dates.tsindex 35f7800bb9..4fcc2b28e3 100644--- a/apps/web/lib/analytics/utils/get-start-end-dates.ts+++ b/apps/web/lib/analytics/utils/get-start-end-dates.ts@@ -1,5 +1,5 @@-import { getDaysDifference } from "@dub/utils";-import { endOfDay } from "date-fns";+import { tz } from "@date-fns/tz";+import { differenceInDays, endOfDay } from "date-fns";import { getIntervalData } from "./get-interval-data";export const getStartEndDates = ({@@ -21,9 +21,15 @@ export const getStartEndDates = ({if (start || (interval === "all" && dataAvailableFrom)) {startDate = new Date(start ?? dataAvailableFrom ?? Date.now());- endDate = new Date(endOfDay(end ?? Date.now()));+ endDate = new Date(+ endOfDay(end ?? Date.now(), timezone ? { in: tz(timezone) } : undefined),+ );- const daysDifference = getDaysDifference(startDate, endDate);+ const daysDifference = differenceInDays(+ endDate,+ startDate,+ timezone ? { in: tz(timezone) } : undefined,+ );if (daysDifference <= 2) {granularity = "hour";diff --git a/apps/web/package.json b/apps/web/package.jsonindex 6993c169dd..7b8f120d2f 100644--- a/apps/web/package.json+++ b/apps/web/package.json@@ -22,6 +22,7 @@"@axiomhq/nextjs": "^0.1.6","@boxyhq/saml-jackson": "1.52.1","@chronark/zod-bird": "^0.3.9",+ "@date-fns/tz": "^1.4.1","@dub/analytics": "^0.0.27","@dub/email": "workspace:*","@dub/embed-react": "workspace:*",diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex 601a0499a5..3de4010d31 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -53,6 +53,9 @@ importers:'@chronark/zod-bird':specifier: ^0.3.9version: 0.3.9+ '@date-fns/tz':+ specifier: ^1.4.1+ version: 1.4.1'@dub/analytics':specifier: ^0.0.27version: 0.0.27@@ -1618,6 +1621,9 @@ packages:resolution: {integrity: sha512-Vd/9EVDiu6PPJt9yAh6roZP6El1xHrdvIVGjyBsHR0RYwNHgL7FJPyIIW4fANJNG6FtyZfvlRPpFI4ZM/lubvw==}engines: {node: '>=18'}+ '@date-fns/[email protected]':+ resolution: {integrity: sha512-P5LUNhtbj6YfI3iJjw5EL9eUAG6OitD0W3fWQcpQjDRc/QIsL0tRNuO1PcDvPccWL1fSTXXdE1ds+l95DV/OFA==}+'@dub/[email protected]':resolution: {integrity: sha512-TbLr+sKWiBsMw1GOLpduZI7skXmrLwZlEoVoHyxq66RvMk/5Fl84QoenlhjdxaX1rlHAkWCcjcbAYcCN7skoKw==}@@ -15108,6 +15114,8 @@ snapshots:'@csstools/[email protected]':optional: true+ '@date-fns/[email protected]': {}+'@dub/[email protected]':dependencies:server-only: 0.0.1