Remove use of Array.prototype.includes to support older runtimes (apo…

…llographql#73)

Also removes `babel-polyfill` in favor of `transform-runtime` to surface these runtime-specific issues in testing.

CHANGELOG.md

@@ -1,6 +1,7 @@
 # Change log
 
 ### vNEXT
+- Fix template env for older runtimes (eg. node 5 and earlier) [Justin Schulz](https://github.com/PepperTeasdale) in [#73](https://github.com/apollographql/eslint-plugin-graphql/pull/73)
 
 ### v0.8.2
 - Remove `KnownFragmentNames` and `UnusedFragment` from default rules in `literal` env. [Justin Schulz](https://github.com/PepperTeasdale) in [#70](https://github.com/apollographql/eslint-plugin-graphql/pull/70)

package.json

@@ -19,7 +19,7 @@
     "babel-cli": "^6.7.7",
     "babel-core": "^6.7.7",
     "babel-eslint": "^7.2.3",
-    "babel-polyfill": "^6.7.4",
+    "babel-plugin-transform-runtime": "^6.23.0",
     "babel-preset-es2015": "^6.6.0",
     "babel-preset-stage-0": "^6.5.0",
     "eslint": "^3.17.0",

src/index.js

@@ -12,6 +12,7 @@ import {
   last,
   reduce,
   without,
+  includes,
 } from 'lodash';
 
 import * as customRules from './rules';
@@ -421,7 +422,7 @@ const gqlProcessor = {
   postprocess: function(messages) {
     // only report graphql-errors
     return flatten(messages).filter((message) => {
-      return keys(rules).map((key) => `graphql/${key}`).includes(message.ruleId);
+      return includes(keys(rules).map((key) => `graphql/${key}`), message.ruleId);
     })
   }
 }

test/index.js

@@ -1,7 +1,9 @@
 // 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-polyfill');
+require('babel-core').transform('code', {
+  plugins: ['transform-runtime']
+});
 
 // The tests, however, can and should be written with ECMAScript 2015.
 require('./makeRule');

test/makeRule.js

@@ -2,6 +2,11 @@ import { rules } from '../src';
 import { RuleTester } from 'eslint';
 import schemaJson from './schema.json';
 import path from 'path';
+import {
+  includes,
+  values,
+  entries,
+} from 'lodash';
 
 const schemaJsonFilepath = path.resolve(__dirname, './schema.json');
 const secondSchemaJsonFilepath = path.resolve(__dirname, './second-schema.json');
@@ -823,8 +828,8 @@ const requiredFieldsTestCases = {
     validators: 'all',
   }];
   ruleTester.run('enabled all validators', rule, {
-    valid: Object.values(validatorCases).map(({pass: code}) => ({options, parserOptions, code})),
-    invalid: Object.values(validatorCases).map(({fail: code, errors}) => ({options, parserOptions, code, errors})),
+    valid: values(validatorCases).map(({pass: code}) => ({options, parserOptions, code})),
+    invalid: values(validatorCases).map(({fail: code, errors}) => ({options, parserOptions, code, errors})),
   });
 
   options = [{
@@ -833,8 +838,8 @@ const requiredFieldsTestCases = {
   }];
   ruleTester.run('disabled all validators', rule, {
     valid: [].concat(
-      Object.values(validatorCases).map(({pass: code}) => code),
-      Object.values(validatorCases).map(({fail: code}) => code),
+      values(validatorCases).map(({pass: code}) => code),
+      values(validatorCases).map(({fail: code}) => code),
     ).map(code => ({options, parserOptions, code})),
     invalid: [],
   });
@@ -843,19 +848,19 @@ const requiredFieldsTestCases = {
   // that can fail. (Excluding test cases that include this validation rule as
   // 'alsoBreaks'…sometimes it's hard to make a test that fails exactly one
   // validator).
-  for (const [validatorName, {pass, fail, errors}] of Object.entries(validatorCases)) {
+  for (const [validatorName, {pass, fail, errors}] of entries(validatorCases)) {
     options = [{
       schemaJson, tagName: 'gql',
       validators: [validatorName],
     }];
     const otherValidators = (
-      Object.entries(validatorCases)
-        .filter(([otherValidatorName, {alsoBreaks}]) => otherValidatorName !== validatorName && !(alsoBreaks || []).includes(validatorName))
+      entries(validatorCases)
+        .filter(([otherValidatorName, {alsoBreaks}]) => otherValidatorName !== validatorName && !includes((alsoBreaks || []), validatorName))
         .map(([name, testCases]) => testCases)
     );
     ruleTester.run(`enabled only ${validatorName} validator`, rule, {
       valid: [].concat(
-        Object.values(validatorCases).map(({pass: code}) => code),
+        values(validatorCases).map(({pass: code}) => code),
         otherValidators.map(({fail: code}) => code),
       ).map(code => ({options, parserOptions, code})),
       invalid: [{options, parserOptions, errors, code: fail}],
@@ -867,8 +872,8 @@ const requiredFieldsTestCases = {
     schemaJson, tagName: 'gql',
   }];
   ruleTester.run('testing named-operations rule', rules['named-operations'], {
-    valid: Object.values(namedOperationsValidatorCases).map(({pass: code}) => ({options, parserOptions, code})),
-    invalid: Object.values(namedOperationsValidatorCases).map(({fail: code, errors}) => ({options, parserOptions, code, errors})),
+    valid: values(namedOperationsValidatorCases).map(({pass: code}) => ({options, parserOptions, code})),
+    invalid: values(namedOperationsValidatorCases).map(({fail: code, errors}) => ({options, parserOptions, code, errors})),
   });
 
   // Validate the required-fields rule

yarn.lock

@@ -633,14 +633,20 @@ babel-plugin-transform-regenerator@^6.24.1:
   dependencies:
     regenerator-transform "0.9.11"
 
+babel-plugin-transform-runtime@^6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-runtime/-/babel-plugin-transform-runtime-6.23.0.tgz#88490d446502ea9b8e7efb0fe09ec4d99479b1ee"
+  dependencies:
+    babel-runtime "^6.22.0"
+
 babel-plugin-transform-strict-mode@^6.24.1:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz#d5faf7aa578a65bbe591cf5edae04a0c67020758"
   dependencies:
     babel-runtime "^6.22.0"
     babel-types "^6.24.1"
 
-babel-polyfill@^6.23.0, babel-polyfill@^6.7.4:
+babel-polyfill@^6.23.0:
   version "6.23.0"
   resolved "https://registry.yarnpkg.com/babel-polyfill/-/babel-polyfill-6.23.0.tgz#8364ca62df8eafb830499f699177466c3b03499d"
   dependencies: