From 26fd190a3809116442d220fe8fa57f2831cf1cb7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Sep 2021 17:28:11 +0000 Subject: [PATCH 01/26] chore(deps-dev): bump ngrok from 4.1.0 to 4.2.2 (#2753) Bumps [ngrok](https://github.com/bubenshchykov/ngrok) from 4.1.0 to 4.2.2. - [Release notes](https://github.com/bubenshchykov/ngrok/releases) - [Changelog](https://github.com/bubenshchykov/ngrok/blob/master/CHANGELOG.md) - [Commits](https://github.com/bubenshchykov/ngrok/commits) --- updated-dependencies: - dependency-name: ngrok dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1d5c3be829..b883c2310d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18330,15 +18330,15 @@ } }, "ngrok": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ngrok/-/ngrok-4.1.0.tgz", - "integrity": "sha512-ajSwP/qfGVaXXD0PYphg/IJD4pzt2ObKo6HDvBK4feLrFLSIJDWjlVQRwv3NYDnHzeSMb9MiJtObDKhGNhYELA==", + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/ngrok/-/ngrok-4.2.2.tgz", + "integrity": "sha512-qHBvVul0BtYw9R8Io/0/0IDPXA03i9rRV59XCQMz8h32zkSJpCjRMgVcarK9ZKrZbUfYT0hiuChgBSNMga0UdQ==", "dev": true, "requires": { "@types/node": "^8.10.50", "decompress-zip": "^0.3.2", "got": "^11.5.1", - "hpagent": "^0.1.1", + "hpagent": "^0.1.2", "uuid": "^3.3.2", "yaml": "^1.10.0" }, diff --git a/package.json b/package.json index 1b7d869262..6a1fe613b5 100644 --- a/package.json +++ b/package.json @@ -228,7 +228,7 @@ "mockdate": "^3.0.5", "mockingoose": "^2.13.2", "mongodb-memory-server-core": "^6.9.6", - "ngrok": "^4.1.0", + "ngrok": "^4.2.2", "optimize-css-assets-webpack-plugin": "^5.0.8", "prettier": "^2.3.2", "proxyquire": "^2.1.3", From e003e6bdab177f301203ce9d42c0e348d33ff6bc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Sep 2021 17:35:10 +0000 Subject: [PATCH 02/26] chore(deps-dev): bump @typescript-eslint/parser from 4.30.0 to 4.31.0 (#2754) Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) from 4.30.0 to 4.31.0. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/parser/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v4.31.0/packages/parser) --- updated-dependencies: - dependency-name: "@typescript-eslint/parser" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 46 +++++++++++++++++++++++----------------------- package.json | 2 +- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/package-lock.json b/package-lock.json index b883c2310d..4b5e4e9534 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6037,41 +6037,41 @@ } }, "@typescript-eslint/parser": { - "version": "4.30.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.30.0.tgz", - "integrity": "sha512-HJ0XuluSZSxeboLU7Q2VQ6eLlCwXPBOGnA7CqgBnz2Db3JRQYyBDJgQnop6TZ+rsbSx5gEdWhw4rE4mDa1FnZg==", + "version": "4.31.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.31.0.tgz", + "integrity": "sha512-oWbzvPh5amMuTmKaf1wp0ySxPt2ZXHnFQBN2Szu1O//7LmOvgaKTCIDNLK2NvzpmVd5A2M/1j/rujBqO37hj3w==", "dev": true, "requires": { - "@typescript-eslint/scope-manager": "4.30.0", - "@typescript-eslint/types": "4.30.0", - "@typescript-eslint/typescript-estree": "4.30.0", + "@typescript-eslint/scope-manager": "4.31.0", + "@typescript-eslint/types": "4.31.0", + "@typescript-eslint/typescript-estree": "4.31.0", "debug": "^4.3.1" }, "dependencies": { "@typescript-eslint/scope-manager": { - "version": "4.30.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.30.0.tgz", - "integrity": "sha512-VJ/jAXovxNh7rIXCQbYhkyV2Y3Ac/0cVHP/FruTJSAUUm4Oacmn/nkN5zfWmWFEanN4ggP0vJSHOeajtHq3f8A==", + "version": "4.31.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.31.0.tgz", + "integrity": "sha512-LJ+xtl34W76JMRLjbaQorhR0hfRAlp3Lscdiz9NeI/8i+q0hdBZ7BsiYieLoYWqy+AnRigaD3hUwPFugSzdocg==", "dev": true, "requires": { - "@typescript-eslint/types": "4.30.0", - "@typescript-eslint/visitor-keys": "4.30.0" + "@typescript-eslint/types": "4.31.0", + "@typescript-eslint/visitor-keys": "4.31.0" } }, "@typescript-eslint/types": { - "version": "4.30.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.30.0.tgz", - "integrity": "sha512-YKldqbNU9K4WpTNwBqtAerQKLLW/X2A/j4yw92e3ZJYLx+BpKLeheyzoPfzIXHfM8BXfoleTdiYwpsvVPvHrDw==", + "version": "4.31.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.31.0.tgz", + "integrity": "sha512-9XR5q9mk7DCXgXLS7REIVs+BaAswfdHhx91XqlJklmqWpTALGjygWVIb/UnLh4NWhfwhR5wNe1yTyCInxVhLqQ==", "dev": true }, "@typescript-eslint/typescript-estree": { - "version": "4.30.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.30.0.tgz", - "integrity": "sha512-6WN7UFYvykr/U0Qgy4kz48iGPWILvYL34xXJxvDQeiRE018B7POspNRVtAZscWntEPZpFCx4hcz/XBT+erenfg==", + "version": "4.31.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.31.0.tgz", + "integrity": "sha512-QHl2014t3ptg+xpmOSSPn5hm4mY8D4s97ftzyk9BZ8RxYQ3j73XcwuijnJ9cMa6DO4aLXeo8XS3z1omT9LA/Eg==", "dev": true, "requires": { - "@typescript-eslint/types": "4.30.0", - "@typescript-eslint/visitor-keys": "4.30.0", + "@typescript-eslint/types": "4.31.0", + "@typescript-eslint/visitor-keys": "4.31.0", "debug": "^4.3.1", "globby": "^11.0.3", "is-glob": "^4.0.1", @@ -6080,12 +6080,12 @@ } }, "@typescript-eslint/visitor-keys": { - "version": "4.30.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.30.0.tgz", - "integrity": "sha512-pNaaxDt/Ol/+JZwzP7MqWc8PJQTUhZwoee/PVlQ+iYoYhagccvoHnC9e4l+C/krQYYkENxznhVSDwClIbZVxRw==", + "version": "4.31.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.31.0.tgz", + "integrity": "sha512-HUcRp2a9I+P21+O21yu3ezv3GEPGjyGiXoEUQwZXjR8UxRApGeLyWH4ZIIUSalE28aG4YsV6GjtaAVB3QKOu0w==", "dev": true, "requires": { - "@typescript-eslint/types": "4.30.0", + "@typescript-eslint/types": "4.31.0", "eslint-visitor-keys": "^2.0.0" } }, diff --git a/package.json b/package.json index 6a1fe613b5..7ada0d8868 100644 --- a/package.json +++ b/package.json @@ -193,7 +193,7 @@ "@types/uuid": "^8.3.1", "@types/validator": "^13.6.3", "@typescript-eslint/eslint-plugin": "^4.30.0", - "@typescript-eslint/parser": "^4.30.0", + "@typescript-eslint/parser": "^4.31.0", "auto-changelog": "^2.3.0", "axios-mock-adapter": "^1.20.0", "babel-loader": "^8.2.2", From 4fe60c3e8d875ac7606dc806eb4c3b8930b4f085 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Sep 2021 17:37:11 +0000 Subject: [PATCH 03/26] fix(deps): bump web-streams-polyfill from 3.1.0 to 3.1.1 (#2755) Bumps [web-streams-polyfill](https://github.com/MattiasBuelens/web-streams-polyfill) from 3.1.0 to 3.1.1. - [Release notes](https://github.com/MattiasBuelens/web-streams-polyfill/releases) - [Changelog](https://github.com/MattiasBuelens/web-streams-polyfill/blob/master/CHANGELOG.md) - [Commits](https://github.com/MattiasBuelens/web-streams-polyfill/compare/v3.1.0...v3.1.1) --- updated-dependencies: - dependency-name: web-streams-polyfill dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4b5e4e9534..9bc886ad62 100644 --- a/package-lock.json +++ b/package-lock.json @@ -25496,9 +25496,9 @@ "integrity": "sha1-eWkVhNmGB/UHC9O3CkDmuyLkAes=" }, "web-streams-polyfill": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.1.0.tgz", - "integrity": "sha512-wO9r1YnYe7kFBLHyyVEhV1H8VRWoNiNnuP+v/HUUmSTaRF8F93Kmd3JMrETx0f11GXxRek6OcL2QtjFIdc5WYw==" + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.1.1.tgz", + "integrity": "sha512-Czi3fG883e96T4DLEPRvufrF2ydhOOW1+1a6c3gNjH2aIh50DNFBdfwh2AKoOf1rXvpvavAoA11Qdq9+BKjE0Q==" }, "webauth": { "version": "1.1.0", diff --git a/package.json b/package.json index 7ada0d8868..8109eb73b2 100644 --- a/package.json +++ b/package.json @@ -151,7 +151,7 @@ "uid-generator": "^2.0.0", "uuid": "^8.3.2", "validator": "^13.6.0", - "web-streams-polyfill": "^3.1.0", + "web-streams-polyfill": "^3.1.1", "whatwg-fetch": "^3.6.2", "winston": "^3.3.3", "winston-cloudwatch": "^2.5.2", From a671ee6084dfe3fdfdcec99cad88ba9b209d5870 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Sep 2021 17:55:41 +0000 Subject: [PATCH 04/26] fix(deps): bump axios from 0.21.2 to 0.21.4 (#2756) Bumps [axios](https://github.com/axios/axios) from 0.21.2 to 0.21.4. - [Release notes](https://github.com/axios/axios/releases) - [Changelog](https://github.com/axios/axios/blob/master/CHANGELOG.md) - [Commits](https://github.com/axios/axios/compare/v0.21.2...v0.21.4) --- updated-dependencies: - dependency-name: axios dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9bc886ad62..aa85349a20 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7044,9 +7044,9 @@ "dev": true }, "axios": { - "version": "0.21.2", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.2.tgz", - "integrity": "sha512-87otirqUw3e8CzHTMO+/9kh/FSgXt/eVDvipijwDtEuwbkySWZ9SBm6VEubmJ/kLKEoLQV/POhxXFb66bfekfg==", + "version": "0.21.4", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz", + "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==", "requires": { "follow-redirects": "^1.14.0" }, diff --git a/package.json b/package.json index 8109eb73b2..948a682a91 100644 --- a/package.json +++ b/package.json @@ -83,7 +83,7 @@ "angular-ui-router": "~1.0.29", "aws-info": "^1.2.0", "aws-sdk": "^2.983.0", - "axios": "^0.21.2", + "axios": "^0.21.4", "bcrypt": "^5.0.1", "bluebird": "^3.5.2", "body-parser": "^1.18.3", From cdf632d722a4739195d6e65b8a3d44b16182cce0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Sep 2021 17:56:46 +0000 Subject: [PATCH 05/26] chore(deps-dev): bump @typescript-eslint/eslint-plugin (#2752) Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 4.30.0 to 4.31.0. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/eslint-plugin/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v4.31.0/packages/eslint-plugin) --- updated-dependencies: - dependency-name: "@typescript-eslint/eslint-plugin" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 56 +++++++++++++++++++++++------------------------ package.json | 2 +- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/package-lock.json b/package-lock.json index aa85349a20..9777cac8fd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5875,13 +5875,13 @@ } }, "@typescript-eslint/eslint-plugin": { - "version": "4.30.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.30.0.tgz", - "integrity": "sha512-NgAnqk55RQ/SD+tZFD9aPwNSeHmDHHe5rtUyhIq0ZeCWZEvo4DK9rYz7v9HDuQZFvn320Ot+AikaCKMFKLlD0g==", + "version": "4.31.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.31.0.tgz", + "integrity": "sha512-iPKZTZNavAlOhfF4gymiSuUkgLne/nh5Oz2/mdiUmuZVD42m9PapnCnzjxuDsnpnbH3wT5s2D8bw6S39TC6GNw==", "dev": true, "requires": { - "@typescript-eslint/experimental-utils": "4.30.0", - "@typescript-eslint/scope-manager": "4.30.0", + "@typescript-eslint/experimental-utils": "4.31.0", + "@typescript-eslint/scope-manager": "4.31.0", "debug": "^4.3.1", "functional-red-black-tree": "^1.0.1", "regexpp": "^3.1.0", @@ -5896,43 +5896,43 @@ "dev": true }, "@typescript-eslint/experimental-utils": { - "version": "4.30.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.30.0.tgz", - "integrity": "sha512-K8RNIX9GnBsv5v4TjtwkKtqMSzYpjqAQg/oSphtxf3xxdt6T0owqnpojztjjTcatSteH3hLj3t/kklKx87NPqw==", + "version": "4.31.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.31.0.tgz", + "integrity": "sha512-Hld+EQiKLMppgKKkdUsLeVIeEOrwKc2G983NmznY/r5/ZtZCDvIOXnXtwqJIgYz/ymsy7n7RGvMyrzf1WaSQrw==", "dev": true, "requires": { "@types/json-schema": "^7.0.7", - "@typescript-eslint/scope-manager": "4.30.0", - "@typescript-eslint/types": "4.30.0", - "@typescript-eslint/typescript-estree": "4.30.0", + "@typescript-eslint/scope-manager": "4.31.0", + "@typescript-eslint/types": "4.31.0", + "@typescript-eslint/typescript-estree": "4.31.0", "eslint-scope": "^5.1.1", "eslint-utils": "^3.0.0" } }, "@typescript-eslint/scope-manager": { - "version": "4.30.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.30.0.tgz", - "integrity": "sha512-VJ/jAXovxNh7rIXCQbYhkyV2Y3Ac/0cVHP/FruTJSAUUm4Oacmn/nkN5zfWmWFEanN4ggP0vJSHOeajtHq3f8A==", + "version": "4.31.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.31.0.tgz", + "integrity": "sha512-LJ+xtl34W76JMRLjbaQorhR0hfRAlp3Lscdiz9NeI/8i+q0hdBZ7BsiYieLoYWqy+AnRigaD3hUwPFugSzdocg==", "dev": true, "requires": { - "@typescript-eslint/types": "4.30.0", - "@typescript-eslint/visitor-keys": "4.30.0" + "@typescript-eslint/types": "4.31.0", + "@typescript-eslint/visitor-keys": "4.31.0" } }, "@typescript-eslint/types": { - "version": "4.30.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.30.0.tgz", - "integrity": "sha512-YKldqbNU9K4WpTNwBqtAerQKLLW/X2A/j4yw92e3ZJYLx+BpKLeheyzoPfzIXHfM8BXfoleTdiYwpsvVPvHrDw==", + "version": "4.31.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.31.0.tgz", + "integrity": "sha512-9XR5q9mk7DCXgXLS7REIVs+BaAswfdHhx91XqlJklmqWpTALGjygWVIb/UnLh4NWhfwhR5wNe1yTyCInxVhLqQ==", "dev": true }, "@typescript-eslint/typescript-estree": { - "version": "4.30.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.30.0.tgz", - "integrity": "sha512-6WN7UFYvykr/U0Qgy4kz48iGPWILvYL34xXJxvDQeiRE018B7POspNRVtAZscWntEPZpFCx4hcz/XBT+erenfg==", + "version": "4.31.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.31.0.tgz", + "integrity": "sha512-QHl2014t3ptg+xpmOSSPn5hm4mY8D4s97ftzyk9BZ8RxYQ3j73XcwuijnJ9cMa6DO4aLXeo8XS3z1omT9LA/Eg==", "dev": true, "requires": { - "@typescript-eslint/types": "4.30.0", - "@typescript-eslint/visitor-keys": "4.30.0", + "@typescript-eslint/types": "4.31.0", + "@typescript-eslint/visitor-keys": "4.31.0", "debug": "^4.3.1", "globby": "^11.0.3", "is-glob": "^4.0.1", @@ -5941,12 +5941,12 @@ } }, "@typescript-eslint/visitor-keys": { - "version": "4.30.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.30.0.tgz", - "integrity": "sha512-pNaaxDt/Ol/+JZwzP7MqWc8PJQTUhZwoee/PVlQ+iYoYhagccvoHnC9e4l+C/krQYYkENxznhVSDwClIbZVxRw==", + "version": "4.31.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.31.0.tgz", + "integrity": "sha512-HUcRp2a9I+P21+O21yu3ezv3GEPGjyGiXoEUQwZXjR8UxRApGeLyWH4ZIIUSalE28aG4YsV6GjtaAVB3QKOu0w==", "dev": true, "requires": { - "@typescript-eslint/types": "4.30.0", + "@typescript-eslint/types": "4.31.0", "eslint-visitor-keys": "^2.0.0" } }, diff --git a/package.json b/package.json index 948a682a91..af0b20405c 100644 --- a/package.json +++ b/package.json @@ -192,7 +192,7 @@ "@types/uid-generator": "^2.0.2", "@types/uuid": "^8.3.1", "@types/validator": "^13.6.3", - "@typescript-eslint/eslint-plugin": "^4.30.0", + "@typescript-eslint/eslint-plugin": "^4.31.0", "@typescript-eslint/parser": "^4.31.0", "auto-changelog": "^2.3.0", "axios-mock-adapter": "^1.20.0", From 7da643df5c10fa9f34ddfaa4923fd725f37ea36c Mon Sep 17 00:00:00 2001 From: Timothee Groleau Date: Tue, 7 Sep 2021 10:33:08 +0800 Subject: [PATCH 06/26] fix(radio): Remove unnecessary nbsp from option text (#2736) * fix(radio): Remove unecessary nbsp from option text * fix(radio): nbsp is an alternative, rather than appended --- .../base/componentViews/field-radiobutton.client.view.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/public/modules/forms/base/componentViews/field-radiobutton.client.view.html b/src/public/modules/forms/base/componentViews/field-radiobutton.client.view.html index d7fe175d29..6be20298e6 100644 --- a/src/public/modules/forms/base/componentViews/field-radiobutton.client.view.html +++ b/src/public/modules/forms/base/componentViews/field-radiobutton.client.view.html @@ -41,8 +41,8 @@ aria-labelledby="label-{{ vm.field._id || 'defaultID'}}" aria-describedby="description-{{ vm.field._id || 'defaultID'}}" /> - {{ option }}   - + {{ option }} +   Date: Tue, 7 Sep 2021 10:29:03 +0200 Subject: [PATCH 07/26] fix: upgrade zod from 3.7.1 to 3.7.2 (#2737) Snyk has created this PR to upgrade zod from 3.7.1 to 3.7.2. See this package in npm: https://www.npmjs.com/package/zod See this project in Snyk: https://app.snyk.io/org/formsg/project/c35bb3aa-a521-4778-a5b9-491c66e3e78d?utm_source=github&utm_medium=upgrade-pr --- shared/package-lock.json | 6 +++--- shared/package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/shared/package-lock.json b/shared/package-lock.json index 72eba9920a..b4598be369 100644 --- a/shared/package-lock.json +++ b/shared/package-lock.json @@ -548,9 +548,9 @@ "dev": true }, "zod": { - "version": "3.7.1", - "resolved": "https://registry.npmjs.org/zod/-/zod-3.7.1.tgz", - "integrity": "sha512-9TRjeMKz3xFUOl/CYhBmp/hCrMhk5U6qRnfy9q+HwmQPbMYp3qnM+/cPst+wzHQjfSBjHDYZq7S7TQnlAjqjFg==" + "version": "3.7.2", + "resolved": "https://registry.npmjs.org/zod/-/zod-3.7.2.tgz", + "integrity": "sha512-JhYYcj+TS/a0+3kqxnbmuXMVtA+QkJUPu91beQTo1Y3xA891pHeMPQgVOSu97FdzAd056Yp87lpEi8Xvmd3zhw==" } } } diff --git a/shared/package.json b/shared/package.json index 7ea2c10d82..34abde724f 100644 --- a/shared/package.json +++ b/shared/package.json @@ -10,7 +10,7 @@ "lodash": "^4.17.21", "type-fest": "^1.4.0", "validator": "^13.6.0", - "zod": "^3.7.1" + "zod": "^3.7.2" }, "devDependencies": { "@typescript-eslint/eslint-plugin": "^4.28.2", From bb9749cc1b04678cd91e58abb2c3650c88989dca Mon Sep 17 00:00:00 2001 From: Timothee Groleau Date: Tue, 7 Sep 2021 17:36:04 +0800 Subject: [PATCH 08/26] chore(deps): Update winston-cloudwatch (#2726) * chore(deps): Update winston-cloudwatch * chore(deps): Supply dummy winston cloudwatch transport name to make typescript compiler happy --- package-lock.json | 75 ++++++++++++++++++++-------------------- package.json | 2 +- src/app/config/logger.ts | 7 ++++ 3 files changed, 45 insertions(+), 39 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9e75d54657..51230780a2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10176,9 +10176,9 @@ "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==" }, "tslib": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.2.0.tgz", - "integrity": "sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w==" + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", + "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==" } } }, @@ -12655,9 +12655,9 @@ }, "dependencies": { "debug": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", - "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", + "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", "requires": { "ms": "2.1.2" } @@ -13544,9 +13544,9 @@ } }, "debug": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", - "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", + "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", "requires": { "ms": "2.1.2" } @@ -19082,9 +19082,9 @@ } }, "debug": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", - "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", + "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", "requires": { "ms": "2.1.2" } @@ -20216,9 +20216,9 @@ } }, "debug": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", - "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", + "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", "requires": { "ms": "2.1.2" } @@ -21748,9 +21748,9 @@ "integrity": "sha512-XB9Ftrf2EEKfzoQXt3Nitrt/IPbT+f1fgqBdoxO3W/+JYvtEOW6EgxnWfr9GH6nmULv7Y2tPmEX3koxThVmebA==" }, "smart-buffer": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.1.0.tgz", - "integrity": "sha512-iVICrxOzCynf/SNaBQCw34eM9jROU/s5rzIhpOvzhzuYHfJR/DhZfDkXiZSgKXfgv26HT3Yni3AV/DGw0cGnnw==" + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz", + "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==" }, "smtp-server": { "version": "3.5.0", @@ -21980,20 +21980,20 @@ } }, "socks": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/socks/-/socks-2.6.0.tgz", - "integrity": "sha512-mNmr9owlinMplev0Wd7UHFlqI4ofnBnNzFuzrm63PPaHgbkqCFe4T5LzwKmtQ/f2tX0NTpcdVLyD/FHxFBstYw==", + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/socks/-/socks-2.6.1.tgz", + "integrity": "sha512-kLQ9N5ucj8uIcxrDwjm0Jsqk06xdpBjGNQtpXy4Q8/QY2k+fY7nZH8CARy+hkbG+SGAovmzzuauCpBlb8FrnBA==", "requires": { "ip": "^1.1.5", "smart-buffer": "^4.1.0" } }, "socks-proxy-agent": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-5.0.0.tgz", - "integrity": "sha512-lEpa1zsWCChxiynk+lCycKuC502RxDWLKJZoIhnxrWNjLSDGYRFflHA1/228VkRcnv9TIb8w98derGbpKxJRgA==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-5.0.1.tgz", + "integrity": "sha512-vZdmnjb9a2Tz6WEQVIurybSwElwPxMZaIc7PzqbJTrezcKNznv6giT7J7tZDZ1BojVaa1jvO/UiUdhDVB0ACoQ==", "requires": { - "agent-base": "6", + "agent-base": "^6.0.2", "debug": "4", "socks": "^2.3.3" }, @@ -22007,9 +22007,9 @@ } }, "debug": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", - "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", + "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", "requires": { "ms": "2.1.2" } @@ -26078,12 +26078,11 @@ } }, "winston-cloudwatch": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/winston-cloudwatch/-/winston-cloudwatch-2.5.2.tgz", - "integrity": "sha512-8HcDE6ey546Vb26gV/YPNFOrzff/RCPwbhVnV7e8oPW5c0JU8g8j1OLChmOpqgUEz3EA7RQAkYHjK0DkvKvyQQ==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/winston-cloudwatch/-/winston-cloudwatch-3.0.2.tgz", + "integrity": "sha512-/fm8Fp3xVV2rtrC0fgRBiCpYZ1GTO36x9cp2W0T3Utco4anxautXNFLantzmbpGmIGYfK9xnjwV97Eq+TXtm8g==", "requires": { "async": "^3.1.0", - "aws-sdk": "^2.553.0", "chalk": "^4.0.0", "fast-safe-stringify": "^2.0.7", "lodash.assign": "^4.2.0", @@ -26102,14 +26101,14 @@ } }, "async": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/async/-/async-3.2.0.tgz", - "integrity": "sha512-TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw==" + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/async/-/async-3.2.1.tgz", + "integrity": "sha512-XdD5lRO/87udXCMC9meWdYiR+Nq6ZjUfXidViUZGu2F1MO4T3XwZ1et0hb2++BgLfhyJwy44BGB/yx80ABx8hg==" }, "chalk": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", - "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", "requires": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" diff --git a/package.json b/package.json index e08f37e394..5f5f476382 100644 --- a/package.json +++ b/package.json @@ -154,7 +154,7 @@ "web-streams-polyfill": "^3.1.1", "whatwg-fetch": "^3.6.2", "winston": "^3.3.3", - "winston-cloudwatch": "^2.5.2", + "winston-cloudwatch": "^3.0.2", "zod": "^3.8.2" }, "devDependencies": { diff --git a/src/app/config/logger.ts b/src/app/config/logger.ts index 3134731df4..7cde0760e4 100644 --- a/src/app/config/logger.ts +++ b/src/app/config/logger.ts @@ -12,6 +12,12 @@ import { Environment } from '../../types' import { aws, customCloudWatchGroup, isDev, nodeEnv } from './config' +// WINSTON_CLOUDWATCH_NAME is not actually needed, but the typescript definition has +// an error (presumably?), and so we must supply a dummy value. +// See issue: https://github.com/lazywithclass/winston-cloudwatch/issues/159 +// TODO: remove if/when typescript definition is updated correctly +const WINSTON_CLOUDWATCH_NAME = 'FormSGCloudWatch' + // Params to enforce the logging format. export type CustomLoggerParams = { message: string @@ -233,6 +239,7 @@ export const createCloudWatchLogger = (label: string) => { if (!isDev && customCloudWatchGroup) { loggerOptions.transports = [ new WinstonCloudWatch({ + name: WINSTON_CLOUDWATCH_NAME, logGroupName: customCloudWatchGroup, // Every EC2 instance needs its own unique stream name, or else they // will run into InvalidSequenceTokenException errors because they do From 50c9e8a5c66c3b1dc53cb64f28b5d6fe79c05c80 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 7 Sep 2021 17:24:13 +0000 Subject: [PATCH 09/26] chore(deps-dev): bump @types/node from 14.17.14 to 14.17.15 (#2758) Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 14.17.14 to 14.17.15. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node) --- updated-dependencies: - dependency-name: "@types/node" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 51230780a2..2c5f803752 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5662,9 +5662,9 @@ "dev": true }, "@types/node": { - "version": "14.17.14", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.14.tgz", - "integrity": "sha512-rsAj2u8Xkqfc332iXV12SqIsjVi07H479bOP4q94NAcjzmAvapumEhuVIt53koEf7JFrpjgNKjBga5Pnn/GL8A==" + "version": "14.17.15", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.15.tgz", + "integrity": "sha512-D1sdW0EcSCmNdLKBGMYb38YsHUS6JcM7yQ6sLQ9KuZ35ck7LYCKE7kYFHOO59ayFOY3zobWVZxf4KXhYHcHYFA==" }, "@types/nodemailer": { "version": "6.4.4", diff --git a/package.json b/package.json index 5f5f476382..5eef517df7 100644 --- a/package.json +++ b/package.json @@ -181,7 +181,7 @@ "@types/json-stringify-safe": "^5.0.0", "@types/mongodb": "^3.6.20", "@types/mongodb-uri": "^0.9.1", - "@types/node": "^14.17.14", + "@types/node": "^14.17.15", "@types/nodemailer": "^6.4.4", "@types/opossum": "^6.2.0", "@types/promise-retry": "^1.1.3", From 14461c3cc7b170a4e95de0631f2e4720d9c70a29 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 7 Sep 2021 17:36:39 +0000 Subject: [PATCH 10/26] chore(deps-dev): bump @types/compression from 1.7.1 to 1.7.2 (#2760) Bumps [@types/compression](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/compression) from 1.7.1 to 1.7.2. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/compression) --- updated-dependencies: - dependency-name: "@types/compression" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2c5f803752..2d106bf7bc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5267,9 +5267,9 @@ "dev": true }, "@types/compression": { - "version": "1.7.1", - "resolved": "https://registry.npmjs.org/@types/compression/-/compression-1.7.1.tgz", - "integrity": "sha512-d6K1bU3qIjtfB2u+A1N0WDf62LpewRjrvbqY79qlPwk2otgQ4mWB4+LzPCWTvGmcuVwo+zAroEhsNlJavRcFvg==", + "version": "1.7.2", + "resolved": "https://registry.npmjs.org/@types/compression/-/compression-1.7.2.tgz", + "integrity": "sha512-lwEL4M/uAGWngWFLSG87ZDr2kLrbuR8p7X+QZB1OQlT+qkHsCPDVFnHPyXf4Vyl4yDDorNY+mAhosxkCvppatg==", "dev": true, "requires": { "@types/express": "*" diff --git a/package.json b/package.json index 5eef517df7..73816b33bf 100644 --- a/package.json +++ b/package.json @@ -165,7 +165,7 @@ "@types/bcrypt": "^5.0.0", "@types/bluebird": "^3.5.36", "@types/busboy": "^0.2.4", - "@types/compression": "^1.7.1", + "@types/compression": "^1.7.2", "@types/convict": "^6.1.1", "@types/cookie-parser": "^1.4.2", "@types/dedent": "^0.7.0", From 2e3eeb8031cef2a4240c8658429254cf5635d51d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 8 Sep 2021 17:21:17 +0000 Subject: [PATCH 11/26] fix(deps): bump aws-sdk from 2.983.0 to 2.984.0 (#2763) Bumps [aws-sdk](https://github.com/aws/aws-sdk-js) from 2.983.0 to 2.984.0. - [Release notes](https://github.com/aws/aws-sdk-js/releases) - [Changelog](https://github.com/aws/aws-sdk-js/blob/master/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-js/compare/v2.983.0...v2.984.0) --- updated-dependencies: - dependency-name: aws-sdk dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2d106bf7bc..fb2a6405c1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6999,9 +6999,9 @@ "integrity": "sha512-24q5Rh3bno7ldoyCq99d6hpnLI+PAMocdeVaaGt/5BTQMprvDwQToHfNnruqN11odCHZZIQbRBw+nZo1lTCH9g==" }, "aws-sdk": { - "version": "2.983.0", - "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.983.0.tgz", - "integrity": "sha512-i4QMJt5hEYzhoDzmbo0v+aAuHQPXM6ah15GBKObbxwYxmzK9wjMG+FH3DiWZZHdFsf3C+p1zDg4rIr63jmOeBw==", + "version": "2.984.0", + "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.984.0.tgz", + "integrity": "sha512-wFwNKhlO03V7UnpIge2qT/gYOMvGUlmVuFgF2gQRIkt6lWYvnf8/QDTCKZLhGBpC8/mml10m0CM3khMNwU1KVQ==", "requires": { "buffer": "4.9.2", "events": "1.1.1", diff --git a/package.json b/package.json index 73816b33bf..c507d34ce4 100644 --- a/package.json +++ b/package.json @@ -82,7 +82,7 @@ "angular-ui-bootstrap": "~2.5.6", "angular-ui-router": "~1.0.29", "aws-info": "^1.2.0", - "aws-sdk": "^2.983.0", + "aws-sdk": "^2.984.0", "axios": "^0.21.4", "bcrypt": "^5.0.1", "bluebird": "^3.5.2", From c4400615141da2f968216079f03d0c962a204625 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 9 Sep 2021 17:26:20 +0000 Subject: [PATCH 12/26] chore(deps-dev): bump core-js from 3.17.2 to 3.17.3 (#2770) Bumps [core-js](https://github.com/zloirock/core-js) from 3.17.2 to 3.17.3. - [Release notes](https://github.com/zloirock/core-js/releases) - [Changelog](https://github.com/zloirock/core-js/blob/master/CHANGELOG.md) - [Commits](https://github.com/zloirock/core-js/compare/v3.17.2...v3.17.3) --- updated-dependencies: - dependency-name: core-js dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index fb2a6405c1..059c2efdb0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9374,9 +9374,9 @@ } }, "core-js": { - "version": "3.17.2", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.17.2.tgz", - "integrity": "sha512-XkbXqhcXeMHPRk2ItS+zQYliAMilea2euoMsnpRRdDad6b2VY6CQQcwz1K8AnWesfw4p165RzY0bTnr3UrbYiA==", + "version": "3.17.3", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.17.3.tgz", + "integrity": "sha512-lyvajs+wd8N1hXfzob1LdOCCHFU4bGMbqqmLn1Q4QlCpDqWPpGf+p0nj+LNrvDDG33j0hZXw2nsvvVpHysxyNw==", "dev": true }, "core-js-compat": { diff --git a/package.json b/package.json index c507d34ce4..355bbdd1ba 100644 --- a/package.json +++ b/package.json @@ -199,7 +199,7 @@ "babel-loader": "^8.2.2", "concurrently": "^6.2.1", "copy-webpack-plugin": "^6.0.2", - "core-js": "^3.17.2", + "core-js": "^3.17.3", "coveralls": "^3.1.1", "css-loader": "^2.1.1", "csv-parse": "^4.16.3", From 12987002c789a95dd6651e4484bd2fe1ef640268 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 9 Sep 2021 17:28:11 +0000 Subject: [PATCH 13/26] chore(deps-dev): bump prettier from 2.3.2 to 2.4.0 (#2771) Bumps [prettier](https://github.com/prettier/prettier) from 2.3.2 to 2.4.0. - [Release notes](https://github.com/prettier/prettier/releases) - [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md) - [Commits](https://github.com/prettier/prettier/compare/2.3.2...2.4.0) --- updated-dependencies: - dependency-name: prettier dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 059c2efdb0..06c1aca33f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20064,9 +20064,9 @@ "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=" }, "prettier": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.3.2.tgz", - "integrity": "sha512-lnJzDfJ66zkMy58OL5/NY5zp70S7Nz6KqcKkXYzn2tMVrNxvbqaBpg7H3qHaLxCJ5lNMsGuM8+ohS7cZrthdLQ==", + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.4.0.tgz", + "integrity": "sha512-DsEPLY1dE5HF3BxCRBmD4uYZ+5DCbvatnolqTqcxEgKVZnL2kUfyu7b8pPQ5+hTBkdhU9SLUmK0/pHb07RE4WQ==", "dev": true }, "prettier-linter-helpers": { diff --git a/package.json b/package.json index 355bbdd1ba..15534db507 100644 --- a/package.json +++ b/package.json @@ -230,7 +230,7 @@ "mongodb-memory-server-core": "^6.9.6", "ngrok": "^4.2.2", "optimize-css-assets-webpack-plugin": "^5.0.8", - "prettier": "^2.3.2", + "prettier": "^2.4.0", "proxyquire": "^2.1.3", "regenerator": "^0.14.4", "rimraf": "^3.0.2", From e4217a313e95b53920adc05bf35dbb45241a4be4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 9 Sep 2021 17:39:26 +0000 Subject: [PATCH 14/26] fix(deps): bump aws-sdk from 2.984.0 to 2.985.0 (#2773) Bumps [aws-sdk](https://github.com/aws/aws-sdk-js) from 2.984.0 to 2.985.0. - [Release notes](https://github.com/aws/aws-sdk-js/releases) - [Changelog](https://github.com/aws/aws-sdk-js/blob/master/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-js/compare/v2.984.0...v2.985.0) --- updated-dependencies: - dependency-name: aws-sdk dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 06c1aca33f..0ad404a1d4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6999,9 +6999,9 @@ "integrity": "sha512-24q5Rh3bno7ldoyCq99d6hpnLI+PAMocdeVaaGt/5BTQMprvDwQToHfNnruqN11odCHZZIQbRBw+nZo1lTCH9g==" }, "aws-sdk": { - "version": "2.984.0", - "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.984.0.tgz", - "integrity": "sha512-wFwNKhlO03V7UnpIge2qT/gYOMvGUlmVuFgF2gQRIkt6lWYvnf8/QDTCKZLhGBpC8/mml10m0CM3khMNwU1KVQ==", + "version": "2.985.0", + "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.985.0.tgz", + "integrity": "sha512-Al1oFENrrDeKRpxlklk5sONqzCgEkrhaJ1vtIfpLYYqhNlAY+ku/z1hG1+qSlvgmljGyn7T6/zAb2EcbbAFZLQ==", "requires": { "buffer": "4.9.2", "events": "1.1.1", diff --git a/package.json b/package.json index 15534db507..32f176a1c9 100644 --- a/package.json +++ b/package.json @@ -82,7 +82,7 @@ "angular-ui-bootstrap": "~2.5.6", "angular-ui-router": "~1.0.29", "aws-info": "^1.2.0", - "aws-sdk": "^2.984.0", + "aws-sdk": "^2.985.0", "axios": "^0.21.4", "bcrypt": "^5.0.1", "bluebird": "^3.5.2", From 128c1fc6bda74abf8909baedbf1529f56c161b19 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 9 Sep 2021 17:44:42 +0000 Subject: [PATCH 15/26] fix(deps): bump libphonenumber-js from 1.9.26 to 1.9.27 (#2774) Bumps [libphonenumber-js](https://gitlab.com/catamphetamine/libphonenumber-js) from 1.9.26 to 1.9.27. - [Release notes](https://gitlab.com/catamphetamine/libphonenumber-js/tags) - [Changelog](https://gitlab.com/catamphetamine/libphonenumber-js/blob/master/CHANGELOG.md) - [Commits](https://gitlab.com/catamphetamine/libphonenumber-js/compare/v1.9.26...v1.9.27) --- updated-dependencies: - dependency-name: libphonenumber-js dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0ad404a1d4..0ebc9e67a2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16407,9 +16407,9 @@ } }, "libphonenumber-js": { - "version": "1.9.26", - "resolved": "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.9.26.tgz", - "integrity": "sha512-j0brmDsZLSKJCrcli1HjzHYP29VOf5P/Yz+xxe7WmKTe+0XVnKa0J+UEAaT96D21w1mfLPhlm0ZXBQ13EVF+XQ==" + "version": "1.9.27", + "resolved": "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.9.27.tgz", + "integrity": "sha512-6eoCiQ3IPTRhXuhjNK7PaD4jA1NVP4mJZLAMu10dQEYbyk+nzzanpT6MJC1ZESesKGPLS1yIvVOy1WtlM57Xuw==" }, "lie": { "version": "3.3.0", diff --git a/package.json b/package.json index 32f176a1c9..bc51a0f8be 100644 --- a/package.json +++ b/package.json @@ -119,7 +119,7 @@ "json-stringify-safe": "^5.0.1", "jszip": "^3.7.1", "jwt-decode": "^3.1.2", - "libphonenumber-js": "^1.9.26", + "libphonenumber-js": "^1.9.27", "lodash": "^4.17.21", "moment-timezone": "0.5.33", "mongodb-uri": "^0.9.7", From 51f0b8c57642a0c150c9b71f46327d77a3d6bff6 Mon Sep 17 00:00:00 2001 From: Timothee Groleau Date: Fri, 10 Sep 2021 16:52:48 +0800 Subject: [PATCH 16/26] fix(otp): Ensure uniform distribution of digits (#2775) * fix(otp): Ensure uniform distribution of digits * refactor(otp): Simplify code with array functions --- src/app/utils/otp.ts | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/app/utils/otp.ts b/src/app/utils/otp.ts index 3cbe2bd3b2..d54e2c7930 100644 --- a/src/app/utils/otp.ts +++ b/src/app/utils/otp.ts @@ -10,17 +10,11 @@ const DEFAULT_SALT_ROUNDS = 10 * @returns 6 digit OTP string */ export const generateOtp = (): string => { - const length = 6 - const chars = '0123456789' // Generates cryptographically strong pseudo-random data. - // The size argument is a number indicating the number of bytes to generate. - const rnd = crypto.randomBytes(length) - const d = chars.length / 256 - const digits = new Array(length) - for (let i = 0; i < length; i++) { - digits[i] = chars[Math.floor(rnd[i] * d)] - } - return digits.join('') + return Array(6) + .fill(0) + .map(() => crypto.randomInt(0, 10)) + .join('') } /** From 3f0aa27aae18cf10856681b06855d03431d549a7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 12 Sep 2021 17:19:25 +0000 Subject: [PATCH 17/26] fix(deps): bump aws-sdk from 2.985.0 to 2.987.0 (#2778) Bumps [aws-sdk](https://github.com/aws/aws-sdk-js) from 2.985.0 to 2.987.0. - [Release notes](https://github.com/aws/aws-sdk-js/releases) - [Changelog](https://github.com/aws/aws-sdk-js/blob/master/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-js/compare/v2.985.0...v2.987.0) --- updated-dependencies: - dependency-name: aws-sdk dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0ebc9e67a2..4b80f4939b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6999,9 +6999,9 @@ "integrity": "sha512-24q5Rh3bno7ldoyCq99d6hpnLI+PAMocdeVaaGt/5BTQMprvDwQToHfNnruqN11odCHZZIQbRBw+nZo1lTCH9g==" }, "aws-sdk": { - "version": "2.985.0", - "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.985.0.tgz", - "integrity": "sha512-Al1oFENrrDeKRpxlklk5sONqzCgEkrhaJ1vtIfpLYYqhNlAY+ku/z1hG1+qSlvgmljGyn7T6/zAb2EcbbAFZLQ==", + "version": "2.987.0", + "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.987.0.tgz", + "integrity": "sha512-XgMrHWHE3aKg11D4QSlpyLvsGw6mHHiUQuowbswd11k89Q6wEfA+jMbYMC7/jsx3LrH9EKti70qhfZyw/wQIfg==", "requires": { "buffer": "4.9.2", "events": "1.1.1", diff --git a/package.json b/package.json index bc51a0f8be..eeabe07c71 100644 --- a/package.json +++ b/package.json @@ -82,7 +82,7 @@ "angular-ui-bootstrap": "~2.5.6", "angular-ui-router": "~1.0.29", "aws-info": "^1.2.0", - "aws-sdk": "^2.985.0", + "aws-sdk": "^2.987.0", "axios": "^0.21.4", "bcrypt": "^5.0.1", "bluebird": "^3.5.2", From 570b1e8f3f3f83c7b7fe9967066ab19322e539ba Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 12 Sep 2021 17:21:50 +0000 Subject: [PATCH 18/26] chore(deps-dev): bump typescript from 4.4.2 to 4.4.3 (#2779) Bumps [typescript](https://github.com/Microsoft/TypeScript) from 4.4.2 to 4.4.3. - [Release notes](https://github.com/Microsoft/TypeScript/releases) - [Commits](https://github.com/Microsoft/TypeScript/compare/v4.4.2...v4.4.3) --- updated-dependencies: - dependency-name: typescript dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4b80f4939b..0bc758d1aa 100644 --- a/package-lock.json +++ b/package-lock.json @@ -24704,9 +24704,9 @@ } }, "typescript": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.2.tgz", - "integrity": "sha512-gzP+t5W4hdy4c+68bfcv0t400HVJMMd2+H9B7gae1nQlBzCqvrXX+6GL/b3GAgyTH966pzrZ70/fRjwAtZksSQ==", + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.3.tgz", + "integrity": "sha512-4xfscpisVgqqDfPaJo5vkd+Qd/ItkoagnHpufr+i2QCHBsNYp+G7UAoyFl8aPtx879u38wPV65rZ8qbGZijalA==", "dev": true }, "uglify-js": { diff --git a/package.json b/package.json index eeabe07c71..2a6bb95a98 100644 --- a/package.json +++ b/package.json @@ -248,7 +248,7 @@ "ts-node": "^10.2.1", "ts-node-dev": "^1.1.8", "type-fest": "^2.2.0", - "typescript": "^4.4.2", + "typescript": "^4.4.3", "url-loader": "^1.1.2", "webpack": "^4.46.0", "webpack-cli": "^3.3.12", From 3744811180bbe5603a875db80d82cdfada0ce50f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 12 Sep 2021 17:24:04 +0000 Subject: [PATCH 19/26] chore(deps-dev): bump @babel/preset-env from 7.15.4 to 7.15.6 (#2780) Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) from 7.15.4 to 7.15.6. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.15.6/packages/babel-preset-env) --- updated-dependencies: - dependency-name: "@babel/preset-env" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 179 +++++++++++++++++++++++++--------------------- package.json | 2 +- 2 files changed, 98 insertions(+), 83 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0bc758d1aa..deedbaef89 100644 --- a/package-lock.json +++ b/package-lock.json @@ -507,9 +507,9 @@ "dev": true }, "@babel/types": { - "version": "7.15.4", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.15.4.tgz", - "integrity": "sha512-0f1HJFuGmmbrKTCZtbm3cU+b/AqdEYk5toj5iQur58xkVMlS0JWaKxTBSmCXd47uiN7vbcozAupm6Mvs80GNhw==", + "version": "7.15.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.15.6.tgz", + "integrity": "sha512-BPU+7QhqNjmWyDO0/vitH/CuhpV8ZmK1wpKva8nuyNF5MJfuRNWMc+hc14+u9xT93kvykMdncrJT19h74uB1Ig==", "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.14.9", @@ -1163,6 +1163,33 @@ "@babel/types": "^7.10.1" } }, + "@babel/helper-simple-access": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.15.4.tgz", + "integrity": "sha512-UzazrDoIVOZZcTeHHEPYrr1MvTR/K+wgLg6MY6e1CJyaRhbibftF6fR2KU2sFRtI/nERUZR9fBd6aKgBlIBaPg==", + "dev": true, + "requires": { + "@babel/types": "^7.15.4" + }, + "dependencies": { + "@babel/helper-validator-identifier": { + "version": "7.14.9", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.9.tgz", + "integrity": "sha512-pQYxPY0UP6IHISRitNe8bsijHex4TWZXi2HwKVsjPiltzlhse2znVcm9Ace510VT1kxIHjGJCZZQBX2gJDbo0g==", + "dev": true + }, + "@babel/types": { + "version": "7.15.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.15.6.tgz", + "integrity": "sha512-BPU+7QhqNjmWyDO0/vitH/CuhpV8ZmK1wpKva8nuyNF5MJfuRNWMc+hc14+u9xT93kvykMdncrJT19h74uB1Ig==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.14.9", + "to-fast-properties": "^2.0.0" + } + } + } + }, "@babel/helper-skip-transparent-expression-wrappers": { "version": "7.15.4", "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.15.4.tgz", @@ -1179,9 +1206,9 @@ "dev": true }, "@babel/types": { - "version": "7.15.4", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.15.4.tgz", - "integrity": "sha512-0f1HJFuGmmbrKTCZtbm3cU+b/AqdEYk5toj5iQur58xkVMlS0JWaKxTBSmCXd47uiN7vbcozAupm6Mvs80GNhw==", + "version": "7.15.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.15.6.tgz", + "integrity": "sha512-BPU+7QhqNjmWyDO0/vitH/CuhpV8ZmK1wpKva8nuyNF5MJfuRNWMc+hc14+u9xT93kvykMdncrJT19h74uB1Ig==", "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.14.9", @@ -1583,9 +1610,9 @@ } }, "@babel/parser": { - "version": "7.15.5", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.5.tgz", - "integrity": "sha512-2hQstc6I7T6tQsWzlboMh3SgMRPaS4H6H7cPQsJkdzTzEGqQrpLDsE2BGASU5sBPoEQyHzeqU6C8uKbFeEk6sg==", + "version": "7.15.6", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.6.tgz", + "integrity": "sha512-S/TSCcsRuCkmpUuoWijua0Snt+f3ewU/8spLo+4AXJCZfT0bVCzLD5MuOKdrx0mlAptbKzn5AdgEIIKXxXkz9Q==", "dev": true }, "@babel/template": { @@ -1617,9 +1644,9 @@ } }, "@babel/types": { - "version": "7.15.4", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.15.4.tgz", - "integrity": "sha512-0f1HJFuGmmbrKTCZtbm3cU+b/AqdEYk5toj5iQur58xkVMlS0JWaKxTBSmCXd47uiN7vbcozAupm6Mvs80GNhw==", + "version": "7.15.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.15.6.tgz", + "integrity": "sha512-BPU+7QhqNjmWyDO0/vitH/CuhpV8ZmK1wpKva8nuyNF5MJfuRNWMc+hc14+u9xT93kvykMdncrJT19h74uB1Ig==", "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.14.9", @@ -2065,9 +2092,9 @@ } }, "@babel/parser": { - "version": "7.15.5", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.5.tgz", - "integrity": "sha512-2hQstc6I7T6tQsWzlboMh3SgMRPaS4H6H7cPQsJkdzTzEGqQrpLDsE2BGASU5sBPoEQyHzeqU6C8uKbFeEk6sg==", + "version": "7.15.6", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.6.tgz", + "integrity": "sha512-S/TSCcsRuCkmpUuoWijua0Snt+f3ewU/8spLo+4AXJCZfT0bVCzLD5MuOKdrx0mlAptbKzn5AdgEIIKXxXkz9Q==", "dev": true }, "@babel/template": { @@ -2099,9 +2126,9 @@ } }, "@babel/types": { - "version": "7.15.4", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.15.4.tgz", - "integrity": "sha512-0f1HJFuGmmbrKTCZtbm3cU+b/AqdEYk5toj5iQur58xkVMlS0JWaKxTBSmCXd47uiN7vbcozAupm6Mvs80GNhw==", + "version": "7.15.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.15.6.tgz", + "integrity": "sha512-BPU+7QhqNjmWyDO0/vitH/CuhpV8ZmK1wpKva8nuyNF5MJfuRNWMc+hc14+u9xT93kvykMdncrJT19h74uB1Ig==", "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.14.9", @@ -2670,9 +2697,9 @@ } }, "@babel/parser": { - "version": "7.15.5", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.5.tgz", - "integrity": "sha512-2hQstc6I7T6tQsWzlboMh3SgMRPaS4H6H7cPQsJkdzTzEGqQrpLDsE2BGASU5sBPoEQyHzeqU6C8uKbFeEk6sg==", + "version": "7.15.6", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.6.tgz", + "integrity": "sha512-S/TSCcsRuCkmpUuoWijua0Snt+f3ewU/8spLo+4AXJCZfT0bVCzLD5MuOKdrx0mlAptbKzn5AdgEIIKXxXkz9Q==", "dev": true }, "@babel/template": { @@ -2687,9 +2714,9 @@ } }, "@babel/types": { - "version": "7.15.4", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.15.4.tgz", - "integrity": "sha512-0f1HJFuGmmbrKTCZtbm3cU+b/AqdEYk5toj5iQur58xkVMlS0JWaKxTBSmCXd47uiN7vbcozAupm6Mvs80GNhw==", + "version": "7.15.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.15.6.tgz", + "integrity": "sha512-BPU+7QhqNjmWyDO0/vitH/CuhpV8ZmK1wpKva8nuyNF5MJfuRNWMc+hc14+u9xT93kvykMdncrJT19h74uB1Ig==", "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.14.9", @@ -2768,31 +2795,6 @@ "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz", "integrity": "sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ==", "dev": true - }, - "@babel/helper-simple-access": { - "version": "7.15.4", - "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.15.4.tgz", - "integrity": "sha512-UzazrDoIVOZZcTeHHEPYrr1MvTR/K+wgLg6MY6e1CJyaRhbibftF6fR2KU2sFRtI/nERUZR9fBd6aKgBlIBaPg==", - "dev": true, - "requires": { - "@babel/types": "^7.15.4" - } - }, - "@babel/helper-validator-identifier": { - "version": "7.14.9", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.9.tgz", - "integrity": "sha512-pQYxPY0UP6IHISRitNe8bsijHex4TWZXi2HwKVsjPiltzlhse2znVcm9Ace510VT1kxIHjGJCZZQBX2gJDbo0g==", - "dev": true - }, - "@babel/types": { - "version": "7.15.4", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.15.4.tgz", - "integrity": "sha512-0f1HJFuGmmbrKTCZtbm3cU+b/AqdEYk5toj5iQur58xkVMlS0JWaKxTBSmCXd47uiN7vbcozAupm6Mvs80GNhw==", - "dev": true, - "requires": { - "@babel/helper-validator-identifier": "^7.14.9", - "to-fast-properties": "^2.0.0" - } } } }, @@ -2831,9 +2833,9 @@ "dev": true }, "@babel/types": { - "version": "7.15.4", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.15.4.tgz", - "integrity": "sha512-0f1HJFuGmmbrKTCZtbm3cU+b/AqdEYk5toj5iQur58xkVMlS0JWaKxTBSmCXd47uiN7vbcozAupm6Mvs80GNhw==", + "version": "7.15.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.15.6.tgz", + "integrity": "sha512-BPU+7QhqNjmWyDO0/vitH/CuhpV8ZmK1wpKva8nuyNF5MJfuRNWMc+hc14+u9xT93kvykMdncrJT19h74uB1Ig==", "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.14.9", @@ -3008,9 +3010,9 @@ } }, "@babel/parser": { - "version": "7.15.5", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.5.tgz", - "integrity": "sha512-2hQstc6I7T6tQsWzlboMh3SgMRPaS4H6H7cPQsJkdzTzEGqQrpLDsE2BGASU5sBPoEQyHzeqU6C8uKbFeEk6sg==", + "version": "7.15.6", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.6.tgz", + "integrity": "sha512-S/TSCcsRuCkmpUuoWijua0Snt+f3ewU/8spLo+4AXJCZfT0bVCzLD5MuOKdrx0mlAptbKzn5AdgEIIKXxXkz9Q==", "dev": true }, "@babel/template": { @@ -3042,9 +3044,9 @@ } }, "@babel/types": { - "version": "7.15.4", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.15.4.tgz", - "integrity": "sha512-0f1HJFuGmmbrKTCZtbm3cU+b/AqdEYk5toj5iQur58xkVMlS0JWaKxTBSmCXd47uiN7vbcozAupm6Mvs80GNhw==", + "version": "7.15.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.15.6.tgz", + "integrity": "sha512-BPU+7QhqNjmWyDO0/vitH/CuhpV8ZmK1wpKva8nuyNF5MJfuRNWMc+hc14+u9xT93kvykMdncrJT19h74uB1Ig==", "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.14.9", @@ -3421,9 +3423,9 @@ } }, "@babel/preset-env": { - "version": "7.15.4", - "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.15.4.tgz", - "integrity": "sha512-4f2nLw+q6ht8gl3sHCmNhmA5W6b1ItLzbH3UrKuJxACHr2eCpk96jwjrAfCAaXaaVwTQGnyUYHY2EWXJGt7TUQ==", + "version": "7.15.6", + "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.15.6.tgz", + "integrity": "sha512-L+6jcGn7EWu7zqaO2uoTDjjMBW+88FXzV8KvrBl2z6MtRNxlsmUNRlZPaNNPUTgqhyC5DHNFk/2Jmra+ublZWw==", "dev": true, "requires": { "@babel/compat-data": "^7.15.0", @@ -3440,7 +3442,7 @@ "@babel/plugin-proposal-logical-assignment-operators": "^7.14.5", "@babel/plugin-proposal-nullish-coalescing-operator": "^7.14.5", "@babel/plugin-proposal-numeric-separator": "^7.14.5", - "@babel/plugin-proposal-object-rest-spread": "^7.14.7", + "@babel/plugin-proposal-object-rest-spread": "^7.15.6", "@babel/plugin-proposal-optional-catch-binding": "^7.14.5", "@babel/plugin-proposal-optional-chaining": "^7.14.5", "@babel/plugin-proposal-private-methods": "^7.14.5", @@ -3493,7 +3495,7 @@ "@babel/plugin-transform-unicode-escapes": "^7.14.5", "@babel/plugin-transform-unicode-regex": "^7.14.5", "@babel/preset-modules": "^0.1.4", - "@babel/types": "^7.15.4", + "@babel/types": "^7.15.6", "babel-plugin-polyfill-corejs2": "^0.2.2", "babel-plugin-polyfill-corejs3": "^0.2.2", "babel-plugin-polyfill-regenerator": "^0.2.2", @@ -3669,9 +3671,9 @@ } }, "@babel/parser": { - "version": "7.15.5", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.5.tgz", - "integrity": "sha512-2hQstc6I7T6tQsWzlboMh3SgMRPaS4H6H7cPQsJkdzTzEGqQrpLDsE2BGASU5sBPoEQyHzeqU6C8uKbFeEk6sg==", + "version": "7.15.6", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.6.tgz", + "integrity": "sha512-S/TSCcsRuCkmpUuoWijua0Snt+f3ewU/8spLo+4AXJCZfT0bVCzLD5MuOKdrx0mlAptbKzn5AdgEIIKXxXkz9Q==", "dev": true }, "@babel/plugin-proposal-async-generator-functions": { @@ -3685,6 +3687,19 @@ "@babel/plugin-syntax-async-generators": "^7.8.4" } }, + "@babel/plugin-proposal-object-rest-spread": { + "version": "7.15.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.15.6.tgz", + "integrity": "sha512-qtOHo7A1Vt+O23qEAX+GdBpqaIuD3i9VRrWgCJeq7WO6H2d14EK3q11urj5Te2MAeK97nMiIdRpwd/ST4JFbNg==", + "dev": true, + "requires": { + "@babel/compat-data": "^7.15.0", + "@babel/helper-compilation-targets": "^7.15.4", + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/plugin-syntax-object-rest-spread": "^7.8.3", + "@babel/plugin-transform-parameters": "^7.15.4" + } + }, "@babel/plugin-syntax-class-properties": { "version": "7.12.13", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz", @@ -3783,9 +3798,9 @@ } }, "@babel/types": { - "version": "7.15.4", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.15.4.tgz", - "integrity": "sha512-0f1HJFuGmmbrKTCZtbm3cU+b/AqdEYk5toj5iQur58xkVMlS0JWaKxTBSmCXd47uiN7vbcozAupm6Mvs80GNhw==", + "version": "7.15.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.15.6.tgz", + "integrity": "sha512-BPU+7QhqNjmWyDO0/vitH/CuhpV8ZmK1wpKva8nuyNF5MJfuRNWMc+hc14+u9xT93kvykMdncrJT19h74uB1Ig==", "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.14.9", @@ -3793,24 +3808,24 @@ } }, "caniuse-lite": { - "version": "1.0.30001254", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001254.tgz", - "integrity": "sha512-GxeHOvR0LFMYPmFGA+NiTOt9uwYDxB3h154tW2yBYwfz2EMX3i1IBgr6gmJGfU0K8KQsqPa5XqLD8zVdP5lUzA==", + "version": "1.0.30001256", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001256.tgz", + "integrity": "sha512-QirrvMLmB4txNnxiaG/xbm6FSzv9LqOZ3Jp9VtCYb3oPIfCHpr/oGn38pFq0udwlkctvXQgPthaXqJ76DaYGnA==", "dev": true }, "colorette": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.3.0.tgz", - "integrity": "sha512-ecORCqbSFP7Wm8Y6lyqMJjexBQqXSF7SSeaTyGGphogUjBlFP9m9o08wy86HL2uB7fMTxtOUzLMk7ogKcxMg1w==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.4.0.tgz", + "integrity": "sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g==", "dev": true }, "core-js-compat": { - "version": "3.17.2", - "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.17.2.tgz", - "integrity": "sha512-lHnt7A1Oqplebl5i0MrQyFv/yyEzr9p29OjlkcsFRDDgHwwQyVckfRGJ790qzXhkwM8ba4SFHHa2sO+T5f1zGg==", + "version": "3.17.3", + "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.17.3.tgz", + "integrity": "sha512-+in61CKYs4hQERiADCJsdgewpdl/X0GhEX77pjKgbeibXviIt2oxEjTc8O2fqHX8mDdBrDvX8MYD/RYsBv4OiA==", "dev": true, "requires": { - "browserslist": "^4.16.8", + "browserslist": "^4.17.0", "semver": "7.0.0" }, "dependencies": { @@ -3845,9 +3860,9 @@ } }, "electron-to-chromium": { - "version": "1.3.830", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.830.tgz", - "integrity": "sha512-gBN7wNAxV5vl1430dG+XRcQhD4pIeYeak6p6rjdCtlz5wWNwDad8jwvphe5oi1chL5MV6RNRikfffBBiFuj+rQ==", + "version": "1.3.836", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.836.tgz", + "integrity": "sha512-Ney3pHOJBWkG/AqYjrW0hr2AUCsao+2uvq9HUlRP8OlpSdk/zOHOUJP7eu0icDvePC9DlgffuelP4TnOJmMRUg==", "dev": true }, "node-releases": { diff --git a/package.json b/package.json index 2a6bb95a98..5e6f2a649a 100644 --- a/package.json +++ b/package.json @@ -160,7 +160,7 @@ "devDependencies": { "@babel/core": "^7.15.5", "@babel/plugin-transform-runtime": "^7.15.0", - "@babel/preset-env": "^7.15.4", + "@babel/preset-env": "^7.15.6", "@opengovsg/mockpass": "^2.7.8", "@types/bcrypt": "^5.0.0", "@types/bluebird": "^3.5.36", From 31d18464575eeb78b7287eeff039a984ef141bac Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 12 Sep 2021 17:42:18 +0000 Subject: [PATCH 20/26] fix(deps): bump libphonenumber-js from 1.9.27 to 1.9.32 (#2782) Bumps [libphonenumber-js](https://gitlab.com/catamphetamine/libphonenumber-js) from 1.9.27 to 1.9.32. - [Release notes](https://gitlab.com/catamphetamine/libphonenumber-js/tags) - [Changelog](https://gitlab.com/catamphetamine/libphonenumber-js/blob/master/CHANGELOG.md) - [Commits](https://gitlab.com/catamphetamine/libphonenumber-js/compare/v1.9.27...v1.9.32) --- updated-dependencies: - dependency-name: libphonenumber-js dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index deedbaef89..e65e56acad 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16422,9 +16422,9 @@ } }, "libphonenumber-js": { - "version": "1.9.27", - "resolved": "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.9.27.tgz", - "integrity": "sha512-6eoCiQ3IPTRhXuhjNK7PaD4jA1NVP4mJZLAMu10dQEYbyk+nzzanpT6MJC1ZESesKGPLS1yIvVOy1WtlM57Xuw==" + "version": "1.9.32", + "resolved": "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.9.32.tgz", + "integrity": "sha512-sXuNLzTU/lNUZ78eWUi5JvqaHAhwBMuMT17613EjLZl/ejIoDe0EV225Xhw4vuZ6FcqkiwsF8qHcOyyn1dBEWQ==" }, "lie": { "version": "3.3.0", diff --git a/package.json b/package.json index 5e6f2a649a..d976c9bd74 100644 --- a/package.json +++ b/package.json @@ -119,7 +119,7 @@ "json-stringify-safe": "^5.0.1", "jszip": "^3.7.1", "jwt-decode": "^3.1.2", - "libphonenumber-js": "^1.9.27", + "libphonenumber-js": "^1.9.32", "lodash": "^4.17.21", "moment-timezone": "0.5.33", "mongodb-uri": "^0.9.7", From cde09b703790b70df65fc9c55d9654f54eaa7f17 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 12 Sep 2021 18:01:22 +0000 Subject: [PATCH 21/26] chore(deps-dev): bump type-fest from 2.2.0 to 2.3.2 (#2783) Bumps [type-fest](https://github.com/sindresorhus/type-fest) from 2.2.0 to 2.3.2. - [Release notes](https://github.com/sindresorhus/type-fest/releases) - [Commits](https://github.com/sindresorhus/type-fest/compare/v2.2.0...v2.3.2) --- updated-dependencies: - dependency-name: type-fest dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index e65e56acad..dc23df5696 100644 --- a/package-lock.json +++ b/package-lock.json @@ -24689,9 +24689,9 @@ "dev": true }, "type-fest": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.2.0.tgz", - "integrity": "sha512-T/HWTs/P20wqgy3GoIDv80tAB3Xvgk2vpxnS1vF8oVboipjrSB1hP5f1gFhCVt5QuMvOsALSwBBd02J94P51lg==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.3.2.tgz", + "integrity": "sha512-cfvZ1nOC/VqAt8bVOIlFz8x+HdDASpiFYrSi0U0nzcAFlOnzzQ/gsPg2PP1uqjreO7sQCtraYJHMduXSewQsSA==", "dev": true }, "type-is": { diff --git a/package.json b/package.json index d976c9bd74..d13f2c62a7 100644 --- a/package.json +++ b/package.json @@ -247,7 +247,7 @@ "ts-loader": "^7.0.5", "ts-node": "^10.2.1", "ts-node-dev": "^1.1.8", - "type-fest": "^2.2.0", + "type-fest": "^2.3.2", "typescript": "^4.4.3", "url-loader": "^1.1.2", "webpack": "^4.46.0", From eeeb0acf0a9a5bfd37e9da7089bc0a9b51c0dfc5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Sep 2021 10:20:04 +0000 Subject: [PATCH 22/26] fix(deps): bump twilio from 3.67.1 to 3.67.2 (#2772) Bumps [twilio](https://github.com/twilio/twilio-node) from 3.67.1 to 3.67.2. - [Release notes](https://github.com/twilio/twilio-node/releases) - [Changelog](https://github.com/twilio/twilio-node/blob/main/CHANGES.md) - [Commits](https://github.com/twilio/twilio-node/compare/3.67.1...3.67.2) --- updated-dependencies: - dependency-name: twilio dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index dc23df5696..f835155af1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -24617,9 +24617,9 @@ "integrity": "sha512-RKJBIj8lySrShN4w6i/BonWp2Z/uxwC3h4y7xsRrpP59ZboCd0GpEVsOnMDYLMmKBpYhb5TgHzZXy7wTfYFBRw==" }, "twilio": { - "version": "3.67.1", - "resolved": "https://registry.npmjs.org/twilio/-/twilio-3.67.1.tgz", - "integrity": "sha512-JpdPLqPyYpMyrW39ByUbHimqeHpcWuMv7DD1R215C5wf8dS9EzYfAHqFvrZCEOZkdpB3QeR0UZfvh96jb8FB7Q==", + "version": "3.67.2", + "resolved": "https://registry.npmjs.org/twilio/-/twilio-3.67.2.tgz", + "integrity": "sha512-JOpnY+leRJIERFljSzKIIu80Kfj2QVIoldEjTDH1xiCEEwbmsMbZIzZwO/zDEhCpKcvpMTSuK2jl/xPmTxAkvA==", "requires": { "axios": "^0.21.1", "dayjs": "^1.8.29", diff --git a/package.json b/package.json index d13f2c62a7..abfd0b3f64 100644 --- a/package.json +++ b/package.json @@ -146,7 +146,7 @@ "toastr": "^2.1.4", "triple-beam": "^1.3.0", "tweetnacl": "^1.0.1", - "twilio": "^3.67.1", + "twilio": "^3.67.2", "ui-select": "^0.19.8", "uid-generator": "^2.0.0", "uuid": "^8.3.2", From 1ae05e7611ca94c724c8208e1afa9c6788d0d8cf Mon Sep 17 00:00:00 2001 From: Frank Chen Date: Mon, 13 Sep 2021 09:10:20 -0700 Subject: [PATCH 23/26] feat: Add 4MB attachment support (#2777) --- shared/types/field/attachmentField.ts | 1 + .../controllers/edit-fields-modal.client.controller.js | 6 +++--- .../modules/forms/services/attachment.client.service.js | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/shared/types/field/attachmentField.ts b/shared/types/field/attachmentField.ts index 04497883e9..629f7cb141 100644 --- a/shared/types/field/attachmentField.ts +++ b/shared/types/field/attachmentField.ts @@ -4,6 +4,7 @@ export enum AttachmentSize { OneMb = '1', TwoMb = '2', ThreeMb = '3', + FourMb = '4', SevenMb = '7', TenMb = '10', TwentyMb = '20', diff --git a/src/public/modules/forms/admin/controllers/edit-fields-modal.client.controller.js b/src/public/modules/forms/admin/controllers/edit-fields-modal.client.controller.js index 938ad97bed..c5eb893100 100644 --- a/src/public/modules/forms/admin/controllers/edit-fields-modal.client.controller.js +++ b/src/public/modules/forms/admin/controllers/edit-fields-modal.client.controller.js @@ -20,7 +20,7 @@ const { } = require('../../../../../../shared/types/field') const CancelToken = axios.CancelToken -const EMAIL_MODE_ALLOWED_SIZES = ['1', '2', '3', '7'] +const EMAIL_MODE_ALLOWED_SIZES = ['1', '2', '3', '4', '7'] angular .module('forms') @@ -326,8 +326,8 @@ function EditFieldsModalController( // Modify tooltip to match email or encrypt mode options vm.attachmentTooltipText = vm.myform.responseMode === responseModeEnum.EMAIL - ? 'Guideline: Images & PDFs - 1-3 MB, Slides & Videos - 7 MB. Include up to 7 MB of attachments in a submission (Email mode).' - : 'Guideline: Images & PDFs - 1-3 MB, Slides - 7 MB, Videos - 10-20 MB. Include up to 20 MB of attachments in a submission (Storage mode).' + ? 'Guideline: Images & PDFs - 1-4 MB, Slides & Videos - 7 MB. Include up to 7 MB of attachments in a submission (Email mode).' + : 'Guideline: Images & PDFs - 1-4 MB, Slides - 7 MB, Videos - 10-20 MB. Include up to 20 MB of attachments in a submission (Storage mode).' let previousAttachmentSize = 0 diff --git a/src/public/modules/forms/services/attachment.client.service.js b/src/public/modules/forms/services/attachment.client.service.js index 3e085337f5..91368295ad 100644 --- a/src/public/modules/forms/services/attachment.client.service.js +++ b/src/public/modules/forms/services/attachment.client.service.js @@ -3,9 +3,9 @@ const { zipWith } = require('lodash') angular.module('forms').service('Attachment', [Attachment]) function Attachment() { - this.sizes = ['1', '2', '3', '7', '10', '20'] + this.sizes = ['1', '2', '3', '4', '7', '10', '20'] - this.descriptions = ['1 MB', '2 MB', '3 MB', '7 MB', '10 MB', '20 MB'] + this.descriptions = ['1 MB', '2 MB', '3 MB', '4 MB', '7 MB', '10 MB', '20 MB'] this.dropdown = zipWith(this.descriptions, this.sizes, (desc, size) => { return { name: desc, value: size } From c5bfd95f5d4ca4e105de208ec64468bdd23a6558 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Sep 2021 17:28:53 +0000 Subject: [PATCH 24/26] chore(deps-dev): bump @typescript-eslint/eslint-plugin (#2795) Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 4.31.0 to 4.31.1. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/eslint-plugin/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v4.31.1/packages/eslint-plugin) --- updated-dependencies: - dependency-name: "@typescript-eslint/eslint-plugin" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 56 +++++++++++++++++++++++------------------------ package.json | 2 +- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/package-lock.json b/package-lock.json index f835155af1..781f54fdb8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5890,13 +5890,13 @@ } }, "@typescript-eslint/eslint-plugin": { - "version": "4.31.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.31.0.tgz", - "integrity": "sha512-iPKZTZNavAlOhfF4gymiSuUkgLne/nh5Oz2/mdiUmuZVD42m9PapnCnzjxuDsnpnbH3wT5s2D8bw6S39TC6GNw==", + "version": "4.31.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.31.1.tgz", + "integrity": "sha512-UDqhWmd5i0TvPLmbK5xY3UZB0zEGseF+DHPghZ37Sb83Qd3p8ujhvAtkU4OF46Ka5Pm5kWvFIx0cCTBFKo0alA==", "dev": true, "requires": { - "@typescript-eslint/experimental-utils": "4.31.0", - "@typescript-eslint/scope-manager": "4.31.0", + "@typescript-eslint/experimental-utils": "4.31.1", + "@typescript-eslint/scope-manager": "4.31.1", "debug": "^4.3.1", "functional-red-black-tree": "^1.0.1", "regexpp": "^3.1.0", @@ -5911,43 +5911,43 @@ "dev": true }, "@typescript-eslint/experimental-utils": { - "version": "4.31.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.31.0.tgz", - "integrity": "sha512-Hld+EQiKLMppgKKkdUsLeVIeEOrwKc2G983NmznY/r5/ZtZCDvIOXnXtwqJIgYz/ymsy7n7RGvMyrzf1WaSQrw==", + "version": "4.31.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.31.1.tgz", + "integrity": "sha512-NtoPsqmcSsWty0mcL5nTZXMf7Ei0Xr2MT8jWjXMVgRK0/1qeQ2jZzLFUh4QtyJ4+/lPUyMw5cSfeeME+Zrtp9Q==", "dev": true, "requires": { "@types/json-schema": "^7.0.7", - "@typescript-eslint/scope-manager": "4.31.0", - "@typescript-eslint/types": "4.31.0", - "@typescript-eslint/typescript-estree": "4.31.0", + "@typescript-eslint/scope-manager": "4.31.1", + "@typescript-eslint/types": "4.31.1", + "@typescript-eslint/typescript-estree": "4.31.1", "eslint-scope": "^5.1.1", "eslint-utils": "^3.0.0" } }, "@typescript-eslint/scope-manager": { - "version": "4.31.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.31.0.tgz", - "integrity": "sha512-LJ+xtl34W76JMRLjbaQorhR0hfRAlp3Lscdiz9NeI/8i+q0hdBZ7BsiYieLoYWqy+AnRigaD3hUwPFugSzdocg==", + "version": "4.31.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.31.1.tgz", + "integrity": "sha512-N1Uhn6SqNtU2XpFSkD4oA+F0PfKdWHyr4bTX0xTj8NRx1314gBDRL1LUuZd5+L3oP+wo6hCbZpaa1in6SwMcVQ==", "dev": true, "requires": { - "@typescript-eslint/types": "4.31.0", - "@typescript-eslint/visitor-keys": "4.31.0" + "@typescript-eslint/types": "4.31.1", + "@typescript-eslint/visitor-keys": "4.31.1" } }, "@typescript-eslint/types": { - "version": "4.31.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.31.0.tgz", - "integrity": "sha512-9XR5q9mk7DCXgXLS7REIVs+BaAswfdHhx91XqlJklmqWpTALGjygWVIb/UnLh4NWhfwhR5wNe1yTyCInxVhLqQ==", + "version": "4.31.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.31.1.tgz", + "integrity": "sha512-kixltt51ZJGKENNW88IY5MYqTBA8FR0Md8QdGbJD2pKZ+D5IvxjTYDNtJPDxFBiXmka2aJsITdB1BtO1fsgmsQ==", "dev": true }, "@typescript-eslint/typescript-estree": { - "version": "4.31.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.31.0.tgz", - "integrity": "sha512-QHl2014t3ptg+xpmOSSPn5hm4mY8D4s97ftzyk9BZ8RxYQ3j73XcwuijnJ9cMa6DO4aLXeo8XS3z1omT9LA/Eg==", + "version": "4.31.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.31.1.tgz", + "integrity": "sha512-EGHkbsUvjFrvRnusk6yFGqrqMBTue5E5ROnS5puj3laGQPasVUgwhrxfcgkdHNFECHAewpvELE1Gjv0XO3mdWg==", "dev": true, "requires": { - "@typescript-eslint/types": "4.31.0", - "@typescript-eslint/visitor-keys": "4.31.0", + "@typescript-eslint/types": "4.31.1", + "@typescript-eslint/visitor-keys": "4.31.1", "debug": "^4.3.1", "globby": "^11.0.3", "is-glob": "^4.0.1", @@ -5956,12 +5956,12 @@ } }, "@typescript-eslint/visitor-keys": { - "version": "4.31.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.31.0.tgz", - "integrity": "sha512-HUcRp2a9I+P21+O21yu3ezv3GEPGjyGiXoEUQwZXjR8UxRApGeLyWH4ZIIUSalE28aG4YsV6GjtaAVB3QKOu0w==", + "version": "4.31.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.31.1.tgz", + "integrity": "sha512-PCncP8hEqKw6SOJY+3St4LVtoZpPPn+Zlpm7KW5xnviMhdqcsBty4Lsg4J/VECpJjw1CkROaZhH4B8M1OfnXTQ==", "dev": true, "requires": { - "@typescript-eslint/types": "4.31.0", + "@typescript-eslint/types": "4.31.1", "eslint-visitor-keys": "^2.0.0" } }, diff --git a/package.json b/package.json index abfd0b3f64..22192cf4b9 100644 --- a/package.json +++ b/package.json @@ -192,7 +192,7 @@ "@types/uid-generator": "^2.0.2", "@types/uuid": "^8.3.1", "@types/validator": "^13.6.3", - "@typescript-eslint/eslint-plugin": "^4.31.0", + "@typescript-eslint/eslint-plugin": "^4.31.1", "@typescript-eslint/parser": "^4.31.0", "auto-changelog": "^2.3.0", "axios-mock-adapter": "^1.20.0", From 227329daa79de29b65dcf096ccef69af40699a37 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 14 Sep 2021 02:29:04 +0000 Subject: [PATCH 25/26] fix(deps): bump fp-ts from 2.11.1 to 2.11.2 (#2796) Bumps [fp-ts](https://github.com/gcanti/fp-ts) from 2.11.1 to 2.11.2. - [Release notes](https://github.com/gcanti/fp-ts/releases) - [Changelog](https://github.com/gcanti/fp-ts/blob/master/CHANGELOG.md) - [Commits](https://github.com/gcanti/fp-ts/compare/2.11.1...2.11.2) --- updated-dependencies: - dependency-name: fp-ts dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 781f54fdb8..6721771b76 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12463,9 +12463,9 @@ "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=" }, "fp-ts": { - "version": "2.11.1", - "resolved": "https://registry.npmjs.org/fp-ts/-/fp-ts-2.11.1.tgz", - "integrity": "sha512-CJOfs+Heq/erkE5mqH2mhpsxCKABGmcLyeEwPxtbTlkLkItGUs6bmk2WqjB2SgoVwNwzTE5iKjPQJiq06CPs5g==" + "version": "2.11.2", + "resolved": "https://registry.npmjs.org/fp-ts/-/fp-ts-2.11.2.tgz", + "integrity": "sha512-G1rD89nmbbgTNRBKohjB3Qv4IxOHQ5KV3ZvYfpaQZyrGt+ZQUFrcnCqE567bcEdvwoAUKDQM7isOcv7xcM/qAQ==" }, "fragment-cache": { "version": "0.2.1", diff --git a/package.json b/package.json index 22192cf4b9..4bd79cd9ff 100644 --- a/package.json +++ b/package.json @@ -111,7 +111,7 @@ "fetch-readablestream": "^0.2.0", "file-saver": "^2.0.5", "font-awesome": "4.7.0", - "fp-ts": "^2.11.1", + "fp-ts": "^2.11.2", "has-ansi": "^4.0.1", "helmet": "^4.6.0", "http-status-codes": "^2.1.4", From 59fe0663df7fb3c8ffad0d5a174ee4856996763b Mon Sep 17 00:00:00 2001 From: Timothee Groleau Date: Tue, 14 Sep 2021 10:56:27 +0800 Subject: [PATCH 26/26] chore: bump version to 5.28.0 --- CHANGELOG.md | 32 ++++++++++++++++++++++++++++++++ package-lock.json | 2 +- package.json | 2 +- 3 files changed, 34 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c6d682e0b4..8062492e14 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,8 +4,39 @@ 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.28.0](https://github.com/opengovsg/FormSG/compare/v5.27.0...v5.28.0) + +- fix(deps): bump fp-ts from 2.11.1 to 2.11.2 [`#2796`](https://github.com/opengovsg/FormSG/pull/2796) +- chore(deps-dev): bump @typescript-eslint/eslint-plugin [`#2795`](https://github.com/opengovsg/FormSG/pull/2795) +- feat: Add 4MB attachment support [`#2777`](https://github.com/opengovsg/FormSG/pull/2777) +- fix(deps): bump twilio from 3.67.1 to 3.67.2 [`#2772`](https://github.com/opengovsg/FormSG/pull/2772) +- chore(deps-dev): bump type-fest from 2.2.0 to 2.3.2 [`#2783`](https://github.com/opengovsg/FormSG/pull/2783) +- fix(deps): bump libphonenumber-js from 1.9.27 to 1.9.32 [`#2782`](https://github.com/opengovsg/FormSG/pull/2782) +- chore(deps-dev): bump @babel/preset-env from 7.15.4 to 7.15.6 [`#2780`](https://github.com/opengovsg/FormSG/pull/2780) +- chore(deps-dev): bump typescript from 4.4.2 to 4.4.3 [`#2779`](https://github.com/opengovsg/FormSG/pull/2779) +- fix(deps): bump aws-sdk from 2.985.0 to 2.987.0 [`#2778`](https://github.com/opengovsg/FormSG/pull/2778) +- fix(otp): Ensure uniform distribution of digits [`#2775`](https://github.com/opengovsg/FormSG/pull/2775) +- fix(deps): bump libphonenumber-js from 1.9.26 to 1.9.27 [`#2774`](https://github.com/opengovsg/FormSG/pull/2774) +- fix(deps): bump aws-sdk from 2.984.0 to 2.985.0 [`#2773`](https://github.com/opengovsg/FormSG/pull/2773) +- chore(deps-dev): bump prettier from 2.3.2 to 2.4.0 [`#2771`](https://github.com/opengovsg/FormSG/pull/2771) +- chore(deps-dev): bump core-js from 3.17.2 to 3.17.3 [`#2770`](https://github.com/opengovsg/FormSG/pull/2770) +- fix(deps): bump aws-sdk from 2.983.0 to 2.984.0 [`#2763`](https://github.com/opengovsg/FormSG/pull/2763) +- chore(deps-dev): bump @types/compression from 1.7.1 to 1.7.2 [`#2760`](https://github.com/opengovsg/FormSG/pull/2760) +- chore(deps-dev): bump @types/node from 14.17.14 to 14.17.15 [`#2758`](https://github.com/opengovsg/FormSG/pull/2758) +- chore(deps): Update winston-cloudwatch [`#2726`](https://github.com/opengovsg/FormSG/pull/2726) +- fix: upgrade zod from 3.7.1 to 3.7.2 [`#2737`](https://github.com/opengovsg/FormSG/pull/2737) +- build: merge release 5.27.0 into develop [`#2757`](https://github.com/opengovsg/FormSG/pull/2757) +- fix(radio): Remove unnecessary nbsp from option text [`#2736`](https://github.com/opengovsg/FormSG/pull/2736) +- chore(deps-dev): bump @typescript-eslint/eslint-plugin [`#2752`](https://github.com/opengovsg/FormSG/pull/2752) +- fix(deps): bump axios from 0.21.2 to 0.21.4 [`#2756`](https://github.com/opengovsg/FormSG/pull/2756) +- fix(deps): bump web-streams-polyfill from 3.1.0 to 3.1.1 [`#2755`](https://github.com/opengovsg/FormSG/pull/2755) +- chore(deps-dev): bump @typescript-eslint/parser from 4.30.0 to 4.31.0 [`#2754`](https://github.com/opengovsg/FormSG/pull/2754) +- chore(deps-dev): bump ngrok from 4.1.0 to 4.2.2 [`#2753`](https://github.com/opengovsg/FormSG/pull/2753) + #### [v5.27.0](https://github.com/opengovsg/FormSG/compare/v5.26.0...v5.27.0) +> 6 September 2021 + - fix(deps): bump libphonenumber-js from 1.9.25 to 1.9.26 [`#2741`](https://github.com/opengovsg/FormSG/pull/2741) - fix(deps): bump @babel/runtime from 7.15.3 to 7.15.4 [`#2746`](https://github.com/opengovsg/FormSG/pull/2746) - chore(deps-dev): bump @babel/core from 7.15.0 to 7.15.5 [`#2749`](https://github.com/opengovsg/FormSG/pull/2749) @@ -28,6 +59,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). - chore(deps-dev): bump @types/node from 14.17.12 to 14.17.14 [`#2722`](https://github.com/opengovsg/FormSG/pull/2722) - fix(deps): bump aws-sdk from 2.978.0 to 2.979.0 [`#2717`](https://github.com/opengovsg/FormSG/pull/2717) - chore: merge release v5.26.0 back to develop [`#2711`](https://github.com/opengovsg/FormSG/pull/2711) +- chore: bump version to 5.27.0 [`ffb85d2`](https://github.com/opengovsg/FormSG/commit/ffb85d2ff0d902baac9b497d66c520f4c4f7e018) #### [v5.26.0](https://github.com/opengovsg/FormSG/compare/v5.25.0...v5.26.0) diff --git a/package-lock.json b/package-lock.json index 6721771b76..02c7a05ffd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "FormSG", - "version": "5.27.0", + "version": "5.28.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 4bd79cd9ff..18b148decd 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "FormSG", "description": "Form Manager for Government", - "version": "5.27.0", + "version": "5.28.0", "homepage": "https://form.gov.sg", "authors": [ "FormSG "