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: v14.4.1
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: v14.4.2
Choose a head ref
  • 5 commits
  • 5 files changed
  • 2 contributors

Commits on Jun 29, 2019

  1. Verified

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

Commits on Jul 2, 2019

  1. Verified

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

Commits on Jul 3, 2019

  1. Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Copy the full SHA
    cbd5c95 View commit details
  2. Verified

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

    IvanGoncharov committed Jul 3, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    IvanGoncharov Ivan Goncharov
    Copy the full SHA
    6faa515 View commit details
Showing with 25 additions and 9 deletions.
  1. +2 −3 package.json
  2. +2 −3 src/jsutils/defineToJSON.js
  3. +1 −1 src/jsutils/nodejsCustomInspectSymbol.js
  4. +18 −0 src/utilities/__tests__/buildClientSchema-test.js
  5. +2 −2 src/version.js
5 changes: 2 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "graphql",
"version": "14.4.1",
"version": "14.4.2",
"description": "A Query Language and Runtime which can target any service.",
"license": "MIT",
"main": "index",
@@ -34,8 +34,7 @@
"build": "node resources/build.js",
"changelog": "node resources/gen-changelog.js",
"preversion": ". ./resources/checkgit.sh",
"version": "node resources/gen-version.js && npm test",
"postversion": "git commit --amend --all --no-edit",
"version": "node resources/gen-version.js && npm test && git add src/version.js",
"prepublishOnly": ". ./resources/prepublish.sh",
"gitpublish": ". ./resources/gitpublish.sh"
},
5 changes: 2 additions & 3 deletions src/jsutils/defineToJSON.js
Original file line number Diff line number Diff line change
@@ -7,9 +7,8 @@ import nodejsCustomInspectSymbol from './nodejsCustomInspectSymbol';
* methods, if no function provided they become aliases for toString().
*/
export default function defineToJSON(
// eslint-disable-next-line flowtype/no-weak-types
classObject: Class<any> | Function,
fn?: () => any = classObject.prototype.toString,
classObject: Class<any> | ((...args: Array<any>) => mixed),
fn?: () => mixed = classObject.prototype.toString,
): void {
classObject.prototype.toJSON = fn;
classObject.prototype.inspect = fn;
2 changes: 1 addition & 1 deletion src/jsutils/nodejsCustomInspectSymbol.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// @flow strict

const nodejsCustomInspectSymbol =
typeof Symbol === 'function'
typeof Symbol === 'function' && typeof Symbol.for === 'function'
? Symbol.for('nodejs.util.inspect.custom')
: undefined;

18 changes: 18 additions & 0 deletions src/utilities/__tests__/buildClientSchema-test.js
Original file line number Diff line number Diff line change
@@ -581,6 +581,24 @@ describe('Type System: build schema from introspection', () => {
);
});

it('throws when missing definition for one of the standard scalars', () => {
const schema = buildSchema(`
type Query {
foo: Float
}
`);
const introspection = introspectionFromSchema(schema);

// $DisableFlowOnNegativeTest
introspection.__schema.types = introspection.__schema.types.filter(
({ name }) => name !== 'Float',
);

expect(() => buildClientSchema(introspection)).to.throw(
'Invalid or incomplete schema, unknown type: Float. Ensure that a full introspection query is used in order to build a client schema.',
);
});

it('throws when type reference is missing name', () => {
const introspection = introspectionFromSchema(dummySchema);

4 changes: 2 additions & 2 deletions src/version.js
Original file line number Diff line number Diff line change
@@ -8,14 +8,14 @@
/**
* A string containing the version of the GraphQL.js library
*/
export const version = '14.4.1';
export const version = '14.4.2';

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