Merge pull request #5316 from nextcloud/renovate/main-nextcloud-route…

…r-2.x fix(deps): update dependency @nextcloud/router to ^2.2.1 (main)
nextcloud · Jan 31, 2024 · 45290ea · 45290ea
2 parents 9c6cb8c + 1d04855
commit 45290ea
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 14 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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/package-lock.json b/package-lock.json
diff --git 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.6.0",
     "@quartzy/markdown-it-mentions": "^0.2.0",
     "@tiptap/core": "^2.1.13",

diff --git 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
@@ -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 = {}