Merge pull request #13539 from DefectDojo/master-into-dev/2.51.3-2.52.0-dev

Release: Merge back 2.51.3 into dev from: master-into-dev/2.51.3-2.52.0-dev

Author: rossops

.github/renovate.json

@@ -30,7 +30,9 @@
         "/^.github/workflows//"
       ],
       "matchStrings": [
-        "\\w*:\\s[\"']?(?<currentValue>\\S*[^\"']?)[\"']?\\s#\\s*renovate:\\s*datasource=(?<datasource>.*?) depName=(?<depName>.*?)( versioning=(?<versioning>.*?))?\\s"
+        "\\w*:\\s\"(?<currentValue>\\S+)\"\\s#\\s*renovate:\\s*datasource=(?<datasource>.*?) depName=(?<depName>.*?)( versioning=(?<versioning>.*?))?\\s",
+        "\\w*:\\s'(?<currentValue>\\S+)'\\s#\\s*renovate:\\s*datasource=(?<datasource>.*?) depName=(?<depName>.*?)( versioning=(?<versioning>.*?))?\\s",
+        "\\w*:\\s(?<currentValue>\\S+)\\s#\\s*renovate:\\s*datasource=(?<datasource>.*?) depName=(?<depName>.*?)( versioning=(?<versioning>.*?))?\\s"
       ],
       "versioningTemplate": "{{#if versioning}}{{{versioning}}}{{else}}semver{{/if}}"
     }

.github/workflows/gh-pages.yml

@@ -15,7 +15,7 @@ jobs:
       - name: Setup Hugo
         uses: peaceiris/actions-hugo@75d2e84710de30f6ff7268e08f310b60ef14033f # v3.0.0
         with:
-          hugo-version: '0.140.1' # renovate: datasource=github-releases depName=gohugoio/hugo versioning=loose
+          hugo-version: '0.152.1' # renovate: datasource=github-releases depName=gohugoio/hugo
           extended: true
 
       - name: Setup Node

.github/workflows/k8s-tests.yml

@@ -27,7 +27,7 @@ jobs:
       - name: Setup Minikube
         uses: manusa/actions-setup-minikube@b589f2d61bf96695c546929c72b38563e856059d # v2.14.0
         with:
-          minikube version: 'v1.37.0' # renovate: datasource=github-releases depName=kubernetes/minikube versioning=loose
+          minikube version: 'v1.37.0' # renovate: datasource=github-releases depName=kubernetes/minikube
           kubernetes version: ${{ matrix.k8s }}
           driver: docker
           start args: '--addons=ingress --cni calico'

.github/workflows/shellcheck.yml

@@ -4,7 +4,7 @@ on:
   pull_request:
 env:
   SHELLCHECK_REPO: 'koalaman/shellcheck'
-  SHELLCHECK_VERSION: 'v0.9.0' # renovate: datasource=github-releases depName=koalaman/shellcheck versioning=loose
+  SHELLCHECK_VERSION: 'v0.9.0' # renovate: datasource=github-releases depName=koalaman/shellcheck
   SHELLCHECK_SHA: '038fd81de6b7e20cc651571362683853670cdc71' # Renovate config is not currently adjusted to update hash - it needs to be done manually for now
 jobs:
   shellcheck:

.github/workflows/validate_docs_build.yml

@@ -12,7 +12,7 @@ jobs:
       - name: Setup Hugo
         uses: peaceiris/actions-hugo@75d2e84710de30f6ff7268e08f310b60ef14033f # v3.0.0
         with:
-          hugo-version: '0.140.1' # renovate: datasource=github-releases depName=gohugoio/hugo versioning=loose
+          hugo-version: '0.152.1' # renovate: datasource=github-releases depName=gohugoio/hugo
           extended: true
 
       - name: Setup Node

docs/assets/favicon.svg

@@ -1,6 +1,5 @@
 title = "DefectDojo Documentation"
 baseurl = "http://localhost/"
-canonifyURLs = false
 disableAliases = true
 disableHugoGeneratorInject = true
 disableKinds = ["taxonomy", "term"]
@@ -84,3 +83,6 @@ copyRight = "Copyright (c) 2020-2024 Thulite"
   hint = "photo"
   quality = 85
   resampleFilter = "Lanczos"
+
+[pagination]
+  pagerSize = 10

docs/config/_default/hugo.toml

@@ -1,47 +1,52 @@
-# mounts
-## archetypes
-[[mounts]]
-  source = "node_modules/@thulite/doks-core/archetypes"
-  target = "archetypes"
+# Module Configuration File
+#
+# This file configures Hugo module settings, particularly module mounts which
+# define how content is organized within the project.
+#
+# Mounts specify file paths in your project that Hugo should use when building
+# the site. They allow for custom directory structures and integrating content
+# from different locations.
 
+## content
 [[mounts]]
-  source = "archetypes"
-  target = "archetypes"
+  source = "content"
+  target = "content"
 
-## assets
+## data
 [[mounts]]
-  source = "node_modules/@thulite/core/assets"
-  target = "assets"
+  source = "node_modules/@thulite/doks-core/data"
+  target = "data"
 
 [[mounts]]
-  source = "node_modules/@thulite/images/assets"
-  target = "assets"
+  source = "data"
+  target = "data"
 
+## layouts
 [[mounts]]
-  source = "node_modules/@thulite/doks-core/assets"
-  target = "assets"
+  source = "layouts"
+  target = "layouts"
 
 [[mounts]]
-  source = "node_modules/@tabler/icons/icons"
-  target = "assets/svgs/tabler-icons"
+  # Exclude 'home.html' to avoid conflicts with a custom home page layout defined in the local 'layouts' directory.
+  excludeFiles = "home.html"
+  source = "node_modules/@thulite/doks-core/layouts"
+  target = "layouts"
 
 [[mounts]]
-  source = "assets"
-  target = "assets"
+  source = "node_modules/@thulite/core/layouts"
+  target = "layouts"
 
-## content
 [[mounts]]
-  source = "content"
-  target = "content"
+  source = "node_modules/@thulite/seo/layouts"
+  target = "layouts"
 
-## data
 [[mounts]]
-  source = "node_modules/@thulite/doks-core/data"
-  target = "data"
+  source = "node_modules/@thulite/images/layouts"
+  target = "layouts"
 
 [[mounts]]
-  source = "data"
-  target = "data"
+  source = "node_modules/@thulite/inline-svg/layouts"
+  target = "layouts"
 
 ## i18n
 [[mounts]]
@@ -52,30 +57,35 @@
   source = "i18n"
   target = "i18n"
 
-## layouts
+## archetypes
 [[mounts]]
-  source = "node_modules/@thulite/core/layouts"
-  target = "layouts"
+  source = "node_modules/@thulite/doks-core/archetypes"
+  target = "archetypes"
 
 [[mounts]]
-  source = "node_modules/@thulite/seo/layouts"
-  target = "layouts"
+  source = "archetypes"
+  target = "archetypes"
 
+## assets
 [[mounts]]
-  source = "node_modules/@thulite/images/layouts"
-  target = "layouts"
+  source = "node_modules/@thulite/core/assets"
+  target = "assets"
 
 [[mounts]]
-  source = "node_modules/@thulite/doks-core/layouts"
-  target = "layouts"
+  source = "node_modules/@thulite/doks-core/assets"
+  target = "assets"
 
 [[mounts]]
-  source = "node_modules/@thulite/inline-svg/layouts"
-  target = "layouts"
+  source = "node_modules/@tabler/icons/icons"
+  target = "assets/svgs/tabler-icons"
 
 [[mounts]]
-  source = "layouts"
-  target = "layouts"
+  source = "node_modules/@thulite/images/assets"
+  target = "assets"
+
+[[mounts]]
+  source = "assets"
+  target = "assets"
 
 ## static
 [[mounts]]
@@ -84,4 +94,4 @@
 
 [[mounts]]
   source = "static"
-  target = "static"
+  target = "static"

docs/config/_default/module.toml

@@ -1,11 +1,11 @@
 const autoprefixer = require('autoprefixer');
-const purgecss = require('@fullhuman/postcss-purgecss');
+const { purgeCSSPlugin } = require('@fullhuman/postcss-purgecss');
 const whitelister = require('purgecss-whitelister');
 
 module.exports = {
     plugins: [
         autoprefixer(),
-        purgecss({
+        purgeCSSPlugin({
             content: ['./hugo_stats.json'],
             extractors: [
                 {
@@ -18,7 +18,6 @@ module.exports = {
             ],
             dynamicAttributes: [
                 'aria-expanded',
-                'aria-selected',
                 'data-bs-popper',
                 'data-bs-target',
                 'data-bs-theme',
@@ -62,4 +61,4 @@ module.exports = {
             ]
         })
     ]
-};
+};

docs/config/postcss.config.js

@@ -0,0 +1,16 @@
+---
+title: "🪄 AI Features"
+description: ""
+summary: ""
+date: 2023-09-07T16:06:50+02:00
+lastmod: 2023-09-07T16:06:50+02:00
+draft: false
+weight: 2
+chapter: true
+seo:
+  title: "" # custom title (optional)
+  description: "" # custom description (recommended)
+  canonical: "" # custom canonical URL (optional)
+  robots: "" # custom robot tags (optional)
+exclude_search: true
+---