cozy-ui 115.0.0 → 115.0.2

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [115.0.2](https://github.com/cozy/cozy-ui/compare/v115.0.1...v115.0.2) (2024-12-20)
+
+
+### Bug Fixes
+
+* **initFormat:** Ensure do not crash if no date is passed ([07564e7](https://github.com/cozy/cozy-ui/commit/07564e7))
+
+## [115.0.1](https://github.com/cozy/cozy-ui/compare/v115.0.0...v115.0.1) (2024-12-20)
+
+
+### Bug Fixes
+
+* Ensure use correct format locales ([5d078db](https://github.com/cozy/cozy-ui/commit/5d078db)), closes [/github.com/date-fns/date-fns/blob/main/CHANGELOG.md#200---2019-08-20](https://github.com//github.com/date-fns/date-fns/blob/main/CHANGELOG.md/issues/200---2019-08-20)
+
 # [115.0.0](https://github.com/cozy/cozy-ui/compare/v114.0.1...v115.0.0) (2024-12-19)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-ui",
-  "version": "115.0.0",
+  "version": "115.0.2",
   "description": "Cozy apps UI SDK",
   "main": "./index.js",
   "bin": {

package/react/providers/I18n/format.jsx

@@ -6,18 +6,38 @@ import { DEFAULT_LANG } from '.'
 const locales = {}
 let lang = DEFAULT_LANG
 
+/**
+ * Ensure that the locale is in the correct format for date-fns (see 2.0.0 BC https://github.com/date-fns/date-fns/blob/main/CHANGELOG.md#200---2019-08-20)
+ * @param {string} lang
+ */
+const ensureLocaleFormat = lang => {
+  switch (lang) {
+    case 'en':
+      return 'en-US'
+    case 'zh_cn':
+      return 'zh-CN'
+    case 'zh_tw':
+      return 'zh-TW'
+    default:
+      return lang
+  }
+}
+
 const getWarningMessage = lang =>
   `The "${lang}" locale isn't supported by date-fns. or has not been included in the build. Check if you have configured a ContextReplacementPlugin that is too restrictive.`
 
 export const provideDateFnsLocale = (userLang, defaultLang = DEFAULT_LANG) => {
-  lang = userLang
+  lang = ensureLocaleFormat(userLang)
+  const ensureDefaultLang = ensureLocaleFormat(defaultLang)
   try {
-    locales[defaultLang] = require(`date-fns/locale/${defaultLang}/index.js`)
+    locales[
+      ensureDefaultLang
+    ] = require(`date-fns/locale/${ensureDefaultLang}/index.js`)
   } catch (err) {
-    console.warn(getWarningMessage(defaultLang))
+    console.warn(getWarningMessage(ensureDefaultLang))
   }
 
-  if (lang && lang !== defaultLang) {
+  if (lang && lang !== ensureDefaultLang) {
     try {
       locales[lang] = require(`date-fns/locale/${lang}/index.js`)
     } catch (e) {
@@ -33,7 +53,11 @@ export const initFormat =
     const locale = provideDateFnsLocale(userLang, defaultLang)
     const ensureDate = date && typeof date === 'string' ? new Date(date) : date
 
-    return format(ensureDate, formatStr, { locale, ...opts })
+    try {
+      return format(ensureDate, formatStr, { locale, ...opts })
+    } catch (error) {
+      console.error('Error in initFormat', error)
+    }
   }
 
 export const formatLocallyDistanceToNow = date => {

package/react/providers/I18n/format.spec.jsx

@@ -10,6 +10,18 @@ describe('initFormat', () => {
   it('should not throw if a date-fns locale can not be found', () => {
     expect(() => initFormat('unknown-lang', 'unknown-default')).not.toThrow()
   })
+
+  it('should use the correct locale', () => {
+    const f = initFormat('fr', 'en')
+    const date = f(0, 'yyyy-LLLL-dd')
+    expect(date).toBe('1970-janvier-01')
+  })
+
+  it('should fallback english if a date-fns locale can not be found', () => {
+    const f = initFormat('unknown-lang', 'unknown-default')
+    const date = f(0, 'yyyy-LLLL-dd')
+    expect(date).toBe('1970-January-01')
+  })
 })
 
 describe('formatLocallyDistanceToNow', () => {

package/transpiled/react/providers/I18n/format.js

@@ -9,6 +9,26 @@ import formatDistanceToNow from 'date-fns/formatDistanceToNow';
 import { DEFAULT_LANG } from "cozy-ui/transpiled/react/providers/I18n";
 var locales = {};
 var lang = DEFAULT_LANG;
+/**
+ * Ensure that the locale is in the correct format for date-fns (see 2.0.0 BC https://github.com/date-fns/date-fns/blob/main/CHANGELOG.md#200---2019-08-20)
+ * @param {string} lang
+ */
+
+var ensureLocaleFormat = function ensureLocaleFormat(lang) {
+  switch (lang) {
+    case 'en':
+      return 'en-US';
+
+    case 'zh_cn':
+      return 'zh-CN';
+
+    case 'zh_tw':
+      return 'zh-TW';
+
+    default:
+      return lang;
+  }
+};
 
 var getWarningMessage = function getWarningMessage(lang) {
   return "The \"".concat(lang, "\" locale isn't supported by date-fns. or has not been included in the build. Check if you have configured a ContextReplacementPlugin that is too restrictive.");
@@ -16,15 +36,16 @@ var getWarningMessage = function getWarningMessage(lang) {
 
 export var provideDateFnsLocale = function provideDateFnsLocale(userLang) {
   var defaultLang = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : DEFAULT_LANG;
-  lang = userLang;
+  lang = ensureLocaleFormat(userLang);
+  var ensureDefaultLang = ensureLocaleFormat(defaultLang);
 
   try {
-    locales[defaultLang] = require("date-fns/locale/".concat(defaultLang, "/index.js"));
+    locales[ensureDefaultLang] = require("date-fns/locale/".concat(ensureDefaultLang, "/index.js"));
   } catch (err) {
-    console.warn(getWarningMessage(defaultLang));
+    console.warn(getWarningMessage(ensureDefaultLang));
   }
 
-  if (lang && lang !== defaultLang) {
+  if (lang && lang !== ensureDefaultLang) {
     try {
       locales[lang] = require("date-fns/locale/".concat(lang, "/index.js"));
     } catch (e) {
@@ -40,9 +61,14 @@ export var initFormat = function initFormat(userLang) {
     var opts = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
     var locale = provideDateFnsLocale(userLang, defaultLang);
     var ensureDate = date && typeof date === 'string' ? new Date(date) : date;
-    return format(ensureDate, formatStr, _objectSpread({
-      locale: locale
-    }, opts));
+
+    try {
+      return format(ensureDate, formatStr, _objectSpread({
+        locale: locale
+      }, opts));
+    } catch (error) {
+      console.error('Error in initFormat', error);
+    }
   };
 };
 export var formatLocallyDistanceToNow = function formatLocallyDistanceToNow(date) {