From ea49d0e97f4a6c1f626d3675a9481ec3212c2d7b Mon Sep 17 00:00:00 2001
From: Nathan Bierema <nbierema@gmail.com>
Date: Mon, 25 Oct 2021 11:15:37 -0400
Subject: [PATCH] stash

---
 .yarnrc.yml                                   | 13 +-----------
 packages/redux-devtools-cli/package.json      |  1 -
 packages/redux-devtools-cli/src/api/schema.ts | 12 ++---------
 .../src/middleware/graphql.ts                 | 21 +++----------------
 packages/redux-devtools-cli/src/routes.ts     | 11 ++++++++++
 packages/redux-devtools-cli/src/store.ts      |  2 +-
 yarn.lock                                     | 14 -------------
 7 files changed, 18 insertions(+), 56 deletions(-)

diff --git a/.yarnrc.yml b/.yarnrc.yml
index a2ac1cd6..73f0c544 100644
--- a/.yarnrc.yml
+++ b/.yarnrc.yml
@@ -19,20 +19,9 @@ packageExtensions:
     dependencies:
       '@types/react': '*'
       'react': '*'
-  'apollo-server-core@^2.25.2':
+  'apollo-server-core@^3.4.0':
     dependencies:
       '@types/node': '^14.17.15'
-  'apollo-server@^2.25.2':
-    dependencies:
-      '@types/express': '^4.17.13'
-      '@types/node': '^14.17.15'
-  'graphql-subscriptions@^1.0.0':
-    dependencies:
-      '@types/node': '^14.17.15'
-  'subscriptions-transport-ws@^0.9.19':
-    dependencies:
-      '@types/node': '^14.17.15'
-      '@types/ws': '^7.4.7'
   'knex@^0.19.5':
     dependencies:
       '@types/node': '^14.17.15'
diff --git a/packages/redux-devtools-cli/package.json b/packages/redux-devtools-cli/package.json
index 57d03b2b..04d3db41 100644
--- a/packages/redux-devtools-cli/package.json
+++ b/packages/redux-devtools-cli/package.json
@@ -42,7 +42,6 @@
   "dependencies": {
     "@redux-devtools/app": "^1.0.0-8",
     "@types/react": "^17.0.32",
-    "apollo-server": "^3.4.0",
     "apollo-server-express": "^3.4.0",
     "body-parser": "^1.19.0",
     "chalk": "^4.1.2",
diff --git a/packages/redux-devtools-cli/src/api/schema.ts b/packages/redux-devtools-cli/src/api/schema.ts
index a5236cd2..b61baca5 100644
--- a/packages/redux-devtools-cli/src/api/schema.ts
+++ b/packages/redux-devtools-cli/src/api/schema.ts
@@ -1,12 +1,11 @@
 import fs from 'fs';
-import { makeExecutableSchema } from 'apollo-server';
 import { Store } from '../store';
 
-const schema = fs
+export const schema = fs
   .readFileSync(require.resolve('./schema_def.graphql'))
   .toString();
 
-const resolvers = {
+export const resolvers = {
   Query: {
     reports: function report(
       source: unknown,
@@ -24,10 +23,3 @@ const resolvers = {
     },
   },
 };
-
-const executableSchema = makeExecutableSchema({
-  typeDefs: schema,
-  resolvers: resolvers,
-});
-
-export default executableSchema;
diff --git a/packages/redux-devtools-cli/src/middleware/graphql.ts b/packages/redux-devtools-cli/src/middleware/graphql.ts
index 4bf5b00f..e5c3e45a 100644
--- a/packages/redux-devtools-cli/src/middleware/graphql.ts
+++ b/packages/redux-devtools-cli/src/middleware/graphql.ts
@@ -1,28 +1,13 @@
 import { ApolloServer } from 'apollo-server-express';
-import schema from '../api/schema';
+import { schema, resolvers } from '../api/schema';
 import { Store } from '../store';
 
 export default function (store: Store) {
   return new ApolloServer({
-    schema,
+    typeDefs: schema,
+    resolvers,
     context: {
       store: store,
     },
-    playground: {
-      endpoint: '/graphql',
-      tabs: [
-        {
-          endpoint: '/graphql',
-          query:
-            '{\n' +
-            '  reports {\n' +
-            '    id,\n' +
-            '    type,\n' +
-            '    title\n' +
-            '  }\n' +
-            '}',
-        },
-      ],
-    },
   });
 }
diff --git a/packages/redux-devtools-cli/src/routes.ts b/packages/redux-devtools-cli/src/routes.ts
index 2a477dd5..0ddbdb04 100644
--- a/packages/redux-devtools-cli/src/routes.ts
+++ b/packages/redux-devtools-cli/src/routes.ts
@@ -5,8 +5,10 @@ import * as http from 'http';
 import bodyParser from 'body-parser';
 import cors from 'cors';
 import { SCServer } from 'socketcluster-server';
+import { ApolloServer } from 'apollo-server-express';
 import graphqlMiddleware from './middleware/graphql';
 import { AddData, ReportBaseFields, Store } from './store';
+import { resolvers, schema } from './api/schema';
 
 const app = express.Router();
 
@@ -40,6 +42,15 @@ function routes(
     else app.use(morgan('combined'));
   }
 
+  const server = new ApolloServer({
+    typeDefs: schema,
+    resolvers,
+    context: {
+      store: store,
+    },
+  });
+  await server.start();
+  server.applyMiddleware({ app });
   graphqlMiddleware(store).applyMiddleware({ app } as {
     app: express.Application;
   });
diff --git a/packages/redux-devtools-cli/src/store.ts b/packages/redux-devtools-cli/src/store.ts
index b4776000..619a722c 100644
--- a/packages/redux-devtools-cli/src/store.ts
+++ b/packages/redux-devtools-cli/src/store.ts
@@ -18,7 +18,7 @@ function error(msg: string): Promise<{ error: string }> {
 
 type ReportType = 'STATE' | 'ACTION' | 'STATES' | 'ACTIONS';
 
-interface Report {
+export interface Report {
   id: string;
   type: ReportType | null;
   title: string | null;
diff --git a/yarn.lock b/yarn.lock
index bc05edad..c39e5c46 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4659,7 +4659,6 @@ __metadata:
     "@types/uuid": ^8.3.1
     "@typescript-eslint/eslint-plugin": ^5.1.0
     "@typescript-eslint/parser": ^5.1.0
-    apollo-server: ^3.4.0
     apollo-server-express: ^3.4.0
     body-parser: ^1.19.0
     chalk: ^4.1.2
@@ -8826,19 +8825,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"apollo-server@npm:^3.4.0":
-  version: 3.4.0
-  resolution: "apollo-server@npm:3.4.0"
-  dependencies:
-    apollo-server-core: ^3.4.0
-    apollo-server-express: ^3.4.0
-    express: ^4.17.1
-  peerDependencies:
-    graphql: ^15.3.0
-  checksum: e51e5529b4014cfa2bbf52038223b04a87c423b481a7948d8430a8861ab9766ef12d8bd08945434819f9f85ee5c0134cced6be2da7460b3bc29aa7185cb39bed
-  languageName: node
-  linkType: hard
-
 "app-root-dir@npm:^1.0.2":
   version: 1.0.2
   resolution: "app-root-dir@npm:1.0.2"