build: release v6.18.0

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).
 
+#### [v6.18.0](https://github.com/opengovsg/FormSG/compare/v6.17.0...v6.18.0)
+
+- fix: remove beta for storage download, set max dim for image compression for 1024 [`#5408`](https://github.com/opengovsg/FormSG/pull/5408)
+- chore(deps-dev): bump @types/lodash from 4.14.187 to 4.14.189 [`#5392`](https://github.com/opengovsg/FormSG/pull/5392)
+- chore(deps-dev): bump @types/lodash from 4.14.188 to 4.14.189 in /shared [`#5395`](https://github.com/opengovsg/FormSG/pull/5395)
+- chore(deps-dev): bump jest-mock-axios from 4.6.1 to 4.6.2 [`#5391`](https://github.com/opengovsg/FormSG/pull/5391)
+- fix(deps): bump twilio from 3.83.0 to 3.83.2 [`#5393`](https://github.com/opengovsg/FormSG/pull/5393)
+- docs: update README.md for node upgrade to v18 [`#5387`](https://github.com/opengovsg/FormSG/pull/5387)
+- feat: use 2 nodemailer clients [`#5369`](https://github.com/opengovsg/FormSG/pull/5369)
+- fix(deps): bump type-fest from 2.19.0 to 3.2.0 in /shared [`#5357`](https://github.com/opengovsg/FormSG/pull/5357)
+- chore(deps-dev): bump eslint from 7.32.0 to 8.27.0 [`#5375`](https://github.com/opengovsg/FormSG/pull/5375)
+- fix(deps): bump winston-cloudwatch from 4.0.1 to 6.1.1 [`#4962`](https://github.com/opengovsg/FormSG/pull/4962)
+- chore(deps-dev): bump @opengovsg/mockpass from 2.9.4 to 3.0.3 [`#5381`](https://github.com/opengovsg/FormSG/pull/5381)
+- fix: local dev [`#5379`](https://github.com/opengovsg/FormSG/pull/5379)
+- fix(deps): bump @aws-sdk/client-cloudwatch-logs from 3.204.0 to 3.209.0 [`#5378`](https://github.com/opengovsg/FormSG/pull/5378)
+- fix: make custom field validations consistent between angular and react [`#5373`](https://github.com/opengovsg/FormSG/pull/5373)
+- build: merge v6.17.0 back into develop [`#5371`](https://github.com/opengovsg/FormSG/pull/5371)
+- fix(deps): bump aws-sdk from 2.1250.0 to 2.1251.0 [`#5374`](https://github.com/opengovsg/FormSG/pull/5374)
+- build: release v6.17.0 [`#5370`](https://github.com/opengovsg/FormSG/pull/5370)
+
 #### [v6.17.0](https://github.com/opengovsg/FormSG/compare/v6.16.0...v6.17.0)
 
+> 10 November 2022
+
 - fix(deps): bump aws-sdk from 2.1249.0 to 2.1250.0 [`#5366`](https://github.com/opengovsg/FormSG/pull/5366)
 - fix: revive pressing enter to request and submit OTP [`#5360`](https://github.com/opengovsg/FormSG/pull/5360)
 - fix: augment admin logic form fields data with myinfo values [`#5364`](https://github.com/opengovsg/FormSG/pull/5364)
@@ -22,6 +44,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - fix(deps): bump @aws-sdk/client-cloudwatch-logs from 3.201.0 to 3.204.0 [`#5352`](https://github.com/opengovsg/FormSG/pull/5352)
 - chore: drop staging-alt2 as deployment target [`#5349`](https://github.com/opengovsg/FormSG/pull/5349)
 - build: release v6.16.0 [`#5346`](https://github.com/opengovsg/FormSG/pull/5346)
+- chore: bump version to v6.17.0 [`7c9557e`](https://github.com/opengovsg/FormSG/commit/7c9557e654107d82cb4d1d6ecf42cd9af4225fa7)
 
 #### [v6.16.0](https://github.com/opengovsg/FormSG/compare/v6.15.0...v6.16.0)
 
@@ -48,14 +71,13 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - fix(deps): bump @aws-sdk/client-cloudwatch-logs from 3.200.0 to 3.201.0 [`#5327`](https://github.com/opengovsg/FormSG/pull/5327)
 - fix(deps): bump dd-trace from 3.6.0 to 3.7.0 [`#5328`](https://github.com/opengovsg/FormSG/pull/5328)
 - build: release v6.14.0 [`#5323`](https://github.com/opengovsg/FormSG/pull/5323)
-- fix: reorder feedback modal options [`#5322`](https://github.com/opengovsg/FormSG/pull/5322)
-- chore: bump version to v6.14.0 [`598fb42`](https://github.com/opengovsg/FormSG/commit/598fb42dcc7da4d6d887c4cd4e5cf9f99d1c741d)
 - chore: bump version to v6.15.0 [`56d3be5`](https://github.com/opengovsg/FormSG/commit/56d3be5674106b77e71bf8d242271e5c362f2489)
 
 #### [v6.14.0](https://github.com/opengovsg/FormSG/compare/v6.13.0...v6.14.0)
 
 > 2 November 2022
 
+- fix: reorder feedback modal options [`#5322`](https://github.com/opengovsg/FormSG/pull/5322)
 - fix: add frontend validation for duplicate Others [`#5319`](https://github.com/opengovsg/FormSG/pull/5319)
 - fix: add multiline for dropdown items [`#5317`](https://github.com/opengovsg/FormSG/pull/5317)
 - fix: fall through on conditional check if value is special others [`#5318`](https://github.com/opengovsg/FormSG/pull/5318)
@@ -67,6 +89,12 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - ci: use federated role [`#5304`](https://github.com/opengovsg/FormSG/pull/5304)
 - chore: merge release v6.13.0 into develop  [`#5298`](https://github.com/opengovsg/FormSG/pull/5298)
 - build: release v6.13.0 [`#5297`](https://github.com/opengovsg/FormSG/pull/5297)
+- chore: bump version to v6.14.0 [`598fb42`](https://github.com/opengovsg/FormSG/commit/598fb42dcc7da4d6d887c4cd4e5cf9f99d1c741d)
+
+#### [v6.13.0](https://github.com/opengovsg/FormSG/compare/v6.12.0...v6.13.0)
+
+> 1 November 2022
+
 - feat: add sitemap.xml tnd robots.txt to react [`#5269`](https://github.com/opengovsg/FormSG/pull/5269)
 - fix(deps): bump aws-sdk from 2.1235.0 to 2.1243.0 [`#5295`](https://github.com/opengovsg/FormSG/pull/5295)
 - chore(deps-dev): bump @opengovsg/mockpass from 2.9.3 to 2.9.4 [`#5294`](https://github.com/opengovsg/FormSG/pull/5294)
@@ -77,13 +105,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - feat: add dashboard row filtering by open/closed forms [`#5234`](https://github.com/opengovsg/FormSG/pull/5234)
 - fix(deps): bump @aws-sdk/client-cloudwatch-logs from 3.197.0 to 3.199.0 [`#5284`](https://github.com/opengovsg/FormSG/pull/5284)
 - feat: add image compression for oversize image attachments [`#5287`](https://github.com/opengovsg/FormSG/pull/5287)
-- chore: bump version to v6.13.0 [`5162d7e`](https://github.com/opengovsg/FormSG/commit/5162d7ecbf9dc61a21e1b76ac41465ab450807c9)
-- chore: bump version to v6.14.0 [`c69087e`](https://github.com/opengovsg/FormSG/commit/c69087e57279bb4715db19727abb6899a3681eb9)
-
-#### [v6.13.0](https://github.com/opengovsg/FormSG/compare/v6.12.0...v6.13.0)
-
-> 31 October 2022
-
 - feat: remove contact us link from app footer [`#5288`](https://github.com/opengovsg/FormSG/pull/5288)
 - fix: endpage state is dirty when paragraph or buttonLink fields are undefined [`#5235`](https://github.com/opengovsg/FormSG/pull/5235)
 - chore(deps-dev): bump core-js from 3.25.5 to 3.26.0 [`#5283`](https://github.com/opengovsg/FormSG/pull/5283)
@@ -96,7 +117,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - fix(deps): bump dd-trace from 3.5.0 to 3.6.0 [`#5273`](https://github.com/opengovsg/FormSG/pull/5273)
 - build: merge v6.12.0 into develop  [`#5268`](https://github.com/opengovsg/FormSG/pull/5268)
 - build: release v6.12.0 [`#5267`](https://github.com/opengovsg/FormSG/pull/5267)
-- chore: bump version to v6.13.0 [`00bed29`](https://github.com/opengovsg/FormSG/commit/00bed2945fa34dc53b5f8c015225f5faa9a0b6a0)
+- chore: bump version to v6.13.0 [`5162d7e`](https://github.com/opengovsg/FormSG/commit/5162d7ecbf9dc61a21e1b76ac41465ab450807c9)
 - feat: add mode option to editForm [`979e3ea`](https://github.com/opengovsg/FormSG/commit/979e3ea49077f89ae3360d3acf7e34f2bfdc5453)
 - fix: use Mode from react-hook-form [`6458379`](https://github.com/opengovsg/FormSG/commit/645837922e0ee16de3ffba7c17884898ed70906f)
 
@@ -143,24 +164,23 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - fix: correctly filter 401 status responses in datadog RUM [`#5232`](https://github.com/opengovsg/FormSG/pull/5232)
 - chore: merge release v6.9.0 into develop  [`#5231`](https://github.com/opengovsg/FormSG/pull/5231)
 - build: release v6.9.0 [`#5228`](https://github.com/opengovsg/FormSG/pull/5228)
-- fix: add empty string as a fallback for querystring [`#5230`](https://github.com/opengovsg/FormSG/pull/5230)
-- fix: handle query strings in url hashes when doing angular redirect [`#5229`](https://github.com/opengovsg/FormSG/pull/5229)
-- feat: update RUM sampleRate to match increased rollout percentage [`#5227`](https://github.com/opengovsg/FormSG/pull/5227)
-- fix: change to stack for correct breadcrumb padding, correct text color [`#5226`](https://github.com/opengovsg/FormSG/pull/5226)
-- fix(deps): bump @aws-sdk/client-cloudwatch-logs from 3.190.0 to 3.192.0 [`#5224`](https://github.com/opengovsg/FormSG/pull/5224)
-- chore: bump version to v6.9.0 [`8d66b8b`](https://github.com/opengovsg/FormSG/commit/8d66b8bf84d4e11b7f086214add6fba22e64770b)
 - chore: bump version to v6.10.0 [`0a24b49`](https://github.com/opengovsg/FormSG/commit/0a24b49f404c82d24f22195a721e738b8d073d45)
 
 #### [v6.9.0](https://github.com/opengovsg/FormSG/compare/v6.8.1...v6.9.0)
 
 > 21 October 2022
 
+- fix: add empty string as a fallback for querystring [`#5230`](https://github.com/opengovsg/FormSG/pull/5230)
+- fix: handle query strings in url hashes when doing angular redirect [`#5229`](https://github.com/opengovsg/FormSG/pull/5229)
+- feat: update RUM sampleRate to match increased rollout percentage [`#5227`](https://github.com/opengovsg/FormSG/pull/5227)
+- fix: change to stack for correct breadcrumb padding, correct text color [`#5226`](https://github.com/opengovsg/FormSG/pull/5226)
+- fix(deps): bump @aws-sdk/client-cloudwatch-logs from 3.190.0 to 3.192.0 [`#5224`](https://github.com/opengovsg/FormSG/pull/5224)
 - feat: add breadcrumbs to admin form navbar [`#5190`](https://github.com/opengovsg/FormSG/pull/5190)
 - build: use new CD pipeline to allow for datadog source maps, add cache control [`#5225`](https://github.com/opengovsg/FormSG/pull/5225)
 - chore: merge release v6.8.1 into develop  [`#5222`](https://github.com/opengovsg/FormSG/pull/5222)
 - fix: update RUM percentages to 65%, prevent feedback form submission if feedback is empty [`#5220`](https://github.com/opengovsg/FormSG/pull/5220)
 - chore: merge release v6.8.0 into develop  [`#5221`](https://github.com/opengovsg/FormSG/pull/5221)
-- chore: bump version to v6.9.0 [`dd09962`](https://github.com/opengovsg/FormSG/commit/dd09962209ebb77e2fb03b2037c0f39db67e908b)
+- chore: bump version to v6.9.0 [`8d66b8b`](https://github.com/opengovsg/FormSG/commit/8d66b8bf84d4e11b7f086214add6fba22e64770b)
 
 #### [v6.8.1](https://github.com/opengovsg/FormSG/compare/v6.8.0...v6.8.1)
 

Dockerfile.development

@@ -52,7 +52,12 @@ ENV PUPPETEER_EXECUTABLE_PATH=/usr/bin/chromium-browser
 # Chinese fonts
 RUN echo @edge http://nl.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositories && apk add wqy-zenhei@edge
 
-COPY package*.json ./
+# Avoid using globs as there seems to be some inconsistency in the way dockerfile handles globs
+# * https://github.com/moby/moby/issues/15858 
+COPY package.json package-lock.json ./
+COPY shared/package.json shared/package-lock.json ./shared/
+COPY frontend/package.json frontend/package-lock.json ./frontend/
+
 # --legacy-peer-deps flag
 # A breaking change in the peer dependency resolution strategy was introduced in
 # npm 7. This resulted in npm throwing an error when installing packages:

README.md

@@ -39,7 +39,7 @@ Notable features include:
 - (Singapore government agencies only) Citizen authentication with [SingPass](https://www.singpass.gov.sg/singpass/common/aboutus)
 - (Singapore government agencies only) Corporate authentication with [CorpPass](https://www.corppass.gov.sg/corppass/common/aboutus)
 - (Singapore government agencies only) Automatic prefill of verified data with [MyInfo](https://www.singpass.gov.sg/myinfo/common/aboutus)
-- Webhooks functionality via the official [FormSG JavaScript SDK](https://github.com/opengovsg/formsg-sdk) and contributor-supported [FormSG Ruby SDK](<https://github.com/opengovsg/formsg-ruby-sdk>)
+- Webhooks functionality via the official [FormSG JavaScript SDK](https://github.com/opengovsg/formsg-sdk) and contributor-supported [FormSG Ruby SDK](https://github.com/opengovsg/formsg-ruby-sdk)
 
 The current product roadmap includes:
 
@@ -57,11 +57,7 @@ Install [docker and docker-compose](https://docs.docker.com/get-docker/).
 
 ### First Setup
 
-Run the following shell command to install relevant npm packages.
-
-```bash
-npm install
-```
+Run `npm install` in root directory to install relevant npm packages.
 
 If you are on Mac OS X, you may want to allow Docker to use more RAM (minimum of 4GB) by clicking on the Docker icon on the toolbar, clicking on the "Preferences" menu item, then clicking on the "Resources" link on the left.
 
@@ -148,8 +144,8 @@ The team uses macOS for development.
 
 Make you sure have the following node version & package manager on your machine:
 
-- `"node": ">=14.17.0"`
-- `"npm": ">=6.0.0"`
+- `"node": ">=18.12.1"`
+- `"npm": ">=8.19.2"`
 - `"mongo": ">=4.0.0"`
 
 Run

__tests__/e2e/setup/.test-env

@@ -67,6 +67,12 @@ SESSION_SECRET=sandcrawler-138577
 SES_PORT=1025 
 SES_HOST=0.0.0.0
 
+# TODO #130 Remove these when SES migration is over (opengovsg/formsg-private#130)
+SES_PORT_US=1025
+SES_HOST_US=0.0.0.0
+SES_PORT_SG=1025
+SES_HOST_SG=0.0.0.0
+
 SERVICES=s3
 
 IMAGE_S3_BUCKET=local-image-bucket