govuk_tech_docs 4.0.0 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4dc850d9644bdfb68d0604fb1a6b9710e677d10efcb3ad7107b4ac592924931d
-  data.tar.gz: c6cf243d37b9e353ce4400dc2b9a5b521753ff3a56338fcb406f063205a01b55
+  metadata.gz: b899e5d1bbaa64b7a22b7438f61483a08db695b46a131584c62155d4b657fe71
+  data.tar.gz: 7151e7e22a7b3005d5134ea18b52bc884415922a0b86b383af628550fa9c641f
 SHA512:
-  metadata.gz: 9b270f50021512617508ed2204b67b87a5b329baf833ea6c3446eee3918d889c1553c2854faf0fcf250183c1b75d59125c7f325497215a5fd3ebd4670b0acdc6
-  data.tar.gz: 257a1b7a1d73f43ae716986ae98eea6bb8843eb06100a870691d6c3a0e7c26eecba849aef97d8b93c08a899724e8176384f0470b96c77b58b3c1bd8ff099cd2e
+  metadata.gz: 06ec23191e7de7bbf5587cd5aeaa2236b30735829a0dbf12cb9e784ab8397164d5e220d0e32e51f4c57dfe61f95214b2f0cd393c5cd18f53edb274236a7d9e01
+  data.tar.gz: 28c2edc113a32a82fa5aade7b7190c38ced2ea8610adb7d19fc9f72e0ef185b2cedd649a5bdd8a991085dba71309aeece7a5d5336fbf2d6001c9c3a9dd042476

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## Unreleased
 
+## 4.1.0
+
+- [Fix missing manifest.json from govuk-frontend](https://github.com/alphagov/tech-docs-gem/pull/376)
+- [Stable soft for left navigation](https://github.com/alphagov/tech-docs-gem/pull/374)
+
 ## 4.0.0
 
 ### Breaking

data/govuk_tech_docs.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   files_in_git = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
 
   # Include assets from GOV.UK Frontend library in the distributed gem
-  govuk_frontend_assets = Dir["node_modules/govuk-frontend/**/*.{scss,js,mjs,woff,woff2,png,svg,ico}"]
+  govuk_frontend_assets = Dir["node_modules/govuk-frontend/**/*.{scss,js,mjs,woff,woff2,png,svg,ico}", "node_modules/govuk-frontend/dist/govuk/assets/manifest.json"]
 
   spec.files         = files_in_git + govuk_frontend_assets
 

data/lib/govuk_tech_docs/table_of_contents/helpers.rb

@@ -18,12 +18,27 @@ module GovukTechDocs
         output
       end
 
+      # Items with a weight appear first, in weight order
+      #   if items have equal weight, they stay in the order they appeared (stable sort)
+      # Items without a weight appear after, sorted stably in the order that they are
+      # present in the resource list
+      def sort_resources_stably(resources)
+        resources
+          .each.with_index
+          .sort_by { |r, index| [r.data.weight ? 0 : 1, r.data.weight || 0, index] }
+          .map(&:first)
+          .to_a
+      end
+
+      def select_top_level_html_files(resources)
+        resources
+          .select { |r| r.path.end_with?(".html") && (r.parent.nil? || r.parent.url == "/") }
+      end
+
       def multi_page_table_of_contents(resources, current_page, config, current_page_html = nil)
-        # Only parse top level html files
-        # Sorted by weight frontmatter
-        resources = resources
-        .select { |r| r.path.end_with?(".html") && (r.parent.nil? || r.parent.url == "/") }
-        .sort_by { |r| [r.data.weight ? 0 : 1, r.data.weight || 0] }
+        resources = sort_resources_stably(
+          select_top_level_html_files(resources),
+        )
 
         render_page_tree(resources, current_page, config, current_page_html)
       end
@@ -40,9 +55,7 @@ module GovukTechDocs
       end
 
       def render_page_tree(resources, current_page, config, current_page_html)
-        # Sort by weight frontmatter
-        resources = resources
-        .sort_by { |r| [r.data.weight ? 0 : 1, r.data.weight || 0] }
+        resources = sort_resources_stably(resources)
 
         output = "<ul>\n"
         resources.each do |resource|

data/lib/govuk_tech_docs/version.rb

@@ -1,3 +1,3 @@
 module GovukTechDocs
-  VERSION = "4.0.0".freeze
+  VERSION = "4.1.0".freeze
 end

data/node_modules/govuk-frontend/dist/govuk/assets/manifest.json

@@ -0,0 +1,39 @@
+{
+  "icons": [
+    {
+      "src": "images/favicon.ico",
+      "type": "image/x-icon",
+      "sizes": "48x48"
+    },
+    {
+      "src": "images/favicon.svg",
+      "type": "image/svg+xml",
+      "sizes": "150x150",
+      "purpose": "any"
+    },
+    {
+      "src": "images/govuk-icon-180.png",
+      "type": "image/png",
+      "sizes": "180x180",
+      "purpose": "maskable"
+    },
+    {
+      "src": "images/govuk-icon-192.png",
+      "type": "image/png",
+      "sizes": "192x192",
+      "purpose": "maskable"
+    },
+    {
+      "src": "images/govuk-icon-512.png",
+      "type": "image/png",
+      "sizes": "512x512",
+      "purpose": "maskable"
+    },
+    {
+      "src": "images/govuk-icon-mask.svg",
+      "type": "image/svg+xml",
+      "sizes": "150x150",
+      "purpose": "monochrome"
+    }
+  ]
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govuk_tech_docs
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.1.0
 platform: ruby
 authors:
 - Government Digital Service
@@ -509,6 +509,7 @@ files:
 - node_modules/govuk-frontend/dist/govuk/assets/images/govuk-icon-512.png
 - node_modules/govuk-frontend/dist/govuk/assets/images/govuk-icon-mask.svg
 - node_modules/govuk-frontend/dist/govuk/assets/images/govuk-opengraph-image.png
+- node_modules/govuk-frontend/dist/govuk/assets/manifest.json
 - node_modules/govuk-frontend/dist/govuk/common/closest-attribute-value.mjs
 - node_modules/govuk-frontend/dist/govuk/common/govuk-frontend-version.mjs
 - node_modules/govuk-frontend/dist/govuk/common/index.mjs