From d3d0e283dcb59484d70886c607395c75e3caa1d4 Mon Sep 17 00:00:00 2001 From: Ferdinand Thiessen Date: Thu, 31 Jul 2025 13:52:32 +0200 Subject: [PATCH] chore: remove `nextcloud-vue-collections` and use `@nextcloud/vue` instead `nextcloud-vue-collections` is deprecated for quite some time and was merged into `@nextcloud/vue`. So lets drop that dependency. Adjust the two files where it was used, one of them was itself never used so just dropped that file. Signed-off-by: Ferdinand Thiessen --- .../src/views/CollaborationView.vue | 36 ------------------- apps/files_sharing/src/views/SharingTab.vue | 17 ++++----- package-lock.json | 29 +-------------- package.json | 3 +- 4 files changed, 9 insertions(+), 76 deletions(-) delete mode 100644 apps/files_sharing/src/views/CollaborationView.vue diff --git a/apps/files_sharing/src/views/CollaborationView.vue b/apps/files_sharing/src/views/CollaborationView.vue deleted file mode 100644 index b75ad53e1b8..00000000000 --- a/apps/files_sharing/src/views/CollaborationView.vue +++ /dev/null @@ -1,36 +0,0 @@ - - - - - diff --git a/apps/files_sharing/src/views/SharingTab.vue b/apps/files_sharing/src/views/SharingTab.vue index 7ceec34ab2f..f7be524ec6d 100644 --- a/apps/files_sharing/src/views/SharingTab.vue +++ b/apps/files_sharing/src/views/SharingTab.vue @@ -138,7 +138,7 @@
-
@@ -161,19 +161,16 @@ import { getCapabilities } from '@nextcloud/capabilities' import { orderBy } from '@nextcloud/files' import { loadState } from '@nextcloud/initial-state' import { generateOcsUrl } from '@nextcloud/router' -import { CollectionList } from 'nextcloud-vue-collections' import { ShareType } from '@nextcloud/sharing' - -import InfoIcon from 'vue-material-design-icons/Information.vue' -import NcPopover from '@nextcloud/vue/dist/Components/NcPopover.js' - import axios from '@nextcloud/axios' import moment from '@nextcloud/moment' -import NcAvatar from '@nextcloud/vue/dist/Components/NcAvatar.js' -import NcButton from '@nextcloud/vue/dist/Components/NcButton.js' +import NcAvatar from '@nextcloud/vue/components/NcAvatar' +import NcButton from '@nextcloud/vue/components/NcButton' +import NcCollectionList from '@nextcloud/vue/components/NcCollectionList' +import NcPopover from '@nextcloud/vue/components/NcPopover' +import InfoIcon from 'vue-material-design-icons/InformationOutline.vue' import { shareWithTitle } from '../utils/SharedWithMe.js' - import Config from '../services/ConfigService.ts' import Share from '../models/Share.ts' import SharingEntryInternal from '../components/SharingEntryInternal.vue' @@ -192,10 +189,10 @@ export default { name: 'SharingTab', components: { - CollectionList, InfoIcon, NcAvatar, NcButton, + NcCollectionList, NcPopover, SharingEntryInternal, SharingEntrySimple, diff --git a/package-lock.json b/package-lock.json index aec908cf955..beb6b14802d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -34,7 +34,7 @@ "@simplewebauthn/browser": "^12.0.0", "@vue/web-component-wrapper": "^1.3.0", "@vueuse/components": "^11.3.0", - "@vueuse/core": "^11.0.1", + "@vueuse/core": "^11.3.0", "@vueuse/integrations": "^11.3.0", "backbone": "^1.6.1", "blueimp-md5": "^2.19.0", @@ -60,7 +60,6 @@ "marked": "^15.0.12", "moment": "^2.30.1", "moment-timezone": "^0.6.0", - "nextcloud-vue-collections": "^0.13.0", "p-limit": "^6.2.0", "p-queue": "^7.4.1", "path": "^0.12.7", @@ -17326,12 +17325,6 @@ "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", "license": "MIT" }, - "node_modules/lodash-es": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz", - "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==", - "license": "MIT" - }, "node_modules/lodash.camelcase": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz", @@ -18898,26 +18891,6 @@ "node": ">= 0.4.0" } }, - "node_modules/nextcloud-vue-collections": { - "version": "0.13.0", - "resolved": "https://registry.npmjs.org/nextcloud-vue-collections/-/nextcloud-vue-collections-0.13.0.tgz", - "integrity": "sha512-J5n2Kf9h/HVKFM0YdcHnNcbbqSossq7ocQwC9fHFs87/5iKgkUMPmVmla6uTKZHUKYCNnKSJtG7pDOWD4AP47A==", - "deprecated": "This package is now deprecated, the components have been merged into @nextcloud/vue as of version 8.14.0.", - "dependencies": { - "@nextcloud/axios": "^2.5.0", - "@nextcloud/l10n": "^3.1.0", - "@nextcloud/router": "^3.0.1", - "@nextcloud/vue": "^8.12.0", - "lodash-es": "^4.17.21" - }, - "engines": { - "node": "^20.0.0", - "npm": "^10.0.0" - }, - "peerDependencies": { - "vue": "^2.7.16" - } - }, "node_modules/nise": { "version": "1.5.3", "resolved": "https://registry.npmjs.org/nise/-/nise-1.5.3.tgz", diff --git a/package.json b/package.json index f4b2d05a34f..c8f99486c8a 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "@simplewebauthn/browser": "^12.0.0", "@vue/web-component-wrapper": "^1.3.0", "@vueuse/components": "^11.3.0", - "@vueuse/core": "^11.0.1", + "@vueuse/core": "^11.3.0", "@vueuse/integrations": "^11.3.0", "backbone": "^1.6.1", "blueimp-md5": "^2.19.0", @@ -91,7 +91,6 @@ "marked": "^15.0.12", "moment": "^2.30.1", "moment-timezone": "^0.6.0", - "nextcloud-vue-collections": "^0.13.0", "p-limit": "^6.2.0", "p-queue": "^7.4.1", "path": "^0.12.7",