Merge pull request #54175 from nextcloud/backport/54171/stable31

[stable31] chore: remove `nextcloud-vue-collections` and use `@nextcloud/vue` instead

apps/files_sharing/src/views/CollaborationView.vue

@@ -1,36 +0,0 @@
-<!--
-  - SPDX-FileCopyrightText: 2019 Nextcloud GmbH and Nextcloud contributors
-  - SPDX-License-Identifier: AGPL-3.0-or-later
--->
-
-<template>
-	<CollectionList v-if="fileId"
-		:id="fileId"
-		type="file"
-		:name="filename" />
-</template>
-
-<script>
-import { CollectionList } from 'nextcloud-vue-collections'
-
-export default {
-	name: 'CollaborationView',
-	components: {
-		CollectionList,
-	},
-	computed: {
-		fileId() {
-			if (this.$root.model && this.$root.model.id) {
-				return '' + this.$root.model.id
-			}
-			return null
-		},
-		filename() {
-			if (this.$root.model && this.$root.model.name) {
-				return '' + this.$root.model.name
-			}
-			return ''
-		},
-	},
-}
-</script>

apps/files_sharing/src/views/SharingTab.vue

@@ -138,7 +138,7 @@
 				<div v-if="projectsEnabled"
 					v-show="!showSharingDetailsView && fileInfo"
 					class="sharingTab__additionalContent">
-					<CollectionList :id="`${fileInfo.id}`"
+					<NcCollectionList :id="`${fileInfo.id}`"
 						type="file"
 						:name="fileInfo.name" />
 				</div>
@@ -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,

dist/3467-3467.js.map.license

@@ -1 +0,0 @@
-3467-3467.js.license

dist/5110-5110.js.license

@@ -23,7 +23,6 @@ SPDX-FileCopyrightText: Paul Vorbach <paul@vorba.ch> (http://paul.vorba.ch)
 SPDX-FileCopyrightText: Paul Vorbach <paul@vorb.de> (http://vorb.de)
 SPDX-FileCopyrightText: Nextcloud GmbH and Nextcloud contributors
 SPDX-FileCopyrightText: Matt Zabriskie
-SPDX-FileCopyrightText: Julius Härtl <jus@bitgrid.net>
 SPDX-FileCopyrightText: Joyent
 SPDX-FileCopyrightText: Jonas Schade <derzade@gmail.com>
 SPDX-FileCopyrightText: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
@@ -169,9 +168,6 @@ This file is generated from multiple sources. Included packages:
 - moment
 	- version: 2.30.1
 	- license: MIT
-- nextcloud-vue-collections
-	- version: 0.13.0
-	- license: AGPL-3.0-or-later
 - buffer
 	- version: 6.0.3
 	- license: MIT

dist/5110-5110.js.map.license

@@ -0,0 +1 @@
+5110-5110.js.license

dist/5291-5291.js.map.license

@@ -1 +0,0 @@
-5291-5291.js.license

dist/6509-6509.js.map.license

@@ -0,0 +1 @@
+6509-6509.js.license

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",

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",