From 047b61a95ef3abd0af7907e1e7e2c08b78b50bfe Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 19 Mar 2024 15:15:46 +0000
Subject: [PATCH 1/2] fix(deps): update dependency @nextcloud/router to ^2.2.1

---
 package-lock.json | 16 ++++++++--------
 package.json      |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 3e27153a296..75b9771134b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21,7 +21,7 @@
         "@nextcloud/l10n": "^2.2.0",
         "@nextcloud/logger": "^2.7.0",
         "@nextcloud/moment": "^1.3.1",
-        "@nextcloud/router": "^2.2.0",
+        "@nextcloud/router": "^2.2.1",
         "@nextcloud/vue": "^8.11.0",
         "@quartzy/markdown-it-mentions": "^0.2.0",
         "@tiptap/core": "^2.1.13",
@@ -4109,16 +4109,16 @@
       }
     },
     "node_modules/@nextcloud/router": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/@nextcloud/router/-/router-2.2.0.tgz",
-      "integrity": "sha512-M4AVGnB5tt3MYO5RpH/R2jq7z/nW05AmRhk4Lh68krVwRIYGo8pgNikKrPGogHd2Q3UgzF5Py1drHz3uuV99bQ==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/@nextcloud/router/-/router-2.2.1.tgz",
+      "integrity": "sha512-ZRc/WI0RaksEJMz08H/6LimIdP+1A1xTHThCYEghs7VgAKNp5917vT2OKSpG0cMRbIwk0ongFVt5FB5qjy/iFg==",
       "dependencies": {
         "@nextcloud/typings": "^1.7.0",
         "core-js": "^3.6.4"
       },
       "engines": {
         "node": "^20.0.0",
-        "npm": "^9.0.0"
+        "npm": "^10.0.0"
       }
     },
     "node_modules/@nextcloud/stylelint-config": {
@@ -32983,9 +32983,9 @@
       }
     },
     "@nextcloud/router": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/@nextcloud/router/-/router-2.2.0.tgz",
-      "integrity": "sha512-M4AVGnB5tt3MYO5RpH/R2jq7z/nW05AmRhk4Lh68krVwRIYGo8pgNikKrPGogHd2Q3UgzF5Py1drHz3uuV99bQ==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/@nextcloud/router/-/router-2.2.1.tgz",
+      "integrity": "sha512-ZRc/WI0RaksEJMz08H/6LimIdP+1A1xTHThCYEghs7VgAKNp5917vT2OKSpG0cMRbIwk0ongFVt5FB5qjy/iFg==",
       "requires": {
         "@nextcloud/typings": "^1.7.0",
         "core-js": "^3.6.4"
diff --git a/package.json b/package.json
index 387d8fe63d8..459f25e0391 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,7 @@
     "@nextcloud/l10n": "^2.2.0",
     "@nextcloud/logger": "^2.7.0",
     "@nextcloud/moment": "^1.3.1",
-    "@nextcloud/router": "^2.2.0",
+    "@nextcloud/router": "^2.2.1",
     "@nextcloud/vue": "^8.11.0",
     "@quartzy/markdown-it-mentions": "^0.2.0",
     "@tiptap/core": "^2.1.13",

From 844a2130fa19d9a3aaff0692df809b5f37424d45 Mon Sep 17 00:00:00 2001
From: Jonas <jonas@freesources.org>
Date: Tue, 19 Mar 2024 16:23:53 +0100
Subject: [PATCH 2/2] fix(test): adjust to new @nextcloud/router webroot

Signed-off-by: Jonas <jonas@freesources.org>
---
 cypress/e2e/api/SessionApi.spec.js          | 1 +
 cypress/e2e/api/SyncServiceProvider.spec.js | 2 +-
 cypress/e2e/api/UsersApi.spec.js            | 2 +-
 index.html                                  | 2 +-
 src/tests/helpers/links.spec.js             | 3 ++-
 src/tests/setup.js                          | 2 +-
 6 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/cypress/e2e/api/SessionApi.spec.js b/cypress/e2e/api/SessionApi.spec.js
index 82b7879f398..6b8ffe74314 100644
--- a/cypress/e2e/api/SessionApi.spec.js
+++ b/cypress/e2e/api/SessionApi.spec.js
@@ -38,6 +38,7 @@ describe('The session Api', function() {
 			config: { modRewriteWorking: false },
 			webroot: '',
 		}
+		window._oc_webroot = ''
 	})
 
 	beforeEach(function() {
diff --git a/cypress/e2e/api/SyncServiceProvider.spec.js b/cypress/e2e/api/SyncServiceProvider.spec.js
index 2d0e940fb8f..aebb89c2e14 100644
--- a/cypress/e2e/api/SyncServiceProvider.spec.js
+++ b/cypress/e2e/api/SyncServiceProvider.spec.js
@@ -34,8 +34,8 @@ describe('Sync service provider', function() {
 		cy.createUser(user)
 		window.OC = {
 			config: { modRewriteWorking: false },
-			webroot: '',
 		}
+		window._oc_webroot = ''
 	})
 
 	beforeEach(function() {
diff --git a/cypress/e2e/api/UsersApi.spec.js b/cypress/e2e/api/UsersApi.spec.js
index 2e3d72287ea..ea85a3e669b 100644
--- a/cypress/e2e/api/UsersApi.spec.js
+++ b/cypress/e2e/api/UsersApi.spec.js
@@ -32,8 +32,8 @@ describe('The user mention API', function() {
 		cy.createUser(user)
 		window.OC = {
 			config: { modRewriteWorking: false },
-			webroot: '',
 		}
+		window._oc_webroot = ''
 	})
 
 	let fileId
diff --git a/index.html b/index.html
index 2a1d355f9da..f705c9414eb 100644
--- a/index.html
+++ b/index.html
@@ -24,12 +24,12 @@
 			return string
 		}
 		OC = {
-			webroot: '/dist/OC_WEBROOT',
 			config: {},
 			isUserAdmin() {
 				return true
 			}
 		}
+		_oc_webroot = '/dist/OC_WEBROOT'
 	</script>
     <script type="module">
 	    import { RichTextReader, AttachmentResolver, ATTACHMENT_RESOLVER } from './src/package.js'
diff --git a/src/tests/helpers/links.spec.js b/src/tests/helpers/links.spec.js
index d881b2897ac..dac80a9a594 100644
--- a/src/tests/helpers/links.spec.js
+++ b/src/tests/helpers/links.spec.js
@@ -8,9 +8,10 @@ global.OCA = {
 
 global.OC = {
 	config: {modRewriteWorking: true},
-	webroot: ''
 }
 
+global._oc_webroot = ''
+
 describe('Preparing href attributes for the DOM', () => {
 
 	test('leave empty hrefs alone', () => {
diff --git a/src/tests/setup.js b/src/tests/setup.js
index b95374768f0..be43ce44bbf 100644
--- a/src/tests/setup.js
+++ b/src/tests/setup.js
@@ -47,7 +47,6 @@ jest.mock('@nextcloud/dialogs', () => ({
 
 global.OC = {
 	requestToken: '123',
-	webroot: '/nc-webroot',
 	coreApps: [
 		'core',
 	],
@@ -74,6 +73,7 @@ global.OC = {
 	}
 }
 
+global._oc_webroot = '/nc-webroot'
 global.OCA = {}