Skip to content

Commit

Permalink
Merge pull request #5988 from opengovsg/release_v6.37.0
Browse files Browse the repository at this point in the history
build: release v6.37.0
  • Loading branch information
wanlingt authored Mar 24, 2023
2 parents 75b6d31 + b4d24eb commit 638690e
Show file tree
Hide file tree
Showing 71 changed files with 5,524 additions and 3,158 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/playwright.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,15 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 14
node-version: 18
- name: Install dependencies
run: npm ci
- name: Install Playwright Browsers
run: npx playwright install --with-deps
- name: Build
env:
NODE_OPTIONS: '--max-old-space-size=4096'
NODE_OPTIONS: '--max-old-space-size=4096 --openssl-legacy-provider'
REACT_APP_FORMSG_SDK_MODE: 'test'
run: npm run build
- name: Run Playwright tests
run: npx playwright test
Expand Down
1 change: 1 addition & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
unsafe-perm=true
legacy-peer-deps=true
66 changes: 42 additions & 24 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,36 @@ 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.36.1](https://github.com/opengovsg/FormSG/compare/v6.36.0...v6.36.1)

#### [v6.37.0](https://github.com/opengovsg/FormSG/compare/v6.36.0...v6.37.0)

- fix(deps): bump type-fest from 3.6.1 to 3.7.0 in /shared [`#5986`](https://github.com/opengovsg/FormSG/pull/5986)
- chore(deps-dev): bump @typescript-eslint/eslint-plugin from 5.55.0 to 5.56.0 in /shared [`#5953`](https://github.com/opengovsg/FormSG/pull/5953)
- chore(deps-dev): bump @typescript-eslint/parser from 5.52.0 to 5.56.0 [`#5978`](https://github.com/opengovsg/FormSG/pull/5978)
- fix: submit admin feedback form [`#5981`](https://github.com/opengovsg/FormSG/pull/5981)
- fix: typo in readme [`#5979`](https://github.com/opengovsg/FormSG/pull/5979)
- docs: improve contribution guidelines [`#5925`](https://github.com/opengovsg/FormSG/pull/5925)
- fix: move permission list validation from model level to service layer [`#5946`](https://github.com/opengovsg/FormSG/pull/5946)
- chore(deps-dev): bump eslint-config-prettier from 8.7.0 to 8.8.0 in /shared [`#5952`](https://github.com/opengovsg/FormSG/pull/5952)
- chore(deps-dev): bump @typescript-eslint/parser from 5.55.0 to 5.56.0 in /shared [`#5954`](https://github.com/opengovsg/FormSG/pull/5954)
- chore(deps-dev): bump csv-parse from 5.3.3 to 5.3.6 [`#5951`](https://github.com/opengovsg/FormSG/pull/5951)
- docs: Script to find invalid whitespaces [`#5945`](https://github.com/opengovsg/FormSG/pull/5945)
- chore(deps-dev): bump rimraf from 3.0.2 to 4.4.0 [`#5947`](https://github.com/opengovsg/FormSG/pull/5947)
- build: merge Release 6.36.1 back into develop [`#5941`](https://github.com/opengovsg/FormSG/pull/5941)
- fix(deps): bump libphonenumber-js from 1.10.15 to 1.10.24 [`#5943`](https://github.com/opengovsg/FormSG/pull/5943)
- fix: trim dropdown options for logic check [`#5940`](https://github.com/opengovsg/FormSG/pull/5940)
- fix(deps): bump moment-timezone from 0.5.40 to 0.5.41 [`#5939`](https://github.com/opengovsg/FormSG/pull/5939)
- test(e2e): add storage mode e2e tests [`#5926`](https://github.com/opengovsg/FormSG/pull/5926)
- chore(deps-dev): bump jest-localstorage-mock from 2.4.25 to 2.4.26 [`#5916`](https://github.com/opengovsg/FormSG/pull/5916)
- fix(deps): bump libphonenumber-js from 1.10.21 to 1.10.24 in /shared [`#5936`](https://github.com/opengovsg/FormSG/pull/5936)
- chore(deps): bump @opengovsg/myinfo-gov-client from 4.0.1 to 4.0.2 [`#5931`](https://github.com/opengovsg/FormSG/pull/5931)
- feat: otp prefix for respondents email and mobile fields [`#5874`](https://github.com/opengovsg/FormSG/pull/5874)
- chore(deps-dev): bump @typescript-eslint/eslint-plugin from 5.54.1 to 5.55.0 in /shared [`#5923`](https://github.com/opengovsg/FormSG/pull/5923)
- feat: update uen entity types [`#5915`](https://github.com/opengovsg/FormSG/pull/5915)
- chore(deps-dev): bump @typescript-eslint/parser from 5.54.1 to 5.55.0 in /shared [`#5922`](https://github.com/opengovsg/FormSG/pull/5922)
- test(e2e/email): add form auth tests [`#5876`](https://github.com/opengovsg/FormSG/pull/5876)
- build: merge v6.36.0 into develop [`#5914`](https://github.com/opengovsg/FormSG/pull/5914)
- build: release v6.36.0 [`#5913`](https://github.com/opengovsg/FormSG/pull/5913)
- fix: trim dropdown options for logic check [`25e197a`](https://github.com/opengovsg/FormSG/commit/25e197a22eecec527b2b284aee0b95ccb1cd3797)
- chore: bump version to 6.36.1 [`faf75b5`](https://github.com/opengovsg/FormSG/commit/faf75b5a7d0d12745e9a0104c541fb66cca17258)

#### [v6.36.0](https://github.com/opengovsg/FormSG/compare/v6.35.0...v6.36.0)

Expand Down Expand Up @@ -265,7 +291,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

#### [v6.24.0](https://github.com/opengovsg/FormSG/compare/v6.23.3...v6.24.0)

> 22 December 2022
> 23 December 2022

- feat: initialise datadog in head [`#5571`](https://github.com/opengovsg/FormSG/pull/5571)
- build: merge 6.23.3 into develop [`#5614`](https://github.com/opengovsg/FormSG/pull/5614)
Expand Down Expand Up @@ -302,7 +328,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

#### [v6.23.3](https://github.com/opengovsg/FormSG/compare/v6.23.2...v6.23.3)

> 22 December 2022
> 23 December 2022

- build: Release v6.23.2 hotfix [`#5602`](https://github.com/opengovsg/FormSG/pull/5602)
- chore: bump version to 6.23.2 [`1256707`](https://github.com/opengovsg/FormSG/commit/1256707db95a30486c2ccfc731d9ff6cbdb7dc40)
Expand Down Expand Up @@ -380,7 +406,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
- fix: extend tags in then show logic blocks to be full width [`#5507`](https://github.com/opengovsg/FormSG/pull/5507)
- build: Release v6.20.0 [`#5496`](https://github.com/opengovsg/FormSG/pull/5496)
- chore: bump version to v6.21.0 [`3d189cf`](https://github.com/opengovsg/FormSG/commit/3d189cfdc7c105eb31987d31c1b38cb82f402952)
- chore: bump version to v6.20.0 [`54131bd`](https://github.com/opengovsg/FormSG/commit/54131bd9c354fbb9aa478ca871817c34b1544aaa)
- chore: fix changelog due to recut in v6.19.0 [`769efee`](https://github.com/opengovsg/FormSG/commit/769efee7d3552d5d675c1b81ed3320a931aafcb8)

#### [v6.20.0](https://github.com/opengovsg/FormSG/compare/v6.19.0...v6.20.0)
Expand All @@ -390,6 +415,13 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
- chore: decommission SAML support for Singpass / Corppass [`#5469`](https://github.com/opengovsg/FormSG/pull/5469)
- chore: update chromatic GA to only run in PRs [`#5488`](https://github.com/opengovsg/FormSG/pull/5488)
- build: release v6.19.0 [`#5481`](https://github.com/opengovsg/FormSG/pull/5481)
- chore: bump version to v6.20.0 [`54131bd`](https://github.com/opengovsg/FormSG/commit/54131bd9c354fbb9aa478ca871817c34b1544aaa)
- Merge pull request #5490 from opengovsg/release-al2 [`bf0984e`](https://github.com/opengovsg/FormSG/commit/bf0984e8ae74382fd455c0821b16976793990932)

#### [v6.19.0](https://github.com/opengovsg/FormSG/compare/v6.18.5...v6.19.0)

> 29 November 2022

- feat: add public form `/use-template` redirection to admin form template page [`#5486`](https://github.com/opengovsg/FormSG/pull/5486)
- fix: remove form title special characters validation [`#5485`](https://github.com/opengovsg/FormSG/pull/5485)
- chore: merge hotfix release v6.18.5 to develop [`#5480`](https://github.com/opengovsg/FormSG/pull/5480)
Expand All @@ -404,28 +436,15 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
- fix: extend MyInfo login expiry to match env var [`#5464`](https://github.com/opengovsg/FormSG/pull/5464)
- chore: merge hotfix release v6.18.4 back to develop [`#5472`](https://github.com/opengovsg/FormSG/pull/5472)
- feat: improve admin storage mode response printability [`#5460`](https://github.com/opengovsg/FormSG/pull/5460)
- fix: update field validators with more specific type guarantees [`#5468`](https://github.com/opengovsg/FormSG/pull/5468)
- build: hotfix release v6.18.4 [`#5470`](https://github.com/opengovsg/FormSG/pull/5470)
- fix: correctly perform logic validation on MyInfo prefilled fields [`#5467`](https://github.com/opengovsg/FormSG/pull/5467)
- fix: trim dropdown option answer in backend and in angularjs frontend [`#5466`](https://github.com/opengovsg/FormSG/pull/5466)
- chore(deps-dev): bump @babel/preset-env from 7.19.4 to 7.20.2 [`#5463`](https://github.com/opengovsg/FormSG/pull/5463)
- test: add email submission e2e tests [`#5162`](https://github.com/opengovsg/FormSG/pull/5162)
- feat: allow special chars in form title [`#5436`](https://github.com/opengovsg/FormSG/pull/5436)
- fix: release v6.18.3 [`#5459`](https://github.com/opengovsg/FormSG/pull/5459)
- chore(deps-dev): bump husky from 8.0.1 to 8.0.2 [`#5457`](https://github.com/opengovsg/FormSG/pull/5457)
- fix(docker-compose): change ports from 5000 to 5001 [`#5455`](https://github.com/opengovsg/FormSG/pull/5455)
- chore(deps-dev): bump @types/lodash from 4.14.189 to 4.14.190 in /shared [`#5454`](https://github.com/opengovsg/FormSG/pull/5454)
- chore(deps-dev): bump @typescript-eslint/eslint-plugin from 5.43.0 to 5.44.0 [`#5453`](https://github.com/opengovsg/FormSG/pull/5453)
- fix: update max dimension for image uploads [`#5451`](https://github.com/opengovsg/FormSG/pull/5451)
- fix(deps): bump @sentry/browser from 7.17.3 to 7.20.1 [`#5449`](https://github.com/opengovsg/FormSG/pull/5449)
- chore: bump version to v6.20.0 [`1f3f2b7`](https://github.com/opengovsg/FormSG/commit/1f3f2b7fbd0d0fec1980dacbba6a384aeb28b999)
- Merge pull request #5490 from opengovsg/release-al2 [`bf0984e`](https://github.com/opengovsg/FormSG/commit/bf0984e8ae74382fd455c0821b16976793990932)
- fix(deps): bump @aws-sdk/client-cloudwatch-logs to 3.216.0 [`ac812ec`](https://github.com/opengovsg/FormSG/commit/ac812ecdd14b11f9500e3d95aa75050be40d8e24)

#### [v6.19.0](https://github.com/opengovsg/FormSG/compare/v6.18.5...v6.19.0)

> 22 November 2022

- fix: disable submission in template mode [`#5443`](https://github.com/opengovsg/FormSG/pull/5443)
- fix(docker-compose): include US and SG SES env vars [`#5442`](https://github.com/opengovsg/FormSG/pull/5442)
- feat: use-template for forms [`#5377`](https://github.com/opengovsg/FormSG/pull/5377)
Expand All @@ -444,7 +463,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
- fix(deps): bump aws-sdk from 2.1251.0 to 2.1255.0 [`#5415`](https://github.com/opengovsg/FormSG/pull/5415)
- fix(deps): bump loader-utils from 1.4.0 to 1.4.2 [`#5416`](https://github.com/opengovsg/FormSG/pull/5416)
- chore(deps-dev): bump eslint-plugin-jest from 27.1.3 to 27.1.5 [`#5414`](https://github.com/opengovsg/FormSG/pull/5414)
- chore: bump version to v6.19.0 [`04762a2`](https://github.com/opengovsg/FormSG/commit/04762a268542a70f3b9d10e1f8c7f273d32ac9bc)
- chore: bump version to v6.19.0 [`f245c66`](https://github.com/opengovsg/FormSG/commit/f245c66f1dbb133429101574889e55b479591061)
- Merge pull request #5435 from opengovsg/release-al2 [`6023bac`](https://github.com/opengovsg/FormSG/commit/6023bac35189418bac8b1bb59cea53661df7fb76)

#### [v6.18.5](https://github.com/opengovsg/FormSG/compare/v6.18.4...v6.18.5)
Expand All @@ -453,17 +472,16 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

- fix: update field validators with more specific type guarantees [`#5468`](https://github.com/opengovsg/FormSG/pull/5468)
- build: hotfix release v6.18.4 [`#5470`](https://github.com/opengovsg/FormSG/pull/5470)
- fix: correctly perform logic validation on MyInfo prefilled fields [`#5467`](https://github.com/opengovsg/FormSG/pull/5467)
- fix: trim dropdown option answer in backend and in angularjs frontend [`#5466`](https://github.com/opengovsg/FormSG/pull/5466)
- chore: bump version to 6.18.5 [`d542ca3`](https://github.com/opengovsg/FormSG/commit/d542ca3ba7273ddb1de5aa3cf91bdcff057ead07)
- chore: bump version to v6.18.4 [`fa4b57a`](https://github.com/opengovsg/FormSG/commit/fa4b57a6ff8ed0c5f0aced09733115c32bb2a8ce)

#### [v6.18.4](https://github.com/opengovsg/FormSG/compare/v6.18.3...v6.18.4)

> 28 November 2022

- fix: correctly perform logic validation on MyInfo prefilled fields [`#5467`](https://github.com/opengovsg/FormSG/pull/5467)
- fix: trim dropdown option answer in backend and in angularjs frontend [`#5466`](https://github.com/opengovsg/FormSG/pull/5466)
- fix: release v6.18.3 [`#5459`](https://github.com/opengovsg/FormSG/pull/5459)
- chore: bump version to v6.18.4 [`704d7b4`](https://github.com/opengovsg/FormSG/commit/704d7b41a263dc774e39f3633a94594def74efef)
- chore: bump version to v6.18.4 [`fa4b57a`](https://github.com/opengovsg/FormSG/commit/fa4b57a6ff8ed0c5f0aced09733115c32bb2a8ce)

#### [v6.18.3](https://github.com/opengovsg/FormSG/compare/v6.18.2...v6.18.3)

Expand Down
12 changes: 7 additions & 5 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,15 @@ Welcome to FormSG! The following are guidelines for contribution. Use your best

## Getting started

To contribute, you can start by taking a look at our open issues marked 'contribute' under GitHub's 'Issues' tab. Feel free to assign yourself to any 'contribute' issue that interests you, and comment with questions or clarifications.
To contribute, you can start by taking a look at our open issues marked 'contribute' under GitHub's 'Issues' tab. Feel free to assign yourself to any 'contribute' issue that interests you, and comment with questions or clarifications.

Otherwise, please **first discuss the change you wish to make via GitHub issue**, [email](mailto:[email protected]), or any other method with the repository owners beforehand.
Before starting work on a PR, please **first discuss the change you wish to make via GitHub issue**, [email](mailto:[email protected]), or any other method with the repository owners beforehand. This will give us the opportunity to provide feedback, and avoid wasted effort subsequently.

For other changes which are not currently in our open issues, please file an issue first for discussion, before starting work on the PR. We strongly encourage contributors not to open unsolicited PRs, as we may not be able to review or accept them.

## Security reports

Please do not file an open issue for ongoing security bugs. Instead, email us directly with your findings at [support@form.gov.sg](mailto:support@form.gov.sg).
Please do not file an open issue for ongoing security bugs. Instead, email us directly with your findings at [contribute@form.gov.sg](mailto:contribute@form.gov.sg).

## Bug reports and feature requests

Expand Down Expand Up @@ -40,7 +42,7 @@ If you're submitting a pull request, some points to note:
1. Ensure any install or build dependencies are removed before the end of the layer when doing a build. Refer to [README.md](https://go.gov.sg/formsg-readme) for more details
2. Update the [README.md](https://go.gov.sg/formsg-readme) with details of changes to the interface, including new environment variables, exposed ports, useful file locations and container parameters.
<!---Increase the version numbers of the packages in any example files and the [README.md](https://github.com/opengovsg/formsg/blob/master/README.md) to the new version that this Pull Request would represent.--->
3. Write [semantic commit messages](https://www.conventionalcommits.org/en/v1.0.0/). See past [PRs](https://github.com/opengovsg/FormSG/pulls) for examples.
3. Write [semantic commit messages](https://www.conventionalcommits.org/en/v1.0.0/). See past [PRs](https://github.com/opengovsg/FormSG/pulls) for examples.
4. You may merge the Pull Request in once you have the sign-off of two other developers, or if you do not have permission to do that, you may request the second reviewer to merge it for you.

## Contributor License Agreement
Expand All @@ -52,4 +54,4 @@ You generally only need to submit a CLA once, so if you've already submitted one

## Contact us

Have questions? Feel free to reach out to us at [support@form.gov.sg](mailto:support@form.gov.sg).
Have questions? Feel free to reach out to us at [contribute@form.gov.sg](mailto:contribute@form.gov.sg).
17 changes: 10 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

- [FormSG](#formsg)
- [Table of Contents](#table-of-contents)
- [Contributing](#contributing)
- [Features](#features)
- [Local Development (Docker)](#local-development-docker)
- [Prerequisites](#prerequisites)
Expand All @@ -26,10 +27,16 @@
- [End-to-end tests](#end-to-end-tests)
- [Architecture](#architecture)
- [MongoDB Scripts](#mongodb-scripts)
- [Contributing](#contributing)
- [Support](#support)
- [Acknowledgements](#acknowledgements)

## Contributing

We welcome all contributions, bug reports, bug fixes, documentation improvements, enhancements, and ideas to code open sourced by the Government Technology Agency of Singapore. Contributors will also be asked to sign a Contributor License Agreement (CLA) to ensure that everybody is free to use their contributions.

#### IMPORTANT NOTE TO ALL CONTRIBUTORS
Before contributing, please read [CONTRIBUTING.md](CONTRIBUTING.md). In particular, we strongly encourage contributors to please **first discuss the change you wish to make via GitHub issue**, [email](mailto:[email protected]), or any other method with the repository owners beforehand. Otherwise, we may not be able to review or accept your PR.

## Features

FormSG is a form builder application built, open sourced and maintained by the [Open Government Products](https://open.gov.sg) team of the Singapore [Government Technology Agency](https://tech.gov.sg) to digitise paper processes.
Expand Down Expand Up @@ -65,7 +72,7 @@ Install [docker and docker-compose](https://docs.docker.com/get-docker/).
To install the relevant npm packages, run the following in the root direcory:

```bash
npm install --legacy-peer-deps
npm install
```

To prevent breaking changes to webpack4 introduced in node 17 and above, enable the `--openssl-legacy-provider` flag:
Expand Down Expand Up @@ -99,7 +106,7 @@ only takes ~15 seconds to finish starting up the image.

### Adding dependencies

Run `npm install --legacy-peer-deps` as per usual.
Run `npm install` as per usual.

For backend, run

Expand Down Expand Up @@ -207,10 +214,6 @@ The architecture overview is [here](docs/ARCHITECTURE.md).

Scripts for common tasks in MongoDB can be found [here](docs/MONGODB.md).

## Contributing

We welcome all contributions, bug reports, bug fixes, documentation improvements, enhancements, and ideas to code open sourced by the Government Technology Agency of Singapore. Contributors should read [CONTRIBUTING.md](CONTRIBUTING.md) and will also be asked to sign a Contributor License Agreement (CLA) to ensure that everybody is free to use their contributions.

## Support

Please contact FormSG ([email protected]) for any details.
Expand Down
Loading

0 comments on commit 638690e

Please sign in to comment.