Skip to content

Commit 1fa4820

Browse files
authored
Merge pull request #134 from LandRegistry/govuk-frontend-54
GOV.UK Frontend v5.4.0
2 parents c860fc0 + 2d3d011 commit 1fa4820

File tree

8 files changed

+75
-66
lines changed

8 files changed

+75
-66
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# GOV.UK Frontend Flask
22

3-
![govuk-frontend 5.1.0](https://img.shields.io/badge/govuk--frontend%20version-5.1.0-005EA5?logo=gov.uk&style=flat)
3+
![govuk-frontend 5.4.0](https://img.shields.io/badge/govuk--frontend%20version-5.4.0-005EA5?logo=gov.uk&style=flat)
44

55
**GOV.UK Frontend Flask is a [community tool](https://design-system.service.gov.uk/community/resources-and-tools/) of the [GOV.UK Design System](https://design-system.service.gov.uk/). The Design System team is not responsible for it and cannot support you with using it. Contact the [maintainers](#contributors) directly if you need [help](#support) or you want to request a feature.**
66

app/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ def create_app(config_class=Config):
4040
"script-src": [
4141
"'self'",
4242
"'sha256-GUQ5ad8JK5KmEWmROf3LZd9ge94daqNvd8xy9YS1iDw='",
43-
"'sha256-EOlYC7YurunqHZxQoZ/zL5TKc/rPajg45h85KVyb5So='",
43+
"'sha256-xvC5hOpINthj2xzP7qkRGmqR3SpU8ZVw1sEMKbsOS/4='",
4444
],
4545
}
4646

app/templates/base.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<meta name="description" content="{{config['SERVICE_NAME']}}">
1414
<meta name="keywords" content="GOV.UK, govuk, gov, government, uk, frontend, ui, user interface, jinja, python, flask, port, template, templating, macro, component, design system, html, forms, wtf, wtforms, widget, widgets, demo, example">
1515
<meta name="author" content="{{config['DEPARTMENT_NAME']}}">
16-
<link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='govuk-frontend-5.1.0.min.css') }}" />
16+
<link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='govuk-frontend-5.4.0.min.css') }}" />
1717
{% assets "css" %}<link href="{{ ASSET_URL }}" rel="stylesheet">{% endassets %}
1818
{% endblock %}
1919

@@ -161,9 +161,9 @@
161161
{% endblock %}
162162

163163
{% block bodyEnd %}
164-
<script type="module" src="{{ url_for('static', filename='govuk-frontend-5.1.0.min.js') }}"></script>
164+
<script type="module" src="{{ url_for('static', filename='govuk-frontend-5.4.0.min.js') }}"></script>
165165
<script type="module">
166-
import { initAll } from "{{ url_for('static', filename='govuk-frontend-5.1.0.min.js') }}"
166+
import { initAll } from "{{ url_for('static', filename='govuk-frontend-5.4.0.min.js') }}"
167167
initAll()
168168
</script>
169169
{% assets "js" %}<script type="text/javascript" src="{{ ASSET_URL }}"></script>{% endassets %}

app/templates/demos/component.html

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
{%- from 'govuk_frontend_jinja/components/notification-banner/macro.html' import govukNotificationBanner -%}
2424
{%- from 'govuk_frontend_jinja/components/pagination/macro.html' import govukPagination -%}
2525
{%- from 'govuk_frontend_jinja/components/panel/macro.html' import govukPanel -%}
26+
{%- from 'govuk_frontend_jinja/components/password-input/macro.html' import govukPasswordInput -%}
2627
{%- from 'govuk_frontend_jinja/components/phase-banner/macro.html' import govukPhaseBanner -%}
2728
{%- from 'govuk_frontend_jinja/components/radios/macro.html' import govukRadios -%}
2829
{%- from 'govuk_frontend_jinja/components/select/macro.html' import govukSelect -%}
@@ -124,6 +125,8 @@ <h2 id="{{fixture.name | replace(' ', '-')}}" class="govuk-heading-l">{{fixture.
124125
{{ govukPagination(fixture.options)}}
125126
{% elif component == 'panel' %}
126127
{{ govukPanel(fixture.options)}}
128+
{% elif component == 'password-input' %}
129+
{{ govukPasswordInput(fixture.options)}}
127130
{% elif component == 'phase-banner' %}
128131
{{ govukPhaseBanner(fixture.options)}}
129132
{% elif component == 'radios' %}

app/templates/demos/create_account.html

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,9 @@ <h1 class="govuk-heading-xl">Create an account</h1>
6464
'autocomplete': 'tel'
6565
}) }}
6666

67-
{{ form.password(params={
68-
'spellcheck': false
69-
}) }}
67+
{{ form.password }}
7068

71-
{{ form.confirm_password(params={
72-
'spellcheck': false
73-
}) }}
69+
{{ form.confirm_password }}
7470

7571
{{ form.terms_and_conditions }}
7672

build.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ rm -rf app/static/images
44
rm -rf app/static/govuk-frontend*
55

66
# Get new release distribution assets and move to static directory
7-
curl -L https://github.com/alphagov/govuk-frontend/releases/download/v5.1.0/release-v5.1.0.zip > govuk_frontend.zip
7+
curl -L https://github.com/alphagov/govuk-frontend/releases/download/v5.4.0/release-v5.4.0.zip > govuk_frontend.zip
88
unzip -o govuk_frontend.zip -d app/static
99
mv app/static/assets/* app/static
1010

@@ -21,10 +21,10 @@ rm -rf govuk_frontend.zip
2121
rm -rf govuk_components
2222

2323
# Get new release source code and move to a directory
24-
curl -L https://github.com/alphagov/govuk-frontend/archive/refs/tags/v5.1.0.zip > govuk_frontend_source.zip
24+
curl -L https://github.com/alphagov/govuk-frontend/archive/refs/tags/v5.4.0.zip > govuk_frontend_source.zip
2525
unzip -o govuk_frontend_source.zip -d govuk_frontend_source
2626
mkdir govuk_components
27-
mv govuk_frontend_source/govuk-frontend-5.1.0/packages/govuk-frontend/src/govuk/components/** govuk_components
27+
mv govuk_frontend_source/govuk-frontend-5.4.0/packages/govuk-frontend/src/govuk/components/** govuk_components
2828

2929
# Remove all files apart from test fixtures
3030
find govuk_components -type f ! -name '*.yaml' -delete

requirements.txt

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# pip-compile requirements.in
66
#
7-
blinker==1.7.0
7+
blinker==1.8.2
88
# via flask
99
brotli==1.1.0
1010
# via flask-compress
@@ -16,11 +16,11 @@ deepmerge==1.1.1
1616
# via govuk-frontend-wtf
1717
deprecated==1.2.14
1818
# via limits
19-
dnspython==2.5.0
19+
dnspython==2.6.1
2020
# via email-validator
21-
email-validator==2.1.0.post1
21+
email-validator==2.1.1
2222
# via -r requirements.in
23-
flask==3.0.2
23+
flask==3.0.3
2424
# via
2525
# -r requirements.in
2626
# flask-assets
@@ -30,38 +30,38 @@ flask==3.0.2
3030
# govuk-frontend-wtf
3131
flask-assets==2.1.0
3232
# via -r requirements.in
33-
flask-compress==1.14
33+
flask-compress==1.15
3434
# via -r requirements.in
35-
flask-limiter[redis]==3.5.1
35+
flask-limiter[redis]==3.7.0
3636
# via -r requirements.in
3737
flask-talisman==1.1.0
3838
# via -r requirements.in
3939
flask-wtf==1.2.1
4040
# via govuk-frontend-wtf
41-
govuk-frontend-jinja==3.0.0
41+
govuk-frontend-jinja==3.1.0
4242
# via
4343
# -r requirements.in
4444
# govuk-frontend-wtf
45-
govuk-frontend-wtf==3.0.0
45+
govuk-frontend-wtf==3.1.0
4646
# via -r requirements.in
47-
gunicorn==21.2.0
47+
gunicorn==22.0.0
4848
# via -r requirements.in
49-
idna==3.6
49+
idna==3.7
5050
# via email-validator
51-
importlib-resources==6.1.1
51+
importlib-resources==6.4.0
5252
# via limits
53-
itsdangerous==2.1.2
53+
itsdangerous==2.2.0
5454
# via
5555
# flask
5656
# flask-wtf
57-
jinja2==3.1.3
57+
jinja2==3.1.4
5858
# via
5959
# flask
6060
# govuk-frontend-jinja
6161
# govuk-frontend-wtf
6262
jsmin==3.0.1
6363
# via -r requirements.in
64-
limits[redis]==3.7.0
64+
limits[redis]==3.12.0
6565
# via flask-limiter
6666
markdown-it-py==3.0.0
6767
# via rich
@@ -74,29 +74,31 @@ mdurl==0.1.2
7474
# via markdown-it-py
7575
ordered-set==4.1.0
7676
# via flask-limiter
77-
packaging==23.2
77+
packaging==24.0
7878
# via
7979
# gunicorn
8080
# limits
81-
pygments==2.17.2
81+
pygments==2.18.0
8282
# via rich
8383
pyyaml==6.0.1
8484
# via -r requirements.in
85-
redis==5.0.1
85+
redis==5.0.4
8686
# via limits
87-
rich==13.7.0
87+
rich==13.7.1
8888
# via flask-limiter
89-
typing-extensions==4.9.0
89+
typing-extensions==4.12.0
9090
# via
9191
# flask-limiter
9292
# limits
9393
webassets==2.0
9494
# via flask-assets
95-
werkzeug==3.0.1
95+
werkzeug==3.0.3
9696
# via flask
9797
wrapt==1.16.0
9898
# via deprecated
9999
wtforms==3.1.2
100100
# via
101101
# flask-wtf
102102
# govuk-frontend-wtf
103+
zstandard==0.22.0
104+
# via flask-compress

requirements_dev.txt

Lines changed: 40 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,17 @@
44
#
55
# pip-compile requirements_dev.in
66
#
7+
annotated-types==0.7.0
8+
# via pydantic
79
attrs==23.2.0
810
# via flake8-bugbear
911
authlib==1.3.0
1012
# via safety
11-
bandit==1.7.7
13+
bandit==1.7.8
1214
# via -r requirements_dev.in
13-
black==24.2.0
15+
black==24.4.2
1416
# via -r requirements_dev.in
15-
build==1.0.3
17+
build==1.2.1
1618
# via pip-tools
1719
certifi==2024.2.2
1820
# via requests
@@ -27,11 +29,9 @@ click==8.1.7
2729
# pur
2830
# safety
2931
# typer
30-
coverage[toml]==7.4.1
31-
# via
32-
# coverage
33-
# pytest-cov
34-
cryptography==42.0.2
32+
coverage[toml]==7.5.3
33+
# via pytest-cov
34+
cryptography==42.0.7
3535
# via authlib
3636
dparse==0.6.4b0
3737
# via
@@ -41,29 +41,29 @@ flake8==7.0.0
4141
# via
4242
# flake8-bugbear
4343
# pep8-naming
44-
flake8-bugbear==24.2.6
44+
flake8-bugbear==24.4.26
4545
# via -r requirements_dev.in
46-
idna==3.6
46+
idna==3.7
4747
# via requests
4848
iniconfig==2.0.0
4949
# via pytest
5050
isort==5.13.2
5151
# via -r requirements_dev.in
52-
jinja2==3.1.3
52+
jinja2==3.1.4
5353
# via safety
5454
markdown-it-py==3.0.0
5555
# via rich
5656
markupsafe==2.1.5
5757
# via jinja2
58-
marshmallow==3.20.2
58+
marshmallow==3.21.2
5959
# via safety
6060
mccabe==0.7.0
6161
# via flake8
6262
mdurl==0.1.2
6363
# via markdown-it-py
6464
mypy-extensions==1.0.0
6565
# via black
66-
packaging==23.2
66+
packaging==24.0
6767
# via
6868
# black
6969
# build
@@ -76,67 +76,75 @@ pathspec==0.12.1
7676
# via black
7777
pbr==6.0.0
7878
# via stevedore
79-
pep8-naming==0.13.3
79+
pep8-naming==0.14.1
8080
# via -r requirements_dev.in
81-
pip-tools==7.3.0
81+
pip-tools==7.4.1
8282
# via -r requirements_dev.in
83-
platformdirs==4.2.0
83+
platformdirs==4.2.2
8484
# via black
85-
pluggy==1.4.0
85+
pluggy==1.5.0
8686
# via pytest
8787
pur==7.3.1
8888
# via -r requirements_dev.in
8989
pycodestyle==2.11.1
9090
# via flake8
91-
pycparser==2.21
91+
pycparser==2.22
9292
# via cffi
93-
pydantic==1.10.14
93+
pydantic==2.7.2
9494
# via
9595
# safety
9696
# safety-schemas
97+
pydantic-core==2.18.3
98+
# via pydantic
9799
pyflakes==3.2.0
98100
# via flake8
99-
pygments==2.17.2
101+
pygments==2.18.0
100102
# via rich
101-
pyproject-hooks==1.0.0
102-
# via build
103-
pytest==8.0.0
103+
pyproject-hooks==1.1.0
104+
# via
105+
# build
106+
# pip-tools
107+
pytest==8.2.1
104108
# via pytest-cov
105-
pytest-cov==4.1.0
109+
pytest-cov==5.0.0
106110
# via -r requirements_dev.in
107111
pyyaml==6.0.1
108112
# via bandit
109-
requests==2.31.0
113+
requests==2.32.3
110114
# via safety
111-
rich==13.7.0
115+
rich==13.7.1
112116
# via
113117
# bandit
114118
# safety
119+
# typer
115120
ruamel-yaml==0.18.6
116121
# via
117122
# safety
118123
# safety-schemas
119124
ruamel-yaml-clib==0.2.8
120125
# via ruamel-yaml
121-
safety==3.0.1
126+
safety==3.2.0
122127
# via -r requirements_dev.in
123128
safety-schemas==0.0.2
124129
# via safety
125-
stevedore==5.1.0
130+
shellingham==1.5.4
131+
# via typer
132+
stevedore==5.2.0
126133
# via bandit
127-
typer==0.9.0
134+
typer==0.12.3
128135
# via safety
129-
typing-extensions==4.9.0
136+
typing-extensions==4.12.0
130137
# via
131138
# pydantic
139+
# pydantic-core
132140
# safety
133141
# safety-schemas
134142
# typer
135-
urllib3==2.2.0
143+
urllib3==2.2.1
136144
# via
137145
# requests
138146
# safety
139-
wheel==0.42.0
147+
wheel==0.43.0
140148
# via pip-tools
141149

142150
# The following packages are considered to be unsafe in a requirements file:

0 commit comments

Comments
 (0)