From 5cba49c9addeec9cb0c5f9d021e8d5ffb620e747 Mon Sep 17 00:00:00 2001
From: 07akioni <07akioni2@gmail.com>
Date: Thu, 18 Jul 2024 23:32:28 +0800
Subject: [PATCH] fix: fix issues caused by date-fns 3.0

---
 jest.config.js                                |  3 +--
 scripts/post-build/index.js                   |  4 +--
 scripts/pre-build/pre-cjs-build.js            |  3 +--
 src/calendar/demos/enUS/basic.demo.vue        |  2 +-
 src/calendar/demos/zhCN/basic.demo.vue        |  2 +-
 src/calendar/src/Calendar.tsx                 |  2 +-
 src/calendar/tests/Calendar.spec.tsx          |  2 +-
 .../demos/enUS/disabled-time.demo.vue         |  2 +-
 .../demos/zhCN/disabled-time.demo.vue         |  2 +-
 src/date-picker/src/DatePicker.tsx            |  2 +-
 src/date-picker/src/panel/use-calendar.ts     |  4 +--
 .../src/panel/use-dual-calendar.ts            |  2 +-
 src/date-picker/src/utils.ts                  |  2 +-
 src/date-picker/src/validation-utils.ts       |  2 +-
 src/date-picker/tests/DatePicker.spec.tsx     |  2 +-
 src/locales/date/arDZ.ts                      |  2 +-
 src/locales/date/azAZ.ts                      |  2 +-
 src/locales/date/csCZ.ts                      |  2 +-
 src/locales/date/deDE.ts                      |  2 +-
 src/locales/date/enGB.ts                      |  2 +-
 src/locales/date/enUS.ts                      |  2 +-
 src/locales/date/eo.ts                        |  2 +-
 src/locales/date/esAR.ts                      |  4 +--
 src/locales/date/etEE.ts                      |  2 +-
 src/locales/date/faIR.ts                      |  2 +-
 src/locales/date/frFR.ts                      |  4 +--
 src/locales/date/idID.ts                      |  4 +--
 src/locales/date/itIT.ts                      |  4 +--
 src/locales/date/jaJP.ts                      |  2 +-
 src/locales/date/koKR.ts                      |  2 +-
 src/locales/date/nbNO.ts                      |  2 +-
 src/locales/date/nlNL.ts                      |  2 +-
 src/locales/date/plPL.ts                      |  4 +--
 src/locales/date/ptBR.ts                      |  2 +-
 src/locales/date/ruRU.ts                      |  2 +-
 src/locales/date/skSK.ts                      |  2 +-
 src/locales/date/svSE.ts                      |  2 +-
 src/locales/date/thTH.ts                      |  6 ++---
 src/locales/date/trTR.ts                      |  6 ++---
 src/locales/date/ukUA.ts                      |  2 +-
 src/locales/date/uzUZ.ts                      |  2 +-
 src/locales/date/viVN.ts                      |  4 +--
 src/locales/date/zhCN.ts                      |  2 +-
 src/locales/date/zhTW.ts                      |  2 +-
 src/time-picker/src/TimePicker.tsx            |  4 +--
 src/time-picker/src/utils.ts                  |  2 +-
 src/time/src/Time.ts                          |  4 +--
 vite.config.js                                | 25 ++-----------------
 48 files changed, 62 insertions(+), 87 deletions(-)

diff --git a/jest.config.js b/jest.config.js
index 168306f99..841ff9255 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -67,8 +67,7 @@ module.exports = {
 
   // A map from regular expressions to module names or to arrays of module names that allow to stub out resources with a single module
   moduleNameMapper: {
-    '^lodash-es$': 'lodash',
-    '^date-fns/esm(.*)$': 'date-fns$1'
+    '^lodash-es$': 'lodash'
   },
 
   // An array of regexp pattern strings, matched against all module paths before considered 'visible' to the module loader
diff --git a/scripts/post-build/index.js b/scripts/post-build/index.js
index 64b596503..c18dead54 100644
--- a/scripts/post-build/index.js
+++ b/scripts/post-build/index.js
@@ -16,9 +16,7 @@ const { completePath } = require('./complete-path')
   })
   await replaceDefine([srcDir], {
     // the sequence is crucial
-    '\'lodash\'': '\'lodash-es\'',
-    '\'date-fns/(.*)\'//': '\'date-fns/esm/$1\'',
-    '\'date-fns\'//': '\'date-fns/esm\''
+    '\'lodash\'': '\'lodash-es\''
   })
 
   // complete require and import source path
diff --git a/scripts/pre-build/pre-cjs-build.js b/scripts/pre-build/pre-cjs-build.js
index f2bf0b37a..08b9aaf23 100644
--- a/scripts/pre-build/pre-cjs-build.js
+++ b/scripts/pre-build/pre-cjs-build.js
@@ -5,7 +5,6 @@ const { replaceDefine, srcDir } = require('../utils')
 
 (async () => {
   await replaceDefine([srcDir], {
-    '\'lodash-es\'': '\'lodash\'',
-    '\'date-fns/esm(.*)\'': '\'date-fns$1\'//'
+    '\'lodash-es\'': '\'lodash\''
   })
 })()
diff --git a/src/calendar/demos/enUS/basic.demo.vue b/src/calendar/demos/enUS/basic.demo.vue
index 2207f9ab3..c9524615e 100644
--- a/src/calendar/demos/enUS/basic.demo.vue
+++ b/src/calendar/demos/enUS/basic.demo.vue
@@ -7,7 +7,7 @@ A basic calender.
 <script lang="ts">
 import { defineComponent, ref } from 'vue'
 import { useMessage } from 'naive-ui'
-import { addDays, isYesterday } from 'date-fns/esm'
+import { addDays, isYesterday } from 'date-fns'
 
 export default defineComponent({
   setup() {
diff --git a/src/calendar/demos/zhCN/basic.demo.vue b/src/calendar/demos/zhCN/basic.demo.vue
index 6a66f394c..983a3c515 100644
--- a/src/calendar/demos/zhCN/basic.demo.vue
+++ b/src/calendar/demos/zhCN/basic.demo.vue
@@ -7,7 +7,7 @@
 <script lang="ts">
 import { defineComponent, ref } from 'vue'
 import { useMessage } from 'naive-ui'
-import { addDays, isYesterday } from 'date-fns/esm'
+import { addDays, isYesterday } from 'date-fns'
 
 export default defineComponent({
   setup() {
diff --git a/src/calendar/src/Calendar.tsx b/src/calendar/src/Calendar.tsx
index 41912e12d..d0d193f62 100644
--- a/src/calendar/src/Calendar.tsx
+++ b/src/calendar/src/Calendar.tsx
@@ -15,7 +15,7 @@ import {
   getYear,
   startOfDay,
   startOfMonth
-} from 'date-fns/esm'
+} from 'date-fns'
 import { useMergedState } from 'vooks'
 import { dateArray } from '../../date-picker/src/utils'
 import { ChevronLeftIcon, ChevronRightIcon } from '../../_internal/icons'
diff --git a/src/calendar/tests/Calendar.spec.tsx b/src/calendar/tests/Calendar.spec.tsx
index d95e8c3ee..84a56a31e 100644
--- a/src/calendar/tests/Calendar.spec.tsx
+++ b/src/calendar/tests/Calendar.spec.tsx
@@ -1,7 +1,7 @@
 /* eslint-disable unused-imports/no-unused-vars */
 import { h } from 'vue'
 import { mount } from '@vue/test-utils'
-import { addMonths, format, getYear, isYesterday } from 'date-fns/esm'
+import { addMonths, format, getYear, isYesterday } from 'date-fns'
 import { NCalendar } from '../index'
 import { NButton } from '../../button'
 
diff --git a/src/date-picker/demos/enUS/disabled-time.demo.vue b/src/date-picker/demos/enUS/disabled-time.demo.vue
index ae582995f..1422c6d59 100644
--- a/src/date-picker/demos/enUS/disabled-time.demo.vue
+++ b/src/date-picker/demos/enUS/disabled-time.demo.vue
@@ -4,7 +4,7 @@
 
 <script lang="ts">
 import { defineComponent } from 'vue'
-import { startOfDay } from 'date-fns/esm'
+import { startOfDay } from 'date-fns'
 
 const d = 86400000
 const h = 3600000
diff --git a/src/date-picker/demos/zhCN/disabled-time.demo.vue b/src/date-picker/demos/zhCN/disabled-time.demo.vue
index 65e1f3e7c..53cd902fa 100644
--- a/src/date-picker/demos/zhCN/disabled-time.demo.vue
+++ b/src/date-picker/demos/zhCN/disabled-time.demo.vue
@@ -4,7 +4,7 @@
 
 <script lang="ts">
 import { defineComponent } from 'vue'
-import { startOfDay } from 'date-fns/esm'
+import { startOfDay } from 'date-fns'
 
 const d = 86400000
 const h = 3600000
diff --git a/src/date-picker/src/DatePicker.tsx b/src/date-picker/src/DatePicker.tsx
index fc6d10aeb..631b9cfad 100644
--- a/src/date-picker/src/DatePicker.tsx
+++ b/src/date-picker/src/DatePicker.tsx
@@ -17,7 +17,7 @@ import {
 } from 'vue'
 import { type FollowerPlacement, VBinder, VFollower, VTarget } from 'vueuc'
 import { clickoutside } from 'vdirs'
-import { format, getTime, isValid } from 'date-fns/esm'
+import { format, getTime, isValid } from 'date-fns'
 import { useIsMounted, useMergedState } from 'vooks'
 import { getPreciseEventTarget, happensIn } from 'seemly'
 import type { Size as TimePickerSize } from '../../time-picker/src/interface'
diff --git a/src/date-picker/src/panel/use-calendar.ts b/src/date-picker/src/panel/use-calendar.ts
index 43588647b..71866c201 100644
--- a/src/date-picker/src/panel/use-calendar.ts
+++ b/src/date-picker/src/panel/use-calendar.ts
@@ -26,7 +26,7 @@ import {
   startOfSecond,
   startOfWeek,
   startOfYear
-} from 'date-fns/esm'
+} from 'date-fns'
 import type { VirtualListInst } from 'vueuc'
 import type { ScrollbarInst } from '../../../_internal'
 import {
@@ -99,7 +99,7 @@ function useCalendar(
   )
   const calendarValueRef = ref(
     props.value === null || Array.isArray(props.value)
-      ? props.defaultCalendarStartTime ?? Date.now()
+      ? (props.defaultCalendarStartTime ?? Date.now())
       : props.value
   )
   const yearVlRef = ref<VirtualListInst | null>(null)
diff --git a/src/date-picker/src/panel/use-dual-calendar.ts b/src/date-picker/src/panel/use-dual-calendar.ts
index f810ab536..96cb938ff 100644
--- a/src/date-picker/src/panel/use-dual-calendar.ts
+++ b/src/date-picker/src/panel/use-dual-calendar.ts
@@ -12,7 +12,7 @@ import {
   startOfMonth,
   startOfQuarter,
   startOfSecond
-} from 'date-fns/esm'
+} from 'date-fns'
 import type { VirtualListInst } from 'vueuc'
 import {
   type DateItem,
diff --git a/src/date-picker/src/utils.ts b/src/date-picker/src/utils.ts
index 560366b48..57bf7e6af 100644
--- a/src/date-picker/src/utils.ts
+++ b/src/date-picker/src/utils.ts
@@ -19,7 +19,7 @@ import {
   parse,
   startOfMonth,
   startOfYear
-} from 'date-fns/esm'
+} from 'date-fns'
 import type { NDateLocale } from '../../locales'
 import { START_YEAR } from './config'
 import type { FirstDayOfWeek, Value } from './interface'
diff --git a/src/date-picker/src/validation-utils.ts b/src/date-picker/src/validation-utils.ts
index d924a6e8a..50b7578fb 100644
--- a/src/date-picker/src/validation-utils.ts
+++ b/src/date-picker/src/validation-utils.ts
@@ -1,5 +1,5 @@
 import { type Ref, computed } from 'vue'
-import { getHours, getMinutes, getSeconds } from 'date-fns/esm'
+import { getHours, getMinutes, getSeconds } from 'date-fns'
 import type { DatePickerSetupProps } from './DatePicker'
 import type {
   IsRangeDateDisabled,
diff --git a/src/date-picker/tests/DatePicker.spec.tsx b/src/date-picker/tests/DatePicker.spec.tsx
index de6c5918d..bec717614 100644
--- a/src/date-picker/tests/DatePicker.spec.tsx
+++ b/src/date-picker/tests/DatePicker.spec.tsx
@@ -1,6 +1,6 @@
 import { ref } from 'vue'
 import { mount } from '@vue/test-utils'
-import { format } from 'date-fns/esm'
+import { format } from 'date-fns'
 import { NDatePicker } from '../index'
 import type { Value } from '../src/interface'
 import { dateEnUS } from '../../locales'
diff --git a/src/locales/date/arDZ.ts b/src/locales/date/arDZ.ts
index ef37d132d..e93e20511 100644
--- a/src/locales/date/arDZ.ts
+++ b/src/locales/date/arDZ.ts
@@ -1,4 +1,4 @@
-import arDZ from 'date-fns/esm/locale/ar'
+import { arDZ } from 'date-fns/locale'
 import type { NDateLocale } from './enUS'
 
 const dateArDZ: NDateLocale = {
diff --git a/src/locales/date/azAZ.ts b/src/locales/date/azAZ.ts
index faf34ceee..11b737b1f 100644
--- a/src/locales/date/azAZ.ts
+++ b/src/locales/date/azAZ.ts
@@ -1,4 +1,4 @@
-import az from 'date-fns/esm/locale/az'
+import { az } from 'date-fns/locale'
 import type { NDateLocale } from './enUS'
 
 const dateAzAZ: NDateLocale = {
diff --git a/src/locales/date/csCZ.ts b/src/locales/date/csCZ.ts
index df43b245a..6a32a0f80 100644
--- a/src/locales/date/csCZ.ts
+++ b/src/locales/date/csCZ.ts
@@ -1,4 +1,4 @@
-import cs from 'date-fns/esm/locale/cs'
+import { cs } from 'date-fns/locale'
 import type { NDateLocale } from './enUS'
 
 const dateCsCZ: NDateLocale = {
diff --git a/src/locales/date/deDE.ts b/src/locales/date/deDE.ts
index b4a79b42a..a85c8d391 100644
--- a/src/locales/date/deDE.ts
+++ b/src/locales/date/deDE.ts
@@ -1,4 +1,4 @@
-import de from 'date-fns/esm/locale/de'
+import { de } from 'date-fns/locale'
 import type { NDateLocale } from './enUS'
 
 const dateDeDE: NDateLocale = {
diff --git a/src/locales/date/enGB.ts b/src/locales/date/enGB.ts
index a530a43d9..0489085ef 100644
--- a/src/locales/date/enGB.ts
+++ b/src/locales/date/enGB.ts
@@ -1,4 +1,4 @@
-import enGB from 'date-fns/esm/locale/en-GB'
+import { enGB } from 'date-fns/locale'
 import type { NDateLocale } from './enUS'
 
 const dateEnGB: NDateLocale = {
diff --git a/src/locales/date/enUS.ts b/src/locales/date/enUS.ts
index f8e5c19bd..de6564fc4 100644
--- a/src/locales/date/enUS.ts
+++ b/src/locales/date/enUS.ts
@@ -1,4 +1,4 @@
-import enUS from 'date-fns/esm/locale/en-US'
+import { enUS } from 'date-fns/locale'
 import type { Locale } from 'date-fns'
 
 interface NDateLocale {
diff --git a/src/locales/date/eo.ts b/src/locales/date/eo.ts
index 4ef654d37..b3c3b15a4 100644
--- a/src/locales/date/eo.ts
+++ b/src/locales/date/eo.ts
@@ -1,4 +1,4 @@
-import eo from 'date-fns/esm/locale/eo'
+import { eo } from 'date-fns/locale'
 import type { NDateLocale } from './enUS'
 
 const dateEo: NDateLocale = {
diff --git a/src/locales/date/esAR.ts b/src/locales/date/esAR.ts
index 30491ac65..50ad095ec 100644
--- a/src/locales/date/esAR.ts
+++ b/src/locales/date/esAR.ts
@@ -1,9 +1,9 @@
-import esAR from 'date-fns/esm/locale/es'
+import { es } from 'date-fns/locale'
 import type { NDateLocale } from './enUS'
 
 const dateEsAR: NDateLocale = {
   name: 'es-AR',
-  locale: esAR
+  locale: es
 }
 
 export default dateEsAR
diff --git a/src/locales/date/etEE.ts b/src/locales/date/etEE.ts
index fe24ec321..0668cfdd6 100644
--- a/src/locales/date/etEE.ts
+++ b/src/locales/date/etEE.ts
@@ -1,4 +1,4 @@
-import et from 'date-fns/esm/locale/et'
+import { et } from 'date-fns/locale'
 import type { NDateLocale } from './enUS'
 
 const dateEtEE: NDateLocale = {
diff --git a/src/locales/date/faIR.ts b/src/locales/date/faIR.ts
index 3b5ed1180..9b3330238 100644
--- a/src/locales/date/faIR.ts
+++ b/src/locales/date/faIR.ts
@@ -1,4 +1,4 @@
-import faIR from 'date-fns/esm/locale/zh-CN'
+import { faIR } from 'date-fns/locale'
 import type { NDateLocale } from './enUS'
 
 const dateFaIR: NDateLocale = {
diff --git a/src/locales/date/frFR.ts b/src/locales/date/frFR.ts
index 8b2521780..9b99afb9f 100644
--- a/src/locales/date/frFR.ts
+++ b/src/locales/date/frFR.ts
@@ -1,9 +1,9 @@
-import frFR from 'date-fns/esm/locale/fr'
+import { fr } from 'date-fns/locale'
 import type { NDateLocale } from './enUS'
 
 const dateFrFR: NDateLocale = {
   name: 'fr-FR',
-  locale: frFR
+  locale: fr
 }
 
 export default dateFrFR
diff --git a/src/locales/date/idID.ts b/src/locales/date/idID.ts
index 5a6ef608b..1f40b67b8 100644
--- a/src/locales/date/idID.ts
+++ b/src/locales/date/idID.ts
@@ -1,9 +1,9 @@
-import idID from 'date-fns/esm/locale/id'
+import { id } from 'date-fns/locale'
 import type { NDateLocale } from './enUS'
 
 const dateIdID: NDateLocale = {
   name: 'id-ID',
-  locale: idID
+  locale: id
 }
 
 export default dateIdID
diff --git a/src/locales/date/itIT.ts b/src/locales/date/itIT.ts
index 3940edabd..f103d721e 100644
--- a/src/locales/date/itIT.ts
+++ b/src/locales/date/itIT.ts
@@ -1,9 +1,9 @@
-import itIT from 'date-fns/esm/locale/it'
+import { it } from 'date-fns/locale'
 import type { NDateLocale } from './enUS'
 
 const dateItIT: NDateLocale = {
   name: 'it-IT',
-  locale: itIT
+  locale: it
 }
 
 export default dateItIT
diff --git a/src/locales/date/jaJP.ts b/src/locales/date/jaJP.ts
index 57cf5ca29..4eaf217d6 100644
--- a/src/locales/date/jaJP.ts
+++ b/src/locales/date/jaJP.ts
@@ -1,4 +1,4 @@
-import ja from 'date-fns/esm/locale/ja'
+import { ja } from 'date-fns/locale'
 import type { NDateLocale } from './enUS'
 
 const dateJaJP: NDateLocale = {
diff --git a/src/locales/date/koKR.ts b/src/locales/date/koKR.ts
index 3f5d8b4cb..2254e8ae6 100644
--- a/src/locales/date/koKR.ts
+++ b/src/locales/date/koKR.ts
@@ -1,4 +1,4 @@
-import ko from 'date-fns/esm/locale/ko'
+import { ko } from 'date-fns/locale'
 import type { NDateLocale } from './enUS'
 
 const dateKoKR: NDateLocale = {
diff --git a/src/locales/date/nbNO.ts b/src/locales/date/nbNO.ts
index 4c4c47ad3..8c1eb48fc 100644
--- a/src/locales/date/nbNO.ts
+++ b/src/locales/date/nbNO.ts
@@ -1,4 +1,4 @@
-import nb from 'date-fns/esm/locale/nb'
+import { nb } from 'date-fns/locale'
 import type { NDateLocale } from './enUS'
 
 const dateNbNO: NDateLocale = {
diff --git a/src/locales/date/nlNL.ts b/src/locales/date/nlNL.ts
index 7a6cd8d19..a4679cb96 100644
--- a/src/locales/date/nlNL.ts
+++ b/src/locales/date/nlNL.ts
@@ -1,4 +1,4 @@
-import nl from 'date-fns/esm/locale/nl'
+import { nl } from 'date-fns/locale'
 import type { NDateLocale } from './enUS'
 
 const dateNlNL: NDateLocale = {
diff --git a/src/locales/date/plPL.ts b/src/locales/date/plPL.ts
index 0dc243ff2..29ac1ef74 100644
--- a/src/locales/date/plPL.ts
+++ b/src/locales/date/plPL.ts
@@ -1,9 +1,9 @@
-import plPL from 'date-fns/esm/locale/pl'
+import { pl } from 'date-fns/locale'
 import type { NDateLocale } from './enUS'
 
 const datePlPL: NDateLocale = {
   name: 'pl-PL',
-  locale: plPL
+  locale: pl
 }
 
 export default datePlPL
diff --git a/src/locales/date/ptBR.ts b/src/locales/date/ptBR.ts
index 523d69dd4..57634639c 100644
--- a/src/locales/date/ptBR.ts
+++ b/src/locales/date/ptBR.ts
@@ -1,4 +1,4 @@
-import ptBR from 'date-fns/esm/locale/pt-BR'
+import { ptBR } from 'date-fns/locale'
 import type { NDateLocale } from './enUS'
 
 const datePtBr: NDateLocale = {
diff --git a/src/locales/date/ruRU.ts b/src/locales/date/ruRU.ts
index 09682d7c7..de708cbf7 100644
--- a/src/locales/date/ruRU.ts
+++ b/src/locales/date/ruRU.ts
@@ -1,4 +1,4 @@
-import ru from 'date-fns/esm/locale/ru'
+import { ru } from 'date-fns/locale'
 import type { NDateLocale } from './enUS'
 
 const dateRuRU: NDateLocale = {
diff --git a/src/locales/date/skSK.ts b/src/locales/date/skSK.ts
index 29da479a0..900a87abd 100644
--- a/src/locales/date/skSK.ts
+++ b/src/locales/date/skSK.ts
@@ -1,4 +1,4 @@
-import sk from 'date-fns/esm/locale/sk'
+import { sk } from 'date-fns/locale'
 import type { NDateLocale } from './enUS'
 
 const dateSkSK: NDateLocale = {
diff --git a/src/locales/date/svSE.ts b/src/locales/date/svSE.ts
index 2ab6c7e58..16cd5a3ba 100644
--- a/src/locales/date/svSE.ts
+++ b/src/locales/date/svSE.ts
@@ -1,4 +1,4 @@
-import sv from 'date-fns/esm/locale/sv'
+import { sv } from 'date-fns/locale'
 import type { NDateLocale } from './enUS'
 
 const dateSvSE: NDateLocale = {
diff --git a/src/locales/date/thTH.ts b/src/locales/date/thTH.ts
index 5d848aec4..b61892193 100644
--- a/src/locales/date/thTH.ts
+++ b/src/locales/date/thTH.ts
@@ -1,9 +1,9 @@
-import thTH from 'date-fns/esm/locale/th'
+import { th } from 'date-fns/locale'
 import type { NDateLocale } from './enUS'
 
 const dateThTH: NDateLocale = {
-  name: 'thTH',
-  locale: thTH
+  name: 'th-TH',
+  locale: th
 }
 
 export default dateThTH
diff --git a/src/locales/date/trTR.ts b/src/locales/date/trTR.ts
index 2f927a59c..05aeda6bf 100644
--- a/src/locales/date/trTR.ts
+++ b/src/locales/date/trTR.ts
@@ -1,9 +1,9 @@
-import trTR from 'date-fns/esm/locale/tr'
+import { tr } from 'date-fns/locale'
 import type { NDateLocale } from './enUS'
 
 const dateTrTR: NDateLocale = {
-  name: 'zh-CN',
-  locale: trTR
+  name: 'tr-TR',
+  locale: tr
 }
 
 export default dateTrTR
diff --git a/src/locales/date/ukUA.ts b/src/locales/date/ukUA.ts
index 06a5e79d1..0d406996b 100644
--- a/src/locales/date/ukUA.ts
+++ b/src/locales/date/ukUA.ts
@@ -1,4 +1,4 @@
-import uk from 'date-fns/esm/locale/uk'
+import { uk } from 'date-fns/locale'
 import type { NDateLocale } from './enUS'
 
 const dateUkUA: NDateLocale = {
diff --git a/src/locales/date/uzUZ.ts b/src/locales/date/uzUZ.ts
index 6328889d3..015289dfc 100644
--- a/src/locales/date/uzUZ.ts
+++ b/src/locales/date/uzUZ.ts
@@ -1,4 +1,4 @@
-import uz from 'date-fns/esm/locale/uz'
+import { uz } from 'date-fns/locale'
 import type { NDateLocale } from './enUS'
 
 const dateUzUZ: NDateLocale = {
diff --git a/src/locales/date/viVN.ts b/src/locales/date/viVN.ts
index 0cfc4deae..7f8766046 100644
--- a/src/locales/date/viVN.ts
+++ b/src/locales/date/viVN.ts
@@ -1,9 +1,9 @@
-import viVN from 'date-fns/esm/locale/vi'
+import { vi } from 'date-fns/locale'
 import type { NDateLocale } from './enUS'
 
 const dateVi: NDateLocale = {
   name: 'vi-VN',
-  locale: viVN
+  locale: vi
 }
 
 export default dateVi
diff --git a/src/locales/date/zhCN.ts b/src/locales/date/zhCN.ts
index 514e9c702..3975fe7be 100644
--- a/src/locales/date/zhCN.ts
+++ b/src/locales/date/zhCN.ts
@@ -1,4 +1,4 @@
-import zhCN from 'date-fns/esm/locale/zh-CN'
+import { zhCN } from 'date-fns/locale'
 import type { NDateLocale } from './enUS'
 
 const dateZhCN: NDateLocale = {
diff --git a/src/locales/date/zhTW.ts b/src/locales/date/zhTW.ts
index ce08abc20..98efe035a 100644
--- a/src/locales/date/zhTW.ts
+++ b/src/locales/date/zhTW.ts
@@ -1,4 +1,4 @@
-import zhTW from 'date-fns/esm/locale/zh-TW'
+import { zhTW } from 'date-fns/locale'
 import type { NDateLocale } from './enUS'
 
 const datezhTW: NDateLocale = {
diff --git a/src/time-picker/src/TimePicker.tsx b/src/time-picker/src/TimePicker.tsx
index cd2a339ab..6b944cc92 100644
--- a/src/time-picker/src/TimePicker.tsx
+++ b/src/time-picker/src/TimePicker.tsx
@@ -32,8 +32,8 @@ import {
   startOfHour,
   startOfMinute,
   startOfSecond
-} from 'date-fns/esm'
-import formatInTimeZone from 'date-fns-tz/formatInTimeZone'
+} from 'date-fns'
+import { formatInTimeZone } from 'date-fns-tz'
 import type { Locale } from 'date-fns'
 import type { FormValidationStatus } from '../../form/src/interface'
 import { strictParse } from '../../date-picker/src/utils'
diff --git a/src/time-picker/src/utils.ts b/src/time-picker/src/utils.ts
index 998645dde..e3dfbbb7a 100644
--- a/src/time-picker/src/utils.ts
+++ b/src/time-picker/src/utils.ts
@@ -1,4 +1,4 @@
-import { getHours } from 'date-fns/esm'
+import { getHours } from 'date-fns'
 import { type MaybeArray, throwError } from '../../_utils'
 
 export const time = {
diff --git a/src/time/src/Time.ts b/src/time/src/Time.ts
index b768689a6..0641c1000 100644
--- a/src/time/src/Time.ts
+++ b/src/time/src/Time.ts
@@ -5,9 +5,9 @@ import {
   defineComponent,
   h
 } from 'vue'
-import { format, formatDistanceStrict, fromUnixTime } from 'date-fns/esm'
+import { format, formatDistanceStrict, fromUnixTime } from 'date-fns'
 import type { Locale } from 'date-fns'
-import formatInTimeZone from 'date-fns-tz/formatInTimeZone'
+import { formatInTimeZone } from 'date-fns-tz'
 import { useLocale } from '../../_mixins'
 import type { ExtractPublicPropTypes } from '../../_utils'
 
diff --git a/vite.config.js b/vite.config.js
index 839ad7685..282b72396 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -34,7 +34,7 @@ module.exports = {
       '@css-render/plugin-bem',
       'async-validator',
       'css-render',
-      'date-fns/esm',
+      'date-fns',
       'date-fns-tz/getTimezoneOffset',
       'evtd',
       'highlight.js',
@@ -57,28 +57,7 @@ module.exports = {
       'highlight.js/lib/languages/xml',
       '@vicons/ionicons5',
       '@vicons/ionicons4',
-      '@vicons/fluent/Compose16Regular.js',
-      'date-fns/esm/locale/nb',
-      'date-fns/esm/locale/fr',
-      'date-fns/esm/locale/id',
-      'date-fns/esm/locale/de',
-      'date-fns/esm/locale/ja',
-      'date-fns/esm/locale/zh-CN',
-      'date-fns/esm/locale/en-US',
-      'date-fns/esm/locale/ru',
-      'date-fns/esm/locale/uk',
-      'date-fns/esm/locale/zh-TW',
-      'date-fns/esm/locale/es',
-      'date-fns/esm/locale/it',
-      'date-fns/esm/locale/en-GB',
-      'date-fns/esm/locale/pl',
-      'date-fns/esm/locale/eo',
-      'date-fns/esm/locale/sk',
-      'date-fns/esm/locale/pt-BR',
-      'date-fns/esm/locale/th',
-      'date-fns/esm/locale/ko',
-      'date-fns/esm/locale/nl',
-      'date-fns/esm/locale/ar'
+      '@vicons/fluent/Compose16Regular.js'
     ],
     exclude: ['__INDEX__']
   },