Skip to content

Commit 7753133

Browse files
committed
Merge remote-tracking branch 'origin/16.x.x' into backport-16.x.x
2 parents 5c7d4d1 + 9a91e33 commit 7753133

File tree

13 files changed

+169
-8
lines changed

13 files changed

+169
-8
lines changed

.github/workflows/pull_request.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ jobs:
77
contents: read # for actions/checkout
88
security-events: write # for codeql-action
99
uses: ./.github/workflows/ci.yml
10+
secrets:
11+
codecov_token: ${{ secrets.CODECOV_TOKEN }}
1012

1113
dependency-review:
1214
name: Security check of added dependencies

.github/workflows/push.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ jobs:
77
contents: read # for actions/checkout
88
security-events: write
99
uses: ./.github/workflows/ci.yml
10+
secrets:
11+
codecov_token: ${{ secrets.CODECOV_TOKEN }}
1012
deploy-to-npm-branch:
1113
name: Deploy to `npm` branch
1214
needs: ci

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
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)
2+
13
# GraphQL.js
24

35
The JavaScript reference implementation for GraphQL, a query language for APIs created by Facebook.

cspell.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,13 @@ overrides:
2020
words:
2121
- clsx
2222
- infima
23+
- noopener
24+
- Vite
25+
- craco
26+
- esbuild
27+
- swcrc
28+
- noreferrer
29+
- xlink
2330

2431
validateDirectives: true
2532
ignoreRegExpList:

src/jsutils/instanceOf.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
import { inspect } from './inspect.js';
22

3+
/* c8 ignore next 3 */
4+
const isProduction =
5+
globalThis.process &&
6+
// eslint-disable-next-line no-undef
7+
process.env.NODE_ENV === 'production';
8+
39
/**
410
* A replacement for instanceof which includes an error warning when multi-realm
511
* constructors are detected.
@@ -9,7 +15,7 @@ import { inspect } from './inspect.js';
915
export const instanceOf: (value: unknown, constructor: Constructor) => boolean =
1016
/* c8 ignore next 6 */
1117
// FIXME: https://github.com/graphql/graphql-js/issues/2317
12-
globalThis.process != null && globalThis.process.env.NODE_ENV === 'production'
18+
isProduction
1319
? function instanceOf(value: unknown, constructor: Constructor): boolean {
1420
return value instanceof constructor;
1521
}

src/language/ast.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -343,11 +343,12 @@ export interface OperationDefinitionNode {
343343
readonly selectionSet: SelectionSetNode;
344344
}
345345

346-
export enum OperationTypeNode {
346+
enum OperationTypeNode {
347347
QUERY = 'query',
348348
MUTATION = 'mutation',
349349
SUBSCRIPTION = 'subscription',
350350
}
351+
export { OperationTypeNode };
351352

352353
export interface VariableDefinitionNode {
353354
readonly kind: Kind.VARIABLE_DEFINITION;

src/language/directiveLocation.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* The set of allowed directive location values.
33
*/
4-
export enum DirectiveLocation {
4+
enum DirectiveLocation {
55
/** Request Definitions */
66
QUERY = 'QUERY',
77
MUTATION = 'MUTATION',
@@ -24,3 +24,5 @@ export enum DirectiveLocation {
2424
INPUT_OBJECT = 'INPUT_OBJECT',
2525
INPUT_FIELD_DEFINITION = 'INPUT_FIELD_DEFINITION',
2626
}
27+
28+
export { DirectiveLocation }

src/language/kinds.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* The set of allowed kind values for AST nodes.
33
*/
4-
export enum Kind {
4+
enum Kind {
55
/** Name */
66
NAME = 'Name',
77

@@ -72,3 +72,5 @@ export enum Kind {
7272
ENUM_TYPE_EXTENSION = 'EnumTypeExtension',
7373
INPUT_OBJECT_TYPE_EXTENSION = 'InputObjectTypeExtension',
7474
}
75+
76+
export { Kind };

src/language/tokenKind.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* An exported enum describing the different kinds of tokens that the
33
* lexer emits.
44
*/
5-
export enum TokenKind {
5+
enum TokenKind {
66
SOF = '<SOF>',
77
EOF = '<EOF>',
88
BANG = '!',
@@ -27,3 +27,5 @@ export enum TokenKind {
2727
BLOCK_STRING = 'BlockString',
2828
COMMENT = 'Comment',
2929
}
30+
31+
export { TokenKind }

src/type/introspection.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@ export const __EnumValue: GraphQLObjectType = new GraphQLObjectType({
443443
} as GraphQLFieldConfigMap<GraphQLEnumValue, unknown>),
444444
});
445445

446-
export enum TypeKind {
446+
enum TypeKind {
447447
SCALAR = 'SCALAR',
448448
OBJECT = 'OBJECT',
449449
INTERFACE = 'INTERFACE',
@@ -453,6 +453,7 @@ export enum TypeKind {
453453
LIST = 'LIST',
454454
NON_NULL = 'NON_NULL',
455455
}
456+
export { TypeKind };
456457

457458
export const __TypeKind: GraphQLEnumType = new GraphQLEnumType({
458459
name: '__TypeKind',

0 commit comments

Comments
 (0)