Merge branch 'crux-bphc:master' into master

Author: aten2005

.env.example

@@ -22,4 +22,3 @@ CHRONO_SECRET=""
 LOG_MODE="development" # if not set, defaults to NODE_ENV
 LOG_LEVEL="info"
 DB_LONG_RUNNING_QUERY_MS=2000
-SEARCH_SERVICE_URL="http://chrono:4713"

.env.testing

@@ -13,4 +13,3 @@ GOOGLE_CLIENT_SECRET="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"
 JWT_PRIVATE_KEY="LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFb3dJQkFBS0NBUUVBc3luWEt0RUtvdzFsaXZXd1dTVkdzVlQ2Nnl3RTZCZXpZRzM4TTJMTXNmRDAwSjhCCmNNalVreTdzRmxSN2pzV2NjRjk0Y0tIbXFPcEdlYy9LcDdFSUhJWFhrZFB3TncyRHltOE1rc1Z4WjlDUHpIU1kKTmptRzZ2akVlVUgxcEJGc1NaLzVoTGtldzNXd2NQVHNwWVgraVU5Qm82L2M0QVFEMG9qamUyZk1iRTNDK3hLTwpPckFYWkE0V1ZmTEZiL0pQbTgvQlJ6ODk0Z1pwSFg4Sk9oVmRFNjFkdzhsRGFSUXo4RzhoRjJOMlA1UnMwbGx3CnJxSkxadCtTZW5DSEt6eWNOYmJFMGNhMGFRZnpHcW9wUlNGS28vc21id3Jydi94a0ZXcEkxL2ZhUDhGMWEyY1MKSmQ5RVZ4M245NzN6ZVdFekZnOUFWTEVQMGZZdlNTQXJzWUNMbHdJREFRQUJBb0lCQUd3NWhnUVRLajI4UmU1ZQo0eHUyYkxHS0I5Z3ZTdmQzK1o3eVVUb3BJRVVNckpXb3R4SU4vbnE2Q1ZxanhjOUVoMjlKL0ZMdE9Zd25tRkxVCnRqSDl1a3lnZk10V0h2RGlkUTIvYnZUcDE4dENMTnJ3UTFIZUJpWENCOHpIano2QVY4MVJtVVFYSHdJckFWMzYKVlVqWFhCNU5oZlQrc29tUFkwKzE2TlFPcTJsdnZENUtoZ1VUYjdPM2V6cXQ5b0VZM3ZqTURhaU5mZ0poWndRbQpUcjkvV2k2OWxyNGtvWE80KzhrT3dDUFRlOWJYVFYxTTREcGpoM29CNTV3ZUJUNXUxK3IxZnJPdml6cFJCUTB2CjhvNHlEYjVGdTJqTDQyLzR2Z0t2VEczd0pPNVE3MVJ2bGNoSktRTjhuZFJJaU5rMUNadXJ5QjhRdWRpelpsKzkKcFFlbUFZRUNnWUVBNW1wM2N1NUdBK3cxY2s2amlhRWora1F0UmJ3V2VTall0S2hmTnhtNjRGZ0VNMCtlM2pXWQpXRnI3VVRYVE9CeGZ6UkZqeVBTUVBqcUJYc2hXajZzcURGMmVWa3h1V3YwdlpKc082YjBYV3BNVmtiQUx0M0UyCk5DNldhQjZYS3lubGlKcWU5aUQ4cHlRSSt2dzlJY2ZWMEZyOUdxSG81a05hRFoyOHhBKytqNmNDZ1lFQXh3NkkKRjhIajV1RkIyS2NheE5RUG1BcUI0QUUrdG1UbzF1Yk1kZUFDbFE5UWRkU01Sc2VvSk8yQzI4bnpLSGpvRlg1cQpxajJhVkYrbTlDZWFJRW5vVzhvS2MvODJreVNpVVo3WXUveWRaeE5IcDloVEhRNEE1QjNqaUdIZUsxVHZhdTV1CmZtcHhrY01zVE9wSlorb2FKbTU0cnVBZXlIaWRpTWRTN0VRN0lwRUNnWUFrUUdYd3NDcFYzYWovQmY1VzNnSnkKRXAzbzFkSFhXQ1RZTDVGamN1bmkrQllaR0pMUE5URjEzVUtqSVV2TkRUSEphczMvUlBNWXgwMnBZdTJ6aHVPRAp0SXIvMnVDVjhqV3RwM091TkxEaThEYzVoN0FnT1hDa3Z4dXMzL3M2c0VuTHQwQUJTMmxVeHFlZkRXWjAxU0wvCnVBRVFXcDd3ODNITXFKK1ZYVURIQ3dLQmdRQ3RZMjBNTktuTnJKenNtUEpxVE1XZ2pGYUF4dFRYajZKNXZ1U08KTUtoUEt0M05KVzFqSWZyRzM5UkNtdkNoYWwvT2lTVmtVUENqV2daVldrR1lxb2dwbkIzcTJIMnpRZy9aeE9ISgpMY3Yxd3dlQm5wOFhDZUdnMHFBbFpncGQrRWZyL3ZCa1VWZkh2aGhTanltTnlJOHF0c09Nb0ZCd0V4QTEybG5TCno4UXE0UUtCZ0UvQTdtM2ZLVlBTa25ma05iZSt2aENMbHEyMUFCTkE1bmZtbDFLUlNmZmhXQUJWNDZ5WnFHanMKa1RUUk00bWFpNmZ3YUkydGRDWmljcGd4OG5uSHFkM2RndVRMOURueVJSbWR0ZEoyWDAvOHpvcUdLUXlxU2g2VwpwUElhSmZ3UWk2UUU4RXJTRVNkZFl6U0J0Ykh4L0xWeE1QMWdENENabDhZNXkwMEdBNW41Ci0tLS0tRU5EIFJTQSBQUklWQVRFIEtFWS0tLS0t"
 JWT_PUBLIC_KEY="LS0tLS1CRUdJTiBQVUJMSUMgS0VZLS0tLS0KTUlJQklqQU5CZ2txaGtpRzl3MEJBUUVGQUFPQ0FROEFNSUlCQ2dLQ0FRRUFzeW5YS3RFS293MWxpdld3V1NWRwpzVlQ2Nnl3RTZCZXpZRzM4TTJMTXNmRDAwSjhCY01qVWt5N3NGbFI3anNXY2NGOTRjS0htcU9wR2VjL0twN0VJCkhJWFhrZFB3TncyRHltOE1rc1Z4WjlDUHpIU1lOam1HNnZqRWVVSDFwQkZzU1ovNWhMa2V3M1d3Y1BUc3BZWCsKaVU5Qm82L2M0QVFEMG9qamUyZk1iRTNDK3hLT09yQVhaQTRXVmZMRmIvSlBtOC9CUno4OTRnWnBIWDhKT2hWZApFNjFkdzhsRGFSUXo4RzhoRjJOMlA1UnMwbGx3cnFKTFp0K1NlbkNIS3p5Y05iYkUwY2EwYVFmekdxb3BSU0ZLCm8vc21id3Jydi94a0ZXcEkxL2ZhUDhGMWEyY1NKZDlFVngzbjk3M3plV0V6Rmc5QVZMRVAwZll2U1NBcnNZQ0wKbHdJREFRQUIKLS0tLS1FTkQgUFVCTElDIEtFWS0tLS0t"
 CHRONO_SECRET="99fcf0561404319f865d52ec3d3d6239ccc1fbcd5f1f6e5c72cbfd3f5b6feff119ba5dc9a027f06e1ab5fcc39de6c71da6fc46c46b0206c06097394491f26b15"
-SEARCH_SERVICE_URL="http://chrono:4713"

.github/workflows/build.yml

@@ -3,11 +3,13 @@ name: Build code
 on:
   pull_request:
     types: [ labeled ]
+  push:
+    branches: [ master ]
   merge_group:
 
 jobs:
   build:
-    if: ${{ github.event.label.name == 'ready' }}
+    if: ${{ github.event.label.name == 'ready' || github.event_name == 'push' || github.event_name == 'merge_group' }}
     runs-on: self-hosted
     steps:
       - name: Checkout
@@ -16,13 +18,13 @@ jobs:
       - name: Install Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: 22.17.0
+          node-version: 24.14.1
 
       - uses: pnpm/action-setup@v2
         name: Install pnpm
         id: pnpm-install
         with:
-          version: 10.13.1
+          version: 11.8.0
           run_install: false
 
       - name: Get pnpm store directory

.github/workflows/linting.yml

@@ -3,11 +3,13 @@ name: Lint code and check formatting with BiomeJS
 on:
   pull_request:
     types: [ labeled ]
+  push:
+    branches: [ master ]
   merge_group:
 
 jobs:
   linting:
-    if: ${{ github.event.label.name == 'ready' }}
+    if: ${{ github.event.label.name == 'ready' || github.event_name == 'push' || github.event_name == 'merge_group' }}
     runs-on: self-hosted
     steps:
       - name: Checkout
@@ -16,13 +18,13 @@ jobs:
       - name: Install Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: 22.17.0
+          node-version: 24.14.1
 
       - uses: pnpm/action-setup@v2
         name: Install pnpm
         id: pnpm-install
         with:
-          version: 10.13.1
+          version: 11.8.0
           run_install: false
 
       - name: Get pnpm store directory

.github/workflows/pipeline.yml

@@ -11,7 +11,7 @@ jobs:
         run: |
             cd /home/ubuntu/clones
             cd chronofactorem-rewrite-draft
-            git pull
+            GIT_SSH_COMMAND="ssh -i /home/ubuntu/.ssh/gh-actions -o IdentitiesOnly=yes" git pull
             docker compose --profile ingestion down
             docker compose --profile prod down
             docker compose --profile prod up --build -d

.gitignore

@@ -1,5 +1,6 @@
 .idea/
-.vscode/
+.vscode/*
+!.vscode/extensions.json
 node_modules/
 build/
 tmp/
@@ -8,4 +9,5 @@ temp/
 postgres
 logs
 nginx.prod.conf
-backend/data
+backend/data
+mise.toml

.vscode/extensions.json

@@ -0,0 +1,7 @@
+{
+  "recommendations": [
+    "fronterior.biome-monorepo",
+    "bradlc.vscode-tailwindcss",
+    "typescriptteam.native-preview"
+  ]
+}

README.md

@@ -4,11 +4,14 @@
 
 ## Steps for setup:
 
-1. Install [nvm](https://github.com/nvm-sh/nvm) and install Node v22.17.0 LTS using `nvm install v22.17.0`. If you're using a different Node version manager, do the equivalent.
-2. Activate Node v22.17.0 using `nvm use v22.17.0`.
+1. Install [nvm](https://github.com/nvm-sh/nvm) and install Node v24.14.0 LTS using `nvm install v24.14.1`. If you're using a different Node version manager, do the equivalent.
+2. Activate Node v24.14.1 using `nvm use v24.14.1`.
 3. Install pnpm, using `npm i -g pnpm`.
 4. Install the packages in this repo by running `pnpm i -r` in the root of this repository.
 
+> [!tip]
+> Typescript 7 is now out, and we find the Typescript 7 dev experience to be quite a bit faster than the default in VSCode. We recommend installing the plugins in `.vscode` and setting them up to enable TS7 support.
+
 Check [.env.example](./.env.example) for an example env file. It can be arbitrary, though we recommend using:
 
 ```
@@ -36,7 +39,6 @@ CHRONO_SECRET="99fcf0561404319f865d52ec3d3d6239ccc1fbcd5f1f6e5c72cbfd3f5b6feff11
 LOG_MODE="development"
 LOG_LEVEL="info"
 DB_LONG_RUNNING_QUERY_MS=2000
-SEARCH_SERVICE_URL="http://chrono:4713"
 ```
 
 Obviously, we'll use different creds in production.
@@ -184,11 +186,3 @@ If something goes wrong, and you need to overwrite the course data for a semeste
 **NOTE:** This same `db` container is used in `dev` and `prod`
 
 **NOTE:** This same `ingestion` container is the container that runs the ingestion script.
-
-## Search service
-
-For course & timetable search, we'll be using https://github.com/crux-bphc/search-service/. Both the Docker Compose configurations are set to run on the same network (named `chrono_net`).
-
-Make sure to set the `CHRONO_PORT` environment variable in the search service to an unused port (such as 4713). Then, set the `SEARCH_SERVICE_URL` environment variable here to `http://chrono:XXXX`, replacing `XXXX` with the previously set port.
-
-Before adding any timetables to the search service, you'll need to add the relevant courses to the search service indexes. A sample way to do this is using https://github.com/crux-bphc/search-service/blob/master/chrono/utils.py.

backend/biome.json

@@ -1,13 +1,9 @@
 {
   "root": false,
-  "$schema": "https://biomejs.dev/schemas/2.1.1/schema.json",
-  "extends": [
-    "../biome.json"
-  ],
+  "$schema": "https://biomejs.dev/schemas/2.5.0/schema.json",
+  "extends": ["../biome.json"],
   "files": {
-    "includes": [
-      "src/**"
-    ]
+    "includes": ["src/**"]
   },
   "formatter": {
     "indentStyle": "space"
@@ -31,4 +27,4 @@
       }
     }
   }
-}
+}

backend/docker/dev/Dockerfile

@@ -1,7 +1,7 @@
-FROM node:22.17.0-bookworm-slim
+FROM node:24.14.1-bookworm-slim
 ENV NODE_ENV development
 
-RUN corepack enable pnpm && corepack install -g pnpm@latest-10
+RUN corepack enable pnpm && corepack install -g pnpm@latest-11
 
 WORKDIR /usr/local/app
 COPY --chown=node:node ./package.json ./