diff --git a/demo/admin/package.json b/demo/admin/package.json index 27fcd5576d2..b760792317e 100644 --- a/demo/admin/package.json +++ b/demo/admin/package.json @@ -26,7 +26,7 @@ "start": "pnpm check-node-version && run-s admin-generator intl:compile && run-p gql:types generate-block-types && dotenv -e .env.secrets -e .env.local -e .env -e .env.site-configs -- vite" }, "dependencies": { - "@apollo/client": "^3.13.8", + "@apollo/client": "^4.0.9", "@comet/admin": "workspace:*", "@comet/admin-date-time": "workspace:*", "@comet/admin-icons": "workspace:*", diff --git a/docs/package.json b/docs/package.json index 87e93249486..f62f9febe7e 100644 --- a/docs/package.json +++ b/docs/package.json @@ -39,7 +39,7 @@ }, "dependencies": { "@algolia/client-search": "^5.32.0", - "@apollo/client": "^3.13.8", + "@apollo/client": "^4.0.9", "@comet/admin": "workspace:*", "@comet/admin-color-picker": "workspace:*", "@comet/admin-date-time": "workspace:*", diff --git a/packages/admin/admin-generator/package.json b/packages/admin/admin-generator/package.json index 6407fd08eaf..e1319a20f8e 100644 --- a/packages/admin/admin-generator/package.json +++ b/packages/admin/admin-generator/package.json @@ -42,7 +42,7 @@ "ts-node": "^10.9.2" }, "devDependencies": { - "@apollo/client": "^3.7.0", + "@apollo/client": "^4.0.9", "@comet/admin": "workspace:*", "@comet/admin-icons": "workspace:*", "@comet/cms-admin": "workspace:*", diff --git a/packages/admin/admin/package.json b/packages/admin/admin/package.json index 735169428d7..60700fc0a21 100644 --- a/packages/admin/admin/package.json +++ b/packages/admin/admin/package.json @@ -48,7 +48,7 @@ "uuid": "^11.1.0" }, "devDependencies": { - "@apollo/client": "^3.13.8", + "@apollo/client": "^4.0.9", "@babel/cli": "^7.28.0", "@babel/core": "^7.28.0", "@comet/admin-babel-preset": "workspace:*", @@ -105,7 +105,7 @@ "typescript": "5.9.3" }, "peerDependencies": { - "@apollo/client": "^3.7.0", + "@apollo/client": "^3.7.0 || ^4.0.0", "@emotion/react": "^11.5.0", "@emotion/styled": "^11.3.0", "@mui/material": "^7.0.0", diff --git a/packages/admin/cms-admin/package.json b/packages/admin/cms-admin/package.json index 8176f46d6ad..c0dc7056ff3 100644 --- a/packages/admin/cms-admin/package.json +++ b/packages/admin/cms-admin/package.json @@ -66,7 +66,7 @@ "uuid": "^11.1.0" }, "devDependencies": { - "@apollo/client": "^3.13.8", + "@apollo/client": "^4.0.9", "@babel/cli": "^7.28.0", "@babel/core": "^7.28.0", "@comet/admin-babel-preset": "workspace:*", @@ -122,7 +122,7 @@ "typescript": "5.9.3" }, "peerDependencies": { - "@apollo/client": "^3.7.0", + "@apollo/client": "^3.7.0 || ^4.0.0", "@emotion/react": "^11.5.0", "@emotion/styled": "^11.3.0", "@mui/material": "^7.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7bc62347167..099da414c47 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -63,8 +63,8 @@ importers: demo/admin: dependencies: '@apollo/client': - specifier: ^3.13.8 - version: 3.14.0(@types/react@18.3.26)(graphql-ws@6.0.4(graphql@16.11.0)(ws@8.18.3))(graphql@16.11.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(subscriptions-transport-ws@0.11.0(graphql@16.11.0)) + specifier: ^4.0.9 + version: 4.0.9(graphql-ws@6.0.4(graphql@16.11.0)(ws@8.18.3))(graphql@16.11.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(rxjs@7.8.2)(subscriptions-transport-ws@0.11.0(graphql@16.11.0)) '@comet/admin': specifier: workspace:* version: link:../../packages/admin/admin @@ -612,8 +612,8 @@ importers: specifier: ^5.32.0 version: 5.37.0 '@apollo/client': - specifier: ^3.13.8 - version: 3.14.0(@types/react@18.3.26)(graphql-ws@6.0.4(graphql@16.11.0)(ws@8.18.3))(graphql@16.11.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(subscriptions-transport-ws@0.11.0(graphql@16.11.0)) + specifier: ^4.0.9 + version: 4.0.9(graphql-ws@6.0.4(graphql@16.11.0)(ws@8.18.3))(graphql@16.11.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(rxjs@7.8.2)(subscriptions-transport-ws@0.11.0(graphql@16.11.0)) '@comet/admin': specifier: workspace:* version: link:../packages/admin/admin @@ -815,8 +815,8 @@ importers: version: 11.1.0 devDependencies: '@apollo/client': - specifier: ^3.13.8 - version: 3.14.0(@types/react@18.3.26)(graphql-ws@6.0.4(graphql@16.11.0)(ws@8.18.3))(graphql@16.11.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(subscriptions-transport-ws@0.11.0(graphql@16.11.0)) + specifier: ^4.0.9 + version: 4.0.9(graphql-ws@6.0.4(graphql@16.11.0)(ws@8.18.3))(graphql@16.11.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(rxjs@7.8.2)(subscriptions-transport-ws@0.11.0(graphql@16.11.0)) '@babel/cli': specifier: ^7.28.0 version: 7.28.3(@babel/core@7.28.5) @@ -1178,8 +1178,8 @@ importers: version: 10.9.2(@swc/core@1.13.3)(@types/node@24.10.1)(typescript@5.9.3) devDependencies: '@apollo/client': - specifier: ^3.7.0 - version: 3.14.0(@types/react@18.3.26)(graphql-ws@6.0.4(graphql@16.11.0)(ws@8.18.3))(graphql@16.11.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(subscriptions-transport-ws@0.11.0(graphql@16.11.0)) + specifier: ^4.0.9 + version: 4.0.9(graphql-ws@6.0.4(graphql@16.11.0)(ws@8.18.3))(graphql@16.11.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(rxjs@7.8.2)(subscriptions-transport-ws@0.11.0(graphql@16.11.0)) '@comet/admin': specifier: workspace:* version: link:../admin @@ -1502,8 +1502,8 @@ importers: version: 11.1.0 devDependencies: '@apollo/client': - specifier: ^3.13.8 - version: 3.14.0(@types/react@18.3.26)(graphql-ws@6.0.4(graphql@16.11.0)(ws@8.18.3))(graphql@16.11.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(subscriptions-transport-ws@0.11.0(graphql@16.11.0)) + specifier: ^4.0.9 + version: 4.0.9(graphql-ws@6.0.4(graphql@16.11.0)(ws@8.18.3))(graphql@16.11.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(rxjs@7.8.2)(subscriptions-transport-ws@0.11.0(graphql@16.11.0)) '@babel/cli': specifier: ^7.28.0 version: 7.28.3(@babel/core@7.28.5) @@ -2324,8 +2324,8 @@ importers: storybook: dependencies: '@apollo/client': - specifier: ^3.13.8 - version: 3.14.0(@types/react@18.3.26)(graphql-ws@6.0.4(graphql@16.11.0)(ws@8.18.3))(graphql@16.11.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(subscriptions-transport-ws@0.11.0(graphql@16.11.0)) + specifier: ^4.0.9 + version: 4.0.9(graphql-ws@6.0.4(graphql@16.11.0)(ws@8.18.3))(graphql@16.11.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(rxjs@7.8.2)(subscriptions-transport-ws@0.11.0(graphql@16.11.0)) '@comet/admin': specifier: workspace:* version: link:../packages/admin/admin @@ -2379,7 +2379,7 @@ importers: version: 24.10.1 apollo-link-rest: specifier: ^0.9.0 - version: 0.9.0(@apollo/client@3.14.0(@types/react@18.3.26)(graphql-ws@6.0.4(graphql@16.11.0)(ws@8.18.3))(graphql@16.11.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(subscriptions-transport-ws@0.11.0(graphql@16.11.0)))(graphql@16.11.0)(qs@6.14.0) + version: 0.9.0(@apollo/client@4.0.9(graphql-ws@6.0.4(graphql@16.11.0)(ws@8.18.3))(graphql@16.11.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(rxjs@7.8.2)(subscriptions-transport-ws@0.11.0(graphql@16.11.0)))(graphql@16.11.0)(qs@6.14.0) date-fns: specifier: ^4.1.0 version: 4.1.0 @@ -2652,13 +2652,14 @@ packages: peerDependencies: graphql: 14.x || 15.x || 16.x - '@apollo/client@3.14.0': - resolution: {integrity: sha512-0YQKKRIxiMlIou+SekQqdCo0ZTHxOcES+K8vKB53cIDpwABNR0P0yRzPgsbgcj3zRJniD93S/ontsnZsCLZrxQ==} + '@apollo/client@4.0.9': + resolution: {integrity: sha512-Lh2drMzFE9x5jVS8RKmlGL5SORkvpyUJIT+wTErxDUR2HpWePiBfhhcHHRSlZFiCR866ewCv4euTc4IDF0GWxw==} peerDependencies: - graphql: ^15.0.0 || ^16.0.0 + graphql: ^16.0.0 graphql-ws: ^5.5.5 || ^6.0.3 - react: ^16.8.0 || ^17.0.0 || ^18.0.0 || >=19.0.0-rc - react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || >=19.0.0-rc + 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: @@ -16067,17 +16068,6 @@ packages: resolution: {integrity: sha512-A4pcaORqmNMDVwUjWoTzuhwMGpP+NykpfqAsEgI1FSH/EzC7lrN5TMd+kN8YCovX+jMpu8eaqXgXPCa0g8FQNQ==} hasBin: true - rehackt@0.1.0: - resolution: {integrity: sha512-7kRDOuLHB87D/JESKxQoRwv4DzbIdwkAGQ7p6QKGdVlY1IZheUnVhlk/4UZlNUVxdAXpyxikE3URsG067ybVzw==} - peerDependencies: - '@types/react': '*' - react: '*' - peerDependenciesMeta: - '@types/react': - optional: true - react: - optional: true - rehype-raw@7.0.0: resolution: {integrity: sha512-/aE8hCfKlQeA8LmyeyQvQF3eBiLRGNlfBJEvWH7ivp9sBqs7TNqBL5X3v157rM4IFETqDnIOO+z5M/biZbo9Ww==} @@ -17252,10 +17242,6 @@ packages: ts-interface-checker@0.1.13: resolution: {integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==} - ts-invariant@0.10.3: - resolution: {integrity: sha512-uivwYcQaxAucv1CzRp2n/QdYPo4ILf9VXgH19zEIjFx2EJufV16P0JtJVpYHy89DItG6Kwj2oIUjrcK5au+4tQ==} - engines: {node: '>=8'} - ts-jest@29.4.4: resolution: {integrity: sha512-ccVcRABct5ZELCT5U0+DZwkXMCcOCLi2doHRrKy1nK/s7J7bch6TzJMsrY09WxgUUIP/ITfmcDS8D2yl63rnXw==} engines: {node: ^14.15.0 || ^16.10.0 || ^18.0.0 || >=20.0.0} @@ -18172,12 +18158,6 @@ packages: resolution: {integrity: sha512-U/PBtDf35ff0D8X8D0jfdzHYEPFxAI7jJlxZXwCSez5M3190m+QobIfh+sWDWSHMCWWJN2AWamkegn6vr6YBTw==} engines: {node: '>=18'} - zen-observable-ts@1.2.5: - resolution: {integrity: sha512-QZWQekv6iB72Naeake9hS1KxHlotfRpe+WGNbNx5/ta+R3DNjVO2bswf63gXlWDcs+EMd7XY8HfVQyP1X6T4Zg==} - - zen-observable@0.8.15: - resolution: {integrity: sha512-PQ2PC7R9rslx84ndNBZB/Dkv8V8fZEpk83RLgXtYd0fwUgEjseMn1Dgajh2x6S8QbZAFa9p2qVCEuYZNgve0dQ==} - zip-stream@4.1.1: resolution: {integrity: sha512-9qv4rlDiopXg4E69k+vMHjNN63YFMe9sZMrdlvKnCjlCRWeCBswPPMPUfx+ipsAWq1LXHe70RcbaHdJJpS6hyQ==} engines: {node: '>= 10'} @@ -18372,7 +18352,7 @@ snapshots: dependencies: graphql: 16.11.0 - '@apollo/client@3.14.0(@types/react@18.3.26)(graphql-ws@6.0.4(graphql@16.11.0)(ws@8.18.3))(graphql@16.11.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(subscriptions-transport-ws@0.11.0(graphql@16.11.0))': + '@apollo/client@4.0.9(graphql-ws@6.0.4(graphql@16.11.0)(ws@8.18.3))(graphql@16.11.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(rxjs@7.8.2)(subscriptions-transport-ws@0.11.0(graphql@16.11.0))': dependencies: '@graphql-typed-document-node/core': 3.2.0(graphql@16.11.0) '@wry/caches': 1.0.1 @@ -18380,21 +18360,14 @@ snapshots: '@wry/trie': 0.5.0 graphql: 16.11.0 graphql-tag: 2.12.6(graphql@16.11.0) - hoist-non-react-statics: 3.3.2 optimism: 0.18.1 - prop-types: 15.8.1 - rehackt: 0.1.0(@types/react@18.3.26)(react@18.3.1) - symbol-observable: 4.0.0 - ts-invariant: 0.10.3 + rxjs: 7.8.2 tslib: 2.8.1 - zen-observable-ts: 1.2.5 optionalDependencies: graphql-ws: 6.0.4(graphql@16.11.0)(ws@8.18.3) react: 18.3.1 react-dom: 18.3.1(react@18.3.1) subscriptions-transport-ws: 0.11.0(graphql@16.11.0) - transitivePeerDependencies: - - '@types/react' '@apollo/protobufjs@1.2.7': dependencies: @@ -28100,9 +28073,9 @@ snapshots: normalize-path: 3.0.0 picomatch: 2.3.1 - apollo-link-rest@0.9.0(@apollo/client@3.14.0(@types/react@18.3.26)(graphql-ws@6.0.4(graphql@16.11.0)(ws@8.18.3))(graphql@16.11.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(subscriptions-transport-ws@0.11.0(graphql@16.11.0)))(graphql@16.11.0)(qs@6.14.0): + apollo-link-rest@0.9.0(@apollo/client@4.0.9(graphql-ws@6.0.4(graphql@16.11.0)(ws@8.18.3))(graphql@16.11.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(rxjs@7.8.2)(subscriptions-transport-ws@0.11.0(graphql@16.11.0)))(graphql@16.11.0)(qs@6.14.0): dependencies: - '@apollo/client': 3.14.0(@types/react@18.3.26)(graphql-ws@6.0.4(graphql@16.11.0)(ws@8.18.3))(graphql@16.11.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(subscriptions-transport-ws@0.11.0(graphql@16.11.0)) + '@apollo/client': 4.0.9(graphql-ws@6.0.4(graphql@16.11.0)(ws@8.18.3))(graphql@16.11.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(rxjs@7.8.2)(subscriptions-transport-ws@0.11.0(graphql@16.11.0)) graphql: 16.11.0 qs: 6.14.0 @@ -35860,11 +35833,6 @@ snapshots: dependencies: jsesc: 0.5.0 - rehackt@0.1.0(@types/react@18.3.26)(react@18.3.1): - optionalDependencies: - '@types/react': 18.3.26 - react: 18.3.1 - rehype-raw@7.0.0: dependencies: '@types/hast': 3.0.4 @@ -37354,10 +37322,6 @@ snapshots: ts-interface-checker@0.1.13: {} - ts-invariant@0.10.3: - dependencies: - tslib: 2.8.1 - ts-jest@29.4.4(@babel/core@7.28.5)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.28.5))(jest-util@29.7.0)(jest@29.7.0(@types/node@24.10.1)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.13.3)(@types/node@24.10.1)(typescript@5.9.3)))(typescript@5.9.3): dependencies: bs-logger: 0.2.6 @@ -38489,12 +38453,6 @@ snapshots: yoctocolors-cjs@2.1.3: {} - zen-observable-ts@1.2.5: - dependencies: - zen-observable: 0.8.15 - - zen-observable@0.8.15: {} - zip-stream@4.1.1: dependencies: archiver-utils: 3.0.4 diff --git a/storybook/package.json b/storybook/package.json index af1514c87fd..2ec34ee868d 100644 --- a/storybook/package.json +++ b/storybook/package.json @@ -16,7 +16,7 @@ "storybook": "storybook dev -p 26638 --no-version-updates" }, "dependencies": { - "@apollo/client": "^3.13.8", + "@apollo/client": "^4.0.9", "@comet/admin": "workspace:*", "@comet/admin-color-picker": "workspace:*", "@comet/admin-date-time": "workspace:*",