Drop Node 8. Support GraphQL 15. Update Babel 7 & ESLint 6.8

.babelrc.js

@@ -0,0 +1,4 @@
+module.exports = {
+  presets: ['@babel/preset-env'],
+  plugins: ['@babel/plugin-transform-runtime'],
+};

.tav.yml

@@ -1,4 +1,4 @@
 
 graphql:
-  versions: ^0.12.0  || ^0.13.0 || ^14.0.0
+  versions: ^0.12.0  || ^0.13.0 || ^14.0.0 || ^15.0.0
   commands: mocha test/index.js

.travis.yml

@@ -1,7 +1,7 @@
 language: node_js
 node_js:
-  - "8"
   - "10"
+  - "12"
 install:
   - npm install
 

CHANGELOG.md

@@ -3,6 +3,7 @@
 ### vNEXT
 
 - Improve identity template literal tag docs. [PR #254](https://github.com/apollographql/eslint-plugin-graphql/pull/254) by [Jayden Seric](https://github.com/jaydenseric).
+- Add support for GraphQL 15. Update all `devDependencies` - upgrades the project to use Babel 7 and ESLint 6. [PR #271](https://github.com/apollographql/eslint-plugin-graphql/pull/271) by [Scott Taylor](https://github.com/staylor).
 
 ### v3.1.1
 

package.json

@@ -7,7 +7,7 @@
   "scripts": {
     "test": "tav --ci && mocha test/index.js",
     "prepublish": "babel ./src --ignore test --out-dir ./lib",
-    "pretest": "node test/updateSchemaJson.js",
+    "pretest": "babel-node test/updateSchemaJson.js",
     "tav": "tav",
     "lint": "eslint 'src/**/*.js' 'test/**/*.js'"
   },
@@ -17,39 +17,36 @@
     "url": "git+https://github.com/apollostack/eslint-plugin-graphql.git"
   },
   "devDependencies": {
-    "babel-cli": "6.26.0",
-    "babel-core": "6.26.3",
-    "babel-eslint": "10.0.1",
-    "babel-plugin-transform-runtime": "6.23.0",
-    "babel-preset-es2015": "6.24.1",
-    "babel-preset-stage-0": "6.24.1",
-    "eslint": "5.16.0",
-    "graphql": "14.4.2",
-    "graphql-tools": "4.0.5",
-    "mocha": "6.2.0",
-    "pretty-quick": "1.11.1",
+    "@babel/cli": "7.10.1",
+    "@babel/core": "7.10.1",
+    "@babel/node": "7.10.1",
+    "@babel/plugin-transform-runtime": "7.10.1",
+    "@babel/preset-env": "7.10.1",
+    "@babel/register": "7.9.0",
+    "babel-eslint": "10.1.0",
+    "eslint": "6.8.0",
+    "graphql": "15.0.0",
+    "graphql-tools": "6.0.3",
+    "mocha": "7.2.0",
+    "pretty-quick": "2.0.1",
     "test-all-versions": "4.1.1"
   },
-  "babel": {
-    "presets": [
-      "es2015",
-      "stage-0"
-    ]
-  },
   "husky": {
     "hooks": {
       "pre-commit": "pretty-quick --staged"
     }
   },
   "engines": {
-    "node": ">=6.0"
+    "node": ">=10.0"
   },
   "license": "MIT",
   "dependencies": {
-    "graphql-config": "^2.0.1",
-    "lodash": "^4.11.1"
+    "@babel/runtime": "^7.10.0",
+    "graphql-config": "^3.0.2",
+    "lodash.flatten": "^4.4.0",
+    "lodash.without": "^4.4.0"
   },
   "peerDependencies": {
-    "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0"
+    "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0"
   }
 }

src/index.js

@@ -6,9 +6,10 @@ import {
   specifiedRules as allGraphQLValidators
 } from "graphql";
 
-import { flatten, keys, reduce, without, includes } from "lodash";
+import flatten from "lodash.flatten";
+import without from "lodash.without";
 
-import { getGraphQLConfig, ConfigNotFoundError } from "graphql-config";
+import { loadConfigSync, ConfigNotFoundError, ProjectNotFoundError } from "graphql-config";
 
 import * as customRules from "./customGraphQLValidationRules";
 import { internalTag } from "./constants";
@@ -21,34 +22,54 @@ const envGraphQLValidatorNames = {
   apollo: without(
     allGraphQLValidatorNames,
     "KnownFragmentNames",
-    "NoUnusedFragments"
+    "NoUnusedFragments",
+    // `graphql`@15
+    "KnownFragmentNamesRule",
+    "NoUnusedFragmentsRule"
   ),
   lokka: without(
     allGraphQLValidatorNames,
     "KnownFragmentNames",
-    "NoUnusedFragments"
+    "NoUnusedFragments",
+    // `graphql`@15
+    "KnownFragmentNamesRule",
+    "NoUnusedFragmentsRule"
   ),
   fraql: without(
     allGraphQLValidatorNames,
     "KnownFragmentNames",
-    "NoUnusedFragments"
+    "NoUnusedFragments",
+    // `graphql`@15
+    "KnownFragmentNamesRule",
+    "NoUnusedFragmentsRule"
   ),
   relay: without(
     allGraphQLValidatorNames,
     "KnownDirectives",
     "KnownFragmentNames",
     "NoUndefinedVariables",
     "NoUnusedFragments",
+    // `graphql`@15
+    "KnownDirectivesRule",
+    "KnownFragmentNamesRule",
+    "NoUndefinedVariablesRule",
+    "NoUnusedFragmentsRule",
     // `graphql` < 14
     "ProvidedNonNullArguments",
     // `graphql`@14
     "ProvidedRequiredArguments",
-    "ScalarLeafs"
+    "ScalarLeafs",
+    // `graphql`@15
+    "ProvidedRequiredArgumentsRule",
+    "ScalarLeafsRule"
   ),
   literal: without(
     allGraphQLValidatorNames,
     "KnownFragmentNames",
-    "NoUnusedFragments"
+    "NoUnusedFragments",
+    // `graphql`@15
+    "KnownFragmentNamesRule",
+    "NoUnusedFragmentsRule"
   )
 };
 
@@ -268,23 +289,34 @@ function parseOptions(optionGroup, context) {
     schema = initSchemaFromString(schemaString);
   } else {
     try {
-      const config = getGraphQLConfig(path.dirname(context.getFilename()));
+      const config = loadConfigSync({
+        rootDir: path.resolve(
+          process.cwd(),
+          path.dirname(context.getFilename())
+        )
+      });
       let projectConfig;
       if (projectName) {
-        projectConfig = config.getProjects()[projectName];
+        projectConfig = config.getProject(projectName);
         if (!projectConfig) {
           throw new Error(
-            `Project with name "${projectName}" not found in ${config.configPath}.`
+            `Project with name "${projectName}" not found in ${config.filepath}.`
           );
         }
       } else {
-        projectConfig = config.getConfigForFile(context.getFilename());
+        try {
+          projectConfig = config.getProjectForFile(context.getFilename());
+        } catch (e) {
+          if (!(e instanceof ProjectNotFoundError)) {
+            throw e;
+          }
+        }
       }
       if (projectConfig) {
-        const key = `${config.configPath}[${projectConfig.projectName}]`;
+        const key = `${config.filepath}[${projectConfig.name}]`;
         schema = projectCache[key];
         if (!schema) {
-          schema = projectConfig.getSchema();
+          schema = projectConfig.getSchemaSync();
           projectCache[key] = schema;
         }
       }
@@ -294,7 +326,7 @@ function parseOptions(optionGroup, context) {
     } catch (e) {
       if (e instanceof ConfigNotFoundError) {
         throw new Error(
-          "Must provide .graphqlconfig file or pass in `schemaJson` option " +
+          "Must provide GraphQL Config file or pass in `schemaJson` option " +
             "with schema object or `schemaJsonFilepath` with absolute path to the json file."
         );
       }
@@ -385,14 +417,13 @@ const gqlProcessor = {
   },
   postprocess: function(messages) {
     // only report graphql-errors
-    return flatten(messages).filter(message => {
-      return includes(keys(rules).map(key => `graphql/${key}`), message.ruleId);
-    });
+    return flatten(messages).filter(message =>
+      Object.keys(rules).map(key => `graphql/${key}`).includes(message.ruleId)
+    );
   }
 };
 
-export const processors = reduce(
-  gqlFiles,
+export const processors = gqlFiles.reduce(
   (result, value) => {
     return { ...result, [`.${value}`]: gqlProcessor };
   },

test/customTagName.js

@@ -1,4 +1,5 @@
 import schemaJson from './schema.json';
+import { isGraphQL15 } from './helpers';
 
 import {
   rule,
@@ -25,7 +26,7 @@ ruleTester.run('custom tag name', rule, {
       parserOptions,
       code: 'const x = myGraphQLTag``',
       errors: [{
-        message: 'Syntax Error: Unexpected <EOF>',
+        message: isGraphQL15 ? 'Syntax Error: Unexpected <EOF>.' : 'Syntax Error: Unexpected <EOF>',
         type: 'TaggedTemplateExpression'
       }]
     },

test/default.js

@@ -1,3 +1,4 @@
+import { isGraphQL15 } from './helpers';
 import schemaJson from './schema.json';
 
 import {
@@ -45,7 +46,7 @@ ruleTester.run('default options', rule, {
       parserOptions,
       code: 'const x = gql``',
       errors: [{
-        message: 'Syntax Error: Unexpected <EOF>',
+        message: isGraphQL15 ? 'Syntax Error: Unexpected <EOF>.' : 'Syntax Error: Unexpected <EOF>',
         type: 'TaggedTemplateExpression'
       }]
     },

test/env/apollo.js

@@ -1,3 +1,4 @@
+import { isGraphQL15 } from '../helpers';
 import schemaJson from '../schema.json';
 
 import {
@@ -34,7 +35,7 @@ ruleTester.run('apollo', rule, {
       parserOptions,
       code: 'const x = gql`query }{ ${x}`',
       errors: [{
-        message: 'Syntax Error: Expected {, found }',
+        message: isGraphQL15 ? 'Syntax Error: Expected "{", found "}".' : 'Syntax Error: Expected {, found }',
         type: 'TaggedTemplateExpression'
       }]
     }

test/env/lokka.js

@@ -1,3 +1,4 @@
+import { isGraphQL15 } from '../helpers';
 import schemaJson from '../schema.json';
 
 import {
@@ -111,7 +112,9 @@ ruleTester.run('lokka', rule, {
         \`);
       `,
       errors: [{
-        message: 'Unknown argument "wrongArg" on field "director" of type "Film".',
+        message: isGraphQL15 ?
+          'Unknown argument "wrongArg" on field "Film.director".' :
+          'Unknown argument "wrongArg" on field "director" of type "Film".',
         type: 'TaggedTemplateExpression',
         line: 5,
         column: 22

test/env/relay.js

@@ -13,7 +13,7 @@ const options = [
 ];
 
 // Need this to support statics
-const parser = 'babel-eslint';
+const parser = require.resolve('babel-eslint');
 
 ruleTester.run('relay', rule, {
   valid: [

test/graphqlconfig/multiproject-literal/graphql.config.json

@@ -0,0 +1,12 @@
+{
+  "projects": {
+    "gql": {
+      "schema": "../../schema.graphql",
+      "include": ["first.graphql"]
+    },
+    "swapi": {
+      "schema": "../../second-schema.graphql",
+      "include": ["second.graphql"]
+    }
+  }
+}

test/graphqlconfig/multiproject/.graphqlconfig

@@ -1,10 +1,10 @@
 {
   "projects": {
     "gql": {
-      "schemaPath": "../../schema.graphql"
+      "schema": "../../schema.graphql"
     },
     "swapi": {
-      "schemaPath": "../../second-schema.graphql"
+      "schema": "../../second-schema.graphql"
     }
   }
 }

test/graphqlconfig/simple/graphql.config.json

@@ -0,0 +1,3 @@
+{
+  "schema": "../../schema.graphql"
+}

test/helpers.js

@@ -2,16 +2,26 @@ import { rules } from '../src';
 import { RuleTester } from 'eslint';
 import schemaJson from './schema.json';
 import path from 'path';
-import { printSchema, buildClientSchema, specifiedRules as allGraphQLValidators } from 'graphql';
+import * as graphql from 'graphql';
 
+const { printSchema, buildClientSchema, specifiedRules: allGraphQLValidators } = graphql;
+
+export const isGraphQL15 = graphql.versionInfo && graphql.versionInfo.major >= 15;
 
 export const schemaJsonFilepath = path.resolve(__dirname, './schema.json');
 export const secondSchemaJsonFilepath = path.resolve(__dirname, './second-schema.json');
 export const schemaString = printSchema(buildClientSchema(schemaJson.data))
 
 const allGraphQLValidatorNames = allGraphQLValidators.map(rule => rule.name);
-export const requiredArgumentRuleName = allGraphQLValidatorNames.includes('ProvidedRequiredArguments') ?
-  'ProvidedRequiredArguments':'ProvidedNonNullArguments';
+
+let requiredArgumentRule = 'ProvidedNonNullArguments';
+if (allGraphQLValidatorNames.includes('ProvidedRequiredArgumentsRule')) {
+  requiredArgumentRule = 'ProvidedRequiredArgumentsRule';
+} else if (allGraphQLValidatorNames.includes('ProvidedRequiredArguments')) {
+  requiredArgumentRule = 'ProvidedRequiredArguments';
+}
+
+export const requiredArgumentRuleName = requiredArgumentRule;
 
 // Init rule
 

test/index.js

@@ -1,11 +1,5 @@
-// This file cannot be written with ECMAScript 2015 because it has to load
-// the Babel require hook to enable ECMAScript 2015 features!
-require('babel-core/register');
-require('babel-core').transform('code', {
-  plugins: ['transform-runtime']
-});
+require('@babel/register');
 
-// The tests, however, can and should be written with ECMAScript 2015.
 require('./makeProcessors');
 require('./graphqlconfig/');
 require('./env');