Skip to content

Commit b70005f

Browse files
authored
Merge branch 'next' into schema-coordinates
2 parents 42d1f4d + 9b7e529 commit b70005f

Some content is hidden

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

73 files changed

+5327
-690
lines changed

.c8rc.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
"src/jsutils/Maybe.ts",
88
"src/jsutils/ObjMap.ts",
99
"src/jsutils/PromiseOrValue.ts",
10-
"src/utilities/typedQueryDocumentNode.ts"
10+
"src/utilities/typedQueryDocumentNode.ts",
11+
"src/**/__tests__/**/*.ts"
1112
],
1213
"clean": true,
1314
"report-dir": "reports/coverage",

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ jobs:
145145
runs-on: ubuntu-latest
146146
strategy:
147147
matrix:
148-
node_version_to_setup: [16, 18, 19]
148+
node_version_to_setup: [20, 22, 24]
149149
permissions:
150150
contents: read # for actions/checkout
151151
steps:

.node-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v20
1+
v24

README.md

Lines changed: 48 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[![GraphQLConf 2024 Banner: September 10-12, San Francisco. Hosted by the GraphQL Foundation](https://github.com/user-attachments/assets/2d048502-e5b2-4e9d-a02a-50b841824de6)](https://graphql.org/conf/2024/?utm_source=github&utm_medium=graphql_js&utm_campaign=readme)
1+
[![GraphQLConf 2025 Banner: September 08-10, Amsterdam. Hosted by the GraphQL Foundation](./assets/graphql-conf-2025.png)](https://graphql.org/conf/2025/?utm_source=github&utm_medium=graphql_js&utm_campaign=readme)
22

33
# GraphQL.js
44

@@ -110,7 +110,7 @@ graphql({ schema, source }).then((result) => {
110110

111111
**Note**: Please don't forget to set `NODE_ENV=production` if you are running a production server. It will disable some checks that can be useful during development but will significantly improve performance.
112112

113-
### Want to ride the bleeding edge?
113+
## Want to ride the bleeding edge?
114114

115115
The `npm` branch in this repository is automatically maintained to be the last
116116
commit to `main` to pass all tests, in the same form found on npm. It is
@@ -134,7 +134,7 @@ the portions of the library you use. This works because GraphQL.js is distribute
134134
with both CommonJS (`require()`) and ESModule (`import`) files. Ensure that any
135135
custom build configurations look for `.mjs` files!
136136

137-
### Contributing
137+
## Contributing
138138

139139
We actively welcome pull requests. Learn how to [contribute](./.github/CONTRIBUTING.md).
140140

@@ -146,10 +146,53 @@ You can find [detailed information here](https://github.com/graphql/graphql-wg/t
146146

147147
If your company benefits from GraphQL and you would like to provide essential financial support for the systems and people that power our community, please also consider membership in the [GraphQL Foundation](https://foundation.graphql.org/join).
148148

149-
### Changelog
149+
## Changelog
150150

151151
Changes are tracked as [GitHub releases](https://github.com/graphql/graphql-js/releases).
152152

153-
### License
153+
## License
154154

155155
GraphQL.js is [MIT-licensed](./LICENSE).
156+
157+
## Version Support
158+
159+
GraphQL.JS follows Semantic Versioning (SemVer) for its releases. Our version support policy is as follows:
160+
161+
- Latest Major Version: We provide full support, including bug fixes and security updates, for the latest major version of GraphQL.JS.
162+
- Previous Major Version: We offer feature support for the previous major version for 12 months after the release of the newest major version.
163+
This means that for 12 months we can backport features for specification changes _if_ they don't cause any breaking changes. We'll continue
164+
supporting the previous major version with bug and security fixes.
165+
- Older Versions: Versions older than the previous major release are considered unsupported. While the code remains available,
166+
we do not actively maintain or provide updates for these versions.
167+
One exception to this rule is when the older version has been released < 1 year ago, in that case we
168+
will treat it like the "Previous Major Version".
169+
170+
### Long-Term Support (LTS)
171+
172+
We do not currently offer a Long-Term Support version of GraphQL.JS. Users are encouraged to upgrade to the latest stable version
173+
to receive the most up-to-date features, performance improvements, and security updates.
174+
175+
### End-of-Life (EOL) Schedule
176+
177+
We will announce the EOL date for a major version at least 6 months in advance.
178+
After a version reaches its EOL, it will no longer receive updates, even for critical security issues.
179+
180+
### Upgrade Assistance
181+
182+
To assist users in upgrading to newer versions:
183+
184+
- We maintain detailed release notes for each version, highlighting new features, breaking changes, and deprecations.
185+
- [Our documentation](https://www.graphql-js.org/) includes migration guides for moving between major versions.
186+
- The [community forum (Discord channel #graphql-js)](https://discord.graphql.org) is available for users who need additional assistance with upgrades.
187+
188+
### Security Updates
189+
190+
We prioritize the security of GraphQL.JS:
191+
192+
- Critical security updates will be applied to both the current and previous major version.
193+
- For versions that have reached EOL, we strongly recommend upgrading to a supported version to receive security updates.
194+
195+
### Community Contributions
196+
197+
We welcome community contributions for all versions of GraphQL.JS. However, our maintainers will primarily focus on reviewing
198+
and merging contributions for supported versions.

assets/graphql-conf-2025.png

488 KB
Loading

benchmark/fixtures.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ export const bigSchemaSDL = fs.readFileSync(
55
'utf8',
66
);
77

8+
export const bigDocumentSDL = fs.readFileSync(
9+
new URL('kitchen-sink.graphql', import.meta.url),
10+
'utf8',
11+
);
12+
813
export const bigSchemaIntrospectionResult = JSON.parse(
914
fs.readFileSync(new URL('github-schema.json', import.meta.url), 'utf8'),
1015
);

benchmark/kitchen-sink.graphql

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
query queryName($foo: ComplexType, $site: Site = MOBILE) @onQuery {
2+
whoever123is: node(id: [123, 456]) {
3+
id
4+
... on User @onInlineFragment {
5+
field2 {
6+
id
7+
alias: field1(first: 10, after: $foo) @include(if: $foo) {
8+
id
9+
...frag @onFragmentSpread
10+
}
11+
}
12+
}
13+
... @skip(unless: $foo) {
14+
id
15+
}
16+
... {
17+
id
18+
}
19+
}
20+
}
21+
22+
mutation likeStory @onMutation {
23+
like(story: 123) @onField {
24+
story {
25+
id @onField
26+
}
27+
}
28+
}
29+
30+
subscription StoryLikeSubscription(
31+
$input: StoryLikeSubscribeInput @onVariableDefinition
32+
) @onSubscription {
33+
storyLikeSubscribe(input: $input) {
34+
story {
35+
likers {
36+
count
37+
}
38+
likeSentence {
39+
text
40+
}
41+
}
42+
}
43+
}
44+
45+
fragment frag on Friend @onFragmentDefinition {
46+
foo(
47+
size: $size
48+
bar: $b
49+
obj: {
50+
key: "value"
51+
block: """
52+
block string uses \"""
53+
"""
54+
}
55+
)
56+
}
57+
58+
{
59+
unnamed(truthy: true, falsy: false, nullish: null)
60+
query
61+
}
62+
63+
query {
64+
__typename
65+
}

benchmark/printer-benchmark.js

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
import { parse } from 'graphql/language/parser.js';
2+
import { print } from 'graphql/language/printer.js';
3+
4+
import { bigDocumentSDL } from './fixtures.js';
5+
6+
const document = parse(bigDocumentSDL);
7+
8+
export const benchmark = {
9+
name: 'Print kitchen sink document',
10+
count: 1000,
11+
measure() {
12+
print(document);
13+
},
14+
};

cspell.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,20 @@ overrides:
2727
- swcrc
2828
- noreferrer
2929
- xlink
30+
- codegen
31+
- composability
32+
- deduplication
33+
- debuggable
34+
- subschema
35+
- subschemas
36+
- NATS
37+
- benjie
38+
- codegen
39+
- URQL
40+
- tada
41+
- Graphile
42+
- precompiled
43+
- debuggable
3044

3145
validateDirectives: true
3246
ignoreRegExpList:
@@ -114,6 +128,8 @@ words:
114128
- svgr
115129
- ruru
116130
- oneof
131+
- vercel
132+
- unbatched
117133

118134
# used as href anchors
119135
- graphqlerror
@@ -169,3 +185,6 @@ words:
169185
- XXXF
170186
- bfnrt
171187
- wrds
188+
- overcomplicating
189+
- cacheable
190+
- pino

package-lock.json

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

0 commit comments

Comments
 (0)