Skip to content

Commit 7127ed0

Browse files
committed
Merge branch 'master' of https://github.com/source-academy/frontend into richard/css-improvements
2 parents 8029cd1 + 20fd8d1 commit 7127ed0

File tree

5 files changed

+452
-395
lines changed

5 files changed

+452
-395
lines changed

.github/workflows/build-development.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,17 @@ jobs:
1616
runs-on: ubuntu-latest
1717
steps:
1818
- name: Checkout repository
19-
uses: actions/checkout@v4
19+
uses: actions/checkout@v5
2020
with:
2121
ref: ${{ github.event.inputs.ref }}
2222
# Has to be run before actions/setup-node.
2323
# See: https://github.com/actions/setup-node/issues/480
2424
- name: Enable corepack for Yarn
2525
run: corepack enable
2626
- name: Setup node
27-
uses: actions/setup-node@v4
27+
uses: actions/setup-node@v6
2828
with:
29-
node-version: 20
29+
node-version: 22
3030
cache: yarn
3131
- name: Setup Sentry CLI
3232
run: |

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@ jobs:
2525
commands: [tsc, 'format:ci', eslint, build, 'test --bail=1', test-coveralls]
2626
steps:
2727
- name: Checkout repository
28-
uses: actions/checkout@v4
28+
uses: actions/checkout@v5
2929
# Has to be run before actions/setup-node.
3030
# See: https://github.com/actions/setup-node/issues/480
3131
- name: Enable corepack for Yarn
3232
run: corepack enable
3333
- name: Setup node
34-
uses: actions/setup-node@v4
34+
uses: actions/setup-node@v6
3535
with:
36-
node-version: 20
36+
node-version: 22
3737
cache: yarn
3838
- name: Install dependencies
3939
run: yarn install --immutable

.node-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20.9.0
1+
22.17.0

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
"@sentry/react": "^10.5.0",
4343
"@sourceacademy/c-slang": "^1.0.21",
4444
"@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",
45+
"@sourceacademy/language-directory": "https://github.com/source-academy/language-directory.git#0.0.6",
4646
"@sourceacademy/plugin-directory": "https://github.com/source-academy/plugin-directory.git#0.0.2",
4747
"@sourceacademy/sharedb-ace": "2.1.1",
4848
"@sourceacademy/sling-client": "^0.1.0",
@@ -68,7 +68,7 @@
6868
"js-cookie": "^3.0.5",
6969
"js-slang": "^1.0.85",
7070
"js-yaml": "^4.1.0",
71-
"konva": "^9.2.0",
71+
"konva": "^10.0.0",
7272
"lodash": "^4.17.21",
7373
"lz-string": "^1.4.4",
7474
"mdast-util-from-markdown": "^2.0.0",
@@ -85,7 +85,7 @@
8585
"react-drag-drop-files": "^3.0.0",
8686
"react-draggable": "^4.4.5",
8787
"react-dropzone": "^14.2.3",
88-
"react-i18next": "^15.0.0",
88+
"react-i18next": "^16.0.0",
8989
"react-konva": "^18.2.10",
9090
"react-latex-next": "^3.0.0",
9191
"react-mde": "^11.5.0",

0 commit comments

Comments
 (0)