Merge pull request #77 from LandRegistry/govuk-frontend-47

GOV.UK Frontend 4.7.0

Author: matthew-shaw

README.md

@@ -1,6 +1,6 @@
 # GOV.UK Frontend Flask
 
-![govuk-frontend 4.6.0](https://img.shields.io/badge/govuk--frontend%20version-4.6.0-005EA5?logo=gov.uk&style=flat)
+![govuk-frontend 4.7.0](https://img.shields.io/badge/govuk--frontend%20version-4.7.0-005EA5?logo=gov.uk&style=flat)
 
 **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.**
 

app/templates/base.html

@@ -13,8 +13,8 @@
   <meta name="description" content="{{config['SERVICE_NAME']}}">
   <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">
   <meta name="author" content="{{config['DEPARTMENT_NAME']}}">
-  <!--[if gt IE 8]><!--><link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='govuk-frontend-4.6.0.min.css') }}" /><!--<![endif]-->
-  <!--[if IE 8]><link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='govuk-frontend-ie8-4.6.0.min.css') }}" /><![endif]-->
+  <!--[if gt IE 8]><!--><link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='govuk-frontend-4.7.0.min.css') }}" /><!--<![endif]-->
+  <!--[if IE 8]><link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='govuk-frontend-ie8-4.7.0.min.css') }}" /><![endif]-->
   {% assets "css" %}<link href="{{ ASSET_URL }}" rel="stylesheet">{% endassets %}
 {% endblock %}
 
@@ -162,7 +162,7 @@
 
 {% block bodyEnd %}
   <!--[if gt IE 8]><!-->
-  <script src="{{ url_for('static', filename='govuk-frontend-4.6.0.min.js') }}"> </script>
+  <script src="{{ url_for('static', filename='govuk-frontend-4.7.0.min.js') }}"> </script>
   <script>window.GOVUKFrontend.initAll()</script>
   <!--<![endif]-->
   {% assets "js" %}<script type="text/javascript" src="{{ ASSET_URL }}"></script>{% endassets %}

app/templates/demos/component.html

@@ -11,6 +11,7 @@
 {%- from 'govuk_frontend_jinja/components/details/macro.html' import govukDetails -%}
 {%- from 'govuk_frontend_jinja/components/error-message/macro.html' import govukErrorMessage -%}
 {%- from 'govuk_frontend_jinja/components/error-summary/macro.html' import govukErrorSummary -%}
+{%- from 'govuk_frontend_jinja/components/exit-this-page/macro.html' import govukExitThisPage -%}
 {%- from 'govuk_frontend_jinja/components/fieldset/macro.html' import govukFieldset -%}
 {%- from 'govuk_frontend_jinja/components/file-upload/macro.html' import govukFileUpload -%}
 {%- from 'govuk_frontend_jinja/components/footer/macro.html' import govukFooter -%}
@@ -98,6 +99,8 @@ <h2 id="{{fixture.name | replace(' ', '-')}}" class="govuk-heading-l">{{fixture.
               {{ govukErrorMessage(fixture.options)}}
             {% elif fixtures.component == 'error-summary' %}
               {{ govukErrorSummary(fixture.options)}}
+            {% elif fixtures.component == 'exit-this-page' %}
+              {{ govukExitThisPage(fixture.options)}}
             {% elif fixtures.component == 'fieldset' %}
               {{ govukFieldset(fixture.options)}}
             {% elif fixtures.component == 'file-upload' %}

build.sh

@@ -4,7 +4,7 @@ rm -rf app/static/images
 rm -rf app/static/govuk-frontend*
 
 # Get new release distribution assets and move to static directory
-curl -L https://github.com/alphagov/govuk-frontend/releases/download/v4.6.0/release-v4.6.0.zip > govuk_frontend.zip
+curl -L https://github.com/alphagov/govuk-frontend/releases/download/v4.7.0/release-v4.7.0.zip > govuk_frontend.zip
 unzip -o govuk_frontend.zip -d app/static
 mv app/static/assets/* app/static
 
@@ -21,10 +21,10 @@ rm -rf govuk_frontend.zip
 rm -rf govuk_components
 
 # Get new release source code and move to a directory
-curl -L https://github.com/alphagov/govuk-frontend/archive/v4.6.0.zip > govuk_frontend_source.zip
+curl -L https://github.com/alphagov/govuk-frontend/archive/v4.7.0.zip > govuk_frontend_source.zip
 unzip -o govuk_frontend_source.zip -d govuk_frontend_source
 mkdir govuk_components
-mv govuk_frontend_source/govuk-frontend-4.6.0/package/govuk/components/** govuk_components
+mv govuk_frontend_source/govuk-frontend-4.7.0/package/govuk/components/** govuk_components
 
 # Remove all files apart from test fixtures json
 find govuk_components -type f ! -name 'fixtures.json' -delete

requirements.in

@@ -2,12 +2,12 @@ cssmin==0.2.0
 email_validator==2.0.0.post2
 flask-assets==2.0
 flask-compress==1.13
-flask-limiter==3.3.0
+flask-limiter==3.3.1
 flask-talisman==1.0.0
-flask==2.3.1
-govuk-frontend-jinja==2.6.0
-govuk-frontend-wtf==2.4.0
+flask==2.3.2
+govuk-frontend-jinja==2.7.0
+govuk-frontend-wtf==2.5.0
 gunicorn==20.1.0
 jsmin==3.0.1
 python-dotenv==1.0.0
-redis==4.5.4
+redis==4.6.0

requirements.txt

@@ -4,25 +4,23 @@
 #
 #    pip-compile requirements.in
 #
-async-timeout==4.0.2
-    # via redis
 blinker==1.6.2
     # via flask
 brotli==1.0.9
     # via flask-compress
-click==8.1.3
+click==8.1.4
     # via flask
 cssmin==0.2.0
     # via -r requirements.in
 deepmerge==1.1.0
     # via govuk-frontend-wtf
-deprecated==1.2.13
+deprecated==1.2.14
     # via limits
 dnspython==2.3.0
     # via email-validator
 email-validator==2.0.0.post2
     # via -r requirements.in
-flask==2.3.1
+flask==2.3.2
     # via
     #   -r requirements.in
     #   flask-assets
@@ -34,23 +32,23 @@ flask-assets==2.0
     # via -r requirements.in
 flask-compress==1.13
     # via -r requirements.in
-flask-limiter==3.3.0
+flask-limiter==3.3.1
     # via -r requirements.in
 flask-talisman==1.0.0
     # via -r requirements.in
 flask-wtf==1.1.1
     # via govuk-frontend-wtf
-govuk-frontend-jinja==2.6.0
+govuk-frontend-jinja==2.7.0
     # via
     #   -r requirements.in
     #   govuk-frontend-wtf
-govuk-frontend-wtf==2.4.0
+govuk-frontend-wtf==2.5.0
     # via -r requirements.in
 gunicorn==20.1.0
     # via -r requirements.in
 idna==3.4
     # via email-validator
-importlib-resources==5.12.0
+importlib-resources==6.0.0
     # via limits
 itsdangerous==2.1.2
     # via
@@ -63,11 +61,11 @@ jinja2==3.1.2
     #   govuk-frontend-wtf
 jsmin==3.0.1
     # via -r requirements.in
-limits==3.4.0
+limits==3.5.0
     # via flask-limiter
-markdown-it-py==2.2.0
+markdown-it-py==3.0.0
     # via rich
-markupsafe==2.1.2
+markupsafe==2.1.3
     # via
     #   jinja2
     #   werkzeug
@@ -82,17 +80,17 @@ pygments==2.15.1
     # via rich
 python-dotenv==1.0.0
     # via -r requirements.in
-redis==4.5.4
+redis==4.6.0
     # via -r requirements.in
-rich==13.3.4
+rich==13.4.2
     # via flask-limiter
-typing-extensions==4.5.0
+typing-extensions==4.7.1
     # via
     #   flask-limiter
     #   limits
 webassets==2.0
     # via flask-assets
-werkzeug==2.3.0
+werkzeug==2.3.6
     # via flask
 wrapt==1.15.0
     # via deprecated

requirements_dev.in

@@ -1,9 +1,9 @@
 bandit==1.7.5
 black==22.12.0
-flake8-bugbear==23.3.23
+flake8-bugbear==23.7.10
 isort==5.12.0
 pep8-naming==0.13.3
-pip-tools==6.13.0
+pip-tools==6.14.0
 pur==7.1.0
-pytest-cov==4.0.0
+pytest-cov==4.1.0
 safety==2.3.5

requirements_dev.txt

@@ -12,37 +12,37 @@ black==22.12.0
     # via -r requirements_dev.in
 build==0.10.0
     # via pip-tools
-certifi==2022.12.7
+certifi==2023.5.7
     # via requests
-charset-normalizer==3.1.0
+charset-normalizer==3.2.0
     # via requests
-click==8.1.3
+click==8.1.4
     # via
     #   black
     #   pip-tools
     #   pur
     #   safety
-coverage[toml]==7.2.3
+coverage[toml]==7.2.7
     # via pytest-cov
-dparse==0.6.2
+dparse==0.6.3
     # via safety
 flake8==6.0.0
     # via
     #   flake8-bugbear
     #   pep8-naming
-flake8-bugbear==23.3.23
+flake8-bugbear==23.7.10
     # via -r requirements_dev.in
 gitdb==4.0.10
     # via gitpython
-gitpython==3.1.31
+gitpython==3.1.32
     # via bandit
 idna==3.4
     # via requests
 iniconfig==2.0.0
     # via pytest
 isort==5.12.0
     # via -r requirements_dev.in
-markdown-it-py==2.2.0
+markdown-it-py==3.0.0
     # via rich
 mccabe==0.7.0
     # via flake8
@@ -62,11 +62,11 @@ pbr==5.11.1
     # via stevedore
 pep8-naming==0.13.3
     # via -r requirements_dev.in
-pip-tools==6.13.0
+pip-tools==6.14.0
     # via -r requirements_dev.in
-platformdirs==3.4.0
+platformdirs==3.8.1
     # via black
-pluggy==1.0.0
+pluggy==1.2.0
     # via pytest
 pur==7.1.0
     # via -r requirements_dev.in
@@ -76,31 +76,31 @@ pyflakes==3.0.1
     # via flake8
 pygments==2.15.1
     # via rich
-pyparsing==3.0.9
+pyparsing==3.1.0
     # via packaging
 pyproject-hooks==1.0.0
     # via build
-pytest==7.3.1
+pytest==7.4.0
     # via pytest-cov
-pytest-cov==4.0.0
+pytest-cov==4.1.0
     # via -r requirements_dev.in
 pyyaml==6.0
     # via bandit
-requests==2.29.0
+requests==2.31.0
     # via safety
-rich==13.3.4
+rich==13.4.2
     # via bandit
-ruamel-yaml==0.17.21
+ruamel-yaml==0.17.32
     # via safety
+ruamel-yaml-clib==0.2.7
+    # via ruamel-yaml
 safety==2.3.5
     # via -r requirements_dev.in
 smmap==5.0.0
     # via gitdb
-stevedore==5.0.0
+stevedore==5.1.0
     # via bandit
-toml==0.10.2
-    # via dparse
-urllib3==1.26.15
+urllib3==2.0.3
     # via requests
 wheel==0.40.0
     # via pip-tools

runtime.txt

@@ -1 +1 @@
-python-3.11.3
+python-3.11.4