summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>2024-01-28 17:29:07 +0000
committerGitHub <noreply@github.com>2024-01-28 17:29:07 +0000
commitefbdcd8c04d359ff29e67d1411aba30466251f98 (patch)
tree13d677ae69125e38386e4197f174cef07735950e
parent63d04815bf227a18b8fd7d35a98dedf83c44d3e0 (diff)
parent375e03270bebecf03ccaf7eed7c46ad8e6b2ef03 (diff)
Merge pull request #11465 from nextcloud/dependabot/npm_and_yarn/nextcloud/router-2.2.1
-rw-r--r--package-lock.json16
-rw-r--r--package.json2
-rw-r--r--src/test-setup.js3
3 files changed, 11 insertions, 10 deletions
diff --git a/package-lock.json b/package-lock.json
index e59fc13c4..668367ab5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21,7 +21,7 @@
"@nextcloud/l10n": "^2.2.0",
"@nextcloud/moment": "^1.3.1",
"@nextcloud/paths": "^2.1.0",
- "@nextcloud/router": "^2.2.0",
+ "@nextcloud/router": "^2.2.1",
"@nextcloud/vue": "^8.4.0",
"crypto-js": "^4.2.0",
"debounce": "^2.0.0",
@@ -3752,16 +3752,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": {
@@ -23738,9 +23738,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 a5394e748..6ff2282e4 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,7 @@
"@nextcloud/l10n": "^2.2.0",
"@nextcloud/moment": "^1.3.1",
"@nextcloud/paths": "^2.1.0",
- "@nextcloud/router": "^2.2.0",
+ "@nextcloud/router": "^2.2.1",
"@nextcloud/vue": "^8.4.0",
"crypto-js": "^4.2.0",
"debounce": "^2.0.0",
diff --git a/src/test-setup.js b/src/test-setup.js
index 348423aa9..d6ef6aca0 100644
--- a/src/test-setup.js
+++ b/src/test-setup.js
@@ -45,11 +45,12 @@ window.IntersectionObserver = jest.fn(() => ({
disconnect: jest.fn(),
}))
+window._oc_webroot = '/nc-webroot' // used by getRootUrl() | since @nextcloud/router 2.2.1
+
global.appName = 'spreed'
global.OC = {
requestToken: '123',
- webroot: '/nc-webroot',
coreApps: [
'core',
],