From 793c08ece80d2f3995655212999cf1da259a52fe Mon Sep 17 00:00:00 2001 From: Hugo Jeffreys Date: Thu, 7 Apr 2022 16:04:22 +0100 Subject: [PATCH 01/14] Move post option to the end of the page on all journeys --- apps/collection/views/contact-details.html | 4 ++-- apps/correct-mistakes/views/contact-details.html | 4 ++-- apps/lost-stolen/views/contact-details.html | 4 ++-- apps/not-arrived/views/contact-details.html | 4 ++-- apps/someone-else/views/contact-details.html | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/apps/collection/views/contact-details.html b/apps/collection/views/contact-details.html index ff627c5a..6622494a 100644 --- a/apps/collection/views/contact-details.html +++ b/apps/collection/views/contact-details.html @@ -33,6 +33,8 @@ {{#input-text}}email{{/input-text}} + {{#input-phone}}phone{{/input-phone}} + {{#checkbox}}use-address{{/checkbox}}
@@ -65,8 +67,6 @@
- {{#input-phone}}phone{{/input-phone}} - {{#input-submit}}continue{{/input-submit}} {{/form}} diff --git a/apps/correct-mistakes/views/contact-details.html b/apps/correct-mistakes/views/contact-details.html index 1993cbb4..a12d5783 100644 --- a/apps/correct-mistakes/views/contact-details.html +++ b/apps/correct-mistakes/views/contact-details.html @@ -33,6 +33,8 @@ {{#input-text}}email{{/input-text}} + {{#input-phone}}phone{{/input-phone}} + {{#checkbox}}use-address{{/checkbox}}
@@ -65,8 +67,6 @@
- {{#input-phone}}phone{{/input-phone}} - {{#input-submit}}continue{{/input-submit}} {{/form}} diff --git a/apps/lost-stolen/views/contact-details.html b/apps/lost-stolen/views/contact-details.html index 6d24b87c..9d7fdf86 100644 --- a/apps/lost-stolen/views/contact-details.html +++ b/apps/lost-stolen/views/contact-details.html @@ -33,6 +33,8 @@ {{#input-text}}email{{/input-text}} + {{#input-phone}}phone{{/input-phone}} + {{#location.inside-uk}} {{#checkbox}}use-address{{/checkbox}} @@ -67,8 +69,6 @@ {{/location.inside-uk}} - {{#input-phone}}phone{{/input-phone}} - {{#input-submit}}continue{{/input-submit}} {{/form}} diff --git a/apps/not-arrived/views/contact-details.html b/apps/not-arrived/views/contact-details.html index 9e3a485e..29545ded 100644 --- a/apps/not-arrived/views/contact-details.html +++ b/apps/not-arrived/views/contact-details.html @@ -33,6 +33,8 @@ {{#input-text}}email{{/input-text}} + {{#input-phone}}phone{{/input-phone}} + {{#checkbox}}use-address{{/checkbox}}
@@ -65,8 +67,6 @@
- {{#input-phone}}phone{{/input-phone}} - {{#input-submit}}continue{{/input-submit}} {{/form}} diff --git a/apps/someone-else/views/contact-details.html b/apps/someone-else/views/contact-details.html index 2fbca647..410d4fa2 100644 --- a/apps/someone-else/views/contact-details.html +++ b/apps/someone-else/views/contact-details.html @@ -33,6 +33,8 @@ {{#input-text}}email{{/input-text}} + {{#input-phone}}phone{{/input-phone}} + {{#checkbox}}use-address{{/checkbox}}
@@ -65,8 +67,6 @@
- {{#input-phone}}phone{{/input-phone}} - {{#input-submit}}continue{{/input-submit}} {{/form}} From 4b56555a9476e8dfeab24627212cdedbce4eb675 Mon Sep 17 00:00:00 2001 From: Hugo Jeffreys Date: Mon, 11 Apr 2022 15:00:51 +0100 Subject: [PATCH 02/14] Update to latest version of hof --- package.json | 2 +- yarn.lock | 27 ++++++++++++++++----------- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index 15db0b32..d71dd9b4 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "author": "HomeOffice", "dependencies": { "express": "^4.17.1", - "hof": "^19.13.9", + "hof": "^19.13.12", "hogan.js": "^3.0.2", "hot-shots": "^5.9.0", "i18n-future": "^2.0.1", diff --git a/yarn.lock b/yarn.lock index e6d1784d..a0a3f5d8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2794,10 +2794,10 @@ hmac-drbg@^1.0.1: minimalistic-assert "^1.0.0" minimalistic-crypto-utils "^1.0.1" -hof@^19.13.9: - version "19.13.9" - resolved "https://registry.yarnpkg.com/hof/-/hof-19.13.9.tgz#28f1385507ac0b2ade993682a76a7c358c76022d" - integrity sha512-lSIenKPI5rE1OgTCAJnnMv4mQPWxCXrxjBV5PrfqwDLkLpjz2zlP83xRg/X5jiU4WaRZf9bJfklNiI4NCaOuSQ== +hof@^19.13.12: + version "19.13.12" + resolved "https://registry.yarnpkg.com/hof/-/hof-19.13.12.tgz#c272d31a4195df38b442fa56165b383edc3a2e77" + integrity sha512-o70AocJfn4AC4TmQYAzG+CGeRCCXySAVQXi7YduJTPqV1y6WdccZ5fxhQepCV4l9yBW9qgHI8vycbbQvxkDs5g== dependencies: aliasify "^2.1.0" bluebird "^3.7.2" @@ -2836,7 +2836,7 @@ hof@^19.13.9: minimist "^1.2.0" mixwith "^0.1.1" mkdirp "^0.5.1" - moment "^2.24.0" + moment "^2.29.2" morgan "^1.10.0" mustache "^2.3.0" nodemailer "^6.6.3" @@ -2851,7 +2851,7 @@ hof@^19.13.9: serve-static "^1.14.1" uglify-js "^3.14.3" underscore "^1.12.1" - urijs "^1.19.10" + urijs "^1.19.11" winston "^3.3.3" hogan-express-strict@^0.5.4: @@ -3792,11 +3792,16 @@ moment-business@^2.0.0: moment "^2.9.0" skipped-periodic-values "^1.0.0" -moment@^2.24.0, moment@^2.29.1, moment@^2.9.0: +moment@^2.29.1, moment@^2.9.0: version "2.29.1" resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3" integrity sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ== +moment@^2.29.2: + version "2.29.2" + resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.2.tgz#00910c60b20843bcba52d37d58c628b47b1f20e4" + integrity sha512-UgzG4rvxYpN15jgCmVJwac49h9ly9NurikMWGPdVxm8GZD6XjkKPxDTjQQ43gtGgnV3X0cAyWDdP2Wexoquifg== + morgan@^1.10.0: version "1.10.0" resolved "https://registry.yarnpkg.com/morgan/-/morgan-1.10.0.tgz#091778abc1fc47cd3509824653dae1faab6b17d7" @@ -5553,10 +5558,10 @@ uri-js@^4.2.2: dependencies: punycode "^2.1.0" -urijs@^1.19.10: - version "1.19.10" - resolved "https://registry.yarnpkg.com/urijs/-/urijs-1.19.10.tgz#8e2fe70a8192845c180f75074884278f1eea26cb" - integrity sha512-EzauQlgKuJgsXOqoMrCiePBf4At5jVqRhXykF3Wfb8ZsOBMxPcfiVBcsHXug4Aepb/ICm2PIgqAUGMelgdrWEg== +urijs@^1.19.11: + version "1.19.11" + resolved "https://registry.yarnpkg.com/urijs/-/urijs-1.19.11.tgz#204b0d6b605ae80bea54bea39280cdb7c9f923cc" + integrity sha512-HXgFDgDommxn5/bIv0cnQZsPhHDA90NPHD6+c/v21U5+Sx5hoP8+dP9IZXBU1gIfvdRfhG8cel9QNPeionfcCQ== url@0.10.3: version "0.10.3" From 57cef55476c6d7f5bba40512b33d431eb48bf8ff Mon Sep 17 00:00:00 2001 From: Hugo Jeffreys Date: Mon, 11 Apr 2022 15:29:49 +0100 Subject: [PATCH 03/14] Update acceptance test on correct mistakes journey to reflect update on hof --- test/_features/brp/correct_mistakes.feature | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/_features/brp/correct_mistakes.feature b/test/_features/brp/correct_mistakes.feature index b19432ee..06b16e37 100644 --- a/test/_features/brp/correct_mistakes.feature +++ b/test/_features/brp/correct_mistakes.feature @@ -87,7 +87,7 @@ Feature: A user should access the correct mistakes service and be able to log an Then I should see the 'What is your correct family name?' error Then I should see the 'What are your correct given name(s)?' error Then I should see the 'What is your correct place of birth?' error - Then I should see the 'Enter a valid date' error + Then I should see the 'Enter your date of birth' error Then I should see the 'What is your correct gender?' error Then I should see the 'What are the correct sponsor details?' error Then I should see the 'What is wrong with your signature?' error From 19c48845227590dc732fa3199d633a3320b0b9de Mon Sep 17 00:00:00 2001 From: Hugo Jeffreys Date: Tue, 12 Apr 2022 12:42:59 +0100 Subject: [PATCH 04/14] Update hof to 19.13.13 --- package.json | 2 +- yarn.lock | 13 ++++--------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index d71dd9b4..28d03716 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "author": "HomeOffice", "dependencies": { "express": "^4.17.1", - "hof": "^19.13.12", + "hof": "^19.13.13", "hogan.js": "^3.0.2", "hot-shots": "^5.9.0", "i18n-future": "^2.0.1", diff --git a/yarn.lock b/yarn.lock index 91c6ff36..9fc32a8d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2794,10 +2794,10 @@ hmac-drbg@^1.0.1: minimalistic-assert "^1.0.0" minimalistic-crypto-utils "^1.0.1" -hof@^19.13.12: - version "19.13.12" - resolved "https://registry.yarnpkg.com/hof/-/hof-19.13.12.tgz#c272d31a4195df38b442fa56165b383edc3a2e77" - integrity sha512-o70AocJfn4AC4TmQYAzG+CGeRCCXySAVQXi7YduJTPqV1y6WdccZ5fxhQepCV4l9yBW9qgHI8vycbbQvxkDs5g== +hof@^19.13.13: + version "19.13.13" + resolved "https://registry.yarnpkg.com/hof/-/hof-19.13.13.tgz#6d73d1b5a783e2abf79316664443067df45f9c0c" + integrity sha512-jm7LwDxsymav7xRu7YLjn1IkRwAO7YfiOBcgK/jG7m7YHvV9UK4ohYCNTxYwcDuxiGtK2aPuz8zUq/36XB358g== dependencies: aliasify "^2.1.0" bluebird "^3.7.2" @@ -3797,11 +3797,6 @@ moment@^2.29.1, moment@^2.29.2, moment@^2.9.0: resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.2.tgz#00910c60b20843bcba52d37d58c628b47b1f20e4" integrity sha512-UgzG4rvxYpN15jgCmVJwac49h9ly9NurikMWGPdVxm8GZD6XjkKPxDTjQQ43gtGgnV3X0cAyWDdP2Wexoquifg== -moment@^2.29.2: - version "2.29.2" - resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.2.tgz#00910c60b20843bcba52d37d58c628b47b1f20e4" - integrity sha512-UgzG4rvxYpN15jgCmVJwac49h9ly9NurikMWGPdVxm8GZD6XjkKPxDTjQQ43gtGgnV3X0cAyWDdP2Wexoquifg== - morgan@^1.10.0: version "1.10.0" resolved "https://registry.yarnpkg.com/morgan/-/morgan-1.10.0.tgz#091778abc1fc47cd3509824653dae1faab6b17d7" From e0bd838c0418ad9aed87cca9b35a2d3ce0c27796 Mon Sep 17 00:00:00 2001 From: Hugo Jeffreys Date: Thu, 14 Apr 2022 11:13:36 +0100 Subject: [PATCH 05/14] Updating hof to 19.13.14 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 28d03716..c9ed25f6 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "author": "HomeOffice", "dependencies": { "express": "^4.17.1", - "hof": "^19.13.13", + "hof": "^19.13.14", "hogan.js": "^3.0.2", "hot-shots": "^5.9.0", "i18n-future": "^2.0.1", diff --git a/yarn.lock b/yarn.lock index 9fc32a8d..d04e6f4b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2794,10 +2794,10 @@ hmac-drbg@^1.0.1: minimalistic-assert "^1.0.0" minimalistic-crypto-utils "^1.0.1" -hof@^19.13.13: - version "19.13.13" - resolved "https://registry.yarnpkg.com/hof/-/hof-19.13.13.tgz#6d73d1b5a783e2abf79316664443067df45f9c0c" - integrity sha512-jm7LwDxsymav7xRu7YLjn1IkRwAO7YfiOBcgK/jG7m7YHvV9UK4ohYCNTxYwcDuxiGtK2aPuz8zUq/36XB358g== +hof@^19.13.14: + version "19.13.14" + resolved "https://registry.yarnpkg.com/hof/-/hof-19.13.14.tgz#bbc60ee67de156ddd22cf8f263e9a6904ad30fd7" + integrity sha512-I34pII3L1zaUVxCAW2yBxYVnEPXctK27vSjnJRMwBcvQ1rQ48rbDk835weudraegM++NDVeAxcP/wU1pSbVSeQ== dependencies: aliasify "^2.1.0" bluebird "^3.7.2" From da6a329da7e1d86eb7ae8747e93262e8f35222b1 Mon Sep 17 00:00:00 2001 From: Hugo Jeffreys Date: Thu, 14 Apr 2022 14:07:03 +0100 Subject: [PATCH 06/14] Update hof and snyk file --- .snyk | 20 +------------ package.json | 2 +- yarn.lock | 83 +++++++++++++++++++++++++++++++--------------------- 3 files changed, 52 insertions(+), 53 deletions(-) diff --git a/.snyk b/.snyk index 7fe006a4..04b2ec4d 100644 --- a/.snyk +++ b/.snyk @@ -34,23 +34,5 @@ ignore: - browserify > module-deps > cached-path-relative: reason: No update currently available expires: '2022-02-20T10:38:20.144Z' - SNYK-JS-MINIMIST-2429795: - - hof > minimist: - reaason: Waiting for the package to be updated 1.2.6 in hof - expires: '2022-04-20T10:38:20.144Z' - - hof > mkdirp > minimist: - reaason: Waiting for the package to be updated 1.2.6 in hof - expires: '2022-04-20T10:38:20.144Z' - - hof > browserify > subarg > minimist: - reaason: Waiting for the package to be updated 1.2.6 in hof - expires: '2022-04-20T10:38:20.144Z' - - hof > browserify > deps-sort > subarg: - reaason: Waiting for the package to be updated 1.2.6 in hof - expires: '2022-04-20T10:38:20.144Z' - - hof > browserify > module-deps > subarg: - reaason: Waiting for the package to be updated 1.2.6 in hof - expires: '2022-04-20T10:38:20.144Z' - - hof > browserify > module-deps > detective: - reaason: Waiting for the package to be updated 1.2.6 in hof - expires: '2022-04-20T10:38:20.144Z' + patch: {} diff --git a/package.json b/package.json index c9ed25f6..0f629ce2 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "author": "HomeOffice", "dependencies": { "express": "^4.17.1", - "hof": "^19.13.14", + "hof": "^19.13.15", "hogan.js": "^3.0.2", "hot-shots": "^5.9.0", "i18n-future": "^2.0.1", diff --git a/yarn.lock b/yarn.lock index d04e6f4b..c82ebe23 100644 --- a/yarn.lock +++ b/yarn.lock @@ -208,6 +208,11 @@ "@babel/helper-validator-identifier" "^7.14.8" to-fast-properties "^2.0.0" +"@colors/colors@1.5.0": + version "1.5.0" + resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9" + integrity sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ== + "@cucumber/create-meta@^5.0.0": version "5.0.0" resolved "https://registry.yarnpkg.com/@cucumber/create-meta/-/create-meta-5.0.0.tgz#baea1a40ec823881eeefc29a523d6c87d13f4016" @@ -756,10 +761,10 @@ astral-regex@^2.0.0: resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31" integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ== -async@^3.1.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/async/-/async-3.2.0.tgz#b3a2685c5ebb641d3de02d161002c60fc9f85720" - integrity sha512-TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw== +async@^3.2.3: + version "3.2.3" + resolved "https://registry.yarnpkg.com/async/-/async-3.2.3.tgz#ac53dafd3f4720ee9e8a160628f18ea91df196c9" + integrity sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g== async@~1.0.0: version "1.0.0" @@ -1315,7 +1320,7 @@ colors@1.0.x: resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b" integrity sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs= -colors@^1.1.2, colors@^1.2.1, colors@^1.4.0: +colors@^1.1.2, colors@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78" integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA== @@ -2333,7 +2338,7 @@ fast-levenshtein@^2.0.6: resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= -fast-safe-stringify@^2.0.4, fast-safe-stringify@^2.0.7: +fast-safe-stringify@^2.0.7: version "2.0.8" resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.0.8.tgz#dc2af48c46cf712b683e849b2bbd446b32de936f" integrity sha512-lXatBjf3WPjmWD6DpIZxkeSsCOwqI0maYMpgDlx8g4U2qi4lbjA9oH/HD2a87G+KfsUmo5WbJFmqBZlPxtptag== @@ -2794,10 +2799,10 @@ hmac-drbg@^1.0.1: minimalistic-assert "^1.0.0" minimalistic-crypto-utils "^1.0.1" -hof@^19.13.14: - version "19.13.14" - resolved "https://registry.yarnpkg.com/hof/-/hof-19.13.14.tgz#bbc60ee67de156ddd22cf8f263e9a6904ad30fd7" - integrity sha512-I34pII3L1zaUVxCAW2yBxYVnEPXctK27vSjnJRMwBcvQ1rQ48rbDk835weudraegM++NDVeAxcP/wU1pSbVSeQ== +hof@^19.13.15: + version "19.13.15" + resolved "https://registry.yarnpkg.com/hof/-/hof-19.13.15.tgz#f9162659959c433b507c7bb297852e7e5249bdca" + integrity sha512-xywgUvLsORkEZwFGEpv14vFmesm+XHKg2B8xM3AWwredZ+AJ68dXu1UugzwR14otJts+HDdr0sWJxEudFzBR6Q== dependencies: aliasify "^2.1.0" bluebird "^3.7.2" @@ -2833,7 +2838,7 @@ hof@^19.13.14: lodash "^4.17.21" markdown-it "^12.3.2" minimatch "^3.0.3" - minimist "^1.2.0" + minimist "^1.2.6" mixwith "^0.1.1" mkdirp "^0.5.1" moment "^2.29.2" @@ -2852,7 +2857,7 @@ hof@^19.13.14: uglify-js "^3.14.3" underscore "^1.12.1" urijs "^1.19.11" - winston "^3.3.3" + winston "^3.7.2" hogan-express-strict@^0.5.4: version "0.5.4" @@ -3555,15 +3560,15 @@ log-symbols@4.1.0: chalk "^4.1.0" is-unicode-supported "^0.1.0" -logform@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/logform/-/logform-2.2.0.tgz#40f036d19161fc76b68ab50fdc7fe495544492f2" - integrity sha512-N0qPlqfypFx7UHNn4B3lzS/b0uLqt2hmuoa+PpuXNYgozdJYAyauF5Ky0BWVjrxDlMWiT3qN4zPq3vVAfZy7Yg== +logform@^2.3.2, logform@^2.4.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/logform/-/logform-2.4.0.tgz#131651715a17d50f09c2a2c1a524ff1a4164bcfe" + integrity sha512-CPSJw4ftjf517EhXZGGvTHHkYobo7ZCc0kvwUoOYcjfR2UVrI66RHj8MCrfAdEitdmFqbu2BYdYs8FHHZSb6iw== dependencies: - colors "^1.2.1" - fast-safe-stringify "^2.0.4" + "@colors/colors" "1.5.0" fecha "^4.2.0" ms "^2.1.1" + safe-stable-stringify "^2.3.1" triple-beam "^1.3.0" lolex@^4.2.0: @@ -3704,6 +3709,11 @@ minimist@^1.1.0, minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5: resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== +minimist@^1.2.6: + version "1.2.6" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44" + integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q== + mixwith@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/mixwith/-/mixwith-0.1.1.tgz#c8995918c5b61fbfda9ad377a857cd47750541c0" @@ -4561,7 +4571,7 @@ read-pkg@^3.0.0: normalize-package-data "^2.3.2" path-type "^3.0.0" -readable-stream@^2.0.0, readable-stream@^2.0.2, readable-stream@^2.2.2, readable-stream@^2.3.7, readable-stream@~2.3.6: +readable-stream@^2.0.0, readable-stream@^2.0.2, readable-stream@^2.2.2, readable-stream@~2.3.6: version "2.3.7" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== @@ -4782,6 +4792,11 @@ safe-buffer@5.2.1, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, s resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== +safe-stable-stringify@^2.3.1: + version "2.3.1" + resolved "https://registry.yarnpkg.com/safe-stable-stringify/-/safe-stable-stringify-2.3.1.tgz#ab67cbe1fe7d40603ca641c5e765cb942d04fc73" + integrity sha512-kYBSfT+troD9cDA85VDnHZ1rpHC50O0g1e6WlGHVCz/g+JS+9WKLj+XwFYyR8UbrZN8ll9HUpDAAddY58MGisg== + "safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: version "2.1.2" resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" @@ -5369,7 +5384,7 @@ tough-cookie@~2.5.0: psl "^1.1.28" punycode "^2.1.1" -triple-beam@^1.2.0, triple-beam@^1.3.0: +triple-beam@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/triple-beam/-/triple-beam-1.3.0.tgz#a595214c7298db8339eeeee083e4d10bd8cb8dd9" integrity sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw== @@ -5698,13 +5713,14 @@ wide-align@1.1.3: dependencies: string-width "^1.0.2 || 2" -winston-transport@^4.4.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/winston-transport/-/winston-transport-4.4.0.tgz#17af518daa690d5b2ecccaa7acf7b20ca7925e59" - integrity sha512-Lc7/p3GtqtqPBYYtS6KCN3c77/2QCev51DvcJKbkFPQNoj1sinkGwLGFDxkXY9J6p9+EPnYs+D90uwbnaiURTw== +winston-transport@^4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/winston-transport/-/winston-transport-4.5.0.tgz#6e7b0dd04d393171ed5e4e4905db265f7ab384fa" + integrity sha512-YpZzcUzBedhlTAfJg6vJDlyEai/IFMIVcaEZZyl3UXIl4gmqRpU7AE89AHLkbzLUsv0NVmw7ts+iztqKxxPW1Q== dependencies: - readable-stream "^2.3.7" - triple-beam "^1.2.0" + logform "^2.3.2" + readable-stream "^3.6.0" + triple-beam "^1.3.0" winston@^1.0.1: version "1.1.2" @@ -5719,20 +5735,21 @@ winston@^1.0.1: pkginfo "0.3.x" stack-trace "0.0.x" -winston@^3.3.3: - version "3.3.3" - resolved "https://registry.yarnpkg.com/winston/-/winston-3.3.3.tgz#ae6172042cafb29786afa3d09c8ff833ab7c9170" - integrity sha512-oEXTISQnC8VlSAKf1KYSSd7J6IWuRPQqDdo8eoRNaYKLvwSb5+79Z3Yi1lrl6KDpU6/VWaxpakDAtb1oQ4n9aw== +winston@^3.7.2: + version "3.7.2" + resolved "https://registry.yarnpkg.com/winston/-/winston-3.7.2.tgz#95b4eeddbec902b3db1424932ac634f887c400b1" + integrity sha512-QziIqtojHBoyzUOdQvQiar1DH0Xp9nF1A1y7NVy2DGEsz82SBDtOalS0ulTRGVT14xPX3WRWkCsdcJKqNflKng== dependencies: "@dabh/diagnostics" "^2.0.2" - async "^3.1.0" + async "^3.2.3" is-stream "^2.0.0" - logform "^2.2.0" + logform "^2.4.0" one-time "^1.0.0" readable-stream "^3.4.0" + safe-stable-stringify "^2.3.1" stack-trace "0.0.x" triple-beam "^1.3.0" - winston-transport "^4.4.0" + winston-transport "^4.5.0" word-wrap@^1.2.3: version "1.2.3" From 06a82c8d7cb4e10d065172dcf771f197b3bd5815 Mon Sep 17 00:00:00 2001 From: Hugo Jeffreys Date: Thu, 14 Apr 2022 14:38:04 +0100 Subject: [PATCH 07/14] Add async to snyk file --- .snyk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.snyk b/.snyk index 04b2ec4d..ce3546e5 100644 --- a/.snyk +++ b/.snyk @@ -34,5 +34,8 @@ ignore: - browserify > module-deps > cached-path-relative: reason: No update currently available expires: '2022-02-20T10:38:20.144Z' - + SNYK-JS-ASYNC-2441827: + - '*': + reason: Needs async to be upgraded to 3.2.2 or higher in hof + expires: '2022-04-20T10:38:20.144Z' patch: {} From 2aa141d6326fd51fc39b0a273dcb5dfb9a14b513 Mon Sep 17 00:00:00 2001 From: Hugo Jeffreys Date: Thu, 14 Apr 2022 14:57:01 +0100 Subject: [PATCH 08/14] Removing async from snyk file --- .snyk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.snyk b/.snyk index ce3546e5..21b60271 100644 --- a/.snyk +++ b/.snyk @@ -34,8 +34,4 @@ ignore: - browserify > module-deps > cached-path-relative: reason: No update currently available expires: '2022-02-20T10:38:20.144Z' - SNYK-JS-ASYNC-2441827: - - '*': - reason: Needs async to be upgraded to 3.2.2 or higher in hof - expires: '2022-04-20T10:38:20.144Z' patch: {} From f21e330784075259d110c4624a3ca201b4f5cbf2 Mon Sep 17 00:00:00 2001 From: Hugo Jeffreys Date: Thu, 14 Apr 2022 16:33:10 +0100 Subject: [PATCH 09/14] Update winston to latest version and change logger file --- lib/logger.js | 2 +- package.json | 2 +- yarn.lock | 42 ++---------------------------------------- 3 files changed, 4 insertions(+), 42 deletions(-) diff --git a/lib/logger.js b/lib/logger.js index eb19a722..2515f00b 100644 --- a/lib/logger.js +++ b/lib/logger.js @@ -47,7 +47,7 @@ if (notProd) { delete transports.exceptionHandlers; } -const logger = new (winston.Logger)(transports); +const logger = new winston.createLogger(transports); winston.addColors(colors); diff --git a/package.json b/package.json index 0f629ce2..1c66dfa0 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "nodemailer": "^6.4.16", "typeahead-aria": "^1.0.1", "underscore": "^1.13.1", - "winston": "^1.0.1" + "winston": "^3.7.1" }, "devDependencies": { "@cucumber/cucumber": "^7.3.0", diff --git a/yarn.lock b/yarn.lock index c82ebe23..64d04e7f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -766,11 +766,6 @@ async@^3.2.3: resolved "https://registry.yarnpkg.com/async/-/async-3.2.3.tgz#ac53dafd3f4720ee9e8a160628f18ea91df196c9" integrity sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g== -async@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/async/-/async-1.0.0.tgz#f8fc04ca3a13784ade9e1641af98578cfbd647a9" - integrity sha1-+PwEyjoTeErenhZBr5hXjPvWR6k= - asynckit@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" @@ -1315,11 +1310,6 @@ colorette@^1.2.2: resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94" integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w== -colors@1.0.x: - version "1.0.3" - resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b" - integrity sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs= - colors@^1.1.2, colors@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78" @@ -1545,11 +1535,6 @@ csrf@^3.0.2: tsscmp "1.0.6" uid-safe "2.1.5" -cycle@1.0.x: - version "1.0.3" - resolved "https://registry.yarnpkg.com/cycle/-/cycle-1.0.3.tgz#21e80b2be8580f98b468f379430662b046c34ad2" - integrity sha1-IegLK+hYD5i0aPN5QwZisEbDStI= - d@1, d@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/d/-/d-1.0.1.tgz#8698095372d58dbee346ffd0c7093f99f8f9eb5a" @@ -2297,11 +2282,6 @@ extsprintf@^1.2.0: resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f" integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8= -eyes@0.1.x: - version "0.1.8" - resolved "https://registry.yarnpkg.com/eyes/-/eyes-0.1.8.tgz#62cf120234c683785d902348a800ef3e0cc20bc0" - integrity sha1-Ys8SAjTGg3hdkCNIqADvPgzCC8A= - falafel@^2.0.0: version "2.2.4" resolved "https://registry.yarnpkg.com/falafel/-/falafel-2.2.4.tgz#b5d86c060c2412a43166243cb1bce44d1abd2819" @@ -3277,7 +3257,7 @@ isexe@^2.0.0: resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= -isstream@0.1.x, isstream@~0.1.2: +isstream@~0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo= @@ -4349,11 +4329,6 @@ pkg-up@^2.0.0: dependencies: find-up "^2.1.0" -pkginfo@0.3.x: - version "0.3.1" - resolved "https://registry.yarnpkg.com/pkginfo/-/pkginfo-0.3.1.tgz#5b29f6a81f70717142e09e765bbeab97b4f81e21" - integrity sha1-Wyn2qB9wcXFC4J52W76rl7T4HiE= - playwright@^1.12.3: version "1.14.1" resolved "https://registry.yarnpkg.com/playwright/-/playwright-1.14.1.tgz#73913d3044a85a58edf13148245279231072532e" @@ -5722,20 +5697,7 @@ winston-transport@^4.5.0: readable-stream "^3.6.0" triple-beam "^1.3.0" -winston@^1.0.1: - version "1.1.2" - resolved "https://registry.yarnpkg.com/winston/-/winston-1.1.2.tgz#68edd769ff79d4f9528cf0e5d80021aade67480c" - integrity sha1-aO3Xaf951PlSjPDl2AAhqt5nSAw= - dependencies: - async "~1.0.0" - colors "1.0.x" - cycle "1.0.x" - eyes "0.1.x" - isstream "0.1.x" - pkginfo "0.3.x" - stack-trace "0.0.x" - -winston@^3.7.2: +winston@^3.7.1, winston@^3.7.2: version "3.7.2" resolved "https://registry.yarnpkg.com/winston/-/winston-3.7.2.tgz#95b4eeddbec902b3db1424932ac634f887c400b1" integrity sha512-QziIqtojHBoyzUOdQvQiar1DH0Xp9nF1A1y7NVy2DGEsz82SBDtOalS0ulTRGVT14xPX3WRWkCsdcJKqNflKng== From 1330fac476034ddd555d268596e554809d341d74 Mon Sep 17 00:00:00 2001 From: Hugo Jeffreys Date: Thu, 14 Apr 2022 16:48:40 +0100 Subject: [PATCH 10/14] Add hof > mkdirp to snyk --- .snyk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.snyk b/.snyk index 21b60271..5b960dfe 100644 --- a/.snyk +++ b/.snyk @@ -34,4 +34,8 @@ ignore: - browserify > module-deps > cached-path-relative: reason: No update currently available expires: '2022-02-20T10:38:20.144Z' + SNYK-JS-MINIMIST-2429795: + - hof > mkdirp > minimist: + reason: mkdirp update currently crashing hof build + expires: '2022-04-22T10:38:20.144Z' patch: {} From 6a788d488d024e5be42ffd3824b45d531b2563b0 Mon Sep 17 00:00:00 2001 From: Hugo Jeffreys Date: Tue, 19 Apr 2022 09:04:12 +0100 Subject: [PATCH 11/14] Add browserify > subarg > minimist to snyk file --- .snyk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.snyk b/.snyk index 5b960dfe..326fdc63 100644 --- a/.snyk +++ b/.snyk @@ -38,4 +38,7 @@ ignore: - hof > mkdirp > minimist: reason: mkdirp update currently crashing hof build expires: '2022-04-22T10:38:20.144Z' + - hof > browserify > subarg > minimist: + reason: No update to browserify currently available + expires: '2022-04-24T16:53:44.487Z' patch: {} From 2f4e93aeac5c9bcacf33c76d7b852fe4c72f496f Mon Sep 17 00:00:00 2001 From: Hugo Jeffreys Date: Tue, 19 Apr 2022 09:50:30 +0100 Subject: [PATCH 12/14] Add browserify > browserify > deps-sort > subarg > minimist to snyk file --- .snyk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.snyk b/.snyk index 326fdc63..b51a00b0 100644 --- a/.snyk +++ b/.snyk @@ -41,4 +41,7 @@ ignore: - hof > browserify > subarg > minimist: reason: No update to browserify currently available expires: '2022-04-24T16:53:44.487Z' + - hof > browserify > deps-sort > subarg > minimist: + reason: No update to browserify currently available + expires: '2022-04-24T16:53:44.487Z' patch: {} From 38d58281799e9d43e0e4fdf6cb85331bed5c53d5 Mon Sep 17 00:00:00 2001 From: Hugo Jeffreys Date: Tue, 19 Apr 2022 10:38:06 +0100 Subject: [PATCH 13/14] Add hof > browserify > module-deps > subarg > minimist to snyk file --- .snyk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.snyk b/.snyk index b51a00b0..90ae73ff 100644 --- a/.snyk +++ b/.snyk @@ -44,4 +44,7 @@ ignore: - hof > browserify > deps-sort > subarg > minimist: reason: No update to browserify currently available expires: '2022-04-24T16:53:44.487Z' + - hof > browserify > module-deps > subarg > minimist: + reason: No update to browserify currently available + expires: '2022-04-24T16:53:44.487Z' patch: {} From f6776443697a5f5b36252f367825b49008c41fd7 Mon Sep 17 00:00:00 2001 From: Hugo Jeffreys Date: Tue, 19 Apr 2022 11:10:02 +0100 Subject: [PATCH 14/14] Add hof > browserify > module-deps > detective > minimist to snyk file --- .snyk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.snyk b/.snyk index 90ae73ff..b6c70e40 100644 --- a/.snyk +++ b/.snyk @@ -47,4 +47,7 @@ ignore: - hof > browserify > module-deps > subarg > minimist: reason: No update to browserify currently available expires: '2022-04-24T16:53:44.487Z' + - hof > browserify > module-deps > detective > minimist: + reason: No update to browserify currently available + expires: '2022-04-24T16:53:44.487Z' patch: {}