Skip to content

Commit

Permalink
Merge pull request #2043 from opengovsg/release-v5.11.0
Browse files Browse the repository at this point in the history
chore: merge v5.11.0 into master
  • Loading branch information
karrui authored Jun 1, 2021
2 parents 64b4bf0 + 54b1958 commit a2f8e1d
Show file tree
Hide file tree
Showing 84 changed files with 5,069 additions and 1,416 deletions.
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

0 comments on commit a2f8e1d

Please sign in to comment.