Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: merge release v5.12.1 into master #2103

Merged
merged 35 commits into from
Jun 8, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
9cc9691
fix(verification): loosen OTP waiting time by 2 seconds (#1957)
mantariksh May 25, 2021
3692ae3
Merge pull request #1969 from opengovsg/release-v5.11.0
mantariksh May 25, 2021
d3907e9
fix: add types to RequestHandler in submitEncryptModeForm (#1889)
frankchn May 25, 2021
e90f7d6
chore(deps-dev): bump @types/node from 14.17.0 to 14.17.1 (#1972)
dependabot[bot] May 25, 2021
22365d8
chore(deps-dev): bump @types/express-serve-static-core (#1973)
dependabot[bot] May 25, 2021
de6fd74
fix(deps): bump aws-sdk from 2.912.0 to 2.913.0 (#1974)
dependabot[bot] May 25, 2021
d0589a6
chore(deps-dev): bump @types/express from 4.17.11 to 4.17.12 (#1975)
dependabot[bot] May 25, 2021
0fe5206
fix(deps): bump opossum from 6.0.1 to 6.1.0 (#1976)
dependabot[bot] May 25, 2021
94cf3cd
fix(deps): bump libphonenumber-js from 1.9.18 to 1.9.19 (#1979)
dependabot[bot] May 26, 2021
5551009
fix(deps): bump aws-sdk from 2.913.0 to 2.914.0 (#1980)
dependabot[bot] May 26, 2021
89b9723
chore(deps-dev): bump core-js from 3.12.1 to 3.13.0 (#1978)
dependabot[bot] May 27, 2021
8cb6253
fix: upgrade mongoose from 5.12.5 to 5.12.7 (#1977)
snyk-bot May 27, 2021
42fc11a
refactor: Convert form-feedback.client.factory.js, CsvGenerator.js to…
tshuli May 27, 2021
18f0e7a
feat: display different e-service placeholder text for singpass and c…
chowyiyin May 27, 2021
f26f292
refactor(verification): migrate otp generation to new api endpoint (#…
seaerchin May 27, 2021
793d64f
refactor(verification): migrate otp verification to new v3 routes (#1…
seaerchin May 27, 2021
9792ee9
chore(deps-dev): bump typescript from 4.2.4 to 4.3.2 (#1984)
dependabot[bot] May 27, 2021
5b9ba49
fix(deps): bump aws-sdk from 2.914.0 to 2.916.0 (#1985)
dependabot[bot] May 27, 2021
cd2fc23
chore(deps-dev): bump core-js from 3.13.0 to 3.13.1 (#1990)
dependabot[bot] May 30, 2021
a320816
chore(deps-dev): bump @types/mongodb from 3.6.16 to 3.6.17 (#1991)
dependabot[bot] May 30, 2021
8ece945
chore(deps-dev): bump date-fns from 2.21.3 to 2.22.1 (#1992)
dependabot[bot] May 30, 2021
8ff6389
fix(deps): bump aws-sdk from 2.916.0 to 2.918.0 (#1993)
dependabot[bot] May 30, 2021
ea2c0fe
chore(deps-dev): bump @babel/preset-env from 7.14.2 to 7.14.4 (#1994)
dependabot[bot] May 30, 2021
8a3282e
chore(deps-dev): bump eslint-plugin-import from 2.23.3 to 2.23.4 (#1995)
dependabot[bot] May 30, 2021
bb17cf3
chore(deps-dev): bump @opengovsg/mockpass from 2.7.0 to 2.7.2 (#2031)
dependabot[bot] May 31, 2021
37f8170
fix(deps): bump @sentry/browser from 6.4.1 to 6.5.0 (#2033)
dependabot[bot] May 31, 2021
e34828c
chore(deps-dev): bump @typescript-eslint/eslint-plugin (#2034)
dependabot[bot] May 31, 2021
2ac72f0
fix(deps): bump @sentry/integrations from 6.4.1 to 6.5.0 (#2036)
dependabot[bot] May 31, 2021
3e0ff27
chore(deps-dev): bump @typescript-eslint/parser from 4.25.0 to 4.26.0…
dependabot[bot] May 31, 2021
8ed8fc7
ref: remove usage of express-serve-static-core types (ParamsDictionar…
karrui Jun 1, 2021
a24da59
feat: Deduplicate Mongodb Error Messages (#1996)
frankchn Jun 1, 2021
76d00ce
build: upgrade application node version to v14 (by updating Docker im…
karrui Jun 1, 2021
85759bc
chore: bump version to 5.12.0
yong-jie Jun 1, 2021
9a2c9dc
fix: deny non-GET requests from RP and SP domains
mantariksh Jun 1, 2021
6c415d2
chore: bump version to 5.12.1
mantariksh Jun 1, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- name: Use Node.js
uses: actions/setup-node@v1
with:
node-version: '12.x'
node-version: '14.x'
- name: Cache Node.js modules
uses: actions/cache@v2
with:
Expand All @@ -35,7 +35,7 @@ jobs:
- name: Use Node.js
uses: actions/setup-node@v1
with:
node-version: '12.x'
node-version: '14.x'
- name: Load Node.js modules
uses: actions/cache@v2
with:
Expand All @@ -54,7 +54,7 @@ jobs:
- name: Use Node.js
uses: actions/setup-node@v1
with:
node-version: '12.x'
node-version: '14.x'
- name: Load Node.js modules
uses: actions/cache@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ services:
- xvfb

language: node_js
node_js: '12'
node_js: '14'
install: true # skip installation, perform in build stage.

notifications:
Expand Down
45 changes: 45 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,52 @@ 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.12.1](https://github.com/opengovsg/FormSG/compare/v5.12.0...v5.12.1)

- fix: deny non-GET requests from RP and SP domains [`9a2c9dc`](https://github.com/opengovsg/FormSG/commit/9a2c9dc0f3287b35e03bf48674c7ef57411ffe87)

#### [v5.12.0](https://github.com/opengovsg/FormSG/compare/v5.11.0...v5.12.0)

> 1 June 2021

- build: upgrade application node version to v14 (by updating Docker image) [`#2038`](https://github.com/opengovsg/FormSG/pull/2038)
- feat: Deduplicate Mongodb Error Messages [`#1996`](https://github.com/opengovsg/FormSG/pull/1996)
- ref: remove usage of express-serve-static-core types (ParamsDictionary, Query) [`#1848`](https://github.com/opengovsg/FormSG/pull/1848)
- chore(deps-dev): bump @typescript-eslint/parser from 4.25.0 to 4.26.0 [`#2035`](https://github.com/opengovsg/FormSG/pull/2035)
- fix(deps): bump @sentry/integrations from 6.4.1 to 6.5.0 [`#2036`](https://github.com/opengovsg/FormSG/pull/2036)
- chore(deps-dev): bump @typescript-eslint/eslint-plugin [`#2034`](https://github.com/opengovsg/FormSG/pull/2034)
- fix(deps): bump @sentry/browser from 6.4.1 to 6.5.0 [`#2033`](https://github.com/opengovsg/FormSG/pull/2033)
- chore(deps-dev): bump @opengovsg/mockpass from 2.7.0 to 2.7.2 [`#2031`](https://github.com/opengovsg/FormSG/pull/2031)
- chore(deps-dev): bump eslint-plugin-import from 2.23.3 to 2.23.4 [`#1995`](https://github.com/opengovsg/FormSG/pull/1995)
- chore(deps-dev): bump @babel/preset-env from 7.14.2 to 7.14.4 [`#1994`](https://github.com/opengovsg/FormSG/pull/1994)
- fix(deps): bump aws-sdk from 2.916.0 to 2.918.0 [`#1993`](https://github.com/opengovsg/FormSG/pull/1993)
- chore(deps-dev): bump date-fns from 2.21.3 to 2.22.1 [`#1992`](https://github.com/opengovsg/FormSG/pull/1992)
- chore(deps-dev): bump @types/mongodb from 3.6.16 to 3.6.17 [`#1991`](https://github.com/opengovsg/FormSG/pull/1991)
- chore(deps-dev): bump core-js from 3.13.0 to 3.13.1 [`#1990`](https://github.com/opengovsg/FormSG/pull/1990)
- fix(deps): bump aws-sdk from 2.914.0 to 2.916.0 [`#1985`](https://github.com/opengovsg/FormSG/pull/1985)
- chore(deps-dev): bump typescript from 4.2.4 to 4.3.2 [`#1984`](https://github.com/opengovsg/FormSG/pull/1984)
- refactor(verification): migrate otp verification to new v3 routes [`#1926`](https://github.com/opengovsg/FormSG/pull/1926)
- refactor(verification): migrate otp generation to new api endpoint [`#1916`](https://github.com/opengovsg/FormSG/pull/1916)
- feat: display different e-service placeholder text for singpass and corpass [`#1968`](https://github.com/opengovsg/FormSG/pull/1968)
- refactor: Convert form-feedback.client.factory.js, CsvGenerator.js to TypeScript [`#1899`](https://github.com/opengovsg/FormSG/pull/1899)
- fix: upgrade mongoose from 5.12.5 to 5.12.7 [`#1977`](https://github.com/opengovsg/FormSG/pull/1977)
- chore(deps-dev): bump core-js from 3.12.1 to 3.13.0 [`#1978`](https://github.com/opengovsg/FormSG/pull/1978)
- fix(deps): bump aws-sdk from 2.913.0 to 2.914.0 [`#1980`](https://github.com/opengovsg/FormSG/pull/1980)
- fix(deps): bump libphonenumber-js from 1.9.18 to 1.9.19 [`#1979`](https://github.com/opengovsg/FormSG/pull/1979)
- fix(deps): bump opossum from 6.0.1 to 6.1.0 [`#1976`](https://github.com/opengovsg/FormSG/pull/1976)
- chore(deps-dev): bump @types/express from 4.17.11 to 4.17.12 [`#1975`](https://github.com/opengovsg/FormSG/pull/1975)
- fix(deps): bump aws-sdk from 2.912.0 to 2.913.0 [`#1974`](https://github.com/opengovsg/FormSG/pull/1974)
- chore(deps-dev): bump @types/express-serve-static-core [`#1973`](https://github.com/opengovsg/FormSG/pull/1973)
- chore(deps-dev): bump @types/node from 14.17.0 to 14.17.1 [`#1972`](https://github.com/opengovsg/FormSG/pull/1972)
- fix: add types to RequestHandler in submitEncryptModeForm [`#1889`](https://github.com/opengovsg/FormSG/pull/1889)
- chore: merge v5.11.0 into develop [`#1969`](https://github.com/opengovsg/FormSG/pull/1969)
- fix(verification): loosen OTP waiting time by 2 seconds [`#1957`](https://github.com/opengovsg/FormSG/pull/1957)
- chore: bump version to 5.12.0 [`85759bc`](https://github.com/opengovsg/FormSG/commit/85759bc9dc01f73da3cbd0ec73c636e58e983948)

#### [v5.11.0](https://github.com/opengovsg/FormSG/compare/v5.10.0...v5.11.0)

> 25 May 2021

- fix: set form logo default value when creating form document [`#1966`](https://github.com/opengovsg/FormSG/pull/1966)
- chore(deps-dev): bump ts-node from 9.1.1 to 10.0.0 [`#1964`](https://github.com/opengovsg/FormSG/pull/1964)
- feat: extract public form submission flow (and preview) to specific Typescript services [`#1917`](https://github.com/opengovsg/FormSG/pull/1917)
Expand Down Expand Up @@ -69,6 +113,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
- fix(deps): bump aws-sdk from 2.903.0 to 2.904.0 [`#1869`](https://github.com/opengovsg/FormSG/pull/1869)
- chore(deps-dev): bump @typescript-eslint/eslint-plugin [`#1868`](https://github.com/opengovsg/FormSG/pull/1868)
- fix(deps): bump @sentry/integrations from 6.3.5 to 6.3.6 [`#1850`](https://github.com/opengovsg/FormSG/pull/1850)
- chore: bump version to 5.11.0 [`54b1958`](https://github.com/opengovsg/FormSG/commit/54b1958d0968e670ef145461d9d7859384d573ef)
- chore: bump version to v5.10.1 [`0442cd7`](https://github.com/opengovsg/FormSG/commit/0442cd72637019fb1e43bce5f8f5abe14ee79f8c)
- fix: allow for unknown keys in updateEndPage validator [`617d86a`](https://github.com/opengovsg/FormSG/commit/617d86a28910eec6ebd3249a2de636086429d6a6)

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.development
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:12-alpine3.12
FROM node:fermium-alpine3.13
LABEL maintainer=FormSG<formsg@data.gov.sg>

WORKDIR /opt/formsg
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.production
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:12-alpine3.12 AS node-modules-builder
FROM node:fermium-alpine3.13 AS node-modules-builder
# node-modules-builder stage installs/compiles the node_modules folder
# Python version must be specified starting in alpine3.12
RUN apk update && apk upgrade && \
Expand All @@ -11,7 +11,7 @@ RUN npm ci
COPY . /opt/formsg

# This stage builds the final container
FROM node:12-alpine3.12
FROM node:fermium-alpine3.13
LABEL maintainer=FormSG<formsg@data.gov.sg>
WORKDIR /opt/formsg

Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -113,14 +113,14 @@ The team uses macOS for development.

Make you sure have the following node version & package manager on your machine:

- `"node": ">=12.18.0"`
- `"node": ">=14.17.0"`
- `"npm": ">=6.0.0"`
- `"mongo": ">=3.6.0"`
- `"mongo": ">=4.0.0"`

Run

```bash
nvm install 12.18.0
nvm install 14
npm install
pip install "localstack[full]"
```
Expand Down
4 changes: 2 additions & 2 deletions docs/TROUBLESHOOTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ A list of common issues that developers face and how to resolve them.
## `Error: Module did not self-register.`

This could happen if node modules were compiled with a different version of node, or if node modules fail to compile due to other configuration errors.
Running tests locally requires `node` to specifically be the latest version of NodeJS 12. You can use `nvm` to manually set the node version.
Running tests locally requires `node` to specifically be the latest version of NodeJS 14. You can use `nvm` to manually set the node version.

### [Node Versioning Error](https://stackoverflow.com/questions/28486891/uncaught-error-module-did-not-self-register)

Run the following commands to set the node version and then re-install the node modules:

```
nvm use 12
nvm use 14
rm -r node_modules
npm install
```
Expand Down
Loading