Resolve lockfile

.github/workflows/docker.yaml

@@ -28,7 +28,7 @@ jobs:
       TWILIO_AUTH_TOKEN: 123
       elasticURL: "http://localhost:9200"
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Build the Docker container
         run: docker build --no-cache -t cca-test:latest .
@@ -57,7 +57,7 @@ jobs:
         run: curl localhost:4000/.well-known/apollo/server-health
 
       - name: Run a custom scrape (shouldn't take more than ~5 minutes)
-        run: docker exec test sh -c "LOG_LEVEL=VERBOSE CUSTOM_SCRAPE=true TERMS_TO_SCRAPE=202140 yarn prod:scrape"
+        run: docker exec test sh -c "LOG_LEVEL=VERBOSE CUSTOM_SCRAPE=true TERMS_TO_SCRAPE=202140 node scrapers/main.js"
 
       #### If these start failing, it might not be our fault
       ## Since this test uses live data, there is a chance it could change
@@ -100,7 +100,7 @@ jobs:
               "SELECT name FROM courses WHERE subject = 'CS' and class_id = '3500';" | grep "Object"
 
       - name: Run the updater ONLY ONCE, so that it scrapes missing classes
-        run: docker exec test sh -c "LOG_LEVEL=VERBOSE CUSTOM_SCRAPE=true UPDATE_ONLY_ONCE=true TERMS_TO_SCRAPE=202140 yarn prod:updater"
+        run: docker exec test sh -c "LOG_LEVEL=VERBOSE CUSTOM_SCRAPE=true UPDATE_ONLY_ONCE=true TERMS_TO_SCRAPE=202140 node services/updater.js"
         # This should take 5 minutes MAX.
         # In the scrape step, we used `CUSTOM_SCRAPE=true`. That limits what courses are being scraped - see `scrapers/filter` for more details.
         #   We need to use that here as well.

.github/workflows/lint.yaml

@@ -11,38 +11,56 @@ jobs:
     name: prettier
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           ref: ${{ github.head_ref }}
+
       - name: Prettify code
-        uses: creyD/prettier_action@v3.0
+        uses: creyD/prettier_action@v4.3
         with:
           prettier_options: --write **/*.{js,ts}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
   lint:
     name: Lint & Type checks
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - name: install node
-        uses: actions/setup-node@v2
+      - uses: actions/checkout@v4
+
+      - name: Install Node
+        uses: actions/setup-node@v4
         with:
           node-version: "22"
-      - uses: bahmutov/npm-install@v1
-      - name: Linting
+
+      - name: Enable Corepack
+        run: corepack enable
+
+      - name: Install deps
+        run: yarn install
+
+      - name: Check linter
         run: yarn lint
-      - name: Checks Typescript types
+
+      - name: Check types
         run: yarn tsc
+
   dependency_checks:
     name: Dependency Checks
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - name: install node
-        uses: actions/setup-node@v2
+      - uses: actions/checkout@v4
+
+      - name: Install Node
+        uses: actions/setup-node@v4
         with:
           node-version: "22"
-      - uses: bahmutov/npm-install@v1
+
+      - name: Enable Corepack
+        run: corepack enable
+
+      - name: Install deps
+        run: yarn install
+
       - name: Checks for duplicate definitions in the yarn lockfile
-        run: yarn yarn-deduplicate --fail
+        run: yarn dedupe --check

.github/workflows/test.yaml

@@ -16,14 +16,22 @@ jobs:
       elasticURL: "http://localhost:9200"
       NODE_COVERALLS_DEBUG: 1
     steps:
-      - uses: actions/checkout@v2
-      - name: install node
-        uses: actions/setup-node@v2
+      - uses: actions/checkout@v4
+
+      - name: Install Node
+        uses: actions/setup-node@v4
         with:
           node-version: "22"
-      - uses: bahmutov/npm-install@v1
 
-      - run: yarn unittest --coverage
+      - name: Enable Corepack
+        run: corepack enable
+
+      - name: Install deps
+        run: yarn install
+
+      - name: Run unit tests
+        run: yarn unittest --coverage
+
       - name: Coveralls
         uses: coverallsapp/github-action@master
         with:
@@ -55,26 +63,35 @@ jobs:
       elasticURL: "http://localhost:9200"
       NODE_COVERALLS_DEBUG: 1
     steps:
-      - uses: actions/checkout@v2
-      - name: install node
-        uses: actions/setup-node@v2
+      - uses: actions/checkout@v4
+
+      - name: Install Node
+        uses: actions/setup-node@v4
         with:
           node-version: "22"
-      - uses: bahmutov/npm-install@v1
 
-      - run: yarn db:migrate
+      - name: Enable Corepack
+        run: corepack enable
 
-      - run: yarn db:refresh
+      - name: Install deps
+        run: yarn install
 
-      - run: yarn test --coverage --detectOpenHandles
+      - name: Setup database
+        run: |
+          yarn db:migrate
+          yarn db:refresh
+
+      - name: Run the mixed tests
+        run: yarn test --coverage --detectOpenHandles
       - name: Coveralls
         uses: coverallsapp/github-action@master
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           flag-name: General tests
           parallel: true
 
-      - run: yarn dbtest --coverage
+      - name: Run the integration tests
+        run: yarn dbtest --coverage
       - name: Coveralls
         uses: coverallsapp/github-action@master
         with:
@@ -107,14 +124,18 @@ jobs:
       NODE_ENV: dev
       DEV: true
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
-      - name: install node
-        uses: actions/setup-node@v2
+      - name: Install Node
+        uses: actions/setup-node@v4
         with:
           node-version: "22"
 
-      - uses: bahmutov/npm-install@v1
+      - name: Enable Corepack
+        run: corepack enable
+
+      - name: Install deps
+        run: yarn install
 
       - run: mv ./data/cache_2022_summer ./cache
 

.gitignore

@@ -13,3 +13,12 @@ cache.zip
 logs/
 coverage/
 .idea/
+
+# Yarn
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions

.yarnrc.yml

@@ -0,0 +1 @@
+nodeLinker: node-modules

Dockerfile

@@ -1,10 +1,15 @@
 # build environment
-FROM node:22-alpine as build
+FROM node:22-alpine AS build
 WORKDIR /app
+
 # Install deps
 COPY package.json /app/package.json
 COPY yarn.lock /app/yarn.lock
+COPY .yarnrc.yml /app/.yarnrc.yml
+
+RUN corepack enable
 RUN yarn install --frozen-lockfile
+
 # Copy source
 COPY graphql /app/graphql
 COPY prisma /app/prisma
@@ -19,16 +24,25 @@ COPY infrastructure/prod /app
 COPY babel.config.json /app
 
 RUN yarn build
-RUN rm -rf node_modules
+
+FROM node:22-alpine AS dist
+WORKDIR /dist
+RUN corepack enable
+
+COPY --from=build /app/dist .
+
+# TODO: This should be a `yarn workspaces focus --production` but
+# the dev and non-dev deps are a tangled mess rn
+RUN yarn workspaces focus
 
 # Get RDS Certificate
 RUN apk update && apk add wget && rm -rf /var/cache/apk/* \
     && wget "https://s3.amazonaws.com/rds-downloads/rds-ca-2019-root.pem"
-ENV dbCertPath /app/rds-ca-2019-root.pem
+ENV dbCertPath=/app/rds-ca-2019-root.pem
 
 ENV NODE_ENV=prod
 
-ENTRYPOINT ["/app/entrypoint.sh"]
+ENTRYPOINT ["/dist/entrypoint.sh"]
 
 EXPOSE 4000 8080
-CMD ["yarn", "prod"]
+CMD ["node", "graphql/index.js"]

infrastructure/prod/entrypoint.sh

@@ -1,9 +1,7 @@
 #!/bin/sh
 
-cd dist
-yarn install --production
-yarn prod:db:migrate
+# Run a production prisma migration
+yarn prisma migrate deploy --preview-feature
 yarn db:refresh
-cd ..
 
 exec "$@"

package.json

@@ -43,10 +43,8 @@
     "dbtest": "jest -i --projects tests/database --verbose",
     "about:unittest": "//// Runs unit tests. Does not need db, elasticsearch, spun up. Does not need the Docker containers to be running.",
     "unittest": "jest -i --projects tests/unit --verbose",
-    "about:build_backend": "//// Compiles this project",
-    "build_backend": "rm -rf dist && mkdir -p dist && babel --extensions '.js,.ts' . -d dist/ --copy-files --ignore node_modules --ignore .git --include-dotfiles && rm -rf dist/.git",
-    "about:build": "//// Compiles this project, surpressing output",
-    "build": "yarn -s build_backend",
+    "about:build": "//// Compiles this project",
+    "build": "rm -rf dist && mkdir -p dist && babel --extensions '.js,.ts' . -d dist/ --copy-files --ignore node_modules --ignore .git --include-dotfiles && rm -rf dist/.git",
     "about:prod:scrape": "//// Runs the scrapers (same as `yarn scrape`, but on the compiled project)",
     "prod:scrape": "node dist/scrapers/main.js",
     "about:prod": "//// Runs the API (same as `yarn dev`, but on the compiled project)",
@@ -140,14 +138,14 @@
     "prettier": "^3.0.0",
     "pretty-quick": "4",
     "prisma": "^5.0.0",
-    "typescript": "^5.6.0",
-    "yarn-deduplicate": "^6.0.2"
+    "typescript": "^5.6.0"
   },
   "about:engines": [
     "This helps us ensure that only specific versions of Node are used to run this project",
     "Older versions may lead to unexpected errors due to dependency issues, etc."
   ],
   "engines": {
     "node": ">=20"
-  }
+  },
+  "packageManager": "[email protected]"
 }

services/searcher.ts

@@ -423,7 +423,7 @@ class Searcher {
 
   filterOutSections(
     results: SearchResult[],
-    filters: FilterInput
+    filters: FilterInput,
   ): SearchResult[] {
     return results
       .map((result) => {