Merge branch 'main' into suvij/eng-6333-add-org-and-graph-id-to-gql_o…

…perations-table-to-avoid
wundergraph · Feb 11, 2025 · c7259f7 · c7259f7
2 parents bbdb5d0 + 666d68e
commit c7259f7
Show file tree

Hide file tree

Showing 65 changed files with 7,240 additions and 2,143 deletions.
diff --git a/Makefile b/Makefile
@@ -122,7 +122,10 @@ dc-federation-demo:
 
 DC_FLAGS=
 dc-subgraphs-demo:
-	OTEL_AUTH_TOKEN=$(OTEL_AUTH_TOKEN) docker compose -f docker-compose.full.yml --profile subgraphs up --remove-orphans --detach $(DC_FLAGS)
+	OTEL_AUTH_TOKEN=$(OTEL_AUTH_TOKEN) docker compose -f docker-compose.full.yml --profile subgraphs up --remove-orphans --detach $(DC_FLAGS) && make dc-subgraphs-config
+
+dc-subgraphs-config:
+	pushd router && make compose-demo-config && popd
 
 dc-subgraphs-demo-down:
 	docker compose -f docker-compose.full.yml --profile subgraphs down --remove-orphans
@@ -159,8 +162,6 @@ run-subgraphs-local:
 sync-go-workspace:
 	cd router && go mod tidy
 	cd demo && make bump-deps
-	cd composition-go && go mod tidy
-	cd graphqlmetrics && go mod tidy
 	cd router-tests && make bump-deps
 
 # Validates if any breaking changes has been introduced.

diff --git a/cli/CHANGELOG.md b/cli/CHANGELOG.md
@@ -4,6 +4,14 @@ Binaries are attached to the github release otherwise all images can be found [h
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.72.4](https://github.com/wundergraph/cosmo/compare/wgc@0.72.3...wgc@0.72.4) (2025-02-06)
+
+**Note:** Version bump only for package wgc
+
+## [0.72.3](https://github.com/wundergraph/cosmo/compare/wgc@0.72.2...wgc@0.72.3) (2025-02-05)
+
+**Note:** Version bump only for package wgc
+
 ## [0.72.2](https://github.com/wundergraph/cosmo/compare/wgc@0.72.1...wgc@0.72.2) (2025-02-05)
 
 ### Bug Fixes

diff --git a/cli/package.json b/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wgc",
-  "version": "0.72.2",
+  "version": "0.72.4",
   "description": "The official CLI tool to manage the GraphQL Federation Platform Cosmo",
   "type": "module",
   "main": "dist/index.js",

diff --git a/composition-go/index.global.js b/composition-go/index.global.js
diff --git a/composition/CHANGELOG.md b/composition/CHANGELOG.md
@@ -4,6 +4,18 @@ Binaries are attached to the github release otherwise all images can be found [h
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.36.1](https://github.com/wundergraph/cosmo/compare/@wundergraph/composition@0.36.0...@wundergraph/composition@0.36.1) (2025-02-06)
+
+### Bug Fixes
+
+* allow integer to Float input coercion ([#1572](https://github.com/wundergraph/cosmo/issues/1572)) ([51c3d8e](https://github.com/wundergraph/cosmo/commit/51c3d8e11b6360f583f1809e2360c652a91659c6)) (@Aenimus)
+
+# [0.36.0](https://github.com/wundergraph/cosmo/compare/@wundergraph/composition@0.35.0...@wundergraph/composition@0.36.0) (2025-02-05)
+
+### Features
+
+* implement [@openfed](https://github.com/openfed)__configureDescription ([#1568](https://github.com/wundergraph/cosmo/issues/1568)) ([28398c1](https://github.com/wundergraph/cosmo/commit/28398c19afb33dfad816c3779024d6edb5047c84)) (@Aenimus)
+
 # [0.35.0](https://github.com/wundergraph/cosmo/compare/@wundergraph/composition@0.34.0...@wundergraph/composition@0.35.0) (2025-01-24)
 
 ### Features

diff --git a/composition/package.json b/composition/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@wundergraph/composition",
-  "version": "0.35.0",
+  "version": "0.36.1",
   "author": {
     "name": "WunderGraph Maintainers",
     "email": "info@wundergraph.com"
@@ -17,6 +17,7 @@
     "build": "del dist && tsc",
     "test:watch": "vitest test",
     "test": "vitest run",
+    "test:core": "vitest run --exclude ./tests/unstaged-tests",
     "lint": "prettier --check src tests",
     "lint:fix": "prettier --write src tests",
     "postversion": "node ./scripts/get-composition-version.mjs"

diff --git a/composition/src/ast/utils.ts b/composition/src/ast/utils.ts
@@ -4,7 +4,6 @@ import {
   EnumTypeDefinitionNode,
   EnumTypeExtensionNode,
   FieldNode,
-  InlineFragmentNode,
   InputObjectTypeDefinitionNode,
   InputObjectTypeExtensionNode,
   InterfaceTypeDefinitionNode,
@@ -23,8 +22,6 @@ import {
   SelectionNode,
   SelectionSetNode,
   StringValueNode,
-  TypeDefinitionNode,
-  TypeExtensionNode,
   UnionTypeDefinitionNode,
   UnionTypeExtensionNode,
 } from 'graphql';
@@ -52,7 +49,6 @@ import {
   SUBSCRIPTION,
   UNION_UPPER,
 } from '../utils/string-constants';
-import { duplicateImplementedInterfaceError } from '../errors/errors';
 import { CompositeOutputNode } from '../schema-building/ast';
 
 export function isObjectLikeNodeEntity(node: CompositeOutputNode): boolean {