Support native ESM via .mjs.

.babelrc.js

@@ -0,0 +1,14 @@
+module.exports = {
+  presets: [
+    [
+      'env',
+      {
+        modules: process.env.ESM ? false : 'commonjs',
+        targets: {
+          node: require('./package.json').engines.node.substring(2), // Strip `>=`
+        },
+      },
+    ],
+  ],
+  plugins: ['transform-class-properties', 'transform-flow-strip-types']
+};

.travis.yml

@@ -2,10 +2,8 @@ language: node_js
 
 # https://github.com/nodejs/LTS
 node_js:
-  - "8"
-  - "7"
+  - "node"
   - "6"
-  - "4"
 
 git:
   depth: 5

README.md

@@ -19,7 +19,7 @@ Just mount `express-graphql` as a route handler:
 
 ```js
 const express = require('express');
-const graphqlHTTP = require('express-graphql');
+const { graphqlHTTP } = require('express-graphql');
 
 const app = express();
 
@@ -38,7 +38,7 @@ Use `.get` or `.post` (or both) rather than `.use` to configure your route handl
 
 ```js
 const restify = require('restify');
-const graphqlHTTP = require('express-graphql');
+const { graphqlHTTP } = require('express-graphql');
 
 const app = restify.createServer();
 
@@ -162,7 +162,7 @@ This example uses [`express-session`][] to provide GraphQL with the currently lo
 
 ```js
 const session = require('express-session');
-const graphqlHTTP = require('express-graphql');
+const { graphqlHTTP } = require('express-graphql');
 
 const app = express();
 
@@ -207,7 +207,7 @@ This example illustrates adding the amount of time consumed by running the
 provided query, which could perhaps be used by your development tools.
 
 ```js
-const graphqlHTTP = require('express-graphql');
+const { graphqlHTTP } = require('express-graphql');
 
 const app = express();
 
@@ -273,9 +273,9 @@ running a GraphQL request. This function is used internally to handle the
 incoming request, you may use it directly for building other similar services.
 
 ```js
-const graphqlHTTP = require('express-graphql');
+const { getGraphQLParams } = require('express-graphql');
 
-graphqlHTTP.getGraphQLParams(request).then(params => {
+getGraphQLParams(request).then(params => {
   // do something...
 })
 ```

examples/index.js

@@ -8,7 +8,7 @@
  */
 
 import express from 'express';
-import graphqlHTTP from '../src/';
+import { graphqlHTTP } from '../src/';
 import { buildSchema } from 'graphql';
 
 // Construct a schema, using GraphQL schema language

package.json

@@ -19,7 +19,11 @@
     "middleware",
     "api"
   ],
-  "main": "dist/index.js",
+  "engines": {
+    "node": ">=6"
+  },
+  "main": "dist/index",
+  "module": "dist/index.mjs",
   "directories": {
     "lib": "./dist"
   },
@@ -34,26 +38,25 @@
   },
   "babel": {
     "presets": [
-      "es2015"
-    ],
-    "plugins": [
-      "transform-class-properties",
-      "transform-flow-strip-types"
+      "./.babelrc.js"
     ]
   },
   "scripts": {
-    "prepublish": ". ./resources/prepublish.sh",
     "test": "npm run lint && npm run check && npm run testonly",
     "testonly": "mocha $npm_package_options_mocha",
     "lint": "eslint src",
     "prettier": "prettier --write 'src/**/*.js'",
     "check": "flow check",
-    "build": "rm -rf dist/* && babel src --ignore __tests__ --out-dir dist && npm run build:flow",
+    "build": "npm run build:clean && npm run build:esm && npm run build:cjs && npm run build:flow",
+    "build:clean": "rm -rf dist/*",
+    "build:esm": "ESM=1 babel src -d dist/esm --ignore __tests__ && for file in $(find dist/esm -name '*.js'); do mv \"$file\" `echo \"$file\" | sed 's/dist\\/esm/dist/g; s/.js$/.mjs/g'`; done && rm -rf dist/esm",
+    "build:cjs": "babel src -d dist --ignore __tests__",
     "build:flow": "find ./src -name '*.js' -not -path '*/__tests__*' | while read filepath; do cp $filepath `echo $filepath | sed 's/\\/src\\//\\/dist\\//g'`.flow; done",
     "watch": "node resources/watch.js",
     "cover": "babel-node node_modules/.bin/isparta cover --root src --report html node_modules/.bin/_mocha -- $npm_package_options_mocha",
     "cover:lcov": "babel-node node_modules/.bin/isparta cover --root src --report lcovonly node_modules/.bin/_mocha -- $npm_package_options_mocha",
     "preversion": "npm test",
+    "prepublish": ". ./resources/prepublish.sh",
     "start": "babel-node examples/index.js"
   },
   "dependencies": {
@@ -69,7 +72,7 @@
     "babel-plugin-transform-class-properties": "6.24.1",
     "babel-plugin-transform-flow-strip-types": "6.22.0",
     "babel-plugin-transform-runtime": "^6.23.0",
-    "babel-preset-es2015": "6.24.1",
+    "babel-preset-env": "^1.6.1",
     "babel-register": "^6.26.0",
     "babel-runtime": "^6.26.0",
     "body-parser": "1.18.2",

src/__tests__/http-test.js

@@ -30,7 +30,7 @@ import {
   GraphQLError,
   BREAK,
 } from 'graphql';
-import graphqlHTTP from '../';
+import { graphqlHTTP } from '../';
 
 const QueryRootType = new GraphQLObjectType({
   name: 'QueryRoot',

src/__tests__/usage-test.js

@@ -12,7 +12,7 @@ import { describe, it } from 'mocha';
 import request from 'supertest';
 import express from 'express';
 import { GraphQLSchema } from 'graphql';
-import graphqlHTTP from '../';
+import { graphqlHTTP } from '../';
 
 describe('Useful errors when incorrectly used', () => {
   it('requires an option factory function', () => {

src/index.js

@@ -139,8 +139,7 @@ type Middleware = (request: $Request, response: $Response) => Promise<void>;
  * Middleware for express; takes an options object or function as input to
  * configure behavior, and returns an express middleware.
  */
-module.exports = graphqlHTTP;
-function graphqlHTTP(options: Options): Middleware {
+export function graphqlHTTP(options: Options): Middleware {
   if (!options) {
     throw new Error('GraphQL middleware requires options.');
   }
@@ -390,8 +389,7 @@ export type GraphQLParams = {
  * Provided a "Request" provided by express or connect (typically a node style
  * HTTPClientRequest), Promise the GraphQL request parameters.
  */
-module.exports.getGraphQLParams = getGraphQLParams;
-function getGraphQLParams(request: $Request): Promise<GraphQLParams> {
+export function getGraphQLParams(request: $Request): Promise<GraphQLParams> {
   return parseBody(request).then(bodyData => {
     const urlData = (request.url && url.parse(request.url, true).query) || {};
     return parseGraphQLParams(urlData, bodyData);