fix(date): 升级 date-fns

fjc0k · Jan 29, 2024 · 7e7bb5f · 7e7bb5f
1 parent 5cf217f
commit 7e7bb5f
Show file tree

Hide file tree

Showing 12 changed files with 253 additions and 349 deletions.
diff --git a/haoma-compile.config.ts b/haoma-compile.config.ts
@@ -78,9 +78,6 @@ export default [
     target: file => (/src\/(dev|x)\//.test(file) ? 'node' : 'browser'),
     outDir: 'lib/_cjs',
     emitDts: false,
-    alias: {
-      'date-fns/esm': 'date-fns',
-    },
     plugins: [removeIsTypePlugin],
   }),
 ]
diff --git a/package.json b/package.json
@@ -132,7 +132,7 @@
     "benchmark": "^2.1.4",
     "cli-table3": "^0.6.0",
     "cuid": "^2.1.8",
-    "date-fns": "^2.24.0",
+    "date-fns": "^3.3.1",
     "decimal.js-light": "^2.5.1",
     "fast-xml-parser": "^3.18.0",
     "gcoord": "^0.3.2",

diff --git a/src/date/anyToDate.ts b/src/date/anyToDate.ts
@@ -1,5 +1,5 @@
+import { parseISO, toDate } from 'date-fns'
 import { isNumeric } from '../utils'
-import { parseISO, toDate } from 'date-fns/esm'
 
 /**
  * 增强版的 toDate，支持：

diff --git a/src/date/formatDate.ts b/src/date/formatDate.ts
@@ -1,4 +1,4 @@
-import { lightFormat } from 'date-fns/esm'
+import { lightFormat } from 'date-fns'
 
 /**
  * 日期格式化占位符。

diff --git a/src/date/formatDistanceAgo.test.ts b/src/date/formatDistanceAgo.test.ts
@@ -1,12 +1,12 @@
-import { formatDistanceAgo } from './formatDistanceAgo'
 import {
   subDays,
   subHours,
   subMinutes,
   subMonths,
   subSeconds,
   subYears,
-} from 'date-fns/esm'
+} from 'date-fns'
+import { formatDistanceAgo } from './formatDistanceAgo'
 
 describe('formatDistanceAgo', () => {
   test('表现正常', () => {

diff --git a/src/date/formatDistanceAgo.ts b/src/date/formatDistanceAgo.ts
@@ -1,5 +1,5 @@
-import { formatDistanceToNowStrict } from 'date-fns/esm'
-import { zhCN } from 'date-fns/esm/locale'
+import { formatDistanceToNowStrict } from 'date-fns'
+import { zhCN } from 'date-fns/locale'
 
 /**
  * 将时间转化为 `xxx前` 表示。

diff --git a/src/date/formatDistancePlus.test.ts b/src/date/formatDistancePlus.test.ts
@@ -1,18 +1,18 @@
-import { addDays, addYears, subDays, subYears } from 'date-fns/esm'
+import { addDays, addYears, subDays, subYears } from 'date-fns'
 import { formatDistancePlus } from './formatDistancePlus'
 
 describe('formatDistancePlus', () => {
   test('前', () => {
     expect(formatDistancePlus(subDays(new Date(), 1))).toBe('1天前')
-    expect(formatDistancePlus(subDays(new Date(), 1.5))).toBe('1天前')
+    expect(formatDistancePlus(subDays(new Date(), 1.5))).toBe('2天前')
     expect(formatDistancePlus(subYears(new Date(), 10))).toBe('10年前')
 
     expect(
       formatDistancePlus(subDays(new Date(), 1), addDays(new Date(), 2)),
     ).toBe('3天前')
     expect(
       formatDistancePlus(subDays(new Date(), 1.5), addDays(new Date(), 2)),
-    ).toBe('3天前')
+    ).toBe('4天前')
     expect(
       formatDistancePlus(subYears(new Date(), 10), addYears(new Date(), 3)),
     ).toBe('13年前')

diff --git a/src/date/formatDistancePlus.ts b/src/date/formatDistancePlus.ts
@@ -1,5 +1,5 @@
-import { formatDistanceStrict, isBefore } from 'date-fns/esm'
-import { zhCN } from 'date-fns/esm/locale'
+import { formatDistanceStrict, isBefore } from 'date-fns'
+import { zhCN } from 'date-fns/locale'
 
 /**
  * 将时间转化为 `xxx前/后` 表示。