Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: graphql/graphql-js
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v15.5.2
Choose a base ref
...
head repository: graphql/graphql-js
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v15.5.3
Choose a head ref
  • 3 commits
  • 6 files changed
  • 3 contributors

Commits on Sep 2, 2021

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    acc468b View commit details

Commits on Sep 6, 2021

  1. backport: Preserve deprecationReason on GraphQLInputFields (#3260)

    Co-authored-by: Ivan Goncharov <ivan.goncharov.ua@gmail.com>
    Co-authored-by: Trevor Scheer <trevor.scheer@gmail.com>
    IvanGoncharov and trevor-scheer authored Sep 6, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    1293dfa View commit details
  2. 15.5.3

    IvanGoncharov committed Sep 6, 2021

    Verified

    This commit was signed with the committer’s verified signature.
    IvanGoncharov Ivan Goncharov
    Copy the full SHA
    99d6079 View commit details
Showing with 24 additions and 7 deletions.
  1. +2 −2 package-lock.json
  2. +1 −1 package.json
  3. +2 −2 src/language/parser.d.ts
  4. +16 −0 src/type/__tests__/definition-test.js
  5. +1 −0 src/type/definition.js
  6. +2 −2 src/version.js
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "graphql",
"version": "15.5.2",
"version": "15.5.3",
"description": "A Query Language and Runtime which can target any service.",
"license": "MIT",
"private": true,
4 changes: 2 additions & 2 deletions src/language/parser.d.ts
Original file line number Diff line number Diff line change
@@ -218,11 +218,11 @@ export class Parser {
/**
* Arguments[Const] : ( Argument[?Const]+ )
*/
parseArguments: Array<ArgumentNode>;
parseArguments(): Array<ArgumentNode>;
/**
* Argument[Const] : Name : Value[?Const]
*/
parseArgument: ArgumentNode;
parseArgument(): ArgumentNode;
/**
* Corresponds to both FragmentSpread and InlineFragment in the spec.
*
16 changes: 16 additions & 0 deletions src/type/__tests__/definition-test.js
Original file line number Diff line number Diff line change
@@ -856,6 +856,22 @@ describe('Type System: Input Objects', () => {
);
});
});

it('Deprecation reason is preserved on fields', () => {
const inputObjType = new GraphQLInputObjectType({
name: 'SomeInputObject',
fields: {
deprecatedField: {
type: ScalarType,
deprecationReason: 'not used anymore',
},
},
});
expect(inputObjType.toConfig()).to.have.nested.property(
'fields.deprecatedField.deprecationReason',
'not used anymore',
);
});
});

describe('Type System: List', () => {
1 change: 1 addition & 0 deletions src/type/definition.js
Original file line number Diff line number Diff line change
@@ -1546,6 +1546,7 @@ export class GraphQLInputObjectType {
description: field.description,
type: field.type,
defaultValue: field.defaultValue,
deprecationReason: field.deprecationReason,
extensions: field.extensions,
astNode: field.astNode,
}));
4 changes: 2 additions & 2 deletions src/version.js
Original file line number Diff line number Diff line change
@@ -6,14 +6,14 @@
/**
* A string containing the version of the GraphQL.js library
*/
export const version = '15.5.2';
export const version = '15.5.3';

/**
* An object containing the components of the GraphQL.js version string
*/
export const versionInfo = Object.freeze({
major: 15,
minor: 5,
patch: 2,
patch: 3,
preReleaseTag: null,
});