.eslintrc.yml

@@ -143,7 +143,7 @@ rules:
   import/dynamic-import-chunkname: off
 
   ##############################################################################
-  # ESLint builtin rules list based on `v7.12.x`
+  # ESLint builtin rules list based on `v7.18.x`
   ##############################################################################
 
   # Possible Errors
@@ -185,6 +185,7 @@ rules:
   no-unreachable-loop: error
   no-unsafe-finally: error
   no-unsafe-negation: error
+  no-unsafe-optional-chaining: [error, { disallowArithmeticOperators: true }]
   no-useless-backreference: error
   require-atomic-updates: error
   use-isnan: error
@@ -236,6 +237,7 @@ rules:
   no-new: error
   no-new-func: error
   no-new-wrappers: error
+  no-nonoctal-decimal-escape: error
   no-octal: error
   no-octal-escape: error
   no-param-reassign: error
@@ -504,7 +506,7 @@ overrides:
       - plugin:import/typescript
     rules:
       ##########################################################################
-      # `@typescript-eslint/eslint-plugin` rule list based on `v4.5.x`
+      # `@typescript-eslint/eslint-plugin` rule list based on `v4.13.x`
       ##########################################################################
 
       # Supported Rules
@@ -529,6 +531,7 @@ overrides:
       '@typescript-eslint/naming-convention': off # TODO consider
       '@typescript-eslint/no-base-to-string': error
       '@typescript-eslint/no-confusing-non-null-assertion': error
+      '@typescript-eslint/no-confusing-void-expression': error
       '@typescript-eslint/no-dynamic-delete': off
       '@typescript-eslint/no-empty-interface': error
       '@typescript-eslint/no-explicit-any': off # TODO error
@@ -556,11 +559,13 @@ overrides:
       '@typescript-eslint/no-unnecessary-qualifier': error
       '@typescript-eslint/no-unnecessary-type-arguments': error
       '@typescript-eslint/no-unnecessary-type-assertion': error
+      '@typescript-eslint/no-unnecessary-type-constraint': off # TODO consider
       '@typescript-eslint/no-unsafe-assignment': off # TODO consider
       '@typescript-eslint/no-unsafe-call': off # TODO consider
       '@typescript-eslint/no-unsafe-member-access': off # TODO consider
       '@typescript-eslint/no-unsafe-return': off # TODO consider
       '@typescript-eslint/no-var-requires': error
+      '@typescript-eslint/non-nullable-type-assertion-style': error
       '@typescript-eslint/prefer-as-const': off # TODO consider
       '@typescript-eslint/prefer-enum-initializers': off # TODO consider
       '@typescript-eslint/prefer-for-of': off # TODO switch to error after TS migration
@@ -581,6 +586,7 @@ overrides:
       '@typescript-eslint/restrict-plus-operands':
         [error, { checkCompoundAssignments: true }]
       '@typescript-eslint/restrict-template-expressions': error
+      '@typescript-eslint/sort-type-union-intersection-members': off # TODO consider
       '@typescript-eslint/strict-boolean-expressions': off # TODO consider
       '@typescript-eslint/switch-exhaustiveness-check': error
       '@typescript-eslint/triple-slash-reference': error
@@ -643,6 +649,7 @@ overrides:
 
       # Bellow rules are disabled because coflicts with Prettier, see:
       # https://github.com/prettier/eslint-config-prettier/blob/master/%40typescript-eslint.js
+      '@typescript-eslint/object-curly-spacing': off
       '@typescript-eslint/quotes': off
       '@typescript-eslint/brace-style': off
       '@typescript-eslint/comma-dangle': off
@@ -655,6 +662,7 @@ overrides:
       '@typescript-eslint/no-extra-semi': off
       '@typescript-eslint/semi': off
       '@typescript-eslint/space-before-function-paren': off
+      '@typescript-eslint/space-infix-ops': off
       '@typescript-eslint/type-annotation-spacing': off
   - files: 'src/**/__*__/**'
     rules:

.flowconfig

@@ -39,4 +39,4 @@ experimental.const_params=true
 include_warnings=true
 
 [version]
-^0.136.0
+^0.142.0

.github/workflows/ci.yml

@@ -137,15 +137,15 @@ jobs:
         if: ${{ always() }}
         uses: codecov/codecov-action@v1
         with:
-          file: ./coverage/tests/coverage-final.json
+          file: ./coverage/coverage-final.json
           fail_ci_if_error: true
 
   test:
     name: Run tests on Node v${{ matrix.node_version_to_setup }}
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node_version_to_setup: [10, 12, 14]
+        node_version_to_setup: [10, 12, 14, 15]
     steps:
       - name: Checkout repo
         uses: actions/checkout@v2

.nycrc.yml

@@ -4,7 +4,6 @@ include:
 exclude:
   - 'src/polyfills'
   - '**/*-fuzz.js'
-  - '**/*-benchmark.js'
   - '**/*.d.ts'
   - 'src/validation/rules/ExecutableDefinitions.js'
   - 'src/validation/rules/LoneSchemaDefinition.js'
@@ -16,8 +15,8 @@ exclude:
   - 'src/validation/rules/UniqueOperationTypes.js'
   - 'src/utilities/findDeprecatedUsages.js'
 clean: true
-temp-directory: 'coverage/tests'
-report-dir: 'coverage/tests'
+temp-directory: 'coverage'
+report-dir: 'coverage'
 skip-full: true
 reporter: [json, html, text]
 check-coverage: true

README.md

@@ -115,6 +115,16 @@ directly on this branch:
 npm install graphql@git://github.com/graphql/graphql-js.git#npm
 ```
 
+### Experimental features
+
+Each release of GraphQL.js will be accompanied by an experimental release containing support for the `@defer` and `@stream` directive proposal. We are hoping to get community feedback on these releases before the proposal is accepted into the GraphQL specification. You can use this experimental release of GraphQL.js by adding the following to your project's `package.json` file.
+
+```
+"graphql": "experimental-stream-defer"
+```
+
+Community feedback on this experimental release is much appreciated and can be provided on the [issue created for this purpose](https://github.com/graphql/graphql-js/issues/2848).
+
 ### Using in a Browser
 
 GraphQL.js is a general-purpose library and can be used both in a Node server

benchmark/benchmark.js

@@ -31,10 +31,11 @@ function exec(command, options = {}) {
 // and returns path to its 'dist' directory.
 function prepareBenchmarkProjects(revisionList) {
   const tmpDir = path.join(os.tmpdir(), 'graphql-js-benchmark');
-  fs.mkdirSync(tmpDir, { recursive: true });
+  fs.rmdirSync(tmpDir, { recursive: true, force: true });
+  fs.mkdirSync(tmpDir);
 
   const setupDir = path.join(tmpDir, 'setup');
-  fs.rmdirSync(setupDir, { recursive: true });
+  fs.rmdirSync(setupDir, { recursive: true, force: true });
   fs.mkdirSync(setupDir);
 
   return revisionList.map((revision) => {
@@ -72,12 +73,12 @@ function prepareBenchmarkProjects(revisionList) {
     }
 
     const repoDir = path.join(tmpDir, hash);
-    fs.rmdirSync(repoDir, { recursive: true });
+    fs.rmdirSync(repoDir, { recursive: true, force: true });
     fs.mkdirSync(repoDir);
     exec(`git archive "${hash}" | tar -xC "${repoDir}"`);
     exec('npm --quiet ci', { cwd: repoDir });
     fs.renameSync(buildNPMArchive(repoDir), archivePath);
-    fs.rmdirSync(repoDir, { recursive: true });
+    fs.rmdirSync(repoDir, { recursive: true, force: true });
     return archivePath;
   }
 

integrationTests/integration-test.js

@@ -17,7 +17,7 @@ function exec(command, options = {}) {
 
 describe('Integration Tests', () => {
   const tmpDir = path.join(os.tmpdir(), 'graphql-js-integrationTmp');
-  fs.rmdirSync(tmpDir, { recursive: true });
+  fs.rmdirSync(tmpDir, { recursive: true, force: true });
   fs.mkdirSync(tmpDir);
 
   const distDir = path.resolve('./npmDist');

integrationTests/node/package.json

@@ -7,6 +7,7 @@
     "graphql": "file:../graphql.tgz",
     "node-10": "npm:node@10.x.x",
     "node-12": "npm:node@12.x.x",
-    "node-14": "npm:node@14.x.x"
+    "node-14": "npm:node@14.x.x",
+    "node-15": "npm:node@15.x.x"
   }
 }

integrationTests/ts/package.json

@@ -19,6 +19,7 @@
     "typescript-3.7": "npm:typescript@3.7.x",
     "typescript-3.8": "npm:typescript@3.8.x",
     "typescript-3.9": "npm:typescript@3.9.x",
-    "typescript-4.0": "npm:typescript@4.0.x"
+    "typescript-4.0": "npm:typescript@4.0.x",
+    "typescript-4.1": "npm:typescript@4.1.x"
   }
 }