fix: merge release 5.43.1 to develop (with merge conflict fixes)

CHANGELOG.md

@@ -4,8 +4,30 @@ 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).
 
+#### [v5.43.1](https://github.com/opengovsg/FormSG/compare/v5.43.0...v5.43.1)
+
+- fix: revert helmet from 5.0.2 to 4.6.0 [`7813015`](https://github.com/opengovsg/FormSG/commit/7813015b351001df24b56fcbd2c3098ccd32e332)
+
+#### [v5.43.0](https://github.com/opengovsg/FormSG/compare/v5.42.0...v5.43.0)
+
+> 15 February 2022
+
+- fix(deps): bump vm2 from 3.9.5 to 3.9.7 [`#3431`](https://github.com/opengovsg/FormSG/pull/3431)
+- fix(deps): bump @sentry/browser from 6.16.1 to 6.17.7 [`#3429`](https://github.com/opengovsg/FormSG/pull/3429)
+- chore(deps-dev): bump @babel/core from 7.17.0 to 7.17.2 [`#3430`](https://github.com/opengovsg/FormSG/pull/3430)
+- refactor: use combined route validators and handlers [`#3428`](https://github.com/opengovsg/FormSG/pull/3428)
+- chore: bump spcp-auth-client to 1.14.15 [`#3341`](https://github.com/opengovsg/FormSG/pull/3341)
+- fix(docs): Add missing characters for consistency [`#3426`](https://github.com/opengovsg/FormSG/pull/3426)
+- fix(deps): bump helmet from 5.0.1 to 5.0.2 [`#3319`](https://github.com/opengovsg/FormSG/pull/3319)
+- fix(deps): bump libphonenumber-js from 1.9.48 to 1.9.49 in /shared [`#3423`](https://github.com/opengovsg/FormSG/pull/3423)
+- chore(deps-dev): bump eslint-plugin-jest from 26.0.0 to 26.1.0 [`#3419`](https://github.com/opengovsg/FormSG/pull/3419)
+- build: merge release 5.42.0 into develop [`#3417`](https://github.com/opengovsg/FormSG/pull/3417)
+- chore: bump version to v5.43.0 [`55961a3`](https://github.com/opengovsg/FormSG/commit/55961a33d8627449a40b9e12369967bb979f7e26)
+
 #### [v5.42.0](https://github.com/opengovsg/FormSG/compare/v5.40.0...v5.42.0)
 
+> 10 February 2022
+
 - chore(deps-dev): bump @types/node from 17.0.8 to 17.0.16 [`#3414`](https://github.com/opengovsg/FormSG/pull/3414)
 - feat: log ses message id [`#3391`](https://github.com/opengovsg/FormSG/pull/3391)
 - fix(deps): bump type-fest from 2.11.1 to 2.11.2 in /shared [`#3392`](https://github.com/opengovsg/FormSG/pull/3392)

package.json

@@ -1,7 +1,7 @@
 {
   "name": "FormSG",
   "description": "Form Manager for Government",
-  "version": "5.42.0",
+  "version": "5.43.1",
   "homepage": "https://form.gov.sg",
   "authors": [
     "FormSG <[email protected]>"
@@ -113,7 +113,7 @@
     "file-saver": "^2.0.5",
     "font-awesome": "4.7.0",
     "fp-ts": "^2.11.8",
-    "helmet": "^5.0.2",
+    "helmet": "^4.6.0",
     "hot-shots": "^9.0.0",
     "http-status-codes": "^2.2.0",
     "intl-tel-input": "~12.4.0",

src/app/loaders/express/helmet.ts

@@ -1,6 +1,6 @@
 import { RequestHandler } from 'express'
 import helmet from 'helmet'
-import { ContentSecurityPolicyOptions } from 'helmet/dist/types/middlewares/content-security-policy'
+import { ContentSecurityPolicyOptions } from 'helmet/dist/middlewares/content-security-policy'
 
 import config from '../../config/config'
 import { sentryConfig } from '../../config/features/sentry.config'