Skip to content

Commit 16e93fc

Browse files
authored
Merge branch 'master' into memory-vis
2 parents 0382fd9 + ef84ba5 commit 16e93fc

File tree

266 files changed

+10895
-4749
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

266 files changed

+10895
-4749
lines changed

.prettierrc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,6 @@
33
"singleQuote": true,
44
"printWidth": 100,
55
"arrowParens": "avoid",
6-
"trailingComma": "none"
6+
"trailingComma": "none",
7+
"endOfLine": "auto"
78
}

eslint.config.mjs

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
// @ts-check
22

3-
// import eslint from '@eslint/js';
4-
import { config, configs } from 'typescript-eslint';
3+
import eslint from '@eslint/js';
54
import reactPlugin from 'eslint-plugin-react';
65
import reactHooksPlugin from 'eslint-plugin-react-hooks';
76
import simpleImportSort from 'eslint-plugin-simple-import-sort';
8-
// import reactRefresh from 'eslint-plugin-react-refresh';
7+
import tseslint from 'typescript-eslint';
8+
import reactRefresh from 'eslint-plugin-react-refresh';
99

10-
export default config(
11-
{ ignores: ['eslint.config.mjs', 'node_modules', '**/*.js', '**/*.map'] },
12-
// eslint.configs.recommended,
13-
...configs.recommended,
10+
export default tseslint.config(
11+
{ ignores: ['eslint.config.mjs', '**/*.snap'] },
12+
eslint.configs.recommended,
13+
tseslint.configs.recommended,
1414
// TODO: Enable when ready
15-
// {
16-
// plugins: {
17-
// 'react-refresh': reactRefresh
18-
// },
19-
// rules: {
20-
// 'react-refresh/only-export-components': 'warn'
21-
// }
22-
// },
15+
{
16+
plugins: {
17+
'react-refresh': reactRefresh
18+
},
19+
rules: {
20+
'react-refresh/only-export-components': 'warn'
21+
}
22+
},
2323
{
2424
files: ['**/*.js'],
2525
rules: {
@@ -38,6 +38,7 @@ export default config(
3838
},
3939
rules: {
4040
...reactHooksPlugin.configs['recommended-latest'].rules,
41+
'no-empty': 'warn',
4142
'no-restricted-imports': [
4243
'error',
4344
{

package.json

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -31,41 +31,44 @@
3131
"preview": "rsbuild preview"
3232
},
3333
"dependencies": {
34-
"@blueprintjs/core": "^5.10.1",
35-
"@blueprintjs/datetime2": "^2.3.3",
34+
"@blueprintjs/core": "^6.0.0",
35+
"@blueprintjs/datetime": "^6.0.0",
3636
"@blueprintjs/icons": "^6.0.0",
37-
"@blueprintjs/select": "^5.1.3",
37+
"@blueprintjs/select": "^6.0.0",
38+
"@convergencelabs/ace-collab-ext": "^0.6.0",
3839
"@mantine/hooks": "^7.11.2",
3940
"@octokit/rest": "^22.0.0",
4041
"@reduxjs/toolkit": "^1.9.7",
41-
"@sentry/browser": "^8.33.0",
42+
"@sentry/react": "^10.5.0",
4243
"@sourceacademy/c-slang": "^1.0.21",
43-
"@sourceacademy/sharedb-ace": "^2.0.3",
44+
"@sourceacademy/conductor": "https://github.com/source-academy/conductor.git#0.2.1",
45+
"@sourceacademy/language-directory": "https://github.com/source-academy/language-directory.git#0.0.4",
46+
"@sourceacademy/plugin-directory": "https://github.com/source-academy/plugin-directory.git#0.0.2",
47+
"@sourceacademy/sharedb-ace": "2.1.1",
4448
"@sourceacademy/sling-client": "^0.1.0",
4549
"@szhsin/react-menu": "^4.0.0",
4650
"@tanstack/react-table": "^8.9.3",
4751
"@tremor/react": "^1.8.2",
48-
"ace-builds": "^1.36.3",
52+
"ace-builds": "^1.42.1",
4953
"acorn": "^8.9.0",
50-
"ag-grid-community": "^32.3.1",
51-
"ag-grid-react": "^32.3.1",
54+
"ag-grid-community": "^34.1.1",
55+
"ag-grid-react": "^34.1.1",
5256
"array-move": "^4.0.0",
5357
"browserfs": "^1.4.3",
5458
"classnames": "^2.3.2",
55-
"conductor": "https://github.com/source-academy/conductor.git#0.2.1",
5659
"dayjs": "^1.11.13",
5760
"dompurify": "^3.2.4",
5861
"flexboxgrid": "^6.3.1",
5962
"flexboxgrid-helpers": "^1.1.3",
6063
"hastscript": "^9.0.0",
6164
"i18next": "^25.0.0",
6265
"i18next-browser-languagedetector": "^8.0.0",
66+
"immer": "^9.0.21",
6367
"java-slang": "^1.0.13",
6468
"js-cookie": "^3.0.5",
65-
"js-slang": "^1.0.84",
69+
"js-slang": "^1.0.85",
6670
"js-yaml": "^4.1.0",
6771
"konva": "^9.2.0",
68-
"language-directory": "https://github.com/source-academy/language-directory.git",
6972
"lodash": "^4.17.21",
7073
"lz-string": "^1.4.4",
7174
"mdast-util-from-markdown": "^2.0.0",
@@ -101,7 +104,7 @@
101104
"showdown": "^2.1.0",
102105
"sourceror": "^0.8.5",
103106
"unified": "^11.0.0",
104-
"uuid": "^11.0.2",
107+
"uuid": "^13.0.0",
105108
"workbox-core": "^7.3.0",
106109
"workbox-precaching": "^7.3.0",
107110
"workbox-routing": "^7.3.0",
@@ -115,7 +118,6 @@
115118
"@babel/plugin-proposal-private-property-in-object": "^7.21.11",
116119
"@babel/preset-typescript": "^7.24.1",
117120
"@babel/runtime": "^7.24.5",
118-
"@convergencelabs/ace-collab-ext": "^0.6.0",
119121
"@rsbuild/core": "^1.3.12",
120122
"@rsbuild/plugin-eslint": "^1.1.1",
121123
"@rsbuild/plugin-node-polyfill": "^1.3.0",
@@ -127,7 +129,7 @@
127129
"@testing-library/dom": "^10.4.0",
128130
"@testing-library/jest-dom": "^6.0.0",
129131
"@testing-library/react": "^16.0.0",
130-
"@testing-library/user-event": "^14.4.3",
132+
"@testing-library/user-event": "^14.6.0",
131133
"@types/estree": "^1.0.5",
132134
"@types/gapi": "^0.0.47",
133135
"@types/gapi.auth2": "^0.0.61",
@@ -147,14 +149,14 @@
147149
"@types/redux-mock-store": "^1.0.3",
148150
"@types/showdown": "^2.0.1",
149151
"@types/xml2js": "^0.4.11",
150-
"@vitejs/plugin-react-swc": "^3.11.0",
152+
"@vitejs/plugin-react-swc": "^4.0.0",
151153
"@vitest/coverage-v8": "3.2.4",
152154
"@vitest/ui": "^3.2.4",
153155
"buffer": "^6.0.3",
154156
"canvas": "^3.1.0",
155157
"constants-browserify": "^1.0.0",
156158
"coveralls": "^3.1.1",
157-
"cross-env": "^7.0.3",
159+
"cross-env": "^10.0.0",
158160
"eslint": "^9.9.0",
159161
"eslint-plugin-react": "^7.35.0",
160162
"eslint-plugin-react-hooks": "^5.2.0",
@@ -163,7 +165,7 @@
163165
"https-browserify": "^1.0.0",
164166
"husky": "^9.0.0",
165167
"identity-obj-proxy": "^3.0.0",
166-
"jsdom": "^25.0.1",
168+
"jsdom": "^26.0.0",
167169
"npm-run-all2": "^8.0.0",
168170
"os-browserify": "^0.3.0",
169171
"path": "^0.12.7",

public/assets/Sample_Profile_1.jpg

6.84 KB
Loading

public/assets/Sample_Profile_2.jpg

8.79 KB
Loading

public/assets/Sample_Profile_3.jpg

10.8 KB
Loading

public/assets/Sample_Profile_4.jpg

75.7 KB
Loading

public/assets/Sample_Profile_5.jpg

17.9 KB
Loading

public/assets/Sample_Profile_6.jpg

6.9 KB
Loading

public/assets/Sample_Profile_7.jpg

14 KB
Loading

0 commit comments

Comments
 (0)