Convert CommonJS module syntax to ES6

danielrearden · IvanGoncharov · commit 0f74f05cc2d0 · 2020-06-10T00:48:41.000+03:00
diff --git a/README.md b/README.md
@@ -28,7 +28,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();
 
@@ -49,7 +49,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();
 
@@ -196,7 +196,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();
 
@@ -243,7 +243,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();
 
@@ -321,9 +321,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...
 });
 ```
diff --git a/src/__tests__/http-test.js b/src/__tests__/http-test.js
@@ -26,7 +26,7 @@ import {
   parse,
 } from 'graphql';
 
-import graphqlHTTP from '../index';
+import { graphqlHTTP } from '../index';
 
 const QueryRootType = new GraphQLObjectType({
   name: 'QueryRoot',
diff --git a/src/__tests__/usage-test.js b/src/__tests__/usage-test.js
@@ -6,7 +6,7 @@ import { expect } from 'chai';
 import { describe, it } from 'mocha';
 import { GraphQLSchema } from 'graphql';
 
-import graphqlHTTP from '../index';
+import { graphqlHTTP } from '../index';
 
 describe('Useful errors when incorrectly used', () => {
   it('requires an option factory function', () => {
diff --git a/src/index.js b/src/index.js
@@ -184,8 +184,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.');
   }
@@ -456,8 +455,9 @@ 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;
-async function getGraphQLParams(request: $Request): Promise<GraphQLParams> {
+export async function getGraphQLParams(
+  request: $Request,
+): Promise<GraphQLParams> {
   const { url = '' } = request;
   const urlData = new URLSearchParams(url.split('?')[1]);
   const bodyData = await parseBody(request);
diff --git a/types/index.d.ts b/types/index.d.ts
diff --git a/types/test.ts b/types/test.ts
