diff --git a/.github/dependabot.yml b/.github/dependabot.yml index cf7a39fb..cb7a5096 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -9,3 +9,11 @@ updates: directory: "/" # Location of package manifests schedule: interval: "daily" + + - package-ecosystem: npm + directory: / + open-pull-requests-limit: 10 + + schedule: + interval: weekly + day: "sunday" diff --git a/CHANGELOG.md b/CHANGELOG.md index 80edc428..05ecd114 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,13 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [Unreleased](https://github.com/tim-s-ccs/ccs-govuk-frontend-jinja/compare/1.2.0...main) +## [Unreleased](https://github.com/tim-s-ccs/ccs-govuk-frontend-jinja/compare/1.2.1...main) + +## [1.2.1](https://github.com/tim-s-ccs/ccs-govuk-frontend-jinja/releases/tag/1.2.1) - 15/07/2024 + +### Added + +- [GOV.UK Frontend v5.4.1](https://github.com/alphagov/govuk-frontend/releases/tag/v5.4.1) support ## [1.2.0](https://github.com/tim-s-ccs/ccs-govuk-frontend-jinja/releases/tag/1.2.0) - 25/06/2024 diff --git a/govuk_frontend_jinja/__init__.py b/govuk_frontend_jinja/__init__.py index 4a2bfa87..42cf7cd5 100644 --- a/govuk_frontend_jinja/__init__.py +++ b/govuk_frontend_jinja/__init__.py @@ -1 +1 @@ -__version__ = "1.2.0" \ No newline at end of file +__version__ = "1.2.1" \ No newline at end of file diff --git a/govuk_frontend_jinja/templates/components/back-link/macro.html b/govuk_frontend_jinja/templates/components/back-link/macro.html index f89e4e8e..2fa1ac8e 100644 --- a/govuk_frontend_jinja/templates/components/back-link/macro.html +++ b/govuk_frontend_jinja/templates/components/back-link/macro.html @@ -1,8 +1,8 @@ {% macro govukBackLink(params) %} {% from "govuk_frontend_jinja/macros/attributes.html" import govukAttributes -%} - - {{- params.html | safe if params.html else (params.text if params.text else "Back") -}} + {{- params.html | safe if params.html else (params.text | default("Back")) -}} {% endmacro %} diff --git a/govuk_frontend_jinja/templates/components/breadcrumbs/macro.html b/govuk_frontend_jinja/templates/components/breadcrumbs/macro.html index 1fc37155..5241c0c5 100644 --- a/govuk_frontend_jinja/templates/components/breadcrumbs/macro.html +++ b/govuk_frontend_jinja/templates/components/breadcrumbs/macro.html @@ -12,7 +12,7 @@ {% set classNames = classNames ~ " govuk-breadcrumbs--collapse-on-mobile" %} {% endif -%} -