Merge pull request #7351 from opengovsg/release_v6.122.0

build: release v6.122.0

.eslintrc

@@ -64,10 +64,16 @@
         "typesafe/no-throw-sync-func": "error"
       }
     },
-    { "files": ["*.spec.ts"], "extends": ["plugin:jest/recommended"] },
+    {
+      "files": ["**/*.spec.ts", "**/__tests__/**/*.ts"],
+      "extends": ["plugin:jest/recommended"],
+      "rules": {
+        "@typescript-eslint/no-explicit-any": "off"
+      }
+    },
     {
       "files": ["*.ts", "*.js"],
-      "excludedFiles": ["**/*.spec.ts", "**/.spec.js", "**/__tests__/**/*.ts"],
+      "excludedFiles": ["**/*.spec.ts", "**/__tests__/**/*.ts"],
       "rules": {
         "@typescript-eslint/no-non-null-assertion": "error"
       }

.github/workflows/chromatic.yml

@@ -61,7 +61,7 @@ jobs:
           autoAcceptChanges: develop
           exitOnceUploaded: true
           onlyChanged: true
-          storybookBaseDir: frontend/.storybook
+          storybookBaseDir: frontend
           # Skip running Chromatic on dependabot PRs
           skip: dependabot/**
           # Only run when the frontend directory has changes

.nvmrc

@@ -1 +1 @@
-v18.12.1
+v18.20.2

CHANGELOG.md

@@ -4,14 +4,39 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [v6.122.0](https://github.com/opengovsg/FormSG/compare/v6.121.0...v6.122.0)
+
+- docs(onboarding): touch up onboarding docs, update nvmrc [`#7348`](https://github.com/opengovsg/FormSG/pull/7348)
+- chore: regenerate correct package-lock [`#7349`](https://github.com/opengovsg/FormSG/pull/7349)
+- fix(deps): bump libphonenumber-js from 1.11.1 to 1.11.2 in /shared [`#7347`](https://github.com/opengovsg/FormSG/pull/7347)
+- fix(deps): bump type-fest from 4.18.2 to 4.18.3 in /shared [`#7346`](https://github.com/opengovsg/FormSG/pull/7346)
+- chore(mrf): update copy questions -> fields [`#7341`](https://github.com/opengovsg/FormSG/pull/7341)
+- chore: Security upgrade react-email from 2.1.2 to 2.1.3 [`#7340`](https://github.com/opengovsg/FormSG/pull/7340)
+- chore(deps-dev): bump @types/lodash from 4.17.1 to 4.17.4 in /shared [`#7337`](https://github.com/opengovsg/FormSG/pull/7337)
+- build(deps-dev): bump immer from 8.0.1 to 9.0.21 in /frontend [`#7289`](https://github.com/opengovsg/FormSG/pull/7289)
+- feat: upgrade prettier to v3 [`#7278`](https://github.com/opengovsg/FormSG/pull/7278)
+- chore(deps-dev): bump @types/lodash from 4.17.3 to 4.17.4 in /shared [`#7334`](https://github.com/opengovsg/FormSG/pull/7334)
+- chore(deps-dev): bump @types/lodash from 4.17.1 to 4.17.3 in /shared [`#7332`](https://github.com/opengovsg/FormSG/pull/7332)
+- feat(i18n): stub public-facing locales [`#7288`](https://github.com/opengovsg/FormSG/pull/7288)
+- chore(deps-dev): bump ts-jest from 29.0.5 to 29.1.2 [`#7329`](https://github.com/opengovsg/FormSG/pull/7329)
+- fix(deps): bump express-rate-limit from 6.7.0 to 7.2.0 [`#7164`](https://github.com/opengovsg/FormSG/pull/7164)
+- feat: update eslint packages to stable latest versions [`#7277`](https://github.com/opengovsg/FormSG/pull/7277)
+- chore: remove unused jwt-decode package [`#7202`](https://github.com/opengovsg/FormSG/pull/7202)
+- fix: storybook folder to use base dir [`#7328`](https://github.com/opengovsg/FormSG/pull/7328)
+- build: merge v6.121.0 into develop [`#7327`](https://github.com/opengovsg/FormSG/pull/7327)
+- build: release v6.121.0 [`#7326`](https://github.com/opengovsg/FormSG/pull/7326)
+
 #### [v6.121.0](https://github.com/opengovsg/FormSG/compare/v6.120.0...v6.121.0)
 
+> 14 May 2024
+
 - fix(mrf): input transformation types for decrypting radio others [`#7325`](https://github.com/opengovsg/FormSG/pull/7325)
 - fix(mrf): attachment equality validation [`#7324`](https://github.com/opengovsg/FormSG/pull/7324)
 - fix(deps): bump validator from 13.11.0 to 13.12.0 in /shared [`#7323`](https://github.com/opengovsg/FormSG/pull/7323)
 - fix(deps): bump zod from 3.23.6 to 3.23.8 in /shared [`#7322`](https://github.com/opengovsg/FormSG/pull/7322)
 - build: merge v6.120.0 into develop  [`#7321`](https://github.com/opengovsg/FormSG/pull/7321)
 - build: release v6.120.0 [`#7320`](https://github.com/opengovsg/FormSG/pull/7320)
+- chore: bump version to v6.121.0 [`5defbe6`](https://github.com/opengovsg/FormSG/commit/5defbe6c6a6a8ccbf702478d10bbc52217cab851)
 
 #### [v6.120.0](https://github.com/opengovsg/FormSG/compare/v6.119.1...v6.120.0)
 
@@ -93,7 +118,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - chore: reverting package-lock changes [`040b962`](https://github.com/opengovsg/FormSG/commit/040b96284ea317de22d9de6cf872fd4116f24c51)
 - chore: bump version to v6.117.0 [`6eb4aca`](https://github.com/opengovsg/FormSG/commit/6eb4aca28514e3286c23c0834f9962de291a7fbc)
 
-#### [v6.116.0](https://github.com/opengovsg/FormSG/compare/v6.115.0...v6.116.0)
+#### [v6.116.0](https://github.com/opengovsg/FormSG/compare/v6.115.1...v6.116.0)
 
 > 8 April 2024
 
@@ -104,10 +129,17 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - fix(mrf): webhook be validation [`#7247`](https://github.com/opengovsg/FormSG/pull/7247)
 - chore: move react-dev-inspector to frontend/package.json [`#7245`](https://github.com/opengovsg/FormSG/pull/7245)
 - refactor: add exhaustive checks, use answerArray for arrays [`#7244`](https://github.com/opengovsg/FormSG/pull/7244)
-- * chore(deps-dev): bump @types/express from 4.17.17 to 4.17.21 (#7233) [`#7241`](https://github.com/opengovsg/FormSG/pull/7241)
 - fix(deps): bump type-fest from 4.14.0 to 4.15.0 in /shared [`#7243`](https://github.com/opengovsg/FormSG/pull/7243)
 - chore: bump version to v6.116.0 [`31e1a33`](https://github.com/opengovsg/FormSG/commit/31e1a33c96d76b69c492f5212bc48a3dabe054af)
 
+#### [v6.115.1](https://github.com/opengovsg/FormSG/compare/v6.115.0...v6.115.1)
+
+> 5 April 2024
+
+- * chore(deps-dev): bump @types/express from 4.17.17 to 4.17.21 (#7233) [`#7241`](https://github.com/opengovsg/FormSG/pull/7241)
+- fix: add check to block webhooks updates on mrf [`71ab0c5`](https://github.com/opengovsg/FormSG/commit/71ab0c592c15de5fddbffc9970a424af7a31d4ab)
+- chore: bump version to 6.115.1 [`7d127b2`](https://github.com/opengovsg/FormSG/commit/7d127b2e8353a8a282acabe1c309cefb1e750f9c)
+
 #### [v6.115.0](https://github.com/opengovsg/FormSG/compare/v6.114.1...v6.115.0)
 
 > 3 April 2024

README.md

@@ -67,10 +67,17 @@ Notable features include:
 
 ### Prerequisites
 
-Install [docker and docker-compose](https://docs.docker.com/get-docker/).
+Install [docker and docker-compose](https://docs.docker.com/get-docker/) and the [node version manager](https://github.com/nvm-sh/nvm).
 
 ### First Setup
 
+First, make sure to install and use the node version used by the project:
+
+```bash
+nvm install
+nvm use
+```
+
 To install the relevant npm packages (frontend, backend and virus-scanner), run the following in the root direcory:
 
 ```bash
@@ -87,24 +94,23 @@ If you are on Mac OS X, you may want to allow Docker to use more RAM (minimum of
 
 ### Running Locally
 
-Run the following shell commands to build the Docker image from scratch. This will usually take 10 or so minutes. These commands runs the backend services specified under [docker-compose.yml](docker-compose.yml) and the React frontend on the native host.
+First, build the frontend for local development:
 
 ```bash
 npm run build:frontend
-npm run dev
 ```
 
-After the Docker image has finished building, the React application can be accessed at [localhost:3000](localhost:3000). The backend API server can be accessed at [localhost:5001](localhost:5001).
-
-If there are no dependency changes in `package.json` or changes in the
-`src/app/server.ts` file, you can run
+Run the following shell commands to build the Docker image. The first time will usually take 10 or so minutes. These commands runs the backend services specified under [docker-compose.yml](docker-compose.yml) and the React frontend on the native host.
 
 ```bash
-docker-compose up
+npm run dev
 ```
 
-which does **not** rebuild the Docker image from scratch. This command usually
-only takes ~15 seconds to finish starting up the image.
+After the Docker image has finished building, the following local applications can be accessed:
+
+- React application can be accessed at [localhost:3000](localhost:3000)
+- The backend API server can be accessed at [localhost:5001](localhost:5001)
+- The development mail server can be accessed at [localhost:1080](localhost:1080)
 
 ### Adding dependencies
 

__tests__/e2e/utils/field.ts

@@ -105,6 +105,9 @@ export const createMyInfoField = (
         ...fieldBase,
         ValidationOptions: { selectedValidation: null, customVal: null },
       }
+    default:
+      // eslint-disable-next-line typesafe/no-throw-sync-func
+      throw new Error(`Unimplemented MyInfo field type: ${fieldType}`)
   }
 }
 

frontend/.eslintrc

@@ -4,12 +4,13 @@
   "extends": [
     "eslint:recommended",
     "plugin:prettier/recommended",
-    "plugin:storybook/recommended"
+    "plugin:storybook/recommended",
+    "plugin:react-hooks/recommended"
   ],
   "overrides": [
     {
       "files": ["*.ts", "*.tsx"],
-      "extends": ["react-app", "plugin:@typescript-eslint/recommended"],
+      "extends": ["plugin:@typescript-eslint/recommended"],
       "parser": "@typescript-eslint/parser",
       "rules": {
         "@typescript-eslint/no-unused-vars": "warn"
@@ -26,10 +27,12 @@
         "**/__tests__/**/*.[jt]s?(x)",
         "**/?(*.)+(spec|test).[jt]s?(x)"
       ],
-      "extends": ["react-app/jest", "plugin:testing-library/react"],
+      "extends": ["plugin:testing-library/react"],
       "rules": {
         "@typescript-eslint/no-non-null-assertion": "off",
-        "testing-library/no-unnecessary-act": "off"
+        "testing-library/no-unnecessary-act": "off",
+        "@typescript-eslint/no-explicit-any": "off",
+        "no-unsafe-optional-chaining": "off"
       }
     }
   ],

frontend/.storybook/manager-head.html

@@ -24,7 +24,10 @@
     font-weight: 500;
     font-size: 14px;
     letter-spacing: -0.006em;
-    font-feature-settings: 'tnum' on, 'lnum' on, 'cv05' on;
+    font-feature-settings:
+      'tnum' on,
+      'lnum' on,
+      'cv05' on;
 
     /* Secondary/700 */
     color: #293044;