Skip to content

Merge new changes to master into y-course-refactor#1754

Merged
david-yz-liu merged 35 commits into
Courseography:y-course-refactorfrom
Purplegaze:y-session-merge2
Jul 7, 2026
Merged

Merge new changes to master into y-course-refactor#1754
david-yz-liu merged 35 commits into
Courseography:y-course-refactorfrom
Purplegaze:y-session-merge2

Conversation

@Purplegaze

@Purplegaze Purplegaze commented Jul 7, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

Proposed Changes

Merges new changes that were made to the master branch since the last merge to y-course-refactor and resolves any resulting conflicts.

...

Screenshots of your changes (if applicable)

Type of Change

(Write an X or a brief description next to the type or types that best describe your changes.)

Type Applies?
🚨 Breaking change (fix or feature that would cause existing functionality to change)
✨ New feature (non-breaking change that adds functionality)
🐛 Bug fix (non-breaking change that fixes an issue)
🎨 User interface change (change to user interface; provide screenshots)
♻️ Refactoring (internal change to codebase, without changing functionality)
🚦 Test update (change that only adds or modifies tests)
📦 Dependency update (change that updates a dependency)
🔧 Internal (change that only affects developers or continuous integration) X

Checklist

(Complete each of the following items for your pull request. Indicate that you have completed an item by changing the [ ] into a [x] in the raw text, or by clicking on the checkbox in the rendered description on GitHub.)

Before opening your pull request:

  • I have performed a self-review of my changes.
    • Check that all changed files included in this pull request are intentional changes.
    • Check that all changes are relevant to the purpose of this pull request, as described above.
  • I have added tests for my changes, if applicable.
    • This is required for all bug fixes and new features.
  • I have updated the project documentation, if applicable.
    • This is required for new features.
  • If this is my first contribution, I have added myself to the list of contributors.
  • I have updated the project Changelog (this is required for all changes).

After opening your pull request:

  • I have verified that the CircleCI checks have passed.
  • I have requested a review from a project maintainer.

Questions and Comments

(Include any questions or comments you have regarding your changes.)

r-weng and others added 30 commits May 22, 2026 09:47
@r-weng
Added tests for JSON parsing of Time' data type (Courseography#1706)
aa12db7
@AngelsandDevsLOL
Add tests for Database.Tables FromJSON Meeting instance (Courseograph…
e21e084 
…y#1707)
@dependabot
build(deps): bump tmp from 0.2.5 to 0.2.7 (Courseography#1717)
3a2ebe7 
Bumps [tmp](https://github.com/raszi/node-tmp) from 0.2.5 to 0.2.7.
- [Changelog](https://github.com/raszi/node-tmp/blob/master/CHANGELOG.md)
- [Commits](raszi/node-tmp@v0.2.5...v0.2.7)

---
updated-dependencies:
- dependency-name: tmp
  dependency-version: 0.2.7
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@r-weng
Refactored graph helper functions from Svg.Database to Models.Graph (C…
bc71bea 
…ourseography#1716)
@r-weng
Updated documentation in Util.Blaze (Courseography#1719)
61112ab
@AngelsandDevsLOL
Refactored Building and Time functions into Models (Courseography#1718)
4921e7c
@r-weng
Removed SvgJSON data type (Courseography#1720)
70767e4 
Replaced SvgJSON with ([Text], [Shape], [Path]) instead.
@dependabot
build(deps-dev): bump the jest group with 2 updates (Courseography#1724)
150bafe 
Bumps the jest group with 2 updates: [jest](https://github.com/jestjs/jest/tree/HEAD/packages/jest) and [jest-environment-jsdom](https://github.com/jestjs/jest/tree/HEAD/packages/jest-environment-jsdom).


Updates `jest` from 30.3.0 to 30.4.2
- [Release notes](https://github.com/jestjs/jest/releases)
- [Changelog](https://github.com/jestjs/jest/blob/main/CHANGELOG.md)
- [Commits](https://github.com/jestjs/jest/commits/v30.4.2/packages/jest)

Updates `jest-environment-jsdom` from 30.3.0 to 30.4.1
- [Release notes](https://github.com/jestjs/jest/releases)
- [Changelog](https://github.com/jestjs/jest/blob/main/CHANGELOG.md)
- [Commits](https://github.com/jestjs/jest/commits/v30.4.1/packages/jest-environment-jsdom)

---
updated-dependencies:
- dependency-name: jest
  dependency-version: 30.4.2
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: jest
- dependency-name: jest-environment-jsdom
  dependency-version: 30.4.1
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: jest
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
build(deps): bump the babel group across 1 directory with 5 updates (C…
2bac4c6 
…ourseography#1723)

Bumps the babel group with 5 updates in the / directory:

| Package | From | To |
| --- | --- | --- |
| [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime) | `7.29.2` | `7.29.7` |
| [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) | `7.29.0` | `7.29.7` |
| [@babel/eslint-parser](https://github.com/babel/babel/tree/HEAD/eslint/babel-eslint-parser) | `7.28.6` | `7.29.7` |
| [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) | `7.29.3` | `7.29.7` |
| [@babel/preset-react](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-react) | `7.28.5` | `7.29.7` |



Updates `@babel/runtime` from 7.29.2 to 7.29.7
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.29.7/packages/babel-runtime)

Updates `@babel/core` from 7.29.0 to 7.29.7
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.29.7/packages/babel-core)

Updates `@babel/eslint-parser` from 7.28.6 to 7.29.7
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.29.7/eslint/babel-eslint-parser)

Updates `@babel/preset-env` from 7.29.3 to 7.29.7
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.29.7/packages/babel-preset-env)

Updates `@babel/preset-react` from 7.28.5 to 7.29.7
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.29.7/packages/babel-preset-react)

---
updated-dependencies:
- dependency-name: "@babel/core"
  dependency-version: 7.29.7
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: babel
- dependency-name: "@babel/eslint-parser"
  dependency-version: 7.29.7
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: babel
- dependency-name: "@babel/preset-env"
  dependency-version: 7.29.7
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: babel
- dependency-name: "@babel/preset-react"
  dependency-version: 7.29.7
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: babel
- dependency-name: "@babel/runtime"
  dependency-version: 7.29.7
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: babel
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@AngelsandDevsLOL
Renamed Course data type to CourseData (Courseography#1721)
432042e
@david-yz-liu
Updated CS graph and config for 2026-27 (Courseography#1726)
14b37a4
@david-yz-liu
Added privacy-preserving analytics using GoatCounter and updated priv…
95edff2 
…acy policy (Courseography#1727)
@dependabot
build(deps): bump the react group across 1 directory with 2 updates (C…
a46556b 
…ourseography#1700)

Bumps the react group with 2 updates in the / directory: [react](https://github.com/facebook/react/tree/HEAD/packages/react) and [react-dom](https://github.com/facebook/react/tree/HEAD/packages/react-dom).


Updates `react` from 19.2.4 to 19.2.7
- [Release notes](https://github.com/facebook/react/releases)
- [Changelog](https://github.com/facebook/react/blob/main/CHANGELOG.md)
- [Commits](https://github.com/facebook/react/commits/v19.2.7/packages/react)

Updates `react-dom` from 19.2.4 to 19.2.7
- [Release notes](https://github.com/facebook/react/releases)
- [Changelog](https://github.com/facebook/react/blob/main/CHANGELOG.md)
- [Commits](https://github.com/facebook/react/commits/v19.2.7/packages/react-dom)

---
updated-dependencies:
- dependency-name: react
  dependency-version: 19.2.5
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: react
- dependency-name: react-dom
  dependency-version: 19.2.5
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: react
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
build(deps): bump the ag-grid group across 1 directory with 2 updates (…
35a47ad 
…Courseography#1697)

Bumps the ag-grid group with 2 updates in the / directory: [ag-grid-community](https://github.com/ag-grid/ag-grid) and [ag-grid-react](https://github.com/ag-grid/ag-grid).


Updates `ag-grid-community` from 35.2.0 to 35.3.1
- [Release notes](https://github.com/ag-grid/ag-grid/releases)
- [Commits](ag-grid/ag-grid@release-35.2.0...release-35.3.1)

Updates `ag-grid-react` from 35.2.0 to 35.3.1
- [Release notes](https://github.com/ag-grid/ag-grid/releases)
- [Commits](ag-grid/ag-grid@release-35.2.0...release-35.3.1)

---
updated-dependencies:
- dependency-name: ag-grid-community
  dependency-version: 35.2.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: ag-grid
- dependency-name: ag-grid-react
  dependency-version: 35.2.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: ag-grid
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
build(deps): bump shell-quote from 1.8.3 to 1.8.4 (Courseography#1728)
07281cf 
Bumps [shell-quote](https://github.com/ljharb/shell-quote) from 1.8.3 to 1.8.4.
- [Changelog](https://github.com/ljharb/shell-quote/blob/main/CHANGELOG.md)
- [Commits](ljharb/shell-quote@v1.8.3...v1.8.4)

---
updated-dependencies:
- dependency-name: shell-quote
  dependency-version: 1.8.4
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@david-yz-liu
chore: Run yarn dedupe (Courseography#1729)
8358a26
@david-yz-liu
Release version 0.8.0 (Courseography#1730)
3f3894e
@AngelsandDevsLOL
Renamed Courses datatype and table to Course (Courseography#1732)
31a48ae
@dependabot
build(deps): bump launch-editor from 2.11.1 to 2.14.1 (Courseography#…
054afb9 
…1733)

Bumps [launch-editor](https://github.com/vitejs/launch-editor) from 2.11.1 to 2.14.1.
- [Commits](vitejs/launch-editor@v2.11.1...v2.14.1)

---
updated-dependencies:
- dependency-name: launch-editor
  dependency-version: 2.14.1
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
build(deps-dev): bump webpack-dev-server from 5.2.4 to 5.2.5 (Courseo…
2a568d4 
…graphy#1734)

Bumps [webpack-dev-server](https://github.com/webpack/webpack-dev-server) from 5.2.4 to 5.2.5.
- [Release notes](https://github.com/webpack/webpack-dev-server/releases)
- [Changelog](https://github.com/webpack/webpack-dev-server/blob/main/CHANGELOG.md)
- [Commits](webpack/webpack-dev-server@v5.2.4...v5.2.5)

---
updated-dependencies:
- dependency-name: webpack-dev-server
  dependency-version: 5.2.5
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
build(deps): bump form-data from 4.0.4 to 4.0.6 (Courseography#1735)
fca3906 
Bumps [form-data](https://github.com/form-data/form-data) from 4.0.4 to 4.0.6.
- [Changelog](https://github.com/form-data/form-data/blob/master/CHANGELOG.md)
- [Commits](form-data/form-data@v4.0.4...v4.0.6)

---
updated-dependencies:
- dependency-name: form-data
  dependency-version: 4.0.6
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
build(deps): bump tar from 7.5.11 to 7.5.16 (Courseography#1736)
112ebfb 
Bumps [tar](https://github.com/isaacs/node-tar) from 7.5.11 to 7.5.16.
- [Release notes](https://github.com/isaacs/node-tar/releases)
- [Changelog](https://github.com/isaacs/node-tar/blob/main/CHANGELOG.md)
- [Commits](isaacs/node-tar@v7.5.11...v7.5.16)

---
updated-dependencies:
- dependency-name: tar
  dependency-version: 7.5.16
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@AngelsandDevsLOL
Changed background colour of application (Courseography#1737)
5b8463c
@r-weng
Refactored parseArtSci to extract parseDepartmentList function (Cours…
c15ed5e 
…eography#1725)
@r-weng
Removed period after instructor's first name in course info modal (Co…
107873a 
…urseography#1743)
@david-yz-liu
Updated CircleCI download link for ImageMagick (Courseography#1749)
438a592
@dependabot
build(deps): bump http-proxy-middleware from 2.0.9 to 2.0.10 (Courseo…
e492827 
…graphy#1744)

Bumps [http-proxy-middleware](https://github.com/chimurai/http-proxy-middleware) from 2.0.9 to 2.0.10.
- [Release notes](https://github.com/chimurai/http-proxy-middleware/releases)
- [Changelog](https://github.com/chimurai/http-proxy-middleware/blob/v2.0.10/CHANGELOG.md)
- [Commits](chimurai/http-proxy-middleware@v2.0.9...v2.0.10)

---
updated-dependencies:
- dependency-name: http-proxy-middleware
  dependency-version: 2.0.10
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
build(deps): bump js-yaml from 3.14.2 to 3.15.0 (Courseography#1745)
c3279fc 
Bumps [js-yaml](https://github.com/nodeca/js-yaml) from 3.14.2 to 3.15.0.
- [Changelog](https://github.com/nodeca/js-yaml/blob/master/CHANGELOG.md)
- [Commits](nodeca/js-yaml@3.14.2...3.15.0)

---
updated-dependencies:
- dependency-name: js-yaml
  dependency-version: 3.15.0
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
build(deps): bump the ag-grid group across 1 directory with 2 updates (…
8c19fcc 
…Courseography#1747)

Bumps the ag-grid group with 2 updates in the / directory: [ag-grid-community](https://github.com/ag-grid/ag-grid) and [ag-grid-react](https://github.com/ag-grid/ag-grid).


Updates `ag-grid-community` from 35.3.1 to 36.0.0
- [Release notes](https://github.com/ag-grid/ag-grid/releases)
- [Commits](ag-grid/ag-grid@release-35.3.1...release-36.0.0)

Updates `ag-grid-react` from 35.3.1 to 36.0.0
- [Release notes](https://github.com/ag-grid/ag-grid/releases)
- [Commits](ag-grid/ag-grid@release-35.3.1...release-36.0.0)

---
updated-dependencies:
- dependency-name: ag-grid-community
  dependency-version: 36.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: ag-grid
- dependency-name: ag-grid-react
  dependency-version: 36.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: ag-grid
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@david-yz-liu
Updated Javascript build configuration (Courseography#1750)
eb73994 
In preparation for the Babel v8 upgrade (Courseography#1748), this pull request makes a few updates to our Javascript build configuration:

- Removed `@babel/plugin-proposal-class-properties` dependency, which has been accepted into ES2022 and now is part of `@babel/preset-env`
- Removed redundant babel preset configuration (was in both `package.json` and `babel.config.js`)
- Fixed `corejs` version pinning (to v3.45.0)
- Added `browserslist` configuration
- Updated CircleCI config to use Node v24
david-yz-liu and others added 5 commits July 2, 2026 16:44
@david-yz-liu @claude
Upgraded to Babel 8 (Courseography#1751)
651a761 
Bumps @babel/core, @babel/preset-env, @babel/preset-react,
@babel/eslint-parser, babel-loader, and babel-jest to their Babel
8-compatible majors. preset-env's useBuiltIns/corejs options were
removed upstream in v8, so polyfilling is now handled by the
babel-plugin-polyfill-corejs3 plugin instead.

Verified: yarn test (196/196), yarn build, webpack.dev.js build, and
yarn eslint all pass clean.

Co-authored-by: Claude Sonnet 5 <noreply@anthropic.com>
@AngelsandDevsLOL
Fixed scrollbar display bug on /graph and /generate pages (Courseogra…
be1d888 
…phy#1742)
@dependabot
build(deps): bump @babel/runtime in the babel group across 1 directory (
ec3f2d3 
Courseography#1752)

Bumps the babel group with 1 update in the / directory: [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime).


Updates `@babel/runtime` from 7.29.7 to 8.0.0
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v8.0.0/packages/babel-runtime)

---
updated-dependencies:
- dependency-name: "@babel/runtime"
  dependency-version: 8.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: babel
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@r-weng
Fixed bool node centering in Generate page (Courseography#1746)
13bd7da
@Purplegaze
Merge branch 'master' of https://github.com/Courseography/courseography…
611eb6a 
… into y-session-merge2
@coveralls

coveralls commented Jul 7, 2026

Copy link
Copy Markdown

Coverage Report for CI Build 3

Coverage increased (+0.4%) to 59.237%

Details

  • Coverage increased (+0.4%) from the base build.
  • Patch coverage: 1 uncovered change across 1 file (18 of 19 lines covered, 94.74%).
  • No coverage regressions found.

Uncovered Changes

File Changed Covered %
app/WebParsing/ArtSciParser.hs 18 17 94.44%
Total (2 files) 19 18 94.74%

Coverage Regressions

No coverage regressions found.

Coverage Stats

Coverage Status
Relevant Lines: 3960
Covered Lines: 2401
Line Coverage: 60.63%
Relevant Branches: 966
Covered Branches: 517
Branch Coverage: 53.52%
Branches in Coverage %: Yes
Coverage Strength: 163.99 hits per line
💛 - Coveralls

@Purplegaze Purplegaze requested a review from david-yz-liu July 7, 2026 17:13
david-yz-liu
david-yz-liu approved these changes Jul 7, 2026
View reviewed changes

@david-yz-liu david-yz-liu left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice work, @Purplegaze!

@david-yz-liu david-yz-liu merged commit b42135f into Courseography:y-course-refactor Jul 7, 2026
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@david-yz-liu david-yz-liu david-yz-liu approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@Purplegaze @coveralls @david-yz-liu @r-weng @AngelsandDevsLOL