chore: merge v5.10.1 into master

.gitignore

@@ -31,6 +31,10 @@ dist/
 *.sublime-project
 *.sublime-workspace
 
+# IntelliJ editor
+# ==============
+.idea/
+
 # General
 # =======
 *.log

.husky/pre-commit

@@ -1,4 +1,4 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
 
-npx lint-staged && sh secrets-check.sh
+npm run pre-commit && sh secrets-check.sh

CHANGELOG.md

@@ -4,9 +4,61 @@ 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.10.1](https://github.com/opengovsg/FormSG/compare/v5.10.0...v5.10.1)
+
+- fix: allow for unknown keys in updateEndPage validator [`617d86a`](https://github.com/opengovsg/FormSG/commit/617d86a28910eec6ebd3249a2de636086429d6a6)
+
+#### [v5.10.0](https://github.com/opengovsg/FormSG/compare/v5.9.0...v5.10.0)
+
+> 11 May 2021
+
+- fix(collaborator-modal/client/controller): bugfix for spinner ui [`#1858`](https://github.com/opengovsg/FormSG/pull/1858)
+- fix(deps): bump @opengovsg/spcp-auth-client from 1.4.6 to 1.4.7 [`#1853`](https://github.com/opengovsg/FormSG/pull/1853)
+- fix(deps): bump @sentry/browser from 6.3.5 to 6.3.6 [`#1851`](https://github.com/opengovsg/FormSG/pull/1851)
+- chore(deps-dev): bump @typescript-eslint/parser from 4.22.1 to 4.23.0 [`#1852`](https://github.com/opengovsg/FormSG/pull/1852)
+- fix(deps): bump abortcontroller-polyfill from 1.7.1 to 1.7.3 [`#1823`](https://github.com/opengovsg/FormSG/pull/1823)
+- fix: align joi validation types to schema [`#1800`](https://github.com/opengovsg/FormSG/pull/1800)
+- chore(deps-dev): bump concurrently from 6.0.2 to 6.1.0 [`#1832`](https://github.com/opengovsg/FormSG/pull/1832)
+- chore(deps-dev): bump @types/bcrypt from 3.0.1 to 5.0.0 [`#1830`](https://github.com/opengovsg/FormSG/pull/1830)
+- chore(deps-dev): bump lint-staged from 10.5.4 to 11.0.0 [`#1827`](https://github.com/opengovsg/FormSG/pull/1827)
+- chore(deps-dev): bump core-js from 3.12.0 to 3.12.1 [`#1829`](https://github.com/opengovsg/FormSG/pull/1829)
+- chore(deps-dev): bump eslint from 7.25.0 to 7.26.0 [`#1828`](https://github.com/opengovsg/FormSG/pull/1828)
+- fix(deps): bump aws-sdk from 2.901.0 to 2.903.0 [`#1826`](https://github.com/opengovsg/FormSG/pull/1826)
+- chore(deps-dev): bump date-fns from 2.21.2 to 2.21.3 [`#1824`](https://github.com/opengovsg/FormSG/pull/1824)
+- fix: speed up precommit hooks [`#1820`](https://github.com/opengovsg/FormSG/pull/1820)
+- fix(deps): bump twilio from 3.61.0 to 3.62.0 [`#1818`](https://github.com/opengovsg/FormSG/pull/1818)
+- chore(deps-dev): bump core-js from 3.11.3 to 3.12.0 [`#1817`](https://github.com/opengovsg/FormSG/pull/1817)
+- fix(deps): bump aws-sdk from 2.900.0 to 2.901.0 [`#1816`](https://github.com/opengovsg/FormSG/pull/1816)
+- feat(email-submission): separate error logging for db and state checks [`#1813`](https://github.com/opengovsg/FormSG/pull/1813)
+- feat(admin-form): individual form field api  [`#1799`](https://github.com/opengovsg/FormSG/pull/1799)
+- chore(deps-dev): bump @types/bluebird from 3.5.33 to 3.5.34 [`#1807`](https://github.com/opengovsg/FormSG/pull/1807)
+- chore(deps-dev): bump @types/node from 14.14.43 to 14.14.44 [`#1805`](https://github.com/opengovsg/FormSG/pull/1805)
+- fix(deps): bump aws-sdk from 2.899.0 to 2.900.0 [`#1809`](https://github.com/opengovsg/FormSG/pull/1809)
+- chore(deps-dev): bump core-js from 3.11.2 to 3.11.3 [`#1808`](https://github.com/opengovsg/FormSG/pull/1808)
+- chore(deps-dev): bump date-fns from 2.21.1 to 2.21.2 [`#1806`](https://github.com/opengovsg/FormSG/pull/1806)
+- chore(deps-dev): bump ts-jest from 26.5.5 to 26.5.6 [`#1804`](https://github.com/opengovsg/FormSG/pull/1804)
+- fix: remove Learn More link for MyInfo field limit [`#1802`](https://github.com/opengovsg/FormSG/pull/1802)
+- refactor(adminform): update form collab [`#1744`](https://github.com/opengovsg/FormSG/pull/1744)
+- chore: gitignore intellij files [`#1798`](https://github.com/opengovsg/FormSG/pull/1798)
+- chore: merge v5.9.0 into develop [`#1797`](https://github.com/opengovsg/FormSG/pull/1797)
+- refactor: extract update logic endpoint [`#1695`](https://github.com/opengovsg/FormSG/pull/1695)
+- feat: add <sg-govt-banner-component> to top of public forms [`#1439`](https://github.com/opengovsg/FormSG/pull/1439)
+- fix(deps): bump aws-sdk from 2.897.0 to 2.899.0 [`#1793`](https://github.com/opengovsg/FormSG/pull/1793)
+- chore(deps-dev): bump @typescript-eslint/parser from 4.22.0 to 4.22.1 [`#1794`](https://github.com/opengovsg/FormSG/pull/1794)
+- chore(deps-dev): bump @babel/preset-env from 7.14.0 to 7.14.1 [`#1795`](https://github.com/opengovsg/FormSG/pull/1795)
+- fix(deps): bump convict from 6.0.1 to 6.1.0 [`#1792`](https://github.com/opengovsg/FormSG/pull/1792)
+- fix(deps): bump libphonenumber-js from 1.9.16 to 1.9.17 [`#1791`](https://github.com/opengovsg/FormSG/pull/1791)
+- chore(deps-dev): bump @typescript-eslint/eslint-plugin [`#1790`](https://github.com/opengovsg/FormSG/pull/1790)
+- feat(api-refactor): add specific update end page endpoint in server [`#1760`](https://github.com/opengovsg/FormSG/pull/1760)
+- feat: move server.ts into src/app [`#1785`](https://github.com/opengovsg/FormSG/pull/1785)
+- fix: trigger digest cycle for delete logic [`#1787`](https://github.com/opengovsg/FormSG/pull/1787)
+- chore: bump version to 5.9.0 [`6d6e475`](https://github.com/opengovsg/FormSG/commit/6d6e475c417cfb5efacb203888b0f296159d8ac1)
+- chore: bump version to v5.10.0 [`0615ce5`](https://github.com/opengovsg/FormSG/commit/0615ce5262fcdb65932ad6c9be9ee66503b0e949)
+
 #### [v5.9.0](https://github.com/opengovsg/FormSG/compare/v5.8.0...v5.9.0)
 
-- fix: trigger digest cycle for delete logic [`#1787`](https://github.com/opengovsg/FormSG/pull/1787)
+> 4 May 2021
+
 - fix: allow commas in email confirmation sender [`#1782`](https://github.com/opengovsg/FormSG/pull/1782)
 - chore(deps-dev): bump core-js from 3.11.1 to 3.11.2 [`#1780`](https://github.com/opengovsg/FormSG/pull/1780)
 - fix(deps): bump fp-ts from 2.10.4 to 2.10.5 [`#1781`](https://github.com/opengovsg/FormSG/pull/1781)
@@ -31,6 +83,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - fix(deps): bump aws-sdk from 2.893.0 to 2.894.0 [`#1756`](https://github.com/opengovsg/FormSG/pull/1756)
 - fix(deps): bump @sentry/integrations from 6.3.1 to 6.3.3 [`#1755`](https://github.com/opengovsg/FormSG/pull/1755)
 - chore: merge v5.8.0 into develop [`#1751`](https://github.com/opengovsg/FormSG/pull/1751)
+- chore: bump version to 5.9.0 [`902fd6a`](https://github.com/opengovsg/FormSG/commit/902fd6a764e94bd0882ca1f7bebb3e79f916c9f3)
 
 #### [v5.8.0](https://github.com/opengovsg/FormSG/compare/v5.7.1...v5.8.0)
 

README.md

@@ -64,7 +64,7 @@ npm run dev
 After the Docker image has finished building, the application can be accessed at [localhost:5000](localhost:5000).
 
 If there have been no dependency changes in `package.json` or changes in the
-`src/server.ts` file, you can run
+`src/app/server.ts` file, you can run
 
 ```bash
 docker-compose up

docs/ARCHITECTURE.md

@@ -13,7 +13,7 @@ identities, and E-mail servers hosted in Government Data Centres.
 
 ## Backend
 
-The backend for FormSG is bootstrapped using `src/server.ts` and `src/app/loaders`.
+The backend for FormSG is bootstrapped using `src/app/server.ts` and `src/app/loaders`.
 It sets up express.js routes defined in `src/app/**/*.routes.ts`, with business logic
 defined in `src/app/**/*.controller.ts` and mongoose models defined in `src/app/**/*.model.ts`.