From 711fc9c3e00a74f8eb772139d182307567ce27d7 Mon Sep 17 00:00:00 2001 From: David-DfE <45995847+David-Feetenby@users.noreply.github.com> Date: Mon, 2 Dec 2024 15:35:23 +0000 Subject: [PATCH 01/11] Add 301 redirects to routes file (#895) Co-authored-by: dfeetenby --- config/redirects/301_redirects.yml | 139 +++++++++++++++++++++++++++++ config/routes.rb | 6 ++ 2 files changed, 145 insertions(+) create mode 100644 config/redirects/301_redirects.yml diff --git a/config/redirects/301_redirects.yml b/config/redirects/301_redirects.yml new file mode 100644 index 00000000..822059b3 --- /dev/null +++ b/config/redirects/301_redirects.yml @@ -0,0 +1,139 @@ +redirects: + - old: /communication-and-language + new: /areas-of-learning/communication-and-language + + - old: /communication-and-language/interactions + new: /areas-of-learning/communication-and-language/interactions + + - old: /communication-and-language/exploring-language + new: /areas-of-learning/communication-and-language/exploring-language + + - old: /communication-and-language/listening-and-understanding + new: /areas-of-learning/communication-and-language/listening-and-understanding + + - old: /physical-development + new: /areas-of-learning/physical-development + + - old: /physical-development/core-strength-and-co-ordination + new: /areas-of-learning/physical-development/core-strength-and-co-ordination + + - old: /physical-development/gross-motor-skills + new: /areas-of-learning/physical-development/gross-motor-skills + + - old: /physical-development/fine-motor-skills + new: /areas-of-learning/physical-development/fine-motor-skills + + - old: /personal-social-and-emotional-development + new: /areas-of-learning/personal-social-and-emotional-development + + - old: /personal-social-and-emotional-development/emotions + new: /areas-of-learning/personal-social-and-emotional-development/emotions + + - old: /personal-social-and-emotional-development/sense-of-self + new: /areas-of-learning/personal-social-and-emotional-development/sense-of-self + + - old: /personal-social-and-emotional-development/relationships + new: /areas-of-learning/personal-social-and-emotional-development/relationships + + - old: /literacy + new: /areas-of-learning/literacy + + - old: /literacy/reading-comprehension + new: /areas-of-learning/literacy/reading-comprehension + + - old: /literacy/exploring-words + new: /areas-of-learning/literacy/exploring-words + + - old: /literacy/writing + new: /areas-of-learning/literacy/writing + + - old: /mathematics + new: /areas-of-learning/mathematics + + - old: /mathematics/numbers + new: /areas-of-learning/mathematics/numbers + + - old: /mathematics/patterns-and-connections + new: /areas-of-learning/mathematics/patterns-and-connections + + - old: /mathematics/spacial-reasoning + new: /areas-of-learning/mathematics/spacial-reasoning + + - old: /understanding-the-world + new: /areas-of-learning/understanding-the-world + + - old: /understanding-the-world/personal-experiences + new: /areas-of-learning/understanding-the-world/personal-experiences + + - old: /understanding-the-world/diverse-world + new: /areas-of-learning/understanding-the-world/diverse-world + + - old: /understanding-the-world/widening-vocabulary + new: /areas-of-learning/understanding-the-world/widening-vocabulary + + - old: /expressive-arts-and-design + new: /areas-of-learning/expressive-arts-and-design + + - old: /expressive-arts-and-design/imagination-and-creativity + new: /areas-of-learning/expressive-arts-and-design/imagination-and-creativity + + - old: /expressive-arts-and-design/self-expression + new: /areas-of-learning/expressive-arts-and-design/self-expression + + - old: /expressive-arts-and-design/communicating-through-arts + new: /areas-of-learning/expressive-arts-and-design/communicating-through-arts + + - old: /get-help-to-improve-your-practice + new: /support-for-practitioners + + - old: /get-help-to-improve-your-practice/curriculum-planning + new: /support-for-practitioners/curriculum-planning + + - old: /get-help-to-improve-your-practice/reducing-paperwork + new: /support-for-practitioners/reducing-paperwork + + - old: /get-help-to-improve-your-practice/working-in-partnership-with-parents-and-carers + new: /support-for-practitioners/working-in-partnership-with-parents-and-carers + + - old: /get-help-to-improve-your-practice/english-as-an-additional-language-eal + new: /support-for-practitioners/english-as-an-additional-language-eal + + - old: /get-help-to-improve-your-practice/meeting-the-needs-of-all-children + new: /support-for-practitioners/meeting-the-needs-of-all-children + + - old: /get-help-to-improve-your-practice/sensory-food-education + new: /support-for-practitioners/sensory-food-education + + - old: /get-help-to-improve-your-practice/integrated-reviews + new: /support-for-practitioners/integrated-reviews + + - old: /get-help-to-improve-your-practice/early-years-practitioner-wellbeing-support + new: /support-for-practitioners/early-years-practitioner-wellbeing-support + + - old: /get-help-to-improve-your-practice/training-qualifications-support-and-guidance + new: /support-for-practitioners/training-qualifications-support-and-guidance + + - old: /get-help-to-improve-your-practice/changes-to-the-early-years-foundation-stage-eyfs-framework-january-2024 + new: /support-for-practitioners/changes-to-the-eyfs-framework-january-2024 + + - old: /safeguarding-and-welfare + new: /health-and-wellbeing + + - old: /safeguarding-and-welfare/oral-health + new: /health-and-wellbeing/oral-health + + - old: /safeguarding-and-welfare/food-safety + new: /health-and-wellbeing/food-safety + + - old: /safeguarding-and-welfare/internet-safety + new: /health-and-wellbeing/internet-safety + + - old: /safeguarding-and-welfare/mental-health-for-early-years-children + new: /health-and-wellbeing/mental-health-for-early-years-children + + - old: /accessibility-statement + new: /accessibility + + - old: /settings/cookie-policy + new: /cookie-policy + diff --git a/config/routes.rb b/config/routes.rb index c3ab9f98..44fc2a0e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -9,6 +9,12 @@ # explicit redirect for old link get 'get-help-to-improve-your-practice/send-meeting-the-needs-of-all-children', to: redirect('/get-help-to-improve-your-practice/meeting-the-needs-of-all-children') + # 301 redirects + redirects = YAML.load_file(Rails.root.join('config/redirects/301_redirects.yml'))['redirects'] + redirects.each do |redirect| + get redirect['old'], to: redirect(redirect['new'], status: 301) + end + constraints proc { Rails.application.preview? || Rails.env.test? } do resources :resources, id: /[^\/]+/, only: %i[show] end From dc6003ce0268c3a0d98eee46d6cdbd8a90b3925f Mon Sep 17 00:00:00 2001 From: Katherine Martin <78093815+martikat@users.noreply.github.com> Date: Wed, 4 Dec 2024 13:27:25 +0000 Subject: [PATCH 02/11] Update image card to include title (#899) --- app/views/markup/_image_card.html.slim | 2 +- config/initializers/markdown.rb | 7 ++++--- spec/helpers/content_helper_spec.rb | 19 +++++++++++++++++++ 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/app/views/markup/_image_card.html.slim b/app/views/markup/_image_card.html.slim index 76686145..a0f5fea5 100644 --- a/app/views/markup/_image_card.html.slim +++ b/app/views/markup/_image_card.html.slim @@ -2,4 +2,4 @@ .about-module-box-panel p.govuk-body-l = text - .about-module-box-panel style="min-height: 150px; background-image: url(#{image})" + .about-module-box-panel title=title style="min-height: 150px; background-image: url(#{image})" diff --git a/config/initializers/markdown.rb b/config/initializers/markdown.rb index f7c24ef6..05527704 100644 --- a/config/initializers/markdown.rb +++ b/config/initializers/markdown.rb @@ -52,6 +52,8 @@ def two_thirds # @example # {image_card} + # This is the title + # # This is the body copy # # //path/to/image @@ -61,9 +63,8 @@ def two_thirds def image_card pattern = build_regexp('image_card') @output = output.gsub(pattern) do - text, image = split_content Regexp.last_match(1) - - image_card_template.render(nil, text: text, image: image) + title, text, image = *Regexp.last_match(1).strip.split("\n") + image_card_template.render(nil, title: title, text: text, image: image) end self end diff --git a/spec/helpers/content_helper_spec.rb b/spec/helpers/content_helper_spec.rb index 4b9a8d88..0c1fd0ec 100644 --- a/spec/helpers/content_helper_spec.rb +++ b/spec/helpers/content_helper_spec.rb @@ -114,6 +114,25 @@ expect(html).to include '2 Pages' end end + + describe 'Image card' do + let(:input) do + <<~MARKUP + {image_card} + This is the image card title + + This is image text + + //This is the image + + {/image_card} + MARKUP + end + + it 'renders a title' do + expect(html).to include 'title="This is the image card title"' + end + end end describe 'Not found error' do From ed8cc08d0e9c46e194ab1d0b985309bf59d67c51 Mon Sep 17 00:00:00 2001 From: Katherine Martin <78093815+martikat@users.noreply.github.com> Date: Thu, 5 Dec 2024 12:57:59 +0000 Subject: [PATCH 03/11] Update image card spec (#901) --- config/initializers/markdown.rb | 2 -- spec/helpers/content_helper_spec.rb | 5 +---- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/config/initializers/markdown.rb b/config/initializers/markdown.rb index 05527704..70cb6873 100644 --- a/config/initializers/markdown.rb +++ b/config/initializers/markdown.rb @@ -53,9 +53,7 @@ def two_thirds # @example # {image_card} # This is the title - # # This is the body copy - # # //path/to/image # {/image_card} # diff --git a/spec/helpers/content_helper_spec.rb b/spec/helpers/content_helper_spec.rb index 0c1fd0ec..7ff332b9 100644 --- a/spec/helpers/content_helper_spec.rb +++ b/spec/helpers/content_helper_spec.rb @@ -120,17 +120,14 @@ <<~MARKUP {image_card} This is the image card title - This is image text - //This is the image - {/image_card} MARKUP end it 'renders a title' do - expect(html).to include 'title="This is the image card title"' + expect(html).to include 'This is the image card title' end end end From 2a256cd9fad1a7f8d98e40abb1e3864ed17bf51f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Dec 2024 13:38:47 +0000 Subject: [PATCH 04/11] Bump stylelint from 16.10.0 to 16.11.0 (#896) Bumps [stylelint](https://github.com/stylelint/stylelint) from 16.10.0 to 16.11.0. - [Release notes](https://github.com/stylelint/stylelint/releases) - [Changelog](https://github.com/stylelint/stylelint/blob/main/CHANGELOG.md) - [Commits](https://github.com/stylelint/stylelint/compare/16.10.0...16.11.0) --- updated-dependencies: - dependency-name: stylelint dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 97 ++++++++++++++++++++++++++++------------------------ 2 files changed, 53 insertions(+), 46 deletions(-) diff --git a/package.json b/package.json index 10a90509..a322745d 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ }, "devDependencies": { "postcss": "8", - "stylelint": "^16.10.0", + "stylelint": "^16.11.0", "stylelint-config-gds": "^2.0.0" }, "stylelint": { diff --git a/yarn.lock b/yarn.lock index 0b839841..21de2b3e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -34,38 +34,38 @@ __metadata: languageName: node linkType: hard -"@csstools/css-parser-algorithms@npm:^3.0.1": - version: 3.0.1 - resolution: "@csstools/css-parser-algorithms@npm:3.0.1" +"@csstools/css-parser-algorithms@npm:^3.0.4": + version: 3.0.4 + resolution: "@csstools/css-parser-algorithms@npm:3.0.4" peerDependencies: - "@csstools/css-tokenizer": ^3.0.1 - checksum: 064c6d519197b5af43bbf5efe8f4cdbd361b006113aa82160d637e925b50c643a52d33d512ca01c63042d952d723a2a10798231a714668356b76668fb11294e3 + "@csstools/css-tokenizer": ^3.0.3 + checksum: d411f07765e14eede17bccc6bd4f90ff303694df09aabfede3fd104b2dfacfd4fe3697cd25ddad14684c850328f3f9420ebfa9f78380892492974db24ae47dbd languageName: node linkType: hard -"@csstools/css-tokenizer@npm:^3.0.1": - version: 3.0.1 - resolution: "@csstools/css-tokenizer@npm:3.0.1" - checksum: c9ed4373e5731b5375ea9791590081019c04e95f08b46b272977e5e7b8c3d560affc62e82263cb8def1df1e57f0673140e7e16a14a5e7be04e6a234be088d1d3 +"@csstools/css-tokenizer@npm:^3.0.3": + version: 3.0.3 + resolution: "@csstools/css-tokenizer@npm:3.0.3" + checksum: c31bf410e1244b942e71798e37c54639d040cb59e0121b21712b40015fced2b0fb1ffe588434c5f8923c9cd0017cfc1c1c8f3921abc94c96edf471aac2eba5e5 languageName: node linkType: hard -"@csstools/media-query-list-parser@npm:^3.0.1": - version: 3.0.1 - resolution: "@csstools/media-query-list-parser@npm:3.0.1" +"@csstools/media-query-list-parser@npm:^4.0.2": + version: 4.0.2 + resolution: "@csstools/media-query-list-parser@npm:4.0.2" peerDependencies: - "@csstools/css-parser-algorithms": ^3.0.1 - "@csstools/css-tokenizer": ^3.0.1 - checksum: fca1935cabf9fb94128da87f72c34aa2cfce8eb0beba4c78d685c7b42aaba3521067710afc6905b7347fc41fe53947536ce15a7ef3387b48763d8f7d71778d5e + "@csstools/css-parser-algorithms": ^3.0.4 + "@csstools/css-tokenizer": ^3.0.3 + checksum: 5d008a70f5d4fd96224066a433f5cdefa76cfd78a74416a20d6d5b2bb1bc8282b140e8373015d807d4dadb91daf3deb73eb13f853ec4e0479d0cb92e80c6f20d languageName: node linkType: hard -"@csstools/selector-specificity@npm:^4.0.0": - version: 4.0.0 - resolution: "@csstools/selector-specificity@npm:4.0.0" +"@csstools/selector-specificity@npm:^5.0.0": + version: 5.0.0 + resolution: "@csstools/selector-specificity@npm:5.0.0" peerDependencies: - postcss-selector-parser: ^6.1.0 - checksum: 6f4d4ecfdcd37f950100de8ffe0b4c1b1cc8c004aab2c2ebaa5c3e2bca2412d15b17d4628435f47a62d2c56db41bcbf985cb9c69e74b89964d48e421e93e75ba + postcss-selector-parser: ^7.0.0 + checksum: 186b444cabcdcdeb553bfe021f80c58bfe9ef38dcc444f2b1f34a5aab9be063ab4e753022b2d5792049c041c28cfbb78e4b707ec398459300e402030d35c07eb languageName: node linkType: hard @@ -746,7 +746,7 @@ __metadata: languageName: node linkType: hard -"css-tree@npm:^3.0.0": +"css-tree@npm:^3.0.1": version: 3.0.1 resolution: "css-tree@npm:3.0.1" dependencies: @@ -975,7 +975,7 @@ __metadata: govuk-frontend: "npm:^5.3.1" postcss: "npm:8" sass: "npm:^1.81.0" - stylelint: "npm:^16.10.0" + stylelint: "npm:^16.11.0" stylelint-config-gds: "npm:^2.0.0" languageName: unknown linkType: soft @@ -1425,6 +1425,13 @@ __metadata: languageName: node linkType: hard +"known-css-properties@npm:^0.35.0": + version: 0.35.0 + resolution: "known-css-properties@npm:0.35.0" + checksum: 04a4a2859d62670bb25b5b28091a1f03f6f0d3298a5ed3e7476397c5287b98c434f6dd9c004a0c67a53b7f21acc93f83c972e98c122f568d4d0bd21fd2b90fb6 + languageName: node + linkType: hard + "lines-and-columns@npm:^1.1.6": version: 1.2.4 resolution: "lines-and-columns@npm:1.2.4" @@ -1751,7 +1758,7 @@ __metadata: languageName: node linkType: hard -"picocolors@npm:^1.1.0": +"picocolors@npm:^1.1.1": version: 1.1.1 resolution: "picocolors@npm:1.1.1" checksum: e2e3e8170ab9d7c7421969adaa7e1b31434f789afb9b3f115f6b96d91945041ac3ceb02e9ec6fe6510ff036bcc0bf91e69a1772edc0b707e12b19c0f2d6bcf58 @@ -1814,13 +1821,13 @@ __metadata: languageName: node linkType: hard -"postcss-selector-parser@npm:^6.1.2": - version: 6.1.2 - resolution: "postcss-selector-parser@npm:6.1.2" +"postcss-selector-parser@npm:^7.0.0": + version: 7.0.0 + resolution: "postcss-selector-parser@npm:7.0.0" dependencies: cssesc: "npm:^3.0.0" util-deprecate: "npm:^1.0.2" - checksum: 523196a6bd8cf660bdf537ad95abd79e546d54180f9afb165a4ab3e651ac705d0f8b8ce6b3164fb9e3279ce482c5f751a69eb2d3a1e8eb0fd5e82294fb3ef13e + checksum: e96e096afcce70bf5c97789f5ea09d7415ae5eb701d82b05b5e8532885d31363b484fcb1ca9488c9a331f30508d9e5bb6c3109eb2eb5067ef3d3919f9928cd9d languageName: node linkType: hard @@ -1842,14 +1849,14 @@ __metadata: languageName: node linkType: hard -"postcss@npm:^8.4.47": - version: 8.4.47 - resolution: "postcss@npm:8.4.47" +"postcss@npm:^8.4.49": + version: 8.4.49 + resolution: "postcss@npm:8.4.49" dependencies: nanoid: "npm:^3.3.7" - picocolors: "npm:^1.1.0" + picocolors: "npm:^1.1.1" source-map-js: "npm:^1.2.1" - checksum: 929f68b5081b7202709456532cee2a145c1843d391508c5a09de2517e8c4791638f71dd63b1898dba6712f8839d7a6da046c72a5e44c162e908f5911f57b5f44 + checksum: f1b3f17aaf36d136f59ec373459f18129908235e65dbdc3aee5eef8eba0756106f52de5ec4682e29a2eab53eb25170e7e871b3e4b52a8f1de3d344a514306be3 languageName: node linkType: hard @@ -2187,20 +2194,20 @@ __metadata: languageName: node linkType: hard -"stylelint@npm:^16.10.0": - version: 16.10.0 - resolution: "stylelint@npm:16.10.0" +"stylelint@npm:^16.11.0": + version: 16.11.0 + resolution: "stylelint@npm:16.11.0" dependencies: - "@csstools/css-parser-algorithms": "npm:^3.0.1" - "@csstools/css-tokenizer": "npm:^3.0.1" - "@csstools/media-query-list-parser": "npm:^3.0.1" - "@csstools/selector-specificity": "npm:^4.0.0" + "@csstools/css-parser-algorithms": "npm:^3.0.4" + "@csstools/css-tokenizer": "npm:^3.0.3" + "@csstools/media-query-list-parser": "npm:^4.0.2" + "@csstools/selector-specificity": "npm:^5.0.0" "@dual-bundle/import-meta-resolve": "npm:^4.1.0" balanced-match: "npm:^2.0.0" colord: "npm:^2.9.3" cosmiconfig: "npm:^9.0.0" css-functions-list: "npm:^3.2.3" - css-tree: "npm:^3.0.0" + css-tree: "npm:^3.0.1" debug: "npm:^4.3.7" fast-glob: "npm:^3.3.2" fastest-levenshtein: "npm:^1.0.16" @@ -2212,16 +2219,16 @@ __metadata: ignore: "npm:^6.0.2" imurmurhash: "npm:^0.1.4" is-plain-object: "npm:^5.0.0" - known-css-properties: "npm:^0.34.0" + known-css-properties: "npm:^0.35.0" mathml-tag-names: "npm:^2.1.3" meow: "npm:^13.2.0" micromatch: "npm:^4.0.8" normalize-path: "npm:^3.0.0" - picocolors: "npm:^1.0.1" - postcss: "npm:^8.4.47" + picocolors: "npm:^1.1.1" + postcss: "npm:^8.4.49" postcss-resolve-nested-selector: "npm:^0.1.6" postcss-safe-parser: "npm:^7.0.1" - postcss-selector-parser: "npm:^6.1.2" + postcss-selector-parser: "npm:^7.0.0" postcss-value-parser: "npm:^4.2.0" resolve-from: "npm:^5.0.0" string-width: "npm:^4.2.3" @@ -2231,7 +2238,7 @@ __metadata: write-file-atomic: "npm:^5.0.1" bin: stylelint: bin/stylelint.mjs - checksum: d07dd156c225d16c740995daacd78090f7fc317602e87bda2fca323a4ae427a8526d724f3089df3b2185df4520f987547668ceea9b30985988ccbc514034aa21 + checksum: 65638247fb4e5eacb032e3a98412a13ad8b343d2d58e22d61b96ada72808b5b7e736c845937b3bcfde04c0bfa2120383b507e530afe876dafe824a93c337258f languageName: node linkType: hard From 682f63f082ff2caf7acbffaf24ed3b4bb195d556 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Dec 2024 14:13:38 +0000 Subject: [PATCH 05/11] Bump rspec-rails from 5.1.0 to 7.1.0 (#887) Bumps [rspec-rails](https://github.com/rspec/rspec-rails) from 5.1.0 to 7.1.0. - [Changelog](https://github.com/rspec/rspec-rails/blob/main/Changelog.md) - [Commits](https://github.com/rspec/rspec-rails/compare/v5.1.0...v7.1.0) --- updated-dependencies: - dependency-name: rspec-rails dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 62 ++++++++++++++++++++++++++-------------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index fcfcc5ca..6327c43c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -183,7 +183,7 @@ GEM warden (~> 1.2.3) devise-security (0.18.0) devise (>= 4.3.0) - diff-lcs (1.5.0) + diff-lcs (1.5.1) docile (1.4.0) domain_name (0.6.20240107) dotenv (2.7.6) @@ -280,8 +280,8 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2022.0105) mini_mime (1.1.5) - mini_portile2 (2.8.7) - minitest (5.25.1) + mini_portile2 (2.8.8) + minitest (5.25.4) msgpack (1.7.2) multi_json (1.15.0) multi_test (0.1.2) @@ -295,16 +295,16 @@ GEM net-smtp (0.5.0) net-protocol nio4r (2.7.4) - nokogiri (1.16.7) + nokogiri (1.17.0) mini_portile2 (~> 2.8.2) racc (~> 1.4) - nokogiri (1.16.7-aarch64-linux) + nokogiri (1.17.0-aarch64-linux) racc (~> 1.4) - nokogiri (1.16.7-arm64-darwin) + nokogiri (1.17.0-arm64-darwin) racc (~> 1.4) - nokogiri (1.16.7-x86_64-darwin) + nokogiri (1.17.0-x86_64-darwin) racc (~> 1.4) - nokogiri (1.16.7-x86_64-linux) + nokogiri (1.17.0-x86_64-linux) racc (~> 1.4) orm_adapter (0.5.0) pagy (8.4.5) @@ -354,9 +354,9 @@ GEM activesupport (>= 5.0.0) minitest nokogiri (>= 1.6) - rails-html-sanitizer (1.6.0) + rails-html-sanitizer (1.6.1) loofah (~> 2.21) - nokogiri (~> 1.14) + nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0) railties (7.0.8.5) actionpack (= 7.0.8.5) activesupport (= 7.0.8.5) @@ -377,27 +377,27 @@ GEM rexml (3.3.9) rladr (1.2.0) rouge (4.2.0) - rspec (3.10.0) - rspec-core (~> 3.10.0) - rspec-expectations (~> 3.10.0) - rspec-mocks (~> 3.10.0) - rspec-core (3.10.1) - rspec-support (~> 3.10.0) - rspec-expectations (3.10.2) + rspec (3.13.0) + rspec-core (~> 3.13.0) + rspec-expectations (~> 3.13.0) + rspec-mocks (~> 3.13.0) + rspec-core (3.13.2) + rspec-support (~> 3.13.0) + rspec-expectations (3.13.3) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) - rspec-mocks (3.10.2) + rspec-support (~> 3.13.0) + rspec-mocks (3.13.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) - rspec-rails (5.1.0) - actionpack (>= 5.2) - activesupport (>= 5.2) - railties (>= 5.2) - rspec-core (~> 3.10) - rspec-expectations (~> 3.10) - rspec-mocks (~> 3.10) - rspec-support (~> 3.10) - rspec-support (3.10.3) + rspec-support (~> 3.13.0) + rspec-rails (7.1.0) + actionpack (>= 7.0) + activesupport (>= 7.0) + railties (>= 7.0) + rspec-core (~> 3.13) + rspec-expectations (~> 3.13) + rspec-mocks (~> 3.13) + rspec-support (~> 3.13) + rspec-support (3.13.2) rubocop (1.62.1) json (~> 2.3) language_server-protocol (>= 3.17.0) @@ -475,7 +475,7 @@ GEM sys-uname (1.2.2) ffi (~> 1.1) temple (0.8.2) - thor (1.3.1) + thor (1.3.2) thread_safe (0.3.6) tilt (2.0.10) timeout (0.4.1) @@ -517,7 +517,7 @@ GEM backports (>= 3.18) rainbow yard - zeitwerk (2.6.15) + zeitwerk (2.7.1) PLATFORMS aarch64-linux-musl From d9b874db8942fffa8273e1b85e6ed9bb57cd079e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 Dec 2024 08:29:55 +0000 Subject: [PATCH 06/11] Bump sass from 1.81.0 to 1.83.0 (#904) Bumps [sass](https://github.com/sass/dart-sass) from 1.81.0 to 1.83.0. - [Release notes](https://github.com/sass/dart-sass/releases) - [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md) - [Commits](https://github.com/sass/dart-sass/compare/1.81.0...1.83.0) --- updated-dependencies: - dependency-name: sass dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index a322745d..736da03c 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "dfe-frontend": "^2.0.1", "esbuild": "^0.21.5", "govuk-frontend": "^5.3.1", - "sass": "^1.81.0" + "sass": "^1.83.0" }, "devDependencies": { "postcss": "8", diff --git a/yarn.lock b/yarn.lock index 21de2b3e..eb34eba3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -974,7 +974,7 @@ __metadata: esbuild: "npm:^0.21.5" govuk-frontend: "npm:^5.3.1" postcss: "npm:8" - sass: "npm:^1.81.0" + sass: "npm:^1.83.0" stylelint: "npm:^16.11.0" stylelint-config-gds: "npm:^2.0.0" languageName: unknown @@ -1949,9 +1949,9 @@ __metadata: languageName: node linkType: hard -"sass@npm:^1.81.0": - version: 1.81.0 - resolution: "sass@npm:1.81.0" +"sass@npm:^1.83.0": + version: 1.83.0 + resolution: "sass@npm:1.83.0" dependencies: "@parcel/watcher": "npm:^2.4.1" chokidar: "npm:^4.0.0" @@ -1962,7 +1962,7 @@ __metadata: optional: true bin: sass: sass.js - checksum: 9c59b3c9b4231c18fcb4583cc232dbc4de501ddc11101b7a025e44833e3f3ce6031546dc1cd109ee9f04ebcfb1fe30ff870810af33b8feb9aa9e36dfba9ec1ef + checksum: 4415361229879a9041d77c953da85482e89032aa4321ba13250a9987d39c80fac6c88af3777f2a2d76a4e8b0c8afbd21c1970fdbe84e0b3ec25fb26741f92beb languageName: node linkType: hard From bffdbc0d062de848c92d4a08e1e2e6407144ee6a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 19 Dec 2024 11:34:17 +0000 Subject: [PATCH 07/11] Bump nanoid from 3.3.7 to 3.3.8 in the npm_and_yarn group (#905) Bumps the npm_and_yarn group with 1 update: [nanoid](https://github.com/ai/nanoid). Updates `nanoid` from 3.3.7 to 3.3.8 - [Release notes](https://github.com/ai/nanoid/releases) - [Changelog](https://github.com/ai/nanoid/blob/main/CHANGELOG.md) - [Commits](https://github.com/ai/nanoid/compare/3.3.7...3.3.8) --- updated-dependencies: - dependency-name: nanoid dependency-type: indirect dependency-group: npm_and_yarn ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index eb34eba3..d667aa88 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1628,11 +1628,11 @@ __metadata: linkType: hard "nanoid@npm:^3.3.7": - version: 3.3.7 - resolution: "nanoid@npm:3.3.7" + version: 3.3.8 + resolution: "nanoid@npm:3.3.8" bin: nanoid: bin/nanoid.cjs - checksum: e3fb661aa083454f40500473bb69eedb85dc160e763150b9a2c567c7e9ff560ce028a9f833123b618a6ea742e311138b591910e795614a629029e86e180660f3 + checksum: 4b1bb29f6cfebf3be3bc4ad1f1296fb0a10a3043a79f34fbffe75d1621b4318319211cd420549459018ea3592f0d2f159247a6f874911d6d26eaaadda2478120 languageName: node linkType: hard From b8b0a1d3ecf32d06c6441d6c40f63a78d7dd0712 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 2 Jan 2025 10:45:18 +0000 Subject: [PATCH 08/11] Bump actionpack from 7.0.8.5 to 7.0.8.7 in the bundler group (#907) Bumps the bundler group with 1 update: [actionpack](https://github.com/rails/rails). Updates `actionpack` from 7.0.8.5 to 7.0.8.7 - [Release notes](https://github.com/rails/rails/releases) - [Changelog](https://github.com/rails/rails/blob/v8.0.1/actionpack/CHANGELOG.md) - [Commits](https://github.com/rails/rails/compare/v7.0.8.5...v7.0.8.7) --- updated-dependencies: - dependency-name: actionpack dependency-type: indirect dependency-group: bundler ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 124 +++++++++++++++++++++++++-------------------------- 1 file changed, 62 insertions(+), 62 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 6327c43c..0db91863 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,67 +1,67 @@ GEM remote: https://rubygems.org/ specs: - actioncable (7.0.8.5) - actionpack (= 7.0.8.5) - activesupport (= 7.0.8.5) + actioncable (7.0.8.7) + actionpack (= 7.0.8.7) + activesupport (= 7.0.8.7) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (7.0.8.5) - actionpack (= 7.0.8.5) - activejob (= 7.0.8.5) - activerecord (= 7.0.8.5) - activestorage (= 7.0.8.5) - activesupport (= 7.0.8.5) + actionmailbox (7.0.8.7) + actionpack (= 7.0.8.7) + activejob (= 7.0.8.7) + activerecord (= 7.0.8.7) + activestorage (= 7.0.8.7) + activesupport (= 7.0.8.7) mail (>= 2.7.1) net-imap net-pop net-smtp - actionmailer (7.0.8.5) - actionpack (= 7.0.8.5) - actionview (= 7.0.8.5) - activejob (= 7.0.8.5) - activesupport (= 7.0.8.5) + actionmailer (7.0.8.7) + actionpack (= 7.0.8.7) + actionview (= 7.0.8.7) + activejob (= 7.0.8.7) + activesupport (= 7.0.8.7) mail (~> 2.5, >= 2.5.4) net-imap net-pop net-smtp rails-dom-testing (~> 2.0) - actionpack (7.0.8.5) - actionview (= 7.0.8.5) - activesupport (= 7.0.8.5) + actionpack (7.0.8.7) + actionview (= 7.0.8.7) + activesupport (= 7.0.8.7) rack (~> 2.0, >= 2.2.4) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (7.0.8.5) - actionpack (= 7.0.8.5) - activerecord (= 7.0.8.5) - activestorage (= 7.0.8.5) - activesupport (= 7.0.8.5) + actiontext (7.0.8.7) + actionpack (= 7.0.8.7) + activerecord (= 7.0.8.7) + activestorage (= 7.0.8.7) + activesupport (= 7.0.8.7) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.0.8.5) - activesupport (= 7.0.8.5) + actionview (7.0.8.7) + activesupport (= 7.0.8.7) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (7.0.8.5) - activesupport (= 7.0.8.5) + activejob (7.0.8.7) + activesupport (= 7.0.8.7) globalid (>= 0.3.6) - activemodel (7.0.8.5) - activesupport (= 7.0.8.5) - activerecord (7.0.8.5) - activemodel (= 7.0.8.5) - activesupport (= 7.0.8.5) - activestorage (7.0.8.5) - actionpack (= 7.0.8.5) - activejob (= 7.0.8.5) - activerecord (= 7.0.8.5) - activesupport (= 7.0.8.5) + activemodel (7.0.8.7) + activesupport (= 7.0.8.7) + activerecord (7.0.8.7) + activemodel (= 7.0.8.7) + activesupport (= 7.0.8.7) + activestorage (7.0.8.7) + actionpack (= 7.0.8.7) + activejob (= 7.0.8.7) + activerecord (= 7.0.8.7) + activesupport (= 7.0.8.7) marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (7.0.8.5) + activesupport (7.0.8.7) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -213,7 +213,7 @@ GEM zeitwerk (~> 2.6) dumb_delegator (0.8.1) equalizer (0.0.11) - erubi (1.13.0) + erubi (1.13.1) factory_bot (6.2.0) activesupport (>= 5.0.0) factory_bot_rails (6.2.0) @@ -264,7 +264,7 @@ GEM listen (3.7.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - loofah (2.23.1) + loofah (2.24.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) mail (2.8.1) @@ -295,16 +295,16 @@ GEM net-smtp (0.5.0) net-protocol nio4r (2.7.4) - nokogiri (1.17.0) + nokogiri (1.18.1) mini_portile2 (~> 2.8.2) racc (~> 1.4) - nokogiri (1.17.0-aarch64-linux) + nokogiri (1.18.1-aarch64-linux-musl) racc (~> 1.4) - nokogiri (1.17.0-arm64-darwin) + nokogiri (1.18.1-arm64-darwin) racc (~> 1.4) - nokogiri (1.17.0-x86_64-darwin) + nokogiri (1.18.1-x86_64-darwin) racc (~> 1.4) - nokogiri (1.17.0-x86_64-linux) + nokogiri (1.18.1-x86_64-linux-gnu) racc (~> 1.4) orm_adapter (0.5.0) pagy (8.4.5) @@ -334,32 +334,32 @@ GEM nio4r (~> 2.0) racc (1.8.1) rack (2.2.10) - rack-test (2.1.0) + rack-test (2.2.0) rack (>= 1.3) - rails (7.0.8.5) - actioncable (= 7.0.8.5) - actionmailbox (= 7.0.8.5) - actionmailer (= 7.0.8.5) - actionpack (= 7.0.8.5) - actiontext (= 7.0.8.5) - actionview (= 7.0.8.5) - activejob (= 7.0.8.5) - activemodel (= 7.0.8.5) - activerecord (= 7.0.8.5) - activestorage (= 7.0.8.5) - activesupport (= 7.0.8.5) + rails (7.0.8.7) + actioncable (= 7.0.8.7) + actionmailbox (= 7.0.8.7) + actionmailer (= 7.0.8.7) + actionpack (= 7.0.8.7) + actiontext (= 7.0.8.7) + actionview (= 7.0.8.7) + activejob (= 7.0.8.7) + activemodel (= 7.0.8.7) + activerecord (= 7.0.8.7) + activestorage (= 7.0.8.7) + activesupport (= 7.0.8.7) bundler (>= 1.15.0) - railties (= 7.0.8.5) + railties (= 7.0.8.7) rails-dom-testing (2.2.0) activesupport (>= 5.0.0) minitest nokogiri (>= 1.6) - rails-html-sanitizer (1.6.1) + rails-html-sanitizer (1.6.2) loofah (~> 2.21) nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0) - railties (7.0.8.5) - actionpack (= 7.0.8.5) - activesupport (= 7.0.8.5) + railties (7.0.8.7) + actionpack (= 7.0.8.7) + activesupport (= 7.0.8.7) method_source rake (>= 12.2) thor (~> 1.0) From c4f269d131bb468ac5f84c129843fd4172f681c2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 2 Jan 2025 11:13:42 +0000 Subject: [PATCH 09/11] Bump jsbundling-rails from 1.2.2 to 1.3.1 (#906) Bumps [jsbundling-rails](https://github.com/rails/jsbundling-rails) from 1.2.2 to 1.3.1. - [Release notes](https://github.com/rails/jsbundling-rails/releases) - [Commits](https://github.com/rails/jsbundling-rails/compare/v1.2.2...v1.3.1) --- updated-dependencies: - dependency-name: jsbundling-rails dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 0db91863..02110abd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -255,7 +255,7 @@ GEM i18n (1.14.6) concurrent-ruby (~> 1.0) ice_nine (0.11.2) - jsbundling-rails (1.2.2) + jsbundling-rails (1.3.1) railties (>= 6.0.0) json (2.7.2) language_server-protocol (3.17.0.3) From 898b4115df5ac7a18eed021c790e0794cbc66967 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 2 Jan 2025 11:29:58 +0000 Subject: [PATCH 10/11] Bump canonical-rails from 0.2.15 to 0.2.16 (#894) Bumps [canonical-rails](https://github.com/jumph4x/canonical-rails) from 0.2.15 to 0.2.16. - [Commits](https://github.com/jumph4x/canonical-rails/commits) --- updated-dependencies: - dependency-name: canonical-rails dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 02110abd..78c14dca 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -105,8 +105,8 @@ GEM racc builder (3.3.0) byebug (11.1.3) - canonical-rails (0.2.15) - actionview (>= 4.1, <= 7.2) + canonical-rails (0.2.16) + actionview (>= 4.1, < 7.3) capybara (3.36.0) addressable matrix From 1d9d81b96808fd317628ba73b03abc90f7643f8e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 2 Jan 2025 14:43:51 +0000 Subject: [PATCH 11/11] Bump stylelint from 16.11.0 to 16.12.0 (#911) Bumps [stylelint](https://github.com/stylelint/stylelint) from 16.11.0 to 16.12.0. - [Release notes](https://github.com/stylelint/stylelint/releases) - [Changelog](https://github.com/stylelint/stylelint/blob/main/CHANGELOG.md) - [Commits](https://github.com/stylelint/stylelint/compare/16.11.0...16.12.0) --- updated-dependencies: - dependency-name: stylelint dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index 736da03c..aaa8cc26 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ }, "devDependencies": { "postcss": "8", - "stylelint": "^16.11.0", + "stylelint": "^16.12.0", "stylelint-config-gds": "^2.0.0" }, "stylelint": { diff --git a/yarn.lock b/yarn.lock index d667aa88..79f3312a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -975,7 +975,7 @@ __metadata: govuk-frontend: "npm:^5.3.1" postcss: "npm:8" sass: "npm:^1.83.0" - stylelint: "npm:^16.11.0" + stylelint: "npm:^16.12.0" stylelint-config-gds: "npm:^2.0.0" languageName: unknown linkType: soft @@ -2194,9 +2194,9 @@ __metadata: languageName: node linkType: hard -"stylelint@npm:^16.11.0": - version: 16.11.0 - resolution: "stylelint@npm:16.11.0" +"stylelint@npm:^16.12.0": + version: 16.12.0 + resolution: "stylelint@npm:16.12.0" dependencies: "@csstools/css-parser-algorithms": "npm:^3.0.4" "@csstools/css-tokenizer": "npm:^3.0.3" @@ -2234,11 +2234,11 @@ __metadata: string-width: "npm:^4.2.3" supports-hyperlinks: "npm:^3.1.0" svg-tags: "npm:^1.0.0" - table: "npm:^6.8.2" + table: "npm:^6.9.0" write-file-atomic: "npm:^5.0.1" bin: stylelint: bin/stylelint.mjs - checksum: 65638247fb4e5eacb032e3a98412a13ad8b343d2d58e22d61b96ada72808b5b7e736c845937b3bcfde04c0bfa2120383b507e530afe876dafe824a93c337258f + checksum: d60bc6136f5bdc4e49ec22aee4d82130c4e9c94aa7d249da9dda315a862615e74acaefb24c560529b2102f8c27dde473b148ffcee861f5dab7b0225254765102 languageName: node linkType: hard @@ -2277,16 +2277,16 @@ __metadata: languageName: node linkType: hard -"table@npm:^6.8.2": - version: 6.8.2 - resolution: "table@npm:6.8.2" +"table@npm:^6.9.0": + version: 6.9.0 + resolution: "table@npm:6.9.0" dependencies: ajv: "npm:^8.0.1" lodash.truncate: "npm:^4.4.2" slice-ansi: "npm:^4.0.0" string-width: "npm:^4.2.3" strip-ansi: "npm:^6.0.1" - checksum: f8b348af38ee34e419d8ce7306ba00671ce6f20e861ccff22555f491ba264e8416086063ce278a8d81abfa8d23b736ec2cca7ac4029b5472f63daa4b4688b803 + checksum: 35646185712bb65985fbae5975dda46696325844b78735f95faefae83e86df0a265277819a3e67d189de6e858c509b54e66ca3958ffd51bde56ef1118d455bf4 languageName: node linkType: hard