From df0db786be9b58b22369c3e2fc8316c10f8ac7aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Wed, 26 Apr 2023 16:41:05 +0200
Subject: [PATCH] chore: Bump @nextcloud/vue @nextcloud/webpack-vue-config and
 remove @nextcloud/vue-richtext
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 package-lock.json                             | 46 ++++---------------
 package.json                                  |  5 +-
 src/components/ActivityEntry.vue              |  7 ++-
 src/components/card/CommentItem.vue           |  9 ++--
 src/components/search/GlobalSearchResults.vue |  7 ++-
 src/init-reference.js                         |  2 +-
 src/views/CardReferenceWidget.vue             |  6 +--
 src/views/CommentReferenceWidget.vue          |  8 ++--
 8 files changed, 28 insertions(+), 62 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8c614c16c..d81c83dac 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21,8 +21,7 @@
         "@nextcloud/moment": "^1.2.1",
         "@nextcloud/notify_push": "^1.1.3",
         "@nextcloud/router": "^2.1.1",
-        "@nextcloud/vue": "^7.8.4",
-        "@nextcloud/vue-richtext": "^2.0.4",
+        "@nextcloud/vue": "^7.10.0",
         "blueimp-md5": "^2.19.0",
         "dompurify": "^3.0.2",
         "lodash": "^4.17.21",
@@ -50,7 +49,7 @@
         "@nextcloud/cypress": "^1.0.0-beta.2",
         "@nextcloud/eslint-config": "^8.2.1",
         "@nextcloud/stylelint-config": "^2.3.0",
-        "@nextcloud/webpack-vue-config": "^5.5.0",
+        "@nextcloud/webpack-vue-config": "^5.5.1",
         "@relative-ci/agent": "^4.1.4",
         "@vue/test-utils": "^1.3.5",
         "@vue/vue2-jest": "^29.2.3",
@@ -3481,24 +3480,6 @@
         "npm": "^7.0.0 || ^8.0.0"
       }
     },
-    "node_modules/@nextcloud/vue-richtext": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@nextcloud/vue-richtext/-/vue-richtext-2.0.4.tgz",
-      "integrity": "sha512-+873AF/G8OPVz2lwajpGVRfJ1v492CeiBTrguOkOwSGReNukGyHryCucF6rZGiMFenVIpp8BjNkqjHwkh6Cs4A==",
-      "dependencies": {
-        "@nextcloud/axios": "^2.0.0",
-        "@nextcloud/router": "^2.0.0",
-        "clone": "^2.1.2",
-        "vue": "^2.7.8"
-      },
-      "engines": {
-        "node": ">=14.0.0",
-        "npm": ">=7.0.0"
-      },
-      "peerDependencies": {
-        "vue": "^2.7.8"
-      }
-    },
     "node_modules/@nextcloud/vue-select": {
       "version": "3.22.2",
       "resolved": "https://registry.npmjs.org/@nextcloud/vue-select/-/vue-select-3.22.2.tgz",
@@ -3639,9 +3620,9 @@
       }
     },
     "node_modules/@nextcloud/webpack-vue-config": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/@nextcloud/webpack-vue-config/-/webpack-vue-config-5.5.0.tgz",
-      "integrity": "sha512-bKlGYEqblSiSHNmpaGM9fz/f9v6JNwHp63V63yaI26gE0Zs+DpZSzJWC6HWWbJ1BgmoKT7wLN1GJc4W/NxvnxQ==",
+      "version": "5.5.1",
+      "resolved": "https://registry.npmjs.org/@nextcloud/webpack-vue-config/-/webpack-vue-config-5.5.1.tgz",
+      "integrity": "sha512-2Q3kPnsvkKeENG3rruTjAE1oz/9w0u5QMKO8oh9arL2TIO2aswkDKBtkmu6q7Po3tE+3B2f+ggHq1PNkhtwu6w==",
       "dev": true,
       "engines": {
         "node": "^16.0.0",
@@ -21633,17 +21614,6 @@
         }
       }
     },
-    "@nextcloud/vue-richtext": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@nextcloud/vue-richtext/-/vue-richtext-2.0.4.tgz",
-      "integrity": "sha512-+873AF/G8OPVz2lwajpGVRfJ1v492CeiBTrguOkOwSGReNukGyHryCucF6rZGiMFenVIpp8BjNkqjHwkh6Cs4A==",
-      "requires": {
-        "@nextcloud/axios": "^2.0.0",
-        "@nextcloud/router": "^2.0.0",
-        "clone": "^2.1.2",
-        "vue": "^2.7.8"
-      }
-    },
     "@nextcloud/vue-select": {
       "version": "3.22.2",
       "resolved": "https://registry.npmjs.org/@nextcloud/vue-select/-/vue-select-3.22.2.tgz",
@@ -21651,9 +21621,9 @@
       "requires": {}
     },
     "@nextcloud/webpack-vue-config": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/@nextcloud/webpack-vue-config/-/webpack-vue-config-5.5.0.tgz",
-      "integrity": "sha512-bKlGYEqblSiSHNmpaGM9fz/f9v6JNwHp63V63yaI26gE0Zs+DpZSzJWC6HWWbJ1BgmoKT7wLN1GJc4W/NxvnxQ==",
+      "version": "5.5.1",
+      "resolved": "https://registry.npmjs.org/@nextcloud/webpack-vue-config/-/webpack-vue-config-5.5.1.tgz",
+      "integrity": "sha512-2Q3kPnsvkKeENG3rruTjAE1oz/9w0u5QMKO8oh9arL2TIO2aswkDKBtkmu6q7Po3tE+3B2f+ggHq1PNkhtwu6w==",
       "dev": true,
       "requires": {}
     },
diff --git a/package.json b/package.json
index c81eccc4f..36ca5a278 100644
--- a/package.json
+++ b/package.json
@@ -41,8 +41,7 @@
     "@nextcloud/moment": "^1.2.1",
     "@nextcloud/notify_push": "^1.1.3",
     "@nextcloud/router": "^2.1.1",
-    "@nextcloud/vue": "^7.8.4",
-    "@nextcloud/vue-richtext": "^2.0.4",
+    "@nextcloud/vue": "^7.10.0",
     "blueimp-md5": "^2.19.0",
     "dompurify": "^3.0.2",
     "lodash": "^4.17.21",
@@ -77,7 +76,7 @@
     "@nextcloud/cypress": "^1.0.0-beta.2",
     "@nextcloud/eslint-config": "^8.2.1",
     "@nextcloud/stylelint-config": "^2.3.0",
-    "@nextcloud/webpack-vue-config": "^5.5.0",
+    "@nextcloud/webpack-vue-config": "^5.5.1",
     "@relative-ci/agent": "^4.1.4",
     "@vue/test-utils": "^1.3.5",
     "@vue/vue2-jest": "^29.2.3",
diff --git a/src/components/ActivityEntry.vue b/src/components/ActivityEntry.vue
index 0b65d2de4..211ffb208 100644
--- a/src/components/ActivityEntry.vue
+++ b/src/components/ActivityEntry.vue
@@ -24,7 +24,7 @@
 	<div v-if="activity" class="activity">
 		<div class="activity--header">
 			<img :src="activity.icon" class="activity--icon">
-			<RichText class="activity--subject" :text="message.subject" :arguments="message.parameters" />
+			<NcRichText class="activity--subject" :text="message.subject" :arguments="message.parameters" />
 			<div class="activity--timestamp">
 				{{ relativeDate(activity.datetime) }}
 			</div>
@@ -35,8 +35,7 @@
 </template>
 
 <script>
-import { RichText } from '@nextcloud/vue-richtext'
-import { NcUserBubble } from '@nextcloud/vue'
+import { NcRichText, NcUserBubble } from '@nextcloud/vue'
 import moment from '@nextcloud/moment'
 import DOMPurify from 'dompurify'
 import relativeDate from '../mixins/relativeDate.js'
@@ -61,7 +60,7 @@ const InternalLink = {
 export default {
 	name: 'ActivityEntry',
 	components: {
-		RichText,
+		NcRichText,
 	},
 	mixins: [relativeDate],
 	props: {
diff --git a/src/components/card/CommentItem.vue b/src/components/card/CommentItem.vue
index 32da38194..66b20d8e6 100644
--- a/src/components/card/CommentItem.vue
+++ b/src/components/card/CommentItem.vue
@@ -12,7 +12,7 @@
 					</NcActionButton>
 				</NcActions>
 			</div>
-			<RichText class="comment--content"
+			<NcRichText class="comment--content"
 				:text="richText(comment)"
 				:arguments="richArgs(comment)"
 				:autolink="true" />
@@ -54,7 +54,7 @@
 		</div>
 		<CommentItem v-if="comment.replyTo" :reply="true" :comment="comment.replyTo" />
 		<div v-show="!edit" ref="richTextElement">
-			<RichText class="comment--content"
+			<NcRichText class="comment--content"
 				:text="richText(comment)"
 				:arguments="richArgs(comment)"
 				:autolink="true" />
@@ -64,8 +64,7 @@
 </template>
 
 <script>
-import { NcAvatar, NcActions, NcActionButton, NcUserBubble } from '@nextcloud/vue'
-import { RichText } from '@nextcloud/vue-richtext'
+import { NcAvatar, NcActions, NcActionButton, NcRichText, NcUserBubble } from '@nextcloud/vue'
 import CommentForm from './CommentForm.vue'
 import { getCurrentUser } from '@nextcloud/auth'
 import md5 from 'blueimp-md5'
@@ -93,7 +92,7 @@ export default {
 		NcActions,
 		NcActionButton,
 		CommentForm,
-		RichText,
+		NcRichText,
 		ReplyIcon,
 	},
 	mixins: [relativeDate],
diff --git a/src/components/search/GlobalSearchResults.vue b/src/components/search/GlobalSearchResults.vue
index bf1c61ecc..1d34e61c4 100644
--- a/src/components/search/GlobalSearchResults.vue
+++ b/src/components/search/GlobalSearchResults.vue
@@ -23,7 +23,7 @@
 <template>
 	<div v-if="searchQuery!==''" class="global-search">
 		<h2>
-			<RichText :text="t('deck', 'Search for {searchQuery} in all boards')" :arguments="queryStringArgs" />
+			<NcRichText :text="t('deck', 'Search for {searchQuery} in all boards')" :arguments="queryStringArgs" />
 			<div v-if="loading" class="icon-loading-small" />
 		</h2>
 		<NcActions>
@@ -57,9 +57,8 @@ import { mapState } from 'vuex'
 import axios from '@nextcloud/axios'
 import { generateOcsUrl } from '@nextcloud/router'
 import InfiniteLoading from 'vue-infinite-loading'
-import { RichText } from '@nextcloud/vue-richtext'
 import Placeholder from './Placeholder.vue'
-import { NcActions, NcActionButton } from '@nextcloud/vue'
+import { NcActions, NcActionButton, NcRichText } from '@nextcloud/vue'
 
 const createCancelToken = () => axios.CancelToken.source()
 
@@ -88,7 +87,7 @@ function search({ query, cursor }) {
 
 export default {
 	name: 'GlobalSearchResults',
-	components: { CardItem, InfiniteLoading, RichText, Placeholder, NcActions, NcActionButton },
+	components: { CardItem, InfiniteLoading, NcRichText, Placeholder, NcActions, NcActionButton },
 	data() {
 		return {
 			results: [],
diff --git a/src/init-reference.js b/src/init-reference.js
index 25b630a37..08b804742 100644
--- a/src/init-reference.js
+++ b/src/init-reference.js
@@ -19,7 +19,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { registerWidget } from '@nextcloud/vue-richtext'
+import { registerWidget } from '@nextcloud/vue/dist/Components/NcRichText.js'
 import { Tooltip } from '@nextcloud/vue'
 import Vue from 'vue'
 import CardReferenceWidget from './views/CardReferenceWidget.vue'
diff --git a/src/views/CardReferenceWidget.vue b/src/views/CardReferenceWidget.vue
index 2f2db2fa0..a0e7d9d92 100644
--- a/src/views/CardReferenceWidget.vue
+++ b/src/views/CardReferenceWidget.vue
@@ -67,7 +67,7 @@
 					'description': true,
 					'short-description': shortDescription,
 				}">
-				<RichText v-tooltip.top="{ content: shortDescription ? t('deck', 'Click to expand description') : undefined }"
+				<NcRichText v-tooltip.top="{ content: shortDescription ? t('deck', 'Click to expand description') : undefined }"
 					:text="card.description"
 					:use-markdown="true"
 					@click.native="shortDescription = !shortDescription" />
@@ -90,7 +90,7 @@ import DeckIcon from '../components/icons/DeckIcon.vue'
 import AvatarList from '../components/cards/AvatarList.vue'
 import labelStyle from '../mixins/labelStyle.js'
 
-import { RichText } from '@nextcloud/vue-richtext'
+import { NcRichText } from '@nextcloud/vue'
 import moment from '@nextcloud/moment'
 import { generateUrl } from '@nextcloud/router'
 
@@ -103,7 +103,7 @@ export default {
 		CalendarBlankIcon,
 		CardBulletedOutlineIcon,
 		TextIcon,
-		RichText,
+		NcRichText,
 	},
 
 	mixins: [labelStyle],
diff --git a/src/views/CommentReferenceWidget.vue b/src/views/CommentReferenceWidget.vue
index ffa8f4276..b8d76c2f3 100644
--- a/src/views/CommentReferenceWidget.vue
+++ b/src/views/CommentReferenceWidget.vue
@@ -67,7 +67,7 @@
 					'description': true,
 					'short-description': shortDescription,
 				}">
-				<RichText v-tooltip.top="{ content: shortDescription ? t('deck', 'Click to expand description') : undefined }"
+				<NcRichText v-tooltip.top="{ content: shortDescription ? t('deck', 'Click to expand description') : undefined }"
 					:text="card.description"
 					:use-markdown="true"
 					@click.native="shortDescription = !shortDescription" />
@@ -84,7 +84,7 @@
 				'comment': true,
 				'short-comment': shortComment,
 			}">
-				<RichText v-tooltip.top="{ content: shortComment ? t('deck', 'Click to expand comment') : undefined }"
+				<NcRichText v-tooltip.top="{ content: shortComment ? t('deck', 'Click to expand comment') : undefined }"
 					:text="commentMessageText"
 					:use-markdown="false"
 					@click.native="shortComment = !shortComment" />
@@ -103,7 +103,7 @@ import DeckIcon from '../components/icons/DeckIcon.vue'
 import AvatarList from '../components/cards/AvatarList.vue'
 import labelStyle from '../mixins/labelStyle.js'
 
-import { RichText } from '@nextcloud/vue-richtext'
+import { NcRichText } from '@nextcloud/vue'
 import moment from '@nextcloud/moment'
 import { generateUrl } from '@nextcloud/router'
 
@@ -116,7 +116,7 @@ export default {
 		CalendarBlankIcon,
 		TextIcon,
 		CardBulletedOutlineIcon,
-		RichText,
+		NcRichText,
 		CommentProcessingOutlineIcon,
 	},