diff --git a/packages/apollo-utils/package.json b/packages/apollo-utils/package.json index 392c47b9c..2612c64a9 100644 --- a/packages/apollo-utils/package.json +++ b/packages/apollo-utils/package.json @@ -76,7 +76,7 @@ "@apollo/cache-control-types": "1.0.3", "@apollo/server": "4.10.4", "@apollo/server-plugin-response-cache": "4.1.3", - "@apollo/subgraph": "2.8.4", + "@apollo/subgraph": "2.9.0", "@apollo/utils.keyvadapter": "3.1.0", "@apollo/utils.keyvaluecache": "3.1.0", "@pocket-tools/ts-logger": "workspace:*", @@ -107,7 +107,7 @@ }, "peerDependencies": { "@apollo/server": "4.10.4", - "@apollo/subgraph": "2.8.4", + "@apollo/subgraph": "2.9.0", "@apollo/utils.keyvadapter": "3.1.0", "@apollo/utils.keyvaluecache": "3.1.0", "express": "4.19.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d563759a1..bf2fc91a4 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -17,7 +17,7 @@ importers: devDependencies: '@commitlint/cli': specifier: 19.4.0 - version: 19.4.0(@types/node@22.5.0)(typescript@5.7.0-dev.20240827) + version: 19.4.0(@types/node@22.5.0)(typescript@5.7.0-dev.20240828) '@commitlint/config-conventional': specifier: ^19.2.2 version: 19.2.2 @@ -26,7 +26,7 @@ importers: version: link:packages/eslint-config syncpack: specifier: ^12.4.0 - version: 12.4.0(typescript@5.7.0-dev.20240827) + version: 12.4.0(typescript@5.7.0-dev.20240828) tsconfig: specifier: workspace:* version: link:packages/tsconfig @@ -1690,8 +1690,8 @@ importers: specifier: 4.1.3 version: 4.1.3(@apollo/server@4.10.4(encoding@0.1.13)(graphql@16.8.1))(graphql@16.8.1) '@apollo/subgraph': - specifier: 2.8.4 - version: 2.8.4(graphql@16.8.1) + specifier: 2.9.0 + version: 2.9.0(graphql@16.8.1) '@apollo/utils.keyvadapter': specifier: 3.1.0 version: 3.1.0 @@ -2366,8 +2366,8 @@ importers: specifier: 4.10.4 version: 4.10.4(encoding@0.1.13)(graphql@16.8.1) '@apollo/subgraph': - specifier: 2.8.4 - version: 2.8.4(graphql@16.8.1) + specifier: 2.9.0 + version: 2.9.0(graphql@16.8.1) '@aws-sdk/client-dynamodb': specifier: 3.632.0 version: 3.632.0 @@ -2596,8 +2596,8 @@ importers: specifier: 4.10.4 version: 4.10.4(encoding@0.1.13)(graphql@16.8.1) '@apollo/subgraph': - specifier: 2.8.4 - version: 2.8.4(graphql@16.8.1) + specifier: 2.9.0 + version: 2.9.0(graphql@16.8.1) '@govtechsg/passport-openidconnect': specifier: 1.0.2 version: 1.0.2 @@ -2705,8 +2705,8 @@ importers: specifier: 4.10.4 version: 4.10.4(encoding@0.1.13)(graphql@16.8.1) '@apollo/subgraph': - specifier: 2.8.4 - version: 2.8.4(graphql@16.8.1) + specifier: 2.9.0 + version: 2.9.0(graphql@16.8.1) '@apollo/utils.keyvadapter': specifier: 3.1.0 version: 3.1.0 @@ -2799,8 +2799,8 @@ importers: specifier: 4.10.4 version: 4.10.4(encoding@0.1.13)(graphql@16.8.1) '@apollo/subgraph': - specifier: 2.8.4 - version: 2.8.4(graphql@16.8.1) + specifier: 2.9.0 + version: 2.9.0(graphql@16.8.1) '@aws-sdk/client-eventbridge': specifier: 3.632.0 version: 3.632.0 @@ -2956,8 +2956,8 @@ importers: specifier: 4.10.4 version: 4.10.4(encoding@0.1.13)(graphql@16.8.1) '@apollo/subgraph': - specifier: 2.8.4 - version: 2.8.4(graphql@16.8.1) + specifier: 2.9.0 + version: 2.9.0(graphql@16.8.1) '@apollo/utils.keyvadapter': specifier: 3.1.0 version: 3.1.0 @@ -3186,8 +3186,8 @@ importers: specifier: 4.1.3 version: 4.1.3(@apollo/server@4.10.4(encoding@0.1.13)(graphql@16.8.1))(graphql@16.8.1) '@apollo/subgraph': - specifier: 2.8.4 - version: 2.8.4(graphql@16.8.1) + specifier: 2.9.0 + version: 2.9.0(graphql@16.8.1) '@apollo/utils.keyvadapter': specifier: 3.1.0 version: 3.1.0 @@ -3377,8 +3377,8 @@ importers: specifier: 4.10.4 version: 4.10.4(encoding@0.1.13)(graphql@16.8.1) '@apollo/subgraph': - specifier: 2.8.4 - version: 2.8.4(graphql@16.8.1) + specifier: 2.9.0 + version: 2.9.0(graphql@16.8.1) '@aws-sdk/client-dynamodb': specifier: 3.632.0 version: 3.632.0 @@ -3486,8 +3486,8 @@ importers: specifier: 4.10.4 version: 4.10.4(encoding@0.1.13)(graphql@16.8.1) '@apollo/subgraph': - specifier: 2.8.4 - version: 2.8.4(graphql@16.8.1) + specifier: 2.9.0 + version: 2.9.0(graphql@16.8.1) '@aws-sdk/client-eventbridge': specifier: 3.632.0 version: 3.632.0 @@ -3583,8 +3583,8 @@ importers: specifier: 4.10.4 version: 4.10.4(encoding@0.1.13)(graphql@16.8.1) '@apollo/subgraph': - specifier: 2.8.4 - version: 2.8.4(graphql@16.8.1) + specifier: 2.9.0 + version: 2.9.0(graphql@16.8.1) '@aws-sdk/client-eventbridge': specifier: 3.632.0 version: 3.632.0 @@ -3876,8 +3876,8 @@ packages: peerDependencies: graphql: ^16.5.0 - '@apollo/federation-internals@2.8.4': - resolution: {integrity: sha512-m/vFu5btNfmvxZfe8B1m8jjCN/NxCYctxjdhXgQD4WGbDwtUk59+i7NuVMtX5IfmFMKycwqnbihkv5w2E00XDA==} + '@apollo/federation-internals@2.9.0': + resolution: {integrity: sha512-zvz0nJpfblxAWzphlFtyqUswidIWOf7Vcj4YuPaUlXpOG7VZ0fWyTupPQsj0HeTkAAy3FzCItVHLzn4+I2H/YA==} engines: {node: '>=14.15.0'} peerDependencies: graphql: ^16.5.0 @@ -3904,8 +3904,8 @@ packages: peerDependencies: graphql: ^16.6.0 - '@apollo/subgraph@2.8.4': - resolution: {integrity: sha512-+NMhY2PHrb1C28A3Osns98HWCQ5nlhYv0CSpdSkzY2OOdepaBnzC6btXKZB8J61FaMBmEgL+j2/5uAXJGmS1cQ==} + '@apollo/subgraph@2.9.0': + resolution: {integrity: sha512-FYAOMxMWbAQ/2U/+QYgznBdsyjPiH87wSSJqn6n1dQ80GWIWenZYd49iWy9/y/Z/RTYsA2o8ueAkgHH6AU4psA==} engines: {node: '>=14.15.0'} peerDependencies: graphql: ^16.5.0 @@ -12897,8 +12897,8 @@ packages: engines: {node: '>=14.17'} hasBin: true - typescript@5.7.0-dev.20240827: - resolution: {integrity: sha512-qNwNQBg18O4Z5RRGb07O562OpDlAVlytNcKfqcx8JQRJcs3p/KLHXjr0FbUbJ3SKoxA2vaQ3Zt89YLWHuCXzUw==} + typescript@5.7.0-dev.20240828: + resolution: {integrity: sha512-ErCxPl/V/LAmiULX17il/1qONClDF5dKH3A7ltOVj6Rsj+fSSXYiimnDAZShs7iFfMpo87oWv97hjkX7sG1edg==} engines: {node: '>=14.17'} hasBin: true @@ -13428,7 +13428,7 @@ snapshots: transitivePeerDependencies: - encoding - '@apollo/federation-internals@2.8.4(graphql@16.8.1)': + '@apollo/federation-internals@2.9.0(graphql@16.8.1)': dependencies: '@types/uuid': 9.0.8 chalk: 4.1.2 @@ -13498,10 +13498,10 @@ snapshots: - encoding - supports-color - '@apollo/subgraph@2.8.4(graphql@16.8.1)': + '@apollo/subgraph@2.9.0(graphql@16.8.1)': dependencies: '@apollo/cache-control-types': 1.0.3(graphql@16.8.1) - '@apollo/federation-internals': 2.8.4(graphql@16.8.1) + '@apollo/federation-internals': 2.9.0(graphql@16.8.1) graphql: 16.8.1 '@apollo/usage-reporting-protobuf@4.1.1': @@ -15078,11 +15078,11 @@ snapshots: dependencies: commander: 12.1.0 - '@commitlint/cli@19.4.0(@types/node@22.5.0)(typescript@5.7.0-dev.20240827)': + '@commitlint/cli@19.4.0(@types/node@22.5.0)(typescript@5.7.0-dev.20240828)': dependencies: '@commitlint/format': 19.3.0 '@commitlint/lint': 19.2.2 - '@commitlint/load': 19.4.0(@types/node@22.5.0)(typescript@5.7.0-dev.20240827) + '@commitlint/load': 19.4.0(@types/node@22.5.0)(typescript@5.7.0-dev.20240828) '@commitlint/read': 19.4.0 '@commitlint/types': 19.0.3 execa: 8.0.1 @@ -15129,15 +15129,15 @@ snapshots: '@commitlint/rules': 19.0.3 '@commitlint/types': 19.0.3 - '@commitlint/load@19.4.0(@types/node@22.5.0)(typescript@5.7.0-dev.20240827)': + '@commitlint/load@19.4.0(@types/node@22.5.0)(typescript@5.7.0-dev.20240828)': dependencies: '@commitlint/config-validator': 19.0.3 '@commitlint/execute-rule': 19.0.0 '@commitlint/resolve-extends': 19.1.0 '@commitlint/types': 19.0.3 chalk: 5.3.0 - cosmiconfig: 9.0.0(typescript@5.7.0-dev.20240827) - cosmiconfig-typescript-loader: 5.0.0(@types/node@22.5.0)(cosmiconfig@9.0.0(typescript@5.7.0-dev.20240827))(typescript@5.7.0-dev.20240827) + cosmiconfig: 9.0.0(typescript@5.7.0-dev.20240828) + cosmiconfig-typescript-loader: 5.0.0(@types/node@22.5.0)(cosmiconfig@9.0.0(typescript@5.7.0-dev.20240828))(typescript@5.7.0-dev.20240828) lodash.isplainobject: 4.0.6 lodash.merge: 4.6.2 lodash.uniq: 4.5.0 @@ -19372,12 +19372,12 @@ snapshots: object-assign: 4.1.1 vary: 1.1.2 - cosmiconfig-typescript-loader@5.0.0(@types/node@22.5.0)(cosmiconfig@9.0.0(typescript@5.7.0-dev.20240827))(typescript@5.7.0-dev.20240827): + cosmiconfig-typescript-loader@5.0.0(@types/node@22.5.0)(cosmiconfig@9.0.0(typescript@5.7.0-dev.20240828))(typescript@5.7.0-dev.20240828): dependencies: '@types/node': 22.5.0 - cosmiconfig: 9.0.0(typescript@5.7.0-dev.20240827) + cosmiconfig: 9.0.0(typescript@5.7.0-dev.20240828) jiti: 1.21.6 - typescript: 5.7.0-dev.20240827 + typescript: 5.7.0-dev.20240828 cosmiconfig@8.3.6(typescript@5.5.4): dependencies: @@ -19397,14 +19397,14 @@ snapshots: optionalDependencies: typescript: 5.5.4 - cosmiconfig@9.0.0(typescript@5.7.0-dev.20240827): + cosmiconfig@9.0.0(typescript@5.7.0-dev.20240828): dependencies: env-paths: 2.2.1 import-fresh: 3.3.0 js-yaml: 4.1.0 parse-json: 5.2.0 optionalDependencies: - typescript: 5.7.0-dev.20240827 + typescript: 5.7.0-dev.20240828 cpu-features@0.0.2: dependencies: @@ -19747,7 +19747,7 @@ snapshots: dependencies: semver: 7.6.3 shelljs: 0.8.5 - typescript: 5.7.0-dev.20240827 + typescript: 5.7.0-dev.20240828 dreamopt@0.8.0: dependencies: @@ -24707,13 +24707,13 @@ snapshots: '@pkgr/core': 0.1.1 tslib: 2.6.3 - syncpack@12.4.0(typescript@5.7.0-dev.20240827): + syncpack@12.4.0(typescript@5.7.0-dev.20240828): dependencies: '@effect/schema': 0.69.0(effect@3.5.7) chalk: 5.3.0 chalk-template: 1.1.0 commander: 12.1.0 - cosmiconfig: 9.0.0(typescript@5.7.0-dev.20240827) + cosmiconfig: 9.0.0(typescript@5.7.0-dev.20240828) effect: 3.5.7 enquirer: 2.4.1 fast-check: 3.20.0 @@ -25096,7 +25096,7 @@ snapshots: typescript@5.5.4: {} - typescript@5.7.0-dev.20240827: {} + typescript@5.7.0-dev.20240828: {} ua-parser-js@1.0.38: {} diff --git a/servers/annotations-api/package.json b/servers/annotations-api/package.json index 7f72efac0..71f4735e3 100644 --- a/servers/annotations-api/package.json +++ b/servers/annotations-api/package.json @@ -27,7 +27,7 @@ "@apollo/cache-control-types": "1.0.3", "@apollo/datasource-rest": "^6.2.2", "@apollo/server": "4.10.4", - "@apollo/subgraph": "2.8.4", + "@apollo/subgraph": "2.9.0", "@aws-sdk/client-dynamodb": "3.632.0", "@aws-sdk/client-sqs": "3.632.0", "@aws-sdk/lib-dynamodb": "3.632.0", diff --git a/servers/client-api/Dockerfile b/servers/client-api/Dockerfile index c6bedfe34..f87cddf23 100644 --- a/servers/client-api/Dockerfile +++ b/servers/client-api/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/apollographql/router:v1.52.1@sha256:b16b1cb64f88ceb3485f5e524ade1b4c4a2039a2b1be851be122e79b9d5a6ded +FROM ghcr.io/apollographql/router:v1.53.0@sha256:cfa48711d26bcc7b0320c990f6bf9d135914e1ce34c93d7f2d6ccc5f8314ee1f USER root diff --git a/servers/feature-flags/package.json b/servers/feature-flags/package.json index c2ae5f455..f7afeb326 100644 --- a/servers/feature-flags/package.json +++ b/servers/feature-flags/package.json @@ -22,7 +22,7 @@ }, "dependencies": { "@apollo/server": "4.10.4", - "@apollo/subgraph": "2.8.4", + "@apollo/subgraph": "2.9.0", "@govtechsg/passport-openidconnect": "1.0.2", "@pocket-tools/apollo-utils": "workspace:*", "@pocket-tools/sentry": "workspace:*", diff --git a/servers/image-api/package.json b/servers/image-api/package.json index 27953279f..82a28770b 100644 --- a/servers/image-api/package.json +++ b/servers/image-api/package.json @@ -23,7 +23,7 @@ }, "dependencies": { "@apollo/server": "4.10.4", - "@apollo/subgraph": "2.8.4", + "@apollo/subgraph": "2.9.0", "@apollo/utils.keyvadapter": "3.1.0", "@keyv/redis": "2.8.5", "@pocket-tools/apollo-utils": "workspace:*", diff --git a/servers/list-api/package.json b/servers/list-api/package.json index f366576c4..5604d3a58 100644 --- a/servers/list-api/package.json +++ b/servers/list-api/package.json @@ -21,7 +21,7 @@ }, "dependencies": { "@apollo/server": "4.10.4", - "@apollo/subgraph": "2.8.4", + "@apollo/subgraph": "2.9.0", "@aws-sdk/client-eventbridge": "3.632.0", "@aws-sdk/client-kinesis": "3.632.0", "@aws-sdk/client-sqs": "3.632.0", diff --git a/servers/parser-graphql-wrapper/package.json b/servers/parser-graphql-wrapper/package.json index 4917ca019..ef3c59e76 100644 --- a/servers/parser-graphql-wrapper/package.json +++ b/servers/parser-graphql-wrapper/package.json @@ -22,7 +22,7 @@ "@apollo/cache-control-types": "1.0.3", "@apollo/datasource-rest": "^6.2.2", "@apollo/server": "4.10.4", - "@apollo/subgraph": "2.8.4", + "@apollo/subgraph": "2.9.0", "@apollo/utils.keyvadapter": "3.1.0", "@apollo/utils.keyvaluecache": "3.1.0", "@aws-sdk/client-dynamodb": "3.632.0", diff --git a/servers/shareable-lists-api/package.json b/servers/shareable-lists-api/package.json index 8ec9b116c..a6902c01c 100644 --- a/servers/shareable-lists-api/package.json +++ b/servers/shareable-lists-api/package.json @@ -35,7 +35,7 @@ "dependencies": { "@apollo/server": "4.10.4", "@apollo/server-plugin-response-cache": "4.1.3", - "@apollo/subgraph": "2.8.4", + "@apollo/subgraph": "2.9.0", "@apollo/utils.keyvadapter": "3.1.0", "@apollo/utils.keyvaluecache": "3.1.0", "@aws-sdk/client-eventbridge": "3.632.0", diff --git a/servers/shares-api/package.json b/servers/shares-api/package.json index 24548a477..b917cab60 100644 --- a/servers/shares-api/package.json +++ b/servers/shares-api/package.json @@ -25,7 +25,7 @@ }, "dependencies": { "@apollo/server": "4.10.4", - "@apollo/subgraph": "2.8.4", + "@apollo/subgraph": "2.9.0", "@aws-sdk/client-dynamodb": "3.632.0", "@aws-sdk/client-eventbridge": "3.632.0", "@aws-sdk/lib-dynamodb": "3.632.0", diff --git a/servers/user-api/package.json b/servers/user-api/package.json index 3ea52c730..a0b09a53f 100644 --- a/servers/user-api/package.json +++ b/servers/user-api/package.json @@ -19,7 +19,7 @@ }, "dependencies": { "@apollo/server": "4.10.4", - "@apollo/subgraph": "2.8.4", + "@apollo/subgraph": "2.9.0", "@aws-sdk/client-eventbridge": "3.632.0", "@pocket-tools/apollo-utils": "workspace:*", "@pocket-tools/int-mask": "workspace:*", diff --git a/servers/user-list-search/package.json b/servers/user-list-search/package.json index f91688bc9..b998d6229 100644 --- a/servers/user-list-search/package.json +++ b/servers/user-list-search/package.json @@ -22,7 +22,7 @@ }, "dependencies": { "@apollo/server": "4.10.4", - "@apollo/subgraph": "2.8.4", + "@apollo/subgraph": "2.9.0", "@aws-sdk/client-eventbridge": "3.632.0", "@aws-sdk/client-sqs": "3.632.0", "@elastic/elasticsearch": "^8.14.0",