diff options
| author | Raimund Schlüßler <raimund.schluessler@mailbox.org> | 2021-08-28 23:01:39 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-28 23:01:39 +0300 |
| commit | e5eed6e983eba0fbb64d997d9892e7729c9ba50b (patch) | |
| tree | 0cbd1d5d7986613cd9b39b6e967805482e62bdb6 | |
| parent | c0447761cc423c6dd4625dce163ab3030e36c040 (diff) | |
| parent | 8d3d1d4db45f6bb173848e9cd09be44d3ea85edf (diff) | |
Merge pull request #1759 from nextcloud/fix/noid/calendar-js
Use @nextcloud/calendar-js
| -rw-r--r-- | package-lock.json | 26 | ||||
| -rw-r--r-- | package.json | 4 | ||||
| -rw-r--r-- | src/models/calendarObject.js | 2 |
3 files changed, 4 insertions, 28 deletions
diff --git a/package-lock.json b/package-lock.json index c253645b..bb508861 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,6 +10,7 @@ "dependencies": { "@nextcloud/auth": "^1.3.0", "@nextcloud/axios": "^1.6.0", + "@nextcloud/calendar-js": "^1.1.1", "@nextcloud/dialogs": "^3.1.2", "@nextcloud/event-bus": "^2.0.0", "@nextcloud/initial-state": "1.2.0", @@ -20,7 +21,6 @@ "@nextcloud/vue": "^4.1.0", "@nextcloud/vue-dashboard": "^2.0.1", "@vue/test-utils": "^1.2.1", - "calendar-js": "github:nextcloud/calendar-js", "cdav-library": "github:nextcloud/cdav-library", "color-convert": "^2.0.1", "debounce": "^1.2.1", @@ -4945,21 +4945,6 @@ "node": ">=0.10.0" } }, - "node_modules/calendar-js": { - "name": "@nextcloud/calendar-js", - "version": "1.1.1", - "resolved": "git+ssh://git@github.com/nextcloud/calendar-js.git#48964824347baa173ff402318fe82d73c8520c95", - "integrity": "sha512-Uk0vuLBGkPgqLNLn+ut43MlSNu1FFMT5ke+A/yQXfdhNpriFEVOlQdj9OrJzr9KGZF7snWJvTqJIjOGvfoV6zg==", - "license": "AGPLv3+", - "dependencies": { - "ical.js": "^1.4.0", - "uuid": "^8.3.2" - }, - "engines": { - "node": ">=14.0.0", - "npm": ">=7.0.0" - } - }, "node_modules/call-bind": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", @@ -23306,15 +23291,6 @@ "unset-value": "^1.0.0" } }, - "calendar-js": { - "version": "git+ssh://git@github.com/nextcloud/calendar-js.git#48964824347baa173ff402318fe82d73c8520c95", - "integrity": "sha512-Uk0vuLBGkPgqLNLn+ut43MlSNu1FFMT5ke+A/yQXfdhNpriFEVOlQdj9OrJzr9KGZF7snWJvTqJIjOGvfoV6zg==", - "from": "calendar-js@github:nextcloud/calendar-js#48964824347baa173ff402318fe82d73c8520c95", - "requires": { - "ical.js": "^1.4.0", - "uuid": "^8.3.2" - } - }, "call-bind": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", diff --git a/package.json b/package.json index 35ced589..4cee2da4 100644 --- a/package.json +++ b/package.json @@ -28,6 +28,7 @@ "dependencies": { "@nextcloud/auth": "^1.3.0", "@nextcloud/axios": "^1.6.0", + "@nextcloud/calendar-js": "^1.1.1", "@nextcloud/dialogs": "^3.1.2", "@nextcloud/event-bus": "^2.0.0", "@nextcloud/initial-state": "1.2.0", @@ -38,7 +39,6 @@ "@nextcloud/vue": "^4.1.0", "@nextcloud/vue-dashboard": "^2.0.1", "@vue/test-utils": "^1.2.1", - "calendar-js": "github:nextcloud/calendar-js", "cdav-library": "github:nextcloud/cdav-library", "color-convert": "^2.0.1", "debounce": "^1.2.1", @@ -106,7 +106,7 @@ ".*\\.(vue)$": "<rootDir>/node_modules/vue-jest" }, "transformIgnorePatterns": [ - "/node_modules/(?!(calendar-js)|(@nextcloud/calendar-js)|(vue-material-design-icons))" + "/node_modules/(?!(@nextcloud/calendar-js)|(vue-material-design-icons))" ], "snapshotSerializers": [ "<rootDir>/node_modules/jest-serializer-vue" diff --git a/src/models/calendarObject.js b/src/models/calendarObject.js index 0aecab23..536b571d 100644 --- a/src/models/calendarObject.js +++ b/src/models/calendarObject.js @@ -21,7 +21,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -import { getParserManager } from 'calendar-js' +import { getParserManager } from '@nextcloud/calendar-js' import { COMPONENT_NAME_EVENT, COMPONENT_NAME_JOURNAL, |