Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions .changeset/weak-pugs-stay.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
'@graphql-hive/cli': patch
'hive': patch
---

Improve federation composition rules.

- Fix supergraph `@join__field` generation for `@override` + `@requires` migrations and add a progressive override restriction.
- When a field with `@requires` is overridden, composition now ignores `@requires` usage coming only from the overridden source field when deciding whether to keep `@join__field(..., external: true)`. This prevents stale external annotations in the supergraph.
- Progressive override (`@override(..., label: ...)`) is now rejected when the overridden source field uses `@requires` (error code: `OVERRIDE_COLLISION_WITH_ANOTHER_DIRECTIVE`). Non-progressive override behavior is unchanged.
2 changes: 1 addition & 1 deletion integration-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"@hive/schema": "workspace:*",
"@hive/server": "workspace:*",
"@hive/storage": "workspace:*",
"@theguild/federation-composition": "0.21.3",
"@theguild/federation-composition": "0.22.0",
"@trpc/client": "10.45.3",
"@trpc/server": "10.45.3",
"@types/async-retry": "1.4.8",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
"@sentry/cli": "2.40.0",
"@swc/core": "1.13.5",
"@theguild/eslint-config": "0.12.1",
"@theguild/federation-composition": "0.21.3",
"@theguild/federation-composition": "0.22.0",
"@theguild/prettier-config": "2.0.7",
"@types/node": "22.10.5",
"bob-the-bundler": "7.0.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/libraries/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"@oclif/core": "3.26.6",
"@oclif/plugin-help": "6.2.36",
"@oclif/plugin-update": "4.7.16",
"@theguild/federation-composition": "0.21.3",
"@theguild/federation-composition": "0.22.0",
"cli-table3": "0.6.5",
"colors": "1.4.0",
"env-ci": "7.3.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/services/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"@sentry/node": "7.120.2",
"@sentry/types": "7.120.2",
"@slack/web-api": "7.10.0",
"@theguild/federation-composition": "0.21.3",
"@theguild/federation-composition": "0.22.0",
"@trpc/client": "10.45.3",
"@trpc/server": "10.45.3",
"@types/bcryptjs": "2.4.6",
Expand Down
2 changes: 1 addition & 1 deletion packages/services/demo/federation/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
},
"dependencies": {
"@apollo/subgraph": "2.9.3",
"@theguild/federation-composition": "0.21.3",
"@theguild/federation-composition": "0.22.0",
"graphql": "16.9.0",
"graphql-yoga": "5.13.3"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/services/schema/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"@graphql-tools/stitching-directives": "3.1.38",
"@hive/service-common": "workspace:*",
"@sentry/node": "7.120.2",
"@theguild/federation-composition": "0.21.3",
"@theguild/federation-composition": "0.22.0",
"@trpc/server": "10.45.3",
"@types/async-retry": "1.4.8",
"@types/ioredis-mock": "8.2.5",
Expand Down
2 changes: 1 addition & 1 deletion packages/services/server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"@hive/workflows": "workspace:*",
"@sentry/node": "7.120.2",
"@swc/core": "1.13.5",
"@theguild/federation-composition": "0.21.3",
"@theguild/federation-composition": "0.22.0",
"@trpc/client": "10.45.3",
"@trpc/server": "10.45.3",
"@whatwg-node/server": "0.10.17",
Expand Down
34 changes: 17 additions & 17 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading