diff --git a/.github/workflows/best-practices.yml b/.github/workflows/best-practices.yml index fc1a77848..1f8fd579b 100644 --- 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 index ce5570830..0ffd77da7 100644 --- 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 index a4219b2dc..a0fb4dfe2 100644 --- 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 index 95868067e..1e6227dcd 100644 --- 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 index 82a5ae10a..9b310b100 100644 --- 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 index 75073fb82..92f8ca29b 100644 --- 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/vite-plugin@2.0.0-beta.21": "patches/@crxjs__vite-plugin@2.0.0-beta.21.patch", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c7db854b5..37c32c911 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -9,10 +9,10 @@ overrides: patchedDependencies: '@crxjs/vite-plugin@2.0.0-beta.21': - hash: xq4uab3o3kbvv4gixvawl2aj5q + hash: 638b2575ead9e3df6bf5df962712f1fcbddf1d7ac61ce8dce0cfcc471d404a03 path: patches/@crxjs__vite-plugin@2.0.0-beta.21.patch '@unocss/vite': - hash: 5ptgy7mbavmjf7zwexb7dph4ji + hash: 9e2d2732a6e057a2ca90fba199730f252d8b4db8631b2c6ee0854fce7771bc95 path: patches/@unocss__vite.patch importers: @@ -48,7 +48,7 @@ importers: version: 8.55.0(react@18.3.1) '@unocss/vite': specifier: ^0.63.6 - version: 0.63.6(patch_hash=5ptgy7mbavmjf7zwexb7dph4ji)(rollup@4.34.8)(typescript@5.7.3)(vite@5.4.14(@types/node@22.13.5)(sass@1.85.1)(terser@5.39.0)) + version: 0.63.6(patch_hash=9e2d2732a6e057a2ca90fba199730f252d8b4db8631b2c6ee0854fce7771bc95)(rollup@4.34.8)(typescript@5.7.3)(vite@5.4.14(@types/node@22.13.5)(sass@1.85.1)(terser@5.39.0)) '@vitejs/plugin-react': specifier: ^4.3.4 version: 4.3.4(vite@5.4.14(@types/node@22.13.5)(sass@1.85.1)(terser@5.39.0)) @@ -124,7 +124,7 @@ importers: version: 19.5.0 '@crxjs/vite-plugin': specifier: 2.0.0-beta.21 - version: 2.0.0-beta.21(patch_hash=xq4uab3o3kbvv4gixvawl2aj5q) + version: 2.0.0-beta.21(patch_hash=638b2575ead9e3df6bf5df962712f1fcbddf1d7ac61ce8dce0cfcc471d404a03) '@iconify-json/bi': specifier: ^1.2.2 version: 1.2.2 @@ -7356,7 +7356,7 @@ snapshots: conventional-commits-filter: 5.0.0 conventional-commits-parser: 6.1.0 - '@crxjs/vite-plugin@2.0.0-beta.21(patch_hash=xq4uab3o3kbvv4gixvawl2aj5q)': + '@crxjs/vite-plugin@2.0.0-beta.21(patch_hash=638b2575ead9e3df6bf5df962712f1fcbddf1d7ac61ce8dce0cfcc471d404a03)': dependencies: '@rollup/pluginutils': 4.2.1 '@webcomponents/custom-elements': 1.6.0 @@ -9043,7 +9043,7 @@ snapshots: dependencies: '@unocss/core': 0.63.6 '@unocss/reset': 0.63.6 - '@unocss/vite': 0.63.6(patch_hash=5ptgy7mbavmjf7zwexb7dph4ji)(rollup@4.34.8)(typescript@5.7.3)(vite@5.4.14(@types/node@22.13.5)(sass@1.85.1)(terser@5.39.0)) + '@unocss/vite': 0.63.6(patch_hash=9e2d2732a6e057a2ca90fba199730f252d8b4db8631b2c6ee0854fce7771bc95)(rollup@4.34.8)(typescript@5.7.3)(vite@5.4.14(@types/node@22.13.5)(sass@1.85.1)(terser@5.39.0)) optionalDependencies: vite: 5.4.14(@types/node@22.13.5)(sass@1.85.1)(terser@5.39.0) transitivePeerDependencies: @@ -9196,7 +9196,7 @@ snapshots: dependencies: '@unocss/core': 0.63.6 - '@unocss/vite@0.63.6(patch_hash=5ptgy7mbavmjf7zwexb7dph4ji)(rollup@4.34.8)(typescript@5.7.3)(vite@5.4.14(@types/node@22.13.5)(sass@1.85.1)(terser@5.39.0))': + '@unocss/vite@0.63.6(patch_hash=9e2d2732a6e057a2ca90fba199730f252d8b4db8631b2c6ee0854fce7771bc95)(rollup@4.34.8)(typescript@5.7.3)(vite@5.4.14(@types/node@22.13.5)(sass@1.85.1)(terser@5.39.0))': dependencies: '@ampproject/remapping': 2.3.0 '@rollup/pluginutils': 5.1.4(rollup@4.34.8) @@ -14268,7 +14268,7 @@ snapshots: '@unocss/transformer-compile-class': 0.63.6 '@unocss/transformer-directives': 0.63.6 '@unocss/transformer-variant-group': 0.63.6 - '@unocss/vite': 0.63.6(patch_hash=5ptgy7mbavmjf7zwexb7dph4ji)(rollup@4.34.8)(typescript@5.7.3)(vite@5.4.14(@types/node@22.13.5)(sass@1.85.1)(terser@5.39.0)) + '@unocss/vite': 0.63.6(patch_hash=9e2d2732a6e057a2ca90fba199730f252d8b4db8631b2c6ee0854fce7771bc95)(rollup@4.34.8)(typescript@5.7.3)(vite@5.4.14(@types/node@22.13.5)(sass@1.85.1)(terser@5.39.0)) optionalDependencies: vite: 5.4.14(@types/node@22.13.5)(sass@1.85.1)(terser@5.39.0) transitivePeerDependencies: diff --git a/src/views/components/calendar/CalendarBottomBar.tsx b/src/views/components/calendar/CalendarBottomBar.tsx index fac2a031e..7b9831da4 100644 --- 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 && ( <> - Unscheduled + Async / Other — diff --git a/src/views/components/injected/CourseCatalogInjectedPopup/GradeDistribution.tsx b/src/views/components/injected/CourseCatalogInjectedPopup/GradeDistribution.tsx index 53fd4e3ad..e1aa6e999 100644 --- 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 ))} - About the data + Data Source {distributions[semester] && !distributions[semester]!.instructorIncluded && (