Merge pull request #5346 from nextcloud/renovate/stable28-nextcloud-router-2.x

github-actions[bot] · web-flow · commit 93c72c5e72df · 2024-03-19T16:07:03.000Z
fix(deps): update dependency @nextcloud/router to ^2.2.1 (stable28)
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.11.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 = {}
 
 

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,7 @@ describe('The session Api', function() {`
`38`	`38`	`config: { modRewriteWorking: false },`
`39`	`39`	`webroot: '',`
`40`	`40`	`}`
	`41`	`+ window._oc_webroot = ''`
`41`	`42`	`})`
`42`	`43`
`43`	`44`	`beforeEach(function() {`
Original file line number	Diff line number	Diff line change
`@@ -34,8 +34,8 @@ describe('Sync service provider', function() {`
`34`	`34`	`cy.createUser(user)`
`35`	`35`	`window.OC = {`
`36`	`36`	`config: { modRewriteWorking: false },`
`37`		`- webroot: '',`
`38`	`37`	`}`
	`38`	`+ window._oc_webroot = ''`
`39`	`39`	`})`
`40`	`40`
`41`	`41`	`beforeEach(function() {`
Original file line number	Diff line number	Diff line change
`@@ -32,8 +32,8 @@ describe('The user mention API', function() {`
`32`	`32`	`cy.createUser(user)`
`33`	`33`	`window.OC = {`
`34`	`34`	`config: { modRewriteWorking: false },`
`35`		`- webroot: '',`
`36`	`35`	`}`
	`36`	`+ window._oc_webroot = ''`
`37`	`37`	`})`
`38`	`38`
`39`	`39`	`let fileId`
Original file line number	Diff line number	Diff line change
`@@ -24,12 +24,12 @@`
`24`	`24`	`return string`
`25`	`25`	`}`
`26`	`26`	`OC = {`
`27`		`- webroot: '/dist/OC_WEBROOT',`
`28`	`27`	`config: {},`
`29`	`28`	`isUserAdmin() {`
`30`	`29`	`return true`
`31`	`30`	`}`
`32`	`31`	`}`
	`32`	`+ _oc_webroot = '/dist/OC_WEBROOT'`
`33`	`33`	`</script>`
`34`	`34`	`<script type="module">`
`35`	`35`	`import { RichTextReader, AttachmentResolver, ATTACHMENT_RESOLVER } from './src/package.js'`
Original file line number	Diff line number	Diff line change
`@@ -8,9 +8,10 @@ global.OCA = {`
`8`	`8`
`9`	`9`	`global.OC = {`
`10`	`10`	`config: {modRewriteWorking: true},`
`11`		`- webroot: ''`
`12`	`11`	`}`
`13`	`12`
	`13`	`+global._oc_webroot = ''`
	`14`	`+`
`14`	`15`	`describe('Preparing href attributes for the DOM', () => {`
`15`	`16`
`16`	`17`	`test('leave empty hrefs alone', () => {`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,6 @@ jest.mock('@nextcloud/dialogs', () => ({`
`47`	`47`
`48`	`48`	`global.OC = {`
`49`	`49`	`requestToken: '123',`
`50`		`- webroot: '/nc-webroot',`
`51`	`50`	`coreApps: [`
`52`	`51`	`'core',`
`53`	`52`	`],`
`@@ -74,6 +73,7 @@ global.OC = {`
`74`	`73`	`}`
`75`	`74`	`}`
`76`	`75`
	`76`	`+global._oc_webroot = '/nc-webroot'`
`77`	`77`	`global.OCA = {}`
`78`	`78`
`79`	`79`