diff --git a/package.json b/package.json index 34b6a2294c..4c1a0b85d0 100644 --- a/package.json +++ b/package.json @@ -84,7 +84,7 @@ "deep-clone-simple": "^1.1.1", "deep-freeze": "^0.0.1", "es6-object-assign": "^1.1.0", - "fecha": "^3.0.2", + "fecha": "^4.2.0", "fuse.js": "^3.4.4", "google-timezones-json": "^1.0.2", "hls.js": "^0.12.4", diff --git a/src/common/datetime/format_date.ts b/src/common/datetime/format_date.ts index 6a5e7e67f0..d8c46d4e8d 100644 --- a/src/common/datetime/format_date.ts +++ b/src/common/datetime/format_date.ts @@ -1,4 +1,4 @@ -import fecha from "fecha"; +import { format } from "fecha"; import { toLocaleDateStringSupportsOptions } from "./check_options_support"; export const formatDate = toLocaleDateStringSupportsOptions @@ -8,4 +8,4 @@ export const formatDate = toLocaleDateStringSupportsOptions month: "long", day: "numeric", }) - : (dateObj: Date) => fecha.format(dateObj, "longDate"); + : (dateObj: Date) => format(dateObj, "longDate"); diff --git a/src/common/datetime/format_date_time.ts b/src/common/datetime/format_date_time.ts index ee6d04f7dd..3a20491ed5 100644 --- a/src/common/datetime/format_date_time.ts +++ b/src/common/datetime/format_date_time.ts @@ -1,4 +1,4 @@ -import fecha from "fecha"; +import { format } from "fecha"; import { toLocaleStringSupportsOptions } from "./check_options_support"; export const formatDateTime = toLocaleStringSupportsOptions @@ -10,11 +10,7 @@ export const formatDateTime = toLocaleStringSupportsOptions hour: "numeric", minute: "2-digit", }) - : (dateObj: Date) => - fecha.format( - dateObj, - `${fecha.masks.longDate}, ${fecha.masks.shortTime}` - ); + : (dateObj: Date) => format(dateObj, "MMMM D, YYYY, HH:mm"); export const formatDateTimeWithSeconds = toLocaleStringSupportsOptions ? (dateObj: Date, locales: string) => @@ -26,8 +22,4 @@ export const formatDateTimeWithSeconds = toLocaleStringSupportsOptions minute: "2-digit", second: "2-digit", }) - : (dateObj: Date) => - fecha.format( - dateObj, - `${fecha.masks.longDate}, ${fecha.masks.mediumTime}` - ); + : (dateObj: Date) => format(dateObj, "MMMM D, YYYY, HH:mm:ss"); diff --git a/src/common/datetime/format_time.ts b/src/common/datetime/format_time.ts index d8f0c8a8a0..c27874f3a6 100644 --- a/src/common/datetime/format_time.ts +++ b/src/common/datetime/format_time.ts @@ -1,4 +1,4 @@ -import fecha from "fecha"; +import { format } from "fecha"; import { toLocaleTimeStringSupportsOptions } from "./check_options_support"; export const formatTime = toLocaleTimeStringSupportsOptions @@ -7,7 +7,7 @@ export const formatTime = toLocaleTimeStringSupportsOptions hour: "numeric", minute: "2-digit", }) - : (dateObj: Date) => fecha.format(dateObj, "shortTime"); + : (dateObj: Date) => format(dateObj, "shortTime"); export const formatTimeWithSeconds = toLocaleTimeStringSupportsOptions ? (dateObj: Date, locales: string) => @@ -16,4 +16,4 @@ export const formatTimeWithSeconds = toLocaleTimeStringSupportsOptions minute: "2-digit", second: "2-digit", }) - : (dateObj: Date) => fecha.format(dateObj, "mediumTime"); + : (dateObj: Date) => format(dateObj, "mediumTime"); diff --git a/yarn.lock b/yarn.lock index dfcf8d6065..1dd9450793 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7139,10 +7139,10 @@ fecha@^2.3.3: resolved "https://registry.yarnpkg.com/fecha/-/fecha-2.3.3.tgz#948e74157df1a32fd1b12c3a3c3cdcb6ec9d96cd" integrity sha512-lUGBnIamTAwk4znq5BcqsDaxSmZ9nDVJaij6NvRt/Tg4R69gERA+otPKbS86ROw9nxVMw2/mp1fnaiWqbs6Sdg== -fecha@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/fecha/-/fecha-3.0.2.tgz#fb3adb02762ab6dd27f7d5419f2f6c21a4229cd7" - integrity sha512-oJK6YbKtmz1uvuDsUHOmo9X2HKmYAcRWtzW2yrCzOJRUfyGUEu/8cDymBdedgEnkdJiTpNyPogWqfTuYffU4yA== +fecha@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/fecha/-/fecha-4.2.0.tgz#3ffb6395453e3f3efff850404f0a59b6747f5f41" + integrity sha512-aN3pcx/DSmtyoovUudctc8+6Hl4T+hI9GBBHLjA76jdZl7+b1sgh5g4k+u/GL3dTy1/pnYzKp69FpJ0OicE3Wg== figgy-pudding@^3.5.1: version "3.5.1"