Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump govuk-frontend from 5.0.0 to 5.1.0 #3525

Merged
merged 6 commits into from
Feb 6, 2024

Conversation

dependabot[bot]
Copy link
Contributor

@dependabot dependabot bot commented on behalf of github Feb 5, 2024

Bumps govuk-frontend from 5.0.0 to 5.1.0.

Release notes

Sourced from govuk-frontend's releases.

GOV.UK Frontend v5.1.0

To install this version with npm, run npm install govuk-frontend@5.1.0. You can also find more information about how to stay up to date in our documentation.

New features

Update to the new GOV.UK logo

The GOV.UK logo has been updated to reflect the changing of the monarch. King Charles III uses the Tudor Crown, rather than the St Edward’s Crown chosen by Queen Elizabeth II.

If your service uses GOV.UK branding, you must update your service between 19 February and 1 March 2024 to use the new logo.

These changes were made in the following pull requests:

Include the new logo assets

Multiple new image assets are included in this release. You’ll need to copy these to your service's image assets folder if they’re not being used directly from the Frontend package. By default this folder is located at /assets/images.

If you’re using Nunjucks, the asset path may have been changed by the assetPath global variable or assetsPath parameter on the header component.

Copy the following files from /dist/assets/images into your assets folder. Any images with the same name as an existing image can be safely overwritten.

  • favicon.ico
  • favicon.svg
  • govuk-icon-180.png
  • govuk-icon-192.png
  • govuk-icon-512.png
  • govuk-icon-mask.svg
  • govuk-opengraph-image.png

Update the logo in the header of your page

If you’re using the govukHeader Nunjucks macro in your service, add the useTudorCrown parameter to the macro instantiation. This will become the default in a future version of GOV.UK Frontend.

{{ govukHeader({
  ...
  useTudorCrown: true
}) }}

If you’re not using the Nunjucks macro, locate the SVG code for the existing logo and replace it with this updated SVG.

<svg
  focusable="false"
  role="img"
  class="govuk-header__logotype"
</tr></table> 

... (truncated)

Changelog

Sourced from govuk-frontend's changelog.

GOV.UK Frontend v5.1.0 (Feature release)

New features

To install this version with npm, run npm install govuk-frontend@5.1.0. You can also find more information about how to stay up to date in our documentation.

Update to the new GOV.UK logo

The GOV.UK logo has been updated to reflect the changing of the monarch. King Charles III uses the Tudor Crown, rather than the St Edward’s Crown chosen by Queen Elizabeth II.

If your service uses GOV.UK branding, you must update your service between 19 February and 1 March 2024 to use the new logo.

These changes were made in the following pull requests:

Include the new logo assets

Multiple new image assets are included in this release. You’ll need to copy these to your service's image assets folder if they’re not being used directly from the Frontend package. By default this folder is located at /assets/images.

If you’re using Nunjucks, the asset path may have been changed by the assetPath global variable or assetsPath parameter on the header component.

Copy the following files from /dist/assets/images into your assets folder. Any images with the same name as an existing image can be safely overwritten.

  • favicon.ico
  • favicon.svg
  • govuk-icon-180.png
  • govuk-icon-192.png
  • govuk-icon-512.png
  • govuk-icon-mask.svg
  • govuk-opengraph-image.png

Update the logo in the header of your page

If you’re using the govukHeader Nunjucks macro in your service, add the useTudorCrown parameter to the macro instantiation. This will become the default in a future version of GOV.UK Frontend.

{{ govukHeader({
  ...
  useTudorCrown: true
}) }}

If you’re not using the Nunjucks macro, locate the SVG code for the existing logo and replace it with this updated SVG.

<svg
  focusable="false"
  role="img"
</tr></table> 

... (truncated)

Commits
  • eb8b345 Merge pull request #4734 from alphagov/release-5.1.0
  • 3ee36fd Release v5.1.0
  • 876a4b8 Merge pull request #4721 from alphagov/querkmachine-patch-1
  • 6fa2b67 Fix broken team docs link
  • 18cc100 Merge pull request #4693 from alphagov/dependabot/npm_and_yarn/test-80503005ef
  • 7bf27e6 Merge pull request #4713 from alphagov/deprecate-14-strings
  • ffbfd86 Update changelog entry
  • 220a4c0 Remove duplicate font declarations for point 14
  • 02f5803 Add new $size-internal-use-only for deprecated font sizes
  • 1ed26b0 Ensure govuk-font-size() handles string keys
  • Additional commits viewable in compare view

Dependabot compatibility score

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.


Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot merge will merge this PR after your CI passes on it
  • @dependabot squash and merge will squash and merge this PR after your CI passes on it
  • @dependabot cancel merge will cancel a previously requested merge and block automerging
  • @dependabot reopen will reopen this PR if it is closed
  • @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
  • @dependabot show <dependency name> ignore conditions will show all of the ignore conditions of the specified dependency
  • @dependabot ignore <dependency name> major version will close this group update PR and stop Dependabot creating any more for the specific dependency's major version (unless you unignore this specific dependency's major version or upgrade to it yourself)
  • @dependabot ignore <dependency name> minor version will close this group update PR and stop Dependabot creating any more for the specific dependency's minor version (unless you unignore this specific dependency's minor version or upgrade to it yourself)
  • @dependabot ignore <dependency name> will close this group update PR and stop Dependabot creating any more for the specific dependency (unless you unignore this specific dependency or upgrade to it yourself)
  • @dependabot unignore <dependency name> will remove all of the ignore conditions of the specified dependency
  • @dependabot unignore <dependency name> <ignore condition> will remove the ignore condition of the specified dependency and ignore conditions

Bumps [govuk-frontend](https://github.com/alphagov/govuk-frontend) from 5.0.0 to 5.1.0.
- [Release notes](https://github.com/alphagov/govuk-frontend/releases)
- [Changelog](https://github.com/alphagov/govuk-frontend/blob/main/CHANGELOG.md)
- [Commits](alphagov/govuk-frontend@v5.0.0...v5.1.0)

---
updated-dependencies:
- dependency-name: govuk-frontend
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot dependabot bot added dependencies Pull requests that update a dependency file javascript Pull requests that update Javascript code labels Feb 5, 2024
@dependabot dependabot bot requested a review from a team February 5, 2024 15:52
Copy link

netlify bot commented Feb 5, 2024

You can preview this change here:

Name Link
🔨 Latest commit 28cce47
🔍 Latest deploy log https://app.netlify.com/sites/govuk-design-system-preview/deploys/65c23114a1bd550008e48a63
😎 Deploy Preview https://deploy-preview-3525--govuk-design-system-preview.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

@querkmachine querkmachine added this to the v5.1 milestone Feb 5, 2024
@colinrotherham colinrotherham force-pushed the dependabot/npm_and_yarn/govuk-frontend-5.1.0 branch from 8d2851f to aa2eaf9 Compare February 5, 2024 20:58
@colinrotherham
Copy link
Contributor

colinrotherham commented Feb 6, 2024

@owenatgov @querkmachine I've added some fixes:

  1. Replace govuk-typography-responsive() with govuk-font-size()
  2. Temporarily use image assets from GOV.UK Frontend v5.0.0 (not v5.1.0)
  3. Fix broken link to non-existent hint or label page for components with subset options

Can drop or revert 2) as necessary, but means we can merge this PR ahead of potential new guidance

@colinrotherham colinrotherham force-pushed the dependabot/npm_and_yarn/govuk-frontend-5.1.0 branch from aa2eaf9 to 1ac63b6 Compare February 6, 2024 08:59
Copy link
Member

@querkmachine querkmachine left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can I be real persnickety and request that 6e4e44e and 1f42bde be rebased into a single commit for ease of reversion when we do get to switch on the new logo?

Otherwise, all looking good to me.

This change prevents the new crown image assets being copied from v5.1.0+ and leaves Metalsmith to copy committed v5.0.0 assets from `src/assets` instead

1. Use `/assets/images` for new crown
2. Use `/assets/v5.0.0/images` for old crown
For example, we should never match Tab item `label` text
Unlike other components, hint or labels have no separate guidance pages

Additionally, since child option slugs are suffixed with their parent we must use the original `id` when checking for hints or labels
@colinrotherham colinrotherham force-pushed the dependabot/npm_and_yarn/govuk-frontend-5.1.0 branch from 1ac63b6 to 28cce47 Compare February 6, 2024 13:16
@colinrotherham
Copy link
Contributor

Thanks @querkmachine, both consolidated into b4c8440 now

Good to merge?

@querkmachine
Copy link
Member

@colinrotherham Go for it!

@colinrotherham colinrotherham merged commit ecc5cb5 into main Feb 6, 2024
13 checks passed
@colinrotherham colinrotherham deleted the dependabot/npm_and_yarn/govuk-frontend-5.1.0 branch February 6, 2024 13:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dependencies Pull requests that update a dependency file javascript Pull requests that update Javascript code
Projects
Development

Successfully merging this pull request may close these issues.

2 participants