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 v5.11.0 into master #2043

Merged
merged 64 commits into from
Jun 1, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
d4f8568
fix(deps): bump @sentry/integrations from 6.3.5 to 6.3.6 (#1850)
dependabot[bot] May 11, 2021
954bd8d
chore(deps-dev): bump @typescript-eslint/eslint-plugin (#1868)
dependabot[bot] May 11, 2021
5dbe9e2
fix(deps): bump aws-sdk from 2.903.0 to 2.904.0 (#1869)
dependabot[bot] May 11, 2021
bf32595
Merge pull request #1865 from opengovsg/release-v5.10.0
tshuli May 12, 2021
2b71b24
build: migrate unit tests to GitHub Actions (#1870)
mantariksh May 12, 2021
320a27f
refactor: convert color-themes.client.service.js to TypeScript enum (…
chowyiyin May 12, 2021
3a75b83
chore(deps-dev): bump testcafe from 1.14.0 to 1.14.1 (#1876)
dependabot[bot] May 12, 2021
6f5efe3
fix(deps): bump aws-sdk from 2.904.0 to 2.905.0 (#1877)
dependabot[bot] May 12, 2021
4f79062
chore(deps-dev): bump @opengovsg/mockpass from 2.6.9 to 2.6.10 (#1878)
dependabot[bot] May 12, 2021
0f911c8
chore(deps-dev): bump @babel/plugin-transform-runtime (#1879)
dependabot[bot] May 12, 2021
33fb6ec
chore(deps-dev): bump testcafe from 1.14.1 to 1.14.2 (#1880)
dependabot[bot] May 13, 2021
52f745c
chore(deps-dev): bump @babel/preset-env from 7.14.1 to 7.14.2 (#1881)
dependabot[bot] May 13, 2021
e586c53
fix(deps): bump aws-sdk from 2.905.0 to 2.906.0 (#1883)
dependabot[bot] May 13, 2021
51dba54
chore(deps-dev): bump @types/node from 14.14.44 to 14.14.45 (#1884)
dependabot[bot] May 13, 2021
a83316c
chore(deps-dev): bump @babel/core from 7.14.0 to 7.14.2 (#1882)
dependabot[bot] May 13, 2021
71f3d79
refactor(verification): migrate verified field (#1866)
seaerchin May 14, 2021
b426e8d
chore(deps-dev): bump eslint-plugin-import from 2.22.1 to 2.23.2 (#1891)
dependabot[bot] May 16, 2021
bf7a2cc
chore(deps-dev): bump @types/convict from 6.0.1 to 6.0.2 (#1893)
dependabot[bot] May 16, 2021
a671b8b
fix(deps): bump aws-sdk from 2.906.0 to 2.907.0 (#1894)
dependabot[bot] May 16, 2021
e386e5e
Merge pull request #1898 from opengovsg/release-v5.10.1
karrui May 17, 2021
fd5a8f6
refactor: extract create logic endpoint / refactor $watchCollection (…
tshuli May 17, 2021
e6ec4d3
chore(deps-dev): bump @typescript-eslint/parser from 4.23.0 to 4.24.0…
dependabot[bot] May 17, 2021
b21931c
fix(deps): bump @sentry/browser from 6.3.6 to 6.4.0 (#1913)
dependabot[bot] May 17, 2021
4117a76
chore(deps-dev): bump @typescript-eslint/eslint-plugin (#1911)
dependabot[bot] May 17, 2021
70aa490
fix(deps): bump @sentry/integrations from 6.3.6 to 6.4.0 (#1912)
dependabot[bot] May 17, 2021
87ef9c1
chore(pull_request_template): adds breaking changes section to github…
seaerchin May 18, 2021
87adcba
chore(deps-dev): bump @types/bluebird from 3.5.34 to 3.5.35 (#1918)
dependabot[bot] May 18, 2021
037fc18
chore(deps-dev): bump @babel/plugin-transform-runtime (#1919)
dependabot[bot] May 18, 2021
63868ff
chore(deps-dev): bump @types/node from 14.14.45 to 14.17.0 (#1921)
dependabot[bot] May 18, 2021
fd80925
fix(deps): bump aws-sdk from 2.907.0 to 2.908.0 (#1922)
dependabot[bot] May 18, 2021
d8b49c4
chore(deps-dev): bump @babel/core from 7.14.2 to 7.14.3 (#1920)
dependabot[bot] May 18, 2021
72c9cb2
refactor(verification): reset field verification state when field cha…
seaerchin May 19, 2021
035da37
feat: add response ID to thank you page (#1855)
chowyiyin May 19, 2021
7da9f2a
feat: upgrade myinfo-gov-client to 4.0.0 (#1925)
mantariksh May 19, 2021
f06cb55
build: mute database container logs (#1927)
mantariksh May 19, 2021
ac9ebd5
refactor(admin-form): extract update form startpage (#1833)
seaerchin May 19, 2021
837783d
chore(deps-dev): bump @types/mongodb from 3.6.12 to 3.6.14 (#1932)
dependabot[bot] May 19, 2021
11efddb
fix(deps): bump @sentry/browser from 6.4.0 to 6.4.1 (#1933)
dependabot[bot] May 19, 2021
9fc1f99
fix(deps): bump aws-sdk from 2.908.0 to 2.909.0 (#1934)
dependabot[bot] May 19, 2021
0e3645e
fix(deps): bump @sentry/integrations from 6.4.0 to 6.4.1 (#1931)
dependabot[bot] May 20, 2021
64e7c8b
fix(encrypt-submission): shift encrypt mode form guard higher up the …
yong-jie May 20, 2021
62441f2
feat: implement specific API for duplicating form fields (#1907)
chowyiyin May 20, 2021
e1e6426
fix(deps): bump aws-sdk from 2.909.0 to 2.910.0 (#1944)
dependabot[bot] May 20, 2021
c948ebe
fix(deps): bump twilio from 3.62.0 to 3.63.0 (#1945)
dependabot[bot] May 20, 2021
8a75bb4
fix(deps): bump express-session from 1.17.1 to 1.17.2 (#1946)
dependabot[bot] May 20, 2021
57977ad
fix(deps): bump @stablelib/base64 from 1.0.0 to 1.0.1 (#1949)
dependabot[bot] May 23, 2021
fcd2e74
chore(deps-dev): bump eslint from 7.26.0 to 7.27.0 (#1948)
dependabot[bot] May 23, 2021
6e0bfd7
fix(deps): bump aws-sdk from 2.910.0 to 2.912.0 (#1950)
dependabot[bot] May 23, 2021
66b3b61
fix(deps): bump nodemailer from 6.6.0 to 6.6.1 (#1951)
dependabot[bot] May 23, 2021
a56c8f6
chore(deps-dev): bump eslint-plugin-import from 2.23.2 to 2.23.3 (#1952)
dependabot[bot] May 23, 2021
6b8d086
chore(deps-dev): bump @types/mongodb from 3.6.14 to 3.6.16 (#1953)
dependabot[bot] May 23, 2021
a835052
fix(deps): bump libphonenumber-js from 1.9.17 to 1.9.18 (#1954)
dependabot[bot] May 23, 2021
f266635
feat: add enable captcha infobox (#1908)
jia1 May 24, 2021
a44fb57
chore(deps-dev): bump auto-changelog from 2.2.1 to 2.3.0 (#1958)
dependabot[bot] May 24, 2021
0fd02ed
chore(deps-dev): bump @types/nodemailer from 6.4.1 to 6.4.2 (#1960)
dependabot[bot] May 24, 2021
9874c39
chore(deps-dev): bump @opengovsg/mockpass from 2.6.10 to 2.7.0 (#1962)
dependabot[bot] May 24, 2021
a1d9773
chore(deps-dev): bump @typescript-eslint/eslint-plugin (#1963)
dependabot[bot] May 24, 2021
888d04e
chore(deps-dev): bump concurrently from 6.1.0 to 6.2.0 (#1961)
dependabot[bot] May 24, 2021
c824e67
chore(deps-dev): bump @typescript-eslint/parser from 4.24.0 to 4.25.0…
dependabot[bot] May 24, 2021
f379eef
refactor: convert rating.client.service.js to typescript enum (#1955)
chowyiyin May 25, 2021
7233808
feat: extract public form submission flow (and preview) to specific T…
karrui May 25, 2021
caf1bef
chore(deps-dev): bump ts-node from 9.1.1 to 10.0.0 (#1964)
dependabot[bot] May 25, 2021
1b2680f
fix: set form logo default value when creating form document (#1966)
karrui May 25, 2021
54b1958
chore: bump version to 5.11.0
mantariksh May 25, 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: 6 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@ Closes [insert issue #]
## Solution
<!-- How did you solve the problem? -->

**Breaking Changes**
<!-- Does this PR contain any backward incompatible changes? If so, what are they and should there be special considerations for release? -->
- [ ] Yes - this PR contains breaking changes
- Details ...
- [ ] No - this PR is backwards compatible

**Features**:

- Details ...
Expand Down
69 changes: 69 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
name: CI

on:
push:
pull_request:
types: [opened, reopened]

jobs:
install:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Use Node.js
uses: actions/setup-node@v1
with:
node-version: '12.x'
- name: Cache Node.js modules
uses: actions/cache@v2
with:
# npm cache files are stored in `~/.npm` on Linux/macOS
path: ~/.npm
key: ${{ runner.OS }}-node-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.OS }}-node-
${{ runner.OS }}-
- run: npm ci

test-frontend:
needs: install
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Use Node.js
uses: actions/setup-node@v1
with:
node-version: '12.x'
- name: Load Node.js modules
uses: actions/cache@v2
with:
# npm cache files are stored in `~/.npm` on Linux/macOS
path: ~/.npm
key: ${{ runner.OS }}-node-${{ hashFiles('**/package-lock.json') }}
- run: npm ci
- run: npm run test-frontend

test-backend:
needs: install
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Use Node.js
uses: actions/setup-node@v1
with:
node-version: '12.x'
- name: Load Node.js modules
uses: actions/cache@v2
with:
# npm cache files are stored in `~/.npm` on Linux/macOS
path: ~/.npm
key: ${{ runner.OS }}-node-${{ hashFiles('**/package-lock.json') }}
- run: npm ci
- run: npm run test-backend
- name: Coveralls
uses: coverallsapp/github-action@master
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
14 changes: 1 addition & 13 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,19 +36,7 @@ jobs:
name: build
paths: .
- stage: Tests
name: Frontend tests
workspaces:
use: build
script:
- npm run test-frontend
- name: Backend tests
workspaces:
use: build
script:
- npm run test-backend
after_success:
- cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js
- name: End-to-end tests
name: End-to-end tests
workspaces:
use: build
addons:
Expand Down
68 changes: 66 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,72 @@ 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)

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

- 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)
- refactor: convert rating.client.service.js to typescript enum [`#1955`](https://github.com/opengovsg/FormSG/pull/1955)
- chore(deps-dev): bump @typescript-eslint/parser from 4.24.0 to 4.25.0 [`#1959`](https://github.com/opengovsg/FormSG/pull/1959)
- chore(deps-dev): bump concurrently from 6.1.0 to 6.2.0 [`#1961`](https://github.com/opengovsg/FormSG/pull/1961)
- chore(deps-dev): bump @typescript-eslint/eslint-plugin [`#1963`](https://github.com/opengovsg/FormSG/pull/1963)
- chore(deps-dev): bump @opengovsg/mockpass from 2.6.10 to 2.7.0 [`#1962`](https://github.com/opengovsg/FormSG/pull/1962)
- chore(deps-dev): bump @types/nodemailer from 6.4.1 to 6.4.2 [`#1960`](https://github.com/opengovsg/FormSG/pull/1960)
- chore(deps-dev): bump auto-changelog from 2.2.1 to 2.3.0 [`#1958`](https://github.com/opengovsg/FormSG/pull/1958)
- feat: add enable captcha infobox [`#1908`](https://github.com/opengovsg/FormSG/pull/1908)
- fix(deps): bump libphonenumber-js from 1.9.17 to 1.9.18 [`#1954`](https://github.com/opengovsg/FormSG/pull/1954)
- chore(deps-dev): bump @types/mongodb from 3.6.14 to 3.6.16 [`#1953`](https://github.com/opengovsg/FormSG/pull/1953)
- chore(deps-dev): bump eslint-plugin-import from 2.23.2 to 2.23.3 [`#1952`](https://github.com/opengovsg/FormSG/pull/1952)
- fix(deps): bump nodemailer from 6.6.0 to 6.6.1 [`#1951`](https://github.com/opengovsg/FormSG/pull/1951)
- fix(deps): bump aws-sdk from 2.910.0 to 2.912.0 [`#1950`](https://github.com/opengovsg/FormSG/pull/1950)
- chore(deps-dev): bump eslint from 7.26.0 to 7.27.0 [`#1948`](https://github.com/opengovsg/FormSG/pull/1948)
- fix(deps): bump @stablelib/base64 from 1.0.0 to 1.0.1 [`#1949`](https://github.com/opengovsg/FormSG/pull/1949)
- fix(deps): bump express-session from 1.17.1 to 1.17.2 [`#1946`](https://github.com/opengovsg/FormSG/pull/1946)
- fix(deps): bump twilio from 3.62.0 to 3.63.0 [`#1945`](https://github.com/opengovsg/FormSG/pull/1945)
- fix(deps): bump aws-sdk from 2.909.0 to 2.910.0 [`#1944`](https://github.com/opengovsg/FormSG/pull/1944)
- feat: implement specific API for duplicating form fields [`#1907`](https://github.com/opengovsg/FormSG/pull/1907)
- fix(encrypt-submission): shift encrypt mode form guard higher up the pipeline [`#1929`](https://github.com/opengovsg/FormSG/pull/1929)
- fix(deps): bump @sentry/integrations from 6.4.0 to 6.4.1 [`#1931`](https://github.com/opengovsg/FormSG/pull/1931)
- fix(deps): bump aws-sdk from 2.908.0 to 2.909.0 [`#1934`](https://github.com/opengovsg/FormSG/pull/1934)
- fix(deps): bump @sentry/browser from 6.4.0 to 6.4.1 [`#1933`](https://github.com/opengovsg/FormSG/pull/1933)
- chore(deps-dev): bump @types/mongodb from 3.6.12 to 3.6.14 [`#1932`](https://github.com/opengovsg/FormSG/pull/1932)
- refactor(admin-form): extract update form startpage [`#1833`](https://github.com/opengovsg/FormSG/pull/1833)
- build: mute database container logs [`#1927`](https://github.com/opengovsg/FormSG/pull/1927)
- feat: upgrade myinfo-gov-client to 4.0.0 [`#1925`](https://github.com/opengovsg/FormSG/pull/1925)
- feat: add response ID to thank you page [`#1855`](https://github.com/opengovsg/FormSG/pull/1855)
- refactor(verification): reset field verification state when field changes [`#1900`](https://github.com/opengovsg/FormSG/pull/1900)
- chore(deps-dev): bump @babel/core from 7.14.2 to 7.14.3 [`#1920`](https://github.com/opengovsg/FormSG/pull/1920)
- fix(deps): bump aws-sdk from 2.907.0 to 2.908.0 [`#1922`](https://github.com/opengovsg/FormSG/pull/1922)
- chore(deps-dev): bump @types/node from 14.14.45 to 14.17.0 [`#1921`](https://github.com/opengovsg/FormSG/pull/1921)
- chore(deps-dev): bump @babel/plugin-transform-runtime [`#1919`](https://github.com/opengovsg/FormSG/pull/1919)
- chore(deps-dev): bump @types/bluebird from 3.5.34 to 3.5.35 [`#1918`](https://github.com/opengovsg/FormSG/pull/1918)
- chore(pull_request_template): adds breaking changes section to github template [`#1915`](https://github.com/opengovsg/FormSG/pull/1915)
- fix(deps): bump @sentry/integrations from 6.3.6 to 6.4.0 [`#1912`](https://github.com/opengovsg/FormSG/pull/1912)
- chore(deps-dev): bump @typescript-eslint/eslint-plugin [`#1911`](https://github.com/opengovsg/FormSG/pull/1911)
- fix(deps): bump @sentry/browser from 6.3.6 to 6.4.0 [`#1913`](https://github.com/opengovsg/FormSG/pull/1913)
- chore(deps-dev): bump @typescript-eslint/parser from 4.23.0 to 4.24.0 [`#1910`](https://github.com/opengovsg/FormSG/pull/1910)
- refactor: extract create logic endpoint / refactor $watchCollection [`#1796`](https://github.com/opengovsg/FormSG/pull/1796)
- chore: merge release v5.10.1 into develop [`#1898`](https://github.com/opengovsg/FormSG/pull/1898)
- fix(deps): bump aws-sdk from 2.906.0 to 2.907.0 [`#1894`](https://github.com/opengovsg/FormSG/pull/1894)
- chore(deps-dev): bump @types/convict from 6.0.1 to 6.0.2 [`#1893`](https://github.com/opengovsg/FormSG/pull/1893)
- chore(deps-dev): bump eslint-plugin-import from 2.22.1 to 2.23.2 [`#1891`](https://github.com/opengovsg/FormSG/pull/1891)
- refactor(verification): migrate verified field [`#1866`](https://github.com/opengovsg/FormSG/pull/1866)
- chore(deps-dev): bump @babel/core from 7.14.0 to 7.14.2 [`#1882`](https://github.com/opengovsg/FormSG/pull/1882)
- chore(deps-dev): bump @types/node from 14.14.44 to 14.14.45 [`#1884`](https://github.com/opengovsg/FormSG/pull/1884)
- fix(deps): bump aws-sdk from 2.905.0 to 2.906.0 [`#1883`](https://github.com/opengovsg/FormSG/pull/1883)
- chore(deps-dev): bump @babel/preset-env from 7.14.1 to 7.14.2 [`#1881`](https://github.com/opengovsg/FormSG/pull/1881)
- chore(deps-dev): bump testcafe from 1.14.1 to 1.14.2 [`#1880`](https://github.com/opengovsg/FormSG/pull/1880)
- chore(deps-dev): bump @babel/plugin-transform-runtime [`#1879`](https://github.com/opengovsg/FormSG/pull/1879)
- chore(deps-dev): bump @opengovsg/mockpass from 2.6.9 to 2.6.10 [`#1878`](https://github.com/opengovsg/FormSG/pull/1878)
- fix(deps): bump aws-sdk from 2.904.0 to 2.905.0 [`#1877`](https://github.com/opengovsg/FormSG/pull/1877)
- chore(deps-dev): bump testcafe from 1.14.0 to 1.14.1 [`#1876`](https://github.com/opengovsg/FormSG/pull/1876)
- refactor: convert color-themes.client.service.js to TypeScript enum [`#1846`](https://github.com/opengovsg/FormSG/pull/1846)
- build: migrate unit tests to GitHub Actions [`#1870`](https://github.com/opengovsg/FormSG/pull/1870)
- chore: merge release v5.10.0 back to develop [`#1865`](https://github.com/opengovsg/FormSG/pull/1865)
- 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 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)

#### [v5.10.0](https://github.com/opengovsg/FormSG/compare/v5.9.0...v5.10.0)
Expand Down
2 changes: 2 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,8 @@ services:
- ./init-mongo.js:/docker-entrypoint-initdb.d/init-mongo.js:ro
ports:
- '27017:27017'
logging:
driver: none

localstack:
image: localstack/localstack:0.11.5
Expand Down
Loading