From 1be4e43d3186d5279a8bbe1cbed58d02106af283 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 21 Mar 2023 12:28:37 +0100
Subject: [PATCH] DX: update fullcalendar

---
 package.json                                   | 18 +++++++++---------
 .../Resources/public/types.ts                  |  2 +-
 .../Resources/public/vuejs/Calendar/App.vue    |  1 -
 .../public/vuejs/Calendar/store/utils.ts       |  2 +-
 .../public/vuejs/MyCalendarRange/App2.vue      |  6 ++----
 .../Components/EditLocation.vue                |  2 +-
 .../store/modules/calendarLocals.ts            |  2 +-
 .../store/modules/calendarRanges.ts            |  2 +-
 .../store/modules/calendarRemotes.ts           |  2 +-
 9 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/package.json b/package.json
index 17b02c63a..0bd3a81e5 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
-    "name": "chill",
-    "version": "2.0.0",
-    "devDependencies": {
+  "name": "chill",
+  "version": "2.0.0",
+  "devDependencies": {
     "@alexlafroscia/yaml-merge": "^4.0.0",
     "@apidevtools/swagger-cli": "^4.0.4",
     "@babel/core": "^7.20.5",
@@ -34,12 +34,12 @@
     "webpack-cli": "^5.0.1"
   },
   "dependencies": {
-    "@fullcalendar/core": "^5.11.0",
-    "@fullcalendar/daygrid": "^5.11.0",
-    "@fullcalendar/interaction": "^5.11.0",
-    "@fullcalendar/list": "^5.11.0",
-    "@fullcalendar/timegrid": "^5.11.0",
-    "@fullcalendar/vue3": "^5.11.1",
+    "@fullcalendar/core": "^6.1.4",
+    "@fullcalendar/daygrid": "^6.1.4",
+    "@fullcalendar/interaction": "^6.1.4",
+    "@fullcalendar/list": "^6.1.4",
+    "@fullcalendar/timegrid": "^6.1.4",
+    "@fullcalendar/vue3": "^6.1.4",
     "@popperjs/core": "^2.9.2",
     "dropzone": "^5.7.6",
     "es6-promise": "^4.2.8",
diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/types.ts b/src/Bundle/ChillCalendarBundle/Resources/public/types.ts
index ebc7ab7be..c18cfea13 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/public/types.ts
+++ b/src/Bundle/ChillCalendarBundle/Resources/public/types.ts
@@ -1,4 +1,4 @@
-import {EventInput} from '@fullcalendar/vue3';
+import {EventInput} from '@fullcalendar/core';
 import {DateTime, Location, User, UserAssociatedInterface} from '../../../ChillMainBundle/Resources/public/types' ;
 import {Person} from "../../../ChillPersonBundle/Resources/public/types";
 
diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/App.vue b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/App.vue
index 472bb525b..32b6b569b 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/App.vue
+++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/App.vue
@@ -116,7 +116,6 @@
 <script>
 import ConcernedGroups from 'ChillActivityAssets/vuejs/Activity/components/ConcernedGroups.vue';
 import Location from 'ChillActivityAssets/vuejs/Activity/components/Location.vue';
-import '@fullcalendar/core/vdom'; // solves problem with Vite
 import frLocale from '@fullcalendar/core/locales/fr';
 import FullCalendar from '@fullcalendar/vue3';
 import dayGridPlugin from '@fullcalendar/daygrid';
diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/store/utils.ts b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/store/utils.ts
index 61259a984..04ca26726 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/store/utils.ts
+++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/store/utils.ts
@@ -3,7 +3,7 @@ import {ISOToDatetime} from '../../../../../../ChillMainBundle/Resources/public/
 import {DateTime, User} from '../../../../../../ChillMainBundle/Resources/public/types';
 import {CalendarLight, CalendarRange, CalendarRemote} from '../../../types';
 import type {EventInputCalendarRange} from '../../../types';
-import {EventInput} from '@fullcalendar/vue3';
+import {EventInput} from '@fullcalendar/core';
 
 export interface UserData {
   user: User,
diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App2.vue b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App2.vue
index 5cbd17a76..fb17ba141 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App2.vue
+++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App2.vue
@@ -116,13 +116,11 @@
 import type {
   CalendarOptions,
   DatesSetArg,
-  EventInput,
-  EventInstance
-} from '@fullcalendar/vue3';
+  EventInput
+} from '@fullcalendar/core';
 import {reactive, computed, ref} from "vue";
 import {useStore} from "vuex";
 import {key} from './store';
-import '@fullcalendar/core/vdom'; // solves problem with Vite
 import FullCalendar from '@fullcalendar/vue3';
 import frLocale from '@fullcalendar/core/locales/fr';
 import interactionPlugin, {DropArg, EventResizeDoneArg} from "@fullcalendar/interaction";
diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/Components/EditLocation.vue b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/Components/EditLocation.vue
index 3b605dec7..279650ffd 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/Components/EditLocation.vue
+++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/Components/EditLocation.vue
@@ -26,7 +26,7 @@
 <script setup lang="ts">
 import Modal from "../../../../../../ChillMainBundle/Resources/public/vuejs/_components/Modal.vue";
 import {computed, ref} from "vue";
-import {EventApi} from "@fullcalendar/vue3";
+import {EventApi} from "@fullcalendar/core";
 import {useStore} from "vuex";
 import {key} from "../store";
 import {Location} from "../../../../../../ChillMainBundle/Resources/public/types";
diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store/modules/calendarLocals.ts b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store/modules/calendarLocals.ts
index 12df9663d..893c0413c 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store/modules/calendarLocals.ts
+++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store/modules/calendarLocals.ts
@@ -2,7 +2,7 @@ import {State} from './../index';
 import {ActionContext, Module} from 'vuex';
 import {CalendarLight} from '../../../../types';
 import {fetchCalendarLocalForUser} from '../../../Calendar/api';
-import {EventInput} from '@fullcalendar/vue3';
+import {EventInput} from '@fullcalendar/core';
 import {localsToFullCalendarEvent} from "../../../Calendar/store/utils";
 import {TransportExceptionInterface} from "../../../../../../../ChillMainBundle/Resources/public/lib/api/apiMethods";
 import {COLORS} from "../../../Calendar/const";
diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store/modules/calendarRanges.ts b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store/modules/calendarRanges.ts
index fd7e2d0c1..aaa530909 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store/modules/calendarRanges.ts
+++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store/modules/calendarRanges.ts
@@ -4,7 +4,7 @@ import {CalendarRange, CalendarRangeCreate, CalendarRangeEdit, isEventInputCalen
 import {Location} from "../../../../../../../ChillMainBundle/Resources/public/types";
 import {fetchCalendarRangeForUser} from '../../../Calendar/api';
 import {calendarRangeToFullCalendarEvent} from '../../../Calendar/store/utils';
-import {EventInput} from '@fullcalendar/vue3';
+import {EventInput} from '@fullcalendar/core';
 import {makeFetch} from "../../../../../../../ChillMainBundle/Resources/public/lib/api/apiMethods";
 import {
   datetimeToISO,
diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store/modules/calendarRemotes.ts b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store/modules/calendarRemotes.ts
index 260f79a42..a92e1f9b3 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store/modules/calendarRemotes.ts
+++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store/modules/calendarRemotes.ts
@@ -2,7 +2,7 @@ import {State} from './../index';
 import {ActionContext, Module} from 'vuex';
 import {CalendarRemote} from '../../../../types';
 import {fetchCalendarRemoteForUser} from '../../../Calendar/api';
-import {EventInput, EventSource} from '@fullcalendar/vue3';
+import {EventInput} from '@fullcalendar/core';
 import {remoteToFullCalendarEvent} from "../../../Calendar/store/utils";
 import {TransportExceptionInterface} from "../../../../../../../ChillMainBundle/Resources/public/lib/api/apiMethods";
 import {COLORS} from "../../../Calendar/const";