Upgrade Node and core dependencies

.eslintrc.js

@@ -1,6 +1,6 @@
-module.exports = {
+export default {
   env: {
-    es2021: true,
+    esnext: true,
     jest: true,
     node: true,
   },

.nvmrc

@@ -1 +1 @@
-16
+22

Dockerfile

@@ -1,5 +1,5 @@
 # build environment
-FROM node:16-alpine as build
+FROM node:22-alpine as build
 WORKDIR /app
 # Install deps
 COPY package.json /app/package.json
@@ -34,4 +34,4 @@ ENV NODE_ENV=prod
 ENTRYPOINT ["/app/entrypoint.sh"]
 
 EXPOSE 4000 8080
-CMD ["yarn", "prod"]
+CMD ["yarn", "prod"]

babel.config.json

@@ -1,15 +1,5 @@
 {
-  "presets": [
-    [
-      "@babel/preset-env",
-      {
-        "targets": {
-          "node": "16"
-        }
-      }
-    ],
-    "@babel/preset-typescript"
-  ],
-  "plugins": ["@babel/plugin-proposal-class-properties"],
+  "presets": ["@babel/preset-env", "@babel/preset-typescript"],
+  "plugins": [],
   "ignore": ["node_modules"]
 }

graphql/index.ts

@@ -1,4 +1,6 @@
-import { ApolloServer, gql } from "apollo-server";
+import { ApolloServer } from "@apollo/server";
+import { startStandaloneServer } from "@apollo/server/standalone";
+import gql from "graphql-tag";
 import GraphQLJSON, { GraphQLJSONObject } from "graphql-type-json";
 import macros from "../utils/macros";
 
@@ -61,19 +63,22 @@ const server = new ApolloServer({
     searchResolvers,
     termInfoResolvers,
   ],
-  debug: true,
+  // debug: true,
 });
 
-if (require.main === module) {
-  server
-    .listen()
-    .then(({ url }) => {
-      macros.log(`ready at ${url}`);
-      return;
-    })
-    .catch((err) => {
-      macros.error(`error starting graphql server: ${JSON.stringify(err)}`);
-    });
-}
+console.log("hi");
+
+// if (require.main === module) {
+startStandaloneServer(server, {
+  listen: { port: 3000 },
+})
+  .then(({ url }) => {
+    macros.log(`ready at ${url}`);
+    return;
+  })
+  .catch((err) => {
+    macros.error(`error starting graphql server: ${JSON.stringify(err)}`);
+  });
+// }
 
 export default server;

graphql/resolvers/major.ts

@@ -1,13 +1,17 @@
-import { UserInputError } from "apollo-server";
 import prisma from "../../services/prisma";
 import { Major as PrismaMajor } from "@prisma/client";
+import { GraphQLError } from "graphql";
 
 const noResultsError = (recordType): never => {
-  throw new UserInputError(`${recordType} not found!`);
+  throw new GraphQLError(`${recordType} not found!`, {
+    extensions: {
+      code: "BAD_USER_INPUT",
+    },
+  });
 };
 
 const getLatestMajorOccurrence = async (
-  majorId: string
+  majorId: string,
 ): Promise<PrismaMajor> => {
   const majors: PrismaMajor[] = await prisma.major.findMany({
     where: { majorId: majorId },

graphql/tests/class.test.seq.ts

@@ -2,8 +2,8 @@
  * This file is part of Search NEU and licensed under AGPL3.
  * See the license file in the root folder for details.
  */
-import { gql } from "apollo-server";
-import { GraphQLResponse } from "apollo-server-core";
+import gql from "graphql-tag";
+import { GraphQLResponse } from "@apollo/server";
 import { DocumentNode, GraphQLError } from "graphql";
 import prisma from "../../services/prisma";
 import server from "../index";
@@ -164,11 +164,15 @@ describe("returns errors for non-existant classes", () => {
       `,
     });
 
-    expect(res?.errors?.length).toBe(1);
-    expect(res?.errors?.[0]).toEqual(
+    if (res.body.kind !== "single") {
+      fail("incorrect graphql response kind");
+    }
+
+    expect(res.body.singleResult.errors.length).toBe(1);
+    expect(res.body.singleResult.errors?.[0]).toEqual(
       new GraphQLError(
-        `We couldn't find any occurrences of a class with subject 'CS' and class ID '2510'`
-      )
+        `We couldn't find any occurrences of a class with subject 'CS' and class ID '2510'`,
+      ),
     );
   });
 
@@ -187,10 +191,13 @@ describe("returns errors for non-existant classes", () => {
         }
       `,
     });
+    if (res.body.kind !== "single") {
+      fail("incorrect graphql response kind");
+    }
 
-    expect(res?.errors).toBeUndefined();
+    expect(res.body.singleResult.errors).toBeUndefined();
     // This doesn't throw an error - it just omits any classes for which we have no data
-    expect(res?.data).toEqual({
+    expect(res.body.singleResult.data).toEqual({
       bulkClasses: [],
     });
   });
@@ -207,12 +214,15 @@ describe("returns errors for non-existant classes", () => {
         }
       `,
     });
+    if (res.body.kind !== "single") {
+      fail("incorrect graphql response kind");
+    }
 
-    expect(res?.errors?.length).toBe(1);
-    expect(res?.errors?.[0]).toEqual(
+    expect(res.body.singleResult.errors.length).toBe(1);
+    expect(res.body.singleResult.errors?.[0]).toEqual(
       new GraphQLError(
-        `We couldn't find any occurrences of a class with subject 'CS' and class ID '2510'`
-      )
+        `We couldn't find any occurrences of a class with subject 'CS' and class ID '2510'`,
+      ),
     );
   });
 
@@ -229,11 +239,15 @@ describe("returns errors for non-existant classes", () => {
       `,
     });
 
-    expect(res?.errors?.length).toBe(1);
-    expect(res?.errors?.[0]).toEqual(
+    if (res.body.kind !== "single") {
+      fail("incorrect graphql response kind");
+    }
+
+    expect(res.body.singleResult.errors.length).toBe(1);
+    expect(res.body.singleResult.errors?.[0]).toEqual(
       new GraphQLError(
-        "We couldn't find a course matching the term '202310', subject 'CS', and class ID '2500'"
-      )
+        "We couldn't find a course matching the term '202310', subject 'CS', and class ID '2500'",
+      ),
     );
   });
 
@@ -248,11 +262,15 @@ describe("returns errors for non-existant classes", () => {
       `,
     });
 
-    expect(res?.errors?.length).toBe(1);
-    expect(res?.errors?.[0]).toEqual(
+    if (res.body.kind !== "single") {
+      fail("incorrect graphql response kind");
+    }
+
+    expect(res.body.singleResult.errors.length).toBe(1);
+    expect(res.body.singleResult.errors?.[0]).toEqual(
       new GraphQLError(
-        "We couldn't find a course matching the hash 'neu.edu/202310/CS/2500'"
-      )
+        "We couldn't find a course matching the hash 'neu.edu/202310/CS/2500'",
+      ),
     );
   });
 
@@ -266,12 +284,15 @@ describe("returns errors for non-existant classes", () => {
         }
       `,
     });
+    if (res.body.kind !== "single") {
+      fail("incorrect graphql response kind");
+    }
 
-    expect(res?.errors?.length).toBe(1);
-    expect(res?.errors?.[0]).toEqual(
+    expect(res.body.singleResult.errors.length).toBe(1);
+    expect(res.body.singleResult.errors?.[0]).toEqual(
       new GraphQLError(
-        "We couldn't find a section matching the hash 'neu.edu/201830/CS/2500/123456'"
-      )
+        "We couldn't find a section matching the hash 'neu.edu/201830/CS/2500/123456'",
+      ),
     );
   });
 });

graphql/tests/major.test.seq.ts

@@ -1,8 +1,8 @@
-import { gql } from "apollo-server";
+import gql from "graphql-tag";
 import prisma from "../../services/prisma";
 import server from "../index";
 import { DocumentNode } from "graphql";
-import { GraphQLResponse } from "apollo-server-core";
+import { GraphQLResponse } from "@apollo/server";
 
 const query = async (queryBody: {
   query: string | DocumentNode;

graphql/tests/search.test.seq.ts

@@ -1,10 +1,10 @@
-import { gql } from "apollo-server";
+import gql from "graphql-tag";
 import { mocked } from "jest-mock";
 import searcher from "../../services/searcher";
 import server from "../index";
 import { Course, Requisite, Section } from "../../types/types";
 import { DocumentNode } from "graphql";
-import { GraphQLResponse } from "apollo-server-core";
+import { GraphQLResponse } from "@apollo/server";
 
 jest.mock("../../services/searcher");
 
@@ -208,7 +208,12 @@ describe("search resolver", () => {
       10,
       {},
     ]);
-    expect(res.data.search).toEqual({
+
+    if (res.body.kind !== "single") {
+      fail("incorrect graphql response kind");
+    }
+
+    expect(res.body.singleResult.data.search).toEqual({
       totalCount: 1,
       pageInfo: { hasNextPage: false },
     });

graphql/typeDefs/class.js

@@ -1,4 +1,4 @@
-import { gql } from "apollo-server";
+import gql from "graphql-tag";
 
 const typeDef = gql`
   extend type Query {

graphql/typeDefs/classOccurrence.js

@@ -1,4 +1,4 @@
-import { gql } from "apollo-server";
+import gql from "graphql-tag";
 
 const typeDef = gql`
   type ClassOccurrence {

graphql/typeDefs/employee.js

@@ -1,4 +1,4 @@
-import { gql } from "apollo-server";
+import gql from "graphql-tag";
 
 const typeDef = gql`
   type Employee {

graphql/typeDefs/major.js

@@ -1,4 +1,4 @@
-import { gql } from "apollo-server";
+import gql from "graphql-tag";
 
 const typeDef = gql`
   extend type Query {

graphql/typeDefs/majorOccurrence.js

@@ -1,4 +1,4 @@
-import { gql } from "apollo-server";
+import gql from "graphql-tag";
 
 const typeDef = gql`
   type MajorOccurrence {

graphql/typeDefs/search.js

@@ -1,4 +1,4 @@
-import { gql } from "apollo-server";
+import gql from "graphql-tag";
 
 const typeDef = gql`
   extend type Query {

graphql/typeDefs/termInfo.js

@@ -1,4 +1,4 @@
-import { gql } from "apollo-server";
+import gql from "graphql-tag";
 
 const typeDef = gql`
   extend type Query {

infrastructure/dev/docker-compose.yml → infrastructure/dev/compose.yaml

@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   postgresql:
     image: postgres:11.19-bullseye
@@ -13,8 +11,9 @@ services:
       - POSTGRES_USER=postgres
     env_file:
       - ../../.env
+
   es:
-    image: docker.elastic.co/elasticsearch/elasticsearch-oss:7.10.2
+    image: docker.elastic.co/elasticsearch/elasticsearch:7.17.24
     ports:
       - 9200:9200
     environment: