Merge branch 'main' into sgunter/fix-ics-calendar-export-dates

Longhorn-Developers · Mar 1, 2025 · b211849 · b211849
2 parents 87d6a3c + 56a82ba
commit b211849
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 21 deletions.
diff --git a/.github/workflows/best-practices.yml b/.github/workflows/best-practices.yml
@@ -13,9 +13,9 @@ jobs:
                   fetch-depth: 0
 
             - name: Setup pnpm
-              uses: pnpm/action-setup@v3
+              uses: pnpm/action-setup@v4
               with:
-                  version: 9
+                  version: 10
 
             - name: Install dependencies
               run: pnpm install
@@ -32,9 +32,9 @@ jobs:
                   fetch-depth: 0
 
             - name: Setup pnpm
-              uses: pnpm/action-setup@v3
+              uses: pnpm/action-setup@v4
               with:
-                  version: 9
+                  version: 10
 
             - name: Install dependencies
               run: pnpm install

diff --git a/.github/workflows/check-types.yml b/.github/workflows/check-types.yml
@@ -13,9 +13,9 @@ jobs:
                   fetch-depth: 0
 
             - name: Setup pnpm
-              uses: pnpm/action-setup@v3
+              uses: pnpm/action-setup@v4
               with:
-                  version: 9
+                  version: 10
 
             - name: Install dependencies
               run: pnpm install

diff --git a/.github/workflows/chromatic.yml b/.github/workflows/chromatic.yml
@@ -11,9 +11,9 @@ jobs:
               with:
                   fetch-depth: 0
             - name: Setup pnpm
-              uses: pnpm/action-setup@v3
+              uses: pnpm/action-setup@v4
               with:
-                  version: 9
+                  version: 10
 
             - name: Install dependencies
               run: pnpm install

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -13,9 +13,9 @@ jobs:
                   fetch-depth: 0
 
             - name: Setup pnpm
-              uses: pnpm/action-setup@v3
+              uses: pnpm/action-setup@v4
               with:
-                  version: 9
+                  version: 10
 
             - name: Install dependencies
               run: pnpm install

diff --git a/Dockerfile b/Dockerfile
@@ -2,7 +2,7 @@
 FROM node:20.9.0-alpine AS base
 
 # Install pnpm
-RUN npm install -g pnpm
+RUN npm install -g pnpm@latest-10
 
 # Set working directory
 WORKDIR /app

diff --git a/package.json b/package.json
@@ -145,6 +145,10 @@
         "vite-plugin-inspect": "^0.8.9",
         "vitest": "^2.1.9"
     },
+    "engineStrict": true,
+    "engines": {
+        "pnpm": "^10"
+    },
     "pnpm": {
         "patchedDependencies": {
             "@crxjs/[email protected]": "patches/@[email protected]",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/views/components/calendar/CalendarBottomBar.tsx b/src/views/components/calendar/CalendarBottomBar.tsx
@@ -32,7 +32,7 @@ export default function CalendarBottomBar({ courseCells, setCourse }: CalendarBo
                 {displayCourses && (
                     <>
                         <Text variant='p' className='text-ut-black uppercase'>
-                            Unscheduled
+                            Async / Other
                         </Text>
                         <Text variant='h4' className='text-theme-offwhite/50'>
                             —

diff --git a/src/views/components/injected/CourseCatalogInjectedPopup/GradeDistribution.tsx b/src/views/components/injected/CourseCatalogInjectedPopup/GradeDistribution.tsx
@@ -260,7 +260,7 @@ export default function GradeDistribution({ course }: GradeDistributionProps): J
                                 ))}
                         </select>
                         <Link variant='small' href={UT_GRADE_DISTRIBUTION_URL} className='link'>
-                            About the data
+                            Data Source
                         </Link>
                     </div>
                     {distributions[semester] && !distributions[semester]!.instructorIncluded && (