From 43b63b9f3bd3459c55e9706990c7d3d6fd8a96b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Mon, 15 Aug 2022 22:24:08 +0200
Subject: References
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                                  | 47 ++++++++++++++++------
 package.json                                       |  2 +-
 .../MessagesList/MessagesGroup/Message/Message.vue |  7 ++--
 3 files changed, 40 insertions(+), 16 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 45cc82eed..2a06c15df 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
 			"version": "15.0.0",
 			"license": "agpl",
 			"dependencies": {
-				"@juliushaertl/vue-richtext": "^0.3.3",
+				"@juliushaertl/vue-richtext": "^2.0.0-dev.0",
 				"@nextcloud/auth": "^2.0.0",
 				"@nextcloud/axios": "^2.0.0",
 				"@nextcloud/browser-storage": "^0.1.1",
@@ -2445,15 +2445,29 @@
 			}
 		},
 		"node_modules/@juliushaertl/vue-richtext": {
-			"version": "0.3.3",
-			"resolved": "https://registry.npmjs.org/@juliushaertl/vue-richtext/-/vue-richtext-0.3.3.tgz",
-			"integrity": "sha512-OmAtQfXY5ZkOq6CxE79RVAKTo60fS0HAX2x6MMfHUmTlZgtQQqSxlvIJUZEOo7EiJwD84OVMY0G9holV1iwgTA==",
+			"version": "2.0.0-dev.0",
+			"resolved": "https://registry.npmjs.org/@juliushaertl/vue-richtext/-/vue-richtext-2.0.0-dev.0.tgz",
+			"integrity": "sha512-FN71IXhua3PMtRy87Tnh0mSaddKQGA+vL5vg06Tt5/MXhVTrZKI3AY2dT5hYfH8BdvLCHxtR3+IsjRhgC4H+uQ==",
 			"dependencies": {
-				"core-js": "^3.6.4",
-				"vue": "^2.6.12"
+				"@nextcloud/axios": "^2.0.0",
+				"@nextcloud/router": "^2.0.0",
+				"clone": "^2.1.2",
+				"vue": "^2.7.8"
 			},
 			"engines": {
-				"node": ">=10.0.0"
+				"node": ">=14.0.0",
+				"npm": ">=7.0.0"
+			},
+			"peerDependencies": {
+				"vue": "^2.7.8"
+			}
+		},
+		"node_modules/@juliushaertl/vue-richtext/node_modules/clone": {
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
+			"integrity": "sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==",
+			"engines": {
+				"node": ">=0.8"
 			}
 		},
 		"node_modules/@nextcloud/auth": {
@@ -27977,12 +27991,21 @@
 			}
 		},
 		"@juliushaertl/vue-richtext": {
-			"version": "0.3.3",
-			"resolved": "https://registry.npmjs.org/@juliushaertl/vue-richtext/-/vue-richtext-0.3.3.tgz",
-			"integrity": "sha512-OmAtQfXY5ZkOq6CxE79RVAKTo60fS0HAX2x6MMfHUmTlZgtQQqSxlvIJUZEOo7EiJwD84OVMY0G9holV1iwgTA==",
+			"version": "2.0.0-dev.0",
+			"resolved": "https://registry.npmjs.org/@juliushaertl/vue-richtext/-/vue-richtext-2.0.0-dev.0.tgz",
+			"integrity": "sha512-FN71IXhua3PMtRy87Tnh0mSaddKQGA+vL5vg06Tt5/MXhVTrZKI3AY2dT5hYfH8BdvLCHxtR3+IsjRhgC4H+uQ==",
 			"requires": {
-				"core-js": "^3.6.4",
-				"vue": "^2.6.12"
+				"@nextcloud/axios": "^2.0.0",
+				"@nextcloud/router": "^2.0.0",
+				"clone": "^2.1.2",
+				"vue": "^2.7.8"
+			},
+			"dependencies": {
+				"clone": {
+					"version": "2.1.2",
+					"resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
+					"integrity": "sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w=="
+				}
 			}
 		},
 		"@nextcloud/auth": {
diff --git a/package.json b/package.json
index 7fe6ab221..bdc4c900f 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
 		"stylelint:fix": "stylelint css/*.css css/*.scss src/**/*.scss src/**/*.vue --fix"
 	},
 	"dependencies": {
-		"@juliushaertl/vue-richtext": "^0.3.3",
+		"@juliushaertl/vue-richtext": "^2.0.0-dev.0",
 		"@nextcloud/auth": "^2.0.0",
 		"@nextcloud/axios": "^2.0.0",
 		"@nextcloud/browser-storage": "^0.1.1",
diff --git a/src/components/MessagesList/MessagesGroup/Message/Message.vue b/src/components/MessagesList/MessagesGroup/Message/Message.vue
index 1ea27ae87..68c60c584 100644
--- a/src/components/MessagesList/MessagesGroup/Message/Message.vue
+++ b/src/components/MessagesList/MessagesGroup/Message/Message.vue
@@ -52,7 +52,7 @@ the main body of the message as well as a quote.
 					</div>
 				</div>
 				<div v-else-if="showJoinCallButton" class="message-body__main__text call-started">
-					<RichText :text="message" :arguments="richParameters" :autolink="true" />
+					<RichText :text="message" :arguments="richParameters" :autolink="true" :reference-limit="10" />
 					<CallButton />
 				</div>
 				<div v-else-if="showResultsButton" class="message-body__main__text system-message">
@@ -64,11 +64,11 @@ the main body of the message as well as a quote.
 						:show-as-button="true" />
 				</div>
 				<div v-else-if="isDeletedMessage" class="message-body__main__text deleted-message">
-					<RichText :text="message" :arguments="richParameters" :autolink="true" />
+					<RichText :text="message" :arguments="richParameters" :autolink="true"  :reference-limit="10"/>
 				</div>
 				<div v-else class="message-body__main__text" :class="{'system-message': isSystemMessage}">
 					<Quote v-if="parent" :parent-id="parent" v-bind="quote" />
-					<RichText :text="message" :arguments="richParameters" :autolink="true" />
+					<RichText :text="message" :arguments="richParameters" :autolink="true"  :reference-limit="10"/>
 				</div>
 				<div v-if="!isDeletedMessage" class="message-body__main__right">
 					<span v-tooltip.auto="messageDate"
@@ -811,6 +811,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+@import '@juliushaertl/vue-richtext/dist/style.css';
 @import '../../../../assets/variables';
 
 .message:hover .normal-message-body {
-- 
cgit v1.2.3


From 964377ea92b167ec53d92f64b5580fe0a84e82b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Tue, 30 Aug 2022 08:53:12 +0200
Subject: Move to @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                                  | 94 +++++++++++-----------
 package.json                                       |  2 +-
 src/components/LobbyScreen.vue                     |  2 +-
 .../MessagesList/MessagesGroup/Message/Message.vue |  9 ++-
 src/components/Quote.vue                           |  2 +-
 5 files changed, 59 insertions(+), 50 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2a06c15df..5d84ce805 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,6 @@
 			"version": "15.0.0",
 			"license": "agpl",
 			"dependencies": {
-				"@juliushaertl/vue-richtext": "^2.0.0-dev.0",
 				"@nextcloud/auth": "^2.0.0",
 				"@nextcloud/axios": "^2.0.0",
 				"@nextcloud/browser-storage": "^0.1.1",
@@ -65,6 +64,7 @@
 				"@nextcloud/browserslist-config": "^2.3.0",
 				"@nextcloud/eslint-config": "^8.1.2",
 				"@nextcloud/stylelint-config": "^2.2.0",
+				"@nextcloud/vue-richtext": "^2.0.0",
 				"@nextcloud/webpack-vue-config": "^5.3.0",
 				"@vue/cli-plugin-unit-jest": "^5.0.8",
 				"@vue/cli-service": "^5.0.8",
@@ -2444,32 +2444,6 @@
 				"@jridgewell/sourcemap-codec": "^1.4.10"
 			}
 		},
-		"node_modules/@juliushaertl/vue-richtext": {
-			"version": "2.0.0-dev.0",
-			"resolved": "https://registry.npmjs.org/@juliushaertl/vue-richtext/-/vue-richtext-2.0.0-dev.0.tgz",
-			"integrity": "sha512-FN71IXhua3PMtRy87Tnh0mSaddKQGA+vL5vg06Tt5/MXhVTrZKI3AY2dT5hYfH8BdvLCHxtR3+IsjRhgC4H+uQ==",
-			"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/@juliushaertl/vue-richtext/node_modules/clone": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
-			"integrity": "sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==",
-			"engines": {
-				"node": ">=0.8"
-			}
-		},
 		"node_modules/@nextcloud/auth": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/@nextcloud/auth/-/auth-2.0.0.tgz",
@@ -2984,6 +2958,34 @@
 			"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
 			"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
 		},
+		"node_modules/@nextcloud/vue-richtext": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/@nextcloud/vue-richtext/-/vue-richtext-2.0.0.tgz",
+			"integrity": "sha512-Z/AbweVmIB8shWZVLI0kUPrJnkCBlU5xIkkfv+RPFepLY7eZ+ttm5HRhLGqgFyXFNf4RIM7yGt/l6K35XcEX2A==",
+			"dev": true,
+			"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-richtext/node_modules/clone": {
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
+			"integrity": "sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.8"
+			}
+		},
 		"node_modules/@nextcloud/vue/node_modules/@babel/polyfill": {
 			"version": "7.12.1",
 			"resolved": "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.12.1.tgz",
@@ -27990,24 +27992,6 @@
 				"@jridgewell/sourcemap-codec": "^1.4.10"
 			}
 		},
-		"@juliushaertl/vue-richtext": {
-			"version": "2.0.0-dev.0",
-			"resolved": "https://registry.npmjs.org/@juliushaertl/vue-richtext/-/vue-richtext-2.0.0-dev.0.tgz",
-			"integrity": "sha512-FN71IXhua3PMtRy87Tnh0mSaddKQGA+vL5vg06Tt5/MXhVTrZKI3AY2dT5hYfH8BdvLCHxtR3+IsjRhgC4H+uQ==",
-			"requires": {
-				"@nextcloud/axios": "^2.0.0",
-				"@nextcloud/router": "^2.0.0",
-				"clone": "^2.1.2",
-				"vue": "^2.7.8"
-			},
-			"dependencies": {
-				"clone": {
-					"version": "2.1.2",
-					"resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
-					"integrity": "sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w=="
-				}
-			}
-		},
 		"@nextcloud/auth": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/@nextcloud/auth/-/auth-2.0.0.tgz",
@@ -28491,6 +28475,26 @@
 				}
 			}
 		},
+		"@nextcloud/vue-richtext": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/@nextcloud/vue-richtext/-/vue-richtext-2.0.0.tgz",
+			"integrity": "sha512-Z/AbweVmIB8shWZVLI0kUPrJnkCBlU5xIkkfv+RPFepLY7eZ+ttm5HRhLGqgFyXFNf4RIM7yGt/l6K35XcEX2A==",
+			"dev": true,
+			"requires": {
+				"@nextcloud/axios": "^2.0.0",
+				"@nextcloud/router": "^2.0.0",
+				"clone": "^2.1.2",
+				"vue": "^2.7.8"
+			},
+			"dependencies": {
+				"clone": {
+					"version": "2.1.2",
+					"resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
+					"integrity": "sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==",
+					"dev": true
+				}
+			}
+		},
 		"@nextcloud/webpack-vue-config": {
 			"version": "5.3.0",
 			"resolved": "https://registry.npmjs.org/@nextcloud/webpack-vue-config/-/webpack-vue-config-5.3.0.tgz",
diff --git a/package.json b/package.json
index bdc4c900f..dbc5f914a 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,6 @@
 		"stylelint:fix": "stylelint css/*.css css/*.scss src/**/*.scss src/**/*.vue --fix"
 	},
 	"dependencies": {
-		"@juliushaertl/vue-richtext": "^2.0.0-dev.0",
 		"@nextcloud/auth": "^2.0.0",
 		"@nextcloud/axios": "^2.0.0",
 		"@nextcloud/browser-storage": "^0.1.1",
@@ -73,6 +72,7 @@
 		"@nextcloud/browserslist-config": "^2.3.0",
 		"@nextcloud/eslint-config": "^8.1.2",
 		"@nextcloud/stylelint-config": "^2.2.0",
+		"@nextcloud/vue-richtext": "^2.0.0",
 		"@nextcloud/webpack-vue-config": "^5.3.0",
 		"@vue/cli-plugin-unit-jest": "^5.0.8",
 		"@vue/cli-service": "^5.0.8",
diff --git a/src/components/LobbyScreen.vue b/src/components/LobbyScreen.vue
index 7b7a9490d..ed936711d 100644
--- a/src/components/LobbyScreen.vue
+++ b/src/components/LobbyScreen.vue
@@ -49,7 +49,7 @@
 
 <script>
 import moment from '@nextcloud/moment'
-import RichText from '@juliushaertl/vue-richtext'
+import RichText from '@nextcloud/vue-richtext'
 import SetGuestUsername from './SetGuestUsername.vue'
 import Lobby from './missingMaterialDesignIcons/Lobby.vue'
 
diff --git a/src/components/MessagesList/MessagesGroup/Message/Message.vue b/src/components/MessagesList/MessagesGroup/Message/Message.vue
index 68c60c584..6a650f8c0 100644
--- a/src/components/MessagesList/MessagesGroup/Message/Message.vue
+++ b/src/components/MessagesList/MessagesGroup/Message/Message.vue
@@ -187,7 +187,7 @@ import DeckCard from './MessagePart/DeckCard.vue'
 import DefaultParameter from './MessagePart/DefaultParameter.vue'
 import FilePreview from './MessagePart/FilePreview.vue'
 import Mention from './MessagePart/Mention.vue'
-import RichText from '@juliushaertl/vue-richtext'
+import RichText from '@nextcloud/vue-richtext'
 import AlertCircle from 'vue-material-design-icons/AlertCircle.vue'
 import Check from 'vue-material-design-icons/Check.vue'
 import CheckAll from 'vue-material-design-icons/CheckAll.vue'
@@ -811,7 +811,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import '@juliushaertl/vue-richtext/dist/style.css';
+@import '@nextcloud/vue-richtext/dist/style.css';
 @import '../../../../assets/variables';
 
 .message:hover .normal-message-body {
@@ -837,6 +837,7 @@ export default {
 		min-width: 100%;
 		&__text {
 			flex: 0 1 600px;
+			max-width: 600px;
 			color: var(--color-text-light);
 			.single-emoji {
 				font-size: 250%;
@@ -867,6 +868,10 @@ export default {
 			::v-deep .rich-text--wrapper {
 				white-space: pre-wrap;
 				word-break: break-word;
+
+				.rich-text--reference-widget {
+					width: calc(100% + 132px);
+				}
 			}
 
 			&--quote {
diff --git a/src/components/Quote.vue b/src/components/Quote.vue
index eb868f1a6..dd361b6e7 100644
--- a/src/components/Quote.vue
+++ b/src/components/Quote.vue
@@ -59,7 +59,7 @@ components.
 <script>
 import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
 import Close from 'vue-material-design-icons/Close.vue'
-import RichText from '@juliushaertl/vue-richtext'
+import RichText from '@nextcloud/vue-richtext'
 import FilePreview from './MessagesList/MessagesGroup/Message/MessagePart/FilePreview.vue'
 import DefaultParameter from './MessagesList/MessagesGroup/Message/MessagePart/DefaultParameter.vue'
 import { EventBus } from '../services/EventBus.js'
-- 
cgit v1.2.3


From 5bda7f0cecf939f52e8da199b28e21c830621446 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Wed, 31 Aug 2022 15:56:40 +0200
Subject: Fix eslint

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 .../MessagesList/MessagesGroup/Message/Message.vue   | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/components/MessagesList/MessagesGroup/Message/Message.vue b/src/components/MessagesList/MessagesGroup/Message/Message.vue
index 6a650f8c0..9cb6b1cf9 100644
--- a/src/components/MessagesList/MessagesGroup/Message/Message.vue
+++ b/src/components/MessagesList/MessagesGroup/Message/Message.vue
@@ -52,11 +52,17 @@ the main body of the message as well as a quote.
 					</div>
 				</div>
 				<div v-else-if="showJoinCallButton" class="message-body__main__text call-started">
-					<RichText :text="message" :arguments="richParameters" :autolink="true" :reference-limit="10" />
+					<RichText :text="message"
+						:arguments="richParameters"
+						:autolink="true"
+						:reference-limit="10" />
 					<CallButton />
 				</div>
 				<div v-else-if="showResultsButton" class="message-body__main__text system-message">
-					<RichText :text="message" :arguments="richParameters" :autolink="true" />
+					<RichText :text="message"
+						:arguments="richParameters"
+						:autolink="true"
+						:reference-limit="10" />
 					<!-- Displays only the "see results" button with the results modal -->
 					<Poll :id="messageParameters.poll.id"
 						:poll-name="messageParameters.poll.name"
@@ -64,11 +70,17 @@ the main body of the message as well as a quote.
 						:show-as-button="true" />
 				</div>
 				<div v-else-if="isDeletedMessage" class="message-body__main__text deleted-message">
-					<RichText :text="message" :arguments="richParameters" :autolink="true"  :reference-limit="10"/>
+					<RichText :text="message"
+						:arguments="richParameters"
+						:autolink="true"
+						:reference-limit="10" />
 				</div>
 				<div v-else class="message-body__main__text" :class="{'system-message': isSystemMessage}">
 					<Quote v-if="parent" :parent-id="parent" v-bind="quote" />
-					<RichText :text="message" :arguments="richParameters" :autolink="true"  :reference-limit="10"/>
+					<RichText :text="message"
+						:arguments="richParameters"
+						:autolink="true"
+						:reference-limit="10" />
 				</div>
 				<div v-if="!isDeletedMessage" class="message-body__main__right">
 					<span v-tooltip.auto="messageDate"
-- 
cgit v1.2.3


From b5c5b4aafcfba7ec0e9c13fc064c08bfb1b3690d Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Wed, 31 Aug 2022 15:56:47 +0200
Subject: Adjust exclude list

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 webpack.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webpack.js b/webpack.js
index bdf24fa99..0ed882d69 100644
--- a/webpack.js
+++ b/webpack.js
@@ -23,7 +23,7 @@ webpackConfig.output.assetModuleFilename = '[name][ext]?v=[contenthash]'
 
 // Edit JS rule
 webpackRules.RULE_JS.exclude = BabelLoaderExcludeNodeModulesExcept([
-	'@juliushaertl/vue-richtext',
+	'@nextcloud/vue-richtext',
 	'@nextcloud/event-bus',
 	'@nextcloud/vue-dashboard',
 	'ansi-regex',
-- 
cgit v1.2.3


From e2caa8596f3db45b1454fe187ab89b9604c8a277 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Wed, 31 Aug 2022 16:12:26 +0200
Subject: Fix jest ignore list

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 jest.config.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/jest.config.js b/jest.config.js
index 7907ef694..9aa23e823 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -24,6 +24,7 @@
 const ignorePatterns = [
 	'vue-material-design-icons',
 	'@juliushaertl',
+	'@nextcloud/vue-richtext',
 	'tributejs',
 	'@nextcloud/vue',
 	'splitpanes',
-- 
cgit v1.2.3


From 4dc5d0e243dc985aa1af480bdaffbda3cf883f58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Wed, 31 Aug 2022 16:14:17 +0200
Subject: Move @nextcloud/vue-richtext to actual dependencies
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 | 8 ++------
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 5d84ce805..b56eb91e7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -22,6 +22,7 @@
 				"@nextcloud/router": "^2.0.0",
 				"@nextcloud/vue": "^6.0.0-beta.4",
 				"@nextcloud/vue-dashboard": "^2.0.1",
+				"@nextcloud/vue-richtext": "^2.0.0",
 				"attachmediastream": "^2.1.0",
 				"color.js": "^1.2.0",
 				"crypto-js": "^4.1.1",
@@ -64,7 +65,6 @@
 				"@nextcloud/browserslist-config": "^2.3.0",
 				"@nextcloud/eslint-config": "^8.1.2",
 				"@nextcloud/stylelint-config": "^2.2.0",
-				"@nextcloud/vue-richtext": "^2.0.0",
 				"@nextcloud/webpack-vue-config": "^5.3.0",
 				"@vue/cli-plugin-unit-jest": "^5.0.8",
 				"@vue/cli-service": "^5.0.8",
@@ -2962,7 +2962,6 @@
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/@nextcloud/vue-richtext/-/vue-richtext-2.0.0.tgz",
 			"integrity": "sha512-Z/AbweVmIB8shWZVLI0kUPrJnkCBlU5xIkkfv+RPFepLY7eZ+ttm5HRhLGqgFyXFNf4RIM7yGt/l6K35XcEX2A==",
-			"dev": true,
 			"dependencies": {
 				"@nextcloud/axios": "^2.0.0",
 				"@nextcloud/router": "^2.0.0",
@@ -2981,7 +2980,6 @@
 			"version": "2.1.2",
 			"resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
 			"integrity": "sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==",
-			"dev": true,
 			"engines": {
 				"node": ">=0.8"
 			}
@@ -28479,7 +28477,6 @@
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/@nextcloud/vue-richtext/-/vue-richtext-2.0.0.tgz",
 			"integrity": "sha512-Z/AbweVmIB8shWZVLI0kUPrJnkCBlU5xIkkfv+RPFepLY7eZ+ttm5HRhLGqgFyXFNf4RIM7yGt/l6K35XcEX2A==",
-			"dev": true,
 			"requires": {
 				"@nextcloud/axios": "^2.0.0",
 				"@nextcloud/router": "^2.0.0",
@@ -28490,8 +28487,7 @@
 				"clone": {
 					"version": "2.1.2",
 					"resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
-					"integrity": "sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==",
-					"dev": true
+					"integrity": "sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w=="
 				}
 			}
 		},
diff --git a/package.json b/package.json
index dbc5f914a..9810becd2 100644
--- a/package.json
+++ b/package.json
@@ -30,6 +30,7 @@
 		"@nextcloud/router": "^2.0.0",
 		"@nextcloud/vue": "^6.0.0-beta.4",
 		"@nextcloud/vue-dashboard": "^2.0.1",
+		"@nextcloud/vue-richtext": "^2.0.0",
 		"attachmediastream": "^2.1.0",
 		"color.js": "^1.2.0",
 		"crypto-js": "^4.1.1",
@@ -72,7 +73,6 @@
 		"@nextcloud/browserslist-config": "^2.3.0",
 		"@nextcloud/eslint-config": "^8.1.2",
 		"@nextcloud/stylelint-config": "^2.2.0",
-		"@nextcloud/vue-richtext": "^2.0.0",
 		"@nextcloud/webpack-vue-config": "^5.3.0",
 		"@vue/cli-plugin-unit-jest": "^5.0.8",
 		"@vue/cli-service": "^5.0.8",
-- 
cgit v1.2.3