From 7c6bf4cc26487a1a43fb1bc8a58c4fced27d113d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Nov 2025 12:10:58 +0000
Subject: [PATCH 1/6] chore(deps): bump @vuepic/vue-datepicker from 11.0.2 to
 12.0.1

Bumps [@vuepic/vue-datepicker](https://github.com/Vuepic/vue-datepicker) from 11.0.2 to 12.0.1.
- [Release notes](https://github.com/Vuepic/vue-datepicker/releases)
- [Changelog](https://github.com/Vuepic/vue-datepicker/blob/main/CHANGELOG.md)
- [Commits](https://github.com/Vuepic/vue-datepicker/compare/v11.0.2...v12.0.1)

---
updated-dependencies:
- dependency-name: "@vuepic/vue-datepicker"
  dependency-version: 12.0.1
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 56 ++++++++++++++++++++++++++++++++++++++++++-----
 package.json      |  2 +-
 2 files changed, 52 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0c1588340d..2ce51216fd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21,7 +21,7 @@
         "@nextcloud/logger": "^3.0.2",
         "@nextcloud/router": "^3.0.1",
         "@nextcloud/sharing": "^0.3.0",
-        "@vuepic/vue-datepicker": "^11.0.3",
+        "@vuepic/vue-datepicker": "^12.0.1",
         "@vueuse/components": "^14.0.0",
         "@vueuse/core": "^14.0.0",
         "blurhash": "^2.0.5",
@@ -2074,6 +2074,12 @@
         "node": ">=10"
       }
     },
+    "node_modules/@date-fns/tz": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/@date-fns/tz/-/tz-1.4.1.tgz",
+      "integrity": "sha512-P5LUNhtbj6YfI3iJjw5EL9eUAG6OitD0W3fWQcpQjDRc/QIsL0tRNuO1PcDvPccWL1fSTXXdE1ds+l95DV/OFA==",
+      "license": "MIT"
+    },
     "node_modules/@discoveryjs/json-ext": {
       "version": "0.5.7",
       "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz",
@@ -2794,6 +2800,43 @@
       "integrity": "sha512-aGTxbpbg8/b5JfU1HXSrbH3wXZuLPJcNEcZQFMxLs3oSzgtVu6nFPkbbGGUvBcUjKV2YyB9Wxxabo+HEH9tcRQ==",
       "license": "MIT"
     },
+    "node_modules/@floating-ui/vue": {
+      "version": "1.1.9",
+      "resolved": "https://registry.npmjs.org/@floating-ui/vue/-/vue-1.1.9.tgz",
+      "integrity": "sha512-BfNqNW6KA83Nexspgb9DZuz578R7HT8MZw1CfK9I6Ah4QReNWEJsXWHN+SdmOVLNGmTPDi+fDT535Df5PzMLbQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@floating-ui/dom": "^1.7.4",
+        "@floating-ui/utils": "^0.2.10",
+        "vue-demi": ">=0.13.0"
+      }
+    },
+    "node_modules/@floating-ui/vue/node_modules/vue-demi": {
+      "version": "0.14.10",
+      "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.10.tgz",
+      "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==",
+      "hasInstallScript": true,
+      "license": "MIT",
+      "bin": {
+        "vue-demi-fix": "bin/vue-demi-fix.js",
+        "vue-demi-switch": "bin/vue-demi-switch.js"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      },
+      "peerDependencies": {
+        "@vue/composition-api": "^1.0.0-rc.1",
+        "vue": "^3.0.0-0 || ^2.6.0"
+      },
+      "peerDependenciesMeta": {
+        "@vue/composition-api": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@fontsource/roboto": {
       "version": "5.2.8",
       "resolved": "https://registry.npmjs.org/@fontsource/roboto/-/roboto-5.2.8.tgz",
@@ -6026,18 +6069,21 @@
       }
     },
     "node_modules/@vuepic/vue-datepicker": {
-      "version": "11.0.3",
-      "resolved": "https://registry.npmjs.org/@vuepic/vue-datepicker/-/vue-datepicker-11.0.3.tgz",
-      "integrity": "sha512-sb2adwqwK2PizLQOpxCYps2SwhVT6/ic2HMIOqHJXuYa6iAJZWGL5YVlS7O4aW+sk6ZyxlDURLO7kDZPL4HB/w==",
+      "version": "12.0.1",
+      "resolved": "https://registry.npmjs.org/@vuepic/vue-datepicker/-/vue-datepicker-12.0.1.tgz",
+      "integrity": "sha512-I7yWgDfymtGmtvcVxOdK+THOLCbcq0aEfIsRh4IhWyJkk6q+Nf3rCNHEaGy16GNXRDOsZLT2FiTqP/1Upx2Lzg==",
       "license": "MIT",
       "dependencies": {
+        "@date-fns/tz": "^1.4.1",
+        "@floating-ui/vue": "^1.1.9",
+        "@vueuse/core": "^14.0.0",
         "date-fns": "^4.1.0"
       },
       "engines": {
         "node": ">=18.12.0"
       },
       "peerDependencies": {
-        "vue": ">=3.3.0"
+        "vue": ">=3.5.0"
       }
     },
     "node_modules/@vueuse/components": {
diff --git a/package.json b/package.json
index fd1c2c46a2..db1996271c 100644
--- a/package.json
+++ b/package.json
@@ -87,7 +87,7 @@
     "@nextcloud/logger": "^3.0.2",
     "@nextcloud/router": "^3.0.1",
     "@nextcloud/sharing": "^0.3.0",
-    "@vuepic/vue-datepicker": "^11.0.3",
+    "@vuepic/vue-datepicker": "^12.0.1",
     "@vueuse/components": "^14.0.0",
     "@vueuse/core": "^14.0.0",
     "blurhash": "^2.0.5",

From 113e2d7c29d839da8ce520df428dccdb0830c333 Mon Sep 17 00:00:00 2001
From: Ferdinand Thiessen <opensource@fthiessen.de>
Date: Tue, 4 Nov 2025 13:57:31 +0100
Subject: [PATCH 2/6] refactor(NcDateTimePicker): adjust for updated library

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
---
 package-lock.json                             |  1 +
 package.json                                  |  1 +
 .../NcDateTimePicker/NcDateTimePicker.vue     | 68 ++++++++++++-------
 3 files changed, 44 insertions(+), 26 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2ce51216fd..8bc7aad268 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -26,6 +26,7 @@
         "@vueuse/core": "^14.0.0",
         "blurhash": "^2.0.5",
         "clone": "^2.1.2",
+        "date-fns": "^4.1.0",
         "debounce": "^3.0.0",
         "dompurify": "^3.3.0",
         "emoji-mart-vue-fast": "^15.0.5",
diff --git a/package.json b/package.json
index db1996271c..d7396fac38 100644
--- a/package.json
+++ b/package.json
@@ -92,6 +92,7 @@
     "@vueuse/core": "^14.0.0",
     "blurhash": "^2.0.5",
     "clone": "^2.1.2",
+    "date-fns": "^4.1.0",
     "debounce": "^3.0.0",
     "dompurify": "^3.3.0",
     "emoji-mart-vue-fast": "^15.0.5",
diff --git a/src/components/NcDateTimePicker/NcDateTimePicker.vue b/src/components/NcDateTimePicker/NcDateTimePicker.vue
index bd330be5ca..490ca9ec06 100644
--- a/src/components/NcDateTimePicker/NcDateTimePicker.vue
+++ b/src/components/NcDateTimePicker/NcDateTimePicker.vue
@@ -166,14 +166,6 @@ export default {
 </docs>
 
 <script setup lang="ts">
-import type {
-	// The accepted model value
-	ModelValue as LibraryModelValue,
-	// The emitted object for time picker
-	TimeObj as LibraryTimeObject,
-	VueDatePickerProps,
-} from '@vuepic/vue-datepicker'
-
 import {
 	mdiCalendarBlank,
 	mdiChevronDown,
@@ -189,14 +181,18 @@ import {
 	getDayNamesMin,
 	getFirstDay,
 } from '@nextcloud/l10n'
-import VueDatePicker from '@vuepic/vue-datepicker'
+import { VueDatePicker } from '@vuepic/vue-datepicker'
+import * as locales from 'date-fns/locale'
 import { computed, useTemplateRef } from 'vue'
 import NcIconSvgWrapper from '../NcIconSvgWrapper/NcIconSvgWrapper.vue'
 import NcTimezonePicker from '../NcTimezonePicker/NcTimezonePicker.vue'
 import { t } from '../../l10n.ts'
 import NcButton from '../NcButton/index.ts'
 
-type LibraryFormatOptions = VueDatePickerProps['format']
+type VueDatePickerProps = InstanceType<typeof VueDatePicker>['$props']
+type LibraryFormatOptions = NonNullable<VueDatePickerProps['formats']>['input']
+type LibraryModelValue = VueDatePickerProps['modelValue']
+type LibraryTimeObject = NonNullable<VueDatePickerProps['minTime']>
 
 /**
  * The preselected IANA time zone ID for the time zone picker,
@@ -359,7 +355,7 @@ const value = computed<LibraryModelValue>(() => {
 			hours: time.getHours(),
 			minutes: time.getMinutes(),
 			seconds: time.getSeconds(),
-		} satisfies LibraryTimeObject
+		}
 	} else if (props.type === 'time-range') {
 		const time = [props.modelValue].flat()
 		if (time.length !== 2) {
@@ -373,7 +369,7 @@ const value = computed<LibraryModelValue>(() => {
 			hours: date.getHours(),
 			minutes: date.getMinutes(),
 			seconds: date.getSeconds(),
-		} as LibraryTimeObject))
+		}))
 	} else if (props.type.endsWith('-range')) {
 		if (props.modelValue === undefined) {
 			const start = new Date()
@@ -458,18 +454,27 @@ const pickerType = computed(() => ({
 		partialRange: false,
 	},
 	enableTimePicker: !(props.type === 'date' || props.type === 'date-range'),
-	flow: props.type === 'datetime'
-		? ['calendar', 'time'] as ['calendar', 'time']
-		: undefined,
+	...(props.type === 'datetime'
+		? { flow: { steps: ['calendar', 'time'] as ['calendar', 'time'] } }
+		: {}
+	),
 }))
 
+const localeObject = computed(() => {
+	const name = props.locale.split('-').map((value, index) => index > 0 ? value[0]?.toUpperCase() + value.slice(1) : value).join('')
+	if (name in locales) {
+		return locales[name]
+	}
+	return undefined
+})
+
 /**
  * Called on model value update of the library.
  *
  * @param value The value emitted from the underlying library
  */
 function onUpdateModelValue(value: LibraryModelValue): void {
-	if (value === null) {
+	if (value === null || value === undefined) {
 		return emit('update:modelValue', null)
 	}
 
@@ -508,18 +513,27 @@ function onUpdateModelValue(value: LibraryModelValue): void {
  */
 function formatLibraryTime(time: LibraryTimeObject): Date {
 	const date = new Date()
-	date.setHours(time.hours)
-	date.setMinutes(time.minutes)
-	date.setSeconds(time.seconds)
+	date.setHours(toNumber(time.hours))
+	date.setMinutes(toNumber(time.minutes))
+	if (time.seconds) {
+		date.setSeconds(toNumber(time.seconds))
+	}
 	return date
+
+	/**
+	 * @param value - The value to convert to a number
+	 */
+	function toNumber(value: string | number): number {
+		return typeof value === 'number' ? value : Number.parseInt(value)
+	}
 }
 
 // Localization
 
 const weekStart = getFirstDay()
 
+// day names must be ordered based on week start
 const dayNames = [...getDayNamesMin()]
-// see https://github.com/Vuepic/vue-datepicker/issues/1159
 for (let i = 0; i < weekStart; i++) {
 	dayNames.push(dayNames.shift() as string)
 }
@@ -594,19 +608,21 @@ function cancelSelection() {
 		<VueDatePicker
 			ref="picker"
 			:aria-labels
+			:action-row="{
+				selectBtnLabel: t('Pick'),
+				cancelBtnLabel: t('Cancel'),
+				nowBtnLabel: t('Now'),
+			}"
 			:auto-apply="!confirm"
 			class="vue-date-time-picker"
 			:class="{ 'vue-date-time-picker--clearable': clearable }"
-			:cancel-text="t('Cancel')"
-			:clearable
 			:day-names
 			:placeholder="placeholder ?? placeholderFallback"
-			:format="realFormat"
-			:locale
+			:formats="{ input: realFormat }"
+			:input-attrs="{ clearable }"
+			:locale="localeObject"
 			:minutes-increment="minuteStep"
 			:model-value="value"
-			:now-button-label="t('Now')"
-			:select-text="t('Pick')"
 			six-weeks="fair"
 			:teleport="appendToBody ? (targetElement || undefined) : false"
 			text-input

From f1921238956ffa5133a8b6c6e1ed5b40f73d1bba Mon Sep 17 00:00:00 2001
From: Ferdinand Thiessen <opensource@fthiessen.de>
Date: Thu, 6 Nov 2025 21:20:01 +0100
Subject: [PATCH 3/6] fixup! refactor(NcDateTimePicker): adjust for updated
 library

---
 .../NcDateTimePicker/NcDateTimePicker.vue     | 37 ++++++++++++++-----
 1 file changed, 28 insertions(+), 9 deletions(-)

diff --git a/src/components/NcDateTimePicker/NcDateTimePicker.vue b/src/components/NcDateTimePicker/NcDateTimePicker.vue
index 490ca9ec06..196354ba72 100644
--- a/src/components/NcDateTimePicker/NcDateTimePicker.vue
+++ b/src/components/NcDateTimePicker/NcDateTimePicker.vue
@@ -166,6 +166,8 @@ export default {
 </docs>
 
 <script setup lang="ts">
+import type { Locale } from 'date-fns'
+
 import {
 	mdiCalendarBlank,
 	mdiChevronDown,
@@ -182,11 +184,13 @@ import {
 	getFirstDay,
 } from '@nextcloud/l10n'
 import { VueDatePicker } from '@vuepic/vue-datepicker'
-import * as locales from 'date-fns/locale'
 import { computed, useTemplateRef } from 'vue'
+import { ref } from 'vue'
+import { watch } from 'vue'
 import NcIconSvgWrapper from '../NcIconSvgWrapper/NcIconSvgWrapper.vue'
 import NcTimezonePicker from '../NcTimezonePicker/NcTimezonePicker.vue'
 import { t } from '../../l10n.ts'
+import { logger } from '../../utils/logger.ts'
 import NcButton from '../NcButton/index.ts'
 
 type VueDatePickerProps = InstanceType<typeof VueDatePicker>['$props']
@@ -328,6 +332,9 @@ const emit = defineEmits<{
 const targetElement = useTemplateRef('target')
 const pickerInstance = useTemplateRef('picker')
 
+const localeObject = ref<Locale>()
+watch(() => props.locale, loadLocale, { immediate: true })
+
 /**
  * Mapping of the model-value prop to the format expected by the library.
  * We do not directly pass the prop and adjust the interface to not transparently wrap the library.
@@ -460,14 +467,6 @@ const pickerType = computed(() => ({
 	),
 }))
 
-const localeObject = computed(() => {
-	const name = props.locale.split('-').map((value, index) => index > 0 ? value[0]?.toUpperCase() + value.slice(1) : value).join('')
-	if (name in locales) {
-		return locales[name]
-	}
-	return undefined
-})
-
 /**
  * Called on model value update of the library.
  *
@@ -601,6 +600,26 @@ function selectDate() {
 function cancelSelection() {
 	pickerInstance.value!.closeMenu()
 }
+
+/**
+ * Load the locale object from date-fns dynamically.
+ *
+ * @param locale - The locale to load
+ */
+async function loadLocale(locale: string) {
+	try {
+		const { default: dateFnLocale } = await import(`date-fns/locale/${locale}`)
+		localeObject.value = dateFnLocale
+	} catch (error) {
+		if (locale.includes('-')) {
+			locale = locale.split('-')[0]!
+			logger.debug('Try loading fallback locale for NcDateTimePicker', { locale })
+			await loadLocale(locale)
+		} else {
+			logger.error('Failed to load locale for NcDateTimePicker', { locale, error })
+		}
+	}
+}
 </script>
 
 <template>

From 04a434b3d31afc4122baa1385b5eb4e73cd6793a Mon Sep 17 00:00:00 2001
From: Ferdinand Thiessen <opensource@fthiessen.de>
Date: Thu, 6 Nov 2025 21:25:41 +0100
Subject: [PATCH 4/6] fixup! refactor(NcDateTimePicker): adjust for updated
 library

---
 src/components/NcDateTimePicker/NcDateTimePicker.vue | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/components/NcDateTimePicker/NcDateTimePicker.vue b/src/components/NcDateTimePicker/NcDateTimePicker.vue
index 196354ba72..785bede32c 100644
--- a/src/components/NcDateTimePicker/NcDateTimePicker.vue
+++ b/src/components/NcDateTimePicker/NcDateTimePicker.vue
@@ -449,7 +449,7 @@ const realFormat = computed<LibraryFormatOptions>(() => {
 	return undefined
 })
 
-const pickerType = computed(() => ({
+const pickerType = computed<Partial<VueDatePickerProps>>(() => ({
 	timePicker: props.type === 'time' || props.type === 'time-range',
 	yearPicker: props.type === 'year',
 	monthPicker: props.type === 'month',
@@ -460,7 +460,9 @@ const pickerType = computed(() => ({
 		// but its not covered by our component interface (props / events) documentation so just disabled for now.
 		partialRange: false,
 	},
-	enableTimePicker: !(props.type === 'date' || props.type === 'date-range'),
+	timeConfig: {
+		enableTimePicker: !(props.type === 'date' || props.type === 'date-range'),
+	},
 	...(props.type === 'datetime'
 		? { flow: { steps: ['calendar', 'time'] as ['calendar', 'time'] } }
 		: {}
@@ -645,8 +647,7 @@ async function loadLocale(locale: string) {
 			six-weeks="fair"
 			:teleport="appendToBody ? (targetElement || undefined) : false"
 			text-input
-			:week-num-name
-			:week-numbers="showWeekNumber ? { type: 'iso' } : undefined"
+			:week-numbers="showWeekNumber ? { type: 'iso', label: weekNumName } : undefined"
 			:week-start
 			v-bind="pickerType"
 			@update:model-value="onUpdateModelValue">

From fa0c031834af1d3289842ce25cdd5ec696d40b61 Mon Sep 17 00:00:00 2001
From: Ferdinand Thiessen <opensource@fthiessen.de>
Date: Thu, 6 Nov 2025 21:38:13 +0100
Subject: [PATCH 5/6] fixup! fixup! refactor(NcDateTimePicker): adjust for
 updated library

---
 src/components/NcDateTimePicker/NcDateTimePicker.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/NcDateTimePicker/NcDateTimePicker.vue b/src/components/NcDateTimePicker/NcDateTimePicker.vue
index 785bede32c..09984a8822 100644
--- a/src/components/NcDateTimePicker/NcDateTimePicker.vue
+++ b/src/components/NcDateTimePicker/NcDateTimePicker.vue
@@ -799,7 +799,7 @@ async function loadLocale(locale: string) {
 
 	// make the bottom page toggle stand out better
 	:deep(.dp__btn.dp__button.dp__button_bottom) {
-		color: var(--color-primary-element-light);
+		color: var(--color-primary-element-light-text);
 		background-color: var(--color-primary-element-light);
 	}
 

From 32fb0b775689623cc6eb43e5de29f1a09d4fa768 Mon Sep 17 00:00:00 2001
From: Ferdinand Thiessen <opensource@fthiessen.de>
Date: Fri, 7 Nov 2025 14:33:02 +0100
Subject: [PATCH 6/6] fixup! fixup! fixup! refactor(NcDateTimePicker): adjust
 for updated library

---
 .../NcDateTimePicker/NcDateTimePicker.vue     | 26 ++-----------
 src/utils/date-fns.ts                         | 39 +++++++++++++++++++
 2 files changed, 43 insertions(+), 22 deletions(-)
 create mode 100644 src/utils/date-fns.ts

diff --git a/src/components/NcDateTimePicker/NcDateTimePicker.vue b/src/components/NcDateTimePicker/NcDateTimePicker.vue
index 09984a8822..d9e8c39196 100644
--- a/src/components/NcDateTimePicker/NcDateTimePicker.vue
+++ b/src/components/NcDateTimePicker/NcDateTimePicker.vue
@@ -190,7 +190,7 @@ import { watch } from 'vue'
 import NcIconSvgWrapper from '../NcIconSvgWrapper/NcIconSvgWrapper.vue'
 import NcTimezonePicker from '../NcTimezonePicker/NcTimezonePicker.vue'
 import { t } from '../../l10n.ts'
-import { logger } from '../../utils/logger.ts'
+import { loadDateFnsLocale } from '../../utils/date-fns.ts'
 import NcButton from '../NcButton/index.ts'
 
 type VueDatePickerProps = InstanceType<typeof VueDatePicker>['$props']
@@ -333,7 +333,9 @@ const targetElement = useTemplateRef('target')
 const pickerInstance = useTemplateRef('picker')
 
 const localeObject = ref<Locale>()
-watch(() => props.locale, loadLocale, { immediate: true })
+watch(() => props.locale, async () => {
+	localeObject.value = await loadDateFnsLocale(props.locale)
+}, { immediate: true })
 
 /**
  * Mapping of the model-value prop to the format expected by the library.
@@ -602,26 +604,6 @@ function selectDate() {
 function cancelSelection() {
 	pickerInstance.value!.closeMenu()
 }
-
-/**
- * Load the locale object from date-fns dynamically.
- *
- * @param locale - The locale to load
- */
-async function loadLocale(locale: string) {
-	try {
-		const { default: dateFnLocale } = await import(`date-fns/locale/${locale}`)
-		localeObject.value = dateFnLocale
-	} catch (error) {
-		if (locale.includes('-')) {
-			locale = locale.split('-')[0]!
-			logger.debug('Try loading fallback locale for NcDateTimePicker', { locale })
-			await loadLocale(locale)
-		} else {
-			logger.error('Failed to load locale for NcDateTimePicker', { locale, error })
-		}
-	}
-}
 </script>
 
 <template>
diff --git a/src/utils/date-fns.ts b/src/utils/date-fns.ts
new file mode 100644
index 0000000000..0868dfe82e
--- /dev/null
+++ b/src/utils/date-fns.ts
@@ -0,0 +1,39 @@
+/*!
+ * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+import type { Locale } from 'date-fns'
+
+import { logger } from './logger.ts'
+
+// this is a fix only for the styleguide as webpack does not have glob import
+let modules: Record<string, () => Promise<{ default: Locale }>>
+try {
+	modules = import.meta.glob('/node_modules/date-fns/locale/*.js')
+} catch {
+	modules = {}
+}
+
+/**
+ * Load a date-fns locale module.
+ *
+ * @param locale - The canonical locale to load
+ */
+export async function loadDateFnsLocale(locale: string): Promise<Locale | undefined> {
+	logger.debug(`Loading date-fns locale for '${locale}'`)
+	const modulePath = `/node_modules/date-fns/locale/${locale}.js`
+	if (modules[modulePath]) {
+		logger.debug(`Import date-fns locale for '${locale}'`)
+		const mod = await modules[modulePath]()
+		return mod.default
+	}
+
+	if (locale.includes('-')) {
+		// Try without region
+		const shortLocale = locale.split('-')[0]!
+		return await loadDateFnsLocale(shortLocale)
+	}
+
+	logger.debug(`No date-fns locale found for '${locale}'`)
+}