Fix dependency issue when using @rollup/plugin-commonjs

package.json

@@ -63,6 +63,8 @@
     "@graphql-tools/utils": "8.2.5",
     "@hapi/hapi": "20.2.0",
     "@josephg/resolvable": "1.0.1",
+    "@rollup/plugin-commonjs": "21.0.0",
+    "@rollup/plugin-json": "4.1.0",
     "@sinonjs/fake-timers": "8.0.1",
     "@types/async-retry": "1.4.3",
     "@types/aws-lambda": "8.10.83",
@@ -123,6 +125,7 @@
     "qs-middleware": "1.0.3",
     "request-promise": "4.2.6",
     "requisition": "1.7.0",
+    "rollup": "2.58.0",
     "supertest": "6.1.6",
     "test-listen": "1.1.0",
     "ts-jest": "27.0.5",

packages/apollo-server-core/src/__tests__/rollupCommonJs.test.ts

@@ -0,0 +1,27 @@
+const rollup = require('rollup');
+import json from '@rollup/plugin-json';
+import commonjs from '@rollup/plugin-commonjs';
+import path from 'path';
+
+describe('@rollup/plugin-commonjs', () => {
+  it('bundles into es6 without circular dependencies issues', async () => {
+    const outputOptions = {
+      exports: 'named',
+      name: 'apollo',
+      format: 'umd',
+      sourcemapExcludeSources: false,
+    };
+    const bundle = await rollup.rollup({
+      input: path.resolve(__dirname, '..', '..', 'dist', 'index.js'),
+      plugins: [json(), commonjs()],
+      onwarn: () => {
+        /* suppress warnings */
+      },
+    });
+    const { output } = await bundle.generate(outputOptions);
+    const indexBundle = output[0].code;
+    var varDefinedAfterBundle;
+    eval(`${indexBundle}; varDefinedAfterBundle = 'foo';`);
+    expect(varDefinedAfterBundle).toEqual('foo');
+  });
+});

packages/apollo-server-core/src/gql.ts

@@ -0,0 +1,8 @@
+// This currently provides the ability to have syntax highlighting as well as
+// consistency between client and server gql tags
+import type { DocumentNode } from 'graphql';
+import gqlTag from 'graphql-tag';
+export const gql: (
+  template: TemplateStringsArray | string,
+  ...substitutions: any[]
+) => DocumentNode = gqlTag;