Merge branch 'master' into language-options

Author: tohlh

.github/workflows/build-development.yml

@@ -3,22 +3,30 @@ on:
   push:
     branches:
       - master
+  workflow_dispatch:
+    inputs:
+      ref:
+        description: Branch/Tag/SHA to checkout
+        required: true
+        default: master
 
 jobs:
   deploy:
     name: Build and deploy sourceacademy.org
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
+        with:
+          ref: ${{ github.event.inputs.ref }}
       # Has to be run before actions/setup-node.
       # See: https://github.com/actions/setup-node/issues/480
       - name: Enable corepack for Yarn
         run: corepack enable
       - name: Setup node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
-          node-version: 20
+          node-version: 22
           cache: yarn
       - name: Setup Sentry CLI
         run: |

.github/workflows/ci.yml

@@ -15,25 +15,25 @@ env:
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
-  
+
 jobs:
   lint:
     if: github.event.pull_request.draft == false
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        commands: [tsc, 'format:ci', eslint, build, test, test-coveralls]
+        commands: [tsc, 'format:ci', eslint, build, 'test --bail=1', test-coveralls]
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       # Has to be run before actions/setup-node.
       # See: https://github.com/actions/setup-node/issues/480
       - name: Enable corepack for Yarn
         run: corepack enable
       - name: Setup node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
-          node-version: 20
+          node-version: 22
           cache: yarn
       - name: Install dependencies
         run: yarn install --immutable
@@ -43,5 +43,5 @@ jobs:
         if: matrix.commands == 'test-coveralls'
         uses: coverallsapp/github-action@master
         with:
-          path-to-lcov: lcov.info
+          path-to-lcov: coverage/lcov.info
           github-token: ${{ secrets.GITHUB_TOKEN }}

.node-version

@@ -1 +1 @@
-20.9.0
+22.17.0

.prettierrc

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

CONTRIBUTING.md

@@ -16,10 +16,10 @@ To start contributing, create a fork from our repo and send a PR. Refer to [this
 
 The frontend comes with an extensive test suite. To run the tests after you made your modifications, run
 `yarn test`. Regression tests are run automatically when you want to push changes to this repository.
-The regression tests are generated using `jest` and stored as snapshots in `src/\_\_tests\_\_`.  After modifying the frontend, carefully inspect any failing regression tests reported in red in the command line. If you are convinced that the regression tests and not your changes are at fault, you can update the regression tests by running:
+The regression tests are generated using `vitest` and stored as snapshots in `src/\_\_tests\_\_`. After modifying the frontend, carefully inspect any failing regression tests reported in red in the command line. If you are convinced that the regression tests and not your changes are at fault, you can update the regression tests by running:
 
 ```bash
-yarn test --updateSnapshot
+yarn test --update
 ```
 
 ## Manually testing the frontend

README.md

@@ -24,7 +24,7 @@ The Source Academy (<https://sourceacademy.org/>) is an immersive online experie
 
 1. Clone this repository and navigate to it using your command line
 
-1. Install the version of `yarn` as specified in `package.json`, `packageManager`. 
+1. Install the version of `yarn` as specified in `package.json`, `packageManager`.
 
    > We recommend using `corepack` to manage the version of `yarn`, you may simply run `corepack enable` to complete this step.
 

_config.yml

@@ -1 +1 @@
-theme: jekyll-theme-cayman
+theme: jekyll-theme-cayman

craco.config.js

@@ -1,34 +1,35 @@
 // @ts-check
 
-// import eslint from '@eslint/js';
-import { config, configs } from 'typescript-eslint';
+import eslint from '@eslint/js';
 import reactPlugin from 'eslint-plugin-react';
 import reactHooksPlugin from 'eslint-plugin-react-hooks';
-import simpleImportSort from 'eslint-plugin-simple-import-sort'
-// import reactRefresh from 'eslint-plugin-react-refresh';
+import simpleImportSort from 'eslint-plugin-simple-import-sort';
+import tseslint from 'typescript-eslint';
+import reactRefresh from 'eslint-plugin-react-refresh';
 
-export default config(
-  { ignores: ['eslint.config.mjs'] },
-  // eslint.configs.recommended,
-  ...configs.recommended,
+export default tseslint.config(
+  { ignores: ['eslint.config.mjs', '**/*.snap'] },
+  eslint.configs.recommended,
+  tseslint.configs.recommended,
   // TODO: Enable when ready
-  // {
-  //   plugins: {
-  //     'react-refresh': reactRefresh
-  //   },
-  //   rules: {
-  //     'react-refresh/only-export-components': 'warn'
-  //   }
-  // },
+  {
+    plugins: {
+      'react-refresh': reactRefresh
+    },
+    rules: {
+      'react-refresh/only-export-components': 'warn'
+    }
+  },
   {
     files: ['**/*.ts*'],
     plugins: {
       'react-hooks': reactHooksPlugin,
-      'react': reactPlugin,
+      react: reactPlugin,
       'simple-import-sort': simpleImportSort
     },
     rules: {
       ...reactHooksPlugin.configs['recommended-latest'].rules,
+      'no-empty': 'warn',
       'no-restricted-imports': [
         'error',
         {