Skip to content

Commit e3bec7d

Browse files
authored
feature/NI-165-update-dependencies (#105)
* feature/NI-165-update-dependencies https://eaflood.atlassian.net/browse/NI-165 * Update dependencies * Refactor for use with govuk-frontend 6 * Add feature branch as temporary trigger * Refactor for use with govuk-frontend 6 * Address SonarQube cloud issue * Address SonarQube cloud issue * Revert "Add feature branch as temporary trigger" This reverts commit b4dcfa1.
1 parent 282f826 commit e3bec7d

5 files changed

Lines changed: 89 additions & 54 deletions

File tree

.github/workflows/ci.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,3 +45,7 @@ jobs:
4545
-Dsonar.exclusions=**/node_modules/**,**/test/**,**/test-output/**,**/service-down/**
4646
-Dsonar.javascript.lcov.reportPaths=coverage/lcov.info
4747
-Dsonar.javascript.exclusions=**/node_modules/**,**/test/**,**/test-output/**,**/mock/**,**/public/**
48+
-Dsonar.issue.ignore.multicriteria=e1
49+
-Dsonar.issue.ignore.multicriteria.e1.ruleKey=shell:S5332
50+
-Dsonar.issue.ignore.multicriteria.e1.resourceKey=**/docker/scripts/update-localstack-url.sh
51+

package-lock.json

Lines changed: 75 additions & 43 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,20 +27,20 @@
2727
"@hapi/boom": "10.0.1",
2828
"@hapi/catbox-redis": "7.0.2",
2929
"@hapi/cookie": "12.0.1",
30-
"@hapi/hapi": "21.4.4",
30+
"@hapi/hapi": "21.4.6",
3131
"@hapi/inert": "7.1.0",
3232
"@hapi/vision": "7.0.3",
3333
"@hapi/wreck": "18.1.0",
3434
"blipp": "4.0.2",
35-
"govuk-frontend": "5.13.0",
35+
"govuk-frontend": "6.1.0",
3636
"hapi-pino": "13.0.0",
3737
"https-proxy-agent": "7.0.6",
38-
"joi": "18.0.1",
38+
"joi": "18.0.2",
3939
"moment-timezone": "0.6.0",
4040
"nunjucks": "3.2.4",
41-
"pino": "10.1.0",
42-
"pino-pretty": "13.1.2",
43-
"sass": "1.91.0"
41+
"pino": "10.3.1",
42+
"pino-pretty": "13.1.3",
43+
"sass": "1.97.3"
4444
},
4545
"devDependencies": {
4646
"@hapi/code": "9.0.3",

server/views/layout.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,15 @@
3939

4040
{% block header %}
4141

42-
<header class="govuk-header {% if meta.stage == 'tra' %} govuk-header-blue {% endif %}" role="banner" data-module="header">
42+
<header class="govuk-header {% if meta.stage == 'tra' %} govuk-header-blue {% endif %}" role="banner" data-module="header">
4343

4444

4545
<div class="govuk-header__container govuk-width-container">
4646
<div class="govuk-header__logo">
4747
<a href="/" class="govuk-header__link govuk-header__link--homepage">
4848
<div class="ea-logo"></div>
4949
</a>
50-
</div>
51-
<span class="login-section">
50+
<span class="login-section">
5251
{% if auth.isAuthenticated %}
5352
<span>
5453
<b title="{{auth.credentials.profile.email}}">{{auth.credentials.profile.displayName}}</b>
@@ -61,6 +60,7 @@
6160
<a href="/login?redirectTo={{meta.redirectTo}}">Login</a>
6261
{% endif %}
6362
</span>
63+
</div>
6464
</div>
6565
</header>
6666
{% endblock %}

0 commit comments

Comments
 (0)