Merge branch 'master' into gradingAsync

Author: RichDom2185

package.json

@@ -40,7 +40,7 @@
     "@szhsin/react-menu": "^4.0.0",
     "@tanstack/react-table": "^8.9.3",
     "@tremor/react": "^1.8.2",
-    "ace-builds": "^1.4.14",
+    "ace-builds": "^1.36.3",
     "acorn": "^8.9.0",
     "ag-grid-community": "^32.0.2",
     "ag-grid-react": "^32.0.2",
@@ -53,7 +53,7 @@
     "flexboxgrid-helpers": "^1.1.3",
     "hastscript": "^9.0.0",
     "i18next": "^23.11.2",
-    "i18next-browser-languagedetector": "^7.2.1",
+    "i18next-browser-languagedetector": "^8.0.0",
     "java-slang": "^1.0.13",
     "js-cookie": "^3.0.5",
     "js-slang": "^1.0.76",
@@ -68,14 +68,14 @@
     "query-string": "^9.0.0",
     "re-resizable": "^6.9.9",
     "react": "^18.3.1",
-    "react-ace": "^10.1.0",
+    "react-ace": "^12.0.0",
     "react-copy-to-clipboard": "^5.1.0",
     "react-debounce-render": "^8.0.2",
     "react-dom": "^18.3.1",
     "react-drag-drop-files": "^2.3.10",
     "react-draggable": "^4.4.5",
     "react-dropzone": "^14.2.3",
-    "react-i18next": "^14.1.0",
+    "react-i18next": "^15.0.0",
     "react-konva": "^18.2.10",
     "react-latex-next": "^3.0.0",
     "react-mde": "^11.5.0",
@@ -94,7 +94,7 @@
     "showdown": "^2.1.0",
     "sourceror": "^0.8.5",
     "unified": "^11.0.0",
-    "uuid": "^9.0.0",
+    "uuid": "^11.0.2",
     "xlsx": "https://cdn.sheetjs.com/xlsx-0.20.2/xlsx-0.20.2.tgz",
     "xml2js": "^0.6.0",
     "yareco": "^0.1.5"
@@ -129,7 +129,6 @@
     "@types/react-test-renderer": "^18.0.0",
     "@types/redux-mock-store": "^1.0.3",
     "@types/showdown": "^2.0.1",
-    "@types/uuid": "^9.0.0",
     "@types/xml2js": "^0.4.11",
     "babel-jest": "^29.7.0",
     "buffer": "^6.0.3",
@@ -145,7 +144,7 @@
     "eslint-plugin-simple-import-sort": "^12.1.1",
     "https-browserify": "^1.0.0",
     "husky": "^9.0.0",
-    "npm-run-all2": "^6.0.0",
+    "npm-run-all2": "^7.0.0",
     "os-browserify": "^0.3.0",
     "path-browserify": "^1.0.1",
     "prettier": "^3.3.3",

renovate.json

@@ -1,13 +1,18 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": ["config:base", ":dependencyDashboard", "group:allNonMajor", ":label(dependencies)"],
+  "extends": [
+    "config:recommended",
+    ":dependencyDashboard",
+    "group:allNonMajor",
+    ":label(dependencies)"
+  ],
   "major": {
     "dependencyDashboardApproval": true
   },
   "packageRules": [
     {
-      "matchPackagePatterns": ["*"],
-      "rangeStrategy": "update-lockfile"
+      "rangeStrategy": "update-lockfile",
+      "matchPackageNames": ["*"]
     }
   ],
   "enabledManagers": ["npm"]

src/commons/assessmentWorkspace/AssessmentWorkspace.tsx

@@ -191,9 +191,10 @@ const AssessmentWorkspace: React.FC<AssessmentWorkspaceProps> = props => {
   }, []);
 
   useEffect(() => {
-    handleTeamOverviewFetch(props.assessmentId);
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
+    if (assessmentOverview && assessmentOverview.maxTeamSize > 1) {
+      handleTeamOverviewFetch(props.assessmentId);
+    }
+  }, [assessmentOverview, handleTeamOverviewFetch, props.assessmentId]);
 
   /**
    * After mounting (either an older copy of the assessment

src/commons/utils/AceHelper.ts

@@ -31,6 +31,15 @@ export const selectMode = (chapter: Chapter, variant: Variant, library: string)
   ModeSelector(chapter, variant, library);
 };
 
+import 'ace-builds/src-noconflict/mode-c_cpp';
+import 'ace-builds/src-noconflict/mode-html';
+import 'ace-builds/src-noconflict/mode-java';
+import 'ace-builds/src-noconflict/mode-javascript';
+import 'ace-builds/src-noconflict/mode-python';
+import 'ace-builds/src-noconflict/mode-scheme';
+import 'ace-builds/src-noconflict/mode-typescript';
+import 'js-slang/dist/editors/ace/theme/source';
+
 export const getModeString = (chapter: Chapter, variant: Variant, library: string) => {
   // TODO: Create our own highlighting rules for the different sublanguages
   switch (chapter) {

src/pages/academy/gameSimulator/subcomponents/chapterSimulator/ChapterSimulatorTextLoader.tsx

@@ -1,5 +1,3 @@
-import 'ace-builds/webpack-resolver';
-
 import { Button, Classes, Tab, Tabs } from '@blueprintjs/core';
 import { useState } from 'react';
 import { toTxtPath } from 'src/features/game/assets/TextAssets';

src/pages/achievement/control/AchievementControl.tsx

@@ -35,18 +35,13 @@ const AchievementControl: React.FC = () => {
     [dispatch]
   );
 
-  // TODO: This is a hacky fix. By right, we shouldn't need to use an
-  // inferencer instance since we can encapsulate the logic using hooks
-  // and component state.
   const [initialAchievements, initialGoals] = useTypedSelector(state => [
     state.achievement.achievements,
     state.achievement.goals
   ]);
   const inferencer = useMemo(
     () => new AchievementInferencer(initialAchievements, initialGoals),
-    // We only want to create the inferencer once
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    []
+    [initialAchievements, initialGoals]
   );
 
   /**