From 72e60e0a9a13c1b6ca35259bf0cd072481d28b52 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Wed, 3 Apr 2019 04:57:41 -0400 Subject: [PATCH] Switches from date-fns to day.js (smaller) --- package-lock.json | 10 ++-- package.json | 2 +- src/system/date.ts | 139 +++-------------------------------------------------- 3 files changed, 14 insertions(+), 137 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5175cce..927c205 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2244,17 +2244,17 @@ "assert-plus": "^1.0.0" } }, - "date-fns": { - "version": "1.30.1", - "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-1.30.1.tgz", - "integrity": "sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw==" - }, "date-now": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz", "integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=", "dev": true }, + "dayjs": { + "version": "1.8.12", + "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.8.12.tgz", + "integrity": "sha512-7keChCzzjU68sYJpk7kEI1Q9qbJyscyiW0STwEhqDFt+2js9pA/BSzmYE4PRxcMMoUMxNeY0TEMZHqV/JBR4OA==" + }, "debug": { "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", diff --git a/package.json b/package.json index d5e65dd..8f89542 100644 --- a/package.json +++ b/package.json @@ -4985,7 +4985,7 @@ "vscode:prepublish": "npm run reset && npm run bundle" }, "dependencies": { - "date-fns": "1.30.1", + "dayjs": "1.8.12", "iconv-lite": "0.4.24", "lodash-es": "4.17.11", "vsls": "0.3.1291" diff --git a/src/system/date.ts b/src/system/date.ts index 0c269c1..bb19eb4 100644 --- a/src/system/date.ts +++ b/src/system/date.ts @@ -1,116 +1,10 @@ 'use strict'; -import { format as _format, distanceInWordsToNow as _fromNow } from 'date-fns'; -import * as en from 'date-fns/locale/en'; +import * as dayjs from 'dayjs'; +import * as advancedFormat from 'dayjs/plugin/advancedFormat'; +import * as relativeTime from 'dayjs/plugin/relativeTime'; -// Taken from https://github.com/date-fns/date-fns/blob/601bc8e5708cbaebee5389bdaf51c2b4b33b73c4/src/locale/en/build_distance_in_words_locale/index.js -function buildDistanceInWordsLocale() { - const distanceInWordsLocale: { [key: string]: string | { one: string; other: string } } = { - lessThanXSeconds: { - one: 'less than a second', - other: 'less than {{count}} seconds' - }, - - xSeconds: { - one: '1 second', - other: '{{count}} seconds' - }, - - halfAMinute: 'half a minute', - - lessThanXMinutes: { - one: 'a few seconds', - other: 'less than {{count}} minutes' - }, - - xMinutes: { - one: 'a minute', - other: '{{count}} minutes' - }, - - aboutXHours: { - one: 'an hour', - other: '{{count}} hours' - }, - - xHours: { - one: 'an hour', - other: '{{count}} hours' - }, - - xDays: { - one: 'a day', - other: '{{count}} days' - }, - - aboutXMonths: { - one: 'a month', - other: '{{count}} months' - }, - - xMonths: { - one: 'a month', - other: '{{count}} months' - }, - - aboutXYears: { - one: 'a year', - other: '{{count}} years' - }, - - xYears: { - one: 'a year', - other: '{{count}} years' - }, - - overXYears: { - one: 'a year', - other: '{{count}} years' - }, - - almostXYears: { - one: 'a year', - other: '{{count}} years' - } - }; - - function localize(token: string, count: number, options: any) { - options = options || {}; - - if (count === 12 && token === 'xMonths') { - token = 'aboutXYears'; - count = 1; - } - - const result = distanceInWordsLocale[token]; - - let value: string; - if (typeof result === 'string') { - value = result; - } - else if (count === 1) { - value = result.one; - } - else { - value = result.other.replace('{{count}}', count.toString()); - } - - if (!options.addSuffix) return value; - - if (options.comparison > 0) return `in ${value}`; - - return `${value} ago`; - } - - return { - localize: localize - }; -} - -// Monkey patch the locale to customize the wording -const patch = en as any; -patch.distanceInWords = buildDistanceInWordsLocale(); - -const formatterOptions = { addSuffix: true, locale: patch }; +dayjs.extend(advancedFormat); +dayjs.extend(relativeTime); export namespace Dates { export const MillisecondsPerMinute = 60000; // 60 * 1000 @@ -122,28 +16,11 @@ export namespace Dates { format(format: string): string; } - export function dateDaysFromNow(date: Date, now: number = Date.now()) { - const startOfDayLeft = startOfDay(now); - const startOfDayRight = startOfDay(date); - - const timestampLeft = startOfDayLeft.getTime() - startOfDayLeft.getTimezoneOffset() * MillisecondsPerMinute; - const timestampRight = startOfDayRight.getTime() - startOfDayRight.getTimezoneOffset() * MillisecondsPerMinute; - - return Math.round((timestampLeft - timestampRight) / MillisecondsPerDay); - } - - export function startOfDay(date: Date | number) { - const newDate = new Date(typeof date === 'number' ? date : date.getTime()); - newDate.setHours(0, 0, 0, 0); - return newDate; - } - export function toFormatter(date: Date): DateFormatter { + const wrappedDate = dayjs(date); return { - fromNow: () => { - return _fromNow(date, formatterOptions); - }, - format: (format: string) => _format(date, format) + fromNow: () => wrappedDate.fromNow(), + format: (format: string) => wrappedDate.format(format) }; } }