From d0394daa5ef7773e76f6a842c0d79650caef963f Mon Sep 17 00:00:00 2001
From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Date: Thu, 11 Jun 2026 02:31:10 +0000
Subject: [PATCH 1/7] perf: lazy-load term catalogs and split vendor chunks

Co-Authored-By: Rahul Chalamala <22563365+rchalamala@users.noreply.github.com>
---
 src/Workspace.tsx  |  4 ++-
 src/courseData.ts  | 64 +++++++++++++++++++++++++---------------------
 src/useAppState.ts | 28 +++++++++++++++++---
 vite.config.ts     | 16 ++++++++++++
 4 files changed, 78 insertions(+), 34 deletions(-)

diff --git a/src/Workspace.tsx b/src/Workspace.tsx
index 5c456c3..4e0f54b 100644
--- a/src/Workspace.tsx
+++ b/src/Workspace.tsx
@@ -447,7 +447,9 @@ function WorkspaceSearch() {
     <Select
       isClearable
       className="my-3"
-      placeholder="Add a course..."
+      placeholder={
+        courses.length === 0 ? "Loading courses..." : "Add a course..."
+      }
       options={options}
       value={selectedCourse}
       getOptionLabel={(course) => `${course?.number} - ${course?.name}`}
diff --git a/src/courseData.ts b/src/courseData.ts
index dc9e394..8289ca9 100644
--- a/src/courseData.ts
+++ b/src/courseData.ts
@@ -1,33 +1,39 @@
-import DATA_FA2023 from "./data/IndexedTotalFA2022-23.json";
-import DATA_WI2023 from "./data/IndexedTotalWI2022-23.json";
-import DATA_SP2023 from "./data/IndexedTotalSP2022-23.json";
-import DATA_FA2024 from "./data/IndexedTotalFA2023-24.json";
-import DATA_WI2024 from "./data/IndexedTotalWI2023-24.json";
-import DATA_SP2024 from "./data/IndexedTotalSP2023-24.json";
-import DATA_FA2025 from "./data/IndexedTotalFA2024-25.json";
-import DATA_WI2025 from "./data/IndexedTotalWI2024-25.json";
-import DATA_SP2025 from "./data/IndexedTotalSP2024-25.json";
-import DATA_FA2026 from "./data/IndexedTotalFA2025-26.json";
-import DATA_WI2026 from "./data/IndexedTotalWI2025-26.json";
-import DATA_SP2026 from "./data/IndexedTotalSP2025-26.json";
-import DATA_FA2027 from "./data/IndexedTotalFA2026-27.json";
-
 export const CURRENT_TERM = "/fa2027";
 
-export const courseDataSources: {
-  [key: string]: { [key: string]: CourseData };
+const courseDataLoaders: {
+  [key: string]: () => Promise<{ default: CourseIndex }>;
 } = {
-  "/fa2023": DATA_FA2023,
-  "/wi2023": DATA_WI2023,
-  "/sp2023": DATA_SP2023,
-  "/fa2024": DATA_FA2024,
-  "/wi2024": DATA_WI2024,
-  "/sp2024": DATA_SP2024,
-  "/fa2025": DATA_FA2025,
-  "/wi2025": DATA_WI2025,
-  "/sp2025": DATA_SP2025,
-  "/fa2026": DATA_FA2026,
-  "/wi2026": DATA_WI2026,
-  "/sp2026": DATA_SP2026,
-  "/fa2027": DATA_FA2027,
+  "/fa2023": () => import("./data/IndexedTotalFA2022-23.json"),
+  "/wi2023": () => import("./data/IndexedTotalWI2022-23.json"),
+  "/sp2023": () => import("./data/IndexedTotalSP2022-23.json"),
+  "/fa2024": () => import("./data/IndexedTotalFA2023-24.json"),
+  "/wi2024": () => import("./data/IndexedTotalWI2023-24.json"),
+  "/sp2024": () => import("./data/IndexedTotalSP2023-24.json"),
+  "/fa2025": () => import("./data/IndexedTotalFA2024-25.json"),
+  "/wi2025": () => import("./data/IndexedTotalWI2024-25.json"),
+  "/sp2025": () => import("./data/IndexedTotalSP2024-25.json"),
+  "/fa2026": () => import("./data/IndexedTotalFA2025-26.json"),
+  "/wi2026": () => import("./data/IndexedTotalWI2025-26.json"),
+  "/sp2026": () => import("./data/IndexedTotalSP2025-26.json"),
+  "/fa2027": () => import("./data/IndexedTotalFA2026-27.json"),
 };
+
+const courseIndexCache: { [key: string]: CourseIndex } = {};
+
+export function getCachedCourseIndex(term: string): CourseIndex | undefined {
+  return courseIndexCache[term];
+}
+
+export async function loadCourseIndex(term: string): Promise<CourseIndex> {
+  const cached = courseIndexCache[term];
+  if (cached) {
+    return cached;
+  }
+  const loader = courseDataLoaders[term];
+  if (!loader) {
+    return {};
+  }
+  const module = await loader();
+  courseIndexCache[term] = module.default;
+  return module.default;
+}
diff --git a/src/useAppState.ts b/src/useAppState.ts
index 2bc98c1..5b038d6 100644
--- a/src/useAppState.ts
+++ b/src/useAppState.ts
@@ -14,7 +14,11 @@ import {
   shortenCourses,
 } from "./appContext";
 import { generateCourseSections } from "./scheduler";
-import { CURRENT_TERM, courseDataSources } from "./courseData";
+import {
+  CURRENT_TERM,
+  getCachedCourseIndex,
+  loadCourseIndex,
+} from "./courseData";
 
 function setArrayIdx<T>(arr: Array<T>, idx: number, element: T) {
   return arr.map((value, i) => {
@@ -57,10 +61,26 @@ export function useAppState(): {
   // really basic routing
   const pathname = useReactPath();
   const realPath = pathname === "/" ? CURRENT_TERM : pathname;
-  const indexedCourses: CourseIndex = useMemo(
-    () => courseDataSources[realPath] ?? {},
-    [realPath],
+  const [indexedCourses, setIndexedCourses] = useState<CourseIndex>(
+    () => getCachedCourseIndex(realPath) ?? {},
   );
+  useEffect(() => {
+    let cancelled = false;
+    const cached = getCachedCourseIndex(realPath);
+    if (cached) {
+      setIndexedCourses(cached);
+      return;
+    }
+    setIndexedCourses({});
+    loadCourseIndex(realPath).then((index) => {
+      if (!cancelled) {
+        setIndexedCourses(index);
+      }
+    });
+    return () => {
+      cancelled = true;
+    };
+  }, [realPath]);
 
   // 5 blank workspaces by default bc I'm too lazy to implement dynamic tabs and stuff
   const defaultWorkspaces = useMemo(
diff --git a/vite.config.ts b/vite.config.ts
index e0a2c9f..54385a7 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -15,6 +15,22 @@ export default defineConfig({
   build: {
     sourcemap: true,
     outDir: "dist",
+    chunkSizeWarningLimit: 700,
+    rollupOptions: {
+      output: {
+        manualChunks: {
+          react: ["react", "react-dom", "react-dom/client"],
+          mui: ["@mui/material", "@mui/icons-material"],
+          schedulex: [
+            "@schedule-x/calendar",
+            "@schedule-x/react",
+            "@schedule-x/theme-default",
+            "@schedule-x/events-service",
+          ],
+          motion: ["motion"],
+        },
+      },
+    },
   },
   server: {
     port: 3000,

From 06f49ee7e72e3052c0a409bbad5097e7c116ab26 Mon Sep 17 00:00:00 2001
From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Date: Thu, 11 Jun 2026 02:36:57 +0000
Subject: [PATCH 2/7] fix: no-op workspace mutations while term catalog is
 loading

Co-Authored-By: Rahul Chalamala <22563365+rchalamala@users.noreply.github.com>
---
 src/useAppState.ts | 44 +++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 41 insertions(+), 3 deletions(-)

diff --git a/src/useAppState.ts b/src/useAppState.ts
index 5b038d6..574de24 100644
--- a/src/useAppState.ts
+++ b/src/useAppState.ts
@@ -118,6 +118,8 @@ export function useAppState(): {
     setWorkspaceIdx(storedIdx ? JSON.parse(storedIdx) : 0);
   }, [realPath, defaultWorkspaces, setWorkspaces, setWorkspaceIdx]);
 
+  const catalogReady = Object.keys(indexedCourses).length > 0;
+
   const courses = workspaces[workspaceIdx].courses;
   const availableTimes: Date[][] = useMemo(
     () =>
@@ -133,6 +135,9 @@ export function useAppState(): {
   /** Helper functions to be sent sent through Context */
   const addCourse = useCallback(
     (newCourse: CourseStorage) => {
+      if (!catalogReady) {
+        return;
+      }
       const result = courses.find(
         (course) => course.courseData.id === newCourse.courseData.id,
       );
@@ -177,6 +182,7 @@ export function useAppState(): {
       );
     },
     [
+      catalogReady,
       courses,
       availableTimes,
       workspaces,
@@ -188,6 +194,9 @@ export function useAppState(): {
 
   const removeCourse = useCallback(
     (course: CourseStorage) => {
+      if (!catalogReady) {
+        return;
+      }
       let newCourses = courses.filter((currCourse) => currCourse !== course);
       const newArrangements = generateCourseSections(
         newCourses,
@@ -219,6 +228,7 @@ export function useAppState(): {
       );
     },
     [
+      catalogReady,
       courses,
       availableTimes,
       workspaces,
@@ -230,6 +240,9 @@ export function useAppState(): {
 
   const toggleCourse = useCallback(
     (newCourse: CourseStorage) => {
+      if (!catalogReady) {
+        return;
+      }
       let newCourses = courses.map((course) => {
         if (course.courseData.id === newCourse.courseData.id) {
           newCourse.enabled = !newCourse.enabled;
@@ -273,6 +286,7 @@ export function useAppState(): {
       );
     },
     [
+      catalogReady,
       courses,
       availableTimes,
       arrangementIdx,
@@ -285,6 +299,9 @@ export function useAppState(): {
 
   const toggleSectionLock = useCallback(
     (newCourse: CourseStorage) => {
+      if (!catalogReady) {
+        return;
+      }
       let newCourses = courses.map((course) => {
         if (course.courseData.id === newCourse.courseData.id) {
           newCourse.locked = !newCourse.locked;
@@ -324,6 +341,7 @@ export function useAppState(): {
       );
     },
     [
+      catalogReady,
       courses,
       availableTimes,
       arrangementIdx,
@@ -335,6 +353,9 @@ export function useAppState(): {
   );
 
   const nextArrangement = useCallback(() => {
+    if (!catalogReady) {
+      return;
+    }
     const workspace = workspaces[workspaceIdx];
     let newIdx = workspace.arrangementIdx;
     if (workspace.arrangements.length === 0) {
@@ -356,9 +377,12 @@ export function useAppState(): {
         arrangementIdx: newIdx,
       }),
     );
-  }, [workspaces, workspaceIdx, indexedCourses, setWorkspaces]);
+  }, [catalogReady, workspaces, workspaceIdx, indexedCourses, setWorkspaces]);
 
   const prevArrangement = useCallback(() => {
+    if (!catalogReady) {
+      return;
+    }
     const workspace = workspaces[workspaceIdx];
     let newIdx = workspace.arrangementIdx;
     if (workspace.arrangements.length === 0) {
@@ -382,10 +406,13 @@ export function useAppState(): {
         arrangementIdx: newIdx,
       }),
     );
-  }, [workspaces, workspaceIdx, indexedCourses, setWorkspaces]);
+  }, [catalogReady, workspaces, workspaceIdx, indexedCourses, setWorkspaces]);
 
   const setCourses = useCallback(
     (courses: CourseStorage[]) => {
+      if (!catalogReady) {
+        return;
+      }
       let newCourses = courses;
       const newArrangements = generateCourseSections(
         newCourses,
@@ -416,7 +443,14 @@ export function useAppState(): {
         }),
       );
     },
-    [availableTimes, workspaces, workspaceIdx, indexedCourses, setWorkspaces],
+    [
+      catalogReady,
+      availableTimes,
+      workspaces,
+      workspaceIdx,
+      indexedCourses,
+      setWorkspaces,
+    ],
   );
 
   const setWorkspace = useCallback(
@@ -433,6 +467,9 @@ export function useAppState(): {
 
   const updateAvailableTimes = useCallback(
     (dayIdx: number, isStart: boolean, day: Date) => {
+      if (!catalogReady) {
+        return;
+      }
       const newAvailableTimes = setArrayIdx(availableTimes, dayIdx, [
         isStart ? day : availableTimes[dayIdx][0],
         isStart ? availableTimes[dayIdx][1] : day,
@@ -476,6 +513,7 @@ export function useAppState(): {
       );
     },
     [
+      catalogReady,
       courses,
       availableTimes,
       arrangements,

From 00a6cc302e4db29142e668bcb2b3537843bf878d Mon Sep 17 00:00:00 2001
From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Date: Thu, 11 Jun 2026 02:46:32 +0000
Subject: [PATCH 3/7] fix: log error when term catalog fails to load

Co-Authored-By: Rahul Chalamala <22563365+rchalamala@users.noreply.github.com>
---
 src/useAppState.ts | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/useAppState.ts b/src/useAppState.ts
index 574de24..f9869f1 100644
--- a/src/useAppState.ts
+++ b/src/useAppState.ts
@@ -72,11 +72,15 @@ export function useAppState(): {
       return;
     }
     setIndexedCourses({});
-    loadCourseIndex(realPath).then((index) => {
-      if (!cancelled) {
-        setIndexedCourses(index);
-      }
-    });
+    loadCourseIndex(realPath)
+      .then((index) => {
+        if (!cancelled) {
+          setIndexedCourses(index);
+        }
+      })
+      .catch((error: unknown) => {
+        console.error(`Failed to load course data for ${realPath}:`, error);
+      });
     return () => {
       cancelled = true;
     };

From b88d8f0379d5ab127676d02fb4df366f3f5be6ce Mon Sep 17 00:00:00 2001
From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Date: Thu, 11 Jun 2026 02:59:03 +0000
Subject: [PATCH 4/7] fix: sync catalog state before paint when the term
 changes

Co-Authored-By: Rahul Chalamala <22563365+rchalamala@users.noreply.github.com>
---
 src/useAppState.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/useAppState.ts b/src/useAppState.ts
index f9869f1..0d0d307 100644
--- a/src/useAppState.ts
+++ b/src/useAppState.ts
@@ -64,7 +64,9 @@ export function useAppState(): {
   const [indexedCourses, setIndexedCourses] = useState<CourseIndex>(
     () => getCachedCourseIndex(realPath) ?? {},
   );
-  useEffect(() => {
+  // sync from the cache before paint so indexedCourses never lags behind
+  // the workspace data when the term changes
+  useLayoutEffect(() => {
     let cancelled = false;
     const cached = getCachedCourseIndex(realPath);
     if (cached) {

From 21339b8f1d883aba26052cc8e34666b0718e0d66 Mon Sep 17 00:00:00 2001
From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Date: Thu, 11 Jun 2026 04:14:27 +0000
Subject: [PATCH 5/7] build: use function-form manualChunks for rolldown
 compatibility

Co-Authored-By: Rahul Chalamala <22563365+rchalamala@users.noreply.github.com>
---
 vite.config.ts | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/vite.config.ts b/vite.config.ts
index 54385a7..237e40b 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -18,16 +18,18 @@ export default defineConfig({
     chunkSizeWarningLimit: 700,
     rollupOptions: {
       output: {
-        manualChunks: {
-          react: ["react", "react-dom", "react-dom/client"],
-          mui: ["@mui/material", "@mui/icons-material"],
-          schedulex: [
-            "@schedule-x/calendar",
-            "@schedule-x/react",
-            "@schedule-x/theme-default",
-            "@schedule-x/events-service",
-          ],
-          motion: ["motion"],
+        manualChunks(id: string) {
+          if (!id.includes("node_modules")) return;
+          if (/node_modules\/(react|react-dom|scheduler)\//.test(id))
+            return "react";
+          if (id.includes("node_modules/@mui/")) return "mui";
+          if (id.includes("node_modules/@schedule-x/")) return "schedulex";
+          if (
+            /node_modules\/(motion|framer-motion|motion-dom|motion-utils)\//.test(
+              id,
+            )
+          )
+            return "motion";
         },
       },
     },

From 0fc9466d47044f8de136ed48aef8e2b8cd6baa2f Mon Sep 17 00:00:00 2001
From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Date: Thu, 11 Jun 2026 04:27:01 +0000
Subject: [PATCH 6/7] fix: re-sync search options after async catalog load

Co-Authored-By: Rahul Chalamala <22563365+rchalamala@users.noreply.github.com>
---
 src/Workspace.tsx | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/Workspace.tsx b/src/Workspace.tsx
index 4e0f54b..aa58406 100644
--- a/src/Workspace.tsx
+++ b/src/Workspace.tsx
@@ -1,4 +1,4 @@
-import { use, useState } from "react";
+import { use, useEffect, useState } from "react";
 import Modal, { useModal } from "./Modal";
 import Select from "react-select";
 import { SingleValue } from "react-select";
@@ -419,6 +419,16 @@ function WorkspaceSearch() {
     options = courses;
   }
 
+  // catalogs load asynchronously; re-sync the options once courses arrive
+  // so the dropdown isn't stuck empty if the user touched it while loading
+  const courseCount = courses.length;
+  useEffect(() => {
+    if (courseCount > 0) {
+      setOptions(courses);
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [courseCount]);
+
   const [selectedCourse, setCourse] = useState<Maybe<CourseData>>(null);
 
   const handleSelect = (courseData: SingleValue<CourseData>) => {

From 9e6810e7d2e177a199141bf088198fa77da10805 Mon Sep 17 00:00:00 2001
From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Date: Thu, 11 Jun 2026 04:36:46 +0000
Subject: [PATCH 7/7] fix: key search option re-sync on catalog identity

Co-Authored-By: Rahul Chalamala <22563365+rchalamala@users.noreply.github.com>
---
 src/Workspace.tsx | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/Workspace.tsx b/src/Workspace.tsx
index aa58406..fd31ec0 100644
--- a/src/Workspace.tsx
+++ b/src/Workspace.tsx
@@ -419,15 +419,11 @@ function WorkspaceSearch() {
     options = courses;
   }
 
-  // catalogs load asynchronously; re-sync the options once courses arrive
-  // so the dropdown isn't stuck empty if the user touched it while loading
-  const courseCount = courses.length;
+  // catalogs load asynchronously; re-sync the options whenever the catalog
+  // changes so the dropdown never shows stale or empty results
   useEffect(() => {
-    if (courseCount > 0) {
-      setOptions(courses);
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [courseCount]);
+    setOptions(Object.values(indexedCourses));
+  }, [indexedCourses]);
 
   const [selectedCourse, setCourse] = useState<Maybe<CourseData>>(null);