Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 54 additions & 0 deletions .yarn/patches/vitest-npm-3.2.3-d0d609a9f8.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
diff --git a/dist/chunks/index.CmSc2RE5.js b/dist/chunks/index.CmSc2RE5.js
index 90004b3064c731a22f584000525e0bff3f423867..7fa0351ff36a5d21640520685420046298b71959 100644
--- a/dist/chunks/index.CmSc2RE5.js
+++ b/dist/chunks/index.CmSc2RE5.js
@@ -3,8 +3,6 @@ import { Console } from 'node:console';
// SEE https://github.com/jsdom/jsdom/blob/master/lib/jsdom/living/interfaces.js
const LIVING_KEYS = [
"DOMException",
- "URL",
- "URLSearchParams",
"EventTarget",
"NamedNodeMap",
"Node",
@@ -161,9 +159,6 @@ const LIVING_KEYS = [
"ShadowRoot",
"MutationObserver",
"MutationRecord",
- "Headers",
- "AbortController",
- "AbortSignal",
"Uint8Array",
"Uint16Array",
"Uint32Array",
@@ -441,9 +436,6 @@ var jsdom = {
// https://nodejs.org/dist/latest/docs/api/globals.html
const globalNames = [
"structuredClone",
- "fetch",
- "Request",
- "Response",
"BroadcastChannel",
"MessageChannel",
"MessagePort",
@@ -454,6 +446,20 @@ var jsdom = {
const value = globalThis[name];
if (typeof value !== "undefined" && typeof dom.window[name] === "undefined") dom.window[name] = value;
}
+ const overrideGlobals = [
+ "fetch",
+ "Request",
+ "Response",
+ "Headers",
+ "AbortController",
+ "AbortSignal",
+ "URL",
+ "URLSearchParams",
+ ];
+ for (const name of overrideGlobals) {
+ const value = globalThis[name];
+ if (typeof value !== "undefined") dom.window[name] = value;
+ }
return {
getVmContext() {
return dom.getInternalVMContext();
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
},
"resolutions": {
"@types/react": "18.3.28",
"@types/react-dom": "18.3.7"
"@types/react-dom": "18.3.7",
"vitest@3.2.3": "patch:vitest@npm%3A3.2.3#./.yarn/patches/vitest-npm-3.2.3-d0d609a9f8.patch"
},
"scripts": {
"build": "yarn workspaces foreach --interlaced --verbose --parallel --jobs 3 --exclude datagateway-common run build",
Expand Down
6 changes: 2 additions & 4 deletions packages/datagateway-common/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
"browserslist-to-esbuild": "2.1.1",
"date-fns": "2.30.0",
"hex-to-rgba": "2.0.1",
"history": "4.10.1",
"i18next": "22.0.3",
"lodash.debounce": "4.0.8",
"loglevel": "1.9.1",
Expand All @@ -43,7 +42,7 @@
"@mui/material": ">= 5.5.0 < 6",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-router-dom": ">= 5.2.0 < 6"
"react-router": ">= 7 < 8"
},
"devDependencies": {
"@mui/icons-material": "5.18.0",
Expand All @@ -55,7 +54,6 @@
"@testing-library/user-event": "14.6.1",
"@types/node": "24.12.0",
"@types/react": "18.3.28",
"@types/react-router-dom": "5.3.3",
"@types/react-virtualized": "9.22.2",
"@vitest/coverage-v8": "3.2.3",
"eslint": "9.39.3",
Expand All @@ -70,7 +68,7 @@
"lint-staged": "16.4.0",
"react": "18.3.1",
"react-dom": "18.3.1",
"react-router-dom": "5.3.4",
"react-router": "7.13.2",
"react-test-renderer": "17.0.2",
"typescript-eslint": "8.56.1",
"vitest": "3.2.3",
Expand Down
Loading
Loading