govuk_publishing_components 67.1.0 → 68.1.0

data/app/views/govuk_publishing_components/components/layout_header/_header_logo.html.erb

@@ -8,18 +8,11 @@
   }
 
   environment_exists = environment.present?
-  deprecated_navigation ||= false
   signout_link ||= false
 %>
 
-<% if environment_exists && deprecated_navigation %>
-  <div class="gem-c-header__environment">
-    <%= render "govuk_publishing_components/components/tag", { text: environment, colour: colour_map[environment.downcase] } %>
-  </div>
-<% end %>
-
 <div class="govuk-header__logo gem-c-header__logo">
-  <a href="<%= logo_link %>" class="govuk-header__link govuk-header__link--homepage">
+  <a href="<%= logo_link %>" class="govuk-header__homepage-link">
     <%= render "govuk_publishing_components/components/govuk_logo/govuk_logo" %>
     <% if product_name %>
       <span class="govuk-header__product-name gem-c-header__product-name">
@@ -27,7 +20,7 @@
       </span>
     <% end %>
   </a>
-  <% if environment_exists && !deprecated_navigation %>
+  <% if environment_exists %>
     <div class="gem-c-header__environment">
       <%= render "govuk_publishing_components/components/tag", { text: environment, colour: colour_map[environment.downcase] } %>
     </div>
@@ -35,9 +28,7 @@
 </div>
 
 <% if signout_link %>
-  <div class="govuk-header__content gem-c-header__content">
-    <nav class="gem-c-header__nav govuk-header__navigation">
-      <a class="govuk-header__link govuk-!-font-weight-bold" href="/auth/gds/sign_out">Sign out</a>
-    </nav>
+  <div class="gem-c-layout-header__signout">
+    <a class="gem-c-layout-header__signout-link govuk-!-font-weight-bold" href="/auth/gds/sign_out">Sign out</a>
   </div>
 <% end %>

data/app/views/layouts/govuk_publishing_components/application.html.erb

@@ -23,7 +23,7 @@
   <% end %>
 <% end %>
 <!DOCTYPE html>
-<html lang="en" class="<%= "govuk-template" unless @preview %> govuk-template--rebranded">
+<html lang="en" class="<%= "govuk-template" unless @preview %>">
   <head>
     <meta charset="utf-8">
     <title>

data/config/initializers/assets.rb

@@ -9,7 +9,7 @@ return unless Rails.application.config.respond_to?(:assets)
 Rails.application.config.assets.precompile += %w[govuk_publishing_components_manifest.js]
 
 Rails.application.config.assets.paths += %W[
-  #{__dir__}/../../node_modules/govuk-frontend/dist/govuk/assets/rebrand/images
+  #{__dir__}/../../node_modules/govuk-frontend/dist/govuk/assets/images
   #{__dir__}/../../node_modules/govuk-frontend/dist/govuk/assets/fonts
   #{__dir__}/../../node_modules/govuk-frontend/dist
   #{__dir__}/../../node_modules/

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "67.1.0".freeze
+  VERSION = "68.1.0".freeze
 end

data/node_modules/axe-core/README.md

@@ -28,6 +28,12 @@ First download the package:
 npm install axe-core --save-dev
 ```
 
+Or, using pnpm:
+
+```console
+pnpm add --save-dev axe-core
+```
+
 Now include the javascript file in each of your iframes in your fixtures or test systems:
 
 ```html
@@ -95,17 +101,13 @@ The [axe-core API](doc/API.md) package consists of:
 
 Axe can be built using your local language. To do so, a localization file must be added to the `./locales` directory. This file must be named in the following manner: `<langcode>.json`. To build axe using this locale, instead of the default, run axe with the `--lang` flag, like so:
 
-`grunt build --lang=nl`
-
-or equivalently:
-
-`npm run build -- --lang=nl`
+`pnpm run build -- --lang=nl`
 
 This will create a new build for axe, called `axe.<lang>.js` and `axe.<lang>.min.js`. If you want to build all localized versions, simply pass in `--all-lang` instead. If you want to build multiple localized versions (but not all of them), you can pass in a comma-separated list of languages to the `--lang` flag, like `--lang=nl,ja`.
 
-To create a new translation for axe, start by running `grunt translate --lang=<langcode>`. This will create a json file in the `./locales` directory, with the default English text in it for you to translate. Alternatively, you could copy `./locales/_template.json`. We welcome any localization for axe-core. For details on how to contribute, see the Contributing section below. For details on the message syntax, see [Check Message Template](/doc/check-message-template.md).
+To create a new translation for axe, start by running `pnpm run translate -- --lang=<langcode>`. This will create a json file in the `./locales` directory, with the default English text in it for you to translate. Alternatively, you could copy `./locales/_template.json`. We welcome any localization for axe-core. For details on how to contribute, see the Contributing section below. For details on the message syntax, see [Check Message Template](/doc/check-message-template.md).
 
-To update an existing translation file, re-run `grunt translate --lang=<langcode>`. This will add new messages used in English and remove messages which were not used in English.
+To update an existing translation file, re-run `pnpm run translate -- --lang=<langcode>`. This will add new messages used in English and remove messages which were not used in English.
 
 Additionally, locale can be applied at runtime by passing a `locale` object to `axe.configure()`. The locale object must be of the same shape as existing locales in the `./locales` directory. For example:
 
@@ -153,6 +155,7 @@ Axe-core supports the following locales. Do note that since locales are contribu
 - Polish
 - Portuguese (Brazilian)
 - Spanish
+- Swedish
 
 ## Updates & Security
 

data/node_modules/axe-core/axe.d.ts

@@ -37,12 +37,7 @@ declare namespace axe {
     | 'sectionhead';
 
   type HtmlContentTypes =
-    | 'flow'
-    | 'sectioning'
-    | 'heading'
-    | 'phrasing'
-    | 'embedded'
-    | 'interactive';
+    'flow' | 'sectioning' | 'heading' | 'phrasing' | 'embedded' | 'interactive';
 
   // Array of length 2 or greater
   type MultiArray<T> = [T, T, ...T[]];
@@ -65,10 +60,7 @@ declare namespace axe {
 
   // Context options
   type Selector =
-    | Node
-    | BaseSelector
-    | LabelledShadowDomSelector
-    | LabelledFramesSelector;
+    Node | BaseSelector | LabelledShadowDomSelector | LabelledFramesSelector;
   type SelectorList = Array<Selector | FramesSelector> | NodeList;
   type ContextProp = Selector | SelectorList;
   type ContextObject =
@@ -85,9 +77,7 @@ declare namespace axe {
   type ElementContext = ContextSpec;
 
   type SerialSelector =
-    | BaseSelector
-    | LabelledShadowDomSelector
-    | LabelledFramesSelector;
+    BaseSelector | LabelledShadowDomSelector | LabelledFramesSelector;
   type SerialFrameSelector = SerialSelector | FramesSelector;
   type SerialSelectorList = Array<SerialFrameSelector>;
 
@@ -310,8 +300,7 @@ declare namespace axe {
           virtualNode: VirtualNode
         ) => boolean | undefined | void);
     after?:
-      | string
-      | ((results: AfterResult[], options: unknown) => AfterResult[]);
+      string | ((results: AfterResult[], options: unknown) => AfterResult[]);
     options?: any;
     matches?: string;
     enabled?: boolean;