diff --git a/.changeset/wise-hounds-taste.md b/.changeset/wise-hounds-taste.md new file mode 100644 index 0000000000..15d4e6c693 --- /dev/null +++ b/.changeset/wise-hounds-taste.md @@ -0,0 +1,5 @@ +--- +"tinacms": patch +--- + +fix: update date-fs and related types diff --git a/packages/tinacms/package.json b/packages/tinacms/package.json index 57dfdfcdd6..082102d9fe 100644 --- a/packages/tinacms/package.json +++ b/packages/tinacms/package.json @@ -92,7 +92,7 @@ "cmdk": "catalog:", "color-string": "catalog:", "crypto-js": "catalog:", - "date-fns": "2.30.0", + "date-fns": "4.1.0", "es-toolkit": "^1.42.0", "final-form": "catalog:", "final-form-arrays": "catalog:", @@ -109,7 +109,7 @@ "prop-types": "catalog:", "react-colorful": "catalog:", "react-datetime": "catalog:", - "react-day-picker": "^9.11.1", + "react-day-picker": "^9.13.0", "react-dropzone": "catalog:", "react-final-form": "catalog:", "react-icons": "^5.4.0", diff --git a/packages/tinacms/src/toolkit/components/ui/date-time-picker.tsx b/packages/tinacms/src/toolkit/components/ui/date-time-picker.tsx index 8ed3352899..b3b9551e4e 100644 --- a/packages/tinacms/src/toolkit/components/ui/date-time-picker.tsx +++ b/packages/tinacms/src/toolkit/components/ui/date-time-picker.tsx @@ -10,7 +10,7 @@ import { Input } from './input'; import { Popover, PopoverContent, PopoverTrigger } from './popover'; import moment from 'moment'; import 'moment-timezone'; -import { enUS } from 'date-fns/locale'; +import { enUS, Locale } from 'date-fns/locale'; import { ChevronLeft, ChevronRight } from 'lucide-react'; import { Clock } from 'lucide-react'; import * as React from 'react'; diff --git a/packages/tinacms/src/toolkit/fields/plugins/date-field-plugin.tsx b/packages/tinacms/src/toolkit/fields/plugins/date-field-plugin.tsx index e05a09137d..52c4a2f3f5 100644 --- a/packages/tinacms/src/toolkit/fields/plugins/date-field-plugin.tsx +++ b/packages/tinacms/src/toolkit/fields/plugins/date-field-plugin.tsx @@ -12,6 +12,7 @@ import { // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore importing css is not recognized import { DateTimePicker } from '../../components/ui/date-time-picker'; +import { DayPickerLocale } from 'react-day-picker'; export const DateField = wrapFieldsWithMeta( ({ input, field: { dateFormat, timeFormat, onChange, ...rest } }) => { @@ -43,10 +44,11 @@ export const DateField = wrapFieldsWithMeta( return dateFormat; }, [dateFormat]); - const date = input.value ? new Date(input.value) : input.value; + const date = input.value ? new Date(input.value) : new Date(); return ( @@ -56,7 +58,11 @@ export const DateField = wrapFieldsWithMeta( hourCycle={12} dateFormat={getDateFormat()} value={date} - {...rest} + locale={ + rest.locale + ? ({ code: rest.locale } as Partial) + : undefined + } /> ); diff --git a/packages/tinacms/src/toolkit/react-sidebar/components/VersionInfo.tsx b/packages/tinacms/src/toolkit/react-sidebar/components/VersionInfo.tsx index 51efc309c0..36af2b822e 100644 --- a/packages/tinacms/src/toolkit/react-sidebar/components/VersionInfo.tsx +++ b/packages/tinacms/src/toolkit/react-sidebar/components/VersionInfo.tsx @@ -1,9 +1,9 @@ import { useCMS } from '@toolkit/react-tinacms'; -import formatDistanceToNow from 'date-fns/formatDistanceToNow'; import { Check, LoaderCircle, TriangleAlert } from 'lucide-react'; import React from 'react'; import { version as currentVersion } from '../../../../package.json'; import { LatestVersionResponse } from '../../../internalClient'; +import { formatDistanceToNow } from 'date-fns'; export const VersionInfo = () => { const cms = useCMS(); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5412ae4047..178f12507a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -2286,8 +2286,8 @@ importers: specifier: 'catalog:' version: 4.2.0 date-fns: - specifier: 2.30.0 - version: 2.30.0 + specifier: 4.1.0 + version: 4.1.0 es-toolkit: specifier: ^1.42.0 version: 1.42.0 @@ -2337,8 +2337,8 @@ importers: specifier: 'catalog:' version: 3.3.1(moment@2.29.4)(react@18.3.1) react-day-picker: - specifier: ^9.11.1 - version: 9.11.3(react@18.3.1) + specifier: ^9.13.0 + version: 9.13.0(react@18.3.1) react-dropzone: specifier: 'catalog:' version: 14.2.3(react@18.3.1) @@ -12661,7 +12661,7 @@ packages: puppeteer@23.11.1: resolution: {integrity: sha512-53uIX3KR5en8l7Vd8n5DUv90Ae9QDQsyIthaUFVzwV6yU750RjqRznEtNMBT20VthqAdemnJN+hxVdmMHKt7Zw==} engines: {node: '>=18'} - deprecated: < 24.15.0 is no longer supported + deprecated: < 24.10.2 is no longer supported hasBin: true pure-rand@6.1.0: @@ -12739,8 +12739,8 @@ packages: moment: ^2.16.0 react: ^16.5.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 - react-day-picker@9.11.3: - resolution: {integrity: sha512-7lD12UvGbkyXqgzbYIGQTbl+x29B9bAf+k0pP5Dcs1evfpKk6zv4EdH/edNc8NxcmCiTNXr2HIYPrSZ3XvmVBg==} + react-day-picker@9.13.0: + resolution: {integrity: sha512-euzj5Hlq+lOHqI53NiuNhCP8HWgsPf/bBAVijR50hNaY1XwjKjShAnIe8jm8RD2W9IJUvihDIZ+KrmqfFzNhFQ==} engines: {node: '>=18'} peerDependencies: react: '>=16.8.0' @@ -28386,7 +28386,7 @@ snapshots: prop-types: 15.8.1 react: 18.3.1 - react-day-picker@9.11.3(react@18.3.1): + react-day-picker@9.13.0(react@18.3.1): dependencies: '@date-fns/tz': 1.4.1 date-fns: 4.1.0