From 27997634d9d919e7e17bdaff24453d486304ef46 Mon Sep 17 00:00:00 2001 From: Lukas Tyla Date: Fri, 27 Dec 2024 18:06:40 +0200 Subject: [PATCH] [pickers] Support `date-fns-jalali` v4 (#16011) --- babel.config.js | 2 +- .../calendar-systems/calendar-systems.md | 8 ++++---- package.json | 2 +- packages/x-date-pickers-pro/package.json | 2 +- packages/x-date-pickers/package.json | 2 +- pnpm-lock.yaml | 12 ++++++------ 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/babel.config.js b/babel.config.js index b67f02fa534d7..548219255b525 100644 --- a/babel.config.js +++ b/babel.config.js @@ -116,7 +116,7 @@ module.exports = function getBabelConfig(api) { 'babel-plugin-replace-imports', { test: /date-fns-jalali/i, - replacer: 'date-fns-jalali-v3', + replacer: 'date-fns-jalali-v4', // This option is provided by the `patches/babel-plugin-replace-imports@1.0.2.patch` patch filenameIncludes: 'src/AdapterDateFnsJalaliV3/', }, diff --git a/docs/data/date-pickers/calendar-systems/calendar-systems.md b/docs/data/date-pickers/calendar-systems/calendar-systems.md index 86de2cea4c4c0..b2955aa95722b 100644 --- a/docs/data/date-pickers/calendar-systems/calendar-systems.md +++ b/docs/data/date-pickers/calendar-systems/calendar-systems.md @@ -20,16 +20,16 @@ The following demo shows how to use the `date-fns-jalali` adapter: {{"demo": "AdapterJalali.js"}} :::info -Both `date-fns-jalali` major versions (v2.x and v3.x) are supported. +We support `date-fns-jalali` package v2.x, v3.x, and v4.x major versions. -A single adapter cannot work for both `date-fns-jalali` v2.x and v3.x, because the way functions are exported has been changed in v3.x. +A single adapter cannot work for all `date-fns-jalali` versions, because the way functions are exported has been changed in v3.x. -To use `date-fns-jalali` v3.x, you will have to import the adapter from `@mui/x-date-pickers/AdapterDateFnsJalaliV3` instead of `@mui/x-date-pickers/AdapterDateFnsJalali`. +To use `date-fns-jalali` v3.x or v4.x, you will have to import the adapter from `@mui/x-date-pickers/AdapterDateFnsJalaliV3` instead of `@mui/x-date-pickers/AdapterDateFnsJalali`. ```tsx // with date-fns-jalali v2.x import { AdapterDateFnsJalali } from '@mui/x-date-pickers/AdapterDateFnsJalali'; -// with date-fns-jalali v3.x +// with date-fns-jalali v3.x or v4.x import { AdapterDateFnsJalali } from '@mui/x-date-pickers/AdapterDateFnsJalaliV3'; ``` diff --git a/package.json b/package.json index 502dcc08dce7f..3cd18dbd5c2d0 100644 --- a/package.json +++ b/package.json @@ -134,7 +134,7 @@ "cpy-cli": "^5.0.0", "cross-env": "^7.0.3", "danger": "^12.3.3", - "date-fns-jalali-v3": "npm:date-fns-jalali@3.6.0-1", + "date-fns-jalali-v4": "npm:date-fns-jalali@4.1.0-0", "date-fns-v4": "npm:date-fns@4.1.0", "eslint": "^8.57.1", "eslint-config-airbnb": "^19.0.4", diff --git a/packages/x-date-pickers-pro/package.json b/packages/x-date-pickers-pro/package.json index 3db28d6c260ca..1fa962347f39d 100644 --- a/packages/x-date-pickers-pro/package.json +++ b/packages/x-date-pickers-pro/package.json @@ -57,7 +57,7 @@ "@mui/material": "^5.15.14 || ^6.0.0", "@mui/system": "^5.15.14 || ^6.0.0", "date-fns": "^2.25.0 || ^3.2.0 || ^4.0.0", - "date-fns-jalali": "^2.13.0-0 || ^3.2.0-0", + "date-fns-jalali": "^2.13.0-0 || ^3.2.0-0 || ^4.0.0-0", "dayjs": "^1.10.7", "luxon": "^3.0.2", "moment": "^2.29.4", diff --git a/packages/x-date-pickers/package.json b/packages/x-date-pickers/package.json index 06f3bdaeddef3..aaa2008c4b39c 100644 --- a/packages/x-date-pickers/package.json +++ b/packages/x-date-pickers/package.json @@ -59,7 +59,7 @@ "@mui/material": "^5.15.14 || ^6.0.0", "@mui/system": "^5.15.14 || ^6.0.0", "date-fns": "^2.25.0 || ^3.2.0 || ^4.0.0", - "date-fns-jalali": "^2.13.0-0 || ^3.2.0-0", + "date-fns-jalali": "^2.13.0-0 || ^3.2.0-0 || ^4.0.0-0", "dayjs": "^1.10.7", "luxon": "^3.0.2", "moment": "^2.29.4", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 14c28d1abc349..c1a89befbcbbe 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -215,9 +215,9 @@ importers: danger: specifier: ^12.3.3 version: 12.3.3(encoding@0.1.13) - date-fns-jalali-v3: - specifier: npm:date-fns-jalali@3.6.0-1 - version: date-fns-jalali@3.6.0-1 + date-fns-jalali-v4: + specifier: npm:date-fns-jalali@4.1.0-0 + version: date-fns-jalali@4.1.0-0 date-fns-v4: specifier: npm:date-fns@4.1.0 version: date-fns@4.1.0 @@ -5576,8 +5576,8 @@ packages: resolution: {integrity: sha512-2wz5AOzd3oQ+PnL3E/iKvJZ14i6oTp15sW047ZFCOgM9OSP8ggbb9jm/4SKI8ejdUGH96Krb5dfEQe8zbkVyZw==} engines: {node: '>=0.11'} - date-fns-jalali@3.6.0-1: - resolution: {integrity: sha512-f4FlXArA3kE0uW27y/2AJjRevb6x7DaLMjJfxw7CEXC+XK/JXbZ/WVHND5l1zq2VZsssRrXRWWS0u9NGwawVsQ==} + date-fns-jalali@4.1.0-0: + resolution: {integrity: sha512-hTIP/z+t+qKwBDcmmsnmjWTduxCg+5KfdqWQvb2X/8C9+knYY6epN/pfxdDuyVlSVeFz0sM5eEfwIUQ70U4ckg==} date-fns@2.30.0: resolution: {integrity: sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==} @@ -14950,7 +14950,7 @@ snapshots: dependencies: '@babel/runtime': 7.26.0 - date-fns-jalali@3.6.0-1: {} + date-fns-jalali@4.1.0-0: {} date-fns@2.30.0: dependencies: