This is an automated email from the ASF dual-hosted git repository.
OyvindLGjesdal pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/jena.git
The following commit(s) were added to refs/heads/main by this push:
new 90a5a6da01 fix breaking change in vitest 5 upgrade
90a5a6da01 is described below
commit 90a5a6da0165999f525d2c93a573ea6e9b641d83
Author: Øyvind Gjesdal <[email protected]>
AuthorDate: Sat Sep 19 23:23:00 2026 +0200
fix breaking change in vitest 5 upgrade
* update @vitest/coverage-v8 and vitest to 5.0.1
* use vi.stubGlobal to handle breaking change to
dom-environment-global-assignments-now-update-the-underlying-window
* add new .vitest to .gitignore
---
jena-fuseki2/jena-fuseki-ui/.gitignore | 4 +
jena-fuseki2/jena-fuseki-ui/package.json | 4 +-
.../jena-fuseki-ui/tests/unit/utils/query.spec.js | 16 +-
jena-fuseki2/jena-fuseki-ui/yarn.lock | 217 ++++++++-------------
4 files changed, 97 insertions(+), 144 deletions(-)
diff --git a/jena-fuseki2/jena-fuseki-ui/.gitignore
b/jena-fuseki2/jena-fuseki-ui/.gitignore
index 1fd9a88b57..88fcd70f4f 100644
--- a/jena-fuseki2/jena-fuseki-ui/.gitignore
+++ b/jena-fuseki2/jena-fuseki-ui/.gitignore
@@ -26,6 +26,10 @@ pnpm-debug.log*
*.sln
*.sw?
+##
https://vitest.dev/guide/migration/#generated-reports-and-artifacts-use-the-vitest-directory
+
+.vitest
+
## Yarn :
https://yarnpkg.com/getting-started/qa#which-files-should-be-gitignored
.yarn/*
!.yarn/cache
diff --git a/jena-fuseki2/jena-fuseki-ui/package.json
b/jena-fuseki2/jena-fuseki-ui/package.json
index f829014f9e..5c6d41c3ec 100644
--- a/jena-fuseki2/jena-fuseki-ui/package.json
+++ b/jena-fuseki2/jena-fuseki-ui/package.json
@@ -57,7 +57,7 @@
"@cypress/code-coverage": "^4.0.1",
"@eslint/js": "^10.0.1",
"@vitejs/plugin-vue": "^6.0.0",
- "@vitest/coverage-v8": "^5.0.0",
+ "@vitest/coverage-v8": "^5.0.1",
"@vue/compiler-sfc": "^3.5.26",
"@vue/test-utils": "^2.4.1",
"babel-loader": "^10",
@@ -76,7 +76,7 @@
"typescript": "^7.0.2",
"vite": "^8.0.10",
"vite-plugin-istanbul": "^9.0.0",
- "vitest": "^4.1.0",
+ "vitest": "^5.0.1",
"vue-eslint-parser": "^10.4.0",
"wait-on": "^9.0.0",
"webpack": "^5.104.1"
diff --git a/jena-fuseki2/jena-fuseki-ui/tests/unit/utils/query.spec.js
b/jena-fuseki2/jena-fuseki-ui/tests/unit/utils/query.spec.js
index 4757a0c546..4b04c97120 100644
--- a/jena-fuseki2/jena-fuseki-ui/tests/unit/utils/query.spec.js
+++ b/jena-fuseki2/jena-fuseki-ui/tests/unit/utils/query.spec.js
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-import { describe, expect, it } from 'vitest'
+import { describe, expect, it, vi } from 'vitest'
import { createShareableLink } from '@/utils/query'
describe('query', () => {
@@ -41,18 +41,20 @@ SELECT * WHERE {
expected: `${prefix}%2B%2B%2B%2B%2B`
}
]
- const originalDocument = global.document
- global.document = {
+ vi.stubGlobal('document', {
location: {
protocol: 'https:',
host: 'host:1234',
pathname: '/',
search: ''
}
- }
- tests.forEach(test => {
- expect(createShareableLink(test.value,
'/query/')).to.equal(test.expected)
})
- global.document = originalDocument
+ try {
+ tests.forEach(test => {
+ expect(createShareableLink(test.value,
'/query/')).to.equal(test.expected)
+ })
+ } finally {
+ vi.unstubAllGlobals()
+ }
})
})
diff --git a/jena-fuseki2/jena-fuseki-ui/yarn.lock
b/jena-fuseki2/jena-fuseki-ui/yarn.lock
index 5d581484ff..1887cd3d02 100644
--- a/jena-fuseki2/jena-fuseki-ui/yarn.lock
+++ b/jena-fuseki2/jena-fuseki-ui/yarn.lock
@@ -1842,7 +1842,14 @@ __metadata:
languageName: node
linkType: hard
-"@jridgewell/trace-mapping@npm:^0.3.24, @jridgewell/trace-mapping@npm:^0.3.25,
@jridgewell/trace-mapping@npm:^0.3.28, @jridgewell/trace-mapping@npm:^0.3.31":
+"@jridgewell/sourcemap-codec@npm:^1.6.0":
+ version: 1.6.0
+ resolution: "@jridgewell/sourcemap-codec@npm:1.6.0"
+ checksum:
10c0/b5be700e45a775f218589c3466c4ffea630582b4988657652da464e5ab8a7d18bf928ee4fd2363fb346ede4bea9c6ff0bae05a538358c4565ece6199531b5f72
+ languageName: node
+ linkType: hard
+
+"@jridgewell/trace-mapping@npm:0.3.31, @jridgewell/trace-mapping@npm:^0.3.24,
@jridgewell/trace-mapping@npm:^0.3.25, @jridgewell/trace-mapping@npm:^0.3.28,
@jridgewell/trace-mapping@npm:^0.3.31":
version: 0.3.31
resolution: "@jridgewell/trace-mapping@npm:0.3.31"
dependencies:
@@ -2489,9 +2496,9 @@ __metadata:
languageName: node
linkType: hard
-"@vitest/coverage-v8@npm:^5.0.0":
- version: 5.0.0
- resolution: "@vitest/coverage-v8@npm:5.0.0"
+"@vitest/coverage-v8@npm:^5.0.1":
+ version: 5.0.1
+ resolution: "@vitest/coverage-v8@npm:5.0.1"
dependencies:
"@bcoe/v8-coverage": "npm:^1.0.2"
"@vitest/istanbul-lib-coverage": "npm:^1.0.0"
@@ -2502,26 +2509,12 @@ __metadata:
std-env: "npm:^4.2.0"
tinyrainbow: "npm:^3.1.1"
peerDependencies:
- "@vitest/browser": 5.0.0
- vitest: 5.0.0
+ "@vitest/browser": 5.0.1
+ vitest: 5.0.1
peerDependenciesMeta:
"@vitest/browser":
optional: true
- checksum:
10c0/6d7f102af8f11f69df21ba343b4d101fbdb39ce5568bd2686c72cdf44e03934889328df297ebe4e12dbe1bc5e0a6d565bb9dfaf2fbca1958bf5e7770c7dc9675
- languageName: node
- linkType: hard
-
-"@vitest/expect@npm:4.1.11":
- version: 4.1.11
- resolution: "@vitest/expect@npm:4.1.11"
- dependencies:
- "@standard-schema/spec": "npm:^1.1.0"
- "@types/chai": "npm:^5.2.2"
- "@vitest/spy": "npm:4.1.11"
- "@vitest/utils": "npm:4.1.11"
- chai: "npm:^6.2.2"
- tinyrainbow: "npm:^3.1.0"
- checksum:
10c0/0aa5e0973aca93a58cbdc3041c6bfed5897e976124965203b96a23b811f4ca403590c7eb15802c8d8366ec27a1db0682451e8a91c4d06617636de262baf86e4b
+ checksum:
10c0/7f6dba018b7cd3303c625ff0c906bab971eef00214fac5d7edfd7ab3991bccbe7edf47f89273f49f7d2161e16fbdcc2b9938efd16f2da3bab8c31bf83777349e
languageName: node
linkType: hard
@@ -2541,13 +2534,14 @@ __metadata:
languageName: node
linkType: hard
-"@vitest/mocker@npm:4.1.11":
- version: 4.1.11
- resolution: "@vitest/mocker@npm:4.1.11"
+"@vitest/mocker@npm:5.0.1":
+ version: 5.0.1
+ resolution: "@vitest/mocker@npm:5.0.1"
dependencies:
- "@vitest/spy": "npm:4.1.11"
+ "@jridgewell/trace-mapping": "npm:0.3.31"
+ "@vitest/spy": "npm:5.0.1"
estree-walker: "npm:^3.0.3"
- magic-string: "npm:^0.30.21"
+ magic-string: "npm:^1.2.3"
peerDependencies:
msw: ^2.4.9
vite: ^6.0.0 || ^7.0.0 || ^8.0.0
@@ -2556,56 +2550,14 @@ __metadata:
optional: true
vite:
optional: true
- checksum:
10c0/3111ea34bd5046f6c70bbd67cf8b89608ee8c41cb27ab2bd61d42f4b68810e9ea16a9a757a71bc254c105f73b407d00ebb6bab1ab0f7f5cdcc9d7d16602a3933
- languageName: node
- linkType: hard
-
-"@vitest/pretty-format@npm:4.1.11":
- version: 4.1.11
- resolution: "@vitest/pretty-format@npm:4.1.11"
- dependencies:
- tinyrainbow: "npm:^3.1.0"
- checksum:
10c0/ad32525c73807c0b72f38dc29bc51fd5a17879dc650f37995a9c5adbb8526e15f787691f76aa8768448ec7ed5bf5ba2b12329eac8fda1428b4d6b8c036390f71
+ checksum:
10c0/21f0456c7452d7f65449fc0f43f1ccbf222d353eb11fcf511b78b5b8c4ae38ac9ca286b56936d91856c483575cd86688f1b6dc00f02ffd85ed1108b12cf219cd
languageName: node
linkType: hard
-"@vitest/runner@npm:4.1.11":
- version: 4.1.11
- resolution: "@vitest/runner@npm:4.1.11"
- dependencies:
- "@vitest/utils": "npm:4.1.11"
- pathe: "npm:^2.0.3"
- checksum:
10c0/3c782b055e9e688e1785f7c8937bd1669bad1b0e5758cb8b844f918f30a324b1d21e174d46c941ce80ebf37f2b89b55b6d619a675025914a1ece6377b95909e2
- languageName: node
- linkType: hard
-
-"@vitest/snapshot@npm:4.1.11":
- version: 4.1.11
- resolution: "@vitest/snapshot@npm:4.1.11"
- dependencies:
- "@vitest/pretty-format": "npm:4.1.11"
- "@vitest/utils": "npm:4.1.11"
- magic-string: "npm:^0.30.21"
- pathe: "npm:^2.0.3"
- checksum:
10c0/35d82a7c2a3e4b57529c30387d568d9106b6bf960189214e5d8cb1f5288cb042305c2e5c7b0b2f8cb56a2c814973de0310bc56d72deb79427bea272b6224190c
- languageName: node
- linkType: hard
-
-"@vitest/spy@npm:4.1.11":
- version: 4.1.11
- resolution: "@vitest/spy@npm:4.1.11"
- checksum:
10c0/06c68247a8efd21006abe7532fee17f30ba83c8cda3e0b952ef89e278d58058f4b1de69b6bbaa2ed614c568bf4f5769fcc76be42802dedf2bcdd9c0aae601740
- languageName: node
- linkType: hard
-
-"@vitest/utils@npm:4.1.11":
- version: 4.1.11
- resolution: "@vitest/utils@npm:4.1.11"
- dependencies:
- "@vitest/pretty-format": "npm:4.1.11"
- convert-source-map: "npm:^2.0.0"
- tinyrainbow: "npm:^3.1.0"
- checksum:
10c0/a2c1ddc64333458c3e031465c1ee0440a7660fd1b298c54ccbf865ef1e5cf3ebdd6c5c75a5ea235d8a672498b394e7121f992b096f021f45014ab25e9abd1b52
+"@vitest/spy@npm:5.0.1":
+ version: 5.0.1
+ resolution: "@vitest/spy@npm:5.0.1"
+ checksum:
10c0/88838f6dda5237f0a40c365598ce7112922611e9157b390ca90c11760ae8697c37214f621263bfbe12e2bd27234df577cbbecc93de003ced366d23be24383c37
languageName: node
linkType: hard
@@ -3156,7 +3108,7 @@ __metadata:
"@fortawesome/vue-fontawesome": "npm:^3.0.3"
"@popperjs/core": "npm:^2.11.8"
"@vitejs/plugin-vue": "npm:^6.0.0"
- "@vitest/coverage-v8": "npm:^5.0.0"
+ "@vitest/coverage-v8": "npm:^5.0.1"
"@vue/compiler-dom": "npm:^3.5.41"
"@vue/compiler-sfc": "npm:^3.5.26"
"@vue/test-utils": "npm:^2.4.1"
@@ -3183,7 +3135,7 @@ __metadata:
typescript: "npm:^7.0.2"
vite: "npm:^8.0.10"
vite-plugin-istanbul: "npm:^9.0.0"
- vitest: "npm:^4.1.0"
+ vitest: "npm:^5.0.1"
vue: "npm:^3.5.26"
vue-eslint-parser: "npm:^10.4.0"
vue-router: "npm:^5.0.2"
@@ -4498,13 +4450,20 @@ __metadata:
languageName: node
linkType: hard
-"es-module-lexer@npm:^2.0.0, es-module-lexer@npm:^2.1.0":
+"es-module-lexer@npm:^2.1.0":
version: 2.1.0
resolution: "es-module-lexer@npm:2.1.0"
checksum:
10c0/93bcf2454fa72d67fe3ccd0abef8ce7933f5840a319513418a643dd8e9c6aa8f49709cecfae02ded722805dd327232d30723a807cc52e6809d6ac697c62c29fb
languageName: node
linkType: hard
+"es-module-lexer@npm:^2.3.2":
+ version: 2.3.2
+ resolution: "es-module-lexer@npm:2.3.2"
+ checksum:
10c0/5e7389424c43478439f12f9a6aca1750f6f99afa384fc3de329f4a45f152ab156671055008adaafc74960877abf8cc338aeebf6bed8c21297b146fd6eb7a22f8
+ languageName: node
+ linkType: hard
+
"es-object-atoms@npm:^1.0.0, es-object-atoms@npm:^1.1.1":
version: 1.1.1
resolution: "es-object-atoms@npm:1.1.1"
@@ -4794,10 +4753,10 @@ __metadata:
languageName: node
linkType: hard
-"expect-type@npm:^1.3.0":
- version: 1.3.0
- resolution: "expect-type@npm:1.3.0"
- checksum:
10c0/8412b3fe4f392c420ab41dae220b09700e4e47c639a29ba7ba2e83cc6cffd2b4926f7ac9e47d7e277e8f4f02acda76fd6931cb81fd2b382fa9477ef9ada953fd
+"expect-type@npm:^1.4.0":
+ version: 1.4.0
+ resolution: "expect-type@npm:1.4.0"
+ checksum:
10c0/d40d76b8570695d36587beb3cc28494da2ca3ec8f04e67f5622ed2d372d850e401a9adef19c6835e1a8173903f157c79540b34c7b3fbd7cd8ce726cc903c57b7
languageName: node
linkType: hard
@@ -6270,6 +6229,15 @@ __metadata:
languageName: node
linkType: hard
+"magic-string@npm:^1.2.3":
+ version: 1.4.1
+ resolution: "magic-string@npm:1.4.1"
+ dependencies:
+ "@jridgewell/sourcemap-codec": "npm:^1.6.0"
+ checksum:
10c0/d5162ed2cef7ffa4ee5bcf44fbaba3a814f65b9919f0f3eba43076fda4223161b1064779da32901c3d1f157e7bbc0b6dd973e06c7856e550424f5e73e9217f0a
+ languageName: node
+ linkType: hard
+
"magicast@npm:^0.5.4":
version: 0.5.5
resolution: "magicast@npm:0.5.5"
@@ -8046,13 +8014,6 @@ __metadata:
languageName: node
linkType: hard
-"std-env@npm:^4.0.0-rc.1":
- version: 4.1.0
- resolution: "std-env@npm:4.1.0"
- checksum:
10c0/2e14b6b490db34cb969a48d9cf7c35bca4a47653914aac2814221baae7b867a5b15940d133625c391621971f98cd2266a5dc7036669960e883f1081db2a56558
- languageName: node
- linkType: hard
-
"std-env@npm:^4.2.0":
version: 4.2.0
resolution: "std-env@npm:4.2.0"
@@ -8296,21 +8257,21 @@ __metadata:
languageName: node
linkType: hard
-"tinybench@npm:^2.9.0":
- version: 2.9.0
- resolution: "tinybench@npm:2.9.0"
- checksum:
10c0/c3500b0f60d2eb8db65250afe750b66d51623057ee88720b7f064894a6cb7eb93360ca824a60a31ab16dab30c7b1f06efe0795b352e37914a9d4bad86386a20c
+"tinybench@npm:6.1.4":
+ version: 6.1.4
+ resolution: "tinybench@npm:6.1.4"
+ checksum:
10c0/7a815318a02270a98247298ddd289b75c841725606c977f0b74749bc5ec811a44998267ccb60bd3deb23b551dbfaf4d979eb08e9b04fbc87ff571f9b39cc61c3
languageName: node
linkType: hard
-"tinyexec@npm:^1.0.2":
- version: 1.2.4
- resolution: "tinyexec@npm:1.2.4"
- checksum:
10c0/153b8db6b080194b558ff145b9cffc36b80a6e07babd644dcfbe49c807eee668c876049d28bdee90b96304476f883352f2dad91b3f86bc23832532f4363e66ff
+"tinyexec@npm:1.3.0":
+ version: 1.3.0
+ resolution: "tinyexec@npm:1.3.0"
+ checksum:
10c0/e9b89f97489d2aab2cef408da279e6b32547e738d1275032ccb8fd0028a006d93eb70fc51c6cffd9fc2f5aca6c2a273d8b6f73b52d46ee5116da6b94969ef958
languageName: node
linkType: hard
-"tinyglobby@npm:^0.2.12, tinyglobby@npm:^0.2.14, tinyglobby@npm:^0.2.15,
tinyglobby@npm:^0.2.17":
+"tinyglobby@npm:^0.2.12, tinyglobby@npm:^0.2.14, tinyglobby@npm:^0.2.17":
version: 0.2.17
resolution: "tinyglobby@npm:0.2.17"
dependencies:
@@ -8320,13 +8281,6 @@ __metadata:
languageName: node
linkType: hard
-"tinyrainbow@npm:^3.1.0":
- version: 3.1.0
- resolution: "tinyrainbow@npm:3.1.0"
- checksum:
10c0/f11cf387a26c5c9255bec141a90ac511b26172981b10c3e50053bc6700ea7d2336edcc4a3a21dbb8412fe7c013477d2ba4d7e4877800f3f8107be5105aad6511
- languageName: node
- linkType: hard
-
"tinyrainbow@npm:^3.1.1":
version: 3.1.1
resolution: "tinyrainbow@npm:3.1.1"
@@ -8878,7 +8832,7 @@ __metadata:
languageName: node
linkType: hard
-"vite@npm:^6.0.0 || ^7.0.0 || ^8.0.0, vite@npm:^8.0.10":
+"vite@npm:^8.0.10":
version: 8.2.2
resolution: "vite@npm:8.2.2"
dependencies:
@@ -8935,43 +8889,36 @@ __metadata:
languageName: node
linkType: hard
-"vitest@npm:^4.1.0":
- version: 4.1.11
- resolution: "vitest@npm:4.1.11"
+"vitest@npm:^5.0.1":
+ version: 5.0.1
+ resolution: "vitest@npm:5.0.1"
dependencies:
- "@vitest/expect": "npm:4.1.11"
- "@vitest/mocker": "npm:4.1.11"
- "@vitest/pretty-format": "npm:4.1.11"
- "@vitest/runner": "npm:4.1.11"
- "@vitest/snapshot": "npm:4.1.11"
- "@vitest/spy": "npm:4.1.11"
- "@vitest/utils": "npm:4.1.11"
- es-module-lexer: "npm:^2.0.0"
- expect-type: "npm:^1.3.0"
- magic-string: "npm:^0.30.21"
- obug: "npm:^2.1.1"
- pathe: "npm:^2.0.3"
- picomatch: "npm:^4.0.3"
- std-env: "npm:^4.0.0-rc.1"
- tinybench: "npm:^2.9.0"
- tinyexec: "npm:^1.0.2"
- tinyglobby: "npm:^0.2.15"
- tinyrainbow: "npm:^3.1.0"
- vite: "npm:^6.0.0 || ^7.0.0 || ^8.0.0"
+ "@types/chai": "npm:^5.2.2"
+ "@vitest/mocker": "npm:5.0.1"
+ chai: "npm:^6.2.2"
+ es-module-lexer: "npm:^2.3.2"
+ expect-type: "npm:^1.4.0"
+ magic-string: "npm:^1.2.3"
+ obug: "npm:^2.1.4"
+ picomatch: "npm:^4.0.7"
+ std-env: "npm:^4.2.0"
+ tinybench: "npm:6.1.4"
+ tinyexec: "npm:1.3.0"
+ tinyglobby: "npm:^0.2.17"
why-is-node-running: "npm:^2.3.0"
peerDependencies:
"@edge-runtime/vm": "*"
"@opentelemetry/api": ^1.9.0
- "@types/node": ^20.0.0 || ^22.0.0 || >=24.0.0
- "@vitest/browser-playwright": 4.1.11
- "@vitest/browser-preview": 4.1.11
- "@vitest/browser-webdriverio": 4.1.11
- "@vitest/coverage-istanbul": 4.1.11
- "@vitest/coverage-v8": 4.1.11
- "@vitest/ui": 4.1.11
+ "@types/node": ^22.0.0 || >=24.0.0
+ "@vitest/browser-playwright": 5.0.1
+ "@vitest/browser-preview": 5.0.1
+ "@vitest/browser-webdriverio": ^5.0.0-beta.5 || >=5.0.0
+ "@vitest/coverage-istanbul": 5.0.1
+ "@vitest/coverage-v8": 5.0.1
+ "@vitest/ui": 5.0.1
happy-dom: "*"
jsdom: "*"
- vite: ^6.0.0 || ^7.0.0 || ^8.0.0
+ vite: ^6.4.0 || ^7.0.0 || ^8.0.0
peerDependenciesMeta:
"@edge-runtime/vm":
optional: true
@@ -8999,7 +8946,7 @@ __metadata:
optional: false
bin:
vitest: ./vitest.mjs
- checksum:
10c0/3fa0948cf74adcccc8cbcdb4e6d30ada6933bdfb1816ff99200f3d3b689325b37dc483b22535b57b6d911f7a7b64eaa6a5f8da1606cfe7f2466f48000c21e296
+ checksum:
10c0/1b49fe8eb7274ffd43ca5a29cccbcc942cf991488020a74114f3a725a1168c549d47820715b8ed3f521a0cd9ccc0013ab9511cc6e0f8e0a5bdfb751e3ddc4d2d
languageName: node
linkType: hard
