Skip to content

feat: upgrade fullcalendar by rutwikhdev [frappe] PR#26360

Bot Dokos requested to merge ft-pr-26360 into develop

From: https://github.com/frappe/frappe/pull/26360
Date: 2024-05-13 13:38:34+05:30

  • Merge pull request #26360 from rutwikhdev/upgrade-fullcalendar
  • chore: move fullcalendar libs to a separate bundle
  • test: update asset size values
  • fix: misc fixes for event datetime and styling
  • fix: css styling for calendar and overriden styles
  • fix: event datetime utils for calendar
  • chore: upgrade calendar component to latest
  • build(deps): add fullcalendar and related plugins



Diagnostics

pre-commit failed for source commit: 3d29f90dbd180ab8442c7d81a2a7aacefa149658
prettier.................................................................Failed
- hook id: prettier
- files were modified by this hook

frappe/public/js/frappe/views/calendar/calendar.js

eslint...................................................................Failed
- hook id: eslint
- exit code: 1

frappe/public/js/frappe/views/calendar/calendar.js
  11:8  error  Parsing error: Identifier 'dayGridPlugin' has already been declared

 1 problem (1 error, 0 warnings)


pre-commit failed for source commit: 7e145927bc0fe414c5030200eae3900f978fa1bc
eslint...................................................................Failed
- hook id: eslint
- exit code: 1

frappe/public/js/frappe/views/calendar/calendar.js
  11:8  error  Parsing error: Identifier 'dayGridPlugin' has already been declared

 1 problem (1 error, 0 warnings)


pre-commit failed for source commit: 20355fe31bb1aa99de7be44d5b210b9af9fae7d8
prettier.................................................................Failed
- hook id: prettier
- files were modified by this hook

frappe/public/scss/desk/calendar.scss

eslint...................................................................Failed
- hook id: eslint
- exit code: 1

frappe/public/js/frappe/views/calendar/calendar.js
  11:8  error  Parsing error: Identifier 'dayGridPlugin' has already been declared

 1 problem (1 error, 0 warnings)


pre-commit failed for source commit: e520a39da8e0497d1fcdfca4bbbf54dbb85a990b
eslint...................................................................Failed
- hook id: eslint
- exit code: 1

frappe/public/js/frappe/views/calendar/calendar.js
  11:8  error  Parsing error: Identifier 'dayGridPlugin' has already been declared

 1 problem (1 error, 0 warnings)


pre-commit failed for source commit: def9630e1c8cf1e8deb38f64a5efd6fedf899958
eslint...................................................................Failed
- hook id: eslint
- exit code: 1

frappe/public/js/frappe/views/calendar/calendar.js
  407:9  error  Parsing error: Identifier 'event' has already been declared

 1 problem (1 error, 0 warnings)


pre-commit failed for source commit: 49fb60a0dd7afd80442ad73b28a8ae906fb238c4
prettier.................................................................Failed
- hook id: prettier
- files were modified by this hook

frappe/public/scss/desk/calendar.scss


Suspicious merge commit detected: 49fb60a0dd7afd80442ad73b28a8ae906fb238c4


Suspicious changes found (dokos|telemetry|shipping_rule|capture_doc|sentry|marketplace_apps|subscription_conf):
  745f68bb3efdc011e5371ac35dffeef0a58c110a build(deps): add fullcalendar and related plugins



Checkout instructions
# Checkout locally
git fetch upstream
git switch ft-pr-26360

# Alternatively, re-take the changes
git switch develop
ft take ft-pr-26360

# Make changes then rebase
git rebase -i develop

# Fix or ignore conflicts
git checkout --theirs .
git rebase --continue

# Force-push changes
git push --force-with-lease

Merge request reports