From 9b2822867dc759b6cc65f5a4495dc0086c4d1b9c Mon Sep 17 00:00:00 2001 From: feederbox826 Date: Wed, 29 Apr 2026 17:36:12 -0400 Subject: [PATCH 1/2] minor package, apollo update --- ui/v2.5/.eslintrc.json | 3 +- ui/v2.5/package.json | 16 +- ui/v2.5/pnpm-lock.yaml | 717 +++++++++--------- .../components/List/FilteredListToolbar.tsx | 4 +- ui/v2.5/src/components/List/ItemList.tsx | 12 +- ui/v2.5/src/components/List/ListProvider.tsx | 10 +- ui/v2.5/src/components/List/util.ts | 10 +- ui/v2.5/src/components/Settings/context.tsx | 4 +- .../components/Shared/DeleteEntityDialog.tsx | 4 +- .../Shared/PackageManager/PackageManager.tsx | 3 +- ui/v2.5/src/core/StashService.ts | 283 ++++--- ui/v2.5/src/core/createClient.ts | 4 +- ui/v2.5/src/index.tsx | 2 +- ui/v2.5/tsconfig.json | 6 +- 14 files changed, 607 insertions(+), 471 deletions(-) diff --git a/ui/v2.5/.eslintrc.json b/ui/v2.5/.eslintrc.json index fc12fb963..0855ed07c 100644 --- a/ui/v2.5/.eslintrc.json +++ b/ui/v2.5/.eslintrc.json @@ -4,7 +4,8 @@ }, "parser": "@typescript-eslint/parser", "parserOptions": { - "project": "./tsconfig.json" + "project": "./tsconfig.json", + "tsconfigRootDir": "." }, "plugins": ["@typescript-eslint", "jsx-a11y"], "extends": [ diff --git a/ui/v2.5/package.json b/ui/v2.5/package.json index be9b9dc10..9696f88c6 100644 --- a/ui/v2.5/package.json +++ b/ui/v2.5/package.json @@ -2,7 +2,7 @@ "name": "stash", "private": true, "type": "module", - "packageManager": "pnpm@10.33.0+sha512.10568bb4a6afb58c9eb3630da90cc9516417abebd3fabbe6739f0ae795728da1491e9db5a544c76ad8eb7570f5c4bb3d6c637b2cb41bfdcdb47fa823c8649319", + "packageManager": "pnpm@10.33.2+sha512.a90faf6feeab71ad6c6e57f94e0fe1a12f5dcc22cd754db40ae9593eb6a3e0b6b12e3540218bb37ae083404b1f2ce6db2a4121e979829b4aff94b99f49da1cf8", "engines": { "node": ">= 20" }, @@ -25,8 +25,8 @@ }, "dependencies": { "@ant-design/react-slick": "^1.0.0", - "@apollo/client": "3.14", - "@blaineam/videojs-vr": "^3.1.1", + "@apollo/client": "^4.1.9", + "@blaineam/videojs-vr": "^3.1.4", "@formatjs/intl-getcanonicallocales": "^3.2.2", "@formatjs/intl-locale": "^5.3.1", "@formatjs/intl-numberformat": "^8.15.6", @@ -40,7 +40,7 @@ "@silvermine/videojs-airplay": "^1.3.0", "@silvermine/videojs-chromecast": "^1.5.0", "@types/react-router-dom": "^5.3.3", - "apollo-upload-client": "18", + "apollo-upload-client": "^18.0.1", "base64-blob": "^1.4.1", "bootstrap": "^4.6.2", "classnames": "^2.5.1", @@ -49,7 +49,7 @@ "flag-icons": "^7.5.0", "flexbin": "^0.2.0", "formik": "^2.4.9", - "graphql": "^16.8.1", + "graphql": "^16.13.2", "graphql-tag": "^2.12.6", "graphql-ws": "^5.14.3", "i18n-iso-countries": "^7.14.0", @@ -75,7 +75,7 @@ "slick-carousel": "^1.8.1", "thehandy": "^1.1.0", "ua-parser-js": "^2.0.9", - "universal-cookie": "^8.1.0", + "universal-cookie": "^8.1.1", "video.js": "^7.21.7", "videojs-abloop": "^1.2.0", "videojs-contrib-dash": "^5.1.1", @@ -91,7 +91,7 @@ "@graphql-codegen/typescript": "^4.0.1", "@graphql-codegen/typescript-operations": "^4.0.1", "@graphql-codegen/typescript-react-apollo": "^4.1.0", - "@types/apollo-upload-client": "^18.0.0", + "@types/apollo-upload-client": "^18.0.1", "@types/crypto-js": "^4.2.2", "@types/lodash-es": "^4.17.12", "@types/mousetrap": "^1.6.15", @@ -128,7 +128,7 @@ "stylelint-order": "^8.1.1", "terser": "^5.46.1", "ts-node": "~10.9.2", - "typescript": "~5.9.3", + "typescript": "~6.0.3", "vite": "^7.3.2", "vite-plugin-compression": "^0.5.1", "vite-tsconfig-paths": "^6.1.1" diff --git a/ui/v2.5/pnpm-lock.yaml b/ui/v2.5/pnpm-lock.yaml index 887121082..a1aff43fe 100644 --- a/ui/v2.5/pnpm-lock.yaml +++ b/ui/v2.5/pnpm-lock.yaml @@ -17,11 +17,11 @@ importers: specifier: ^1.0.0 version: 1.1.2(react@17.0.2) '@apollo/client': - specifier: '3.14' - version: 3.14.0(@types/react@17.0.89)(graphql-ws@5.16.2(graphql@16.11.0))(graphql@16.11.0)(react-dom@17.0.2(react@17.0.2))(react@17.0.2) + specifier: ^4.1.9 + version: 4.1.9(graphql-ws@5.16.2(graphql@16.13.2))(graphql@16.13.2)(react-dom@17.0.2(react@17.0.2))(react@17.0.2)(rxjs@7.8.2) '@blaineam/videojs-vr': - specifier: ^3.1.1 - version: 3.1.1 + specifier: ^3.1.4 + version: 3.1.4 '@formatjs/intl-getcanonicallocales': specifier: ^3.2.2 version: 3.2.2 @@ -62,8 +62,8 @@ importers: specifier: ^5.3.3 version: 5.3.3 apollo-upload-client: - specifier: '18' - version: 18.0.1(@apollo/client@3.14.0(@types/react@17.0.89)(graphql-ws@5.16.2(graphql@16.11.0))(graphql@16.11.0)(react-dom@17.0.2(react@17.0.2))(react@17.0.2))(graphql@16.11.0) + specifier: ^18.0.1 + version: 18.0.1(@apollo/client@4.1.9(graphql-ws@5.16.2(graphql@16.13.2))(graphql@16.13.2)(react-dom@17.0.2(react@17.0.2))(react@17.0.2)(rxjs@7.8.2))(graphql@16.13.2) base64-blob: specifier: ^1.4.1 version: 1.4.1 @@ -89,14 +89,14 @@ importers: specifier: ^2.4.9 version: 2.4.9(@types/react@17.0.89)(react@17.0.2) graphql: - specifier: ^16.8.1 - version: 16.11.0 + specifier: ^16.13.2 + version: 16.13.2 graphql-tag: specifier: ^2.12.6 - version: 2.12.6(graphql@16.11.0) + version: 2.12.6(graphql@16.13.2) graphql-ws: specifier: ^5.14.3 - version: 5.16.2(graphql@16.11.0) + version: 5.16.2(graphql@16.13.2) i18n-iso-countries: specifier: ^7.14.0 version: 7.14.0 @@ -132,7 +132,7 @@ importers: version: 6.1.0(react@17.0.2) react-intl: specifier: ^6.2.8 - version: 6.8.9(react@17.0.2)(typescript@5.9.3) + version: 6.8.9(react@17.0.2)(typescript@6.0.3) react-photo-gallery: specifier: ^8.0.0 version: 8.0.0(react-dom@17.0.2(react@17.0.2))(react@17.0.2) @@ -167,8 +167,8 @@ importers: specifier: ^2.0.9 version: 2.0.9 universal-cookie: - specifier: ^8.1.0 - version: 8.1.0 + specifier: ^8.1.1 + version: 8.1.1 video.js: specifier: ^7.21.7 version: 7.21.7 @@ -196,22 +196,22 @@ importers: version: 7.29.0 '@graphql-codegen/cli': specifier: ^5.0.0 - version: 5.0.7(@parcel/watcher@2.5.1)(@types/node@20.19.37)(graphql@16.11.0)(typescript@5.9.3) + version: 5.0.7(@parcel/watcher@2.5.1)(@types/node@20.19.37)(graphql@16.13.2)(typescript@6.0.3) '@graphql-codegen/time': specifier: ^5.0.0 - version: 5.0.1(graphql@16.11.0) + version: 5.0.1(graphql@16.13.2) '@graphql-codegen/typescript': specifier: ^4.0.1 - version: 4.1.6(graphql@16.11.0) + version: 4.1.6(graphql@16.13.2) '@graphql-codegen/typescript-operations': specifier: ^4.0.1 - version: 4.6.1(graphql@16.11.0) + version: 4.6.1(graphql@16.13.2) '@graphql-codegen/typescript-react-apollo': specifier: ^4.1.0 - version: 4.3.3(graphql@16.11.0) + version: 4.3.3(graphql@16.13.2) '@types/apollo-upload-client': - specifier: ^18.0.0 - version: 18.0.1(@types/react@17.0.89)(graphql-ws@5.16.2(graphql@16.11.0))(react-dom@17.0.2(react@17.0.2))(react@17.0.2) + specifier: ^18.0.1 + version: 18.0.1(@types/react@17.0.89)(graphql-ws@5.16.2(graphql@16.13.2))(react-dom@17.0.2(react@17.0.2))(react@17.0.2) '@types/crypto-js': specifier: ^4.2.2 version: 4.2.2 @@ -259,10 +259,10 @@ importers: version: 2.1.3 '@typescript-eslint/eslint-plugin': specifier: ^7.18.0 - version: 7.18.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.9.3))(eslint@8.57.1)(typescript@5.9.3) + version: 7.18.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@6.0.3))(eslint@8.57.1)(typescript@6.0.3) '@typescript-eslint/parser': specifier: ^7.18.0 - version: 7.18.0(eslint@8.57.1)(typescript@5.9.3) + version: 7.18.0(eslint@8.57.1)(typescript@6.0.3) '@vitejs/plugin-react': specifier: ^5.2.0 version: 5.2.0(vite@7.3.2(@types/node@20.19.37)(jiti@2.6.1)(lightningcss@1.32.0)(sass@1.98.0)(terser@5.46.1)(yaml@2.8.1)) @@ -271,19 +271,19 @@ importers: version: 8.57.1 eslint-config-airbnb: specifier: ^19.0.4 - version: 19.0.4(eslint-plugin-import@2.32.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.9.3))(eslint@8.57.1))(eslint-plugin-jsx-a11y@6.10.2(eslint@8.57.1))(eslint-plugin-react-hooks@4.6.2(eslint@8.57.1))(eslint-plugin-react@7.37.5(eslint@8.57.1))(eslint@8.57.1) + version: 19.0.4(eslint-plugin-import@2.32.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@6.0.3))(eslint@8.57.1))(eslint-plugin-jsx-a11y@6.10.2(eslint@8.57.1))(eslint-plugin-react-hooks@4.6.2(eslint@8.57.1))(eslint-plugin-react@7.37.5(eslint@8.57.1))(eslint@8.57.1) eslint-config-airbnb-typescript: specifier: ^18.0.0 - version: 18.0.0(@typescript-eslint/eslint-plugin@7.18.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.9.3))(eslint@8.57.1)(typescript@5.9.3))(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.9.3))(eslint-plugin-import@2.32.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.9.3))(eslint@8.57.1))(eslint@8.57.1) + version: 18.0.0(@typescript-eslint/eslint-plugin@7.18.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@6.0.3))(eslint@8.57.1)(typescript@6.0.3))(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@6.0.3))(eslint-plugin-import@2.32.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@6.0.3))(eslint@8.57.1))(eslint@8.57.1) eslint-config-prettier: specifier: ^8.10.2 version: 8.10.2(eslint@8.57.1) eslint-plugin-deprecation: specifier: ^3.0.0 - version: 3.0.0(eslint@8.57.1)(typescript@5.9.3) + version: 3.0.0(eslint@8.57.1)(typescript@6.0.3) eslint-plugin-import: specifier: ^2.32.0 - version: 2.32.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.9.3))(eslint@8.57.1) + version: 2.32.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@6.0.3))(eslint@8.57.1) eslint-plugin-jsx-a11y: specifier: ^6.10.2 version: 6.10.2(eslint@8.57.1) @@ -310,19 +310,19 @@ importers: version: 1.98.0 stylelint: specifier: ^17.6.0 - version: 17.6.0(typescript@5.9.3) + version: 17.6.0(typescript@6.0.3) stylelint-order: specifier: ^8.1.1 - version: 8.1.1(stylelint@17.6.0(typescript@5.9.3)) + version: 8.1.1(stylelint@17.6.0(typescript@6.0.3)) terser: specifier: ^5.46.1 version: 5.46.1 ts-node: specifier: ~10.9.2 - version: 10.9.2(@types/node@20.19.37)(typescript@5.9.3) + version: 10.9.2(@types/node@20.19.37)(typescript@6.0.3) typescript: - specifier: ~5.9.3 - version: 5.9.3 + specifier: ~6.0.3 + version: 6.0.3 vite: specifier: ^7.3.2 version: 7.3.2(@types/node@20.19.37)(jiti@2.6.1)(lightningcss@1.32.0)(sass@1.98.0)(terser@5.46.1)(yaml@2.8.1) @@ -331,7 +331,7 @@ importers: version: 0.5.1(vite@7.3.2(@types/node@20.19.37)(jiti@2.6.1)(lightningcss@1.32.0)(sass@1.98.0)(terser@5.46.1)(yaml@2.8.1)) vite-tsconfig-paths: specifier: ^6.1.1 - version: 6.1.1(typescript@5.9.3)(vite@7.3.2(@types/node@20.19.37)(jiti@2.6.1)(lightningcss@1.32.0)(sass@1.98.0)(terser@5.46.1)(yaml@2.8.1)) + version: 6.1.1(typescript@6.0.3)(vite@7.3.2(@types/node@20.19.37)(jiti@2.6.1)(lightningcss@1.32.0)(sass@1.98.0)(terser@5.46.1)(yaml@2.8.1)) packages: @@ -340,8 +340,8 @@ packages: peerDependencies: react: '>=16.9.0' - '@apollo/client@3.14.0': - resolution: {integrity: sha512-0YQKKRIxiMlIou+SekQqdCo0ZTHxOcES+K8vKB53cIDpwABNR0P0yRzPgsbgcj3zRJniD93S/ontsnZsCLZrxQ==} + '@apollo/client@3.14.1': + resolution: {integrity: sha512-SgGX6E23JsZhUdG2anxiyHvEvvN6CUaI4ZfMsndZFeuHPXL3H0IsaiNAhLITSISbeyeYd+CBd9oERXQDdjXWZw==} peerDependencies: graphql: ^15.0.0 || ^16.0.0 graphql-ws: ^5.5.5 || ^6.0.3 @@ -358,6 +358,25 @@ packages: subscriptions-transport-ws: optional: true + '@apollo/client@4.1.9': + resolution: {integrity: sha512-qfpkQD51tdU/7iAR6aLb4w9o/L7I475DluWHRb61U/3Q0AH29nNOxOBHjBbWDdf16ncPOoQuxne1sEs2NjqBFw==} + peerDependencies: + graphql: ^16.0.0 + graphql-ws: ^5.5.5 || ^6.0.3 + react: ^17.0.0 || ^18.0.0 || >=19.0.0-rc + react-dom: ^17.0.0 || ^18.0.0 || >=19.0.0-rc + rxjs: ^7.3.0 + subscriptions-transport-ws: ^0.9.0 || ^0.11.0 + peerDependenciesMeta: + graphql-ws: + optional: true + react: + optional: true + react-dom: + optional: true + subscriptions-transport-ws: + optional: true + '@ardatan/relay-compiler@12.0.0': resolution: {integrity: sha512-9anThAaj1dQr6IGmzBMcfzOQKTa5artjuPmw8NYK/fiGEMjADbSguBY2FMDykt+QhilR3wc9VA/3yVju7JHg7Q==} hasBin: true @@ -647,8 +666,8 @@ packages: resolution: {integrity: sha512-LwdZHpScM4Qz8Xw2iKSzS+cfglZzJGvofQICy7W7v4caru4EaAmyUuO6BGrbyQ2mYV11W0U8j5mBhd14dd3B0A==} engines: {node: '>=6.9.0'} - '@blaineam/videojs-vr@3.1.1': - resolution: {integrity: sha512-3W69DgimXeU9RPa7l4x8+37GExWn/OlOVP+1QrrQ4R7yuqCuDD3slKPTNEFzITyHXN8XpVdEAwdH3oFeElYg+g==} + '@blaineam/videojs-vr@3.1.4': + resolution: {integrity: sha512-6L7NxCyvvc3D788yuQGo6S24qeqWz7oIa7WcUWGaTyq6lsiHJI84S5lIyKSgTO0bVIPKsAdSn7TY66CtNuyPLQ==} '@cacheable/memory@2.0.8': resolution: {integrity: sha512-FvEb29x5wVwu/Kf93IWwsOOEuhHh6dYCJF3vcKLzXc0KXIW181AOzv6ceT4ZpBHDvAfG60eqb+ekmrnLHIy+jw==} @@ -3020,8 +3039,8 @@ packages: ws: optional: true - graphql@16.11.0: - resolution: {integrity: sha512-mS1lbMsxgQj6hge1XZ6p7GPhbrtFwUFYi3wRzXAC/FmYnyXMTvvI3td3rjmQ2u8ewXueaSvRPWaEcgVVOT9Jnw==} + graphql@16.13.2: + resolution: {integrity: sha512-5bJ+nf/UCpAjHM8i06fl7eLyVC9iuNAjm9qzkiu2ZGhM0VscSvS6WDPfAwkdkBuoXGM9FJSbKl6wylMwP9Ktig==} engines: {node: ^12.22.0 || ^14.16.0 || ^16.0.0 || >=17.0.0} hard-rejection@2.1.0: @@ -4669,8 +4688,8 @@ packages: thehandy@1.1.0: resolution: {integrity: sha512-ZifUw47kq6cKNiKLNgrnVPkBFbG+yR6tScgWy2INDnGT4XePhjRaQNni67rWn52nAOkotq9VyaK20OZoorHqTA==} - three@0.125.2: - resolution: {integrity: sha512-7rIRO23jVKWcAPFdW/HREU2NZMGWPBZ4XwEMt0Ak0jwLUKVJhcKM55eCBWyGZq/KiQbeo1IeuAoo/9l2dzhTXA==} + three@0.183.2: + resolution: {integrity: sha512-di3BsL2FEQ1PA7Hcvn4fyJOlxRRgFYBpMTcyOgkwJIaDOdJMebEFPA+t98EvjuljDx4hNulAGwF6KIjtwI5jgQ==} throttle-debounce@5.0.2: resolution: {integrity: sha512-B71/4oyj61iNH0KeCamLuE2rmKuTO5byTOSVwECM5FA7TiAiAW+UqTKZ9ERueC4qvgSttUhdmq1mXC3kJqGX7A==} @@ -4817,8 +4836,8 @@ packages: engines: {node: '>=4.2.0'} hasBin: true - typescript@5.9.3: - resolution: {integrity: sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==} + typescript@6.0.3: + resolution: {integrity: sha512-y2TvuxSZPDyQakkFRPZHKFm+KKVqIisdg9/CZwm9ftvKXLP8NRWj38/ODjNbr43SsoXqNuAisEf1GdCxqWcdBw==} engines: {node: '>=14.17'} hasBin: true @@ -4886,8 +4905,8 @@ packages: unist-util-visit@2.0.3: resolution: {integrity: sha512-iJ4/RczbJMkD0712mGktuGpm/U4By4FfDonL7N/9tATGIF4imikjOuagyMY53tnZq3NP6BcmlrHhEKAfGWjh7Q==} - universal-cookie@8.1.0: - resolution: {integrity: sha512-65+kikQAWq7gsJbirwB7dk6e8xeug1hx3++x2dQoymdXcV7fYv0yChOgHCg01ZwP3fE3sYeq6EWCSpFv3HLl9g==} + universal-cookie@8.1.1: + resolution: {integrity: sha512-0wTDiq7TyvJz7YsswNMKWns4ZGJjO2RBFuVlyKiIDkBKc1mceMxjGwGlIcGFHp+xT4OZKOI7XF7jRCnCavC7Mg==} universalify@2.0.1: resolution: {integrity: sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==} @@ -5194,14 +5213,14 @@ snapshots: resize-observer-polyfill: 1.5.1 throttle-debounce: 5.0.2 - '@apollo/client@3.14.0(@types/react@17.0.89)(graphql-ws@5.16.2(graphql@16.11.0))(graphql@16.11.0)(react-dom@17.0.2(react@17.0.2))(react@17.0.2)': + '@apollo/client@3.14.1(@types/react@17.0.89)(graphql-ws@5.16.2(graphql@16.13.2))(graphql@16.13.2)(react-dom@17.0.2(react@17.0.2))(react@17.0.2)': dependencies: - '@graphql-typed-document-node/core': 3.2.0(graphql@16.11.0) + '@graphql-typed-document-node/core': 3.2.0(graphql@16.13.2) '@wry/caches': 1.0.1 '@wry/equality': 0.5.7 '@wry/trie': 0.5.0 - graphql: 16.11.0 - graphql-tag: 2.12.6(graphql@16.11.0) + graphql: 16.13.2 + graphql-tag: 2.12.6(graphql@16.13.2) hoist-non-react-statics: 3.3.2 optimism: 0.18.1 prop-types: 15.8.1 @@ -5211,13 +5230,29 @@ snapshots: tslib: 2.8.1 zen-observable-ts: 1.2.5 optionalDependencies: - graphql-ws: 5.16.2(graphql@16.11.0) + graphql-ws: 5.16.2(graphql@16.13.2) react: 17.0.2 react-dom: 17.0.2(react@17.0.2) transitivePeerDependencies: - '@types/react' - '@ardatan/relay-compiler@12.0.0(graphql@16.11.0)': + '@apollo/client@4.1.9(graphql-ws@5.16.2(graphql@16.13.2))(graphql@16.13.2)(react-dom@17.0.2(react@17.0.2))(react@17.0.2)(rxjs@7.8.2)': + dependencies: + '@graphql-typed-document-node/core': 3.2.0(graphql@16.13.2) + '@wry/caches': 1.0.1 + '@wry/equality': 0.5.7 + '@wry/trie': 0.5.0 + graphql: 16.13.2 + graphql-tag: 2.12.6(graphql@16.13.2) + optimism: 0.18.1 + rxjs: 7.8.2 + tslib: 2.8.1 + optionalDependencies: + graphql-ws: 5.16.2(graphql@16.13.2) + react: 17.0.2 + react-dom: 17.0.2(react@17.0.2) + + '@ardatan/relay-compiler@12.0.0(graphql@16.13.2)': dependencies: '@babel/core': 7.29.0 '@babel/generator': 7.29.1 @@ -5230,7 +5265,7 @@ snapshots: fb-watchman: 2.0.2 fbjs: 3.0.5 glob: 7.2.3 - graphql: 16.11.0 + graphql: 16.13.2 immutable: 3.7.6 invariant: 2.2.4 nullthrows: 1.1.1 @@ -5241,14 +5276,14 @@ snapshots: - encoding - supports-color - '@ardatan/relay-compiler@12.0.3(graphql@16.11.0)': + '@ardatan/relay-compiler@12.0.3(graphql@16.13.2)': dependencies: '@babel/generator': 7.29.1 '@babel/parser': 7.29.2 '@babel/runtime': 7.29.2 chalk: 4.1.2 fb-watchman: 2.0.2 - graphql: 16.11.0 + graphql: 16.13.2 immutable: 3.7.6 invariant: 2.2.4 nullthrows: 1.1.1 @@ -5591,11 +5626,11 @@ snapshots: '@babel/helper-string-parser': 7.27.1 '@babel/helper-validator-identifier': 7.28.5 - '@blaineam/videojs-vr@3.1.1': + '@blaineam/videojs-vr@3.1.4': dependencies: '@babel/runtime': 7.29.2 global: 4.4.0 - three: 0.125.2 + three: 0.183.2 video.js: 7.21.7 webvr-polyfill: 0.10.12 @@ -5945,7 +5980,7 @@ snapshots: '@formatjs/ecma402-abstract': 3.2.0 '@formatjs/fast-memoize': 3.1.1 - '@formatjs/intl@2.10.15(typescript@5.9.3)': + '@formatjs/intl@2.10.15(typescript@6.0.3)': dependencies: '@formatjs/ecma402-abstract': 2.2.4 '@formatjs/fast-memoize': 2.2.3 @@ -5955,7 +5990,7 @@ snapshots: intl-messageformat: 10.7.7 tslib: 2.8.1 optionalDependencies: - typescript: 5.9.3 + typescript: 6.0.3 '@formatjs/ts-transformer@2.13.0': dependencies: @@ -5987,37 +6022,37 @@ snapshots: prop-types: 15.8.1 react: 17.0.2 - '@graphql-codegen/add@5.0.3(graphql@16.11.0)': + '@graphql-codegen/add@5.0.3(graphql@16.13.2)': dependencies: - '@graphql-codegen/plugin-helpers': 5.1.1(graphql@16.11.0) - graphql: 16.11.0 + '@graphql-codegen/plugin-helpers': 5.1.1(graphql@16.13.2) + graphql: 16.13.2 tslib: 2.6.3 - '@graphql-codegen/cli@5.0.7(@parcel/watcher@2.5.1)(@types/node@20.19.37)(graphql@16.11.0)(typescript@5.9.3)': + '@graphql-codegen/cli@5.0.7(@parcel/watcher@2.5.1)(@types/node@20.19.37)(graphql@16.13.2)(typescript@6.0.3)': dependencies: '@babel/generator': 7.29.1 '@babel/template': 7.28.6 '@babel/types': 7.29.0 - '@graphql-codegen/client-preset': 4.8.3(graphql@16.11.0) - '@graphql-codegen/core': 4.0.2(graphql@16.11.0) - '@graphql-codegen/plugin-helpers': 5.1.1(graphql@16.11.0) - '@graphql-tools/apollo-engine-loader': 8.0.22(graphql@16.11.0) - '@graphql-tools/code-file-loader': 8.1.22(graphql@16.11.0) - '@graphql-tools/git-loader': 8.0.26(graphql@16.11.0) - '@graphql-tools/github-loader': 8.0.22(@types/node@20.19.37)(graphql@16.11.0) - '@graphql-tools/graphql-file-loader': 8.1.2(graphql@16.11.0) - '@graphql-tools/json-file-loader': 8.0.20(graphql@16.11.0) - '@graphql-tools/load': 8.1.2(graphql@16.11.0) - '@graphql-tools/prisma-loader': 8.0.17(@types/node@20.19.37)(graphql@16.11.0) - '@graphql-tools/url-loader': 8.0.33(@types/node@20.19.37)(graphql@16.11.0) - '@graphql-tools/utils': 10.9.1(graphql@16.11.0) + '@graphql-codegen/client-preset': 4.8.3(graphql@16.13.2) + '@graphql-codegen/core': 4.0.2(graphql@16.13.2) + '@graphql-codegen/plugin-helpers': 5.1.1(graphql@16.13.2) + '@graphql-tools/apollo-engine-loader': 8.0.22(graphql@16.13.2) + '@graphql-tools/code-file-loader': 8.1.22(graphql@16.13.2) + '@graphql-tools/git-loader': 8.0.26(graphql@16.13.2) + '@graphql-tools/github-loader': 8.0.22(@types/node@20.19.37)(graphql@16.13.2) + '@graphql-tools/graphql-file-loader': 8.1.2(graphql@16.13.2) + '@graphql-tools/json-file-loader': 8.0.20(graphql@16.13.2) + '@graphql-tools/load': 8.1.2(graphql@16.13.2) + '@graphql-tools/prisma-loader': 8.0.17(@types/node@20.19.37)(graphql@16.13.2) + '@graphql-tools/url-loader': 8.0.33(@types/node@20.19.37)(graphql@16.13.2) + '@graphql-tools/utils': 10.9.1(graphql@16.13.2) '@whatwg-node/fetch': 0.10.11 chalk: 4.1.2 - cosmiconfig: 8.3.6(typescript@5.9.3) + cosmiconfig: 8.3.6(typescript@6.0.3) debounce: 1.2.1 detect-indent: 6.1.0 - graphql: 16.11.0 - graphql-config: 5.1.5(@types/node@20.19.37)(graphql@16.11.0)(typescript@5.9.3) + graphql: 16.13.2 + graphql-config: 5.1.5(@types/node@20.19.37)(graphql@16.13.2)(typescript@6.0.3) inquirer: 8.2.7(@types/node@20.19.37) is-glob: 4.0.3 jiti: 1.21.7 @@ -6047,150 +6082,150 @@ snapshots: - uWebSockets.js - utf-8-validate - '@graphql-codegen/client-preset@4.8.3(graphql@16.11.0)': + '@graphql-codegen/client-preset@4.8.3(graphql@16.13.2)': dependencies: '@babel/helper-plugin-utils': 7.28.6 '@babel/template': 7.28.6 - '@graphql-codegen/add': 5.0.3(graphql@16.11.0) - '@graphql-codegen/gql-tag-operations': 4.0.17(graphql@16.11.0) - '@graphql-codegen/plugin-helpers': 5.1.1(graphql@16.11.0) - '@graphql-codegen/typed-document-node': 5.1.2(graphql@16.11.0) - '@graphql-codegen/typescript': 4.1.6(graphql@16.11.0) - '@graphql-codegen/typescript-operations': 4.6.1(graphql@16.11.0) - '@graphql-codegen/visitor-plugin-common': 5.8.0(graphql@16.11.0) - '@graphql-tools/documents': 1.0.1(graphql@16.11.0) - '@graphql-tools/utils': 10.9.1(graphql@16.11.0) - '@graphql-typed-document-node/core': 3.2.0(graphql@16.11.0) - graphql: 16.11.0 + '@graphql-codegen/add': 5.0.3(graphql@16.13.2) + '@graphql-codegen/gql-tag-operations': 4.0.17(graphql@16.13.2) + '@graphql-codegen/plugin-helpers': 5.1.1(graphql@16.13.2) + '@graphql-codegen/typed-document-node': 5.1.2(graphql@16.13.2) + '@graphql-codegen/typescript': 4.1.6(graphql@16.13.2) + '@graphql-codegen/typescript-operations': 4.6.1(graphql@16.13.2) + '@graphql-codegen/visitor-plugin-common': 5.8.0(graphql@16.13.2) + '@graphql-tools/documents': 1.0.1(graphql@16.13.2) + '@graphql-tools/utils': 10.9.1(graphql@16.13.2) + '@graphql-typed-document-node/core': 3.2.0(graphql@16.13.2) + graphql: 16.13.2 tslib: 2.6.3 transitivePeerDependencies: - encoding - '@graphql-codegen/core@4.0.2(graphql@16.11.0)': + '@graphql-codegen/core@4.0.2(graphql@16.13.2)': dependencies: - '@graphql-codegen/plugin-helpers': 5.1.1(graphql@16.11.0) - '@graphql-tools/schema': 10.0.25(graphql@16.11.0) - '@graphql-tools/utils': 10.9.1(graphql@16.11.0) - graphql: 16.11.0 + '@graphql-codegen/plugin-helpers': 5.1.1(graphql@16.13.2) + '@graphql-tools/schema': 10.0.25(graphql@16.13.2) + '@graphql-tools/utils': 10.9.1(graphql@16.13.2) + graphql: 16.13.2 tslib: 2.6.3 - '@graphql-codegen/gql-tag-operations@4.0.17(graphql@16.11.0)': + '@graphql-codegen/gql-tag-operations@4.0.17(graphql@16.13.2)': dependencies: - '@graphql-codegen/plugin-helpers': 5.1.1(graphql@16.11.0) - '@graphql-codegen/visitor-plugin-common': 5.8.0(graphql@16.11.0) - '@graphql-tools/utils': 10.9.1(graphql@16.11.0) + '@graphql-codegen/plugin-helpers': 5.1.1(graphql@16.13.2) + '@graphql-codegen/visitor-plugin-common': 5.8.0(graphql@16.13.2) + '@graphql-tools/utils': 10.9.1(graphql@16.13.2) auto-bind: 4.0.0 - graphql: 16.11.0 + graphql: 16.13.2 tslib: 2.6.3 transitivePeerDependencies: - encoding - '@graphql-codegen/plugin-helpers@3.1.2(graphql@16.11.0)': + '@graphql-codegen/plugin-helpers@3.1.2(graphql@16.13.2)': dependencies: - '@graphql-tools/utils': 9.2.1(graphql@16.11.0) + '@graphql-tools/utils': 9.2.1(graphql@16.13.2) change-case-all: 1.0.15 common-tags: 1.8.2 - graphql: 16.11.0 + graphql: 16.13.2 import-from: 4.0.0 lodash: 4.17.21 tslib: 2.4.1 - '@graphql-codegen/plugin-helpers@5.1.1(graphql@16.11.0)': + '@graphql-codegen/plugin-helpers@5.1.1(graphql@16.13.2)': dependencies: - '@graphql-tools/utils': 10.9.1(graphql@16.11.0) + '@graphql-tools/utils': 10.9.1(graphql@16.13.2) change-case-all: 1.0.15 common-tags: 1.8.2 - graphql: 16.11.0 + graphql: 16.13.2 import-from: 4.0.0 lodash: 4.17.21 tslib: 2.6.3 - '@graphql-codegen/schema-ast@4.1.0(graphql@16.11.0)': + '@graphql-codegen/schema-ast@4.1.0(graphql@16.13.2)': dependencies: - '@graphql-codegen/plugin-helpers': 5.1.1(graphql@16.11.0) - '@graphql-tools/utils': 10.9.1(graphql@16.11.0) - graphql: 16.11.0 + '@graphql-codegen/plugin-helpers': 5.1.1(graphql@16.13.2) + '@graphql-tools/utils': 10.9.1(graphql@16.13.2) + graphql: 16.13.2 tslib: 2.6.3 - '@graphql-codegen/time@5.0.1(graphql@16.11.0)': + '@graphql-codegen/time@5.0.1(graphql@16.13.2)': dependencies: - '@graphql-codegen/plugin-helpers': 5.1.1(graphql@16.11.0) - graphql: 16.11.0 + '@graphql-codegen/plugin-helpers': 5.1.1(graphql@16.13.2) + graphql: 16.13.2 moment: 2.30.1 - '@graphql-codegen/typed-document-node@5.1.2(graphql@16.11.0)': + '@graphql-codegen/typed-document-node@5.1.2(graphql@16.13.2)': dependencies: - '@graphql-codegen/plugin-helpers': 5.1.1(graphql@16.11.0) - '@graphql-codegen/visitor-plugin-common': 5.8.0(graphql@16.11.0) + '@graphql-codegen/plugin-helpers': 5.1.1(graphql@16.13.2) + '@graphql-codegen/visitor-plugin-common': 5.8.0(graphql@16.13.2) auto-bind: 4.0.0 change-case-all: 1.0.15 - graphql: 16.11.0 + graphql: 16.13.2 tslib: 2.6.3 transitivePeerDependencies: - encoding - '@graphql-codegen/typescript-operations@4.6.1(graphql@16.11.0)': + '@graphql-codegen/typescript-operations@4.6.1(graphql@16.13.2)': dependencies: - '@graphql-codegen/plugin-helpers': 5.1.1(graphql@16.11.0) - '@graphql-codegen/typescript': 4.1.6(graphql@16.11.0) - '@graphql-codegen/visitor-plugin-common': 5.8.0(graphql@16.11.0) + '@graphql-codegen/plugin-helpers': 5.1.1(graphql@16.13.2) + '@graphql-codegen/typescript': 4.1.6(graphql@16.13.2) + '@graphql-codegen/visitor-plugin-common': 5.8.0(graphql@16.13.2) auto-bind: 4.0.0 - graphql: 16.11.0 + graphql: 16.13.2 tslib: 2.6.3 transitivePeerDependencies: - encoding - '@graphql-codegen/typescript-react-apollo@4.3.3(graphql@16.11.0)': + '@graphql-codegen/typescript-react-apollo@4.3.3(graphql@16.13.2)': dependencies: - '@graphql-codegen/plugin-helpers': 3.1.2(graphql@16.11.0) - '@graphql-codegen/visitor-plugin-common': 2.13.8(graphql@16.11.0) + '@graphql-codegen/plugin-helpers': 3.1.2(graphql@16.13.2) + '@graphql-codegen/visitor-plugin-common': 2.13.8(graphql@16.13.2) auto-bind: 4.0.0 change-case-all: 1.0.15 - graphql: 16.11.0 + graphql: 16.13.2 tslib: 2.8.1 transitivePeerDependencies: - encoding - supports-color - '@graphql-codegen/typescript@4.1.6(graphql@16.11.0)': + '@graphql-codegen/typescript@4.1.6(graphql@16.13.2)': dependencies: - '@graphql-codegen/plugin-helpers': 5.1.1(graphql@16.11.0) - '@graphql-codegen/schema-ast': 4.1.0(graphql@16.11.0) - '@graphql-codegen/visitor-plugin-common': 5.8.0(graphql@16.11.0) + '@graphql-codegen/plugin-helpers': 5.1.1(graphql@16.13.2) + '@graphql-codegen/schema-ast': 4.1.0(graphql@16.13.2) + '@graphql-codegen/visitor-plugin-common': 5.8.0(graphql@16.13.2) auto-bind: 4.0.0 - graphql: 16.11.0 + graphql: 16.13.2 tslib: 2.6.3 transitivePeerDependencies: - encoding - '@graphql-codegen/visitor-plugin-common@2.13.8(graphql@16.11.0)': + '@graphql-codegen/visitor-plugin-common@2.13.8(graphql@16.13.2)': dependencies: - '@graphql-codegen/plugin-helpers': 3.1.2(graphql@16.11.0) - '@graphql-tools/optimize': 1.4.0(graphql@16.11.0) - '@graphql-tools/relay-operation-optimizer': 6.5.18(graphql@16.11.0) - '@graphql-tools/utils': 9.2.1(graphql@16.11.0) + '@graphql-codegen/plugin-helpers': 3.1.2(graphql@16.13.2) + '@graphql-tools/optimize': 1.4.0(graphql@16.13.2) + '@graphql-tools/relay-operation-optimizer': 6.5.18(graphql@16.13.2) + '@graphql-tools/utils': 9.2.1(graphql@16.13.2) auto-bind: 4.0.0 change-case-all: 1.0.15 dependency-graph: 0.11.0 - graphql: 16.11.0 - graphql-tag: 2.12.6(graphql@16.11.0) + graphql: 16.13.2 + graphql-tag: 2.12.6(graphql@16.13.2) parse-filepath: 1.0.2 tslib: 2.4.1 transitivePeerDependencies: - encoding - supports-color - '@graphql-codegen/visitor-plugin-common@5.8.0(graphql@16.11.0)': + '@graphql-codegen/visitor-plugin-common@5.8.0(graphql@16.13.2)': dependencies: - '@graphql-codegen/plugin-helpers': 5.1.1(graphql@16.11.0) - '@graphql-tools/optimize': 2.0.0(graphql@16.11.0) - '@graphql-tools/relay-operation-optimizer': 7.0.21(graphql@16.11.0) - '@graphql-tools/utils': 10.9.1(graphql@16.11.0) + '@graphql-codegen/plugin-helpers': 5.1.1(graphql@16.13.2) + '@graphql-tools/optimize': 2.0.0(graphql@16.13.2) + '@graphql-tools/relay-operation-optimizer': 7.0.21(graphql@16.13.2) + '@graphql-tools/utils': 10.9.1(graphql@16.13.2) auto-bind: 4.0.0 change-case-all: 1.0.15 dependency-graph: 0.11.0 - graphql: 16.11.0 - graphql-tag: 2.12.6(graphql@16.11.0) + graphql: 16.13.2 + graphql-tag: 2.12.6(graphql@16.13.2) parse-filepath: 1.0.2 tslib: 2.6.3 transitivePeerDependencies: @@ -6198,71 +6233,71 @@ snapshots: '@graphql-hive/signal@1.0.0': {} - '@graphql-tools/apollo-engine-loader@8.0.22(graphql@16.11.0)': + '@graphql-tools/apollo-engine-loader@8.0.22(graphql@16.13.2)': dependencies: - '@graphql-tools/utils': 10.9.1(graphql@16.11.0) + '@graphql-tools/utils': 10.9.1(graphql@16.13.2) '@whatwg-node/fetch': 0.10.11 - graphql: 16.11.0 + graphql: 16.13.2 sync-fetch: 0.6.0-2 tslib: 2.8.1 - '@graphql-tools/batch-execute@9.0.19(graphql@16.11.0)': + '@graphql-tools/batch-execute@9.0.19(graphql@16.13.2)': dependencies: - '@graphql-tools/utils': 10.9.1(graphql@16.11.0) + '@graphql-tools/utils': 10.9.1(graphql@16.13.2) '@whatwg-node/promise-helpers': 1.3.2 dataloader: 2.2.3 - graphql: 16.11.0 + graphql: 16.13.2 tslib: 2.8.1 - '@graphql-tools/code-file-loader@8.1.22(graphql@16.11.0)': + '@graphql-tools/code-file-loader@8.1.22(graphql@16.13.2)': dependencies: - '@graphql-tools/graphql-tag-pluck': 8.3.21(graphql@16.11.0) - '@graphql-tools/utils': 10.9.1(graphql@16.11.0) + '@graphql-tools/graphql-tag-pluck': 8.3.21(graphql@16.13.2) + '@graphql-tools/utils': 10.9.1(graphql@16.13.2) globby: 11.1.0 - graphql: 16.11.0 + graphql: 16.13.2 tslib: 2.8.1 unixify: 1.0.0 transitivePeerDependencies: - supports-color - '@graphql-tools/delegate@10.2.23(graphql@16.11.0)': + '@graphql-tools/delegate@10.2.23(graphql@16.13.2)': dependencies: - '@graphql-tools/batch-execute': 9.0.19(graphql@16.11.0) - '@graphql-tools/executor': 1.4.9(graphql@16.11.0) - '@graphql-tools/schema': 10.0.25(graphql@16.11.0) - '@graphql-tools/utils': 10.9.1(graphql@16.11.0) + '@graphql-tools/batch-execute': 9.0.19(graphql@16.13.2) + '@graphql-tools/executor': 1.4.9(graphql@16.13.2) + '@graphql-tools/schema': 10.0.25(graphql@16.13.2) + '@graphql-tools/utils': 10.9.1(graphql@16.13.2) '@repeaterjs/repeater': 3.0.6 '@whatwg-node/promise-helpers': 1.3.2 dataloader: 2.2.3 dset: 3.1.4 - graphql: 16.11.0 + graphql: 16.13.2 tslib: 2.8.1 - '@graphql-tools/documents@1.0.1(graphql@16.11.0)': + '@graphql-tools/documents@1.0.1(graphql@16.13.2)': dependencies: - graphql: 16.11.0 + graphql: 16.13.2 lodash.sortby: 4.7.0 tslib: 2.8.1 - '@graphql-tools/executor-common@0.0.4(graphql@16.11.0)': + '@graphql-tools/executor-common@0.0.4(graphql@16.13.2)': dependencies: '@envelop/core': 5.3.2 - '@graphql-tools/utils': 10.9.1(graphql@16.11.0) - graphql: 16.11.0 + '@graphql-tools/utils': 10.9.1(graphql@16.13.2) + graphql: 16.13.2 - '@graphql-tools/executor-common@0.0.6(graphql@16.11.0)': + '@graphql-tools/executor-common@0.0.6(graphql@16.13.2)': dependencies: '@envelop/core': 5.3.2 - '@graphql-tools/utils': 10.9.1(graphql@16.11.0) - graphql: 16.11.0 + '@graphql-tools/utils': 10.9.1(graphql@16.13.2) + graphql: 16.13.2 - '@graphql-tools/executor-graphql-ws@2.0.7(graphql@16.11.0)': + '@graphql-tools/executor-graphql-ws@2.0.7(graphql@16.13.2)': dependencies: - '@graphql-tools/executor-common': 0.0.6(graphql@16.11.0) - '@graphql-tools/utils': 10.9.1(graphql@16.11.0) + '@graphql-tools/executor-common': 0.0.6(graphql@16.13.2) + '@graphql-tools/utils': 10.9.1(graphql@16.13.2) '@whatwg-node/disposablestack': 0.0.6 - graphql: 16.11.0 - graphql-ws: 6.0.6(graphql@16.11.0)(ws@8.18.3) + graphql: 16.13.2 + graphql-ws: 6.0.6(graphql@16.13.2)(ws@8.18.3) isomorphic-ws: 5.0.0(ws@8.18.3) tslib: 2.8.1 ws: 8.18.3 @@ -6273,26 +6308,26 @@ snapshots: - uWebSockets.js - utf-8-validate - '@graphql-tools/executor-http@1.3.3(@types/node@20.19.37)(graphql@16.11.0)': + '@graphql-tools/executor-http@1.3.3(@types/node@20.19.37)(graphql@16.13.2)': dependencies: '@graphql-hive/signal': 1.0.0 - '@graphql-tools/executor-common': 0.0.4(graphql@16.11.0) - '@graphql-tools/utils': 10.9.1(graphql@16.11.0) + '@graphql-tools/executor-common': 0.0.4(graphql@16.13.2) + '@graphql-tools/utils': 10.9.1(graphql@16.13.2) '@repeaterjs/repeater': 3.0.6 '@whatwg-node/disposablestack': 0.0.6 '@whatwg-node/fetch': 0.10.11 '@whatwg-node/promise-helpers': 1.3.2 - graphql: 16.11.0 + graphql: 16.13.2 meros: 1.3.2(@types/node@20.19.37) tslib: 2.8.1 transitivePeerDependencies: - '@types/node' - '@graphql-tools/executor-legacy-ws@1.1.19(graphql@16.11.0)': + '@graphql-tools/executor-legacy-ws@1.1.19(graphql@16.13.2)': dependencies: - '@graphql-tools/utils': 10.9.1(graphql@16.11.0) + '@graphql-tools/utils': 10.9.1(graphql@16.13.2) '@types/ws': 8.18.1 - graphql: 16.11.0 + graphql: 16.13.2 isomorphic-ws: 5.0.0(ws@8.18.3) tslib: 2.8.1 ws: 8.18.3 @@ -6300,21 +6335,21 @@ snapshots: - bufferutil - utf-8-validate - '@graphql-tools/executor@1.4.9(graphql@16.11.0)': + '@graphql-tools/executor@1.4.9(graphql@16.13.2)': dependencies: - '@graphql-tools/utils': 10.9.1(graphql@16.11.0) - '@graphql-typed-document-node/core': 3.2.0(graphql@16.11.0) + '@graphql-tools/utils': 10.9.1(graphql@16.13.2) + '@graphql-typed-document-node/core': 3.2.0(graphql@16.13.2) '@repeaterjs/repeater': 3.0.6 '@whatwg-node/disposablestack': 0.0.6 '@whatwg-node/promise-helpers': 1.3.2 - graphql: 16.11.0 + graphql: 16.13.2 tslib: 2.8.1 - '@graphql-tools/git-loader@8.0.26(graphql@16.11.0)': + '@graphql-tools/git-loader@8.0.26(graphql@16.13.2)': dependencies: - '@graphql-tools/graphql-tag-pluck': 8.3.21(graphql@16.11.0) - '@graphql-tools/utils': 10.9.1(graphql@16.11.0) - graphql: 16.11.0 + '@graphql-tools/graphql-tag-pluck': 8.3.21(graphql@16.13.2) + '@graphql-tools/utils': 10.9.1(graphql@16.13.2) + graphql: 16.13.2 is-glob: 4.0.3 micromatch: 4.0.8 tslib: 2.8.1 @@ -6322,97 +6357,97 @@ snapshots: transitivePeerDependencies: - supports-color - '@graphql-tools/github-loader@8.0.22(@types/node@20.19.37)(graphql@16.11.0)': + '@graphql-tools/github-loader@8.0.22(@types/node@20.19.37)(graphql@16.13.2)': dependencies: - '@graphql-tools/executor-http': 1.3.3(@types/node@20.19.37)(graphql@16.11.0) - '@graphql-tools/graphql-tag-pluck': 8.3.21(graphql@16.11.0) - '@graphql-tools/utils': 10.9.1(graphql@16.11.0) + '@graphql-tools/executor-http': 1.3.3(@types/node@20.19.37)(graphql@16.13.2) + '@graphql-tools/graphql-tag-pluck': 8.3.21(graphql@16.13.2) + '@graphql-tools/utils': 10.9.1(graphql@16.13.2) '@whatwg-node/fetch': 0.10.11 '@whatwg-node/promise-helpers': 1.3.2 - graphql: 16.11.0 + graphql: 16.13.2 sync-fetch: 0.6.0-2 tslib: 2.8.1 transitivePeerDependencies: - '@types/node' - supports-color - '@graphql-tools/graphql-file-loader@8.1.2(graphql@16.11.0)': + '@graphql-tools/graphql-file-loader@8.1.2(graphql@16.13.2)': dependencies: - '@graphql-tools/import': 7.1.2(graphql@16.11.0) - '@graphql-tools/utils': 10.9.1(graphql@16.11.0) + '@graphql-tools/import': 7.1.2(graphql@16.13.2) + '@graphql-tools/utils': 10.9.1(graphql@16.13.2) globby: 11.1.0 - graphql: 16.11.0 + graphql: 16.13.2 tslib: 2.8.1 unixify: 1.0.0 transitivePeerDependencies: - supports-color - '@graphql-tools/graphql-tag-pluck@8.3.21(graphql@16.11.0)': + '@graphql-tools/graphql-tag-pluck@8.3.21(graphql@16.13.2)': dependencies: '@babel/core': 7.29.0 '@babel/parser': 7.29.2 '@babel/plugin-syntax-import-assertions': 7.27.1(@babel/core@7.29.0) '@babel/traverse': 7.29.0 '@babel/types': 7.29.0 - '@graphql-tools/utils': 10.9.1(graphql@16.11.0) - graphql: 16.11.0 + '@graphql-tools/utils': 10.9.1(graphql@16.13.2) + graphql: 16.13.2 tslib: 2.8.1 transitivePeerDependencies: - supports-color - '@graphql-tools/import@7.1.2(graphql@16.11.0)': + '@graphql-tools/import@7.1.2(graphql@16.13.2)': dependencies: - '@graphql-tools/utils': 10.9.1(graphql@16.11.0) - '@theguild/federation-composition': 0.20.1(graphql@16.11.0) - graphql: 16.11.0 + '@graphql-tools/utils': 10.9.1(graphql@16.13.2) + '@theguild/federation-composition': 0.20.1(graphql@16.13.2) + graphql: 16.13.2 resolve-from: 5.0.0 tslib: 2.8.1 transitivePeerDependencies: - supports-color - '@graphql-tools/json-file-loader@8.0.20(graphql@16.11.0)': + '@graphql-tools/json-file-loader@8.0.20(graphql@16.13.2)': dependencies: - '@graphql-tools/utils': 10.9.1(graphql@16.11.0) + '@graphql-tools/utils': 10.9.1(graphql@16.13.2) globby: 11.1.0 - graphql: 16.11.0 + graphql: 16.13.2 tslib: 2.8.1 unixify: 1.0.0 - '@graphql-tools/load@8.1.2(graphql@16.11.0)': + '@graphql-tools/load@8.1.2(graphql@16.13.2)': dependencies: - '@graphql-tools/schema': 10.0.25(graphql@16.11.0) - '@graphql-tools/utils': 10.9.1(graphql@16.11.0) - graphql: 16.11.0 + '@graphql-tools/schema': 10.0.25(graphql@16.13.2) + '@graphql-tools/utils': 10.9.1(graphql@16.13.2) + graphql: 16.13.2 p-limit: 3.1.0 tslib: 2.8.1 - '@graphql-tools/merge@9.1.1(graphql@16.11.0)': + '@graphql-tools/merge@9.1.1(graphql@16.13.2)': dependencies: - '@graphql-tools/utils': 10.9.1(graphql@16.11.0) - graphql: 16.11.0 + '@graphql-tools/utils': 10.9.1(graphql@16.13.2) + graphql: 16.13.2 tslib: 2.8.1 - '@graphql-tools/optimize@1.4.0(graphql@16.11.0)': + '@graphql-tools/optimize@1.4.0(graphql@16.13.2)': dependencies: - graphql: 16.11.0 + graphql: 16.13.2 tslib: 2.8.1 - '@graphql-tools/optimize@2.0.0(graphql@16.11.0)': + '@graphql-tools/optimize@2.0.0(graphql@16.13.2)': dependencies: - graphql: 16.11.0 + graphql: 16.13.2 tslib: 2.8.1 - '@graphql-tools/prisma-loader@8.0.17(@types/node@20.19.37)(graphql@16.11.0)': + '@graphql-tools/prisma-loader@8.0.17(@types/node@20.19.37)(graphql@16.13.2)': dependencies: - '@graphql-tools/url-loader': 8.0.33(@types/node@20.19.37)(graphql@16.11.0) - '@graphql-tools/utils': 10.9.1(graphql@16.11.0) + '@graphql-tools/url-loader': 8.0.33(@types/node@20.19.37)(graphql@16.13.2) + '@graphql-tools/utils': 10.9.1(graphql@16.13.2) '@types/js-yaml': 4.0.9 '@whatwg-node/fetch': 0.10.11 chalk: 4.1.2 debug: 4.4.3 dotenv: 16.6.1 - graphql: 16.11.0 - graphql-request: 6.1.0(graphql@16.11.0) + graphql: 16.13.2 + graphql-request: 6.1.0(graphql@16.13.2) http-proxy-agent: 7.0.2 https-proxy-agent: 7.0.6 jose: 5.10.0 @@ -6431,43 +6466,43 @@ snapshots: - uWebSockets.js - utf-8-validate - '@graphql-tools/relay-operation-optimizer@6.5.18(graphql@16.11.0)': + '@graphql-tools/relay-operation-optimizer@6.5.18(graphql@16.13.2)': dependencies: - '@ardatan/relay-compiler': 12.0.0(graphql@16.11.0) - '@graphql-tools/utils': 9.2.1(graphql@16.11.0) - graphql: 16.11.0 + '@ardatan/relay-compiler': 12.0.0(graphql@16.13.2) + '@graphql-tools/utils': 9.2.1(graphql@16.13.2) + graphql: 16.13.2 tslib: 2.8.1 transitivePeerDependencies: - encoding - supports-color - '@graphql-tools/relay-operation-optimizer@7.0.21(graphql@16.11.0)': + '@graphql-tools/relay-operation-optimizer@7.0.21(graphql@16.13.2)': dependencies: - '@ardatan/relay-compiler': 12.0.3(graphql@16.11.0) - '@graphql-tools/utils': 10.9.1(graphql@16.11.0) - graphql: 16.11.0 + '@ardatan/relay-compiler': 12.0.3(graphql@16.13.2) + '@graphql-tools/utils': 10.9.1(graphql@16.13.2) + graphql: 16.13.2 tslib: 2.8.1 transitivePeerDependencies: - encoding - '@graphql-tools/schema@10.0.25(graphql@16.11.0)': + '@graphql-tools/schema@10.0.25(graphql@16.13.2)': dependencies: - '@graphql-tools/merge': 9.1.1(graphql@16.11.0) - '@graphql-tools/utils': 10.9.1(graphql@16.11.0) - graphql: 16.11.0 + '@graphql-tools/merge': 9.1.1(graphql@16.13.2) + '@graphql-tools/utils': 10.9.1(graphql@16.13.2) + graphql: 16.13.2 tslib: 2.8.1 - '@graphql-tools/url-loader@8.0.33(@types/node@20.19.37)(graphql@16.11.0)': + '@graphql-tools/url-loader@8.0.33(@types/node@20.19.37)(graphql@16.13.2)': dependencies: - '@graphql-tools/executor-graphql-ws': 2.0.7(graphql@16.11.0) - '@graphql-tools/executor-http': 1.3.3(@types/node@20.19.37)(graphql@16.11.0) - '@graphql-tools/executor-legacy-ws': 1.1.19(graphql@16.11.0) - '@graphql-tools/utils': 10.9.1(graphql@16.11.0) - '@graphql-tools/wrap': 10.1.4(graphql@16.11.0) + '@graphql-tools/executor-graphql-ws': 2.0.7(graphql@16.13.2) + '@graphql-tools/executor-http': 1.3.3(@types/node@20.19.37)(graphql@16.13.2) + '@graphql-tools/executor-legacy-ws': 1.1.19(graphql@16.13.2) + '@graphql-tools/utils': 10.9.1(graphql@16.13.2) + '@graphql-tools/wrap': 10.1.4(graphql@16.13.2) '@types/ws': 8.18.1 '@whatwg-node/fetch': 0.10.11 '@whatwg-node/promise-helpers': 1.3.2 - graphql: 16.11.0 + graphql: 16.13.2 isomorphic-ws: 5.0.0(ws@8.18.3) sync-fetch: 0.6.0-2 tslib: 2.8.1 @@ -6480,33 +6515,33 @@ snapshots: - uWebSockets.js - utf-8-validate - '@graphql-tools/utils@10.9.1(graphql@16.11.0)': + '@graphql-tools/utils@10.9.1(graphql@16.13.2)': dependencies: - '@graphql-typed-document-node/core': 3.2.0(graphql@16.11.0) + '@graphql-typed-document-node/core': 3.2.0(graphql@16.13.2) '@whatwg-node/promise-helpers': 1.3.2 cross-inspect: 1.0.1 dset: 3.1.4 - graphql: 16.11.0 + graphql: 16.13.2 tslib: 2.8.1 - '@graphql-tools/utils@9.2.1(graphql@16.11.0)': + '@graphql-tools/utils@9.2.1(graphql@16.13.2)': dependencies: - '@graphql-typed-document-node/core': 3.2.0(graphql@16.11.0) - graphql: 16.11.0 + '@graphql-typed-document-node/core': 3.2.0(graphql@16.13.2) + graphql: 16.13.2 tslib: 2.8.1 - '@graphql-tools/wrap@10.1.4(graphql@16.11.0)': + '@graphql-tools/wrap@10.1.4(graphql@16.13.2)': dependencies: - '@graphql-tools/delegate': 10.2.23(graphql@16.11.0) - '@graphql-tools/schema': 10.0.25(graphql@16.11.0) - '@graphql-tools/utils': 10.9.1(graphql@16.11.0) + '@graphql-tools/delegate': 10.2.23(graphql@16.13.2) + '@graphql-tools/schema': 10.0.25(graphql@16.13.2) + '@graphql-tools/utils': 10.9.1(graphql@16.13.2) '@whatwg-node/promise-helpers': 1.3.2 - graphql: 16.11.0 + graphql: 16.13.2 tslib: 2.8.1 - '@graphql-typed-document-node/core@3.2.0(graphql@16.11.0)': + '@graphql-typed-document-node/core@3.2.0(graphql@16.13.2)': dependencies: - graphql: 16.11.0 + graphql: 16.13.2 '@humanwhocodes/config-array@0.13.0': dependencies: @@ -6761,11 +6796,11 @@ snapshots: '@sindresorhus/merge-streams@4.0.0': {} - '@theguild/federation-composition@0.20.1(graphql@16.11.0)': + '@theguild/federation-composition@0.20.1(graphql@16.13.2)': dependencies: constant-case: 3.0.4 debug: 4.4.1 - graphql: 16.11.0 + graphql: 16.13.2 json5: 2.2.3 lodash.sortby: 4.7.0 transitivePeerDependencies: @@ -6781,11 +6816,11 @@ snapshots: '@tweenjs/tween.js@23.1.3': {} - '@types/apollo-upload-client@18.0.1(@types/react@17.0.89)(graphql-ws@5.16.2(graphql@16.11.0))(react-dom@17.0.2(react@17.0.2))(react@17.0.2)': + '@types/apollo-upload-client@18.0.1(@types/react@17.0.89)(graphql-ws@5.16.2(graphql@16.13.2))(react-dom@17.0.2(react@17.0.2))(react@17.0.2)': dependencies: - '@apollo/client': 3.14.0(@types/react@17.0.89)(graphql-ws@5.16.2(graphql@16.11.0))(graphql@16.11.0)(react-dom@17.0.2(react@17.0.2))(react@17.0.2) + '@apollo/client': 3.14.1(@types/react@17.0.89)(graphql-ws@5.16.2(graphql@16.13.2))(graphql@16.13.2)(react-dom@17.0.2(react@17.0.2))(react@17.0.2) '@types/extract-files': 13.0.2 - graphql: 16.11.0 + graphql: 16.13.2 transitivePeerDependencies: - '@types/react' - graphql-ws @@ -6953,34 +6988,34 @@ snapshots: dependencies: '@types/node': 20.19.37 - '@typescript-eslint/eslint-plugin@7.18.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.9.3))(eslint@8.57.1)(typescript@5.9.3)': + '@typescript-eslint/eslint-plugin@7.18.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@6.0.3))(eslint@8.57.1)(typescript@6.0.3)': dependencies: '@eslint-community/regexpp': 4.12.2 - '@typescript-eslint/parser': 7.18.0(eslint@8.57.1)(typescript@5.9.3) + '@typescript-eslint/parser': 7.18.0(eslint@8.57.1)(typescript@6.0.3) '@typescript-eslint/scope-manager': 7.18.0 - '@typescript-eslint/type-utils': 7.18.0(eslint@8.57.1)(typescript@5.9.3) - '@typescript-eslint/utils': 7.18.0(eslint@8.57.1)(typescript@5.9.3) + '@typescript-eslint/type-utils': 7.18.0(eslint@8.57.1)(typescript@6.0.3) + '@typescript-eslint/utils': 7.18.0(eslint@8.57.1)(typescript@6.0.3) '@typescript-eslint/visitor-keys': 7.18.0 eslint: 8.57.1 graphemer: 1.4.0 ignore: 5.3.2 natural-compare: 1.4.0 - ts-api-utils: 1.4.3(typescript@5.9.3) + ts-api-utils: 1.4.3(typescript@6.0.3) optionalDependencies: - typescript: 5.9.3 + typescript: 6.0.3 transitivePeerDependencies: - supports-color - '@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.9.3)': + '@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@6.0.3)': dependencies: '@typescript-eslint/scope-manager': 7.18.0 '@typescript-eslint/types': 7.18.0 - '@typescript-eslint/typescript-estree': 7.18.0(typescript@5.9.3) + '@typescript-eslint/typescript-estree': 7.18.0(typescript@6.0.3) '@typescript-eslint/visitor-keys': 7.18.0 debug: 4.4.3 eslint: 8.57.1 optionalDependencies: - typescript: 5.9.3 + typescript: 6.0.3 transitivePeerDependencies: - supports-color @@ -6989,21 +7024,21 @@ snapshots: '@typescript-eslint/types': 7.18.0 '@typescript-eslint/visitor-keys': 7.18.0 - '@typescript-eslint/type-utils@7.18.0(eslint@8.57.1)(typescript@5.9.3)': + '@typescript-eslint/type-utils@7.18.0(eslint@8.57.1)(typescript@6.0.3)': dependencies: - '@typescript-eslint/typescript-estree': 7.18.0(typescript@5.9.3) - '@typescript-eslint/utils': 7.18.0(eslint@8.57.1)(typescript@5.9.3) + '@typescript-eslint/typescript-estree': 7.18.0(typescript@6.0.3) + '@typescript-eslint/utils': 7.18.0(eslint@8.57.1)(typescript@6.0.3) debug: 4.4.3 eslint: 8.57.1 - ts-api-utils: 1.4.3(typescript@5.9.3) + ts-api-utils: 1.4.3(typescript@6.0.3) optionalDependencies: - typescript: 5.9.3 + typescript: 6.0.3 transitivePeerDependencies: - supports-color '@typescript-eslint/types@7.18.0': {} - '@typescript-eslint/typescript-estree@7.18.0(typescript@5.9.3)': + '@typescript-eslint/typescript-estree@7.18.0(typescript@6.0.3)': dependencies: '@typescript-eslint/types': 7.18.0 '@typescript-eslint/visitor-keys': 7.18.0 @@ -7012,18 +7047,18 @@ snapshots: is-glob: 4.0.3 minimatch: 9.0.9 semver: 7.7.4 - ts-api-utils: 1.4.3(typescript@5.9.3) + ts-api-utils: 1.4.3(typescript@6.0.3) optionalDependencies: - typescript: 5.9.3 + typescript: 6.0.3 transitivePeerDependencies: - supports-color - '@typescript-eslint/utils@7.18.0(eslint@8.57.1)(typescript@5.9.3)': + '@typescript-eslint/utils@7.18.0(eslint@8.57.1)(typescript@6.0.3)': dependencies: '@eslint-community/eslint-utils': 4.9.1(eslint@8.57.1) '@typescript-eslint/scope-manager': 7.18.0 '@typescript-eslint/types': 7.18.0 - '@typescript-eslint/typescript-estree': 7.18.0(typescript@5.9.3) + '@typescript-eslint/typescript-estree': 7.18.0(typescript@6.0.3) eslint: 8.57.1 transitivePeerDependencies: - supports-color @@ -7166,11 +7201,11 @@ snapshots: dependencies: color-convert: 2.0.1 - apollo-upload-client@18.0.1(@apollo/client@3.14.0(@types/react@17.0.89)(graphql-ws@5.16.2(graphql@16.11.0))(graphql@16.11.0)(react-dom@17.0.2(react@17.0.2))(react@17.0.2))(graphql@16.11.0): + apollo-upload-client@18.0.1(@apollo/client@4.1.9(graphql-ws@5.16.2(graphql@16.13.2))(graphql@16.13.2)(react-dom@17.0.2(react@17.0.2))(react@17.0.2)(rxjs@7.8.2))(graphql@16.13.2): dependencies: - '@apollo/client': 3.14.0(@types/react@17.0.89)(graphql-ws@5.16.2(graphql@16.11.0))(graphql@16.11.0)(react-dom@17.0.2(react@17.0.2))(react@17.0.2) + '@apollo/client': 4.1.9(graphql-ws@5.16.2(graphql@16.13.2))(graphql@16.13.2)(react-dom@17.0.2(react@17.0.2))(react@17.0.2)(rxjs@7.8.2) extract-files: 13.0.0 - graphql: 16.11.0 + graphql: 16.13.2 arg@4.1.3: {} @@ -7574,23 +7609,23 @@ snapshots: path-type: 4.0.0 yaml: 1.10.3 - cosmiconfig@8.3.6(typescript@5.9.3): + cosmiconfig@8.3.6(typescript@6.0.3): dependencies: import-fresh: 3.3.1 js-yaml: 4.1.1 parse-json: 5.2.0 path-type: 4.0.0 optionalDependencies: - typescript: 5.9.3 + typescript: 6.0.3 - cosmiconfig@9.0.1(typescript@5.9.3): + cosmiconfig@9.0.1(typescript@6.0.3): dependencies: env-paths: 2.2.1 import-fresh: 3.3.1 js-yaml: 4.1.1 parse-json: 5.2.0 optionalDependencies: - typescript: 5.9.3 + typescript: 6.0.3 create-require@1.1.1: {} @@ -7909,29 +7944,29 @@ snapshots: escape-string-regexp@4.0.0: {} - eslint-config-airbnb-base@15.0.0(eslint-plugin-import@2.32.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.9.3))(eslint@8.57.1))(eslint@8.57.1): + eslint-config-airbnb-base@15.0.0(eslint-plugin-import@2.32.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@6.0.3))(eslint@8.57.1))(eslint@8.57.1): dependencies: confusing-browser-globals: 1.0.11 eslint: 8.57.1 - eslint-plugin-import: 2.32.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.9.3))(eslint@8.57.1) + eslint-plugin-import: 2.32.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@6.0.3))(eslint@8.57.1) object.assign: 4.1.7 object.entries: 1.1.9 semver: 6.3.1 - eslint-config-airbnb-typescript@18.0.0(@typescript-eslint/eslint-plugin@7.18.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.9.3))(eslint@8.57.1)(typescript@5.9.3))(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.9.3))(eslint-plugin-import@2.32.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.9.3))(eslint@8.57.1))(eslint@8.57.1): + eslint-config-airbnb-typescript@18.0.0(@typescript-eslint/eslint-plugin@7.18.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@6.0.3))(eslint@8.57.1)(typescript@6.0.3))(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@6.0.3))(eslint-plugin-import@2.32.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@6.0.3))(eslint@8.57.1))(eslint@8.57.1): dependencies: - '@typescript-eslint/eslint-plugin': 7.18.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.9.3))(eslint@8.57.1)(typescript@5.9.3) - '@typescript-eslint/parser': 7.18.0(eslint@8.57.1)(typescript@5.9.3) + '@typescript-eslint/eslint-plugin': 7.18.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@6.0.3))(eslint@8.57.1)(typescript@6.0.3) + '@typescript-eslint/parser': 7.18.0(eslint@8.57.1)(typescript@6.0.3) eslint: 8.57.1 - eslint-config-airbnb-base: 15.0.0(eslint-plugin-import@2.32.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.9.3))(eslint@8.57.1))(eslint@8.57.1) + eslint-config-airbnb-base: 15.0.0(eslint-plugin-import@2.32.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@6.0.3))(eslint@8.57.1))(eslint@8.57.1) transitivePeerDependencies: - eslint-plugin-import - eslint-config-airbnb@19.0.4(eslint-plugin-import@2.32.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.9.3))(eslint@8.57.1))(eslint-plugin-jsx-a11y@6.10.2(eslint@8.57.1))(eslint-plugin-react-hooks@4.6.2(eslint@8.57.1))(eslint-plugin-react@7.37.5(eslint@8.57.1))(eslint@8.57.1): + eslint-config-airbnb@19.0.4(eslint-plugin-import@2.32.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@6.0.3))(eslint@8.57.1))(eslint-plugin-jsx-a11y@6.10.2(eslint@8.57.1))(eslint-plugin-react-hooks@4.6.2(eslint@8.57.1))(eslint-plugin-react@7.37.5(eslint@8.57.1))(eslint@8.57.1): dependencies: eslint: 8.57.1 - eslint-config-airbnb-base: 15.0.0(eslint-plugin-import@2.32.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.9.3))(eslint@8.57.1))(eslint@8.57.1) - eslint-plugin-import: 2.32.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.9.3))(eslint@8.57.1) + eslint-config-airbnb-base: 15.0.0(eslint-plugin-import@2.32.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@6.0.3))(eslint@8.57.1))(eslint@8.57.1) + eslint-plugin-import: 2.32.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@6.0.3))(eslint@8.57.1) eslint-plugin-jsx-a11y: 6.10.2(eslint@8.57.1) eslint-plugin-react: 7.37.5(eslint@8.57.1) eslint-plugin-react-hooks: 4.6.2(eslint@8.57.1) @@ -7950,27 +7985,27 @@ snapshots: transitivePeerDependencies: - supports-color - eslint-module-utils@2.12.1(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.9.3))(eslint-import-resolver-node@0.3.9)(eslint@8.57.1): + eslint-module-utils@2.12.1(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@6.0.3))(eslint-import-resolver-node@0.3.9)(eslint@8.57.1): dependencies: debug: 3.2.7 optionalDependencies: - '@typescript-eslint/parser': 7.18.0(eslint@8.57.1)(typescript@5.9.3) + '@typescript-eslint/parser': 7.18.0(eslint@8.57.1)(typescript@6.0.3) eslint: 8.57.1 eslint-import-resolver-node: 0.3.9 transitivePeerDependencies: - supports-color - eslint-plugin-deprecation@3.0.0(eslint@8.57.1)(typescript@5.9.3): + eslint-plugin-deprecation@3.0.0(eslint@8.57.1)(typescript@6.0.3): dependencies: - '@typescript-eslint/utils': 7.18.0(eslint@8.57.1)(typescript@5.9.3) + '@typescript-eslint/utils': 7.18.0(eslint@8.57.1)(typescript@6.0.3) eslint: 8.57.1 - ts-api-utils: 1.4.3(typescript@5.9.3) + ts-api-utils: 1.4.3(typescript@6.0.3) tslib: 2.8.1 - typescript: 5.9.3 + typescript: 6.0.3 transitivePeerDependencies: - supports-color - eslint-plugin-import@2.32.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.9.3))(eslint@8.57.1): + eslint-plugin-import@2.32.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@6.0.3))(eslint@8.57.1): dependencies: '@rtsao/scc': 1.1.0 array-includes: 3.1.9 @@ -7981,7 +8016,7 @@ snapshots: doctrine: 2.1.0 eslint: 8.57.1 eslint-import-resolver-node: 0.3.9 - eslint-module-utils: 2.12.1(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.9.3))(eslint-import-resolver-node@0.3.9)(eslint@8.57.1) + eslint-module-utils: 2.12.1(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@6.0.3))(eslint-import-resolver-node@0.3.9)(eslint@8.57.1) hasown: 2.0.2 is-core-module: 2.16.1 is-glob: 4.0.3 @@ -7993,7 +8028,7 @@ snapshots: string.prototype.trimend: 1.0.9 tsconfig-paths: 3.15.0 optionalDependencies: - '@typescript-eslint/parser': 7.18.0(eslint@8.57.1)(typescript@5.9.3) + '@typescript-eslint/parser': 7.18.0(eslint@8.57.1)(typescript@6.0.3) transitivePeerDependencies: - eslint-import-resolver-typescript - eslint-import-resolver-webpack @@ -8400,16 +8435,16 @@ snapshots: graphemer@1.4.0: {} - graphql-config@5.1.5(@types/node@20.19.37)(graphql@16.11.0)(typescript@5.9.3): + graphql-config@5.1.5(@types/node@20.19.37)(graphql@16.13.2)(typescript@6.0.3): dependencies: - '@graphql-tools/graphql-file-loader': 8.1.2(graphql@16.11.0) - '@graphql-tools/json-file-loader': 8.0.20(graphql@16.11.0) - '@graphql-tools/load': 8.1.2(graphql@16.11.0) - '@graphql-tools/merge': 9.1.1(graphql@16.11.0) - '@graphql-tools/url-loader': 8.0.33(@types/node@20.19.37)(graphql@16.11.0) - '@graphql-tools/utils': 10.9.1(graphql@16.11.0) - cosmiconfig: 8.3.6(typescript@5.9.3) - graphql: 16.11.0 + '@graphql-tools/graphql-file-loader': 8.1.2(graphql@16.13.2) + '@graphql-tools/json-file-loader': 8.0.20(graphql@16.13.2) + '@graphql-tools/load': 8.1.2(graphql@16.13.2) + '@graphql-tools/merge': 9.1.1(graphql@16.13.2) + '@graphql-tools/url-loader': 8.0.33(@types/node@20.19.37)(graphql@16.13.2) + '@graphql-tools/utils': 10.9.1(graphql@16.13.2) + cosmiconfig: 8.3.6(typescript@6.0.3) + graphql: 16.13.2 jiti: 2.6.1 minimatch: 9.0.9 string-env-interpolation: 1.0.1 @@ -8424,30 +8459,30 @@ snapshots: - uWebSockets.js - utf-8-validate - graphql-request@6.1.0(graphql@16.11.0): + graphql-request@6.1.0(graphql@16.13.2): dependencies: - '@graphql-typed-document-node/core': 3.2.0(graphql@16.11.0) + '@graphql-typed-document-node/core': 3.2.0(graphql@16.13.2) cross-fetch: 3.2.0 - graphql: 16.11.0 + graphql: 16.13.2 transitivePeerDependencies: - encoding - graphql-tag@2.12.6(graphql@16.11.0): + graphql-tag@2.12.6(graphql@16.13.2): dependencies: - graphql: 16.11.0 + graphql: 16.13.2 tslib: 2.8.1 - graphql-ws@5.16.2(graphql@16.11.0): + graphql-ws@5.16.2(graphql@16.13.2): dependencies: - graphql: 16.11.0 + graphql: 16.13.2 - graphql-ws@6.0.6(graphql@16.11.0)(ws@8.18.3): + graphql-ws@6.0.6(graphql@16.13.2)(ws@8.18.3): dependencies: - graphql: 16.11.0 + graphql: 16.13.2 optionalDependencies: ws: 8.18.3 - graphql@16.11.0: {} + graphql@16.13.2: {} hard-rejection@2.1.0: {} @@ -9605,11 +9640,11 @@ snapshots: react-fast-compare: 3.2.2 react-side-effect: 2.1.2(react@17.0.2) - react-intl@6.8.9(react@17.0.2)(typescript@5.9.3): + react-intl@6.8.9(react@17.0.2)(typescript@6.0.3): dependencies: '@formatjs/ecma402-abstract': 2.2.4 '@formatjs/icu-messageformat-parser': 2.9.4 - '@formatjs/intl': 2.10.15(typescript@5.9.3) + '@formatjs/intl': 2.10.15(typescript@6.0.3) '@formatjs/intl-displaynames': 6.8.5 '@formatjs/intl-listformat': 7.7.5 '@types/hoist-non-react-statics': 3.3.7(@types/react@17.0.89) @@ -9619,7 +9654,7 @@ snapshots: react: 17.0.2 tslib: 2.8.1 optionalDependencies: - typescript: 5.9.3 + typescript: 6.0.3 react-is@16.13.1: {} @@ -10207,13 +10242,13 @@ snapshots: dependencies: inline-style-parser: 0.1.1 - stylelint-order@8.1.1(stylelint@17.6.0(typescript@5.9.3)): + stylelint-order@8.1.1(stylelint@17.6.0(typescript@6.0.3)): dependencies: postcss: 8.5.8 postcss-sorting: 10.0.0(postcss@8.5.8) - stylelint: 17.6.0(typescript@5.9.3) + stylelint: 17.6.0(typescript@6.0.3) - stylelint@17.6.0(typescript@5.9.3): + stylelint@17.6.0(typescript@6.0.3): dependencies: '@csstools/css-calc': 3.1.1(@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.0))(@csstools/css-tokenizer@4.0.0) '@csstools/css-parser-algorithms': 4.0.0(@csstools/css-tokenizer@4.0.0) @@ -10223,7 +10258,7 @@ snapshots: '@csstools/selector-resolve-nested': 4.0.0(postcss-selector-parser@7.1.1) '@csstools/selector-specificity': 6.0.0(postcss-selector-parser@7.1.1) colord: 2.9.3 - cosmiconfig: 9.0.1(typescript@5.9.3) + cosmiconfig: 9.0.1(typescript@6.0.3) css-functions-list: 3.3.3 css-tree: 3.2.1 debug: 4.4.3 @@ -10303,7 +10338,7 @@ snapshots: thehandy@1.1.0: {} - three@0.125.2: {} + three@0.183.2: {} throttle-debounce@5.0.2: {} @@ -10338,9 +10373,9 @@ snapshots: trough@1.0.5: {} - ts-api-utils@1.4.3(typescript@5.9.3): + ts-api-utils@1.4.3(typescript@6.0.3): dependencies: - typescript: 5.9.3 + typescript: 6.0.3 ts-invariant@0.10.3: dependencies: @@ -10348,7 +10383,7 @@ snapshots: ts-log@2.2.7: {} - ts-node@10.9.2(@types/node@20.19.37)(typescript@5.9.3): + ts-node@10.9.2(@types/node@20.19.37)(typescript@6.0.3): dependencies: '@cspotcode/source-map-support': 0.8.1 '@tsconfig/node10': 1.0.11 @@ -10362,13 +10397,13 @@ snapshots: create-require: 1.1.1 diff: 4.0.2 make-error: 1.3.6 - typescript: 5.9.3 + typescript: 6.0.3 v8-compile-cache-lib: 3.0.1 yn: 3.1.1 - tsconfck@3.1.6(typescript@5.9.3): + tsconfck@3.1.6(typescript@6.0.3): optionalDependencies: - typescript: 5.9.3 + typescript: 6.0.3 tsconfig-paths@3.15.0: dependencies: @@ -10438,7 +10473,7 @@ snapshots: typescript@4.9.5: {} - typescript@5.9.3: {} + typescript@6.0.3: {} ua-is-frozen@0.1.2: {} @@ -10514,7 +10549,7 @@ snapshots: unist-util-is: 4.1.0 unist-util-visit-parents: 3.1.1 - universal-cookie@8.1.0: + universal-cookie@8.1.1: dependencies: cookie: 1.1.1 @@ -10624,11 +10659,11 @@ snapshots: transitivePeerDependencies: - supports-color - vite-tsconfig-paths@6.1.1(typescript@5.9.3)(vite@7.3.2(@types/node@20.19.37)(jiti@2.6.1)(lightningcss@1.32.0)(sass@1.98.0)(terser@5.46.1)(yaml@2.8.1)): + vite-tsconfig-paths@6.1.1(typescript@6.0.3)(vite@7.3.2(@types/node@20.19.37)(jiti@2.6.1)(lightningcss@1.32.0)(sass@1.98.0)(terser@5.46.1)(yaml@2.8.1)): dependencies: debug: 4.4.3 globrex: 0.1.2 - tsconfck: 3.1.6(typescript@5.9.3) + tsconfck: 3.1.6(typescript@6.0.3) vite: 7.3.2(@types/node@20.19.37)(jiti@2.6.1)(lightningcss@1.32.0)(sass@1.98.0)(terser@5.46.1)(yaml@2.8.1) transitivePeerDependencies: - supports-color diff --git a/ui/v2.5/src/components/List/FilteredListToolbar.tsx b/ui/v2.5/src/components/List/FilteredListToolbar.tsx index a6a983dc4..347f473fe 100644 --- a/ui/v2.5/src/components/List/FilteredListToolbar.tsx +++ b/ui/v2.5/src/components/List/FilteredListToolbar.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { QueryResult } from "@apollo/client"; +import type { useQuery } from "@apollo/client/react"; import { ListFilterModel } from "src/models/list-filter/filter"; import { IconDefinition } from "@fortawesome/fontawesome-svg-core"; import { PageSizeSelector, SearchTermInput, SortBySelect } from "./ListFilter"; @@ -50,7 +50,7 @@ const SelectionSection: React.FC<{ ); }; -export interface IItemListOperation { +export interface IItemListOperation { text: string; onClick: ( result: T, diff --git a/ui/v2.5/src/components/List/ItemList.tsx b/ui/v2.5/src/components/List/ItemList.tsx index 893f1d005..dff9b3bcd 100644 --- a/ui/v2.5/src/components/List/ItemList.tsx +++ b/ui/v2.5/src/components/List/ItemList.tsx @@ -1,4 +1,4 @@ -import { QueryResult } from "@apollo/client"; +import type { useQuery } from "@apollo/client/react"; import { ListFilterModel } from "src/models/list-filter/filter"; import { useShowEditFilter } from "src/components/List/EditFilterDialog"; import { IHasID } from "src/utils/data"; @@ -17,7 +17,7 @@ import { import { useConfigurationContext } from "src/hooks/Config"; interface IFilteredItemList< - T extends QueryResult, + T extends useQuery.Result, E extends IHasID = IHasID, M = unknown > { @@ -27,7 +27,7 @@ interface IFilteredItemList< // Provides the common state and behaviour for filtered item list components export function useFilteredItemList< - T extends QueryResult, + T extends useQuery.Result, E extends IHasID = IHasID, M = unknown >(props: IFilteredItemList) { @@ -89,7 +89,7 @@ export function useFilteredItemList< }; } -export const showWhenSelected = ( +export const showWhenSelected = ( result: T, filter: ListFilterModel, selectedIds: Set @@ -97,7 +97,7 @@ export const showWhenSelected = ( return selectedIds.size > 0; }; -export const showWhenSingleSelection = ( +export const showWhenSingleSelection = ( result: T, filter: ListFilterModel, selectedIds: Set @@ -105,7 +105,7 @@ export const showWhenSingleSelection = ( return selectedIds.size == 1; }; -export const showWhenNoneSelected = ( +export const showWhenNoneSelected = ( result: T, filter: ListFilterModel, selectedIds: Set diff --git a/ui/v2.5/src/components/List/ListProvider.tsx b/ui/v2.5/src/components/List/ListProvider.tsx index 8b9ee7bfb..2796664ec 100644 --- a/ui/v2.5/src/components/List/ListProvider.tsx +++ b/ui/v2.5/src/components/List/ListProvider.tsx @@ -4,7 +4,7 @@ import { isFunction } from "lodash-es"; import { IHasID } from "src/utils/data"; import { useFilter } from "./FilterProvider"; import { ListFilterModel } from "src/models/list-filter/filter"; -import { QueryResult } from "@apollo/client"; +import type { useQuery } from "@apollo/client/react"; interface IListContextOptions { selectable?: boolean; @@ -80,7 +80,7 @@ export function useListContextOptional() { } interface IQueryResultContextOptions< - T extends QueryResult, + T extends useQuery.Result, E extends IHasID = IHasID, M = unknown > { @@ -92,7 +92,7 @@ interface IQueryResultContextOptions< } export interface IQueryResultContextState< - T extends QueryResult = QueryResult, + T extends useQuery.Result = useQuery.Result, E extends IHasID = IHasID, M = unknown > { @@ -108,7 +108,7 @@ export const QueryResultStateContext = React.createContext(null); export const QueryResultContext = < - T extends QueryResult, + T extends useQuery.Result, E extends IHasID = IHasID, M = unknown >( @@ -174,7 +174,7 @@ export const QueryResultContext = < }; export function useQueryResultContext< - T extends QueryResult, + T extends useQuery.Result, E extends IHasID = IHasID, M = unknown >() { diff --git a/ui/v2.5/src/components/List/util.ts b/ui/v2.5/src/components/List/util.ts index da52ea765..28216e284 100644 --- a/ui/v2.5/src/components/List/util.ts +++ b/ui/v2.5/src/components/List/util.ts @@ -3,7 +3,7 @@ import Mousetrap from "mousetrap"; import { ListFilterModel } from "src/models/list-filter/filter"; import { useHistory, useLocation } from "react-router-dom"; import { isEqual, isFunction } from "lodash-es"; -import { QueryResult } from "@apollo/client"; +import type { useQuery } from "@apollo/client/react"; import { IHasID } from "src/utils/data"; import { useConfigurationContext } from "src/hooks/Config"; import { View } from "./views"; @@ -484,7 +484,7 @@ function totalCountImpacted( // this hook caches a query result and count, and only updates it when the filter changes // in a way that would impact the result count // it is used to prevent the result count/pagination from flickering when changing pages or sorting -export function useCachedQueryResult( +export function useCachedQueryResult( filter: ListFilterModel, result: T ) { @@ -508,7 +508,7 @@ export function useCachedQueryResult( } export interface IQueryResultHook< - T extends QueryResult, + T extends useQuery.Result, E extends IHasID = IHasID, M = unknown > { @@ -520,7 +520,7 @@ export interface IQueryResultHook< } export function useQueryResult< - T extends QueryResult, + T extends useQuery.Result, E extends IHasID = IHasID, M = unknown >( @@ -574,7 +574,7 @@ export function useQueryResult< export function useCloseEditDelete(props: { onSelectNone: () => void; closeModal: () => void; - result: QueryResult; + result: useQuery.Result; }) { const { onSelectNone, closeModal, result } = props; diff --git a/ui/v2.5/src/components/Settings/context.tsx b/ui/v2.5/src/components/Settings/context.tsx index 0960836bb..9be5e3df5 100644 --- a/ui/v2.5/src/components/Settings/context.tsx +++ b/ui/v2.5/src/components/Settings/context.tsx @@ -1,4 +1,4 @@ -import { ApolloError } from "@apollo/client/errors"; +import { CombinedGraphQLErrors } from "@apollo/client"; import { faCheckCircle, faTimesCircle, @@ -26,7 +26,7 @@ type PluginConfigs = Record>; export interface ISettingsContextState { loading: boolean; - error: ApolloError | undefined; + error: CombinedGraphQLErrors | undefined; general: GQL.ConfigGeneralInput; interface: GQL.ConfigInterfaceInput; defaults: GQL.ConfigDefaultSettingsInput; diff --git a/ui/v2.5/src/components/Shared/DeleteEntityDialog.tsx b/ui/v2.5/src/components/Shared/DeleteEntityDialog.tsx index 35622a9b9..ca6adaab2 100644 --- a/ui/v2.5/src/components/Shared/DeleteEntityDialog.tsx +++ b/ui/v2.5/src/components/Shared/DeleteEntityDialog.tsx @@ -1,6 +1,6 @@ import React, { useState } from "react"; import { defineMessages, FormattedMessage, useIntl } from "react-intl"; -import { FetchResult } from "@apollo/client"; +import { ApolloLink } from "@apollo/client"; import { ModalComponent } from "./Modal"; import { useToast } from "src/hooks/Toast"; @@ -13,7 +13,7 @@ interface IDeletionEntity { type DestroyMutation = (input: { ids: string[]; -}) => [() => Promise, {}]; +}) => [() => Promise, {}]; interface IDeleteEntityDialogProps { selected: IDeletionEntity[]; diff --git a/ui/v2.5/src/components/Shared/PackageManager/PackageManager.tsx b/ui/v2.5/src/components/Shared/PackageManager/PackageManager.tsx index 2a9530716..cd67c7a3e 100644 --- a/ui/v2.5/src/components/Shared/PackageManager/PackageManager.tsx +++ b/ui/v2.5/src/components/Shared/PackageManager/PackageManager.tsx @@ -16,7 +16,6 @@ import * as yup from "yup"; import { FormikErrors, yupToFormErrors } from "formik"; import { AlertModal } from "../Alert"; import { LoadingIndicator } from "../LoadingIndicator"; -import { ApolloError } from "@apollo/client"; import { ClearableInput } from "../ClearableInput"; function packageKey( @@ -742,7 +741,7 @@ const SourcePackagesList: React.FC<{ const loaded = await loadSource(); setPackages(loaded); } catch (e) { - setLoadError((e as ApolloError).message); + setLoadError((e as Error).message); } finally { setLoading(false); } diff --git a/ui/v2.5/src/core/StashService.ts b/ui/v2.5/src/core/StashService.ts index 33b778343..54c85f37d 100644 --- a/ui/v2.5/src/core/StashService.ts +++ b/ui/v2.5/src/core/StashService.ts @@ -1,22 +1,20 @@ import { ApolloCache, DocumentNode, - FetchResult, NetworkStatus, - useQuery, + ApolloLink, } from "@apollo/client"; +import { useQuery } from "@apollo/client/react"; import { Modifiers } from "@apollo/client/cache"; -import { - isField, - getQueryDefinition, - StoreObject, -} from "@apollo/client/utilities"; +import { StoreObject } from "@apollo/client/utilities"; +import { isField, getQueryDefinition } from "@apollo/client/utilities/internal"; import { ListFilterModel } from "../models/list-filter/filter"; import * as GQL from "./generated-graphql"; import { createClient } from "./createClient"; import { Client } from "graphql-ws"; import { useEffect, useState } from "react"; +import { IUIConfig } from "./config"; const { client, wsClient, cache: clientCache } = createClient(); @@ -48,10 +46,7 @@ export function useWSState(ws: Client) { // Evicts cached results for the given queries. // Will also call a cache GC afterwards. -export function evictQueries( - cache: ApolloCache, - queries: DocumentNode[] -) { +export function evictQueries(cache: ApolloCache, queries: DocumentNode[]) { const fields: Modifiers = {}; for (const query of queries) { const { selections } = getQueryDefinition(query).selectionSet; @@ -76,11 +71,12 @@ export function evictQueries( * @param ignore optionally specify a cache id to ignore and not modify */ function evictTypeFields( - cache: ApolloCache>, + cache: ApolloCache, input: Record, ignore?: string ) { - const data = cache.extract(); + const data: Record = + cache.extract() as unknown as Record; for (const key in data) { if (ignore?.includes(key)) continue; @@ -104,7 +100,7 @@ function evictTypeFields( // cached result of the given query to null. // Use with "Destroy" mutations. function deleteObject( - cache: ApolloCache, + cache: ApolloCache, obj: StoreObject, query: DocumentNode ) { @@ -536,7 +532,7 @@ export const queryFindSubFolders = (id: string, excludeZipFolders?: boolean) => /// Object Mutations // Increases/decreases the given field of the Stats query by diff -function updateStats(cache: ApolloCache, field: string, diff: number) { +function updateStats(cache: ApolloCache, field: string, diff: number) { cache.modify({ fields: { stats(value) { @@ -550,7 +546,7 @@ function updateStats(cache: ApolloCache, field: string, diff: number) { } function updateO( - cache: ApolloCache, + cache: ApolloCache, typename: string, id: string, updatedOCount: number @@ -620,7 +616,7 @@ export const mutateCreateScene = (input: GQL.SceneCreateInput) => export const useSceneUpdate = () => GQL.useSceneUpdateMutation({ - update(cache, result) { + update(cache: ApolloCache, result: { data: GQL.SceneUpdateMutation }) { if (!result.data?.sceneUpdate) return; evictTypeFields(cache, sceneMutationImpactedTypeFields); @@ -630,7 +626,7 @@ export const useSceneUpdate = () => export const useBulkSceneUpdate = () => GQL.useBulkSceneUpdateMutation({ - update(cache, result) { + update(cache: ApolloCache, result: { data: GQL.BulkSceneUpdateMutation }) { if (!result.data?.bulkSceneUpdate) return; evictTypeFields(cache, sceneMutationImpactedTypeFields); @@ -641,7 +637,7 @@ export const useBulkSceneUpdate = () => export const useScenesUpdate = (input: GQL.SceneUpdateInput[]) => GQL.useScenesUpdateMutation({ variables: { input }, - update(cache, result) { + update(cache: ApolloCache, result: { data: GQL.ScenesUpdateMutation }) { if (!result.data?.scenesUpdate) return; evictTypeFields(cache, sceneMutationImpactedTypeFields); @@ -652,7 +648,7 @@ export const useScenesUpdate = (input: GQL.SceneUpdateInput[]) => export const useSceneDestroy = (input: GQL.SceneDestroyInput) => GQL.useSceneDestroyMutation({ variables: input, - update(cache, result) { + update(cache: ApolloCache, result: { data: GQL.SceneDestroyMutation }) { if (!result.data?.sceneDestroy) return; const obj = { __typename: "Scene", id: input.id }; @@ -670,7 +666,7 @@ export const useSceneDestroy = (input: GQL.SceneDestroyInput) => export const useScenesDestroy = (input: GQL.ScenesDestroyInput) => GQL.useScenesDestroyMutation({ variables: input, - update(cache, result) { + update(cache: ApolloCache, result: { data: GQL.ScenesDestroyMutation }) { if (!result.data?.scenesDestroy) return; for (const id of input.ids) { @@ -690,7 +686,11 @@ export const useScenesDestroy = (input: GQL.ScenesDestroyInput) => export const useSceneIncrementO = (id: string) => GQL.useSceneAddOMutation({ variables: { id }, - update(cache, result, { variables }) { + update( + cache: ApolloCache, + result: { data: GQL.SceneAddOMutation }, + { variables }: { variables: GQL.SceneAddOMutationVariables } + ) { // this is not perfectly accurate, the time is set server-side // it isn't even displayed anywhere in the UI anyway const at = new Date().toISOString(); @@ -749,7 +749,11 @@ export const useSceneIncrementO = (id: string) => export const useSceneDecrementO = (id: string) => GQL.useSceneDeleteOMutation({ variables: { id }, - update(cache, result, { variables }) { + update( + cache: ApolloCache, + result: { data: GQL.SceneDeleteOMutation }, + { variables }: { variables: GQL.SceneDeleteOMutationVariables } + ) { const mutationResult = result.data?.sceneDeleteO; if (!mutationResult || !variables) return; @@ -804,7 +808,7 @@ export const useSceneDecrementO = (id: string) => export const useSceneResetO = (id: string) => GQL.useSceneResetOMutation({ variables: { id }, - update(cache, result) { + update(cache: ApolloCache, result: { data: GQL.SceneResetOMutation }) { const updatedOCount = result.data?.sceneResetO; if (updatedOCount === undefined) return; @@ -868,8 +872,11 @@ export const useSceneResetActivity = ( reset_duration: boolean ) => GQL.useSceneResetActivityMutation({ - variables: { id, reset_resume, reset_duration }, - update(cache, result) { + variables: { variables: { id, reset_resume, reset_duration } }, + update( + cache: ApolloCache, + result: { data: GQL.SceneResetActivityMutation } + ) { if (!result.data?.sceneResetActivity) return; evictTypeFields(cache, sceneMutationImpactedTypeFields); @@ -964,7 +971,11 @@ export const mutateSceneMerge = ( export const useSceneSaveActivity = () => GQL.useSceneSaveActivityMutation({ - update(cache, result, { variables }) { + update( + cache: ApolloCache, + result: { data: GQL.SceneSaveActivityMutation }, + { variables }: { variables: GQL.SceneSaveActivityMutationVariables } + ) { if (!result.data?.sceneSaveActivity || !variables) return; const { id, playDuration, resume_time: resumeTime } = variables; @@ -993,7 +1004,11 @@ export const useSceneSaveActivity = () => export const useSceneIncrementPlayCount = () => GQL.useSceneAddPlayMutation({ - update(cache, result, { variables }) { + update( + cache: ApolloCache, + result: { data: GQL.SceneAddPlayMutation }, + { variables }: { variables: GQL.SceneAddPlayMutationVariables } + ) { const mutationResult = result.data?.sceneAddPlay; if (!mutationResult || !variables) return; @@ -1007,7 +1022,7 @@ export const useSceneIncrementPlayCount = () => cache.modify({ id: cache.identify({ __typename: "Scene", id }), fields: { - play_count(value) { + play_count(value: number) { lastPlayCount = value; return history.length; }, @@ -1034,7 +1049,11 @@ export const useSceneIncrementPlayCount = () => export const useSceneDecrementPlayCount = () => GQL.useSceneDeletePlayMutation({ - update(cache, result, { variables }) { + update( + cache: ApolloCache, + result: { data: GQL.SceneDeletePlayMutation }, + { variables }: { variables: GQL.SceneDeletePlayMutationVariables } + ) { const mutationResult = result.data?.sceneDeletePlay; if (!mutationResult || !variables) return; @@ -1092,14 +1111,18 @@ export const useSceneDecrementPlayCount = () => export const useSceneResetPlayCount = () => GQL.useSceneResetPlayCountMutation({ - update(cache, result, { variables }) { + update( + cache: ApolloCache, + result: { data: GQL.SceneResetPlayCountMutation }, + { variables }: { variables: GQL.SceneResetPlayCountMutationVariables } + ) { if (!variables) return; let lastPlayCount = 0; cache.modify({ id: cache.identify({ __typename: "Scene", id: variables.id }), fields: { - play_count(value) { + play_count(value: number) { lastPlayCount = value; return 0; }, @@ -1143,7 +1166,7 @@ const imageMutationImpactedQueries = [ export const useImageUpdate = () => GQL.useImageUpdateMutation({ - update(cache, result) { + update(cache: ApolloCache, result: { data: GQL.ImageUpdateMutation }) { if (!result.data?.imageUpdate) return; evictTypeFields(cache, imageMutationImpactedTypeFields); @@ -1153,7 +1176,10 @@ export const useImageUpdate = () => export const useBulkImageUpdate = () => GQL.useBulkImageUpdateMutation({ - update(cache, result) { + update( + cache: ApolloCache, + result: { data: { bulkImageUpdate?: unknown } } + ) { if (!result.data?.bulkImageUpdate) return; evictTypeFields(cache, imageMutationImpactedTypeFields); @@ -1164,7 +1190,7 @@ export const useBulkImageUpdate = () => export const useImagesDestroy = (input: GQL.ImagesDestroyInput) => GQL.useImagesDestroyMutation({ variables: input, - update(cache, result) { + update(cache: ApolloCache, result: { data: GQL.ImagesDestroyMutation }) { if (!result.data?.imagesDestroy) return; for (const id of input.ids) { @@ -1182,8 +1208,8 @@ export const useImagesDestroy = (input: GQL.ImagesDestroyInput) => function updateImageIncrementO(id: string) { return ( - cache: ApolloCache>, - result: FetchResult + cache: ApolloCache, + result: ApolloLink.Result ) => { const updatedOCount = result.data?.imageIncrementO; if (updatedOCount === undefined) return; @@ -1236,8 +1262,8 @@ export const mutateImageIncrementO = (id: string) => function updateImageDecrementO(id: string) { return ( - cache: ApolloCache>, - result: FetchResult + cache: ApolloCache, + result: ApolloLink.Result ) => { const updatedOCount = result.data?.imageDecrementO; if (updatedOCount === undefined) return; @@ -1291,8 +1317,8 @@ export const mutateImageDecrementO = (id: string) => function updateImageResetO(id: string) { return ( - cache: ApolloCache>, - result: FetchResult + cache: ApolloCache, + result: ApolloLink.Result ) => { const updatedOCount = result.data?.imageResetO; if (updatedOCount === undefined) return; @@ -1383,7 +1409,7 @@ const groupMutationImpactedQueries = [ export const useGroupCreate = () => GQL.useGroupCreateMutation({ - update(cache, result) { + update(cache: ApolloCache, result: { data: GQL.GroupCreateMutation }) { const group = result.data?.groupCreate; if (!group) return; @@ -1397,7 +1423,7 @@ export const useGroupCreate = () => export const useGroupUpdate = () => GQL.useGroupUpdateMutation({ - update(cache, result) { + update(cache: ApolloCache, result: { data: GQL.GroupUpdateMutation }) { if (!result.data?.groupUpdate) return; evictTypeFields(cache, groupMutationImpactedTypeFields); @@ -1407,7 +1433,7 @@ export const useGroupUpdate = () => export const useBulkGroupUpdate = () => GQL.useBulkGroupUpdateMutation({ - update(cache, result) { + update(cache: ApolloCache, result: { data: GQL.BulkGroupUpdateMutation }) { if (!result.data?.bulkGroupUpdate) return; evictTypeFields(cache, groupMutationImpactedTypeFields); @@ -1415,10 +1441,10 @@ export const useBulkGroupUpdate = () => }, }); -export const useGroupDestroy = (input: GQL.GroupDestroyInput) => +export const useGroupDestroy = (input: GQL.GroupDestroyMutationVariables) => GQL.useGroupDestroyMutation({ variables: input, - update(cache, result) { + update(cache: ApolloCache, result: { data: GQL.GroupDestroyMutation }) { if (!result.data?.groupDestroy) return; const obj = { __typename: "Group", id: input.id }; @@ -1442,7 +1468,7 @@ export const useGroupDestroy = (input: GQL.GroupDestroyInput) => export const useGroupsDestroy = (input: GQL.GroupsDestroyMutationVariables) => GQL.useGroupsDestroyMutation({ variables: input, - update(cache, result) { + update(cache: ApolloCache, result: { data: GQL.GroupsDestroyMutation }) { if (!result.data?.groupsDestroy) return; const { ids } = input; @@ -1469,7 +1495,7 @@ export const useGroupsDestroy = (input: GQL.GroupsDestroyMutationVariables) => export function useReorderSubGroupsMutation() { return GQL.useReorderSubGroupsMutation({ - update(cache) { + update(cache: ApolloCache) { evictQueries(cache, [ GQL.FindGroupsDocument, // various filters ]); @@ -1479,7 +1505,10 @@ export function useReorderSubGroupsMutation() { export const useAddSubGroups = () => { const [addSubGroups] = GQL.useAddGroupSubGroupsMutation({ - update(cache, result) { + update( + cache: ApolloCache, + result: { data: GQL.AddGroupSubGroupsMutation } + ) { if (!result.data?.addGroupSubGroups) return; evictTypeFields(cache, groupMutationImpactedTypeFields); @@ -1501,7 +1530,10 @@ export const useAddSubGroups = () => { export const useRemoveSubGroups = () => { const [removeSubGroups] = GQL.useRemoveGroupSubGroupsMutation({ - update(cache, result) { + update( + cache: ApolloCache, + result: { data: GQL.RemoveGroupSubGroupsMutation } + ) { if (!result.data?.removeGroupSubGroups) return; evictTypeFields(cache, groupMutationImpactedTypeFields); @@ -1535,7 +1567,11 @@ const sceneMarkerMutationImpactedQueries = [ export const useSceneMarkerCreate = () => GQL.useSceneMarkerCreateMutation({ - update(cache, result, { variables }) { + update( + cache: ApolloCache, + result: { data: GQL.SceneMarkerCreateMutation }, + { variables }: { variables: GQL.SceneMarkerCreateMutationVariables } + ) { if (!result.data?.sceneMarkerCreate || !variables) return; // refetch linked scene's marker list @@ -1551,7 +1587,11 @@ export const useSceneMarkerCreate = () => export const useSceneMarkerUpdate = () => GQL.useSceneMarkerUpdateMutation({ - update(cache, result, { variables }) { + update( + cache: ApolloCache, + result: { data: GQL.SceneMarkerUpdateMutation }, + { variables }: { variables: GQL.SceneMarkerUpdateMutationVariables } + ) { if (!result.data?.sceneMarkerUpdate || !variables) return; // refetch linked scene's marker list @@ -1567,7 +1607,10 @@ export const useSceneMarkerUpdate = () => export const useBulkSceneMarkerUpdate = () => GQL.useBulkSceneMarkerUpdateMutation({ - update(cache, result) { + update( + cache: ApolloCache, + result: { data: GQL.BulkSceneMarkerUpdateMutation } + ) { if (!result.data?.bulkSceneMarkerUpdate) return; evictTypeFields(cache, sceneMarkerMutationImpactedTypeFields); @@ -1577,7 +1620,11 @@ export const useBulkSceneMarkerUpdate = () => export const useSceneMarkerDestroy = () => GQL.useSceneMarkerDestroyMutation({ - update(cache, result, { variables }) { + update( + cache: ApolloCache, + result: { data: GQL.SceneMarkerDestroyMutation }, + { variables }: { variables: GQL.SceneMarkerDestroyMutationVariables } + ) { if (!result.data?.sceneMarkerDestroy || !variables) return; const obj = { __typename: "SceneMarker", id: variables.id }; @@ -1593,7 +1640,10 @@ export const useSceneMarkersDestroy = ( ) => GQL.useSceneMarkersDestroyMutation({ variables: input, - update(cache, result) { + update( + cache: ApolloCache, + result: { data: GQL.SceneMarkersDestroyMutation } + ) { if (!result.data?.sceneMarkersDestroy) return; for (const id of input.ids) { @@ -1623,7 +1673,7 @@ const galleryMutationImpactedQueries = [ export const useGalleryCreate = () => GQL.useGalleryCreateMutation({ - update(cache, result) { + update(cache: ApolloCache, result: { data: GQL.GalleryCreateMutation }) { if (!result.data?.galleryCreate) return; // update stats @@ -1636,7 +1686,7 @@ export const useGalleryCreate = () => export const useGalleryUpdate = () => GQL.useGalleryUpdateMutation({ - update(cache, result) { + update(cache: ApolloCache, result: { data: GQL.GalleryUpdateMutation }) { if (!result.data?.galleryUpdate) return; evictTypeFields(cache, galleryMutationImpactedTypeFields); @@ -1646,7 +1696,10 @@ export const useGalleryUpdate = () => export const useBulkGalleryUpdate = () => GQL.useBulkGalleryUpdateMutation({ - update(cache, result) { + update( + cache: ApolloCache, + result: { data: GQL.BulkGalleryUpdateMutation } + ) { if (!result.data?.bulkGalleryUpdate) return; evictTypeFields(cache, galleryMutationImpactedTypeFields); @@ -1654,10 +1707,10 @@ export const useBulkGalleryUpdate = () => }, }); -export const useGalleryDestroy = (input: GQL.GalleryDestroyInput) => +export const useGalleryDestroy = (input: GQL.GalleryDestroyMutationVariables) => GQL.useGalleryDestroyMutation({ variables: input, - update(cache, result) { + update(cache: ApolloCache, result: { data: GQL.GalleryDestroyMutation }) { if (!result.data?.galleryDestroy) return; for (const id of input.ids) { @@ -1702,7 +1755,7 @@ export const mutateAddGalleryImages = (input: GQL.GalleryAddInput) => }, }); -function evictCover(cache: ApolloCache, gallery_id: string) { +function evictCover(cache: ApolloCache, gallery_id: string) { const fields: Partial, "paths" | "cover">> = {}; fields.paths = (paths) => { if (!("cover" in paths)) { @@ -1795,7 +1848,10 @@ const galleryChapterMutationImpactedQueries = [ export const useGalleryChapterCreate = () => GQL.useGalleryChapterCreateMutation({ - update(cache, result) { + update( + cache: ApolloCache, + result: { data: GQL.GalleryChapterCreateMutation } + ) { if (!result.data?.galleryChapterCreate) return; evictTypeFields(cache, galleryChapterMutationImpactedTypeFields); @@ -1805,7 +1861,10 @@ export const useGalleryChapterCreate = () => export const useGalleryChapterUpdate = () => GQL.useGalleryChapterUpdateMutation({ - update(cache, result) { + update( + cache: ApolloCache, + result: { data: GQL.GalleryChapterUpdateMutation } + ) { if (!result.data?.galleryChapterUpdate) return; evictTypeFields(cache, galleryChapterMutationImpactedTypeFields); @@ -1815,7 +1874,11 @@ export const useGalleryChapterUpdate = () => export const useGalleryChapterDestroy = () => GQL.useGalleryChapterDestroyMutation({ - update(cache, result, { variables }) { + update( + cache: ApolloCache, + result: { data: GQL.GalleryChapterDestroyMutation }, + { variables }: { variables: GQL.GalleryChapterDestroyMutationVariables } + ) { if (!result.data?.galleryChapterDestroy || !variables) return; const obj = { __typename: "GalleryChapter", id: variables.id }; @@ -1840,7 +1903,7 @@ export const performerMutationImpactedQueries = [ export const usePerformerCreate = () => GQL.usePerformerCreateMutation({ - update(cache, result) { + update(cache: ApolloCache, result: { data: GQL.PerformerCreateMutation }) { const performer = result.data?.performerCreate; if (!performer) return; @@ -1857,7 +1920,7 @@ export const usePerformerCreate = () => export const usePerformerUpdate = () => GQL.usePerformerUpdateMutation({ - update(cache, result) { + update(cache: ApolloCache, result: { data: GQL.PerformerUpdateMutation }) { if (!result.data?.performerUpdate) return; evictTypeFields(cache, performerMutationImpactedTypeFields); @@ -1865,10 +1928,15 @@ export const usePerformerUpdate = () => }, }); -export const useBulkPerformerUpdate = (input: GQL.BulkPerformerUpdateInput) => +export const useBulkPerformerUpdate = ( + input: GQL.BulkPerformerUpdateMutationVariables +) => GQL.useBulkPerformerUpdateMutation({ variables: { input }, - update(cache, result) { + update( + cache: ApolloCache, + result: { data: GQL.BulkPerformerUpdateMutation } + ) { if (!result.data?.bulkPerformerUpdate) return; evictTypeFields(cache, performerMutationImpactedTypeFields); @@ -1878,7 +1946,11 @@ export const useBulkPerformerUpdate = (input: GQL.BulkPerformerUpdateInput) => export const usePerformerDestroy = () => GQL.usePerformerDestroyMutation({ - update(cache, result, { variables }) { + update( + cache: ApolloCache, + result: { data: GQL.PerformerDestroyMutation }, + { variables }: { variables: GQL.PerformerDestroyMutationVariables } + ) { if (!result.data?.performerDestroy || !variables) return; const obj = { __typename: "Performer", id: variables.id }; @@ -1905,7 +1977,10 @@ export const usePerformersDestroy = ( ) => GQL.usePerformersDestroyMutation({ variables: input, - update(cache, result) { + update( + cache: ApolloCache, + result: { data: GQL.PerformersDestroyMutation } + ) { if (!result.data?.performersDestroy) return; const { ids } = input; @@ -1990,7 +2065,11 @@ export const studioMutationImpactedQueries = [ export const useStudioCreate = () => GQL.useStudioCreateMutation({ - update(cache, result, { variables }) { + update( + cache: ApolloCache, + result: { data: GQL.StudioCreateMutation }, + { variables }: { variables: GQL.StudioCreateMutationVariables } + ) { const studio = result.data?.studioCreate; if (!studio || !variables) return; @@ -2015,7 +2094,7 @@ export const useStudioCreate = () => export const useStudioUpdate = () => GQL.useStudioUpdateMutation({ - update(cache, result) { + update(cache: ApolloCache, result: { data: GQL.StudioUpdateMutation }) { const studio = result.data?.studioUpdate; if (!studio) return; @@ -2032,7 +2111,7 @@ export const useStudioUpdate = () => export const useBulkStudioUpdate = () => GQL.useBulkStudioUpdateMutation({ - update(cache, result) { + update(cache: ApolloCache, result: { data: GQL.BulkStudioUpdateMutation }) { if (!result.data?.bulkStudioUpdate) return; evictTypeFields(cache, studioMutationImpactedTypeFields); @@ -2043,7 +2122,7 @@ export const useBulkStudioUpdate = () => export const useStudioDestroy = (input: GQL.StudioDestroyInput) => GQL.useStudioDestroyMutation({ variables: input, - update(cache, result) { + update(cache: ApolloCache, result: { data: GQL.StudioDestroyMutation }) { if (!result.data?.studioDestroy) return; const obj = { __typename: "Studio", id: input.id }; @@ -2060,7 +2139,7 @@ export const useStudioDestroy = (input: GQL.StudioDestroyInput) => export const useStudiosDestroy = (input: GQL.StudiosDestroyMutationVariables) => GQL.useStudiosDestroyMutation({ variables: input, - update(cache, result) { + update(cache: ApolloCache, result: { data: GQL.StudiosDestroyMutation }) { if (!result.data?.studiosDestroy) return; const { ids } = input; @@ -2094,7 +2173,7 @@ const tagMutationImpactedQueries = [ export const useTagCreate = () => GQL.useTagCreateMutation({ - update(cache, result) { + update(cache: ApolloCache, result: { data: GQL.TagCreateMutation }) { const tag = result.data?.tagCreate; if (!tag) return; @@ -2116,7 +2195,7 @@ export const useTagCreate = () => export const useTagUpdate = () => GQL.useTagUpdateMutation({ - update(cache, result) { + update(cache: ApolloCache, result: { data: GQL.TagUpdateMutation }) { const tag = result.data?.tagUpdate; if (!tag) return; @@ -2134,7 +2213,7 @@ export const useTagUpdate = () => export const useBulkTagUpdate = (input: GQL.BulkTagUpdateInput) => GQL.useBulkTagUpdateMutation({ variables: { input }, - update(cache, result) { + update(cache: ApolloCache, result: { data: GQL.BulkTagUpdateMutation }) { if (!result.data?.bulkTagUpdate) return; evictTypeFields(cache, tagMutationImpactedTypeFields); @@ -2145,7 +2224,7 @@ export const useBulkTagUpdate = (input: GQL.BulkTagUpdateInput) => export const useTagDestroy = (input: GQL.TagDestroyInput) => GQL.useTagDestroyMutation({ variables: input, - update(cache, result) { + update(cache: ApolloCache, result: { data: GQL.TagDestroyMutation }) { if (!result.data?.tagDestroy) return; const obj = { __typename: "Tag", id: input.id }; @@ -2162,7 +2241,7 @@ export const useTagDestroy = (input: GQL.TagDestroyInput) => export const useTagsDestroy = (input: GQL.TagsDestroyMutationVariables) => GQL.useTagsDestroyMutation({ variables: input, - update(cache, result) { + update(cache: ApolloCache, result: { data: GQL.TagsDestroyMutation }) { if (!result.data?.tagsDestroy) return; const { ids } = input; @@ -2182,7 +2261,11 @@ export const useTagsDestroy = (input: GQL.TagsDestroyMutationVariables) => export const useTagsMerge = () => GQL.useTagsMergeMutation({ - update(cache, result, { variables }) { + update( + cache: ApolloCache, + result: { data: GQL.TagsMergeMutation }, + { variables }: { variables: GQL.TagsMergeMutationVariables } + ) { if (!result.data?.tagsMerge || !variables) return; const { source, destination } = variables; @@ -2205,7 +2288,7 @@ export const useTagsMerge = () => export const useSaveFilter = () => { const [saveFilterMutation] = GQL.useSaveFilterMutation({ - update(cache, result) { + update(cache: ApolloCache, result: { data: GQL.SaveFilterMutation }) { if (!result.data?.saveFilter) return; evictQueries(cache, [GQL.FindSavedFiltersDocument]); @@ -2234,7 +2317,11 @@ export const useSaveFilter = () => { export const useSavedFilterDestroy = () => GQL.useDestroySavedFilterMutation({ - update(cache, result, { variables }) { + update( + cache: ApolloCache, + result: { data: GQL.DestroySavedFilterMutation }, + { variables }: { variables: GQL.DestroySavedFilterMutationVariables } + ) { if (!result.data?.destroySavedFilter || !variables) return; const obj = { __typename: "SavedFilter", id: variables.input.id }; @@ -2674,7 +2761,7 @@ export const mutateSetPluginsEnabled = (enabledMap: BoolMap) => }, }); -function updateConfiguration(cache: ApolloCache, result: FetchResult) { +function updateConfiguration(cache: ApolloCache, result: ApolloLink.Result) { if (!result.data) return; evictQueries(cache, [GQL.ConfigurationDocument]); @@ -2682,7 +2769,7 @@ function updateConfiguration(cache: ApolloCache, result: FetchResult) { export const useConfigureGeneral = () => GQL.useConfigureGeneralMutation({ - update(cache, result) { + update(cache: ApolloCache, result: { data: GQL.ConfigureGeneralMutation }) { if (!result.data?.configureGeneral) return; evictQueries(cache, [ @@ -2708,10 +2795,7 @@ export const useConfigureDefaults = () => update: updateConfiguration, }); -function updateUIConfig( - cache: ApolloCache>, - result: GQL.ConfigureUiMutation["configureUI"] | undefined -) { +function updateUIConfig(cache: ApolloCache, result: IUIConfig | undefined) { if (!result) return; const existing = cache.readQuery({ @@ -2731,13 +2815,28 @@ function updateUIConfig( export const useConfigureUI = () => GQL.useConfigureUiMutation({ - update: (cache, result) => updateUIConfig(cache, result.data?.configureUI), + update: ( + cache: ApolloCache, + result: { + data: { + configureUI: GQL.ConfigureUiMutation["configureUI"] | undefined; + }; + } + ) => updateUIConfig(cache, result?.data?.configureUI), }); export const useConfigureUISetting = () => GQL.useConfigureUiSettingMutation({ - update: (cache, result) => - updateUIConfig(cache, result.data?.configureUISetting), + update: ( + cache: ApolloCache, + result: { + data: { + configureUISetting: + | GQL.ConfigureUiSettingMutation["configureUISetting"] + | undefined; + }; + } + ) => updateUIConfig(cache, result.data?.configureUISetting), }); export const useConfigureScraping = () => diff --git a/ui/v2.5/src/core/createClient.ts b/ui/v2.5/src/core/createClient.ts index f2a6ff5fd..4a79f4bff 100644 --- a/ui/v2.5/src/core/createClient.ts +++ b/ui/v2.5/src/core/createClient.ts @@ -9,7 +9,7 @@ import { GraphQLWsLink } from "@apollo/client/link/subscriptions"; import { createClient as createWSClient } from "graphql-ws"; import { onError } from "@apollo/client/link/error"; import { getMainDefinition } from "@apollo/client/utilities"; -import createUploadLink from "apollo-upload-client/createUploadLink.mjs"; +import UploadHttpLink from "apollo-upload-client/UploadHttpLink.mjs"; import * as GQL from "src/core/generated-graphql"; import { FieldReadFunction } from "@apollo/client/cache"; @@ -138,7 +138,7 @@ export const createClient = () => { wsUrl.protocol = "ws:"; } - const httpLink = createUploadLink({ uri: url.toString() }); + const httpLink = new UploadHttpLink({ uri: url.toString() }); const wsClient = createWSClient({ url: wsUrl.toString(), diff --git a/ui/v2.5/src/index.tsx b/ui/v2.5/src/index.tsx index f52e28cea..f8e41fc65 100755 --- a/ui/v2.5/src/index.tsx +++ b/ui/v2.5/src/index.tsx @@ -1,4 +1,4 @@ -import { ApolloProvider } from "@apollo/client"; +import { ApolloProvider } from "@apollo/client/react"; import ReactDOM from "react-dom"; import { BrowserRouter } from "react-router-dom"; import { App } from "./App"; diff --git a/ui/v2.5/tsconfig.json b/ui/v2.5/tsconfig.json index 93c8c0b5a..3adfa6995 100644 --- a/ui/v2.5/tsconfig.json +++ b/ui/v2.5/tsconfig.json @@ -8,12 +8,14 @@ "strict": true, "forceConsistentCasingInFileNames": true, "module": "es2020", - "moduleResolution": "node", + "moduleResolution": "bundler", "resolveJsonModule": true, "noEmit": true, "jsx": "react-jsx", "experimentalDecorators": true, - "baseUrl": ".", + "paths": { + "*": ["./*"] + }, "sourceMap": true, "allowJs": true, "isolatedModules": true, From 119cf597b741aea59b3065cabf08b3916db95652 Mon Sep 17 00:00:00 2001 From: feederbox826 Date: Wed, 29 Apr 2026 17:54:45 -0400 Subject: [PATCH 2/2] apollo broken error handling --- ui/v2.5/src/components/List/PagedList.tsx | 7 ++++--- ui/v2.5/src/utils/errors.ts | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ui/v2.5/src/components/List/PagedList.tsx b/ui/v2.5/src/components/List/PagedList.tsx index e42eebf06..b35b731d8 100644 --- a/ui/v2.5/src/components/List/PagedList.tsx +++ b/ui/v2.5/src/components/List/PagedList.tsx @@ -1,5 +1,6 @@ import React, { PropsWithChildren, useMemo } from "react"; -import { ApolloError, QueryResult } from "@apollo/client"; +import { ApolloError } from "@apollo/client/v4-migration"; +import type { useQuery } from "@apollo/client/react"; import { ListFilterModel } from "src/models/list-filter/filter"; import { Pagination, PaginationIndex } from "./Pagination"; import { LoadingIndicator } from "../Shared/LoadingIndicator"; @@ -34,8 +35,8 @@ export const LoadedContent: React.FC< export const PagedList: React.FC< PropsWithChildren<{ - result: QueryResult; - cachedResult: QueryResult; + result: useQuery.Result; + cachedResult: useQuery.Result; filter: ListFilterModel; totalCount: number; onChangePage: (page: number) => void; diff --git a/ui/v2.5/src/utils/errors.ts b/ui/v2.5/src/utils/errors.ts index f9dfef9dc..abccb16b7 100644 --- a/ui/v2.5/src/utils/errors.ts +++ b/ui/v2.5/src/utils/errors.ts @@ -1,4 +1,4 @@ -import { ApolloError } from "@apollo/client"; +import { ApolloError } from "@apollo/client/v4-migration"; export const apolloError = (error: unknown) => error instanceof ApolloError ? error.message : "";