nextcloud
/
calendar
mirror of https://github.com/nextcloud/calendar
0
0
Fork 0
Code Issues Releases Wiki Activity

Use bundled version of calendar-js 

Signed-off-by: Richard Steinmetz <richard@steinmetz.cloud>
This commit is contained in:
Richard Steinmetz 2021-08-13 15:49:29 +02:00 committed by Raimund Schlüßler
parent 46e63fe363
commit e057fe1c17
No known key found for this signature in database
GPG Key ID: 036FA7EB1A599178
17 changed files with 48 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
package-lock.json generated
View File

@ -5,6 +5,7 @@
"requires": true,
"packages": {
"": {
"name": "calendar",
"version": "2.3.3",
"license": "agpl",
"dependencies": {
@ -17,7 +18,7 @@
"@fullcalendar/vue": "5.9.0",
"@nextcloud/auth": "^1.3.0",
"@nextcloud/axios": "^1.6.0",
"@nextcloud/calendar-js": "^1.1.1",
"@nextcloud/calendar-js": "^2.0.0",
"@nextcloud/dialogs": "^3.1.2",
"@nextcloud/event-bus": "^2.0.0",
"@nextcloud/initial-state": "^1.2.0",
@ -2677,9 +2678,9 @@
"dev": true
},
"node_modules/@nextcloud/calendar-js": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/@nextcloud/calendar-js/-/calendar-js-1.1.1.tgz",
"integrity": "sha512-Uk0vuLBGkPgqLNLn+ut43MlSNu1FFMT5ke+A/yQXfdhNpriFEVOlQdj9OrJzr9KGZF7snWJvTqJIjOGvfoV6zg==",
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/@nextcloud/calendar-js/-/calendar-js-2.0.0.tgz",
"integrity": "sha512-wGDDWjnXaMTJVxK2B31S0BAstN5759fptuddWRVZcFU2gEFXZyiv0iFgcbCOdAni+/Mz9rBbdV8h+TYWbst6Qg==",
"dependencies": {
"ical.js": "^1.4.0",
"uuid": "^8.3.2"
@ -3036,6 +3037,19 @@
"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
},
"node_modules/@nextcloud/vue/node_modules/@nextcloud/calendar-js": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/@nextcloud/calendar-js/-/calendar-js-1.1.1.tgz",
"integrity": "sha512-Uk0vuLBGkPgqLNLn+ut43MlSNu1FFMT5ke+A/yQXfdhNpriFEVOlQdj9OrJzr9KGZF7snWJvTqJIjOGvfoV6zg==",
"dependencies": {
"ical.js": "^1.4.0",
"uuid": "^8.3.2"
},
"engines": {
"node": ">=14.0.0",
"npm": ">=7.0.0"
}
},
"node_modules/@nextcloud/vue/node_modules/ansi-regex": {
"version": "6.0.0",
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.0.tgz",
@ -21876,9 +21890,9 @@
"dev": true
},
"@nextcloud/calendar-js": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/@nextcloud/calendar-js/-/calendar-js-1.1.1.tgz",
"integrity": "sha512-Uk0vuLBGkPgqLNLn+ut43MlSNu1FFMT5ke+A/yQXfdhNpriFEVOlQdj9OrJzr9KGZF7snWJvTqJIjOGvfoV6zg==",
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/@nextcloud/calendar-js/-/calendar-js-2.0.0.tgz",
"integrity": "sha512-wGDDWjnXaMTJVxK2B31S0BAstN5759fptuddWRVZcFU2gEFXZyiv0iFgcbCOdAni+/Mz9rBbdV8h+TYWbst6Qg==",
"requires": {
"ical.js": "^1.4.0",
"uuid": "^8.3.2"
@ -22096,6 +22110,15 @@
"vue2-datepicker": "^3.6.3"
},
"dependencies": {
"@nextcloud/calendar-js": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/@nextcloud/calendar-js/-/calendar-js-1.1.1.tgz",
"integrity": "sha512-Uk0vuLBGkPgqLNLn+ut43MlSNu1FFMT5ke+A/yQXfdhNpriFEVOlQdj9OrJzr9KGZF7snWJvTqJIjOGvfoV6zg==",
"requires": {
"ical.js": "^1.4.0",
"uuid": "^8.3.2"
}
},
"ansi-regex": {
"version": "6.0.0",
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.0.tgz",

7
package.json
View File

@ -44,7 +44,7 @@
"@fullcalendar/vue": "5.9.0",
"@nextcloud/auth": "^1.3.0",
"@nextcloud/axios": "^1.6.0",
"@nextcloud/calendar-js": "^1.1.1",
"@nextcloud/calendar-js": "^2.0.0",
"@nextcloud/dialogs": "^3.1.2",
"@nextcloud/event-bus": "^2.0.0",
"@nextcloud/initial-state": "^1.2.0",
@ -109,7 +109,8 @@
"vue"
],
"moduleNameMapper": {
"^@/(.*)$": "<rootDir>/src/$1"
"^@/(.*)$": "<rootDir>/src/$1",
"^ical.js": "<rootDir>/node_modules/ical.js"
},
"transform": {
".*\\.js$": "<rootDir>/node_modules/babel-jest",
@ -132,7 +133,7 @@
"clover"
],
"transformIgnorePatterns": [
"/node_modules/(?!(@nextcloud/calendar-js)|(@fullcalendar)).+\\.js$"
"/node_modules/(?!(@fullcalendar)).+\\.js$"
],
"setupFilesAfterEnv": [
"./tests/javascript/jest.setup.js",

2
src/components/Shared/TimezoneSelect.vue
View File

@ -14,7 +14,7 @@
</template>
<script>
import { getReadableTimezoneName, getSortedTimezoneList } from '@nextcloud/calendar-js/src/timezones/utils'
import { getReadableTimezoneName, getSortedTimezoneList } from '@nextcloud/calendar-js'
import Multiselect from '@nextcloud/vue/dist/Components/Multiselect'
import { translate as t } from '@nextcloud/l10n'

2
src/fullcalendar/duration.js
View File

@ -16,7 +16,7 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
import DurationValue from '@nextcloud/calendar-js/src/values/durationValue'
import { DurationValue } from '@nextcloud/calendar-js'
/**
* Gets a calendar-js DurationValue from a FullCalendar Duration object

4
src/fullcalendar/eventSources/freeBusyBlockedForAllEventSource.js
View File

@ -19,11 +19,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
import getTimezoneManager from '../../services/timezoneDataProviderService.js'
import { createFreeBusyRequest, getParserManager } from '@nextcloud/calendar-js'
import DateTimeValue from '@nextcloud/calendar-js/src/values/dateTimeValue.js'
import { createFreeBusyRequest, getParserManager, AttendeeProperty, DateTimeValue } from '@nextcloud/calendar-js'
import { findSchedulingOutbox } from '../../services/caldavService.js'
import logger from '../../utils/logger.js'
import AttendeeProperty from '@nextcloud/calendar-js/src/properties/attendeeProperty.js'
/**
* Returns an event source for free-busy

4
src/fullcalendar/eventSources/freeBusyResourceEventSource.js
View File

@ -17,12 +17,10 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
import getTimezoneManager from '../../services/timezoneDataProviderService.js'
import { createFreeBusyRequest } from '@nextcloud/calendar-js'
import DateTimeValue from '@nextcloud/calendar-js/src/values/dateTimeValue.js'
import { createFreeBusyRequest, AttendeeProperty, DateTimeValue } from '@nextcloud/calendar-js'
import { findSchedulingOutbox } from '../../services/caldavService.js'
import freeBusyResourceEventSourceFunction from './freeBusyResourceEventSourceFunction.js'
import logger from '../../utils/logger.js'
import AttendeeProperty from '@nextcloud/calendar-js/src/properties/attendeeProperty.js'
/**
* Returns an event source for free-busy

2
src/models/event.js
View File

@ -18,7 +18,7 @@
*/
import { getDateFromDateTimeValue } from '../utils/date.js'
import DurationValue from '@nextcloud/calendar-js/src/values/durationValue.js'
import { DurationValue } from '@nextcloud/calendar-js'
import { getHexForColorName } from '../utils/color.js'
import { mapAlarmComponentToAlarmObject } from './alarm.js'
import { mapAttendeePropertyToAttendeeObject } from './attendee.js'

6
src/store/calendarObjectInstance.js
View File

@ -21,11 +21,7 @@ import getTimezoneManager from '../services/timezoneDataProviderService'
import {
getDateFromDateTimeValue,
} from '../utils/date.js'
import DurationValue from '@nextcloud/calendar-js/src/values/durationValue.js'
import AttendeeProperty from '@nextcloud/calendar-js/src/properties/attendeeProperty.js'
import DateTimeValue from '@nextcloud/calendar-js/src/values/dateTimeValue.js'
import RecurValue from '@nextcloud/calendar-js/src/values/recurValue.js'
import Property from '@nextcloud/calendar-js/src/properties/property.js'
import { AttendeeProperty, Property, DateTimeValue, DurationValue, RecurValue } from '@nextcloud/calendar-js'
import { getBySetPositionAndBySetFromDate, getWeekDayFromDate } from '../utils/recurrence.js'
import {
getDefaultEventObject,

2
src/store/calendarObjects.js
View File

@ -21,11 +21,11 @@
import Vue from 'vue'
import { mapCalendarJsToCalendarObject } from '../models/calendarObject'
import logger from '../utils/logger.js'
import DateTimeValue from '@nextcloud/calendar-js/src/values/dateTimeValue'
import {
createEvent,
getParserManager,
getTimezoneManager,
DateTimeValue,
} from '@nextcloud/calendar-js'
const state = {

3
src/store/calendars.js
View File

@ -35,8 +35,7 @@ import pLimit from 'p-limit'
import { uidToHexColor } from '../utils/color.js'
import { translate as t } from '@nextcloud/l10n'
import getTimezoneManager from '../services/timezoneDataProviderService.js'
import Timezone from '@nextcloud/calendar-js/src/timezones/timezone.js'
import CalendarComponent from '@nextcloud/calendar-js/src/components/calendarComponent.js'
import { CalendarComponent, Timezone } from '@nextcloud/calendar-js'
import {
CALDAV_BIRTHDAY_CALENDAR,
IMPORT_STAGE_IMPORTING,

2
src/utils/calendarObject.js
View File

@ -16,7 +16,7 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
import DateTimeValue from '@nextcloud/calendar-js/src/values/dateTimeValue.js'
import { DateTimeValue } from '@nextcloud/calendar-js'
/**
* Get all recurrence-items in given range

5
tests/assets/loadAsset.js
View File

@ -20,10 +20,7 @@
*
*/
import ICAL from 'ical.js'
import AlarmComponent from '@nextcloud/calendar-js/src/components/nested/alarmComponent.js'
import AttendeeProperty from "@nextcloud/calendar-js/src/properties/attendeeProperty.js";
import RecurValue from "@nextcloud/calendar-js/src/values/recurValue.js";
import {getParserManager} from "@nextcloud/calendar-js";
import { AlarmComponent, AttendeeProperty, RecurValue, getParserManager } from '@nextcloud/calendar-js'
const fs = require('fs')

4
tests/javascript/unit/models/calendarObject.test.js
View File

@ -24,9 +24,7 @@ import {
mapCalendarJsToCalendarObject,
mapCDavObjectToCalendarObject
} from "../../../../src/models/calendarObject.js";
import CalendarComponent from '@nextcloud/calendar-js/src/components/calendarComponent.js'
import FreeBusyComponent from '@nextcloud/calendar-js/src/components/root/freeBusyComponent.js'
import {getParserManager} from "@nextcloud/calendar-js";
import {CalendarComponent, FreeBusyComponent, getParserManager} from "@nextcloud/calendar-js";
describe('Test suite: Calendar object model (models/calendarObject.js)', () => {

2
tests/javascript/unit/models/event.test.js
View File

@ -26,7 +26,7 @@ import { getHexForColorName } from '../../../../src/utils/color.js'
import { mapAlarmComponentToAlarmObject } from '../../../../src/models/alarm.js'
import { mapAttendeePropertyToAttendeeObject } from '../../../../src/models/attendee.js'
import { getDefaultRecurrenceRuleObject, mapRecurrenceRuleValueToRecurrenceRuleObject } from '../../../../src/models/recurrenceRule.js'
import DateTimeValue from "@nextcloud/calendar-js/src/values/dateTimeValue.js";
import { DateTimeValue } from "@nextcloud/calendar-js";
jest.mock('../../../../src/utils/date.js')
jest.mock('../../../../src/utils/color.js')

2
tests/javascript/unit/models/recurrenceRule.test.js
View File

@ -25,7 +25,7 @@ import {
mapRecurrenceRuleValueToRecurrenceRuleObject
} from "../../../../src/models/recurrenceRule.js";
import { getDateFromDateTimeValue } from '../../../../src/utils/date.js'
import DateTimeValue from "@nextcloud/calendar-js/src/values/dateTimeValue.js";
import { DateTimeValue } from "@nextcloud/calendar-js";
jest.mock('../../../../src/utils/date.js')

3
tests/javascript/unit/models/schedulingObject.test.js
View File

@ -25,8 +25,7 @@ import {
mapCalendarJsToSchedulingObject,
mapCDavObjectToSchedulingObject
} from "../../../../src/models/schedulingObject.js";
import CalendarComponent from "@nextcloud/calendar-js/src/components/calendarComponent.js";
import {getParserManager} from "@nextcloud/calendar-js";
import {CalendarComponent, getParserManager} from "@nextcloud/calendar-js";
describe('Test suite: Scheduling Object model (models/schedulingObject.js)', () => {

1
webpack.js
View File

@ -20,7 +20,6 @@ webpackRules.RULE_JS.exclude = BabelLoaderExcludeNodeModulesExcept([
'p-queue',
'p-try',
'cdav-library',
'calendar-js',
])
// Edit SCSS rule