Issue #1054 - Replacing moment by dayjs #1067
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Zenoo
requested changes
Nov 27, 2024
There was a problem hiding this comment.
Having to extend dayjs every time we need to use it is not a good option.
Please follow the steps here to globally extend dayjs:
iamkun/dayjs#1577
This will have to be done both in the server and client packages
Zenoo
requested changes
Nov 27, 2024
Zenoo
requested changes
Nov 27, 2024
…dule to use in internal files
Zenoo
requested changes
Nov 28, 2024
| dayjs.extend(relativeTime); | ||
| dayjs.extend(utc); | ||
|
|
||
| export default dayjs; |
There was a problem hiding this comment.
We should avoid exporting it to prevent picking it as a reference when using it in other files
There was a problem hiding this comment.
Please revert your changes to this file, the diff contains a lot of file formatting, only keep changes regarding moment/dayjs
| @@ -16,13 +16,13 @@ const GlobalTournamentView = () => { | |||
| return ( | |||
| <Page title={`${bruteName || ''} ${t('MyBrute')}`} headerUrl={`/${bruteName || ''}/cell`}> | |||
| <Paper sx={{ mx: 4 }}> | |||
| <Text h3 bold upperCase typo="handwritten" sx={{ mr: 2 }}>{t('globalTournamentOf')} {moment.utc(date).format('DD/MM/YYYY')}</Text> | |||
| <Text h3 bold upperCase typo="handwritten" sx={{ mr: 2 }}>{t('globalTournamentOf')} {dayjs(date).format('DD/MM/YYYY')}</Text> | |||
There was a problem hiding this comment.
Suggested change
| <Text h3 bold upperCase typo="handwritten" sx={{ mr: 2 }}>{t('globalTournamentOf')} {dayjs(date).format('DD/MM/YYYY')}</Text> | |
| <Text h3 bold upperCase typo="handwritten" sx={{ mr: 2 }}>{t('globalTournamentOf')} {dayjs.utc(date).format('DD/MM/YYYY')}</Text> |
| @@ -32,7 +32,7 @@ const PatchNotesView = () => { | |||
| </Paper> | |||
| {displayedReleases.map((release) => ( | |||
| <Paper key={release.version} sx={{ bgcolor: 'background.paperLight', my: 3 }}> | |||
| <Text h4 bold upperCase>v{release.version} <Text component="span" italic upperCase>{moment(release.date).format('DD MMMM YYYY')}</Text></Text> | |||
| <Text h4 bold upperCase>v{release.version} <Text component="span" italic upperCase>{dayjs(release.date).format('DD MMMM YYYY')}</Text></Text> | |||
There was a problem hiding this comment.
The original was missing the utc usage
Suggested change
| <Text h4 bold upperCase>v{release.version} <Text component="span" italic upperCase>{dayjs(release.date).format('DD MMMM YYYY')}</Text></Text> | |
| <Text h4 bold upperCase>v{release.version} <Text component="span" italic upperCase>{dayjs.utc(release.date).format('DD MMMM YYYY')}</Text></Text> |
| @@ -177,7 +177,7 @@ const ClanThreadView = () => { | |||
| <Box component="img" src="/images/clan/master.gif" sx={{ ml: 1, width: 7 }} /> | |||
| )} | |||
| </Box> | |||
| <Text color="primary">{moment(post.date).format('D MMM YYYY HH:mm')}</Text> | |||
| <Text color="primary">{dayjs(post.date).format('D MMM YYYY HH:mm')}</Text> | |||
There was a problem hiding this comment.
Missing utc in the original code
Suggested change
| <Text color="primary">{dayjs(post.date).format('D MMM YYYY HH:mm')}</Text> | |
| <Text color="primary">{dayjs.utc(post.date).format('D MMM YYYY HH:mm')}</Text> |
| @@ -1,7 +1,7 @@ | |||
| import { | |||
| Event, EventStatus, FightModifier, PrismaClient, | |||
| } from '@labrute/prisma'; | |||
| import moment from 'moment'; | |||
| import dayjs from './dayjs.js'; | |||
There was a problem hiding this comment.
Suggested change
| import dayjs from './dayjs.js'; | |
| import dayjs from 'dayjs'; |
| import translate from './translate.js'; | ||
| import ServerState from './ServerState.js'; | ||
| import dayjs from './dayjs.js'; |
There was a problem hiding this comment.
Suggested change
| import dayjs from './dayjs.js'; | |
| import dayjs from 'dayjs'; |
| import ServerState from '../ServerState.js'; | ||
| import translate from '../translate.js'; | ||
| import checkLevelUpAchievements from './checkLevelUpAchievements.js'; | ||
| import getOpponents from './getOpponents.js'; | ||
| import { removeChoiceFromDestiny } from './removeChoiceFromDestiny.js'; | ||
| import dayjs from '../dayjs.js'; |
There was a problem hiding this comment.
Suggested change
| import dayjs from '../dayjs.js'; | |
| import dayjs from 'dayjs'; |
| dayjs.extend(utc); | ||
| dayjs.extend(isSameOrBefore); | ||
|
|
||
| export default dayjs; |
There was a problem hiding this comment.
Suggested change
| export default dayjs; |
There was a problem hiding this comment.
I don't see this file being imported anywhere, shouldn't it be imported in the core index file?
|
Are you still working on this @Abanoub321 ? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.