From c74319095e91b3cf26d3fc413b3a368b5a3606a5 Mon Sep 17 00:00:00 2001 From: jdolle <1841898+jdolle@users.noreply.github.com> Date: Fri, 23 Jan 2026 16:33:23 -0800 Subject: [PATCH 1/2] Render directive diff on schema definitions --- .changeset/fine-pens-lead.md | 5 ++ package.json | 4 +- packages/libraries/cli/package.json | 2 +- packages/services/api/package.json | 2 +- .../src/modules/proposals/module.graphql.ts | 2 - .../schema/providers/schema-publisher.ts | 4 +- packages/services/storage/package.json | 2 +- .../storage/src/schema-change-model.ts | 2 - packages/web/app/package.json | 4 +- .../src/components/target/proposals/index.tsx | 2 - .../target/proposals/schema-diff/core.tsx | 10 +++- pnpm-lock.yaml | 47 ++++++++++++------- 12 files changed, 53 insertions(+), 33 deletions(-) create mode 100644 .changeset/fine-pens-lead.md diff --git a/.changeset/fine-pens-lead.md b/.changeset/fine-pens-lead.md new file mode 100644 index 0000000000..e350d5d907 --- /dev/null +++ b/.changeset/fine-pens-lead.md @@ -0,0 +1,5 @@ +--- +'hive': patch +--- + +Render directive diff on schema definitions diff --git a/package.json b/package.json index 7d10fb7e26..234a810f12 100644 --- a/package.json +++ b/package.json @@ -74,8 +74,8 @@ "@graphql-codegen/urql-introspection": "3.0.1", "@graphql-eslint/eslint-plugin": "3.20.1", "@graphql-inspector/cli": "6.0.6", - "@graphql-inspector/core": "7.1.1", - "@graphql-inspector/patch": "0.1.1", + "@graphql-inspector/core": "7.1.2-alpha-20260123225001-24881d923593e4baadec9de367d6b34c1849820a", + "@graphql-inspector/patch": "0.1.2-alpha-20260123225001-24881d923593e4baadec9de367d6b34c1849820a", "@graphql-tools/load": "8.1.2", "@manypkg/get-packages": "2.2.2", "@next/eslint-plugin-next": "14.2.23", diff --git a/packages/libraries/cli/package.json b/packages/libraries/cli/package.json index c493abd68c..a9eebb21f2 100644 --- a/packages/libraries/cli/package.json +++ b/packages/libraries/cli/package.json @@ -49,7 +49,7 @@ }, "dependencies": { "@graphql-hive/core": "workspace:*", - "@graphql-inspector/core": "7.1.1", + "@graphql-inspector/core": "7.1.2-alpha-20260123225001-24881d923593e4baadec9de367d6b34c1849820a", "@graphql-tools/code-file-loader": "~8.1.0", "@graphql-tools/graphql-file-loader": "~8.1.0", "@graphql-tools/json-file-loader": "~8.0.0", diff --git a/packages/services/api/package.json b/packages/services/api/package.json index c7756bc7bb..e9adf3d9d4 100644 --- a/packages/services/api/package.json +++ b/packages/services/api/package.json @@ -17,7 +17,7 @@ "@date-fns/utc": "2.1.1", "@graphql-hive/core": "workspace:*", "@graphql-hive/signal": "1.0.0", - "@graphql-inspector/core": "7.1.1", + "@graphql-inspector/core": "7.1.2-alpha-20260123225001-24881d923593e4baadec9de367d6b34c1849820a", "@graphql-tools/merge": "9.1.1", "@hive/cdn-script": "workspace:*", "@hive/schema": "workspace:*", diff --git a/packages/services/api/src/modules/proposals/module.graphql.ts b/packages/services/api/src/modules/proposals/module.graphql.ts index 010c25de9d..9ed6b96fc5 100644 --- a/packages/services/api/src/modules/proposals/module.graphql.ts +++ b/packages/services/api/src/modules/proposals/module.graphql.ts @@ -932,14 +932,12 @@ export default gql` type DirectiveUsageSchemaAdded { addedDirectiveName: String! - schemaTypeName: String! addedToNewType: Boolean directiveRepeatedTimes: Int! } type DirectiveUsageSchemaRemoved { removedDirectiveName: String! - schemaTypeName: String! directiveRepeatedTimes: Int! } diff --git a/packages/services/api/src/modules/schema/providers/schema-publisher.ts b/packages/services/api/src/modules/schema/providers/schema-publisher.ts index 8d61e540a5..dd7c9f8804 100644 --- a/packages/services/api/src/modules/schema/providers/schema-publisher.ts +++ b/packages/services/api/src/modules/schema/providers/schema-publisher.ts @@ -620,7 +620,7 @@ export class SchemaPublisher { proposalChanges = diffSchema.result ?? null; } } catch (e: any) { - this.logger.error('Could not calculate schema proposal diff: ', e.message ?? e); + this.logger.error('Could not calculate schema proposal diff: %s', e.message ?? e); } } @@ -677,7 +677,7 @@ export class SchemaPublisher { proposalChanges = diffSchema.result ?? null; } } catch (e: any) { - this.logger.error('Could not calculate schema proposal diff: ', e.message ?? e); + this.logger.error('Could not calculate schema proposal diff: %s', e.message ?? e); } } diff --git a/packages/services/storage/package.json b/packages/services/storage/package.json index 70cdc42ac4..557126b9eb 100644 --- a/packages/services/storage/package.json +++ b/packages/services/storage/package.json @@ -16,7 +16,7 @@ "db:generate": "schemats generate --config schemats.cjs -o src/db/types.ts && prettier --write src/db/types.ts" }, "devDependencies": { - "@graphql-inspector/core": "7.1.1", + "@graphql-inspector/core": "7.1.2-alpha-20260123225001-24881d923593e4baadec9de367d6b34c1849820a", "@hive/service-common": "workspace:*", "@sentry/node": "7.120.2", "@sentry/types": "7.120.2", diff --git a/packages/services/storage/src/schema-change-model.ts b/packages/services/storage/src/schema-change-model.ts index 81df652661..b5677362ce 100644 --- a/packages/services/storage/src/schema-change-model.ts +++ b/packages/services/storage/src/schema-change-model.ts @@ -671,7 +671,6 @@ export const DirectiveUsageSchemaAddedModel = implement=18.0.0'} + peerDependencies: + graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 + '@graphql-inspector/coverage-command@6.1.12': resolution: {integrity: sha512-5XzKVgDYRzYXGsvi/9Y7/2LPV7DhVNe6bp+9ip1kSNozB8LDBl1L6zZn16PEFJB6ROknN1LPuwcnR3SxTlHQ6w==} engines: {node: '>=18.0.0'} @@ -4390,8 +4396,8 @@ packages: resolution: {integrity: sha512-rEo+HoQt+qjdayy7p5vcR9GeGTdKXmN0LbIm3W+jKKoXeAMlV4zHxnOW6jEhO6E0eVQxf8Sc1TlcH78i2P2a9w==} engines: {node: '>=18.0.0'} - '@graphql-inspector/patch@0.1.1': - resolution: {integrity: sha512-0+8mCAt5JO3gKWyFzotM5ppKWP520bLVJ9eCHRKJxVEBI2s7Ir5q+VfU/BQx8AuqBD7vJLK96IsE2tZaN4Xacg==} + '@graphql-inspector/patch@0.1.2-alpha-20260123225001-24881d923593e4baadec9de367d6b34c1849820a': + resolution: {integrity: sha512-IMD0jcOEn2Zd9S+B3kfynwTR0sHUGW9NkXATmiawDfg6TEWS6X2kHDFczsSpGwibrX4DMo8X886Zi2tzSqH3Qg==} engines: {node: '>=18.0.0'} peerDependencies: graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 @@ -22997,6 +23003,13 @@ snapshots: object-inspect: 1.13.2 tslib: 2.6.2 + '@graphql-inspector/core@7.1.2-alpha-20260123225001-24881d923593e4baadec9de367d6b34c1849820a(graphql@16.9.0)': + dependencies: + dependency-graph: 1.0.0 + graphql: 16.9.0 + object-inspect: 1.13.2 + tslib: 2.6.2 + '@graphql-inspector/coverage-command@6.1.12(@graphql-inspector/config@4.0.2(graphql@16.9.0))(@graphql-inspector/loaders@4.1.0(@graphql-inspector/config@4.0.2(graphql@16.9.0))(graphql@16.9.0))(graphql@16.9.0)(yargs@17.7.2)': dependencies: '@graphql-inspector/commands': 6.0.0(@graphql-inspector/config@4.0.2(graphql@16.9.0))(@graphql-inspector/loaders@4.1.0(@graphql-inspector/config@4.0.2(graphql@16.9.0))(graphql@16.9.0))(graphql@16.9.0)(yargs@17.7.2) @@ -23094,7 +23107,7 @@ snapshots: std-env: 3.7.0 tslib: 2.6.2 - '@graphql-inspector/patch@0.1.1(graphql@16.9.0)': + '@graphql-inspector/patch@0.1.2-alpha-20260123225001-24881d923593e4baadec9de367d6b34c1849820a(graphql@16.9.0)': dependencies: '@graphql-tools/utils': 10.9.1(graphql@16.9.0) graphql: 16.9.0 From e4c05ae2ea64a0e73a1ee754c21eda80c49dd1c9 Mon Sep 17 00:00:00 2001 From: jdolle <1841898+jdolle@users.noreply.github.com> Date: Mon, 26 Jan 2026 09:48:52 -0800 Subject: [PATCH 2/2] Use non-alpha inspector release --- package.json | 4 +-- packages/libraries/cli/package.json | 2 +- packages/services/api/package.json | 2 +- packages/services/storage/package.json | 2 +- packages/web/app/package.json | 4 +-- pnpm-lock.yaml | 40 +++++++++++++------------- 6 files changed, 27 insertions(+), 27 deletions(-) diff --git a/package.json b/package.json index 234a810f12..57e9116994 100644 --- a/package.json +++ b/package.json @@ -74,8 +74,8 @@ "@graphql-codegen/urql-introspection": "3.0.1", "@graphql-eslint/eslint-plugin": "3.20.1", "@graphql-inspector/cli": "6.0.6", - "@graphql-inspector/core": "7.1.2-alpha-20260123225001-24881d923593e4baadec9de367d6b34c1849820a", - "@graphql-inspector/patch": "0.1.2-alpha-20260123225001-24881d923593e4baadec9de367d6b34c1849820a", + "@graphql-inspector/core": "7.1.2", + "@graphql-inspector/patch": "0.1.2", "@graphql-tools/load": "8.1.2", "@manypkg/get-packages": "2.2.2", "@next/eslint-plugin-next": "14.2.23", diff --git a/packages/libraries/cli/package.json b/packages/libraries/cli/package.json index a9eebb21f2..bd8334c559 100644 --- a/packages/libraries/cli/package.json +++ b/packages/libraries/cli/package.json @@ -49,7 +49,7 @@ }, "dependencies": { "@graphql-hive/core": "workspace:*", - "@graphql-inspector/core": "7.1.2-alpha-20260123225001-24881d923593e4baadec9de367d6b34c1849820a", + "@graphql-inspector/core": "7.1.2", "@graphql-tools/code-file-loader": "~8.1.0", "@graphql-tools/graphql-file-loader": "~8.1.0", "@graphql-tools/json-file-loader": "~8.0.0", diff --git a/packages/services/api/package.json b/packages/services/api/package.json index e9adf3d9d4..d2b4eee5e6 100644 --- a/packages/services/api/package.json +++ b/packages/services/api/package.json @@ -17,7 +17,7 @@ "@date-fns/utc": "2.1.1", "@graphql-hive/core": "workspace:*", "@graphql-hive/signal": "1.0.0", - "@graphql-inspector/core": "7.1.2-alpha-20260123225001-24881d923593e4baadec9de367d6b34c1849820a", + "@graphql-inspector/core": "7.1.2", "@graphql-tools/merge": "9.1.1", "@hive/cdn-script": "workspace:*", "@hive/schema": "workspace:*", diff --git a/packages/services/storage/package.json b/packages/services/storage/package.json index 557126b9eb..4f2959f5dd 100644 --- a/packages/services/storage/package.json +++ b/packages/services/storage/package.json @@ -16,7 +16,7 @@ "db:generate": "schemats generate --config schemats.cjs -o src/db/types.ts && prettier --write src/db/types.ts" }, "devDependencies": { - "@graphql-inspector/core": "7.1.2-alpha-20260123225001-24881d923593e4baadec9de367d6b34c1849820a", + "@graphql-inspector/core": "7.1.2", "@hive/service-common": "workspace:*", "@sentry/node": "7.120.2", "@sentry/types": "7.120.2", diff --git a/packages/web/app/package.json b/packages/web/app/package.json index b8e804487e..cab1bb8dee 100644 --- a/packages/web/app/package.json +++ b/packages/web/app/package.json @@ -24,8 +24,8 @@ "@graphiql/react": "1.0.0-alpha.4", "@graphiql/toolkit": "0.9.1", "@graphql-codegen/client-preset-swc-plugin": "0.2.0", - "@graphql-inspector/core": "7.1.2-alpha-20260123225001-24881d923593e4baadec9de367d6b34c1849820a", - "@graphql-inspector/patch": "0.1.2-alpha-20260123225001-24881d923593e4baadec9de367d6b34c1849820a", + "@graphql-inspector/core": "7.1.2", + "@graphql-inspector/patch": "0.1.2", "@graphql-tools/mock": "9.0.25", "@graphql-typed-document-node/core": "3.2.0", "@headlessui/react": "2.2.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4776d98fa9..976f1b38f2 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -134,11 +134,11 @@ importers: specifier: 6.0.6 version: 6.0.6(@types/node@22.10.5)(encoding@0.1.13)(graphql@16.9.0) '@graphql-inspector/core': - specifier: 7.1.2-alpha-20260123225001-24881d923593e4baadec9de367d6b34c1849820a - version: 7.1.2-alpha-20260123225001-24881d923593e4baadec9de367d6b34c1849820a(graphql@16.9.0) + specifier: 7.1.2 + version: 7.1.2(graphql@16.9.0) '@graphql-inspector/patch': - specifier: 0.1.2-alpha-20260123225001-24881d923593e4baadec9de367d6b34c1849820a - version: 0.1.2-alpha-20260123225001-24881d923593e4baadec9de367d6b34c1849820a(graphql@16.9.0) + specifier: 0.1.2 + version: 0.1.2(graphql@16.9.0) '@graphql-tools/load': specifier: 8.1.2 version: 8.1.2(graphql@16.9.0) @@ -458,8 +458,8 @@ importers: specifier: workspace:* version: link:../core/dist '@graphql-inspector/core': - specifier: 7.1.2-alpha-20260123225001-24881d923593e4baadec9de367d6b34c1849820a - version: 7.1.2-alpha-20260123225001-24881d923593e4baadec9de367d6b34c1849820a(graphql@16.9.0) + specifier: 7.1.2 + version: 7.1.2(graphql@16.9.0) '@graphql-tools/code-file-loader': specifier: ~8.1.0 version: 8.1.0(graphql@16.9.0) @@ -757,8 +757,8 @@ importers: specifier: 1.0.0 version: 1.0.0 '@graphql-inspector/core': - specifier: 7.1.2-alpha-20260123225001-24881d923593e4baadec9de367d6b34c1849820a - version: 7.1.2-alpha-20260123225001-24881d923593e4baadec9de367d6b34c1849820a(graphql@16.9.0) + specifier: 7.1.2 + version: 7.1.2(graphql@16.9.0) '@graphql-tools/merge': specifier: 9.1.1 version: 9.1.1(graphql@16.9.0) @@ -1416,8 +1416,8 @@ importers: packages/services/storage: devDependencies: '@graphql-inspector/core': - specifier: 7.1.2-alpha-20260123225001-24881d923593e4baadec9de367d6b34c1849820a - version: 7.1.2-alpha-20260123225001-24881d923593e4baadec9de367d6b34c1849820a(graphql@16.9.0) + specifier: 7.1.2 + version: 7.1.2(graphql@16.9.0) '@hive/service-common': specifier: workspace:* version: link:../service-common @@ -1722,11 +1722,11 @@ importers: specifier: 0.2.0 version: 0.2.0 '@graphql-inspector/core': - specifier: 7.1.2-alpha-20260123225001-24881d923593e4baadec9de367d6b34c1849820a - version: 7.1.2-alpha-20260123225001-24881d923593e4baadec9de367d6b34c1849820a(graphql@16.9.0) + specifier: 7.1.2 + version: 7.1.2(graphql@16.9.0) '@graphql-inspector/patch': - specifier: 0.1.2-alpha-20260123225001-24881d923593e4baadec9de367d6b34c1849820a - version: 0.1.2-alpha-20260123225001-24881d923593e4baadec9de367d6b34c1849820a(graphql@16.9.0) + specifier: 0.1.2 + version: 0.1.2(graphql@16.9.0) '@graphql-tools/mock': specifier: 9.0.25 version: 9.0.25(graphql@16.9.0) @@ -4331,8 +4331,8 @@ packages: peerDependencies: graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 - '@graphql-inspector/core@7.1.2-alpha-20260123225001-24881d923593e4baadec9de367d6b34c1849820a': - resolution: {integrity: sha512-geylRIXwkyQd8jepMaXWSO+yRCXseGBaY31TBFhS1lhgxSRbmxAikImIPHXOJWYapQ2wnt1bxY/dbvTX+baI4A==} + '@graphql-inspector/core@7.1.2': + resolution: {integrity: sha512-yYuWN3/2lQsICwy0PL24hPYeNvDP62Z/t7CfQHcB9V4DJhDtNpoyUYBOwBB1YSwNs4nE9ZQhuv2VeBUZigKVQQ==} engines: {node: '>=18.0.0'} peerDependencies: graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 @@ -4396,8 +4396,8 @@ packages: resolution: {integrity: sha512-rEo+HoQt+qjdayy7p5vcR9GeGTdKXmN0LbIm3W+jKKoXeAMlV4zHxnOW6jEhO6E0eVQxf8Sc1TlcH78i2P2a9w==} engines: {node: '>=18.0.0'} - '@graphql-inspector/patch@0.1.2-alpha-20260123225001-24881d923593e4baadec9de367d6b34c1849820a': - resolution: {integrity: sha512-IMD0jcOEn2Zd9S+B3kfynwTR0sHUGW9NkXATmiawDfg6TEWS6X2kHDFczsSpGwibrX4DMo8X886Zi2tzSqH3Qg==} + '@graphql-inspector/patch@0.1.2': + resolution: {integrity: sha512-iSuRozeQmWm4cX3iNA19+1ADDLdN+qyptkfedKcm1WbGaT7UDDdbh7/RyfAeomVagnhbBKFLLsf3S7I9jV5Iew==} engines: {node: '>=18.0.0'} peerDependencies: graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 @@ -23003,7 +23003,7 @@ snapshots: object-inspect: 1.13.2 tslib: 2.6.2 - '@graphql-inspector/core@7.1.2-alpha-20260123225001-24881d923593e4baadec9de367d6b34c1849820a(graphql@16.9.0)': + '@graphql-inspector/core@7.1.2(graphql@16.9.0)': dependencies: dependency-graph: 1.0.0 graphql: 16.9.0 @@ -23107,7 +23107,7 @@ snapshots: std-env: 3.7.0 tslib: 2.6.2 - '@graphql-inspector/patch@0.1.2-alpha-20260123225001-24881d923593e4baadec9de367d6b34c1849820a(graphql@16.9.0)': + '@graphql-inspector/patch@0.1.2(graphql@16.9.0)': dependencies: '@graphql-tools/utils': 10.9.1(graphql@16.9.0) graphql: 16.9.0