From 01b3370afbfc89110774500ffeb0a5477ae5b52b Mon Sep 17 00:00:00 2001 From: "Adam J. Arling" Date: Mon, 11 Dec 2023 21:52:40 +0000 Subject: [PATCH] Pin Clover to a previous version so the Viewer will render OSD successfully. Remove previous viewer dependencies, and OpenSeadragon direct dependency --- app/assets/package-lock.json | 157 +++-------------------------------- app/assets/package.json | 4 +- 2 files changed, 11 insertions(+), 150 deletions(-) diff --git a/app/assets/package-lock.json b/app/assets/package-lock.json index 9fff8c0f6..ae096f85e 100644 --- a/app/assets/package-lock.json +++ b/app/assets/package-lock.json @@ -7,7 +7,7 @@ "license": "MIT", "dependencies": { "@absinthe/socket-apollo-link": "^0.2.1", - "@apollo/client": "*", + "@apollo/client": "latest", "@apollo/react-hooks": "^4.0.0", "@apollo/react-testing": "^4.0.0", "@appbaseio/reactivesearch": "3.23.1", @@ -20,7 +20,7 @@ "@honeybadger-io/react": "^6.1.7", "@nulib/design-system": "^1.5.1", "@radix-ui/react-dialog": "^1.0.5", - "@samvera/clover-iiif": "2.2.4", + "@samvera/clover-iiif": "^2.1.1", "@samvera/image-downloader": "^1.1.1", "bulma": "^0.9.4", "bulma-checkradio": "^2.1.3", @@ -41,8 +41,6 @@ "js-cookie": "^3.0.5", "moment": "^2.29.3", "node-webvtt": "^1.9.4", - "openseadragon": "^4.1.0", - "openseadragon-react-viewer": "^3.6.0", "phoenix": "^1.7.10", "prop-types": "^15.8.1", "rc-progress": "^3.5.1", @@ -6908,11 +6906,6 @@ "@babel/runtime": "^7.13.10" } }, - "node_modules/@reglendo/canvas2image": { - "version": "1.0.5-2", - "resolved": "https://registry.npmjs.org/@reglendo/canvas2image/-/canvas2image-1.0.5-2.tgz", - "integrity": "sha512-nt9QaZPwJxZdPZall2GuxpTLyZwSXwHlL35K8uJjpl29uCYVlWJAMa8JZ8vAXIhHSJ8e5a1tbiOqDBWX5JxVvA==" - }, "node_modules/@repeaterjs/repeater": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/@repeaterjs/repeater/-/repeater-3.0.4.tgz", @@ -6920,9 +6913,9 @@ "dev": true }, "node_modules/@samvera/clover-iiif": { - "version": "2.2.4", - "resolved": "https://registry.npmjs.org/@samvera/clover-iiif/-/clover-iiif-2.2.4.tgz", - "integrity": "sha512-Mq4+m5lOHVmS3I+GeVAyE0rtv/NGD6WnzxOpSgsJnIOlwRE+A3fpo1lii1PNGB1JoiyA/Otm/GoC0bLtcyTaFA==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@samvera/clover-iiif/-/clover-iiif-2.1.1.tgz", + "integrity": "sha512-QDdbHWPF9AIjcA2MojjspSWE9zRYhWaJimxGT+9w29MklKfFf1clLA0+JfOAgNAZ1VFLH9PFeT4vRvYxffq0YA==", "dependencies": { "@iiif/parser": "^1.1.2", "@iiif/vault": "^0.9.22", @@ -6930,21 +6923,21 @@ "@radix-ui/react-aspect-ratio": "^1.0.3", "@radix-ui/react-collapsible": "^1.0.3", "@radix-ui/react-form": "^0.0.3", - "@radix-ui/react-popover": "^1.0.7", + "@radix-ui/react-popover": "^1.0.6", "@radix-ui/react-radio-group": "^1.1.3", "@radix-ui/react-select": "^1.2.2", "@radix-ui/react-switch": "^1.0.3", "@radix-ui/react-tabs": "^1.0.4", "@stitches/react": "^1.2.8", - "hls.js": "^1.4.12", + "hls.js": "^1.4.10", "node-webvtt": "^1.9.4", - "openseadragon": "^2.4.2", + "openseadragon": "^2.4.2 || ^3.10", "react": "^18.2.0", "react-dom": "^18.2.0", "react-error-boundary": "^4.0.11", "sanitize-html": "^2.11.0", - "swiper": "^9.4.1", - "uuid": "^9.0.1" + "swiper": "9.4.1", + "uuid": "^9.0.0" }, "peerDependencies": { "swiper": "^9.0.0" @@ -7951,14 +7944,6 @@ "@types/react-router": "*" } }, - "node_modules/@types/react-transition-group": { - "version": "4.4.7", - "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.7.tgz", - "integrity": "sha512-ICCyBl5mvyqYp8Qeq9B5G/fyBSRC0zx3XM3sCC6KkcMsNeAHqXBKkmat4GqdJET5jtYUpZXrxI5flve5qhi2Eg==", - "dependencies": { - "@types/react": "*" - } - }, "node_modules/@types/react/node_modules/csstype": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.2.tgz", @@ -10967,20 +10952,6 @@ "integrity": "sha512-X7BJ2yElsnOJ30pZF4uIIDfBEVgF4XEBxL9Bxhy6dnrm5hkzqmsWHGTiHqRiITNhMyFLyAiWndIJP7Z1NTteDg==", "dev": true }, - "node_modules/dom-helpers": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.2.1.tgz", - "integrity": "sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==", - "dependencies": { - "@babel/runtime": "^7.8.7", - "csstype": "^3.0.2" - } - }, - "node_modules/dom-helpers/node_modules/csstype": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.2.tgz", - "integrity": "sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==" - }, "node_modules/dom-serializer": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz", @@ -17466,30 +17437,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/openseadragon": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/openseadragon/-/openseadragon-4.1.0.tgz", - "integrity": "sha512-XMMzf5apmshvIvxvqMwiW9dJ07dol4zudvV1oFnoZuIpSZP3c3tlFjGbyOKHGhb1k4jmHQ7b7koG9vCHdKvC/A==", - "funding": { - "url": "https://opencollective.com/openseadragon" - } - }, - "node_modules/openseadragon-react-viewer": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/openseadragon-react-viewer/-/openseadragon-react-viewer-3.6.0.tgz", - "integrity": "sha512-8hhP/FPhDgD+2HecQvH/4G6h6BImEJ6L7RwLEPlxY7pVNCG4QuD4J7madDNW3/QHjkL1Yl32IXEcCArwGerr4g==", - "dependencies": { - "@emotion/react": "^11.7.1", - "@reglendo/canvas2image": "^1.0.5-2", - "react-device-detect": "^2.1.2", - "react-select": "^5.2.1" - }, - "peerDependencies": { - "openseadragon": "^2.4 || ^3.0.0", - "react": "^16.8 || ^17.0 || ^18.0", - "react-dom": "^16.8 || ^17.0 || ^18.0" - } - }, "node_modules/optimism": { "version": "0.18.0", "resolved": "https://registry.npmjs.org/optimism/-/optimism-0.18.0.tgz", @@ -18688,75 +18635,6 @@ "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==", "dev": true }, - "node_modules/react-select": { - "version": "5.7.7", - "resolved": "https://registry.npmjs.org/react-select/-/react-select-5.7.7.tgz", - "integrity": "sha512-HhashZZJDRlfF/AKj0a0Lnfs3sRdw/46VJIRd8IbB9/Ovr74+ZIwkAdSBjSPXsFMG+u72c5xShqwLSKIJllzqw==", - "dependencies": { - "@babel/runtime": "^7.12.0", - "@emotion/cache": "^11.4.0", - "@emotion/react": "^11.8.1", - "@floating-ui/dom": "^1.0.1", - "@types/react-transition-group": "^4.4.0", - "memoize-one": "^6.0.0", - "prop-types": "^15.6.0", - "react-transition-group": "^4.3.0", - "use-isomorphic-layout-effect": "^1.1.2" - }, - "peerDependencies": { - "react": "^16.8.0 || ^17.0.0 || ^18.0.0", - "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0" - } - }, - "node_modules/react-select/node_modules/@emotion/cache": { - "version": "11.11.0", - "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.11.0.tgz", - "integrity": "sha512-P34z9ssTCBi3e9EI1ZsWpNHcfY1r09ZO0rZbRO2ob3ZQMnFI35jB536qoXbkdesr5EUhYi22anuEJuyxifaqAQ==", - "dependencies": { - "@emotion/memoize": "^0.8.1", - "@emotion/sheet": "^1.2.2", - "@emotion/utils": "^1.2.1", - "@emotion/weak-memoize": "^0.3.1", - "stylis": "4.2.0" - } - }, - "node_modules/react-select/node_modules/@emotion/sheet": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/@emotion/sheet/-/sheet-1.2.2.tgz", - "integrity": "sha512-0QBtGvaqtWi+nx6doRwDdBIzhNdZrXUppvTM4dtZZWEGTXL/XE/yJxLMGlDT1Gt+UHH5IX1n+jkXyytE/av7OA==" - }, - "node_modules/react-select/node_modules/@emotion/utils": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-1.2.1.tgz", - "integrity": "sha512-Y2tGf3I+XVnajdItskUCn6LX+VUDmP6lTL4fcqsXAv43dnlbZiuW4MWQW38rW/BVWSE7Q/7+XQocmpnRYILUmg==" - }, - "node_modules/react-select/node_modules/@emotion/weak-memoize": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.3.1.tgz", - "integrity": "sha512-EsBwpc7hBUJWAsNPBmJy4hxWx12v6bshQsldrVmjxJoc3isbxhOrF2IcCpaXxfvq03NwkI7sbsOLXbYuqF/8Ww==" - }, - "node_modules/react-select/node_modules/@floating-ui/core": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.5.0.tgz", - "integrity": "sha512-kK1h4m36DQ0UHGj5Ah4db7R0rHemTqqO0QLvUqi1/mUUp3LuAWbWxdxSIf/XsnH9VS6rRVPLJCncjRzUvyCLXg==", - "dependencies": { - "@floating-ui/utils": "^0.1.3" - } - }, - "node_modules/react-select/node_modules/@floating-ui/dom": { - "version": "1.5.3", - "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.5.3.tgz", - "integrity": "sha512-ClAbQnEqJAKCJOEbbLo5IUlZHkNszqhuxS4fHAVxRPXPya6Ysf2G8KypnYcOTpx6I8xcgF9bbHb6g/2KpbV8qA==", - "dependencies": { - "@floating-ui/core": "^1.4.2", - "@floating-ui/utils": "^0.1.3" - } - }, - "node_modules/react-select/node_modules/memoize-one": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-6.0.0.tgz", - "integrity": "sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw==" - }, "node_modules/react-side-effect": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/react-side-effect/-/react-side-effect-2.1.2.tgz", @@ -18824,21 +18702,6 @@ } } }, - "node_modules/react-transition-group": { - "version": "4.4.5", - "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.5.tgz", - "integrity": "sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g==", - "dependencies": { - "@babel/runtime": "^7.5.5", - "dom-helpers": "^5.0.1", - "loose-envify": "^1.4.0", - "prop-types": "^15.6.2" - }, - "peerDependencies": { - "react": ">=16.6.0", - "react-dom": ">=16.6.0" - } - }, "node_modules/readable-stream": { "version": "2.3.8", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", diff --git a/app/assets/package.json b/app/assets/package.json index 07033bdb8..b0b4303d0 100644 --- a/app/assets/package.json +++ b/app/assets/package.json @@ -30,7 +30,7 @@ "@honeybadger-io/react": "^6.1.7", "@nulib/design-system": "^1.5.1", "@radix-ui/react-dialog": "^1.0.5", - "@samvera/clover-iiif": "2.2.4", + "@samvera/clover-iiif": "^2.1.1", "@samvera/image-downloader": "^1.1.1", "bulma": "^0.9.4", "bulma-checkradio": "^2.1.3", @@ -51,8 +51,6 @@ "js-cookie": "^3.0.5", "moment": "^2.29.3", "node-webvtt": "^1.9.4", - "openseadragon": "^4.1.0", - "openseadragon-react-viewer": "^3.6.0", "phoenix": "^1.7.10", "prop-types": "^15.8.1", "rc-progress": "^3.5.1",