.babelrc.js

@@ -1,16 +1,5 @@
 module.exports = {
-  presets: [
-    ['@babel/preset-env', {
-        targets: [
-          'node 6',
-          'ie 9',
-          'ios 9',
-          'last 2 chrome versions',
-          'last 2 edge versions',
-          'last 2 firefox versions',
-        ],
-    }],
-  ],
+  presets: ['@babel/preset-env'],
   plugins: [
     './resources/inline-invariant',
     '@babel/plugin-transform-flow-strip-types',

.browserslistrc

@@ -0,0 +1,6 @@
+node 6
+ie 9
+ios 9
+last 2 chrome versions
+last 2 edge versions
+last 2 firefox versions

.eslintrc.yml

@@ -35,7 +35,7 @@ rules:
   # https://github.com/prettier/eslint-plugin-prettier#installation
   prettier/prettier: error
 
-  # `eslint-plugin-flowtype` rule list based on `v3.2.0`
+  # `eslint-plugin-flowtype` rule list based on `v3.4.x`
   # https://github.com/gajus/eslint-plugin-flowtype#eslint-plugin-flowtype
 
   flowtype/array-style-complex-type: [error, verbose]
@@ -48,6 +48,7 @@ rules:
   flowtype/no-dupe-keys: error
   flowtype/no-existential-type: off
   flowtype/no-flow-fix-me-comments: off
+  flowtype/no-mixed: off
   flowtype/no-mutable-array: off
   flowtype/no-primitive-constructor-types: error
   flowtype/no-types-missing-file-annotation: error
@@ -73,7 +74,7 @@ rules:
   flowtype/valid-syntax: off
 
   ##################################################
-  # ESLint builtin rules list based on `v5.12.x`
+  # ESLint builtin rules list based on `v5.15.x`
   ##################################################
 
   # Possible Errors
@@ -186,6 +187,7 @@ rules:
   no-void: error
   no-warning-comments: off
   no-with: error
+  prefer-named-capture-group: off # ES2018
   #prefer-promise-reject-errors: undecided
   radix: error
   #require-await: undecided

.flowconfig

@@ -14,4 +14,4 @@ suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(<VERSION>\\)?)\\)?:? #[0-9]+
 suppress_comment=\\(.\\|\n\\)*\\$DisableFlowOnNegativeTest
 
 [version]
-^0.90.0
+^0.95.0

.gitignore

@@ -6,6 +6,7 @@
 # https://www.gitignore.io/
 
 .nyc_output
+.eslintcache
 node_modules
 coverage
 dist

.mocharc.yml

@@ -0,0 +1,5 @@
+throw-deprecation: true
+check-leaks: true
+require:
+  - '@babel/register'
+  - '@babel/polyfill'

.prettierrc

@@ -1,5 +1,6 @@
 {
   "parser": "flow",
   "singleQuote": true,
-  "trailingComma": "all"
+  "trailingComma": "all",
+  "endOfLine": "lf"
 }

.travis.yml

@@ -1,4 +1,7 @@
+git:
+  depth: 5
 language: node_js
+cache: yarn
 
 # https://github.com/nodejs/Release
 node_js:
@@ -7,27 +10,12 @@ node_js:
   - '8'
   - '6'
 
-git:
-  depth: 5
-
-cache: yarn
-
-notifications:
-  irc:
-    use_notice: true
-    on_success: change
-    on_failure: change
-    skip_join: true
-    channels:
-      - "chat.freenode.net#graphql"
-  slack:
-    secure: G7fzaXoPI1cyyW7dlpQ8oG/ot73n4kE83HgbyK1iEN1YBfodsytVgh0jS+zB3DhhRAotS/VfGVz9Wj2Oo109U5w/FyxdMGuKvFan/0B/aAws1sPxLGWA5230u1wTKQCHAu17+yppFOODUu1ILDXaD2A//Wj5iru9M4NnKc1bO6VHkfBHPTLQLbdPHmorwuSH02Ocbh7K4XOWzXRxM6VrwamEn1KnyXGu2w3QdJUT31OjGEEdf6FUzvjwzFgXPhngCw5+enpwm71ljHDNu8YHhXvHtS4328O5pYQO8np7j653HNEqi+ZUiYEOWpwC8be1xHdvi/s32tPFZiCx28ZmDoCUrY744tpPtE6tzuncmSKB0Y3EjutdXBpxllNr5l5hpX5092G2MlpokFbv85J+E2ALcZYNYeFOqTYTKwTYkxK6B1x4amBNpM+FXgUhloK4BK9OT0Qh5SiQOsM8cZT0h6QP91n+REljtpugW3VbuIxq5OJAi42FYbHBC27pohhq6ohU1euZfobk9a7ZawnjoEUk1EZHXiJzYKY/QqzyB6dwk0ersBl3l3OX/wnjwKTkqc9aTmDWo2L+lHaUCXuCY1+KQXsRicfnH395szTJXQbvcbN0zz188gdz6sawzi5BxndWo0NRwZyOG2YcyUHFQR4bK1rL7Lo6t6rijQ/XMeQ=
-
-script:
-  - if [[ "$TRAVIS_JOB_NUMBER" == *.1 ]]; then npm run test:ci; else npm run testonly; fi
+script: npm run testonly
 
 jobs:
   include:
+    - node_js: 'lts/*'
+      script: npm run test:ci && bash <(curl -s https://codecov.io/bash) -f coverage/coverage-final.json
     - stage: deploy
       if: branch = master OR tag IS present
       script: echo "Deploying..."
@@ -47,6 +35,17 @@ jobs:
             branch: master
             tags: true
 
+notifications:
+  irc:
+    use_notice: true
+    on_success: change
+    on_failure: change
+    skip_join: true
+    channels:
+      - "chat.freenode.net#graphql"
+  slack:
+    secure: G7fzaXoPI1cyyW7dlpQ8oG/ot73n4kE83HgbyK1iEN1YBfodsytVgh0jS+zB3DhhRAotS/VfGVz9Wj2Oo109U5w/FyxdMGuKvFan/0B/aAws1sPxLGWA5230u1wTKQCHAu17+yppFOODUu1ILDXaD2A//Wj5iru9M4NnKc1bO6VHkfBHPTLQLbdPHmorwuSH02Ocbh7K4XOWzXRxM6VrwamEn1KnyXGu2w3QdJUT31OjGEEdf6FUzvjwzFgXPhngCw5+enpwm71ljHDNu8YHhXvHtS4328O5pYQO8np7j653HNEqi+ZUiYEOWpwC8be1xHdvi/s32tPFZiCx28ZmDoCUrY744tpPtE6tzuncmSKB0Y3EjutdXBpxllNr5l5hpX5092G2MlpokFbv85J+E2ALcZYNYeFOqTYTKwTYkxK6B1x4amBNpM+FXgUhloK4BK9OT0Qh5SiQOsM8cZT0h6QP91n+REljtpugW3VbuIxq5OJAi42FYbHBC27pohhq6ohU1euZfobk9a7ZawnjoEUk1EZHXiJzYKY/QqzyB6dwk0ersBl3l3OX/wnjwKTkqc9aTmDWo2L+lHaUCXuCY1+KQXsRicfnH395szTJXQbvcbN0zz188gdz6sawzi5BxndWo0NRwZyOG2YcyUHFQR4bK1rL7Lo6t6rijQ/XMeQ=
+
 env:
   global:
     secure: "uUjOV39iCLSLtShQfKk9AelIu2PqyKf8dYu4rqVcL5Y9yCHdds1KYysVgCx9XhndrugHNCXWzT/sKDS8voc/NRsfycnvdCIvu+dtBwf9lCHGcMyABFpvsjQfKTGyMCbYNDO8Hd/OQqHCFVj1lh4aNGev8tGqpJoMEDPdQbDKsvMVKWfo9QraXYYK7yh7U2vbidAV+YBj/e3VFfR2UQ+OECHxyxFGxWMbyTF8qRZ7JUsgCaJ82zrx0A7VoEJ6BeXxzhYDPuh3QTON9bXiJpWR/QcsKZNQ7d6Dxf06yo4XQDU9igxe6qst41Hj3IiZzLCyucoPXvoRsbmUcsAVdF4PWq3fnHUmyjRwOMcTjPd2SM4FPJpwnSGZEpstzKSJ3pDzpgRGsF7ai5nGNCes6RCi4AUf96GTjt0JAD+AXwD7mrGlcn4oi0m6r1GcNhDOFsBEgFqz26FXUFQcAqrHzZvsqvG01Cs5pAFMUIEpCyCrkDKClc/LWjJoVInDEVCwGqZk6Qz2XroYjFs25m+aB3ycSIN1qgkTg6szMO76tds4YtL8JDHaAXDbvXAk8YRYbQCAIFQVaIpkp8R1kJa++dP8Q3j/lwAkz+57XJ5KPRlLh7KMqF1joTGKptA0c2vD0sees2RxPrcZGmp6eaOLy3JhQmXfPaRLLpiK+plz6T25f7Y="

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2015-present, Facebook, Inc.
+Copyright (c) Facebook, Inc. and its affiliates.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -4,7 +4,7 @@ The JavaScript reference implementation for GraphQL, a query language for APIs c
 
 [![npm version](https://badge.fury.io/js/graphql.svg)](https://badge.fury.io/js/graphql)
 [![Build Status](https://travis-ci.org/graphql/graphql-js.svg?branch=master)](https://travis-ci.org/graphql/graphql-js?branch=master)
-[![Coverage Status](https://coveralls.io/repos/graphql/graphql-js/badge.svg?branch=master)](https://coveralls.io/r/graphql/graphql-js?branch=master)
+[![Coverage Status](https://codecov.io/gh/graphql/graphql-js/branch/master/graph/badge.svg)](https://codecov.io/gh/graphql/graphql-js)
 
 See more complete documentation at https://graphql.org/ and
 https://graphql.org/graphql-js/.

codecov.yml

@@ -0,0 +1,14 @@
+codecov:
+  notify:
+    require_ci_to_pass: yes
+
+parsers:
+  javascript:
+    enable_partials: yes
+
+comment: no
+coverage:
+  status:
+    project:
+      default:
+        target: auto

package.json

@@ -1,6 +1,6 @@
 {
   "name": "graphql",
-  "version": "14.1.1",
+  "version": "14.2.0",
   "description": "A Query Language and Runtime which can target any service.",
   "license": "MIT",
   "main": "index",
@@ -24,16 +24,14 @@
   "scripts": {
     "watch": "node ./resources/watch.js",
     "test": "npm run lint && npm run check && npm run testonly",
-    "test:ci": "npm run lint && npm run check && npm run testonly:coveralls",
-    "t": "mocha --require @babel/register --require @babel/polyfill",
-    "testonly": "mocha --throw-deprecation --require @babel/register --require @babel/polyfill --check-leaks --full-trace --timeout 15000 src/**/__tests__/**/*-test.js",
-    "testonly:cover": "nyc --reporter html --reporter text-summary -- npm run testonly",
-    "testonly:coveralls": "nyc --silent -- npm run testonly && nyc report --reporter text-lcov | coveralls",
-    "lint": "eslint --report-unused-disable-directives src || (printf '\\033[33mTry: \\033[7m npm run lint -- --fix \\033[0m\\n' && exit 1)",
+    "test:ci": "npm run lint -- --no-cache && npm run check && npm run testonly:cover",
+    "testonly": "mocha --full-trace src/**/__tests__/**/*-test.js",
+    "testonly:cover": "nyc --clean --skip-full --reporter json --reporter html --reporter text -- npm run testonly",
+    "lint": "eslint --cache --report-unused-disable-directives src",
     "benchmark": "node ./resources/benchmark.js",
     "prettier": "prettier --write --list-different 'src/**/*.js'",
     "check": "flow check",
-    "check-cover": "for file in {src/*.js,src/**/*.js}; do echo $file; flow coverage $file; done",
+    "check-cover": "flow batch-coverage --quiet --strip-root --show-all src/ && flow stop --quiet",
     "build": "npm run build:clean && npm run build:cp && npm run build:package-json && npm run build:cjs && npm run build:mjs && npm run build:flow",
     "build:clean": "rm -rf ./dist && mkdir ./dist",
     "build:cp": "cp README.md LICENSE ./dist",
@@ -51,23 +49,21 @@
   },
   "devDependencies": {
     "@babel/cli": "7.2.3",
-    "@babel/core": "7.2.2",
-    "@babel/plugin-transform-flow-strip-types": "7.2.3",
-    "@babel/polyfill": "7.2.5",
-    "@babel/preset-env": "7.2.3",
-    "@babel/register": "7.0.0",
+    "@babel/core": "7.4.0",
+    "@babel/plugin-transform-flow-strip-types": "7.4.0",
+    "@babel/polyfill": "7.4.0",
+    "@babel/preset-env": "7.4.2",
+    "@babel/register": "7.4.0",
     "babel-eslint": "10.0.1",
-    "beautify-benchmark": "0.2.4",
     "benchmark": "2.1.4",
     "chai": "4.2.0",
-    "coveralls": "3.0.2",
-    "eslint": "5.12.0",
-    "eslint-plugin-flowtype": "3.2.1",
+    "eslint": "5.15.3",
+    "eslint-plugin-flowtype": "3.4.2",
     "eslint-plugin-prettier": "3.0.1",
-    "flow-bin": "0.90.0",
-    "mocha": "5.2.0",
-    "nyc": "13.1.0",
-    "prettier": "1.15.3",
-    "sane": "4.0.2"
+    "flow-bin": "0.95.1",
+    "mocha": "6.0.2",
+    "nyc": "13.3.0",
+    "prettier": "1.16.4",
+    "sane": "4.1.0"
   }
 }

resources/benchmark.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -9,8 +9,7 @@
 
 'use strict';
 
-const { Suite } = require('benchmark');
-const beautifyBenchmark = require('beautify-benchmark');
+const { Benchmark } = require('benchmark');
 const { execSync } = require('child_process');
 const os = require('os');
 const fs = require('fs');
@@ -80,28 +79,80 @@ function findFiles(cwd, pattern) {
 
 // Run a given benchmark test with the provided revisions.
 function runBenchmark(benchmark, environments) {
-  const modules = environments.map(({ distPath }) =>
-    require(path.join(distPath, benchmark))
-  );
-  const suite = new Suite(modules[0].name, {
-    onStart(event) {
-      console.log('⏱️  ' + event.currentTarget.name);
-      beautifyBenchmark.reset();
-    },
-    onCycle(event) {
-      beautifyBenchmark.add(event.target);
-    },
-    onError(event) {
-      console.error(event.target.error);
-    },
-    onComplete() {
-      beautifyBenchmark.log();
-    },
+  let benchmarkName;
+  const benches = environments.map(environment => {
+    const module = require(path.join(environment.distPath, benchmark))
+    benchmarkName = module.name;
+    return new Benchmark(environment.revision, module.measure);
   });
-  for (let i = 0; i < environments.length; i++) {
-    suite.add(environments[i].revision, modules[i].measure);
+
+  console.log('⏱️   ' + benchmarkName);
+  for (let i = 0; i < benches.length; ++i) {
+    benches[i].run({ async: false });
+    process.stdout.write('  ' + cyan(i + 1) + ' tests completed.\u000D');
+  }
+  console.log('\n');
+
+  beautifyBenchmark(benches);
+  console.log('');
+}
+
+function beautifyBenchmark(results) {
+  const benches = results.map(result => ({
+    name: result.name,
+    error: result.error,
+    ops: result.hz,
+    deviation: result.stats.rme,
+    numRuns: result.stats.sample.length,
+  }));
+
+  const nameMaxLen = maxBy(benches, ({ name }) => name.length);
+  const opsTop = maxBy(benches, ({ ops }) => ops);
+  const opsMaxLen = maxBy(benches, ({ ops }) => beautifyNumber(ops).length);
+
+  for (const bench of benches) {
+    if (bench.error) {
+      console.log('  ' + bench.name + ': ' + red(String(bench.error)));
+      continue;
+    }
+
+    const { name, ops, deviation, numRuns } = bench;
+    console.log(
+      '  ' + nameStr() + grey(' x ') + opsStr() + ' ops/sec ' +
+      grey('\xb1') + deviationStr() + cyan('%') +
+      grey(' (' + numRuns + ' runs sampled)')
+    );
+
+    function nameStr() {
+      const nameFmt = name.padEnd(nameMaxLen);
+      return (ops === opsTop) ? green(nameFmt) : nameFmt;
+    }
+
+    function opsStr() {
+      const percent = ops / opsTop;
+      const colorFn = percent > 0.95 ? green : (percent > 0.80 ? yellow : red);
+      return colorFn(beautifyNumber(ops).padStart(opsMaxLen));
+    }
+
+    function deviationStr() {
+      const colorFn = deviation > 5 ? red : (deviation > 2 ? yellow : green);
+      return colorFn(deviation.toFixed(2));
+    }
   }
-  suite.run({ async: false });
+}
+
+function red(str)    { return '\u001b[31m' + str + '\u001b[0m' }
+function green(str)  { return '\u001b[32m' + str + '\u001b[0m' }
+function yellow(str) { return '\u001b[33m' + str + '\u001b[0m' }
+function cyan(str)   { return '\u001b[36m' + str + '\u001b[0m' }
+function grey(str)   { return '\u001b[90m' + str + '\u001b[0m' }
+
+function beautifyNumber(num) {
+  return Number(num.toFixed(num > 100 ? 0 : 2)).toLocaleString();
+}
+
+function maxBy(array, fn) {
+  return Math.max(...array.map(fn));
 }
 
 // Prepare all revisions and run benchmarks matching a pattern against them.

resources/copy-package-json.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

resources/inline-invariant.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.