From 9e3b44d0e23be66713f50b16637c47c43e7fd7f6 Mon Sep 17 00:00:00 2001 From: Peter Yates Date: Fri, 17 Nov 2023 09:55:10 +0000 Subject: [PATCH 1/3] Upgrade guide to govuk-frontend 5.0.0-beta.2 Had to adjust a few paths to match the new format --- guide/content/stylesheets/application.scss | 2 +- guide/package-lock.json | 14 +++++++------- guide/package.json | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/guide/content/stylesheets/application.scss b/guide/content/stylesheets/application.scss index 872128f7..4b986770 100644 --- a/guide/content/stylesheets/application.scss +++ b/guide/content/stylesheets/application.scss @@ -6,7 +6,7 @@ $govuk-font-family: system-ui, sans-serif; $govuk-brand-colour: #28a; // Import GOV.UK Frontend -@import "govuk/all"; +@import "dist/govuk/all"; // Application components @import "components/breadcrumb"; diff --git a/guide/package-lock.json b/guide/package-lock.json index a19f1086..57c66c19 100644 --- a/guide/package-lock.json +++ b/guide/package-lock.json @@ -10,7 +10,7 @@ "hasInstallScript": true, "license": "ISC", "dependencies": { - "govuk-frontend": "^4.7.0", + "govuk-frontend": "5.0.0-beta.2", "sass": "^1.57.1" } }, @@ -107,9 +107,9 @@ } }, "node_modules/govuk-frontend": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/govuk-frontend/-/govuk-frontend-4.7.0.tgz", - "integrity": "sha512-0OsdCusF5qvLWwKziU8zqxiC0nq6WP0ZQuw51ymZ/1V0tO71oIKMlSLN2S9bm8RcEGSoidPt2A34gKxePrLjvg==", + "version": "5.0.0-beta.2", + "resolved": "https://registry.npmjs.org/govuk-frontend/-/govuk-frontend-5.0.0-beta.2.tgz", + "integrity": "sha512-ELp6skcgCj5lFt6NqeFE1g+kDSRVc8Jk6W071FOi6vrr/m4dUxhiatYo2YMabIcSsyVRmVSLQTPAT0mxpbEFBg==", "engines": { "node": ">= 4.2.0" } @@ -284,9 +284,9 @@ } }, "govuk-frontend": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/govuk-frontend/-/govuk-frontend-4.7.0.tgz", - "integrity": "sha512-0OsdCusF5qvLWwKziU8zqxiC0nq6WP0ZQuw51ymZ/1V0tO71oIKMlSLN2S9bm8RcEGSoidPt2A34gKxePrLjvg==" + "version": "5.0.0-beta.2", + "resolved": "https://registry.npmjs.org/govuk-frontend/-/govuk-frontend-5.0.0-beta.2.tgz", + "integrity": "sha512-ELp6skcgCj5lFt6NqeFE1g+kDSRVc8Jk6W071FOi6vrr/m4dUxhiatYo2YMabIcSsyVRmVSLQTPAT0mxpbEFBg==" }, "immutable": { "version": "4.2.2", diff --git a/guide/package.json b/guide/package.json index c3c2e71f..896bbbbb 100644 --- a/guide/package.json +++ b/guide/package.json @@ -7,13 +7,13 @@ "lib": "lib" }, "scripts": { - "postinstall": "cp -R node_modules/govuk-frontend/govuk/assets/images content/assets && cp node_modules/govuk-frontend/govuk/all.js content/javascripts/govuk-frontend.js", + "postinstall": "cp -R node_modules/govuk-frontend/dist/govuk/assets/images content/assets && cp node_modules/govuk-frontend/dist/govuk/all.bundle.js content/javascripts/govuk-frontend.js", "test": "echo \"Error: no test specified\" && exit 1" }, "author": "", "license": "ISC", "dependencies": { - "govuk-frontend": "^4.7.0", + "govuk-frontend": "5.0.0-beta.2", "sass": "^1.57.1" } } From dd1a79e62288361d82874b151c7debe3c87e5a15 Mon Sep 17 00:00:00 2001 From: Peter Yates Date: Tue, 28 Nov 2023 15:16:25 +0000 Subject: [PATCH 2/3] Release version 5.0.0b1 --- lib/govuk_design_system_formbuilder/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/govuk_design_system_formbuilder/version.rb b/lib/govuk_design_system_formbuilder/version.rb index 7a459157..7a6d7bc8 100644 --- a/lib/govuk_design_system_formbuilder/version.rb +++ b/lib/govuk_design_system_formbuilder/version.rb @@ -1,3 +1,3 @@ module GOVUKDesignSystemFormBuilder - VERSION = '4.1.1'.freeze + VERSION = '5.0.0b1'.freeze end From 0ee62f4b1217ed9f0f6a95cf68296b3b8b5cdf86 Mon Sep 17 00:00:00 2001 From: Peter Yates Date: Fri, 8 Dec 2023 16:41:16 +0000 Subject: [PATCH 3/3] Upgrade to released version of govuk-frontend 5.0.0 --- README.md | 2 +- guide/content/introduction/supported-versions.slim | 2 +- guide/package-lock.json | 14 +++++++------- guide/package.json | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index e90c4fd3..ae479069 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ [![Gem](https://img.shields.io/gem/dt/govuk_design_system_formbuilder?logo=rubygems)](https://rubygems.org/gems/govuk_design_system_formbuilder) [![Test Coverage](https://api.codeclimate.com/v1/badges/110136fb22341d3ba646/test_coverage)](https://codeclimate.com/github/x-govuk/govuk-form-builder/test_coverage) [![GitHub license](https://img.shields.io/github/license/x-govuk/govuk-form-builder)](https://github.com/x-govuk/govuk-form-builder/blob/main/LICENSE) -[![GOV.UK Design System version](https://img.shields.io/badge/GOV.UK%20Design%20System-4.7.0-brightgreen)](https://design-system.service.gov.uk) +[![GOV.UK Design System version](https://img.shields.io/badge/GOV.UK%20Design%20System-5.0.0-brightgreen)](https://design-system.service.gov.uk) [![Rails](https://img.shields.io/badge/Rails-6.1.7%20%E2%95%B1%207.0.6-E16D6D)](https://weblog.rubyonrails.org/releases/) [![Ruby](https://img.shields.io/badge/Ruby-3.0.6%20%20%E2%95%B1%203.1.4%20%20%E2%95%B1%203.2.2-E16D6D)](https://www.ruby-lang.org/en/downloads/) diff --git a/guide/content/introduction/supported-versions.slim b/guide/content/introduction/supported-versions.slim index ed26a130..178d5876 100644 --- a/guide/content/introduction/supported-versions.slim +++ b/guide/content/introduction/supported-versions.slim @@ -29,7 +29,7 @@ table.govuk-table.app-table--constrained th.govuk-table__header scope="row" | GOV.UK Design System td.govuk-table__cell.govuk-table__cell--numeric - | 4.7.0 + | 5.0.0 td.govuk-table__cell.govuk-table__cell--numeric | 3.14.0 tr.govuk-table__row diff --git a/guide/package-lock.json b/guide/package-lock.json index 57c66c19..7d389aa8 100644 --- a/guide/package-lock.json +++ b/guide/package-lock.json @@ -10,7 +10,7 @@ "hasInstallScript": true, "license": "ISC", "dependencies": { - "govuk-frontend": "5.0.0-beta.2", + "govuk-frontend": "5.0.0", "sass": "^1.57.1" } }, @@ -107,9 +107,9 @@ } }, "node_modules/govuk-frontend": { - "version": "5.0.0-beta.2", - "resolved": "https://registry.npmjs.org/govuk-frontend/-/govuk-frontend-5.0.0-beta.2.tgz", - "integrity": "sha512-ELp6skcgCj5lFt6NqeFE1g+kDSRVc8Jk6W071FOi6vrr/m4dUxhiatYo2YMabIcSsyVRmVSLQTPAT0mxpbEFBg==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/govuk-frontend/-/govuk-frontend-5.0.0.tgz", + "integrity": "sha512-3WSfvQ+3kw/q/m8jrq/t8XnMUA8D2r0uhGyZaDbIh1gWTJBQzJBHbHiKYI9nc9ixIXdCFsc9RozkgEm57a795g==", "engines": { "node": ">= 4.2.0" } @@ -284,9 +284,9 @@ } }, "govuk-frontend": { - "version": "5.0.0-beta.2", - "resolved": "https://registry.npmjs.org/govuk-frontend/-/govuk-frontend-5.0.0-beta.2.tgz", - "integrity": "sha512-ELp6skcgCj5lFt6NqeFE1g+kDSRVc8Jk6W071FOi6vrr/m4dUxhiatYo2YMabIcSsyVRmVSLQTPAT0mxpbEFBg==" + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/govuk-frontend/-/govuk-frontend-5.0.0.tgz", + "integrity": "sha512-3WSfvQ+3kw/q/m8jrq/t8XnMUA8D2r0uhGyZaDbIh1gWTJBQzJBHbHiKYI9nc9ixIXdCFsc9RozkgEm57a795g==" }, "immutable": { "version": "4.2.2", diff --git a/guide/package.json b/guide/package.json index 896bbbbb..1f2af6eb 100644 --- a/guide/package.json +++ b/guide/package.json @@ -13,7 +13,7 @@ "author": "", "license": "ISC", "dependencies": { - "govuk-frontend": "5.0.0-beta.2", + "govuk-frontend": "5.0.0", "sass": "^1.57.1" } }