Skip to content

Commit 270773b

Browse files
authored
Merge branch 'main' into test-usage-collector
2 parents fad3dc8 + 80172a5 commit 270773b

190 files changed

Lines changed: 9085 additions & 5328 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.changeset/breezy-ears-raise.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
'hive': patch
3+
---
4+
5+
Remove pretty print from check diff view. Add integration and e2e tests to verify publishing then
6+
checking the same SDL won't cause a difference in the schema check diff viewer

.changeset/good-dingos-change.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/hip-donuts-ask.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@graphql-hive/laboratory': patch
3+
---
4+
5+
Address vulnerability [GHSA-55q2-fjhq-7xh7](https://github.com/advisories/GHSA-55q2-fjhq-7xh7).

.changeset/proud-pugs-wonder.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'hive': patch
3+
---
4+
5+
Address vulnerability [GHSA-55q2-fjhq-7xh7](https://github.com/advisories/GHSA-55q2-fjhq-7xh7).

.changeset/violet-crabs-throw.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.github/dependabot.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,6 @@ updates:
6666
open-pull-requests-limit: 1
6767
schedule:
6868
interval: 'daily'
69-
- package-ecosystem: 'cargo'
70-
open-pull-requests-limit: 1
71-
directory: '/'
72-
schedule:
73-
interval: 'daily'
7469
- package-ecosystem: 'github-actions'
7570
open-pull-requests-limit: 1
7671
directory: '/'

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,9 @@ packages/web/app/src/gql/*.json
128128
# Changelog
129129
packages/web/app/src/components/ui/changelog/generated-changelog.ts
130130

131+
# react-foundry
132+
foundry-nav.gen.d.ts
133+
131134
_redirects
132135

133136
deployment/utils/opentelemetry-collector.types.ts

deployment/CHANGELOG.md

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,34 @@
11
# hive
22

3+
## 11.11.0
4+
5+
### Minor Changes
6+
7+
- [#8319](https://github.com/graphql-hive/console/pull/8319)
8+
[`84b28ff`](https://github.com/graphql-hive/console/commit/84b28fff9b9da65e6c423160cf3771850fad621a)
9+
Thanks [@n1ru4l](https://github.com/n1ru4l)! - Improve supergraph artifact formatting by reducing
10+
excessive whitespace for federation type definitions
11+
12+
### Patch Changes
13+
14+
- [#8350](https://github.com/graphql-hive/console/pull/8350)
15+
[`e0f5255`](https://github.com/graphql-hive/console/commit/e0f5255a013fcb388fb3a783688310a421ec8705)
16+
Thanks [@n1ru4l](https://github.com/n1ru4l)! - Address vulnerability
17+
[GHSA-5p4m-2wfm-xmqj](https://github.com/advisories/GHSA-5p4m-2wfm-xmqj).
18+
19+
- [#8321](https://github.com/graphql-hive/console/pull/8321)
20+
[`6da8b84`](https://github.com/graphql-hive/console/commit/6da8b84dc868ae64b464021191b04e0d1a9af258)
21+
Thanks [@jdolle](https://github.com/jdolle)! - Hide resolutions from insights ui for input types
22+
23+
- [#8347](https://github.com/graphql-hive/console/pull/8347)
24+
[`6fbdf7f`](https://github.com/graphql-hive/console/commit/6fbdf7f692d7ab93cea0bfd499f5fca9a6c0b5e9)
25+
Thanks [@n1ru4l](https://github.com/n1ru4l)! - Address vulnerability
26+
[GHSA-55q2-fjhq-7xh7](https://github.com/advisories/GHSA-55q2-fjhq-7xh7)
27+
28+
- [#8328](https://github.com/graphql-hive/console/pull/8328)
29+
[`1ca35f6`](https://github.com/graphql-hive/console/commit/1ca35f6baa5f57f44f4382d924425ad897a1f634)
30+
Thanks [@jdolle](https://github.com/jdolle)! - Fix link to composition compatibility report
31+
332
## 11.10.0
433

534
### Minor Changes

deployment/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "hive",
3-
"version": "11.10.0",
3+
"version": "11.11.0",
44
"private": true,
55
"scripts": {
66
"generate": "tsx generate.ts",
@@ -17,7 +17,7 @@
1717
"@pulumi/pulumi": "3.214.0",
1818
"@pulumi/random": "4.18.2",
1919
"@pulumiverse/grafana": "2.35.0",
20-
"js-yaml": "4.3.0",
20+
"js-yaml": "4.3.1",
2121
"pg-connection-string": "2.9.1",
2222
"prettier": "3.4.2"
2323
},

deployment/services/graphql.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,7 @@ export function deployGraphQL({
151151
AUTH_GITHUB: '1',
152152
AUTH_GOOGLE: '1',
153153
AUTH_ORGANIZATION_OIDC: '1',
154+
AUTH_ORGANIZATION_SCIM: '1',
154155
AUTH_REQUIRE_EMAIL_VERIFICATION: '1',
155156
// Traces (OTLP)
156157
OPENTELEMETRY_COLLECTOR_ENDPOINT:

0 commit comments

Comments
 (0)