Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
769e0e8
Initial plan
Copilot Aug 9, 2025
0cf0a3a
Initial setup: Remove external dependencies for Blueprint v6 migration
Copilot Aug 9, 2025
f06e04e
Migrate to Blueprint v6: Update dependencies and fix core breaking ch…
Copilot Aug 9, 2025
11357f4
Complete Blueprint v6 migration: Fix xlsx dependencies and verify UI …
Copilot Aug 9, 2025
5a931b1
Revert some dependency changes
RichDom2185 Aug 9, 2025
28be670
Reformat
RichDom2185 Aug 9, 2025
f0d24e6
Simplify some changes
RichDom2185 Aug 9, 2025
105c6e8
Revert XLSX changes
RichDom2185 Aug 9, 2025
6bd946a
Revert conductor changes
RichDom2185 Aug 9, 2025
6f9a4f8
Revert more conductor changes
RichDom2185 Aug 9, 2025
e5a2373
Revert more XLSX changes
RichDom2185 Aug 9, 2025
0c2b333
Organize imports
RichDom2185 Aug 9, 2025
25c9f88
Reapply some dependency updates as they are non-breaking
RichDom2185 Aug 9, 2025
8fb85f4
Migrate some snapshots to bp6
RichDom2185 Aug 9, 2025
fa98dd0
Migrate remaining snapshots to bp6
RichDom2185 Aug 9, 2025
b80e06a
Revert sharedb update
RichDom2185 Aug 9, 2025
553f7b9
Pin sharedb to 2.1.1
RichDom2185 Aug 9, 2025
15e0655
Update missed snapshots
RichDom2185 Aug 9, 2025
247a8ae
Fix format script on Windows
RichDom2185 Aug 9, 2025
283a9c7
Fix format
RichDom2185 Aug 9, 2025
83d1df3
Update markdown dependencies
RichDom2185 Aug 9, 2025
1de1953
Update Vite for tests
RichDom2185 Aug 9, 2025
c9cb626
Update bp5 to bp6 in stepper code block
sayomaki Aug 10, 2025
7a18553
Remove hardcoded classes
RichDom2185 Aug 10, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .prettierrc
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
"singleQuote": true,
"printWidth": 100,
"arrowParens": "avoid",
"trailingComma": "none"
"trailingComma": "none",
"endOfLine": "auto"
}
2 changes: 1 addition & 1 deletion eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
// @ts-check

// import eslint from '@eslint/js';
import { config, configs } from 'typescript-eslint';
import reactPlugin from 'eslint-plugin-react';
import reactHooksPlugin from 'eslint-plugin-react-hooks';
import simpleImportSort from 'eslint-plugin-simple-import-sort';
import { config, configs } from 'typescript-eslint';
// import reactRefresh from 'eslint-plugin-react-refresh';

export default config(
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,17 +31,17 @@
"preview": "rsbuild preview"
},
"dependencies": {
"@blueprintjs/core": "^5.10.1",
"@blueprintjs/datetime2": "^2.3.3",
"@blueprintjs/core": "^6.0.0",
"@blueprintjs/datetime": "^6.0.0",
"@blueprintjs/icons": "^6.0.0",
"@blueprintjs/select": "^5.1.3",
"@blueprintjs/select": "^6.0.0",
"@convergencelabs/ace-collab-ext": "^0.6.0",
"@mantine/hooks": "^7.11.2",
"@octokit/rest": "^22.0.0",
"@reduxjs/toolkit": "^1.9.7",
"@sentry/browser": "^8.33.0",
"@sourceacademy/c-slang": "^1.0.21",
"@sourceacademy/sharedb-ace": "^2.1.1",
"@sourceacademy/sharedb-ace": "2.1.1",
"@sourceacademy/sling-client": "^0.1.0",
"@szhsin/react-menu": "^4.0.0",
"@tanstack/react-table": "^8.9.3",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ exports[`ContentDisplay page renders correctly 1`] = `
className="col-md-10 col-xs-11 contentdisplay-content-parent"
>
<div
className="contentdisplay-content bp5-card bp5-elevation-3"
className="contentdisplay-content bp6-card bp6-elevation-3"
>
<div>
Test Content
Expand Down
2 changes: 1 addition & 1 deletion src/commons/__tests__/__snapshots__/Markdown.test.tsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

exports[`Markdown page renders correctly 1`] = `
<div
className="md bp5-running-text"
className="md bp6-running-text"
dangerouslySetInnerHTML={
{
"__html": "<p>Welcome to the Source Academy playground!</p>
Expand Down
2 changes: 1 addition & 1 deletion src/commons/achievement/AchievementFilter.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const AchievementFilter: React.FC<Props> = ({ filterState, icon, ownStatus }) =>
onClick={() => setGlobalStatus(ownStatus)}
style={{ color: getFilterColor(globalStatus, ownStatus) }}
>
<Icon icon={icon} iconSize={30} />
<Icon icon={icon} size={30} />
<p>{ownStatus}</p>
</div>
);
Expand Down
2 changes: 1 addition & 1 deletion src/commons/achievement/AchievementView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ const AchievementView: React.FC<Props> = ({ focusUuid, userState }) => {
if (focusUuid === '') {
return (
<div className="no-view">
<Icon icon={IconNames.MOUNTAIN} iconSize={60} />
<Icon icon={IconNames.MOUNTAIN} size={60} />
<h2>Select an achievement</h2>
</div>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ const EditableDate: React.FC<Props> = ({ type, date, changeDate }) => {
title={`${type}`}
>
<DatePicker
onChange={changeDate}
onChange={selectedDate => changeDate(selectedDate || undefined)}
timePickerProps={{ showArrowButtons: true }}
value={date}
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ const EditableDate: React.FC<Props> = ({ type, date, changeDate }) => {
title={`${type}`}
>
<DatePicker
onChange={changeDate}
onChange={selectedDate => changeDate(selectedDate || undefined)}
timePickerProps={{ showArrowButtons: true }}
value={date}
/>
Expand Down
4 changes: 2 additions & 2 deletions src/commons/assessment/Assessment.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -226,14 +226,14 @@ const Assessment: React.FC = () => {
<div className="listing-footer">
<div>
<Text className="listing-due-date">
<Icon className="listing-due-icon" iconSize={12} icon={IconNames.CALENDAR} />
<Icon className="listing-due-icon" size={12} icon={IconNames.CALENDAR} />
{`${beforeNow(overview.openAt) ? 'Opened' : 'Opens'}: ${getPrettyDate(
overview.openAt
)}`}
</Text>
{beforeNow(overview.openAt) && (
<Text className="listing-due-date">
<Icon className="listing-due-icon" iconSize={12} icon={IconNames.TIME} />
<Icon className="listing-due-icon" size={12} icon={IconNames.TIME} />
{`Due: ${getPrettyDate(overview.closeAt)}`}
</Text>
)}
Expand Down
Loading
Loading