From 32e683cb6aed7f7210eea736225b788a7e03b5c9 Mon Sep 17 00:00:00 2001 From: Tim Donohue Date: Tue, 1 Sep 2026 12:32:03 -0500 Subject: [PATCH 1/2] Fix ERESOLVE warnings in build for react, react-dom and notistack. These all need to be pinned to versions that are compatible with Mirador v3. --- package-lock.json | 57 ++++++++++++++++------------------------------- package.json | 5 +++++ 2 files changed, 24 insertions(+), 38 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5bc7cd2fcf8..574052103db 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20718,6 +20718,25 @@ "react-dom": "16.x" } }, + "node_modules/mirador-share-plugin/node_modules/notistack": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/notistack/-/notistack-1.0.10.tgz", + "integrity": "sha512-z0y4jJaVtOoH3kc3GtNUlhNTY+5LE04QDeLVujX3VPhhzg67zw055mZjrBF+nzpv3V9aiPNph1EgRU4+t8kQTQ==", + "license": "MIT", + "dependencies": { + "clsx": "^1.1.0", + "hoist-non-react-statics": "^3.3.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/notistack" + }, + "peerDependencies": { + "@material-ui/core": "^4.0.0", + "react": "^16.8.0 || ^17.0.0", + "react-dom": "^16.8.0 || ^17.0.0" + } + }, "node_modules/mirador/node_modules/uuid": { "version": "8.3.2", "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", @@ -21226,44 +21245,6 @@ "node": ">=8" } }, - "node_modules/notistack": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/notistack/-/notistack-3.0.2.tgz", - "integrity": "sha512-0R+/arLYbK5Hh7mEfR2adt0tyXJcCC9KkA2hc56FeWik2QN6Bm/S4uW+BjzDARsJth5u06nTjelSw/VSnB1YEA==", - "license": "MIT", - "dependencies": { - "clsx": "^1.1.0", - "goober": "^2.0.33" - }, - "engines": { - "node": ">=12.0.0", - "npm": ">=6.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/notistack" - }, - "peerDependencies": { - "react": "^17.0.0 || ^18.0.0 || ^19.0.0", - "react-dom": "^17.0.0 || ^18.0.0 || ^19.0.0" - } - }, - "node_modules/notistack/node_modules/csstype": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.2.3.tgz", - "integrity": "sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==", - "license": "MIT", - "peer": true - }, - "node_modules/notistack/node_modules/goober": { - "version": "2.1.19", - "resolved": "https://registry.npmjs.org/goober/-/goober-2.1.19.tgz", - "integrity": "sha512-U7veizMqxyKlM58+Z5j2ngJBH/r9siDmxpvNxSw0PylF6WQvrASJEZrxh1hidRBJc2jqoBVSyOban5u8m+6Rxg==", - "license": "MIT", - "peerDependencies": { - "csstype": "^3.0.10" - } - }, "node_modules/nouislider": { "version": "15.8.1", "resolved": "https://registry.npmjs.org/nouislider/-/nouislider-15.8.1.tgz", diff --git a/package.json b/package.json index 16d7c55af66..48a27f8135f 100644 --- a/package.json +++ b/package.json @@ -76,6 +76,11 @@ "@nicky-lenaers/ngx-scroll-to": { "@angular/common": "^20.3.12", "@angular/core": "^20.3.12" + }, + "react": "16.14.0", + "react-dom": "16.14.0", + "mirador-share-plugin": { + "notistack": "1.0.10" } }, "dependencies": { From 8f2562b73b0c56fc559dce266462bb488dcc5610 Mon Sep 17 00:00:00 2001 From: Tim Donohue Date: Tue, 1 Sep 2026 12:33:26 -0500 Subject: [PATCH 2/2] Fix Mirador build process on `main`. Similar to "build:prod" it needs to use "cross-env" to work with later versions of Node (especially v22.20+) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 48a27f8135f..f842caa59d8 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "clean:prod": "npm run clean:dist && npm run clean:log && npm run clean:doc && npm run clean:coverage && npm run clean:json", "clean": "npm run clean:prod && npm run clean:dev:config && npm run clean:cli && npm run clean:decorator:registries && npm run clean:node", "sync-i18n": "ts-node -r tsconfig-paths/register --project ./tsconfig.ts-node.json scripts/sync-i18n-files.ts", - "build:mirador": "webpack --config webpack/webpack.mirador.config.ts", + "build:mirador": "cross-env TS_NODE_PROJECT=./tsconfig.ts-node.json webpack --config webpack/webpack.mirador.config.ts", "merge-i18n": "ts-node -r tsconfig-paths/register --project ./tsconfig.ts-node.json scripts/merge-i18n-files.ts", "cypress:open": "cypress open", "cypress:run": "cypress run",