Merge branch 'master' into assessment-hotfix

Author: RichDom2185

.prettierrc

@@ -3,5 +3,6 @@
   "singleQuote": true,
   "printWidth": 100,
   "arrowParens": "avoid",
-  "trailingComma": "none"
+  "trailingComma": "none",
+  "endOfLine": "auto"
 }

eslint.config.mjs

@@ -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(

package.json

@@ -31,21 +31,22 @@
     "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.0.3",
+    "@sourceacademy/sharedb-ace": "2.1.1",
     "@sourceacademy/sling-client": "^0.1.0",
     "@szhsin/react-menu": "^4.0.0",
     "@tanstack/react-table": "^8.9.3",
     "@tremor/react": "^1.8.2",
-    "ace-builds": "^1.36.3",
+    "ace-builds": "^1.42.1",
     "acorn": "^8.9.0",
     "ag-grid-community": "^32.3.1",
     "ag-grid-react": "^32.3.1",
@@ -60,6 +61,7 @@
     "hastscript": "^9.0.0",
     "i18next": "^25.0.0",
     "i18next-browser-languagedetector": "^8.0.0",
+    "immer": "^9.0.21",
     "java-slang": "^1.0.13",
     "js-cookie": "^3.0.5",
     "js-slang": "^1.0.84",
@@ -115,7 +117,6 @@
     "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
     "@babel/preset-typescript": "^7.24.1",
     "@babel/runtime": "^7.24.5",
-    "@convergencelabs/ace-collab-ext": "^0.6.0",
     "@rsbuild/core": "^1.3.12",
     "@rsbuild/plugin-eslint": "^1.1.1",
     "@rsbuild/plugin-node-polyfill": "^1.3.0",
@@ -127,7 +128,7 @@
     "@testing-library/dom": "^10.4.0",
     "@testing-library/jest-dom": "^6.0.0",
     "@testing-library/react": "^16.0.0",
-    "@testing-library/user-event": "^14.4.3",
+    "@testing-library/user-event": "^14.6.0",
     "@types/estree": "^1.0.5",
     "@types/gapi": "^0.0.47",
     "@types/gapi.auth2": "^0.0.61",
@@ -147,14 +148,14 @@
     "@types/redux-mock-store": "^1.0.3",
     "@types/showdown": "^2.0.1",
     "@types/xml2js": "^0.4.11",
-    "@vitejs/plugin-react-swc": "^3.11.0",
+    "@vitejs/plugin-react-swc": "^4.0.0",
     "@vitest/coverage-v8": "3.2.4",
     "@vitest/ui": "^3.2.4",
     "buffer": "^6.0.3",
     "canvas": "^3.1.0",
     "constants-browserify": "^1.0.0",
     "coveralls": "^3.1.1",
-    "cross-env": "^7.0.3",
+    "cross-env": "^10.0.0",
     "eslint": "^9.9.0",
     "eslint-plugin-react": "^7.35.0",
     "eslint-plugin-react-hooks": "^5.2.0",
@@ -163,7 +164,7 @@
     "https-browserify": "^1.0.0",
     "husky": "^9.0.0",
     "identity-obj-proxy": "^3.0.0",
-    "jsdom": "^25.0.1",
+    "jsdom": "^26.0.0",
     "npm-run-all2": "^8.0.0",
     "os-browserify": "^0.3.0",
     "path": "^0.12.7",

src/commons/__tests__/__snapshots__/ContentDisplay.test.tsx.snap

@@ -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 

src/commons/__tests__/__snapshots__/Markdown.test.tsx.snap

@@ -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>

src/commons/achievement/AchievementFilter.tsx

@@ -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>
   );

src/commons/achievement/AchievementView.tsx

@@ -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>
     );

src/commons/achievement/control/achievementEditor/EditableDate.tsx

@@ -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}
         />

src/commons/achievement/control/goalEditor/EditableDate.tsx

@@ -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}
         />

src/commons/application/ApplicationTypes.ts

@@ -348,7 +348,6 @@ export const defaultAchievement: AchievementState = {
 };
 
 export const defaultLeaderboard: LeaderboardState = {
-  userXp: [],
   paginatedUserXp: { rows: [], userCount: 0 },
   contestScore: [],
   contestPopularVote: [],
@@ -430,7 +429,8 @@ export const createDefaultWorkspace = (workspaceLocation: WorkspaceLocation): Wo
   enableDebugging: true,
   debuggerContext: {} as DebuggerContext,
   lastDebuggerResult: undefined,
-  files: {}
+  files: {},
+  updateUserRoleCallback: () => {}
 });
 
 const defaultFileName = 'program.js';