Merge branch 'main' into enable-design-system-components

# Conflicts:
#	CHANGELOG.md
#	lib/govuk_tech_docs/version.rb
#	package-lock.json

Author: JC-DSIT

.github/dependabot.yml

@@ -0,0 +1,59 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+
+version: 2
+updates:
+  # 1. Update Ruby dependencies (Gemfile/gemspec) in the root
+  - package-ecosystem: "bundler"
+    directory: "/" 
+    schedule:
+      interval: "weekly"
+      day: "monday"
+      time: "06:00"
+    commit-message:
+      prefix: chore
+    # TODO - add labels
+    # labels:
+    #   - "dependencies"
+    #   - "ruby"
+    #   - "automated-pr"
+    open-pull-requests-limit: 5
+
+  # 2. Update GitHub Actions (keeps your CI workflows secure)
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+      day: "monday"
+      time: "06:00"
+    commit-message:
+      prefix: chore
+    groups:
+      github-actions-updates:
+        patterns:
+          - "*"
+  - package-ecosystem: "npm"
+    directory: "/" 
+    schedule:
+      interval: "weekly"
+      day: "monday"
+      time: "06:00"
+    open-pull-requests-limit: 5
+    
+    groups:
+      # Group all "development" dependencies (linters, test runners, etc.)
+      dev-dependencies:
+        dependency-type: "development"
+        update-types:
+          - "patch"
+          - "minor"
+      
+      # Group all "production" dependencies (react, express, etc.) 
+      # but ONLY for minor/patch versions to avoid breaking changes
+      prod-safe-updates:
+        dependency-type: "production"
+        update-types:
+          - "patch"
+          - "minor"

.npmrc

@@ -0,0 +1 @@
+ignore-scripts=true

CHANGELOG.md

@@ -1,7 +1,3 @@
-## 5.3.0
-
-- [Add custom extensions to render GOV.UK Design System nunjucks components](https://github.com/alphagov/tech-docs-gem/pull/443/changes)
-
 ## 5.2.1
 
 - [Add option to not render child resources when creating a table of contents](https://github.com/alphagov/tech-docs-gem/pull/439/changes)

govuk_tech_docs.gemspec

@@ -42,7 +42,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "concurrent-ruby", "1.3.4" # 1.3.5 introduced a change that breaks activesupport, and so middleman
   spec.add_dependency "csv" # TODO: remove once tilt declares this itself.
   spec.add_dependency "haml", "~> 6.0"
-  spec.add_dependency "middleman", "4.5.1" # remove pin once https://github.com/middleman/middleman/issues/2818 is fixed
+  spec.add_dependency "middleman", "~> 4.6.1"
   spec.add_dependency "middleman-autoprefixer", "~> 2.10"
   spec.add_dependency "middleman-compass", "~> 4.0"
   spec.add_dependency "middleman-livereload"

lib/govuk_tech_docs/version.rb

@@ -1,3 +1,3 @@
 module GovukTechDocs
-  VERSION = "5.3.0".freeze
+  VERSION = "5.2.2".freeze
 end

package.json

@@ -12,8 +12,8 @@
     "nunjucks": "~3.2.4"
   },
   "devDependencies": {
-    "jasmine-browser-runner": "^2.5.0",
-    "jasmine-core": "^5.5.0",
+    "jasmine-browser-runner": "^3.0.0",
+    "jasmine-core": "^5.13.0",
     "standard": "^14.3.4"
   },
   "standard": {