Skip to content

Commit 04a4978

Browse files
authored
feat: Upgrade GraphQL to 16.11.0 (#635)
1 parent 1419a96 commit 04a4978

File tree

49 files changed

+5019
-606
lines changed

Some content is hidden

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

49 files changed

+5019
-606
lines changed

.changeset/tough-peaches-occur.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
'@baseplate-dev/fastify-generators': patch
3+
'@baseplate-dev/react-generators': patch
4+
---
5+
6+
Upgrade GraphQL to 16.11.0

packages/fastify-generators/src/constants/fastify-packages.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export const FASTIFY_PACKAGES = {
99
'pino-pretty': '13.0.0',
1010

1111
'altair-fastify-plugin': '8.0.4',
12-
graphql: '16.9.0',
12+
graphql: '16.11.0',
1313
'@envelop/core': '5.3.0',
1414
'@envelop/disable-introspection': '8.0.0',
1515
'graphql-yoga': '5.15.1',

packages/react-generators/src/constants/react-packages.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ export const REACT_PACKAGES = {
4040

4141
// GraphQL
4242
'@apollo/client': '3.13.8',
43-
graphql: '16.9.0',
43+
graphql: '16.11.0',
4444
'graphql-ws': '5.16.0',
4545
'@graphql-codegen/cli': '5.0.7',
4646
'@graphql-codegen/typescript': '4.1.6',

pnpm-lock.yaml

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/simple/baseplate/project-definition.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
"name": "BlogPost"
7474
}
7575
],
76-
"schemaVersion": 17,
76+
"schemaVersion": 19,
7777
"settings": { "general": { "name": "simple", "portOffset": 3000 } },
7878
"version": "0.1.0"
7979
}

tests/simple/packages/backend/baseplate/generated/package.json

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -13,56 +13,56 @@
1313
],
1414
"scripts": {
1515
"build": "tsc && tsc-alias",
16-
"dev": "tsx watch --clear-screen=false -r dotenv/config src/index.ts | pino-pretty -t",
17-
"dev:script": "tsx watch --respawn -r dotenv/config",
18-
"generate:schema": "tsx -r dotenv/config src/index.ts --exit-after-generate-schema",
16+
"dev": "tsx watch --clear-screen=false --env-file-if-exists=.env src/index.ts | pino-pretty -t",
17+
"generate:schema": "tsx --env-file-if-exists=.env src/index.ts --exit-after-generate-schema",
1918
"preinstall": "npx only-allow pnpm",
2019
"postinstall": "prisma generate",
2120
"lint": "eslint .",
21+
"lint:fix": "eslint . --fix",
2222
"prettier:check": "prettier --check .",
2323
"prettier:write": "prettier -w .",
24-
"run:script": "tsx -r dotenv/config",
24+
"script:dev": "tsx watch --respawn --env-file-if-exists=.env",
25+
"script:run": "tsx --env-file-if-exists=.env",
2526
"start": "node dist/index.js",
2627
"test": "vitest run",
2728
"test:unit": "cross-env TEST_MODE=unit vitest run .unit.",
2829
"typecheck": "tsc --noEmit"
2930
},
3031
"dependencies": {
31-
"@envelop/core": "5.0.1",
32-
"@envelop/disable-introspection": "6.0.0",
32+
"@envelop/core": "5.3.0",
33+
"@envelop/disable-introspection": "8.0.0",
3334
"@fastify/cookie": "11.0.1",
3435
"@fastify/helmet": "13.0.0",
3536
"@fastify/request-context": "6.0.1",
36-
"@pothos/core": "4.3.0",
37-
"@pothos/plugin-prisma": "4.3.1",
38-
"@pothos/plugin-relay": "4.3.0",
39-
"@pothos/plugin-simple-objects": "4.1.0",
37+
"@pothos/core": "4.8.1",
38+
"@pothos/plugin-prisma": "4.10.0",
39+
"@pothos/plugin-relay": "4.6.2",
40+
"@pothos/plugin-simple-objects": "4.1.3",
4041
"@pothos/plugin-tracing": "1.1.0",
4142
"@pothos/tracing-sentry": "1.1.1",
4243
"@prisma/client": "6.5.0",
4344
"@sentry/core": "9.17.0",
4445
"@sentry/node": "9.17.0",
4546
"@sentry/profiling-node": "9.17.0",
4647
"altair-fastify-plugin": "8.0.4",
47-
"cross-env": "7.0.3",
4848
"es-toolkit": "1.31.0",
4949
"fastify": "5.3.2",
5050
"fastify-plugin": "5.0.1",
51-
"graphql": "16.9.0",
52-
"graphql-yoga": "5.6.1",
51+
"graphql": "16.11.0",
52+
"graphql-yoga": "5.15.1",
5353
"nanoid": "3.3.8",
5454
"pino": "9.5.0",
5555
"uuid": "9.0.0",
5656
"zod": "3.24.1"
5757
},
5858
"devDependencies": {
59-
"@envelop/types": "5.0.0",
59+
"@envelop/types": "5.2.1",
6060
"@eslint/js": "9.32.0",
6161
"@types/node": "^22.0.0",
6262
"@types/uuid": "9.0.1",
6363
"@types/ws": "8.5.13",
6464
"@vitest/eslint-plugin": "1.3.4",
65-
"dotenv": "16.3.1",
65+
"cross-env": "7.0.3",
6666
"eslint": "9.32.0",
6767
"eslint-config-prettier": "10.1.8",
6868
"eslint-import-resolver-typescript": "4.4.4",
@@ -79,7 +79,7 @@
7979
"typescript": "5.7.3",
8080
"typescript-eslint": "8.38.0",
8181
"vite-tsconfig-paths": "5.1.4",
82-
"vitest": "3.0.7",
82+
"vitest": "3.2.4",
8383
"vitest-mock-extended": "1.3.2"
8484
},
8585
"engines": {
@@ -90,6 +90,6 @@
9090
"node": "22.14.0"
9191
},
9292
"prisma": {
93-
"seed": "tsx -r dotenv/config --env-file-if-exists=.seed.env src/prisma/seed.ts"
93+
"seed": "tsx --env-file-if-exists=.env --env-file-if-exists=.seed.env src/prisma/seed.ts"
9494
}
9595
}

tests/simple/packages/backend/baseplate/generated/src/plugins/graphql/FieldWithInputPayloadPlugin/global-types.ts

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
import type {
2-
ArgumentRef,
32
FieldKind,
43
FieldNullability,
5-
FieldRef,
64
InputFieldMap,
7-
InputFieldRef,
85
SchemaTypes,
96
ShapeFromTypeParam,
107
TypeParam,
@@ -58,14 +55,14 @@ declare global {
5855
input: InputFieldBuilder<Types, 'InputObject'>;
5956
payload: RootFieldBuilder<Types, unknown, 'PayloadObject'>;
6057
fieldWithInputPayload: <
61-
InputFields extends Record<string, InputFieldRef<Types>>,
58+
InputFields extends InputFieldMap,
6259
PayloadFields extends Record<
6360
string,
6461
FieldRef<Types, unknown, 'PayloadObject'>
6562
>,
6663
ResolveShape,
6764
ResolveReturnShape,
68-
Args extends Record<string, ArgumentRef<Types>> = Record<never, never>,
65+
Args extends InputFieldMap = Record<never, never>,
6966
>(
7067
options: MutationWithInputPayloadOptions<
7168
Types,

tests/simple/packages/backend/baseplate/generated/src/plugins/graphql/FieldWithInputPayloadPlugin/schema-builder.ts

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,17 +79,12 @@ rootBuilderProto.fieldWithInputPayload = function fieldWithInputPayload({
7979
});
8080
});
8181

82-
// eslint-disable-next-line @typescript-eslint/no-unsafe-return
8382
return fieldRef;
8483
};
8584

8685
Object.defineProperty(rootBuilderProto, 'input', {
8786
get: function getInputBuilder(this: RootFieldBuilder<SchemaTypes, unknown>) {
88-
return new InputFieldBuilder(
89-
this.builder,
90-
'InputObject',
91-
`UnnamedWithInputPayload`,
92-
);
87+
return new InputFieldBuilder(this.builder, 'InputObject');
9388
},
9489
});
9590

tests/simple/packages/backend/baseplate/generated/src/plugins/graphql/FieldWithInputPayloadPlugin/types.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import type {
2-
ArgumentRef,
32
FieldKind,
43
FieldMap,
54
FieldOptionsFromKind,
65
FieldRef,
76
GenericFieldRef,
7+
InputFieldMap,
88
InputFieldRef,
99
InputShapeFromFields,
1010
NullableToOptional,
@@ -21,8 +21,8 @@ export type MutationWithInputPayloadOptions<
2121
Types extends SchemaTypes,
2222
ParentShape,
2323
Kind extends FieldKind,
24-
Args extends Record<string, ArgumentRef<Types>>,
25-
InputFields extends Record<string, InputFieldRef<Types>>,
24+
Args extends InputFieldMap,
25+
InputFields extends InputFieldMap,
2626
PayloadFields extends Record<string, FieldRef<Types, unknown, 'Object'>>,
2727
ResolveShape,
2828
ResolveReturnShape,

tests/simple/packages/backend/baseplate/generated/src/services/sentry.ts

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import type { FastifyError } from 'fastify';
22

33
import * as Sentry from '@sentry/node';
44
import { omit } from 'es-toolkit';
5-
import { GraphQLError } from 'graphql';
65

76
import { HttpError } from '../utils/http-errors.js';
87
import { config } from './config.js';
@@ -26,12 +25,6 @@ export function shouldLogToSentry(error: unknown): boolean {
2625
return fastifyError.statusCode <= 500;
2726
}
2827

29-
if (error instanceof GraphQLError) {
30-
return (
31-
!error.extensions.http?.status || error.extensions.http.status >= 500
32-
);
33-
}
34-
3528
return true;
3629
}
3730

0 commit comments

Comments
 (0)