WIP

integrationTests/integration-test.js

@@ -53,9 +53,7 @@ describe('Integration Tests', () => {
   }
 
   testOnNodeProject('ts');
-  testOnNodeProject('ts-esm');
   testOnNodeProject('node');
   testOnNodeProject('node-esm');
   testOnNodeProject('webpack');
-  testOnNodeProject('webpack-esm');
 });

integrationTests/node-esm/index.js

@@ -1,21 +1,20 @@
 /* eslint-disable node/no-missing-import, import/no-unresolved */
 
 import { deepStrictEqual, strictEqual } from 'assert';
-import { readFileSync } from 'fs';
 
 // Regular import
 import { graphqlSync } from 'graphql';
-// import with explicit extension
+// Import with explicit extension
 import { version } from 'graphql/version.js';
 // _/index.js import
 import { buildSchema } from 'graphql/utilities';
-// import without explicit extension
+// Import without explicit extension
 import { isPromise } from 'graphql/jsutils/isPromise';
 
-deepStrictEqual(
-  version,
-  JSON.parse(readFileSync('./node_modules/graphql/package.json')).version,
-);
+// Import package.json
+import pkg from 'graphql/package.json';
+
+deepStrictEqual(version, pkg.version);
 
 const schema = buildSchema('type Query { hello: String }');
 
@@ -33,3 +32,8 @@ deepStrictEqual(result, {
 });
 
 strictEqual(isPromise(Promise.resolve()), true);
+
+// The possible promise rejection is handled by "--unhandled-rejections=strict"
+import('graphql/jsutils/isPromise').then(({ isPromise }) => {
+  strictEqual(isPromise(Promise.resolve()), true);
+});

integrationTests/node-esm/test.js

@@ -14,5 +14,9 @@ for (const version of nodeVersions) {
   console.log(`Testing on ${version} ...`);
 
   const nodePath = resolve('node_modules', version, 'bin/node');
-  execSync(nodePath + ' index.js', { stdio: 'inherit' });
+  execSync(
+    nodePath +
+      ' --experimental-json-modules --unhandled-rejections=strict index.js',
+    { stdio: 'inherit' },
+  );
 }

integrationTests/ts-esm/basic-test.ts → integrationTests/ts/esm.ts

@@ -1,34 +1,38 @@
-import type { ExecutionResult } from 'graphql/execution';
-
-import { graphqlSync } from 'graphql';
-import { GraphQLString, GraphQLSchema, GraphQLObjectType } from 'graphql/type';
-
-const queryType: GraphQLObjectType = new GraphQLObjectType({
-  name: 'Query',
-  fields: () => ({
-    sayHi: {
-      type: GraphQLString,
-      args: {
-        who: {
-          type: GraphQLString,
-          defaultValue: 'World',
-        },
-      },
-      resolve(_root, args: { who: string }) {
-        return 'Hello ' + args.who;
-      },
-    },
-  }),
-});
-
-const schema: GraphQLSchema = new GraphQLSchema({ query: queryType });
-
-const result: ExecutionResult = graphqlSync({
-  schema,
-  source: `
-    query helloWho($who: String){
-      test(who: $who)
-    }
-  `,
-  variableValues: { who: 'Dolly' },
-});
+import type { ExecutionResult } from 'graphql-esm/execution';
+
+import { graphqlSync } from 'graphql-esm';
+import {
+  GraphQLString,
+  GraphQLSchema,
+  GraphQLObjectType,
+} from 'graphql-esm/type';
+
+const queryType: GraphQLObjectType = new GraphQLObjectType({
+  name: 'Query',
+  fields: () => ({
+    sayHi: {
+      type: GraphQLString,
+      args: {
+        who: {
+          type: GraphQLString,
+          defaultValue: 'World',
+        },
+      },
+      resolve(_root, args: { who: string }) {
+        return 'Hello ' + args.who;
+      },
+    },
+  }),
+});
+
+const schema: GraphQLSchema = new GraphQLSchema({ query: queryType });
+
+const result: ExecutionResult = graphqlSync({
+  schema,
+  source: `
+    query helloWho($who: String){
+      test(who: $who)
+    }
+  `,
+  variableValues: { who: 'Dolly' },
+});

integrationTests/ts/package.json

@@ -6,6 +6,7 @@
   },
   "dependencies": {
     "graphql": "file:../graphql.tgz",
+    "graphql-esm": "file:../graphql-esm.tgz",
     "typescript-4.1": "npm:[email protected]",
     "typescript-4.2": "npm:[email protected]",
     "typescript-4.3": "npm:[email protected]",

integrationTests/webpack-esm/entry.js → integrationTests/webpack/entry-esm.mjs

@@ -1,5 +1,8 @@
 // eslint-disable-next-line node/no-missing-import, import/no-unresolved
-import { buildSchema, graphqlSync } from 'graphql';
+import { graphqlSync } from 'graphql-esm';
+
+// eslint-disable-next-line node/no-missing-import, import/no-unresolved
+import { buildSchema } from 'graphql-esm/utilities/buildASTSchema';
 
 const schema = buildSchema('type Query { hello: String }');
 

integrationTests/webpack/package.json

@@ -6,6 +6,7 @@
   },
   "dependencies": {
     "graphql": "file:../graphql.tgz",
+    "graphql-esm": "file:../graphql-esm.tgz",
     "webpack": "5.x.x",
     "webpack-cli": "4.x.x"
   }