Expose logoBase64 and links in badge-maker NPM package (#10283 )

* expose `logoBase64` and `links` in badge-maker NPM package * add test assertion for logoBase64 * pass (public) `logoBase64` as (internal) `logo` * badge-maker 4.0.0 release --------- Co-authored-by: Sergey Kupletsky <s.kupletsky@gmail.com>
Remove logoPosition (#10284 )
2024-06-24 14:53:31 +01:00 · 2024-06-24 13:26:48 +00:00 · 2024-06-23 21:25:29 +00:00 · 2024-06-22 16:37:02 +00:00 · 2024-06-21 19:27:59 +00:00 · 2024-06-21 19:23:54 +00:00
638 changed files with 22630 additions and 16032 deletions
--- a/.github/actions/docusaurus-swizzled-warning/action.yml
+++ b/.github/actions/docusaurus-swizzled-warning/action.yml
@@ -8,5 +8,5 @@ inputs:
    description: 'The GITHUB_TOKEN secret'
    required: true
 runs:
-  using: 'node16'
+  using: 'node20'
  main: 'index.js'
--- a/.github/actions/docusaurus-swizzled-warning/package-lock.json
+++ b/.github/actions/docusaurus-swizzled-warning/package-lock.json
@@ -9,137 +9,165 @@
            "version": "0.0.0",
            "license": "CC0",
            "dependencies": {
-                "@actions/core": "^1.10.0",
-                "@actions/github": "^5.1.1"
+                "@actions/core": "^1.10.1",
+                "@actions/github": "^6.0.0"
            }
        },
        "node_modules/@actions/core": {
-            "version": "1.10.0",
-            "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.10.0.tgz",
-            "integrity": "sha512-2aZDDa3zrrZbP5ZYg159sNoLRb61nQ7awl5pSvIq5Qpj81vwDzdMRKzkWJGJuwVvWpvZKx7vspJALyvaaIQyug==",
+            "version": "1.10.1",
+            "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.10.1.tgz",
+            "integrity": "sha512-3lBR9EDAY+iYIpTnTIXmWcNbX3T2kCkAEQGIQx4NVQ0575nk2k3GRZDTPQG+vVtS2izSLmINlxXf0uLtnrTP+g==",
            "dependencies": {
                "@actions/http-client": "^2.0.1",
                "uuid": "^8.3.2"
            }
        },
        "node_modules/@actions/github": {
-            "version": "5.1.1",
-            "resolved": "https://registry.npmjs.org/@actions/github/-/github-5.1.1.tgz",
-            "integrity": "sha512-Nk59rMDoJaV+mHCOJPXuvB1zIbomlKS0dmSIqPGxd0enAXBnOfn4VWF+CGtRCwXZG9Epa54tZA7VIRlJDS8A6g==",
+            "version": "6.0.0",
+            "resolved": "https://registry.npmjs.org/@actions/github/-/github-6.0.0.tgz",
+            "integrity": "sha512-alScpSVnYmjNEXboZjarjukQEzgCRmjMv6Xj47fsdnqGS73bjJNDpiiXmp8jr0UZLdUB6d9jW63IcmddUP+l0g==",
            "dependencies": {
-                "@actions/http-client": "^2.0.1",
-                "@octokit/core": "^3.6.0",
-                "@octokit/plugin-paginate-rest": "^2.17.0",
-                "@octokit/plugin-rest-endpoint-methods": "^5.13.0"
+                "@actions/http-client": "^2.2.0",
+                "@octokit/core": "^5.0.1",
+                "@octokit/plugin-paginate-rest": "^9.0.0",
+                "@octokit/plugin-rest-endpoint-methods": "^10.0.0"
            }
        },
        "node_modules/@actions/http-client": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-2.1.1.tgz",
-            "integrity": "sha512-qhrkRMB40bbbLo7gF+0vu+X+UawOvQQqNAA/5Unx774RS8poaOhThDOG6BGmxvAnxhQnDp2BG/ZUm65xZILTpw==",
+            "version": "2.2.0",
+            "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-2.2.0.tgz",
+            "integrity": "sha512-q+epW0trjVUUHboliPb4UF9g2msf+w61b32tAkFEwL/IwP0DQWgbCMM0Hbe3e3WXSKz5VcUXbzJQgy8Hkra/Lg==",
            "dependencies": {
-                "tunnel": "^0.0.6"
+                "tunnel": "^0.0.6",
+                "undici": "^5.25.4"
+            }
+        },
+        "node_modules/@fastify/busboy": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/@fastify/busboy/-/busboy-2.0.0.tgz",
+            "integrity": "sha512-JUFJad5lv7jxj926GPgymrWQxxjPYuJNiNjNMzqT+HiuP6Vl3dk5xzG+8sTX96np0ZAluvaMzPsjhHZ5rNuNQQ==",
+            "engines": {
+                "node": ">=14"
            }
        },
        "node_modules/@octokit/auth-token": {
-            "version": "2.5.0",
-            "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.5.0.tgz",
-            "integrity": "sha512-r5FVUJCOLl19AxiuZD2VRZ/ORjp/4IN98Of6YJoJOkY75CIBuYfmiNHGrDwXr+aLGG55igl9QrxX3hbiXlLb+g==",
-            "dependencies": {
-                "@octokit/types": "^6.0.3"
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-4.0.0.tgz",
+            "integrity": "sha512-tY/msAuJo6ARbK6SPIxZrPBms3xPbfwBrulZe0Wtr/DIY9lje2HeV1uoebShn6mx7SjCHif6EjMvoREj+gZ+SA==",
+            "engines": {
+                "node": ">= 18"
            }
        },
        "node_modules/@octokit/core": {
-            "version": "3.6.0",
-            "resolved": "https://registry.npmjs.org/@octokit/core/-/core-3.6.0.tgz",
-            "integrity": "sha512-7RKRKuA4xTjMhY+eG3jthb3hlZCsOwg3rztWh75Xc+ShDWOfDDATWbeZpAHBNRpm4Tv9WgBMOy1zEJYXG6NJ7Q==",
+            "version": "5.0.1",
+            "resolved": "https://registry.npmjs.org/@octokit/core/-/core-5.0.1.tgz",
+            "integrity": "sha512-lyeeeZyESFo+ffI801SaBKmCfsvarO+dgV8/0gD8u1d87clbEdWsP5yC+dSj3zLhb2eIf5SJrn6vDz9AheETHw==",
            "dependencies": {
-                "@octokit/auth-token": "^2.4.4",
-                "@octokit/graphql": "^4.5.8",
-                "@octokit/request": "^5.6.3",
-                "@octokit/request-error": "^2.0.5",
-                "@octokit/types": "^6.0.3",
+                "@octokit/auth-token": "^4.0.0",
+                "@octokit/graphql": "^7.0.0",
+                "@octokit/request": "^8.0.2",
+                "@octokit/request-error": "^5.0.0",
+                "@octokit/types": "^12.0.0",
                "before-after-hook": "^2.2.0",
                "universal-user-agent": "^6.0.0"
+            },
+            "engines": {
+                "node": ">= 18"
            }
        },
        "node_modules/@octokit/endpoint": {
-            "version": "6.0.12",
-            "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.12.tgz",
-            "integrity": "sha512-lF3puPwkQWGfkMClXb4k/eUT/nZKQfxinRWJrdZaJO85Dqwo/G0yOC434Jr2ojwafWJMYqFGFa5ms4jJUgujdA==",
+            "version": "9.0.1",
+            "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-9.0.1.tgz",
+            "integrity": "sha512-hRlOKAovtINHQPYHZlfyFwaM8OyetxeoC81lAkBy34uLb8exrZB50SQdeW3EROqiY9G9yxQTpp5OHTV54QD+vA==",
            "dependencies": {
-                "@octokit/types": "^6.0.3",
+                "@octokit/types": "^12.0.0",
                "is-plain-object": "^5.0.0",
                "universal-user-agent": "^6.0.0"
+            },
+            "engines": {
+                "node": ">= 18"
            }
        },
        "node_modules/@octokit/graphql": {
-            "version": "4.8.0",
-            "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-4.8.0.tgz",
-            "integrity": "sha512-0gv+qLSBLKF0z8TKaSKTsS39scVKF9dbMxJpj3U0vC7wjNWFuIpL/z76Qe2fiuCbDRcJSavkXsVtMS6/dtQQsg==",
+            "version": "7.0.2",
+            "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-7.0.2.tgz",
+            "integrity": "sha512-OJ2iGMtj5Tg3s6RaXH22cJcxXRi7Y3EBqbHTBRq+PQAqfaS8f/236fUrWhfSn8P4jovyzqucxme7/vWSSZBX2Q==",
            "dependencies": {
-                "@octokit/request": "^5.6.0",
-                "@octokit/types": "^6.0.3",
+                "@octokit/request": "^8.0.1",
+                "@octokit/types": "^12.0.0",
                "universal-user-agent": "^6.0.0"
+            },
+            "engines": {
+                "node": ">= 18"
            }
        },
        "node_modules/@octokit/openapi-types": {
-            "version": "12.11.0",
-            "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-12.11.0.tgz",
-            "integrity": "sha512-VsXyi8peyRq9PqIz/tpqiL2w3w80OgVMwBHltTml3LmVvXiphgeqmY9mvBw9Wu7e0QWk/fqD37ux8yP5uVekyQ=="
+            "version": "19.0.0",
+            "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-19.0.0.tgz",
+            "integrity": "sha512-PclQ6JGMTE9iUStpzMkwLCISFn/wDeRjkZFIKALpvJQNBGwDoYYi2fFvuHwssoQ1rXI5mfh6jgTgWuddeUzfWw=="
        },
        "node_modules/@octokit/plugin-paginate-rest": {
-            "version": "2.21.3",
-            "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.21.3.tgz",
-            "integrity": "sha512-aCZTEf0y2h3OLbrgKkrfFdjRL6eSOo8komneVQJnYecAxIej7Bafor2xhuDJOIFau4pk0i/P28/XgtbyPF0ZHw==",
+            "version": "9.0.0",
+            "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-9.0.0.tgz",
+            "integrity": "sha512-oIJzCpttmBTlEhBmRvb+b9rlnGpmFgDtZ0bB6nq39qIod6A5DP+7RkVLMOixIgRCYSHDTeayWqmiJ2SZ6xgfdw==",
            "dependencies": {
-                "@octokit/types": "^6.40.0"
+                "@octokit/types": "^12.0.0"
+            },
+            "engines": {
+                "node": ">= 18"
            },
            "peerDependencies": {
-                "@octokit/core": ">=2"
+                "@octokit/core": ">=5"
            }
        },
        "node_modules/@octokit/plugin-rest-endpoint-methods": {
-            "version": "5.16.2",
-            "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.16.2.tgz",
-            "integrity": "sha512-8QFz29Fg5jDuTPXVtey05BLm7OB+M8fnvE64RNegzX7U+5NUXcOcnpTIK0YfSHBg8gYd0oxIq3IZTe9SfPZiRw==",
+            "version": "10.0.1",
+            "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-10.0.1.tgz",
+            "integrity": "sha512-fgS6HPkPvJiz8CCliewLyym9qAx0RZ/LKh3sATaPfM41y/O2wQ4Z9MrdYeGPVh04wYmHFmWiGlKPC7jWVtZXQA==",
            "dependencies": {
-                "@octokit/types": "^6.39.0",
-                "deprecation": "^2.3.1"
+                "@octokit/types": "^12.0.0"
+            },
+            "engines": {
+                "node": ">= 18"
            },
            "peerDependencies": {
-                "@octokit/core": ">=3"
+                "@octokit/core": ">=5"
            }
        },
        "node_modules/@octokit/request": {
-            "version": "5.6.3",
-            "resolved": "https://registry.npmjs.org/@octokit/request/-/request-5.6.3.tgz",
-            "integrity": "sha512-bFJl0I1KVc9jYTe9tdGGpAMPy32dLBXXo1dS/YwSCTL/2nd9XeHsY616RE3HPXDVk+a+dBuzyz5YdlXwcDTr2A==",
+            "version": "8.1.4",
+            "resolved": "https://registry.npmjs.org/@octokit/request/-/request-8.1.4.tgz",
+            "integrity": "sha512-M0aaFfpGPEKrg7XoA/gwgRvc9MSXHRO2Ioki1qrPDbl1e9YhjIwVoHE7HIKmv/m3idzldj//xBujcFNqGX6ENA==",
            "dependencies": {
-                "@octokit/endpoint": "^6.0.1",
-                "@octokit/request-error": "^2.1.0",
-                "@octokit/types": "^6.16.1",
+                "@octokit/endpoint": "^9.0.0",
+                "@octokit/request-error": "^5.0.0",
+                "@octokit/types": "^12.0.0",
                "is-plain-object": "^5.0.0",
-                "node-fetch": "^2.6.7",
                "universal-user-agent": "^6.0.0"
+            },
+            "engines": {
+                "node": ">= 18"
            }
        },
        "node_modules/@octokit/request-error": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.1.0.tgz",
-            "integrity": "sha512-1VIvgXxs9WHSjicsRwq8PlR2LR2x6DwsJAaFgzdi0JfJoGSO8mYI/cHJQ+9FbN21aa+DrgNLnwObmyeSC8Rmpg==",
+            "version": "5.0.1",
+            "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-5.0.1.tgz",
+            "integrity": "sha512-X7pnyTMV7MgtGmiXBwmO6M5kIPrntOXdyKZLigNfQWSEQzVxR4a4vo49vJjTWX70mPndj8KhfT4Dx+2Ng3vnBQ==",
            "dependencies": {
-                "@octokit/types": "^6.0.3",
+                "@octokit/types": "^12.0.0",
                "deprecation": "^2.0.0",
                "once": "^1.4.0"
+            },
+            "engines": {
+                "node": ">= 18"
            }
        },
        "node_modules/@octokit/types": {
-            "version": "6.41.0",
-            "resolved": "https://registry.npmjs.org/@octokit/types/-/types-6.41.0.tgz",
-            "integrity": "sha512-eJ2jbzjdijiL3B4PrSQaSjuF2sPEQPVCPzBvTHJD9Nz+9dw2SGH4K4xeQJ77YfTq5bRQ+bD8wT11JbeDPmxmGg==",
+            "version": "12.0.0",
+            "resolved": "https://registry.npmjs.org/@octokit/types/-/types-12.0.0.tgz",
+            "integrity": "sha512-EzD434aHTFifGudYAygnFlS1Tl6KhbTynEWELQXIbTY8Msvb5nEqTZIm7sbPEt4mQYLZwu3zPKVdeIrw0g7ovg==",
            "dependencies": {
-                "@octokit/openapi-types": "^12.11.0"
+                "@octokit/openapi-types": "^19.0.0"
            }
        },
        "node_modules/before-after-hook": {
@@ -160,25 +188,6 @@
                "node": ">=0.10.0"
            }
        },
-        "node_modules/node-fetch": {
-            "version": "2.6.12",
-            "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.12.tgz",
-            "integrity": "sha512-C/fGU2E8ToujUivIO0H+tpQ6HWo4eEmchoPIoXtxCrVghxdKq+QOHqEZW7tuP3KlV3bC8FRMO5nMCC7Zm1VP6g==",
-            "dependencies": {
-                "whatwg-url": "^5.0.0"
-            },
-            "engines": {
-                "node": "4.x || >=6.0.0"
-            },
-            "peerDependencies": {
-                "encoding": "^0.1.0"
-            },
-            "peerDependenciesMeta": {
-                "encoding": {
-                    "optional": true
-                }
-            }
-        },
        "node_modules/once": {
            "version": "1.4.0",
            "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
@@ -187,11 +196,6 @@
                "wrappy": "1"
            }
        },
-        "node_modules/tr46": {
-            "version": "0.0.3",
-            "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-            "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
-        },
        "node_modules/tunnel": {
            "version": "0.0.6",
            "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz",
@@ -200,6 +204,17 @@
                "node": ">=0.6.11 <=0.7.0 || >=0.7.3"
            }
        },
+        "node_modules/undici": {
+            "version": "5.28.4",
+            "resolved": "https://registry.npmjs.org/undici/-/undici-5.28.4.tgz",
+            "integrity": "sha512-72RFADWFqKmUb2hmmvNODKL3p9hcB6Gt2DOQMis1SEBaV6a4MH8soBvzg+95CYhCKPFedut2JY9bMfrDl9D23g==",
+            "dependencies": {
+                "@fastify/busboy": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=14.0"
+            }
+        },
        "node_modules/universal-user-agent": {
            "version": "6.0.0",
            "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.0.tgz",
@@ -213,20 +228,6 @@
                "uuid": "dist/bin/uuid"
            }
        },
-        "node_modules/webidl-conversions": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-            "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
-        },
-        "node_modules/whatwg-url": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-            "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
-            "dependencies": {
-                "tr46": "~0.0.3",
-                "webidl-conversions": "^3.0.0"
-            }
-        },
        "node_modules/wrappy": {
            "version": "1.0.2",
            "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
--- a/.github/actions/docusaurus-swizzled-warning/package.json
+++ b/.github/actions/docusaurus-swizzled-warning/package.json
@@ -10,7 +10,7 @@
    "author": "jNullj",
    "license": "CC0",
    "dependencies": {
-        "@actions/core": "^1.10.0",
-        "@actions/github": "^5.1.1"
+        "@actions/core": "^1.10.1",
+        "@actions/github": "^6.0.0"
    }
 }
--- a/.github/actions/draft-release/Dockerfile
+++ b/.github/actions/draft-release/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:18-bullseye
+FROM node:20-bullseye

 RUN apt-get update
 RUN apt-get install -y jq
--- a/.github/actions/service-tests/action.yml
+++ b/.github/actions/service-tests/action.yml
@@ -16,6 +16,10 @@ inputs:
    description: 'The SERVICETESTS_OBS_PASS secret'
    required: false
    default: ''
+  pepy-key:
+    description: 'The SERVICETESTS_PEPY_KEY secret'
+    required: false
+    default: ''
  sl-insight-user-uuid:
    description: 'The SERVICETESTS_SL_INSIGHT_USER_UUID secret'
    required: false
@@ -66,6 +70,7 @@ runs:
        LIBRARIESIO_TOKENS: '${{ inputs.librariesio-tokens }}'
        OBS_USER: '${{ inputs.obs-user }}'
        OBS_PASS: '${{ inputs.obs-pass }}'
+        PEPY_KEY: '${{ inputs.pepy-key }}'
        SL_INSIGHT_USER_UUID: '${{ inputs.sl-insight-user-uuid }}'
        SL_INSIGHT_API_TOKEN: '${{ inputs.sl-insight-api-token }}'
        TWITCH_CLIENT_ID: '${{ inputs.twitch-client-id }}'
--- a/.github/actions/setup/action.yml
+++ b/.github/actions/setup/action.yml
@@ -2,8 +2,12 @@ name: 'Set up project'
 description: 'Set up project'
 inputs:
  node-version:
-    description: 'Version Spec of the version to use. Examples: 12.x, 10.15.1, >=10.15.0.'
+    description: 'Version Spec of the node version to use. Examples: 12.x, 10.15.1, >=10.15.0.'
    required: true
+  npm-version:
+    description: 'Version Spec of the npm version to use. Examples: 9.x, 10.2.3, >=10.1.0.'
+    required: false
+    default: '^10'
  cypress:
    description: 'Install Cypress binary (boolean)'
    type: boolean
@@ -15,12 +19,12 @@ runs:
  using: 'composite'
  steps:
    - name: Install Node JS ${{ inputs.node-version }}
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4
      with:
        node-version: ${{ inputs.node-version }}

-    - name: Install NPM 9
-      run: npm install -g npm@^9.0.0
+    - name: Install NPM ${{ inputs.npm-version }}
+      run: npm install -g npm@${{ inputs.npm-version }}
      shell: bash

    - name: Install dependencies
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -16,7 +16,20 @@ updates:
      # https://caniuse.com/js-regexp-lookbehind
      - dependency-name: 'decamelize'
      - dependency-name: 'humanize-string'
-
+    groups:
+      # All official @docusaurus/* packages should have the exact same version as @docusaurus/core.
+      # From https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#groups:
+      # "You cannot apply a single grouping set of rules to both version updates and security
+      # updates [...] you must define two, separately named, grouping sets of rules"
+      # See https://github.com/badges/shields/issues/10242 for more information.
+      docusaurus-version-updates:
+        applies-to: version-updates
+        patterns:
+          - '@docusaurus/*'
+      docusaurus-security-updates:
+        applies-to: security-updates
+        patterns:
+          - '@docusaurus/*'
  # badge-maker package dependencies
  - package-ecosystem: npm
    directory: '/badge-maker'
@@ -29,7 +42,15 @@ updates:

  # GH actions
  - package-ecosystem: 'github-actions'
-    directory: '/'
+    # all composite actions must be individually listed here
+    # https://github.com/dependabot/dependabot-core/issues/6704
+    directories:
+      - '/'
+      - '/.github/actions/core-tests'
+      - '/.github/actions/integration-tests'
+      - '/.github/actions/package-tests'
+      - '/.github/actions/service-tests'
+      - '/.github/actions/setup'
    schedule:
      interval: weekly
    open-pull-requests-limit: 99
--- a/.github/scripts/deploy-review-app.sh
+++ b/.github/scripts/deploy-review-app.sh
@@ -18,12 +18,13 @@ git checkout "pr-$PR_NUMBER"

 # If the app does not already exist, create it
 if ! flyctl status --app "$app"; then
-  flyctl launch --no-deploy --copy-config --name "$app" --region "$region" --org "$org"
+  flyctl launch --no-deploy --copy-config --name "$app" --region "$region" --org "$org" --dockerfile ./Dockerfile
  echo $SECRETS | tr " " "\n" | flyctl secrets import --app "$app"
 fi

 # Deploy
-flyctl deploy --app "$app" --region "$region"
+flyctl deploy --app "$app" --regions "$region"
+flyctl scale count 1 --app "$app" --yes

 # Post a comment on the PR
 app_url=$(flyctl status --app "$app" --json | jq -r .Hostname)
--- a/.github/workflows/build-docker-image.yml
+++ b/.github/workflows/build-docker-image.yml
@@ -10,10 +10,10 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4

      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
        with:
          version: v0.9.1

@@ -21,7 +21,7 @@ jobs:
        run: echo "SHORT_SHA=${GITHUB_SHA::7}" >> $GITHUB_ENV

      - name: Build
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v6
        with:
          context: .
          push: false
--- a/.github/workflows/cleanup-review-apps.yml
+++ b/.github/workflows/cleanup-review-apps.yml
@@ -10,7 +10,7 @@ jobs:
    runs-on: ubuntu-latest
    environment: 'Review Apps'
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
      - uses: superfly/flyctl-actions/setup-flyctl@master

      - name: install jq
--- a/.github/workflows/create-release.yml
+++ b/.github/workflows/create-release.yml
@@ -24,7 +24,7 @@ jobs:
        run: echo "::set-output name=date::$(date --rfc-3339=date)"

      - name: Checkout branch "master"
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
        with:
          ref: 'master'

@@ -35,18 +35,18 @@ jobs:
          tag: server-${{ steps.date.outputs.date }}

      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
        with:
          version: v0.9.1

      - name: Login to DockerHub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
        with:
          username: ${{ secrets.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}

      - name: Build and push snapshot release to DockerHub
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v6
        with:
          context: .
          push: true
@@ -55,14 +55,14 @@ jobs:
            version=server-${{ steps.date.outputs.date }}

      - name: Login to GHCR
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
        with:
          registry: ghcr.io
          username: ${{ github.actor }}
          password: ${{ secrets.GITHUB_TOKEN }}

      - name: Build and push snapshot release to GHCR
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v6
        with:
          context: .
          push: true
--- a/.github/workflows/danger.yml
+++ b/.github/workflows/danger.yml
@@ -14,12 +14,12 @@ jobs:
    if: github.actor != 'dependabot[bot]' && github.actor != 'repo-ranger[bot]'
    steps:
      - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4

      - name: Setup
        uses: ./.github/actions/setup
        with:
-          node-version: 18
+          node-version: 20

      - name: Danger
        run: npm run danger ci
--- a/.github/workflows/deploy-docs.yml
+++ b/.github/workflows/deploy-docs.yml
@@ -12,14 +12,14 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
        with:
          persist-credentials: false

      - name: Setup
        uses: ./.github/actions/setup
        with:
-          node-version: 18
+          node-version: 20

      - name: Build
        run: npm run build-docs
--- a/.github/workflows/deploy-review-app.yml
+++ b/.github/workflows/deploy-review-app.yml
@@ -14,7 +14,7 @@ jobs:
    runs-on: ubuntu-latest
    environment: 'Review Apps'
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
        with:
          fetch-depth: 0
      - uses: superfly/flyctl-actions/setup-flyctl@master
@@ -35,6 +35,7 @@ jobs:
            LIBRARIESIO_TOKENS=${{ secrets.SERVICETESTS_LIBRARIESIO_TOKENS }}
            OBS_USER=${{ secrets.SERVICETESTS_OBS_USER }}
            OBS_PASS=${{ secrets.SERVICETESTS_OBS_PASS }}
+            PEPY_KEY=${{ secrets.SERVICETESTS_PEPY_KEY }}
            SL_INSIGHT_API_TOKEN=${{ secrets.SERVICETESTS_SL_INSIGHT_USER_UUID }}
            SL_INSIGHT_USER_UUID=${{ secrets.SERVICETESTS_SL_INSIGHT_API_TOKEN }}
            TWITCH_CLIENT_ID=${{ secrets.SERVICETESTS_TWITCH_CLIENT_ID }}
--- a/.github/workflows/docusaurus-swizzled-warning.yml
+++ b/.github/workflows/docusaurus-swizzled-warning.yml
@@ -12,7 +12,7 @@ jobs:
    if: github.actor == 'dependabot[bot]'
    steps:
      - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4

      - name: Install action dependencies
        run: cd .github/actions/docusaurus-swizzled-warning && npm ci
--- a/.github/workflows/draft-release.yml
+++ b/.github/workflows/draft-release.yml
@@ -14,7 +14,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4

      - name: Draft Release
        uses: ./.github/actions/draft-release
--- a/.github/workflows/enforce-dependency-review.yml
+++ b/.github/workflows/enforce-dependency-review.yml
@@ -8,6 +8,6 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: 'Checkout Repository'
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
      - name: 'Dependency Review'
-        uses: actions/dependency-review-action@v3
+        uses: actions/dependency-review-action@v4
--- a/.github/workflows/publish-docker-next.yml
+++ b/.github/workflows/publish-docker-next.yml
@@ -12,15 +12,15 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4

      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
        with:
          version: v0.9.1

      - name: Login to DockerHub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
        with:
          username: ${{ secrets.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -30,7 +30,7 @@ jobs:

      - name: Build and push to DockerHub
        id: docker_build_push
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v6
        with:
          context: .
          push: true
@@ -42,14 +42,14 @@ jobs:
        run: echo ${{ steps.docker_build_push.outputs.digest }} >> $GITHUB_STEP_SUMMARY

      - name: Login to GHCR
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
        with:
          registry: ghcr.io
          username: ${{ github.actor }}
          password: ${{ secrets.GITHUB_TOKEN }}

      - name: Build and push to GHCR
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v6
        with:
          context: .
          push: true
--- a/.github/workflows/test-bug-run-badge.yml
+++ b/.github/workflows/test-bug-run-badge.yml
@@ -35,12 +35,12 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4

      - name: Setup
        uses: ./.github/actions/setup
        with:
-          node-version: 18
+          node-version: 20
          cypress: false

      - name: Output debug info
@@ -49,7 +49,7 @@ jobs:
        run: npm run badge $TEST_BADGE_LINK

      - name: Add Comment to Issue
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
        with:
          script: |
            const issueNumber = context.issue.number;
--- a/.github/workflows/test-e2e.yml
+++ b/.github/workflows/test-e2e.yml
@@ -12,11 +12,11 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4

      - name: Cache Cypress binary
        id: cache-cypress
-        uses: actions/cache@v3
+        uses: actions/cache@v4
        env:
          cache-name: cache-cypress
        with:
@@ -26,7 +26,7 @@ jobs:
      - name: Setup
        uses: ./.github/actions/setup
        with:
-          node-version: 18
+          node-version: 20
          cypress: true

      - name: Run tests
@@ -36,14 +36,14 @@ jobs:

      - name: Archive videos
        if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
        with:
          name: videos
          path: cypress/videos

      - name: Archive screenshots
        if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
        with:
          name: screenshots
          path: cypress/screenshots
--- a/.github/workflows/test-integration-22.yml
+++ b/.github/workflows/test-integration-22.yml
@@ -1,4 +1,4 @@
-name: Integration@node 20
+name: Integration@node 22
 on:
  pull_request:
    types: [opened, reopened, synchronize]
@@ -8,7 +8,7 @@ on:
      - 'dependabot/**'

 jobs:
-  test-integration-20:
+  test-integration-22:
    runs-on: ubuntu-latest
    env:
      PAT_EXISTS: ${{ secrets.GH_PAT != '' }}
@@ -30,12 +30,12 @@ jobs:

    steps:
      - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4

      - name: Setup
        uses: ./.github/actions/setup
        with:
-          node-version: 20
+          node-version: 22
        env:
          NPM_CONFIG_ENGINE_STRICT: 'false'

--- a/.github/workflows/test-integration.yml
+++ b/.github/workflows/test-integration.yml
@@ -30,12 +30,12 @@ jobs:

    steps:
      - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4

      - name: Setup
        uses: ./.github/actions/setup
        with:
-          node-version: 18
+          node-version: 20

      - name: Integration Tests (with PAT)
        if: ${{ env.PAT_EXISTS == 'true' }}
--- a/.github/workflows/test-lint.yml
+++ b/.github/workflows/test-lint.yml
@@ -12,12 +12,12 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4

      - name: Setup
        uses: ./.github/actions/setup
        with:
-          node-version: 18
+          node-version: 20

      - name: ESLint
        if: always()
--- a/.github/workflows/test-main-22.yml
+++ b/.github/workflows/test-main-22.yml
@@ -1,4 +1,4 @@
-name: Main@node 20
+name: Main@node 22
 on:
  pull_request:
    types: [opened, reopened, synchronize]
@@ -8,16 +8,16 @@ on:
      - 'dependabot/**'

 jobs:
-  test-main-20:
+  test-main-22:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4

      - name: Setup
        uses: ./.github/actions/setup
        with:
-          node-version: 20
+          node-version: 22
        env:
          NPM_CONFIG_ENGINE_STRICT: 'false'

--- a/.github/workflows/test-main.yml
+++ b/.github/workflows/test-main.yml
@@ -17,12 +17,12 @@ jobs:

    steps:
      - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4

      - name: Setup
        uses: ./.github/actions/setup
        with:
-          node-version: 18
+          node-version: 20

      - name: Core tests
        uses: ./.github/actions/core-tests
--- a/.github/workflows/test-package-cli.yml
+++ b/.github/workflows/test-package-cli.yml
@@ -19,12 +19,13 @@ jobs:
          - node: '16'
          - node: '18'
          - node: '20'
+          - node: '22'
    steps:
      - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4

      - name: Install Node JS ${{ inputs.node-version }}
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
        with:
          node-version: ${{ matrix.node }}

--- a/.github/workflows/test-package-lib.yml
+++ b/.github/workflows/test-package-lib.yml
@@ -14,19 +14,26 @@ jobs:
      matrix:
        include:
          - node: '16'
+            npm: '^9'
            engine-strict: 'false'
          - node: '18'
-            engine-strict: 'true'
+            npm: '^9'
+            engine-strict: 'false'
          - node: '20'
+            npm: '^10'
+            engine-strict: 'true'
+          - node: '22'
+            npm: '^10'
            engine-strict: 'false'
    steps:
      - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4

      - name: Setup
        uses: ./.github/actions/setup
        with:
          node-version: ${{ matrix.node }}
+          npm-version: ${{ matrix.npm }}
        env:
          NPM_CONFIG_ENGINE_STRICT: ${{ matrix.engine-strict }}

--- a/.github/workflows/test-services-22.yml
+++ b/.github/workflows/test-services-22.yml
@@ -1,4 +1,4 @@
-name: Services@node 20
+name: Services@node 22
 on:
  pull_request:
    types: [opened, edited, reopened, synchronize]
@@ -7,17 +7,17 @@ on:
      - 'gh-readonly-queue/**'

 jobs:
-  test-services-20:
+  test-services-22:
    runs-on: ubuntu-latest

    steps:
      - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4

      - name: Setup
        uses: ./.github/actions/setup
        with:
-          node-version: 20
+          node-version: 22
        env:
          NPM_CONFIG_ENGINE_STRICT: 'false'

@@ -29,6 +29,7 @@ jobs:
          librariesio-tokens: '${{ secrets.SERVICETESTS_LIBRARIESIO_TOKENS }}'
          obs-user: '${{ secrets.SERVICETESTS_OBS_USER }}'
          obs-pass: '${{ secrets.SERVICETESTS_OBS_PASS }}'
+          pepy-key: '${{ secrets.SERVICETESTS_PEPY_KEY }}'
          sl-insight-user-uuid: '${{ secrets.SERVICETESTS_SL_INSIGHT_USER_UUID }}'
          sl-insight-api-token: '${{ secrets.SERVICETESTS_SL_INSIGHT_API_TOKEN }}'
          twitch-client-id: '${{ secrets.SERVICETESTS_TWITCH_CLIENT_ID }}'
--- a/.github/workflows/test-services.yml
+++ b/.github/workflows/test-services.yml
@@ -12,12 +12,12 @@ jobs:

    steps:
      - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4

      - name: Setup
        uses: ./.github/actions/setup
        with:
-          node-version: 18
+          node-version: 20

      - name: Service tests (triggered from local branch)
        if: github.event.pull_request.head.repo.full_name == github.repository
@@ -27,6 +27,7 @@ jobs:
          librariesio-tokens: '${{ secrets.SERVICETESTS_LIBRARIESIO_TOKENS }}'
          obs-user: '${{ secrets.SERVICETESTS_OBS_USER }}'
          obs-pass: '${{ secrets.SERVICETESTS_OBS_PASS }}'
+          pepy-key: '${{ secrets.SERVICETESTS_PEPY_KEY }}'
          sl-insight-user-uuid: '${{ secrets.SERVICETESTS_SL_INSIGHT_USER_UUID }}'
          sl-insight-api-token: '${{ secrets.SERVICETESTS_SL_INSIGHT_API_TOKEN }}'
          twitch-client-id: '${{ secrets.SERVICETESTS_TWITCH_CLIENT_ID }}'
--- a/.github/workflows/update-github-api.yml
+++ b/.github/workflows/update-github-api.yml
@@ -14,18 +14,18 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4

      - name: Setup
        uses: ./.github/actions/setup
        with:
-          node-version: 18
+          node-version: 20

      - name: Check for new GitHub API version
        run: node scripts/update-github-api.js

      - name: Create Pull Request if config has changed
-        uses: peter-evans/create-pull-request@v5
+        uses: peter-evans/create-pull-request@v6
        with:
          token: '${{ secrets.GITHUB_TOKEN }}'
          commit-message: Update GitHub API Version
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,133 @@ Note: this changelog is for the shields.io server. The changelog for the badge-m

 ---

+## server-2024-06-01
+
+- Remove namedLogo from defaultBadgeData of non-social badges [#10195](https://github.com/badges/shields/issues/10195)
+- Update number of badges served each month [#10197](https://github.com/badges/shields/issues/10197)
+- Delete old deprecated services [#10196](https://github.com/badges/shields/issues/10196)
+- handle [BitbucketPipelines] responses with missing result key [#10163](https://github.com/badges/shields/issues/10163)
+- Update description of GitHub commit status badge [#10198](https://github.com/badges/shields/issues/10198)
+- chore: fix spelling of GitHub in badge descriptions [#10199](https://github.com/badges/shields/issues/10199)
+- Add [GithubCheckRuns] service [#7759](https://github.com/badges/shields/issues/7759)
+- feat: add Revolt badge [#10093](https://github.com/badges/shields/issues/10093)
+- ensure color is string before calling toLowerCase() [#10129](https://github.com/badges/shields/issues/10129)
+- instruct dependabot to monitor composite actions [#10139](https://github.com/badges/shields/issues/10139)
+- run tests on node 22 [#10127](https://github.com/badges/shields/issues/10127)
+- tweaks to libraries.io token pooling code [#10074](https://github.com/badges/shields/issues/10074)
+- fix [pypi] status badge when package has no 'Development Status' classifier [#10107](https://github.com/badges/shields/issues/10107)
+- clarify yml paths in server-secrets docs [#10106](https://github.com/badges/shields/issues/10106)
+- Update region flag name in flyctl deploy command [#10134](https://github.com/badges/shields/issues/10134)
+- Dependency updates
+
+## server-2024-05-01
+
+- [Hexpm] Fix badges for pre-release only versions [#10112](https://github.com/badges/shields/issues/10112)
+- feat(logos): support auto-sizing mode [#9191](https://github.com/badges/shields/issues/9191) [#10110](https://github.com/badges/shields/issues/10110) [#10125](https://github.com/badges/shields/issues/10125)
+- support setting pypiBaseUrl by environment variables and queryParameters; affects [pypi] [#10044](https://github.com/badges/shields/issues/10044)
+- Add 0BSD license to licenseTypes and [PypiLicense] [#10092](https://github.com/badges/shields/issues/10092)
+- Update Mastodon profile URL [#10082](https://github.com/badges/shields/issues/10082)
+- [GitHubGoMod] Ignore comment after version (fixes #10079) [#10080](https://github.com/badges/shields/issues/10080)
+- Perf: Librariesio repo dependencies [#10062](https://github.com/badges/shields/issues/10062)
+- [Chocolatey Nuget] Fix "not found" error for chocolatey badge [#10060](https://github.com/badges/shields/issues/10060)
+- Dependency updates
+
+## server-2024-04-01
+
+- improve performance of [GithubLastCommit] [GitlabLastCommit] [GiteaLastCommit] [#10046](https://github.com/badges/shields/issues/10046)
+- [BitbucketLastCommit] Add Bitbucket last commit [#10043](https://github.com/badges/shields/issues/10043)
+- [GithubLastCommit] [GitlabLastCommit] [GiteaLastCommit] Support file path for last commit [#10041](https://github.com/badges/shields/issues/10041)
+- upgrade to docusaurus 3 [#9820](https://github.com/badges/shields/issues/9820)
+- redirect [npm] /dt to /d18m [#10033](https://github.com/badges/shields/issues/10033)
+- Add [JSR] version service [#10030](https://github.com/badges/shields/issues/10030)
+- Add [snapcraft] version badge [#9976](https://github.com/badges/shields/issues/9976)
+- Dependency updates
+
+## server-2024-03-01
+
+- feat(gitea): add last commit badge [#9995](https://github.com/badges/shields/issues/9995)
+- [GithubCreatedAt] Add Created At Badge for Github [#9981](https://github.com/badges/shields/issues/9981)
+- Added custom bucket url support for [Scoop] [#9984](https://github.com/badges/shields/issues/9984)
+- [NpmUnpackedSize] Unpacked Size Badge [#9954](https://github.com/badges/shields/issues/9954)
+- [Website] Render `status: down` badge if website is unresponsive [#9966](https://github.com/badges/shields/issues/9966)
+- deprecate TAS [#9932](https://github.com/badges/shields/issues/9932)
+- [GITEA] add forks, stars, issues and pr badges [#9923](https://github.com/badges/shields/issues/9923)
+- tolerate missing short_version in [visualstudioappcenter] [#9951](https://github.com/badges/shields/issues/9951)
+- [Crates] Only use non-yanked crate versions (ready for merge) [#9949](https://github.com/badges/shields/issues/9949)
+- Dependency updates
+
+## server-2024-02-01
+
+- feat: added up_message and down_message to [uptimerobotstatus] [#9662](https://github.com/badges/shields/issues/9662)
+- Add [Hangar] Badges [#9800](https://github.com/badges/shields/issues/9800)
+- sort categories by title (except core) [#9888](https://github.com/badges/shields/issues/9888)
+- Add Support for [Nostr] Followers [#9870](https://github.com/badges/shields/issues/9870)
+- [thunderstore] replace experimental API usage with newly available v1 API [#9886](https://github.com/badges/shields/issues/9886)
+- Update [Gitea] defaults to gitea.com [#9872](https://github.com/badges/shields/issues/9872)
+- [crates] MSRV Badge [#9871](https://github.com/badges/shields/issues/9871)
+- Add [galaxytoolshed] Version [#8249](https://github.com/badges/shields/issues/8249)
+- fix default style docs for social badges [#9869](https://github.com/badges/shields/issues/9869)
+- Dependency updates
+
+## server-2024-01-01
+
+The most important changes in this release for users hosting their own instance are:
+
+The shields docker image is now based on node 20:
+
+- deploy on node 20 [#9799](https://github.com/badges/shields/issues/9799)
+
+It is now possible to use [authentication for DockerHub](https://github.com/badges/shields/blob/master/doc/server-secrets.md#dockerhub) to allow higher API rate limit or access to private repos:
+
+- call [docker] with auth [#9803](https://github.com/badges/shields/issues/9803)
+
+### New Badges
+
+- [Thunderstore] Add Thunderstore Badges [#9782](https://github.com/badges/shields/issues/9782)
+- Add [Raycast] Badge [#9801](https://github.com/badges/shields/issues/9801)
+- [GITEA] add new gitea service (release/languages) [#9781](https://github.com/badges/shields/issues/9781)
+- Add [NpmStatDownloads] Badge [#9783](https://github.com/badges/shields/issues/9783)
+
+### Frontend Changes
+
+- improve documentation for [dynamicxml] service [#9798](https://github.com/badges/shields/issues/9798)
+- add description to interval enums [#9854](https://github.com/badges/shields/issues/9854)
+- convert 'style' param to enum [#9853](https://github.com/badges/shields/issues/9853)
+- Ensure social category badges are rendered with social style and logo; affects [gitlab keybase lemmy modrinth thunderstore twitch] gist github reddit [#9859](https://github.com/badges/shields/issues/9859)
+
+### Fixes
+
+- [pub] Use official version endpoint for pub-service [#9802](https://github.com/badges/shields/issues/9802)
+- cache weblate badges for longer [#9786](https://github.com/badges/shields/issues/9786)
+- [Discourse] Update schema keys to use plural form (`topic_count` -> `topics_count`) [#9778](https://github.com/badges/shields/issues/9778)
+- cache some badges for longer [#9785](https://github.com/badges/shields/issues/9785)
+- increase page size for github release badge by semver [#9818](https://github.com/badges/shields/issues/9818)
+- Dependency updates
+
+## server-2023-12-04
+
+- move from @renovate/pep440 to @renovatebot/pep440 [#9614](https://github.com/badges/shields/issues/9614)
+- deprecate/fix [ansible] galaxy services [#9648](https://github.com/badges/shields/issues/9648)
+- call [pepy] with auth [#9748](https://github.com/badges/shields/issues/9748)
+- add meaningful descriptions including keywords [#9715](https://github.com/badges/shields/issues/9715)
+- Dependency updates
+
+## server-2023-11-01
+
+- fix greasyfork 404 bug [#9632](https://github.com/badges/shields/issues/9632)
+- Hacktoberfest 2023 support - resolves #9636 [#9637](https://github.com/badges/shields/issues/9637)
+- switch to fixed OpenCollective images [#9615](https://github.com/badges/shields/issues/9615)
+- Dependency updates
+
+## server-2023-10-02
+
+- add python package total downloads from [pepy] badge [#9564](https://github.com/badges/shields/issues/9564)
+- deprecate [redmine] plugin rating badges [#9568](https://github.com/badges/shields/issues/9568)
+- fix [bower] version badge [#9567](https://github.com/badges/shields/issues/9567)
+- Add [PythonVersionFromToml] shield [#9516](https://github.com/badges/shields/issues/9516)
+- Add [dub] score badge service [#9549](https://github.com/badges/shields/issues/9549)
+- Dependency updates
+
 ## server-2023-09-04

 - Fix [testspace] badges [#9525](https://github.com/badges/shields/issues/9525)
@@ -74,7 +201,7 @@ Other changes in this release:

 ## server-2023-05-01

-** Removal:** For users who need to maintain a Github Token pool, storage has been provided via the `RedisTokenPersistence` and `REDIS_URL` settings. This feature was deprecated in `server-2023-03-01`. As of this release, the `RedisTokenPersistence` backend is now removed. If you are using this feature, you will need to migrate to using the `SQLTokenPersistence` backend for storage and provide a postgres connection string via the `POSTGRES_URL` setting. [#8922](https://github.com/badges/shields/issues/8922)
+**Removal:** For users who need to maintain a Github Token pool, storage has been provided via the `RedisTokenPersistence` and `REDIS_URL` settings. This feature was deprecated in `server-2023-03-01`. As of this release, the `RedisTokenPersistence` backend is now removed. If you are using this feature, you will need to migrate to using the `SQLTokenPersistence` backend for storage and provide a postgres connection string via the `POSTGRES_URL` setting. [#8922](https://github.com/badges/shields/issues/8922)

 - fail to start server if there are duplicate service names [#9099](https://github.com/badges/shields/issues/9099)
 - [SourceForge] Added badges for SourceForge [#9078](https://github.com/badges/shields/issues/9078) [#9102](https://github.com/badges/shields/issues/9102)
--- a/4
+++ b/4
@@ -1,4 +1,4 @@
-FROM node:18-alpine AS Builder
+FROM node:20-alpine AS Builder

 RUN mkdir -p /usr/src/app
 RUN mkdir /usr/src/app/private
@@ -19,7 +19,7 @@ RUN npm prune --omit=dev
 RUN npm cache clean --force

 # Use multi-stage build to reduce size
-FROM node:18-alpine
+FROM node:20-alpine

 ARG version=dev
 ENV DOCKER_SHIELDS_VERSION=$version
--- a/README.md
+++ b/README.md
@@ -22,9 +22,6 @@
    <a href="https://discord.gg/HjJCwm5">
        <img src="https://img.shields.io/discord/308323056592486420?logo=discord"
            alt="chat on Discord"></a>
-    <a href="https://twitter.com/intent/follow?screen_name=shields_io">
-        <img src="https://img.shields.io/twitter/follow/shields_io?style=social&logo=twitter"
-            alt="follow on Twitter"></a>
 </p>

 This is home to [Shields.io][shields.io], a service for concise, consistent,
@@ -32,7 +29,7 @@ and legible badges in SVG and raster format, which can easily be included in
 GitHub readmes or any other web page. The service supports dozens of
 continuous integration services, package registries, distributions, app
 stores, social networks, code coverage services, and code analysis services.
-Every month it serves over 870 million images and is used by some of the
+Every month it serves over 1.6 billion images and is used by some of the
 world's most popular open-source projects, [VS Code][vscode], [Vue.js][vue]
 and [Bootstrap][bootstrap] to name a few.

@@ -101,8 +98,8 @@ If you intend on reporting or contributing a fix related to security vulnerabili

 ## Development

-1. Install Node 18 or later. You can use the [package manager][] of your choice.
-   Tests need to pass in Node 18 and 20.
+1. Install Node 20 or later. You can use the [package manager][] of your choice.
+   Tests need to pass in Node 20 and 22.
 2. Clone this repository.
 3. Run `npm ci` to install the dependencies.
 4. Run `npm start` to start the badge server and the frontend dev server.
@@ -112,7 +109,7 @@ When server source files change, the badge server should automatically restart
 itself (using [nodemon][]). When the frontend files change, the frontend dev
 server (`docusaurus start`) should also automatically reload. However the badge
 definitions are built only before the server first starts. To regenerate those,
-either run `npm run defs` or manually restart the server.
+either run `npm run prestart` or manually restart the server.

 To debug a badge from the command line, run `npm run badge -- /npm/v/nock`.
 It also works with full URLs like
--- a/badge-maker/CHANGELOG.md
+++ b/badge-maker/CHANGELOG.md
@@ -1,9 +1,15 @@
 # Changelog

-## 4.0.0 [WIP]
+## 4.0.0
+
+### Breaking Changes

 - Drop compatibility with Node < 16

+### Features
+
+- Add `links` and `logoBase64` params
+
 ## 3.3.1

 - Improve font measuring in for-the-badge and social styles
--- a/badge-maker/README.md
+++ b/badge-maker/README.md
@@ -16,7 +16,7 @@ npm install badge-maker

 ```sh
 npm install -g badge-maker
-badge build passed :green > mybadge.svg
+badge build passed :brightgreen > mybadge.svg
 ```

 ### As a library
@@ -37,7 +37,7 @@ import { makeBadge, ValidationError } from 'badge-maker'
 const format = {
  label: 'build',
  message: 'passed',
-  color: 'green',
+  color: 'brightgreen',
 }

 const svg = makeBadge(format)
@@ -67,6 +67,8 @@ The format is the following:
  message: 'passed',  // (Required) Badge message
  labelColor: '#555',  // (Optional) Label color
  color: '#4c1',  // (Optional) Message color
+  logoBase64: 'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI2NCIgaGVpZ2h0PSI2NCI+PHJlY3Qgd2lkdGg9IjY0IiBoZWlnaHQ9IjY0IiByeD0iOCIgZmlsbD0iI2IxY2U1NiIvPjxwYXRoIGQ9Ik04IDBoMjR2NjRIOGMtNC40MzIgMC04LTMuNTY4LTgtOFY4YzAtNC40MzIgMy41NjgtOCA4LTh6IiBmaWxsPSIjNWQ1ZDVkIi8+PC9zdmc+' // (Optional) Any custom logo can be passed in a URL parameter by base64 encoding
+  links: ['https://example.com', 'https://example.com'], // (Optional) Links array of maximum two links

  // (Optional) One of: 'plastic', 'flat', 'flat-square', 'for-the-badge' or 'social'
  // Each offers a different visual design.
--- a/badge-maker/index.d.ts
+++ b/badge-maker/index.d.ts
@@ -4,6 +4,8 @@ interface Format {
  labelColor?: string
  color?: string
  style?: 'plastic' | 'flat' | 'flat-square' | 'for-the-badge' | 'social'
+  logoBase64?: string
+  links?: Array<string>
 }

 export declare class ValidationError extends Error {}
--- a/badge-maker/lib/color.js
+++ b/badge-maker/lib/color.js
@@ -49,7 +49,7 @@ function normalizeColor(color) {
  } else if (color in aliases) {
    return aliases[color]
  } else if (isHexColor(color)) {
-    return `#${color.toLowerCase()}`
+    return `#${color.toString().toLowerCase()}`
  } else if (isCSSColor(color)) {
    return color.toLowerCase()
  } else {
--- a/badge-maker/lib/color.spec.js
+++ b/badge-maker/lib/color.spec.js
@@ -27,6 +27,8 @@ test(normalizeColor, () => {
  given('blue').expect('blue')
  given('4c1').expect('#4c1')
  given('f00f00').expect('#f00f00')
+  given('111111').expect('#111111')
+  given(111111).expect('#111111')
  given('ABC123').expect('#abc123')
  given('#ccc').expect('#ccc')
  given('#fffe').expect('#fffe')
--- a/badge-maker/lib/constants.js
+++ b/badge-maker/lib/constants.js
@@ -0,0 +1,5 @@
+const DEFAULT_LOGO_HEIGHT = 14
+
+module.exports = {
+  DEFAULT_LOGO_HEIGHT,
+}
--- a/badge-maker/lib/index.js
+++ b/badge-maker/lib/index.js
@@ -16,13 +16,30 @@ function _validate(format) {
    throw new ValidationError('Field `message` is required')
  }

-  const stringFields = ['labelColor', 'color', 'message', 'label']
+  const stringFields = ['labelColor', 'color', 'message', 'label', 'logoBase64']
  stringFields.forEach(function (field) {
    if (field in format && typeof format[field] !== 'string') {
      throw new ValidationError(`Field \`${field}\` must be of type string`)
    }
  })

+  if ('links' in format) {
+    if (!Array.isArray(format.links)) {
+      throw new ValidationError('Field `links` must be an array of strings')
+    } else {
+      if (format.links.length > 2) {
+        throw new ValidationError(
+          'Field `links` must not have more than 2 elements',
+        )
+      }
+      format.links.forEach(function (field) {
+        if (typeof field !== 'string') {
+          throw new ValidationError('Field `links` must be an array of strings')
+        }
+      })
+    }
+  }
+
  const styleValues = [
    'plastic',
    'flat',
@@ -38,11 +55,21 @@ function _validate(format) {
 }

 function _clean(format) {
-  const expectedKeys = ['label', 'message', 'labelColor', 'color', 'style']
+  const expectedKeys = [
+    'label',
+    'message',
+    'labelColor',
+    'color',
+    'style',
+    'logoBase64',
+    'links',
+  ]

  const cleaned = {}
  Object.keys(format).forEach(key => {
-    if (format[key] != null && expectedKeys.includes(key)) {
+    if (format[key] != null && key === 'logoBase64') {
+      cleaned.logo = format[key]
+    } else if (format[key] != null && expectedKeys.includes(key)) {
      cleaned[key] = format[key]
    } else {
      throw new ValidationError(
@@ -65,7 +92,9 @@ function _clean(format) {
 * @param {string} format.message (Required) Badge message (e.g: 'passing')
 * @param {string} format.labelColor (Optional) Label color
 * @param {string} format.color (Optional) Message color
- * @param {string} format.style (Optional) Visual style e.g: 'flat'
+ * @param {string} format.style (Optional) Visual style (e.g: 'flat')
+ * @param {string} format.logoBase64 (Optional) Logo data URL
+ * @param {Array} format.links (Optional) Links array (e.g: ['https://example.com', 'https://example.com'])
 * @returns {string} Badge in SVG format
 * @see https://github.com/badges/shields/tree/master/badge-maker/README.md
 */
--- a/badge-maker/lib/index.spec.js
+++ b/badge-maker/lib/index.spec.js
@@ -25,6 +25,21 @@ describe('makeBadge function', function () {
        style: 'flat',
      }),
    ).to.satisfy(isSvg)
+    expect(
+      makeBadge({
+        label: 'build',
+        message: 'passed',
+        color: 'green',
+        style: 'flat',
+        labelColor: 'blue',
+        logoBase64: 'data:image/svg+xml;base64,PHN2ZyB4bWxu',
+        links: ['https://example.com', 'https://example.com'],
+      }),
+    )
+      .to.satisfy(isSvg)
+      // explicitly make an assertion about logoBase64
+      // this param is not a straight passthrough
+      .and.to.include('data:image/svg+xml;base64,PHN2ZyB4bWxu')
  })

  it('should throw a ValidationError with invalid inputs', function () {
@@ -46,6 +61,21 @@ describe('makeBadge function', function () {
    expect(() =>
      makeBadge({ label: 'build', message: 'passed', labelColor: 7 }),
    ).to.throw(ValidationError, 'Field `labelColor` must be of type string')
+    expect(() =>
+      makeBadge({ label: 'build', message: 'passed', logoBase64: 7 }),
+    ).to.throw(ValidationError, 'Field `logoBase64` must be of type string')
+    expect(() =>
+      makeBadge({ label: 'build', message: 'passed', links: 'test' }),
+    ).to.throw(ValidationError, 'Field `links` must be an array of strings')
+    expect(() =>
+      makeBadge({ label: 'build', message: 'passed', links: [1] }),
+    ).to.throw(ValidationError, 'Field `links` must be an array of strings')
+    expect(() =>
+      makeBadge({ label: 'build', message: 'passed', links: ['1', '2', '3'] }),
+    ).to.throw(
+      ValidationError,
+      'Field `links` must not have more than 2 elements',
+    )
    expect(() =>
      makeBadge({ label: 'build', message: 'passed', format: 'png' }),
    ).to.throw(ValidationError, "Unexpected field 'format'")
--- a/badge-maker/lib/make-badge.js
+++ b/badge-maker/lib/make-badge.js
@@ -3,6 +3,7 @@
 const { normalizeColor, toSvgColor } = require('./color')
 const badgeRenderers = require('./badge-renderers')
 const { stripXmlWhitespace } = require('./xml')
+const { DEFAULT_LOGO_HEIGHT } = require('./constants')

 /*
 note: makeBadge() is fairly thinly wrapped so if we are making changes here
@@ -16,7 +17,7 @@ module.exports = function makeBadge({
  color,
  labelColor,
  logo,
-  logoPosition,
+  logoSize,
  logoWidth,
  links = ['', ''],
 }) {
@@ -45,7 +46,7 @@ module.exports = function makeBadge({
    throw new Error(`Unknown badge style: '${style}'`)
  }

-  logoWidth = +logoWidth || (logo ? 14 : 0)
+  logoWidth = +logoWidth || (logo ? DEFAULT_LOGO_HEIGHT : 0)

  return stripXmlWhitespace(
    render({
@@ -53,8 +54,8 @@ module.exports = function makeBadge({
      message,
      links,
      logo,
-      logoPosition,
      logoWidth,
+      logoSize,
      logoPadding: logo && label.length ? 3 : 0,
      color: toSvgColor(color),
      labelColor: toSvgColor(labelColor),
--- a/badge-maker/lib/xml.js
+++ b/badge-maker/lib/xml.js
@@ -35,7 +35,7 @@ class XmlElement {
   *    Name of the XML tag
   * @param {Array.<string|module:badge-maker/lib/xml~XmlElement>} [attrs.content=[]]
   *    Array of objects to render inside the tag. content may contain a mix of
-   *    string and XmlElement objects. If content is `[]` or ommitted the
+   *    string and XmlElement objects. If content is `[]` or omitted the
   *    element will be rendered as a self-closing element.
   * @param {object} [attrs.attrs={}]
   *    Object representing the tag's attributes as name/value pairs
--- a/badge-maker/package.json
+++ b/badge-maker/package.json
@@ -1,6 +1,6 @@
 {
  "name": "badge-maker",
-  "version": "3.3.1",
+  "version": "4.0.0",
  "description": "Shields.io badge library",
  "keywords": [
    "GitHub",
--- a/config/custom-environment-variables.yml
+++ b/config/custom-environment-variables.yml
@@ -52,6 +52,8 @@ public:
      authorizedOrigins: 'NPM_ORIGINS'
    obs:
      authorizedOrigins: 'OBS_ORIGINS'
+    pypi:
+      baseUri: 'PYPI_URL'
    sonar:
      authorizedOrigins: 'SONAR_ORIGINS'
    teamcity:
@@ -79,6 +81,8 @@ private:
  bitbucket_server_password: 'BITBUCKET_SERVER_PASS'
  curseforge_api_key: 'CURSEFORGE_API_KEY'
  discord_bot_token: 'DISCORD_BOT_TOKEN'
+  dockerhub_username: 'DOCKERHUB_USER'
+  dockerhub_pat: 'DOCKERHUB_PAT'
  drone_token: 'DRONE_TOKEN'
  gh_client_id: 'GH_CLIENT_ID'
  gh_client_secret: 'GH_CLIENT_SECRET'
@@ -96,6 +100,7 @@ private:
  obs_pass: 'OBS_PASS'
  redis_url: 'REDIS_URL'
  opencollective_token: 'OPENCOLLECTIVE_TOKEN'
+  pepy_key: 'PEPY_KEY'
  postgres_url: 'POSTGRES_URL'
  sentry_dsn: 'SENTRY_DSN'
  sl_insight_userUuid: 'SL_INSIGHT_USER_UUID'
--- a/config/default.yml
+++ b/config/default.yml
@@ -22,6 +22,8 @@ public:
      restApiVersion: '2022-11-28'
    obs:
      authorizedOrigins: 'https://api.opensuse.org'
+    pypi:
+      baseUri: 'https://pypi.org'
    weblate:
      authorizedOrigins: 'https://hosted.weblate.org'
    trace: false
--- a/core/base-service/auth-helper.js
+++ b/core/base-service/auth-helper.js
@@ -1,5 +1,13 @@
 import { URL } from 'url'
-import { InvalidParameter } from './errors.js'
+import dayjs from 'dayjs'
+import Joi from 'joi'
+import checkErrorResponse from './check-error-response.js'
+import { InvalidParameter, InvalidResponse } from './errors.js'
+import { fetch } from './got.js'
+import { parseJson } from './json.js'
+import validate from './validate.js'
+
+let jwtCache = Object.create(null)

 class AuthHelper {
  constructor(
@@ -87,7 +95,7 @@ class AuthHelper {
    }
  }

-  shouldAuthenticateRequest({ url, options = {} }) {
+  isAllowedOrigin(url) {
    let parsed
    try {
      parsed = new URL(url)
@@ -97,7 +105,11 @@ class AuthHelper {

    const { protocol, host } = parsed
    const origin = `${protocol}//${host}`
-    const originViolation = !this._authorizedOrigins.includes(origin)
+    return this._authorizedOrigins.includes(origin)
+  }
+
+  shouldAuthenticateRequest({ url, options = {} }) {
+    const originViolation = !this.isAllowedOrigin(url)

    const strictSslCheckViolation =
      this._requireStrictSslToAuthenticate &&
@@ -218,6 +230,103 @@ class AuthHelper {
      }),
    )
  }
+
+  static _getJwtExpiry(token, max = dayjs().add(1, 'hours').unix()) {
+    // get the expiry timestamp for this JWT (capped at a max length)
+    const parts = token.split('.')
+
+    if (parts.length < 2) {
+      throw new InvalidResponse({
+        prettyMessage: 'invalid response data from auth endpoint',
+      })
+    }
+
+    const json = validate(
+      {
+        ErrorClass: InvalidResponse,
+        prettyErrorMessage: 'invalid response data from auth endpoint',
+      },
+      parseJson(Buffer.from(parts[1], 'base64').toString()),
+      Joi.object({ exp: Joi.number().required() }).required(),
+    )
+
+    return Math.min(json.exp, max)
+  }
+
+  static _isJwtValid(expiry) {
+    // we consider the token valid if the expiry
+    // datetime is later than (now + 1 minute)
+    return dayjs.unix(expiry).isAfter(dayjs().add(1, 'minutes'))
+  }
+
+  async _getJwt(loginEndpoint) {
+    const { _user: username, _pass: password } = this
+
+    // attempt to get JWT from cache
+    if (
+      jwtCache?.[loginEndpoint]?.[username]?.token &&
+      jwtCache?.[loginEndpoint]?.[username]?.expiry &&
+      this.constructor._isJwtValid(jwtCache[loginEndpoint][username].expiry)
+    ) {
+      // cache hit
+      return jwtCache[loginEndpoint][username].token
+    }
+
+    // cache miss - request a new JWT
+    const originViolation = !this.isAllowedOrigin(loginEndpoint)
+    if (originViolation) {
+      throw new InvalidParameter({
+        prettyMessage: 'requested origin not authorized',
+      })
+    }
+
+    const { buffer } = await checkErrorResponse({})(
+      await fetch(loginEndpoint, {
+        method: 'POST',
+        form: { username, password },
+      }),
+    )
+
+    const json = validate(
+      {
+        ErrorClass: InvalidResponse,
+        prettyErrorMessage: 'invalid response data from auth endpoint',
+      },
+      parseJson(buffer),
+      Joi.object({ token: Joi.string().required() }).required(),
+    )
+
+    const token = json.token
+    const expiry = this.constructor._getJwtExpiry(token)
+
+    // store in the cache
+    if (!(loginEndpoint in jwtCache)) {
+      jwtCache[loginEndpoint] = {}
+    }
+    jwtCache[loginEndpoint][username] = { token, expiry }
+
+    return token
+  }
+
+  async _getJwtAuthHeader(loginEndpoint) {
+    if (!this.isConfigured) {
+      return undefined
+    }
+
+    const token = await this._getJwt(loginEndpoint)
+    return { Authorization: `Bearer ${token}` }
+  }
+
+  async withJwtAuth(requestParams, loginEndpoint) {
+    const authHeader = await this._getJwtAuthHeader(loginEndpoint)
+    return this._withAnyAuth(requestParams, requestParams =>
+      this.constructor._mergeHeaders(requestParams, authHeader),
+    )
+  }
 }

-export { AuthHelper }
+function clearJwtCache() {
+  jwtCache = Object.create(null)
+}
+
+export { AuthHelper, clearJwtCache }
--- a/core/base-service/auth-helper.spec.js
+++ b/core/base-service/auth-helper.spec.js
@@ -1,7 +1,32 @@
+import dayjs from 'dayjs'
+import nock from 'nock'
 import { expect } from 'chai'
 import { test, given, forCases } from 'sazerac'
-import { AuthHelper } from './auth-helper.js'
-import { InvalidParameter } from './errors.js'
+import { AuthHelper, clearJwtCache } from './auth-helper.js'
+import { InvalidParameter, InvalidResponse } from './errors.js'
+
+function base64UrlEncode(input) {
+  const base64 = btoa(JSON.stringify(input))
+  return base64.replace(/\+/g, '-').replace(/\//g, '_').replace(/=+$/, '')
+}
+
+function getMockJwt(extras) {
+  // this function returns a mock JWT that contains enough
+  // for a unit test but ignores important aspects e.g: signing
+
+  const header = {
+    alg: 'HS256',
+    typ: 'JWT',
+  }
+  const payload = {
+    iat: Math.floor(Date.now() / 1000),
+    ...extras,
+  }
+
+  const encodedHeader = base64UrlEncode(header)
+  const encodedPayload = base64UrlEncode(payload)
+  return `${encodedHeader}.${encodedPayload}`
+}

 describe('AuthHelper', function () {
  describe('constructor checks', function () {
@@ -381,4 +406,153 @@ describe('AuthHelper', function () {
      ).to.throw(InvalidParameter)
    })
  })
+
+  context('JTW Auth', function () {
+    describe('_isJwtValid', function () {
+      test(AuthHelper._isJwtValid, () => {
+        given(dayjs().add(1, 'month').unix()).expect(true)
+        given(dayjs().add(2, 'minutes').unix()).expect(true)
+        given(dayjs().add(30, 'seconds').unix()).expect(false)
+        given(dayjs().unix()).expect(false)
+        given(dayjs().subtract(1, 'seconds').unix()).expect(false)
+      })
+    })
+
+    describe('_getJwtExpiry', function () {
+      it('extracts expiry from valid JWT', function () {
+        const nowPlus30Mins = dayjs().add(30, 'minutes').unix()
+        expect(
+          AuthHelper._getJwtExpiry(getMockJwt({ exp: nowPlus30Mins })),
+        ).to.equal(nowPlus30Mins)
+      })
+
+      it('caps expiry at max', function () {
+        const nowPlus1Hour = dayjs().add(1, 'hours').unix()
+        const nowPlus2Hours = dayjs().add(2, 'hours').unix()
+        expect(
+          AuthHelper._getJwtExpiry(getMockJwt({ exp: nowPlus2Hours })),
+        ).to.equal(nowPlus1Hour)
+      })
+
+      it('throws if JWT does not contain exp', function () {
+        expect(() => {
+          AuthHelper._getJwtExpiry(getMockJwt({}))
+        }).to.throw(InvalidResponse)
+      })
+
+      it('throws if JWT is invalid', function () {
+        expect(() => {
+          AuthHelper._getJwtExpiry('abc')
+        }).to.throw(InvalidResponse)
+      })
+    })
+
+    describe('withJwtAuth', function () {
+      const authHelper = new AuthHelper(
+        {
+          userKey: 'jwt_user',
+          passKey: 'jwt_pass',
+          authorizedOrigins: ['https://example.com'],
+          isRequired: false,
+        },
+        { private: { jwt_user: 'fred', jwt_pass: 'abc123' } },
+      )
+
+      beforeEach(function () {
+        clearJwtCache()
+      })
+
+      it('should use cached response if valid', async function () {
+        // the expiry is far enough in the future that the token
+        // will still be valid on the second hit
+        const mockToken = getMockJwt({ exp: dayjs().add(1, 'hours').unix() })
+
+        // .times(1) ensures if we try to make a second call to this endpoint,
+        // we will throw `Nock: No match for request`
+        nock('https://example.com')
+          .post('/login')
+          .times(1)
+          .reply(200, { token: mockToken })
+        const params1 = await authHelper.withJwtAuth(
+          { url: 'https://example.com/some-endpoint' },
+          'https://example.com/login',
+        )
+        expect(nock.isDone()).to.equal(true)
+        expect(params1).to.deep.equal({
+          options: {
+            headers: {
+              Authorization: `Bearer ${mockToken}`,
+            },
+          },
+          url: 'https://example.com/some-endpoint',
+        })
+
+        // second time round, we'll get the same response again
+        // but this time served from cache
+        const params2 = await authHelper.withJwtAuth(
+          { url: 'https://example.com/some-endpoint' },
+          'https://example.com/login',
+        )
+        expect(params2).to.deep.equal({
+          options: {
+            headers: {
+              Authorization: `Bearer ${mockToken}`,
+            },
+          },
+          url: 'https://example.com/some-endpoint',
+        })
+
+        nock.cleanAll()
+      })
+
+      it('should not use cached response if expired', async function () {
+        // this time we define a token expiry is close enough
+        // that the token will not be valid on the second call
+        const mockToken1 = getMockJwt({
+          exp: dayjs().add(20, 'seconds').unix(),
+        })
+        nock('https://example.com')
+          .post('/login')
+          .times(1)
+          .reply(200, { token: mockToken1 })
+        const params1 = await authHelper.withJwtAuth(
+          { url: 'https://example.com/some-endpoint' },
+          'https://example.com/login',
+        )
+        expect(nock.isDone()).to.equal(true)
+        expect(params1).to.deep.equal({
+          options: {
+            headers: {
+              Authorization: `Bearer ${mockToken1}`,
+            },
+          },
+          url: 'https://example.com/some-endpoint',
+        })
+
+        // second time round we make another network request
+        const mockToken2 = getMockJwt({
+          exp: dayjs().add(20, 'seconds').unix(),
+        })
+        nock('https://example.com')
+          .post('/login')
+          .times(1)
+          .reply(200, { token: mockToken2 })
+        const params2 = await authHelper.withJwtAuth(
+          { url: 'https://example.com/some-endpoint' },
+          'https://example.com/login',
+        )
+        expect(nock.isDone()).to.equal(true)
+        expect(params2).to.deep.equal({
+          options: {
+            headers: {
+              Authorization: `Bearer ${mockToken2}`,
+            },
+          },
+          url: 'https://example.com/some-endpoint',
+        })
+
+        nock.cleanAll()
+      })
+    })
+  })
 })
--- a/core/base-service/base-graphql.js
+++ b/core/base-service/base-graphql.js
@@ -20,7 +20,7 @@ class BaseGraphqlService extends BaseService {
  /**
   * Parse data from JSON endpoint
   *
-   * @param {string} buffer JSON repsonse from upstream API
+   * @param {string} buffer JSON response from upstream API
   * @returns {object} Parsed response
   */
  _parseJson(buffer) {
@@ -50,8 +50,10 @@ class BaseGraphqlService extends BaseService {
   *    See {@link https://github.com/sindresorhus/got/blob/main/documentation/7-retry.md#errorcodes got error codes}
   *    for allowed keys
   *    and {@link module:core/base-service/errors~RuntimeErrorProps} for allowed values
+   * @param {number[]} [attrs.logErrors=[429]] An array of http error codes
+   *    that will be logged (to sentry, if configured).
   * @param {Function} [attrs.transformJson=data => data] Function which takes the raw json and transforms it before
-   * further procesing. In case of multiple query in a single graphql call and few of them
+   * further processing. In case of multiple query in a single graphql call and few of them
   * throw error, partial data might be used ignoring the error.
   * @param {Function} [attrs.transformErrors=defaultTransformErrors]
   *    Function which takes an errors object from a GraphQL
@@ -69,6 +71,7 @@ class BaseGraphqlService extends BaseService {
    options = {},
    httpErrorMessages = {},
    systemErrors = {},
+    logErrors = [429],
    transformJson = data => data,
    transformErrors = defaultTransformErrors,
  }) {
@@ -83,6 +86,7 @@ class BaseGraphqlService extends BaseService {
      options: mergedOptions,
      httpErrors: httpErrorMessages,
      systemErrors,
+      logErrors,
    })
    const json = transformJson(this._parseJson(buffer))
    if (json.errors) {
--- a/core/base-service/base-json.js
+++ b/core/base-service/base-json.js
@@ -14,7 +14,7 @@ class BaseJsonService extends BaseService {
  /**
   * Parse data from JSON endpoint
   *
-   * @param {string} buffer JSON repsonse from upstream API
+   * @param {string} buffer JSON response from upstream API
   * @returns {object} Parsed response
   */
  _parseJson(buffer) {
@@ -40,6 +40,8 @@ class BaseJsonService extends BaseService {
   *    See {@link https://github.com/sindresorhus/got/blob/main/documentation/7-retry.md#errorcodes got error codes}
   *    for allowed keys
   *    and {@link module:core/base-service/errors~RuntimeErrorProps} for allowed values
+   * @param {number[]} [attrs.logErrors=[429]] An array of http error codes
+   *    that will be logged (to sentry, if configured).
   * @returns {object} Parsed response
   * @see https://github.com/sindresorhus/got/blob/main/documentation/2-options.md
   */
@@ -49,6 +51,7 @@ class BaseJsonService extends BaseService {
    options = {},
    httpErrors = {},
    systemErrors = {},
+    logErrors = [429],
  }) {
    const mergedOptions = {
      ...{ headers: { Accept: 'application/json' } },
@@ -59,6 +62,7 @@ class BaseJsonService extends BaseService {
      options: mergedOptions,
      httpErrors,
      systemErrors,
+      logErrors,
    })
    const json = this._parseJson(buffer)
    return this.constructor._validate(json, schema)
--- a/core/base-service/base-svg-scraping.js
+++ b/core/base-service/base-svg-scraping.js
@@ -63,6 +63,8 @@ class BaseSvgScrapingService extends BaseService {
   *    See {@link https://github.com/sindresorhus/got/blob/main/documentation/7-retry.md#errorcodes got error codes}
   *    for allowed keys
   *    and {@link module:core/base-service/errors~RuntimeErrorProps} for allowed values
+   * @param {number[]} [attrs.logErrors=[429]] An array of http error codes
+   *    that will be logged (to sentry, if configured).
   * @returns {object} Parsed response
   * @see https://github.com/sindresorhus/got/blob/main/documentation/2-options.md
   */
@@ -73,6 +75,7 @@ class BaseSvgScrapingService extends BaseService {
    options = {},
    httpErrors = {},
    systemErrors = {},
+    logErrors = [429],
  }) {
    const logTrace = (...args) => trace.logTrace('fetch', ...args)
    const mergedOptions = {
@@ -84,6 +87,7 @@ class BaseSvgScrapingService extends BaseService {
      options: mergedOptions,
      httpErrors,
      systemErrors,
+      logErrors,
    })
    logTrace(emojic.dart, 'Response SVG', buffer)
    const data = {
--- a/core/base-service/base-toml.js
+++ b/core/base-service/base-toml.js
@@ -33,6 +33,8 @@ class BaseTomlService extends BaseService {
   *    See {@link https://github.com/sindresorhus/got/blob/main/documentation/7-retry.md#errorcodes got error codes}
   *    for allowed keys
   *    and {@link module:core/base-service/errors~RuntimeErrorProps} for allowed values
+   * @param {number[]} [attrs.logErrors=[429]] An array of http error codes
+   *    that will be logged (to sentry, if configured).
   * @returns {object} Parsed response
   * @see https://github.com/sindresorhus/got/blob/main/documentation/2-options.md
   */
@@ -42,6 +44,7 @@ class BaseTomlService extends BaseService {
    options = {},
    httpErrors = {},
    systemErrors = {},
+    logErrors = [429],
  }) {
    const logTrace = (...args) => trace.logTrace('fetch', ...args)
    const mergedOptions = {
@@ -61,6 +64,7 @@ class BaseTomlService extends BaseService {
      options: mergedOptions,
      httpErrors,
      systemErrors,
+      logErrors,
    })
    let parsed
    try {
--- a/core/base-service/base-xml.js
+++ b/core/base-service/base-xml.js
@@ -34,6 +34,8 @@ class BaseXmlService extends BaseService {
   *    See {@link https://github.com/sindresorhus/got/blob/main/documentation/7-retry.md#errorcodes got error codes}
   *    for allowed keys
   *    and {@link module:core/base-service/errors~RuntimeErrorProps} for allowed values
+   * @param {number[]} [attrs.logErrors=[429]] An array of http error codes
+   *    that will be logged (to sentry, if configured).
   * @param {object} [attrs.parserOptions={}] Options to pass to fast-xml-parser. See
   *    [documentation](https://github.com/NaturalIntelligence/fast-xml-parser#xml-to-json)
   * @returns {object} Parsed response
@@ -46,6 +48,7 @@ class BaseXmlService extends BaseService {
    options = {},
    httpErrors = {},
    systemErrors = {},
+    logErrors = [429],
    parserOptions = {},
  }) {
    const logTrace = (...args) => trace.logTrace('fetch', ...args)
@@ -58,6 +61,7 @@ class BaseXmlService extends BaseService {
      options: mergedOptions,
      httpErrors,
      systemErrors,
+      logErrors,
    })
    const validateResult = XMLValidator.validate(buffer)
    if (validateResult !== true) {
--- a/core/base-service/base-yaml.js
+++ b/core/base-service/base-yaml.js
@@ -33,6 +33,8 @@ class BaseYamlService extends BaseService {
   *    See {@link https://github.com/sindresorhus/got/blob/main/documentation/7-retry.md#errorcodes got error codes}
   *    for allowed keys
   *    and {@link module:core/base-service/errors~RuntimeErrorProps} for allowed values
+   * @param {number[]} [attrs.logErrors=[429]] An array of http error codes
+   *    that will be logged (to sentry, if configured).
   * @param {object} [attrs.encoding='utf8'] Character encoding
   * @returns {object} Parsed response
   * @see https://github.com/sindresorhus/got/blob/main/documentation/2-options.md
@@ -43,6 +45,7 @@ class BaseYamlService extends BaseService {
    options = {},
    httpErrors = {},
    systemErrors = {},
+    logErrors = [429],
    encoding = 'utf8',
  }) {
    const logTrace = (...args) => trace.logTrace('fetch', ...args)
@@ -60,6 +63,7 @@ class BaseYamlService extends BaseService {
      options: mergedOptions,
      httpErrors,
      systemErrors,
+      logErrors,
    })
    let parsed
    try {
--- a/core/base-service/base.js
+++ b/core/base-service/base.js
@@ -19,7 +19,6 @@ import {
  InvalidParameter,
  Deprecated,
 } from './errors.js'
-import { validateExample, transformExample } from './examples.js'
 import { fetch } from './got.js'
 import { getEnum } from './openapi.js'
 import {
@@ -67,7 +66,6 @@ const serviceDataSchema = Joi.object({
  logoSvg: Joi.string(),
  logoColor: optionalStringWhenNamedLogoPresent,
  logoWidth: optionalNumberWhenAnyLogoPresent,
-  logoPosition: optionalNumberWhenAnyLogoPresent,
  cacheSeconds: Joi.number().integer().min(0),
  style: Joi.string(),
 })
@@ -144,31 +142,14 @@ class BaseService {
  static auth = undefined

  /**
-   * Array of Example objects describing example URLs for this service.
-   * These should use the format specified in `route`,
-   * and can be used to demonstrate how to use badges for this service.
-   *
-   * The preferred way to specify an example is with `namedParams` which are
-   * substituted into the service's compiled route pattern. The rendered badge
-   * is specified with `staticPreview`.
-   *
-   * For services which use a route `format`, the `pattern` can be specified as
-   * part of the example.
-   *
-   * @see {@link module:core/base-service/base~Example}
-   * @abstract
-   * @type {module:core/base-service/base~Example[]}
-   */
-  static examples = []
-
-  /**
-   * Optional: an OpenAPI Paths Object describing this service's
+   * An OpenAPI Paths Object describing this service's
   * route or routes in OpenAPI format.
   *
-   * @see https://swagger.io/specification/#paths-object
   * @abstract
+   * @see https://swagger.io/specification/#paths-object
+   * @type {module:core/base-service/service-definitions~openApiSchema}
   */
-  static openApi = undefined
+  static openApi = {}

  static get _cacheLength() {
    const cacheLengths = {
@@ -207,23 +188,17 @@ class BaseService {
      `Default badge data for ${this.name}`,
    )

-    this.examples.forEach((example, index) =>
-      validateExample(example, index, this),
-    )
-
    // ensure openApi spec matches route
-    if (this.openApi) {
-      const preparedRoute = prepareRoute(this.route)
-      for (const [key, value] of Object.entries(this.openApi)) {
-        let example = key
-        for (const param of value.get.parameters) {
-          example = example.replace(`{${param.name}}`, param.example)
-        }
-        if (!example.match(preparedRoute.regex)) {
-          throw new Error(
-            `Inconsistent Open Api spec and Route found for service ${this.name}`,
-          )
-        }
+    const preparedRoute = prepareRoute(this.route)
+    for (const [key, value] of Object.entries(this.openApi)) {
+      let example = key
+      for (const param of value.get.parameters) {
+        example = example.replace(`{${param.name}}`, param.example)
+      }
+      if (!example.match(preparedRoute.regex)) {
+        throw new Error(
+          `Inconsistent Open Api spec and Route found for service ${this.name}`,
+        )
      }
    }
  }
@@ -233,10 +208,6 @@ class BaseService {
    const { base, format, pattern } = this.route
    const queryParams = getQueryParamNames(this.route)

-    const examples = this.examples.map((example, index) =>
-      transformExample(example, index, this),
-    )
-
    let route
    if (pattern) {
      route = { pattern: makeFullUrl(base, pattern), queryParams }
@@ -246,7 +217,7 @@ class BaseService {
      route = undefined
    }

-    const result = { category, name, isDeprecated, route, examples, openApi }
+    const result = { category, name, isDeprecated, route, openApi }

    assertValidServiceDefinition(result, `getDefinition() for ${this.name}`)

@@ -263,7 +234,13 @@ class BaseService {
    this._metricHelper = metricHelper
  }

-  async _request({ url, options = {}, httpErrors = {}, systemErrors = {} }) {
+  async _request({
+    url,
+    options = {},
+    httpErrors = {},
+    systemErrors = {},
+    logErrors = [429],
+  }) {
    const logTrace = (...args) => trace.logTrace('fetch', ...args)
    let logUrl = url
    const logOptions = Object.assign({}, options)
@@ -290,7 +267,7 @@ class BaseService {
    )
    await this._meterResponse(res, buffer)
    logTrace(emojic.dart, 'Response status code', res.statusCode)
-    return checkErrorResponse(httpErrors)({ buffer, res })
+    return checkErrorResponse(httpErrors, logErrors)({ buffer, res })
  }

  static enabledMetrics = []
@@ -591,9 +568,11 @@ class BaseService {
 *    receives numeric can use `Joi.string()`. A boolean
 *    parameter should use `Joi.equal('')` and will receive an
 *    empty string on e.g. `?compact_message` and undefined
- *    when the parameter is absent. (Note that in,
- *    `examples.queryParams` boolean query params should be given
- *    `null` values.)
+ *    when the parameter is absent. In the OpenApi definitions,
+ *    this type of param should be documented as
+ *    queryParam({
+ *      name: 'compact_message', schema: { type: 'boolean' }, example: null
+ *    })
 */

 /**
@@ -608,30 +587,4 @@ class BaseService {
 *    configured credentials are present.
 */

-/**
- * @typedef {object} Example
- * @property {string} title
- *    Descriptive text that will be shown next to the badge. The default
- *    is to use the service class name, which probably is not what you want.
- * @property {object} namedParams
- *    An object containing the values of named parameters to
- *    substitute into the compiled route pattern.
- * @property {object} queryParams
- *    An object containing query parameters to include in the
- *    example URLs. For alphanumeric query parameters, specify a string value.
- *    For boolean query parameters, specify `null`.
- * @property {string} pattern
- *    The route pattern to compile. Defaults to `this.route.pattern`.
- * @property {object} staticPreview
- *    A rendered badge of the sort returned by `handle()` or
- *    `render()`: an object containing `message` and optional `label` and
- *    `color`. This is usually generated by invoking `this.render()` with some
- *    explicit props.
- * @property {string[]} keywords
- *    Additional keywords, other than words in the title. This helps
- *    users locate relevant badges.
- * @property {string} documentation
- *    An HTML string that is included in the badge popup.
- */
-
 export default BaseService
--- a/core/base-service/base.spec.js
+++ b/core/base-service/base.spec.js
@@ -4,6 +4,7 @@ import sinon from 'sinon'
 import prometheus from 'prom-client'
 import chaiAsPromised from 'chai-as-promised'
 import PrometheusMetrics from '../server/prometheus-metrics.js'
+import { pathParam, queryParam } from './openapi.js'
 import trace from './trace.js'
 import {
  NotFound,
@@ -31,14 +32,17 @@ class DummyService extends BaseService {
  static category = 'other'
  static route = { base: 'foo', pattern: ':namedParamA', queryParamSchema }

-  static examples = [
-    {
-      pattern: ':world',
-      namedParams: { world: 'World' },
-      staticPreview: this.render({ namedParamA: 'foo', queryParamA: 'bar' }),
-      keywords: ['hello'],
+  static openApi = {
+    '/foo/{namedParamA}': {
+      get: {
+        summary: 'Dummy Service',
+        parameters: [
+          pathParam({ name: 'namedParamA', example: 'foo' }),
+          queryParam({ name: 'queryParamA', example: 'bar' }),
+        ],
+      },
    },
-  ]
+  }

  static defaultBadgeData = { label: 'cat', namedLogo: 'appveyor' }

@@ -322,7 +326,7 @@ describe('BaseService', function () {
  })

  describe('ScoutCamp integration', function () {
-    // TODO Strangly, without the useless escape the regexes do not match in Node 12.
+    // TODO Strangely, without the useless escape the regexes do not match in Node 12.
    // eslint-disable-next-line no-useless-escape
    const expectedRouteRegex = /^\/foo(?:\/([^\/#\?]+?))(|\.svg|\.json)$/

@@ -373,7 +377,7 @@ describe('BaseService', function () {
        namedLogo: undefined,
        logo: undefined,
        logoWidth: undefined,
-        logoPosition: undefined,
+        logoSize: undefined,
        links: [],
        labelColor: undefined,
        cacheLengthSeconds: undefined,
@@ -383,7 +387,7 @@ describe('BaseService', function () {

  describe('getDefinition', function () {
    it('returns the expected result', function () {
-      const { category, name, isDeprecated, route, examples } =
+      const { category, name, isDeprecated, route, openApi } =
        DummyService.getDefinition()
      expect({
        category,
@@ -400,7 +404,7 @@ describe('BaseService', function () {
        },
      })
      // The in-depth tests for examples reside in examples.spec.js
-      expect(examples).to.have.lengthOf(1)
+      expect(Object.keys(openApi)).to.have.lengthOf(1)
    })
  })

--- a/core/base-service/check-error-response.js
+++ b/core/base-service/check-error-response.js
@@ -1,3 +1,4 @@
+import log from '../server/log.js'
 import { NotFound, InvalidResponse, Inaccessible } from './errors.js'

 const defaultErrorMessages = {
@@ -5,7 +6,7 @@ const defaultErrorMessages = {
  429: 'rate limited by upstream service',
 }

-export default function checkErrorResponse(httpErrors = {}) {
+export default function checkErrorResponse(httpErrors = {}, logErrors = [429]) {
  return async function ({ buffer, res }) {
    let error
    httpErrors = { ...defaultErrorMessages, ...httpErrors }
@@ -25,6 +26,11 @@ export default function checkErrorResponse(httpErrors = {}) {
        error = new InvalidResponse(props)
      }
    }
+
+    if (logErrors.includes(res.statusCode)) {
+      log.error(new Error(`${res.statusCode} calling ${res.requestUrl.origin}`))
+    }
+
    if (error) {
      error.response = res
      error.buffer = buffer
--- a/core/base-service/check-error-response.spec.js
+++ b/core/base-service/check-error-response.spec.js
@@ -47,7 +47,7 @@ describe('async error handler', function () {

  context('when status is 429', function () {
    const buffer = Buffer.from('some stuff')
-    const res = { statusCode: 429 }
+    const res = { statusCode: 429, requestUrl: new URL('https://example.com/') }

    it('throws InvalidResponse', async function () {
      try {
--- a/core/base-service/coalesce-badge.js
+++ b/core/base-service/coalesce-badge.js
@@ -2,7 +2,8 @@ import {
  decodeDataUrlFromQueryParam,
  prepareNamedLogo,
 } from '../../lib/logos.js'
-import { svg2base64 } from '../../lib/svg-helpers.js'
+import { svg2base64, getIconSize } from '../../lib/svg-helpers.js'
+import { DEFAULT_LOGO_HEIGHT } from '../../badge-maker/lib/constants.js'
 import coalesce from './coalesce.js'
 import toArray from './to-array.js'

@@ -22,9 +23,8 @@ import toArray from './to-array.js'
 //    base64-encoded logos). Otherwise the default color is used. If the color
 //    is specified for a multicolor Shield logo, the named logo will be used and
 //    colored. The appearance of the logo can be customized using `logoWidth`,
-//    and in the case of the popout badge, `logoPosition`. When `?logo=` is
-//    specified, any logo-related parameters specified dynamically by the
-//    service, or by default in the service, are ignored.
+//    When `?logo=` is specified, any logo-related parameters specified
+//    dynamically by the service, or by default in the service, are ignored.
 // 2. The second precedence is the dynamic logo returned by a service. This is
 //    used only by the Endpoint badge. The `logoColor` can be overridden by the
 //    query string.
@@ -55,7 +55,7 @@ export default function coalesceBadge(
  } = overrides
  let {
    logoWidth: overrideLogoWidth,
-    logoPosition: overrideLogoPosition,
+    logoSize: overrideLogoSize,
    color: overrideColor,
    labelColor: overrideLabelColor,
  } = overrides
@@ -76,7 +76,6 @@ export default function coalesceBadge(
    overrideLabelColor = `${overrideLabelColor}`
  }
  overrideLogoWidth = +overrideLogoWidth || undefined
-  overrideLogoPosition = +overrideLogoPosition || undefined

  const {
    isError,
@@ -87,8 +86,8 @@ export default function coalesceBadge(
    logoSvg: serviceLogoSvg,
    namedLogo: serviceNamedLogo,
    logoColor: serviceLogoColor,
+    logoSize: serviceLogoSize,
    logoWidth: serviceLogoWidth,
-    logoPosition: serviceLogoPosition,
    link: serviceLink,
    cacheSeconds: serviceCacheSeconds,
    style: serviceStyle,
@@ -119,7 +118,7 @@ export default function coalesceBadge(
    style = 'flat'
  }

-  let namedLogo, namedLogoColor, logoWidth, logoPosition, logoSvgBase64
+  let namedLogo, namedLogoColor, logoSize, logoWidth, logoSvgBase64
  if (overrideLogo) {
    // `?logo=` could be a named logo or encoded svg.
    const overrideLogoSvgBase64 = decodeDataUrlFromQueryParam(overrideLogo)
@@ -133,8 +132,8 @@ export default function coalesceBadge(
    }
    // If the logo has been overridden it does not make sense to inherit the
    // original width or position.
+    logoSize = overrideLogoSize
    logoWidth = overrideLogoWidth
-    logoPosition = overrideLogoPosition
  } else {
    if (serviceLogoSvg) {
      logoSvgBase64 = svg2base64(serviceLogoSvg)
@@ -145,13 +144,20 @@ export default function coalesceBadge(
      )
      namedLogoColor = coalesce(overrideLogoColor, serviceLogoColor)
    }
+    logoSize = coalesce(overrideLogoSize, serviceLogoSize)
    logoWidth = coalesce(overrideLogoWidth, serviceLogoWidth)
-    logoPosition = coalesce(overrideLogoPosition, serviceLogoPosition)
  }
  if (namedLogo) {
+    const iconSize = getIconSize(String(namedLogo).toLowerCase())
+
+    if (!logoWidth && iconSize && logoSize === 'auto') {
+      logoWidth = (iconSize.width / iconSize.height) * DEFAULT_LOGO_HEIGHT
+    }
+
    logoSvgBase64 = prepareNamedLogo({
      name: namedLogo,
      color: namedLogoColor,
+      size: logoSize,
      style,
    })
  }
@@ -178,7 +184,7 @@ export default function coalesceBadge(
    namedLogo,
    logo: logoSvgBase64,
    logoWidth,
-    logoPosition,
+    logoSize,
    links: toArray(overrideLink || serviceLink),
    cacheLengthSeconds: coalesce(serviceCacheSeconds, defaultCacheSeconds),
  }
--- a/core/base-service/coalesce-badge.spec.js
+++ b/core/base-service/coalesce-badge.spec.js
@@ -195,14 +195,13 @@ describe('coalesceBadge', function () {
      ).to.equal(getSimpleIcon({ name: 'npm', color: 'blue' })).and.not.be.empty
    })

-    it("when the logo is overridden, it ignores the service's logo color, position, and width", function () {
+    it("when the logo is overridden, it ignores the service's logo color and width", function () {
      expect(
        coalesceBadge(
          { logo: 'npm' },
          {
            namedLogo: 'appveyor',
            logoColor: 'red',
-            logoPosition: -3,
            logoWidth: 100,
          },
          {},
@@ -260,6 +259,20 @@ describe('coalesceBadge', function () {
    })
  })

+  describe('Logo size', function () {
+    it('overrides the logoSize', function () {
+      expect(coalesceBadge({ logoSize: 'auto' }, {}, {})).to.include({
+        logoSize: 'auto',
+      })
+    })
+
+    it('applies the logo size', function () {
+      expect(
+        coalesceBadge({}, { namedLogo: 'npm', logoSize: 'auto' }, {}),
+      ).to.include({ logoSize: 'auto' })
+    })
+  })
+
  describe('Logo width', function () {
    it('overrides the logoWidth', function () {
      expect(coalesceBadge({ logoWidth: 20 }, {}, {})).to.include({
@@ -274,20 +287,6 @@ describe('coalesceBadge', function () {
    })
  })

-  describe('Logo position', function () {
-    it('overrides the logoPosition', function () {
-      expect(coalesceBadge({ logoPosition: -10 }, {}, {})).to.include({
-        logoPosition: -10,
-      })
-    })
-
-    it('applies the logo position', function () {
-      expect(
-        coalesceBadge({}, { namedLogo: 'npm', logoPosition: -10 }, {}),
-      ).to.include({ logoPosition: -10 })
-    })
-  })
-
  describe('Links', function () {
    it('overrides the links', function () {
      expect(
--- a/core/base-service/coalesce.spec.js
+++ b/core/base-service/coalesce.spec.js
@@ -6,7 +6,7 @@ import coalesce from './coalesce.js'
 // https://github.com/royriojas/coalescy for these tests!

 describe('coalesce', function () {
-  test(coalesce, function () {
+  test(coalesce, () => {
    given().expect(undefined)
    given(null, []).expect([])
    given(null, [], {}).expect([])
--- a/core/base-service/deprecated-service.js
+++ b/core/base-service/deprecated-service.js
@@ -10,14 +10,12 @@ const attrSchema = Joi.object({
  name: Joi.string(),
  label: Joi.string(),
  category: isValidCategory,
-  // The content of examples is validated later, via `transformExamples()`.
-  examples: Joi.array().default([]),
  message: Joi.string(),
  dateAdded: Joi.date().required(),
 }).required()

 function deprecatedService(attrs) {
-  const { route, name, label, category, examples, message } = Joi.attempt(
+  const { route, name, label, category, message } = Joi.attempt(
    attrs,
    attrSchema,
    `Deprecated service for ${attrs.route.base}`,
@@ -33,7 +31,6 @@ function deprecatedService(attrs) {
    static category = category
    static isDeprecated = true
    static route = route
-    static examples = examples
    static defaultBadgeData = { label }

    async handle() {
--- a/core/base-service/deprecated-service.spec.js
+++ b/core/base-service/deprecated-service.spec.js
@@ -36,16 +36,6 @@ describe('DeprecatedService', function () {
    expect(service.category).to.equal(category)
  })

-  it('sets specified examples', function () {
-    const examples = [
-      {
-        title: 'Not sure we would have examples',
-      },
-    ]
-    const service = deprecatedService({ ...commonAttrs, examples })
-    expect(service.examples).to.deep.equal(examples)
-  })
-
  it('uses default deprecation message when no message specified', async function () {
    const service = deprecatedService({ ...commonAttrs })
    expect(await service.invoke()).to.deep.equal({
--- a/core/base-service/examples.js
+++ b/core/base-service/examples.js
@@ -1,155 +0,0 @@
-import Joi from 'joi'
-import { pathToRegexp, compile } from 'path-to-regexp'
-import categories from '../../services/categories.js'
-import coalesceBadge from './coalesce-badge.js'
-import { makeFullUrl } from './route.js'
-
-const optionalObjectOfKeyValues = Joi.object().pattern(
-  /./,
-  Joi.string().allow(null),
-)
-
-const schema = Joi.object({
-  // This should be:
-  // title: Joi.string().required(),
-  title: Joi.string(),
-  namedParams: optionalObjectOfKeyValues.required(),
-  queryParams: optionalObjectOfKeyValues.default({}),
-  pattern: Joi.string(),
-  staticPreview: Joi.object({
-    label: Joi.string(),
-    message: Joi.alternatives()
-      .try(Joi.string().allow('').required(), Joi.number())
-      .required(),
-    color: Joi.string(),
-    style: Joi.string(),
-  }).required(),
-  keywords: Joi.array().items(Joi.string()).default([]),
-  documentation: Joi.string(), // Valid HTML.
-}).required()
-
-function validateExample(example, index, ServiceClass) {
-  const result = Joi.attempt(
-    example,
-    schema,
-    `Example for ${ServiceClass.name} at index ${index}`,
-  )
-
-  const { pattern, namedParams } = result
-
-  if (!pattern && !ServiceClass.route.pattern) {
-    throw new Error(
-      `Example for ${ServiceClass.name} at index ${index} does not declare a pattern`,
-    )
-  }
-  if (pattern === ServiceClass.route.pattern) {
-    throw new Error(
-      `Example for ${ServiceClass.name} at index ${index} declares a redundant pattern which should be removed`,
-    )
-  }
-
-  // Make sure we can build the full URL using these patterns.
-  try {
-    compile(pattern || ServiceClass.route.pattern, {
-      encode: encodeURIComponent,
-    })(namedParams)
-  } catch (e) {
-    throw Error(
-      `In example for ${
-        ServiceClass.name
-      } at index ${index}, ${e.message.toLowerCase()}`,
-    )
-  }
-  // Make sure there are no extra keys.
-  let keys = []
-  pathToRegexp(pattern || ServiceClass.route.pattern, keys, {
-    strict: true,
-    sensitive: true,
-  })
-  keys = keys.map(({ name }) => name)
-  const extraKeys = Object.keys(namedParams).filter(k => !keys.includes(k))
-  if (extraKeys.length) {
-    throw Error(
-      `In example for ${
-        ServiceClass.name
-      } at index ${index}, namedParams contains unknown keys: ${extraKeys.join(
-        ', ',
-      )}`,
-    )
-  }
-
-  if (example.keywords) {
-    // Make sure the keywords are at least two characters long.
-    const tinyKeywords = example.keywords.filter(k => k.length < 2)
-    if (tinyKeywords.length) {
-      throw Error(
-        `In example for ${
-          ServiceClass.name
-        } at index ${index}, keywords contains words that are less than two characters long: ${tinyKeywords.join(
-          ', ',
-        )}`,
-      )
-    }
-    // Make sure none of the keywords are already included in the title.
-    const title = (example.title || ServiceClass.name).toLowerCase()
-    const redundantKeywords = example.keywords.filter(k =>
-      title.includes(k.toLowerCase()),
-    )
-    if (redundantKeywords.length) {
-      throw Error(
-        `In example for ${
-          ServiceClass.name
-        } at index ${index}, keywords contains words that are already in the title: ${redundantKeywords.join(
-          ', ',
-        )}`,
-      )
-    }
-  }
-
-  return result
-}
-
-function transformExample(inExample, index, ServiceClass) {
-  const {
-    // We should get rid of this transform, since the class name is never what
-    // we want to see.
-    title = ServiceClass.name,
-    namedParams,
-    queryParams,
-    pattern,
-    staticPreview,
-    keywords,
-    documentation,
-  } = validateExample(inExample, index, ServiceClass)
-
-  const { label, message, color, style, namedLogo } = coalesceBadge(
-    {},
-    staticPreview,
-    ServiceClass.defaultBadgeData,
-    ServiceClass,
-  )
-
-  const category = categories.find(c => c.id === ServiceClass.category)
-  return {
-    title,
-    example: {
-      pattern: makeFullUrl(
-        ServiceClass.route.base,
-        pattern || ServiceClass.route.pattern,
-      ),
-      namedParams,
-      queryParams,
-    },
-    preview: {
-      label,
-      message: `${message}`,
-      color,
-      style: style === 'flat' ? undefined : style,
-      namedLogo,
-    },
-    keywords: category ? keywords.concat(category.keywords) : keywords,
-    documentation: documentation ? { __html: documentation } : undefined,
-  }
-}
-
-export { validateExample, transformExample }
--- a/core/base-service/examples.spec.js
+++ b/core/base-service/examples.spec.js
@@ -1,167 +0,0 @@
-import { expect } from 'chai'
-import { test, given } from 'sazerac'
-import { validateExample, transformExample } from './examples.js'
-
-describe('validateExample function', function () {
-  it('passes valid examples', function () {
-    const validExamples = [
-      {
-        title: 'Package manager versioning badge',
-        staticPreview: { message: '123' },
-        pattern: 'dt/:package',
-        namedParams: { package: 'mypackage' },
-        keywords: ['semver', 'management'],
-      },
-    ]
-
-    validExamples.forEach(example => {
-      expect(() =>
-        validateExample(example, 0, { route: {}, name: 'mockService' }),
-      ).not.to.throw(Error)
-    })
-  })
-
-  it('rejects invalid examples', function () {
-    const invalidExamples = [
-      {},
-      { staticPreview: { message: '123' } },
-      {
-        staticPreview: { message: '123' },
-        pattern: 'dt/:package',
-        namedParams: { package: 'mypackage' },
-        exampleUrl: 'dt/mypackage',
-      },
-      { staticPreview: { message: '123' }, pattern: 'dt/:package' },
-      {
-        staticPreview: { message: '123' },
-        pattern: 'dt/:package',
-        previewUrl: 'dt/mypackage',
-      },
-      {
-        staticPreview: { message: '123' },
-        pattern: 'dt/:package',
-        exampleUrl: 'dt/mypackage',
-      },
-      { previewUrl: 'dt/mypackage' },
-      {
-        staticPreview: { message: '123' },
-        pattern: 'dt/:package',
-        namedParams: { package: 'mypackage' },
-        keywords: ['a'], // Keyword too short.
-      },
-      {
-        staticPreview: { message: '123' },
-        pattern: 'dt/:package',
-        namedParams: { package: 'mypackage' },
-        keywords: ['mockService'], // No title and keyword matching the class name.
-      },
-      {
-        title: 'Package manager versioning badge',
-        staticPreview: { message: '123' },
-        pattern: 'dt/:package',
-        namedParams: { package: 'mypackage' },
-        keywords: ['version'], // Keyword included in title.
-      },
-    ]
-
-    invalidExamples.forEach(example => {
-      expect(() =>
-        validateExample(example, 0, { route: {}, name: 'mockService' }),
-      ).to.throw(Error)
-    })
-  })
-})
-
-test(transformExample, function () {
-  const ExampleService = {
-    name: 'ExampleService',
-    route: {
-      base: 'some-service',
-      pattern: ':interval/:packageName',
-    },
-    defaultBadgeData: {
-      label: 'downloads',
-    },
-    category: 'platform-support',
-  }
-
-  given(
-    {
-      pattern: 'dt/:packageName',
-      namedParams: { packageName: 'express' },
-      staticPreview: { message: '50k' },
-      keywords: ['hello'],
-    },
-    0,
-    ExampleService,
-  ).expect({
-    title: 'ExampleService',
-    example: {
-      pattern: '/some-service/dt/:packageName',
-      namedParams: { packageName: 'express' },
-      queryParams: {},
-    },
-    preview: {
-      label: 'downloads',
-      message: '50k',
-      color: 'lightgrey',
-      namedLogo: undefined,
-      style: undefined,
-    },
-    keywords: ['hello', 'platform'],
-    documentation: undefined,
-  })
-
-  given(
-    {
-      namedParams: { interval: 'dt', packageName: 'express' },
-      staticPreview: { message: '50k' },
-      keywords: ['hello'],
-    },
-    0,
-    ExampleService,
-  ).expect({
-    title: 'ExampleService',
-    example: {
-      pattern: '/some-service/:interval/:packageName',
-      namedParams: { interval: 'dt', packageName: 'express' },
-      queryParams: {},
-    },
-    preview: {
-      label: 'downloads',
-      message: '50k',
-      color: 'lightgrey',
-      namedLogo: undefined,
-      style: undefined,
-    },
-    keywords: ['hello', 'platform'],
-    documentation: undefined,
-  })
-
-  given(
-    {
-      namedParams: { interval: 'dt', packageName: 'express' },
-      queryParams: { registry_url: 'http://example.com/' },
-      staticPreview: { message: '50k' },
-      keywords: ['hello'],
-    },
-    0,
-    ExampleService,
-  ).expect({
-    title: 'ExampleService',
-    example: {
-      pattern: '/some-service/:interval/:packageName',
-      namedParams: { interval: 'dt', packageName: 'express' },
-      queryParams: { registry_url: 'http://example.com/' },
-    },
-    preview: {
-      label: 'downloads',
-      message: '50k',
-      color: 'lightgrey',
-      namedLogo: undefined,
-      style: undefined,
-    },
-    keywords: ['hello', 'platform'],
-    documentation: undefined,
-  })
-})
--- a/core/base-service/legacy-request-handler.js
+++ b/core/base-service/legacy-request-handler.js
@@ -11,7 +11,7 @@ const globalQueryParams = new Set([
  'link',
  'logo',
  'logoColor',
-  'logoPosition',
+  'logoSize',
  'logoWidth',
  'link',
  'colorA',
--- a/core/base-service/openapi.js
+++ b/core/base-service/openapi.js
@@ -9,6 +9,7 @@ const globalParamRefs = [
  { $ref: '#/components/parameters/style' },
  { $ref: '#/components/parameters/logo' },
  { $ref: '#/components/parameters/logoColor' },
+  { $ref: '#/components/parameters/logoSize' },
  { $ref: '#/components/parameters/label' },
  { $ref: '#/components/parameters/labelColor' },
  { $ref: '#/components/parameters/color' },
@@ -46,13 +47,6 @@ function getCodeSamples(altText) {
  ]
 }

-function pattern2openapi(pattern) {
-  return pattern
-    .replace(/:([A-Za-z0-9_\-.]+)(?=[/]?)/g, (matches, grp1) => `{${grp1}}`)
-    .replace(/\([^)]*\)/g, '')
-    .replace(/\+$/, '')
-}
-
 function getEnum(pattern, paramName) {
  const re = new RegExp(`${paramName}\\(([A-Za-z0-9_\\-|]+)\\)`)
  const match = pattern.match(re)
@@ -65,126 +59,6 @@ function getEnum(pattern, paramName) {
  return match[1].split('|')
 }

-function param2openapi(pattern, paramName, exampleValue, paramType) {
-  const outParam = {}
-  outParam.name = paramName
-  // We don't have description if we are building the OpenAPI spec from examples[]
-  outParam.in = paramType
-  if (paramType === 'path') {
-    outParam.required = true
-  } else {
-    /* Occasionally we do have required query params, but we can't
-    detect this if we are building the OpenAPI spec from examples[]
-    so just assume all query params are optional */
-    outParam.required = false
-  }
-
-  if (exampleValue === null && paramType === 'query') {
-    outParam.schema = { type: 'boolean' }
-    outParam.allowEmptyValue = true
-  } else {
-    outParam.schema = { type: 'string' }
-  }
-
-  if (paramType === 'path') {
-    outParam.schema.enum = getEnum(pattern, paramName)
-  }
-
-  outParam.example = exampleValue
-  return outParam
-}
-
-function getVariants(pattern) {
-  /*
-  given a URL pattern (which may include '/one/or/:more?/:optional/:parameters*')
-  return an array of all possible permutations:
-  [
-    '/one/or/:more/:optional/:parameters',
-    '/one/or/:optional/:parameters',
-    '/one/or/:more/:optional',
-    '/one/or/:optional',
-  ]
-  */
-  const patterns = [pattern.split('/')]
-  while (patterns.flat().find(p => p.endsWith('?') || p.endsWith('*'))) {
-    for (let i = 0; i < patterns.length; i++) {
-      const pattern = patterns[i]
-      for (let j = 0; j < pattern.length; j++) {
-        const path = pattern[j]
-        if (path.endsWith('?') || path.endsWith('*')) {
-          pattern[j] = path.slice(0, -1)
-          patterns.push(patterns[i].filter(p => p !== pattern[j]))
-        }
-      }
-    }
-  }
-  for (let i = 0; i < patterns.length; i++) {
-    patterns[i] = patterns[i].join('/')
-  }
-  return patterns
-}
-
-function examples2openapi(examples) {
-  const paths = {}
-  for (const example of examples) {
-    const patterns = getVariants(example.example.pattern)
-
-    for (const pattern of patterns) {
-      const openApiPattern = pattern2openapi(pattern)
-      if (
-        openApiPattern.includes('*') ||
-        openApiPattern.includes('?') ||
-        openApiPattern.includes('+') ||
-        openApiPattern.includes('(')
-      ) {
-        throw new Error(`unexpected characters in pattern '${openApiPattern}'`)
-      }
-
-      /*
-      There's several things going on in this block:
-      1. Filter out any examples for params that don't appear
-         in this variant of the route
-      2. Make sure we add params to the array
-         in the same order they appear in the route
-      3. If there are any params we don't have an example value for,
-         make sure they still appear in the pathParams array with
-         exampleValue == undefined anyway
-      */
-      const pathParams = []
-      for (const param of openApiPattern
-        .split('/')
-        .filter(p => p.startsWith('{') && p.endsWith('}'))) {
-        const paramName = param.slice(1, -1)
-        const exampleValue = example.example.namedParams[paramName]
-        pathParams.push(param2openapi(pattern, paramName, exampleValue, 'path'))
-      }
-
-      const queryParams = example.example.queryParams || {}
-
-      const parameters = [
-        ...pathParams,
-        ...Object.entries(queryParams).map(([paramName, exampleValue]) =>
-          param2openapi(pattern, paramName, exampleValue, 'query'),
-        ),
-        ...globalParamRefs,
-      ]
-      paths[openApiPattern] = {
-        get: {
-          summary: example.title,
-          description: example?.documentation?.__html
-            .replace(/<br>/g, '<br />') // react does not like <br>
-            .replace(/{/g, '&#123;')
-            .replace(/}/g, '&#125;')
-            .replace(/<style>(.|\n)*?<\/style>/, ''), // workaround for w3c-validation TODO: remove later
-          parameters,
-          'x-code-samples': getCodeSamples(example.title),
-        },
-      }
-    }
-  }
-  return paths
-}
-
 function addGlobalProperties(endpoints) {
  const paths = {}
  for (const key of Object.keys(endpoints)) {
@@ -198,33 +72,28 @@ function addGlobalProperties(endpoints) {
  return paths
 }

-function services2openapi(services) {
-  const paths = {}
-  for (const service of services) {
-    if (service.openApi) {
-      // if the service declares its own OpenAPI definition, use that...
-      for (const [key, value] of Object.entries(
-        addGlobalProperties(service.openApi),
-      )) {
-        if (key in paths) {
-          throw new Error(`Conflicting route: ${key}`)
-        }
-        paths[key] = value
-      }
-    } else {
-      // ...otherwise do our best to build one from examples[]
-      for (const [key, value] of Object.entries(
-        examples2openapi(service.examples),
-      )) {
-        // allow conflicting routes for legacy examples
-        paths[key] = value
-      }
-    }
-  }
-  return paths
+function sortPaths(obj) {
+  const entries = Object.entries(obj)
+  entries.sort((a, b) => a[1].get.summary.localeCompare(b[1].get.summary))
+  return Object.fromEntries(entries)
 }

-function category2openapi(category, services) {
+function services2openapi(services, sort) {
+  const paths = {}
+  for (const service of services) {
+    for (const [key, value] of Object.entries(
+      addGlobalProperties(service.openApi),
+    )) {
+      if (key in paths && key !== '/github/{variant}/{user}/{repo}') {
+        throw new Error(`Conflicting route: ${key}`)
+      }
+      paths[key] = value
+    }
+  }
+  return sort ? sortPaths(paths) : paths
+}
+
+function category2openapi({ category, services, sort = false }) {
  const spec = {
    openapi: '3.0.0',
    info: {
@@ -241,10 +110,12 @@ function category2openapi(category, services) {
          name: 'style',
          in: 'query',
          required: false,
-          description:
-            'One of: flat (default), flat-square, plastic, for-the-badge, social',
+          description: `If not specified, the default style for this badge is "${
+            category.name.toLowerCase() === 'social' ? 'social' : 'flat'
+          }".`,
          schema: {
            type: 'string',
+            enum: ['flat', 'flat-square', 'plastic', 'for-the-badge', 'social'],
          },
          example: 'flat',
        },
@@ -270,6 +141,17 @@ function category2openapi(category, services) {
          },
          example: 'violet',
        },
+        logoSize: {
+          name: 'logoSize',
+          in: 'query',
+          required: false,
+          description:
+            'Make icons adaptively resize by setting `auto`. Useful for some wider logos like `amd` and `amg`. Supported for simple-icons logos only.',
+          schema: {
+            type: 'string',
+          },
+          example: 'auto',
+        },
        label: {
          name: 'label',
          in: 'query',
@@ -332,7 +214,7 @@ function category2openapi(category, services) {
        },
      },
    },
-    paths: services2openapi(services),
+    paths: services2openapi(services, sort),
  }

  return spec
@@ -363,7 +245,7 @@ function pathParam({
 *   { name: 'name2', example: 'example2' },
 * )
 * ```
- * is equivilent to
+ * is equivalent to
 * ```
 * const params = [
 *   pathParam({ name: 'name1', example: 'example1' }),
@@ -409,11 +291,11 @@ function queryParam({
 *   { name: 'name2', example: 'example2' },
 * )
 * ```
- * is equivilent to
+ * is equivalent to
 * ```
 * const params = [
 *   queryParam({ name: 'name1', example: 'example1' }),
- *   queryParams({ name: 'name2', example: 'example2' }),
+ *   queryParam({ name: 'name2', example: 'example2' }),
 * ]
 * ```
 *
--- a/core/base-service/openapi.spec.js
+++ b/core/base-service/openapi.spec.js
@@ -58,27 +58,6 @@ class OpenApiService extends BaseJsonService {
  }
 }

-class LegacyService extends BaseJsonService {
-  static category = 'build'
-  static route = { base: 'legacy/service', pattern: ':packageName/:distTag*' }
-
-  // this service defines an Examples Array
-  static examples = [
-    {
-      title: 'LegacyService Title',
-      namedParams: { packageName: 'badge-maker' },
-      staticPreview: { label: 'build', message: 'passing' },
-      documentation: 'LegacyService Description',
-    },
-    {
-      title: 'LegacyService Title (with Tag)',
-      namedParams: { packageName: 'badge-maker', distTag: 'latest' },
-      staticPreview: { label: 'build', message: 'passing' },
-      documentation: 'LegacyService Description (with Tag)',
-    },
-  ]
-}
-
 const expected = {
  openapi: '3.0.0',
  info: { version: '1.0.0', title: 'build', license: { name: 'CC0' } },
@@ -89,8 +68,11 @@ const expected = {
        in: 'query',
        required: false,
        description:
-          'One of: flat (default), flat-square, plastic, for-the-badge, social',
-        schema: { type: 'string' },
+          'If not specified, the default style for this badge is "flat".',
+        schema: {
+          enum: ['flat', 'flat-square', 'plastic', 'for-the-badge', 'social'],
+          type: 'string',
+        },
        example: 'flat',
      },
      logo: {
@@ -111,6 +93,17 @@ const expected = {
        schema: { type: 'string' },
        example: 'violet',
      },
+      logoSize: {
+        name: 'logoSize',
+        in: 'query',
+        required: false,
+        description:
+          'Make icons adaptively resize by setting `auto`. Useful for some wider logos like `amd` and `amg`. Supported for simple-icons logos only.',
+        schema: {
+          type: 'string',
+        },
+        example: 'auto',
+      },
      label: {
        name: 'label',
        in: 'query',
@@ -176,6 +169,7 @@ const expected = {
          { $ref: '#/components/parameters/style' },
          { $ref: '#/components/parameters/logo' },
          { $ref: '#/components/parameters/logoColor' },
+          { $ref: '#/components/parameters/logoSize' },
          { $ref: '#/components/parameters/label' },
          { $ref: '#/components/parameters/labelColor' },
          { $ref: '#/components/parameters/color' },
@@ -231,6 +225,7 @@ const expected = {
          { $ref: '#/components/parameters/style' },
          { $ref: '#/components/parameters/logo' },
          { $ref: '#/components/parameters/logoColor' },
+          { $ref: '#/components/parameters/logoSize' },
          { $ref: '#/components/parameters/label' },
          { $ref: '#/components/parameters/labelColor' },
          { $ref: '#/components/parameters/color' },
@@ -263,105 +258,6 @@ const expected = {
        ],
      },
    },
-    '/legacy/service/{packageName}/{distTag}': {
-      get: {
-        summary: 'LegacyService Title (with Tag)',
-        description: 'LegacyService Description (with Tag)',
-        parameters: [
-          {
-            name: 'packageName',
-            in: 'path',
-            required: true,
-            schema: { type: 'string' },
-            example: 'badge-maker',
-          },
-          {
-            name: 'distTag',
-            in: 'path',
-            required: true,
-            schema: { type: 'string' },
-            example: 'latest',
-          },
-          { $ref: '#/components/parameters/style' },
-          { $ref: '#/components/parameters/logo' },
-          { $ref: '#/components/parameters/logoColor' },
-          { $ref: '#/components/parameters/label' },
-          { $ref: '#/components/parameters/labelColor' },
-          { $ref: '#/components/parameters/color' },
-          { $ref: '#/components/parameters/cacheSeconds' },
-          { $ref: '#/components/parameters/link' },
-        ],
-        'x-code-samples': [
-          { lang: 'URL', label: 'URL', source: '$url' },
-          {
-            lang: 'Markdown',
-            label: 'Markdown',
-            source: '![LegacyService Title (with Tag)]($url)',
-          },
-          {
-            lang: 'reStructuredText',
-            label: 'rSt',
-            source: '.. image:: $url\n   :alt: LegacyService Title (with Tag)',
-          },
-          {
-            lang: 'AsciiDoc',
-            label: 'AsciiDoc',
-            source: 'image:$url[LegacyService Title (with Tag)]',
-          },
-          {
-            lang: 'HTML',
-            label: 'HTML',
-            source: '<img alt="LegacyService Title (with Tag)" src="$url">',
-          },
-        ],
-      },
-    },
-    '/legacy/service/{packageName}': {
-      get: {
-        summary: 'LegacyService Title (with Tag)',
-        description: 'LegacyService Description (with Tag)',
-        parameters: [
-          {
-            name: 'packageName',
-            in: 'path',
-            required: true,
-            schema: { type: 'string' },
-            example: 'badge-maker',
-          },
-          { $ref: '#/components/parameters/style' },
-          { $ref: '#/components/parameters/logo' },
-          { $ref: '#/components/parameters/logoColor' },
-          { $ref: '#/components/parameters/label' },
-          { $ref: '#/components/parameters/labelColor' },
-          { $ref: '#/components/parameters/color' },
-          { $ref: '#/components/parameters/cacheSeconds' },
-          { $ref: '#/components/parameters/link' },
-        ],
-        'x-code-samples': [
-          { lang: 'URL', label: 'URL', source: '$url' },
-          {
-            lang: 'Markdown',
-            label: 'Markdown',
-            source: '![LegacyService Title (with Tag)]($url)',
-          },
-          {
-            lang: 'reStructuredText',
-            label: 'rSt',
-            source: '.. image:: $url\n   :alt: LegacyService Title (with Tag)',
-          },
-          {
-            lang: 'AsciiDoc',
-            label: 'AsciiDoc',
-            source: 'image:$url[LegacyService Title (with Tag)]',
-          },
-          {
-            lang: 'HTML',
-            label: 'HTML',
-            source: '<img alt="LegacyService Title (with Tag)" src="$url">',
-          },
-        ],
-      },
-    },
  },
 }

@@ -374,10 +270,10 @@ describe('category2openapi', function () {
  it('generates an Open API spec', function () {
    expect(
      clean(
-        category2openapi({ name: 'build' }, [
-          OpenApiService.getDefinition(),
-          LegacyService.getDefinition(),
-        ]),
+        category2openapi({
+          category: { name: 'build' },
+          services: [OpenApiService.getDefinition()],
+        }),
      ),
    ).to.deep.equal(expected)
  })
--- a/core/base-service/redirector.js
+++ b/core/base-service/redirector.js
@@ -10,6 +10,7 @@ import {
 import { isValidCategory } from './categories.js'
 import { MetricHelper } from './metric-helper.js'
 import { isValidRoute, prepareRoute, namedParamsForMatch } from './route.js'
+import { openApiSchema } from './service-definitions.js'
 import trace from './trace.js'

 const attrSchema = Joi.object({
@@ -17,7 +18,7 @@ const attrSchema = Joi.object({
  category: isValidCategory,
  isDeprecated: Joi.boolean().default(true),
  route: isValidRoute,
-  examples: Joi.array().has(Joi.object()).default([]),
+  openApi: openApiSchema,
  transformPath: Joi.func()
    .maxArity(1)
    .required()
@@ -36,7 +37,7 @@ export default function redirector(attrs) {
    category,
    isDeprecated,
    route,
-    examples,
+    openApi,
    transformPath,
    transformQueryParams,
    overrideTransformedQueryParams,
@@ -52,7 +53,7 @@ export default function redirector(attrs) {
    static category = category
    static isDeprecated = isDeprecated
    static route = route
-    static examples = examples
+    static openApi = openApi

    static register({ camp, metricInstance }, { rasterUrl }) {
      const { regex, captureNames } = prepareRoute({
--- a/core/base-service/redirector.spec.js
+++ b/core/base-service/redirector.spec.js
@@ -45,24 +45,6 @@ describe('Redirector', function () {
    ).to.throw('"dateAdded" is required')
  })

-  it('sets specified example', function () {
-    const examples = [
-      {
-        title: 'very old service',
-        pattern: ':namedParamA',
-        namedParams: {
-          namedParamA: 'namedParamAValue',
-        },
-        staticPreview: {
-          label: 'service',
-          message: 'v0.14.0',
-          color: 'blue',
-        },
-      },
-    ]
-    expect(redirector({ ...attrs, examples }).examples).to.equal(examples)
-  })
-
  describe('ScoutCamp integration', function () {
    let port, baseUrl
    beforeEach(async function () {
--- a/core/base-service/service-definitions.js
+++ b/core/base-service/service-definitions.js
@@ -1,49 +1,17 @@
+/**
+ * @module
+ */
 import Joi from 'joi'

 const arrayOfStrings = Joi.array().items(Joi.string()).min(0).required()

-const objectOfKeyValues = Joi.object()
-  .pattern(/./, Joi.string().allow(null))
-  .required()
-
-const serviceDefinition = Joi.object({
-  category: Joi.string().required(),
-  name: Joi.string().required(),
-  isDeprecated: Joi.boolean().required(),
-  route: Joi.alternatives().try(
-    Joi.object({
-      pattern: Joi.string().required(),
-      queryParams: arrayOfStrings,
-    }),
-    Joi.object({
-      format: Joi.string().required(),
-      queryParams: arrayOfStrings,
-    }),
-  ),
-  examples: Joi.array()
-    .items(
-      Joi.object({
-        title: Joi.string().required(),
-        example: Joi.object({
-          pattern: Joi.string(),
-          namedParams: objectOfKeyValues,
-          queryParams: objectOfKeyValues,
-        }).required(),
-        preview: Joi.object({
-          label: Joi.string(),
-          message: Joi.string().allow('').required(),
-          color: Joi.string().required(),
-          style: Joi.string(),
-          namedLogo: Joi.string(),
-        }).required(),
-        keywords: arrayOfStrings,
-        documentation: Joi.object({
-          __html: Joi.string().required(), // Valid HTML.
-        }),
-      }),
-    )
-    .default([]),
-  openApi: Joi.object().pattern(
+/**
+ * Joi schema describing the subset of OpenAPI paths we use in this application
+ *
+ * @see https://swagger.io/specification/#paths-object
+ */
+const openApiSchema = Joi.object()
+  .pattern(
    /./,
    Joi.object({
      get: Joi.object({
@@ -68,7 +36,24 @@ const serviceDefinition = Joi.object({
          .required(),
      }).required(),
    }).required(),
+  )
+  .default({})
+
+const serviceDefinition = Joi.object({
+  category: Joi.string().required(),
+  name: Joi.string().required(),
+  isDeprecated: Joi.boolean().required(),
+  route: Joi.alternatives().try(
+    Joi.object({
+      pattern: Joi.string().required(),
+      queryParams: arrayOfStrings,
+    }),
+    Joi.object({
+      format: Joi.string().required(),
+      queryParams: arrayOfStrings,
+    }),
  ),
+  openApi: openApiSchema,
 }).required()

 function assertValidServiceDefinition(service, message = undefined) {
@@ -82,15 +67,18 @@ const serviceDefinitionExport = Joi.object({
      Joi.object({
        id: Joi.string().required(),
        name: Joi.string().required(),
-        keywords: arrayOfStrings,
      }),
    )
    .required(),
  services: Joi.array().items(serviceDefinition).required(),
 }).required()

-function assertValidServiceDefinitionExport(examples, message = undefined) {
-  Joi.assert(examples, serviceDefinitionExport, message)
+function assertValidServiceDefinitionExport(openApiSpec, message = undefined) {
+  Joi.assert(openApiSpec, serviceDefinitionExport, message)
 }

-export { assertValidServiceDefinition, assertValidServiceDefinitionExport }
+export {
+  assertValidServiceDefinition,
+  assertValidServiceDefinitionExport,
+  openApiSchema,
+}
--- a/core/server/log.js
+++ b/core/server/log.js
@@ -1,4 +1,4 @@
-import Sentry from '@sentry/node'
+import * as Sentry from '@sentry/node'

 const listeners = []

--- a/core/server/server.js
+++ b/core/server/server.js
@@ -128,6 +128,7 @@ const publicConfigSchema = Joi.object({
      },
      restApiVersion: Joi.date().raw().required(),
    },
+    gitea: defaultService,
    gitlab: defaultService,
    jira: defaultService,
    jenkins: Joi.object({
@@ -138,6 +139,9 @@ const publicConfigSchema = Joi.object({
    nexus: defaultService,
    npm: defaultService,
    obs: defaultService,
+    pypi: {
+      baseUri: requiredUrl,
+    },
    sonar: defaultService,
    teamcity: defaultService,
    weblate: defaultService,
@@ -164,10 +168,13 @@ const privateConfigSchema = Joi.object({
  azure_devops_token: Joi.string(),
  curseforge_api_key: Joi.string(),
  discord_bot_token: Joi.string(),
+  dockerhub_username: Joi.string(),
+  dockerhub_pat: Joi.string(),
  drone_token: Joi.string(),
  gh_client_id: Joi.string(),
  gh_client_secret: Joi.string(),
  gh_token: Joi.string(),
+  gitea_token: Joi.string(),
  gitlab_token: Joi.string(),
  jenkins_user: Joi.string(),
  jenkins_pass: Joi.string(),
@@ -185,6 +192,7 @@ const privateConfigSchema = Joi.object({
  obs_pass: Joi.string(),
  redis_url: Joi.string().uri({ scheme: ['redis', 'rediss'] }),
  opencollective_token: Joi.string(),
+  pepy_key: Joi.string(),
  postgres_url: Joi.string().uri({ scheme: 'postgresql' }),
  sentry_dsn: Joi.string(),
  sl_insight_userUuid: Joi.string(),
--- a/core/token-pooling/sql-token-persistence.js
+++ b/core/token-pooling/sql-token-persistence.js
@@ -15,7 +15,9 @@ export default class SqlTokenPersistence {
    } else {
      this.pool = new pg.Pool({ connectionString: this.url })
    }
-    const result = await this.pool.query(`SELECT token FROM ${this.table};`)
+    const result = await this.pool.query(
+      `SELECT token FROM ${this.table} ORDER BY RANDOM();`,
+    )
    return result.rows.map(row => row.token)
  }

--- a/cypress/e2e/main-page.cy.js
+++ b/cypress/e2e/main-page.cy.js
@@ -25,7 +25,7 @@ describe('Frontend', function () {
    cy.contains('Build')
    cy.contains('Chat').click()

-    cy.contains('Discourse status')
+    cy.contains('Discourse Status')
    cy.contains('Stack Exchange questions')
  })

@@ -40,14 +40,14 @@ describe('Frontend', function () {
  })

  it('Build a badge', function () {
-    visitAndWait('/badges/git-hub-issues')
+    visitAndWait('/badges/git-hub-license')

-    cy.contains('/github/issues/:user/:repo')
+    cy.contains('/github/license/:user/:repo')

    cy.get('input[placeholder="user"]').type('badges')
    cy.get('input[placeholder="repo"]').type('shields')

-    cy.intercept('GET', `${backendUrl}/github/issues/badges/shields`).as('get')
+    cy.intercept('GET', `${backendUrl}/github/license/badges/shields`).as('get')
    cy.contains('Execute').click()
    cy.wait('@get').its('response.statusCode').should('eq', 200)
    cy.get('img[id="badge-preview"]')
--- a/doc/TUTORIAL.md
+++ b/doc/TUTORIAL.md
@@ -25,7 +25,7 @@ and learn about the [GitHub workflow](http://try.github.io/).

 #### Node, NPM

-Node >=18 and NPM 9.x is required. If you don't already have them,
+Node >=20 and NPM 9.x or 10.x is required. If you don't already have them,
 install node and npm: https://nodejs.org/en/download/

 ### Setup a dev install
@@ -71,7 +71,7 @@ Each service has a directory for its files:
    `/services/example/example.service.js`.
    If you add a badge for a new API, create a new directory.

-    Example: [wercker](https://github.com/badges/shields/tree/master/services/wercker)
+    Example: [Docs.rs](https://github.com/badges/shields/tree/master/services/docsrs)

  - For service families with multiple badges we usually store the code for each
    badge in its own file like this:
@@ -134,17 +134,17 @@ export default class Example extends BaseService {

 Description of the code:

-1. Our service badge class will extend `BaseService` so we need to require it. Variables are declared with `const` and `let` in preference to `var`.
+1. Our service badge class will extend `BaseService` so we need to import it.
 2. Our module must export a class which extends `BaseService`.
-3. Returns the name of the category to sort this badge into (eg. "build"). Used to sort the examples on the main [shields.io](https://shields.io) website. [Here](https://github.com/badges/shields/blob/master/services/categories.js) is the list of the valid categories. See [section 4.4](#44-adding-an-example-to-the-front-page) for more details on examples.
-4. `route()` declares the URL path at which the service operates. It also maps components of the URL path to handler parameters.
+3. Returns the name of the category to sort this badge into (eg. "build"). Used to sort the examples on the main [shields.io](https://shields.io) website. [Here](https://github.com/badges/shields/blob/master/services/categories.js) is the list of the valid categories. See [section 4.4](#44-adding-documentation-to-the-frontend) for more details.
+4. `route` declares the URL path at which the service operates. It also maps components of the URL path to handler parameters.
   - `base` defines the first part of the URL that doesn't change, e.g. `/example/`.
   - `pattern` defines the variable part of the route, everything that comes after `/example/`. It can include any
     number of named parameters. These are converted into
     regular expressions by [`path-to-regexp`][path-to-regexp].
     Because a service instance won't be created until it's time to handle a request, the route and other metadata must be obtained by examining the classes themselves. [That's why they're marked `static`.][static]
   - There is additional documentation on conventions for [designing badge URLs](./badge-urls.md)
-5. All badges must implement the `async handle()` function that receives parameters to render the badge. Parameters of `handle()` will match the name defined in `route()` Because we're capturing a single variable called `text` our function signature is `async handle({ text })`. `async` is needed to let JavaScript do other things while we are waiting for result from external API. Although in this simple case, we don't make any external calls. Our `handle()` function should return an object with 3 properties:
+5. All badges must implement the `async handle()` function that receives parameters to render the badge. Parameters of `handle()` will match the name defined in `route` Because we're capturing a single variable called `text` our function signature is `async handle({ text })`. `async` is needed to let JavaScript do other things while we are waiting for result from external API. Although in this simple case, we don't make any external calls. Our `handle()` function should return an object with 3 properties:
   - `label`: the text on the left side of the badge
   - `message`: the text on the right side of the badge - here we are passing through the parameter we captured in the route regex
   - `color`: the background color of the right side of the badge
@@ -223,11 +223,11 @@ Description of the code:
 2. Our badge will query a JSON API so we will extend `BaseJsonService` instead of `BaseService`. This contains some helpers to reduce the need for boilerplate when calling a JSON API.
 3. We perform input validation by defining a schema which we expect the JSON we receive to conform to. This is done using [Joi](https://github.com/hapijs/joi). Defining a schema means we can ensure the JSON we receive meets our expectations and throw an error if we receive unexpected input without having to explicitly code validation checks. The schema also acts as a filter on the JSON object. Any properties we're going to reference need to be validated, otherwise they will be filtered out. In this case our schema declares that we expect to receive an object which must have a property called 'version', which is a string. There is further documentation on [input validation](input-validation.md).
 4. Our module exports a class which extends `BaseJsonService`
-5. Returns the name of the category to sort this badge into (eg. "build"). Used to sort the examples on the main [shields.io](https://shields.io) website. [Here](https://github.com/badges/shields/blob/master/services/categories.js) is the list of the valid categories. See [section 4.4](#44-adding-an-example-to-the-front-page) for more details on examples.
+5. Returns the name of the category to sort this badge into (eg. "build"). Used to sort the examples on the main [shields.io](https://shields.io) website. [Here](https://github.com/badges/shields/blob/master/services/categories.js) is the list of the valid categories. See [section 4.4](#44-adding-documentation-to-the-frontend) for more details.
 6. As with our previous badge, we need to declare a route. This time we will capture a variable called `gem`.
 7. We can use `defaultBadgeData` to set a default `color`, `logo` and/or `label`. If `handle()` doesn't return any of these keys, we'll use the default. Instead of explicitly setting the label text when we return a badge object, we'll use `defaultBadgeData` here to define it declaratively.
 8. We now jump to the bottom of the example code to the function all badges must implement: `async handle()`. This is the function the server will invoke to handle an incoming request. Because our URL pattern captures a variable called `gem`, our function signature is `async handle({ gem })`. We usually separate the process of generating a badge into 2 stages or concerns: fetch and render. The `fetch()` function is responsible for calling an API endpoint to get data. The `render()` function formats the data for display. In a case where there is a lot of calculation or intermediate steps, this pattern may be thought of as fetch, transform, render and it might be necessary to define some helper functions to assist with the 'transform' step.
-9. Working our way upward, the `async fetch()` method is responsible for calling an API endpoint to get data. Extending `BaseJsonService` gives us the helper function `_requestJson()`. Note here that we pass the schema we defined in step 4 as an argument. `_requestJson()` will deal with validating the response against the schema and throwing an error if necessary.
+9. Working our way upward, the `async fetch()` method is responsible for calling an API endpoint to get data. Extending `BaseJsonService` gives us the helper function `_requestJson()`. Note here that we pass the schema we defined in step 3 as an argument. `_requestJson()` will deal with validating the response against the schema and throwing an error if necessary.

   - `_requestJson()` automatically adds an Accept header, checks the status code, parses the response as JSON, and returns the parsed response.
   - `_requestJson()` uses [got](https://github.com/sindresorhus/got) to perform the HTTP request. Options can be passed to got, including method, query string, and headers. If headers are provided they will override the ones automatically set by `_requestJson()`. There is no need to specify json, as the JSON parsing is handled by `_requestJson()`. See the `got` docs for [supported options](https://github.com/sindresorhus/got/blob/main/documentation/2-options.md).
@@ -269,42 +269,86 @@ import { NotFound } from '../index.js'
 throw new NotFound({ prettyMessage: 'package not found' })
 ```

-### (4.4) Adding an Example to the Front Page
+### (4.4) Adding Documentation to the Frontend

-Once we have implemented our badge, we can add it to the index so that users can discover it. We will do this by adding an additional method `examples()` to our class.
+To render the shields.io website, we produce an [OpenAPI 3 specification](https://swagger.io/specification/) which describes the available badge endpoints. Then we use that specification to render the frontend.
+
+Once we have implemented our badge, we want to add it to the index so that users can discover it. We will do this by adding an additional object `openApi` to our class. This object contains an [OpenAPI Paths Object](https://swagger.io/specification/#paths-object) describing the endpoint or endpoints exposed by this service class.

 ```js
+// (1)
+import { pathParams } from '../index.js'
+
 export default class GemVersion extends BaseJsonService {
  // ...

-  // (1)
+  // (2)
  static category = 'version'

-  // (2)
-  static examples = [
-    {
-      // (3)
-      title: 'Gem',
-      namedParams: { gem: 'formatador' },
-      staticPreview: this.render({ version: '2.1.0' }),
-      keywords: ['ruby'],
+  static openApi = {
+    // (3)
+    '/gem/v/{gem}': {
+      // (4)
+      get: {
+        // (5)
+        summary: 'Gem Version',
+        description:
+          '[Ruby Gems](https://rubygems.org/) is a registry for ruby libraries',
+        // (6)
+        parameters: pathParams({
+          name: 'gem',
+          description: 'Name of the Ruby Gem',
+          example: 'formatador',
+        }),
+      },
    },
-  ]
+  }
 }
 ```

-1. We defined category earlier in the tutorial. The `category()` property defines which heading in the index our example will appear under.
-2. The examples property defines an array of examples. In this case the array will contain a single object, but in some cases it is helpful to provide multiple usage examples.
-3. Our example object should contain the following properties:
-   - `title`: Descriptive text that will be shown next to the badge
-   - `namedParams`: Provide a valid example of params we can substitute into
-     the pattern. In this case we need a valid ruby gem, so we've picked [formatador](https://rubygems.org/gems/formatador).
-   - `staticPreview`: On the index page we want to show an example badge, but for performance reasons we want that example to be generated without making an API call. `staticPreview` should be populated by calling our `render()` method with some valid data.
-   - `keywords`: If we want to provide additional keywords other than the title and the category, we can add them here. This helps users to search for relevant badges.
+1. There are four helper functions we can use to assemble [Open API Parameter objects](https://swagger.io/specification/#parameter-object). These are:
+
+   - `pathParam` - returns a single Parameter object describing a single path parameter
+   - `pathParams` - returns an array of path parameter objects
+   - `queryParam` - returns a single Parameter object describing a single query parameter
+   - `queryParams` - returns an array of query parameter objects
+
+   These four helper functions are documented in more detail at http://contributing.shields.io/module-core_base-service_openapi.html
+
+2. We defined category earlier in the tutorial. The `category` property defines which heading in the index our example will appear under.
+3. The keys of the `openApi` object are routes. In this case we only need to describe one route. In some cases, a service class can define more than one badge route. Open API doesn't have the concept of optional path parameters (more specifically, `in: 'path'` implies `required: true`) so if there are any optional path parameters in our route, our `openApi` object needs to describe two URLs: one without the optional parameter, and another with it.
+4. The HTTP method. Shields only allows GET requests, so this is always `get`.
+5. `summary` (required) is a short title or description of the badge. `description` is an optional longer description or additional documentation. We can use markdown or HTML syntax inside the `description` field.
+6. `parameters` is an array of [Open API Parameter objects](https://swagger.io/specification/#parameter-object) describing any parameters we can pass to this route. This array should include all path parameters included in the key that this value object describes and all relevant query parameters. As a minimum, we need to supply `name` and `example`. The example must be a valid example of a value we can provide for this parameter. In this case we need a valid ruby gem, so we've picked [formatador](https://rubygems.org/gems/formatador). There are also optional keys we can pass. The code
+
+   ```js
+   parameters: pathParams({
+     name: 'gem',
+     description: 'Name of the Ruby Gem',
+     example: 'formatador',
+   })
+   ```
+
+   is equivalent to
+
+   ```js
+   parameters: [
+     {
+       name: 'gem',
+       in: 'path',
+       required: true,
+       schema: { type: 'string' },
+       example: 'formatador',
+       description: 'Name of the Ruby Gem',
+     },
+   ]
+   ```
+
+   but we have used the helper function `pathParams` to imply some defaults and reduce the amount of code we need to write by hand.

 Save, run `npm start`, and you can see it [locally](http://127.0.0.1:3000/).

-If you update `examples`, you don't have to restart the server. Run `npm run defs` in another terminal window and the frontend will update.
+If you update `openApi`, you don't have to restart the server. Run `npm run prestart` in another terminal window and the frontend will update.

 ### (4.5) Write Tests<!-- Change the link below when you change the heading -->

--- a/doc/deprecating-badges.md
+++ b/doc/deprecating-badges.md
@@ -90,6 +90,7 @@ Past that point, all related code will be deleted, and a not found error will be

 Here is a listing of all deleted badges that were once part of the Shields.io service:

+- APM
 - Beerpay
 - Bintray
 - bitHound
@@ -99,6 +100,7 @@ Here is a listing of all deleted badges that were once part of the Shields.io se
 - Codetally
 - continuousphp
 - Coverity
+- Criterion
 - David
 - dependabot
 - Dockbit
@@ -109,16 +111,20 @@ Here is a listing of all deleted badges that were once part of the Shields.io se
 - Issue Stats
 - JitPack Downloads
 - Leanpub
+- LGTM
 - Libscore
 - Magnum CI
 - MicroBadger
 - NSP
+- pkgreview
 - PHP Eye
 - requires.io
 - Shippable
 - Snap CI
+- Travis.org
 - VersionEye
 - Waffle
+- Wercker

 ## Additional Information

--- a/doc/input-validation.md
+++ b/doc/input-validation.md
@@ -24,6 +24,8 @@ When we receive input data from an upstream API, we perform input validation to:

 - We don't need to validate characteristics we don't rely on. For example, if we're just going to render a version on a badge with the same exact value from the API response and do not need to sort or transform the value, then it doesn't matter what format the version number is in. We can use a very relaxed schema to validate in this case, e.g. `Joi.string().required()`

+- http://mterczynski.pl/joi-schema-generator/ is a tool that can be used to reverse engineer a schema from an API response. This can be a great starting point to tweak from. If using this as a starting point, remember to remove fields we don't rely on to render a badge.
+
 - If theory (docs) and practice (real-world API responses) conflict, real-world outputs take precedence over documented behaviour. e.g: if the docs say version is a semver but we learn that there are real-world packages where the version number is `0.3b` or `1.2.1.27` then we should accept those values in preference to enforcing the documented API behaviour.

 - Shields is descriptive rather than prescriptive. We reflect the established norms of the communities we serve.
--- a/doc/self-hosting.md
+++ b/doc/self-hosting.md
@@ -4,13 +4,13 @@ This document describes how to host your own shields server either from source o

 ## Installing from Source

-You will need Node 18 or later, which you can install using a
+You will need Node 20 or later, which you can install using a
 [package manager][].

 On Ubuntu / Debian:

 ```sh
-curl -sL https://deb.nodesource.com/setup_18.x | sudo -E bash -; sudo apt-get install -y nodejs
+curl -sL https://deb.nodesource.com/setup_20.x | sudo -E bash -; sudo apt-get install -y nodejs
 ```

 ```sh
--- a/doc/server-secrets.md
+++ b/doc/server-secrets.md
@@ -112,13 +112,25 @@ generated API key.

 ### Discord

-Using a token for Dicsord is optional but will allow higher API rates.
+Using a token for Discord is optional but will allow higher API rates.

- `DISCORD_BOT_TOKEN` (yml: `discord_bot_token`)
+- `DISCORD_BOT_TOKEN` (yml: `private.discord_bot_token`)

 Register an application in the [Discord developer console](https://discord.com/developers).
 To obtain a token, simply create a bot for your application.

+### DockerHub
+
+Using authentication for DockerHub is optional but can be used to allow
+higher API rates or access to private repos.
+
+- `DOCKERHUB_USER` (yml: `private.dockerhub_username`)
+- `DOCKERHUB_PAT` (yml: `private.dockerhub_pat`)
+
+`DOCKERHUB_PAT` is a Personal Access Token. Generate a token in your
+[account security settings](https://hub.docker.com/settings/security) with
+"Read-Only" or "Public Repo Read-Only", depending on your needs.
+
 ### Drone

 - `DRONE_ORIGINS` (yml: `public.services.drone.authorizedOrigins`)
@@ -167,6 +179,15 @@ These settings are used by shields.io for GitHub OAuth app authorization
 but will not be necessary for most self-hosted installations. See
 [production-hosting.md](./production-hosting.md).

+### Gitea
+
+- `GITEA_ORIGINS` (yml: `public.services.gitea.authorizedOrigins`)
+- `GITEA_TOKEN` (yml: `private.gitea_token`)
+
+A Gitea [Personal Access Token][gitea-pat] is required for accessing private content. If you need a Gitea token for your self-hosted Shields server then we recommend limiting the scopes to the minimal set necessary for the badges you are using.
+
+[gitea-pat]: https://docs.gitea.com/development/api-usage#generating-and-listing-api-tokens
+
 ### GitLab

 - `GITLAB_ORIGINS` (yml: `public.services.gitlab.authorizedOrigins`)
@@ -248,12 +269,27 @@ of a package.

 ### OpenCollective

- `OPENCOLLECTIVE_TOKEN` (yml: `opencollective_token`)
+- `OPENCOLLECTIVE_TOKEN` (yml: `private.opencollective_token`)

 OpenCollective's GraphQL API only allows 10 reqs/minute for anonymous users.
 An [API token](https://graphql-docs-v2.opencollective.com/access)
 can be provided to access a higher rate limit of 100 reqs/minute.

+### Pepy
+
+- `PEPY_KEY` (yml: `private.pepy_key`)
+
+The Pepy API requires authentication. To obtain a key,
+Create an account, sign in and obtain generate a key on your
+[account page](https://www.pepy.tech/user).
+
+### PyPI
+
+- `PYPI_URL` (yml: `public.pypi.baseUri`)
+
+`PYPI_URL` can be used to optionally send all the PyPI requests to a Self-hosted Pypi registry,
+users can also override this by query parameter `pypiBaseUrl`.
+
 ### SymfonyInsight (formerly Sensiolabs)

 - `SL_INSIGHT_USER_UUID` (yml: `private.sl_insight_userUuid`)
@@ -294,8 +330,8 @@ access to your private nexus repositories.

 ### Twitch

- `TWITCH_CLIENT_ID` (yml: `twitch_client_id`)
- `TWITCH_CLIENT_SECRET` (yml: `twitch_client_secret`)
+- `TWITCH_CLIENT_ID` (yml: `private.twitch_client_id`)
+- `TWITCH_CLIENT_SECRET` (yml: `private.twitch_client_secret`)

 Register an application in the [Twitch developer console](https://dev.twitch.tv/console)
 in order to obtain a client id and a client secret for making Twitch API calls.
--- a/doc/service-tests.md
+++ b/doc/service-tests.md
@@ -12,7 +12,7 @@ automated tests should be included. They serve three purposes:
 3. They speed up future contributors when they are debugging or improving a
   badge.

-Test should cover:
+Tests should cover:

 1. Valid behavior
 2. Optional parameters like tags or branches
@@ -24,11 +24,11 @@ Test should cover:
 Before getting started, set up a development environment by following the
 [setup instructions](https://github.com/badges/shields/blob/master/doc/TUTORIAL.md#2-setup)

-We will write some tests for the [Wercker Build service](https://github.com/badges/shields/blob/master/services/wercker/wercker.service.js)
+We will write some tests for [Docs.rs](https://github.com/badges/shields/blob/master/services/docsrs/docsrs.service.js), a service that builds documentation of crates, which are packages in the Rust programming language.

 ### (1) Boilerplate

-The code for our badge is in `services/wercker/wercker.service.js`. Tests for this badge should be stored in `services/wercker/wercker.tester.js`.
+The code for our badge is in `services/docsrs/docsrs.service.js`. Tests for this badge should be stored in `services/docsrs/docsrs.tester.js`.

 We'll start by adding some boilerplate to our file:

@@ -41,8 +41,8 @@ export const t = await createServiceTester()
 If our `.service.js` module exports a single class, we can
 `createServiceTester`, which uses convention to create a
 `ServiceTester` object. Calling this inside
-`services/wercker/wercker.tester.js` will create a `ServiceTester` object
-configured for the service exported in `services/wercker/wercker.service.js`.
+`services/docsrs/docsrs.tester.js` will create a `ServiceTester` object
+configured for the service exported in `services/docsrs/docsrs.service.js`.
 We will add our tests to this `ServiceTester` object `t`, which is exported
 from the module.

@@ -51,27 +51,30 @@ from the module.
 First we'll add a test for the typical case:

 ```js
-import { isBuildStatus } from '../test-validators.js'
+import Joi from 'joi'

-t.create('Build status')
-  .get('/build/wercker/go-wercker-api.json')
-  .expectBadge({ label: 'build', message: isBuildStatus })
+t.create('Docs with no version specified')
+  .get('/tokio.json')
+  .expectBadge({
+    label: 'docs',
+    message: Joi.allow('passing', 'failing'),
+  })
 ```

 1. The `create()` method adds a new test to the tester object.
   The chained-on calls come from the API testing framework [IcedFrisby][].
   Here's a [longer example][] and the complete [API guide][icedfrisby api].
 2. We use the `get()` method to request a badge. There are several points to consider here:
-   - We need a real project to test against. In this case we have used [wercker/go-wercker-api](https://app.wercker.com/wercker/go-wercker-api/runs) but we could have chosen any stable project.
+   - We need a real crate to test against. In this case we have used [Tokio](https://docs.rs/tokio) but we could have chosen any one.
   - Note that when we call our badge, we are allowing it to communicate with an external service without mocking the response. We write tests which interact with external services, which is unusual practice in unit testing. We do this because one of the purposes of service tests is to notify us if a badge has broken due to an upstream API change. For this reason it is important for at least one test to call the live API without mocking the interaction.
-   - All badges on shields can be requested in a number of formats. As well as calling https://img.shields.io/wercker/build/wercker/go-wercker-api.svg to generate ![](https://img.shields.io/wercker/build/wercker/go-wercker-api.svg) we can also call https://img.shields.io/wercker/build/wercker/go-wercker-api.json to request the same content as JSON. When writing service tests, we request the badge in JSON format so it is easier to make assertions about the content.
-   - We don't need to explicitly call `/wercker/build/wercker/go-wercker-api.json` here, only `/build/wercker/go-wercker-api.json`. When we create a tester object with `createServiceTester()` the URL base defined in our service class (in this case `/wercker`) is used as the base URL for any requests made by the tester object.
+   - All badges on shields can be requested in a number of formats. As well as calling https://img.shields.io/docsrs/tokio.svg to generate ![](https://img.shields.io/docsrs/tokio.svg) we can also call https://img.shields.io/docsrs/tokio.json to request the same content as JSON. When writing service tests, we request the badge in JSON format so it is easier to make assertions about the content.
+   - We don't need to explicitly call `/docsrs/tokio.json` here, only `/tokio.json`. When we create a tester object with `createServiceTester()` the URL base defined in our service class (in this case `/docsrs`) is used as the base URL for any requests made by the tester object.
 3. `expectBadge()` is a helper function which accepts either a string literal, a [RegExp][] or a [Joi][] schema for the different fields.
   Joi is a validation library that is built into IcedFrisby which you can use to
   match based on a set of allowed strings, regexes, or specific values. You can
   refer to their [API reference][joi api].
-4. We expect `label` to be a string literal `"build"`.
-5. Because this test depends on a live service, we don't want our test to depend on our API call returning a particular build status. Instead we should perform a "picture check" to assert that the badge data conforms to an expected pattern. Our test should not depend on the status of the example project's build, but should fail if trying to generate the badge throws an error, or if there is a breaking change to the upstream API. In this case we will use a pre-defined regular expression to check that the badge value looks like a build status. [services/test-validators.js](https://github.com/badges/shields/blob/master/services/test-validators.js) defines a number of useful validators we can use. Many of the common badge types (version, downloads, rank, etc.) already have validators defined here.
+4. We expect `label` to be a string literal `"docs"`.
+5. Because this test depends on a live service, we don't want our test to depend on our API call returning a particular build status. Instead we should perform a "picture check" to assert that the badge data conforms to an expected pattern. Our test should not depend on the status of the example crates's documentation build, but should fail if trying to generate the badge throws an error, or if there is a breaking change to the upstream API. In this case, we specify a list with all possible response values, `Joi.allow('passing', 'failing')`. For more complex cases, [services/test-validators.js](https://github.com/badges/shields/blob/master/services/test-validators.js) defines a number of useful validators we can use with regular expressions. Many of the common badge types (version, downloads, rank, etc.) already have validators defined there.

 When defining an IcedFrisby test, typically you would invoke the `toss()`
 method, to register the test. This is not necessary, because the Shields test
@@ -89,7 +92,7 @@ harness will call it for you.
 Lets run the test we have written:

 ```
-npm run test:services -- --only=wercker
+npm run test:services -- --only=docsrs
 ```

 The `--only=` option indicates which service or services you want to test. You
@@ -101,11 +104,12 @@ runner.
 Here's the output:

 ```
-Server is starting up: http://lib/service-test-runner/cli.js:80/
-  Wercker
-    Build status
-      ✓
-        [ GET /build/wercker/go-wercker-api.json ] (572ms)
+Server is starting up: http://localhost:1111/
+  DocsRs
+    [live] Docs with no version specified
+      √
+        [ GET /tokio.json ] (441ms)
+

  1 passing (1s)
 ```
@@ -115,80 +119,98 @@ That's looking good!
 Sometimes if we have a failing test, it is useful to be able to see some logging output to help work out why the test is failing. We can do that by calling `npm run test:services:trace`. Try running

 ```
-npm run test:services:trace -- --only=wercker
+npm run test:services:trace -- --only=docsrs
 ```

 to run the test with some additional debug output.

 ### (4) Writing More Tests

-We should write tests cases for valid paths through our code. The Wercker badge supports an optional branch parameter so we'll add a second test for a branch build.
+We should write tests cases for valid paths through our code. The Docs.rs badge supports an optional version parameter so we'll add a second test for a branch build. In this case, we know for sure that the documentation for this older version was successfully built, we specify a string literal instead of a Joi schema for `message`. This narrows down the expectation and gives us a more helpful error message if the test fails.

 ```js
-t.create('Build status (with branch)')
-  .get('/build/wercker/go-wercker-api/master.json')
-  .expectBadge({ label: 'build', message: isBuildStatus })
+t.create('Passing docs for version').get('/tokio/1.37.0.json').expectBadge({
+  label: 'docs@1.37.0',
+  message: 'passing',
+  color: 'brightgreen',
+})
 ```

 ```
-Server is starting up: http://lib/service-test-runner/cli.js:80/
-  Wercker
-    Build status
-      ✓
-        [ GET /build/wercker/go-wercker-api.json ] (572ms)
-    Build status (with branch)
-      ✓
-        [ GET /build/wercker/go-wercker-api/master.json ] (368ms)
+Server is starting up: http://localhost:1111/
+  DocsRs
+    [live] Docs with no version specified
+      √
+        [ GET /tokio.json ] (408ms)
+    [live] Passing docs for version
+      √
+        [ GET /tokio/1.37.0.json ] (171ms)

-  2 passing (1s)
+
+  2 passing (2s)
 ```

 Once we have multiple tests, sometimes it is useful to run only one test. We can do this using the `--fgrep` argument. For example:

 ```
-npm run test:services -- --only="wercker" --fgrep="Build status (with branch)"
+npm run test:services -- --only="docsrs" --fgrep="Passing docs for version"
 ```

-Having covered the typical and custom cases, we'll move on to errors. We should include a test for the 'not found' response and also tests for any other custom error handling. The Wercker integration defines a custom error condition for 401 as well as a custom 404 message:
+Documentation for tokio version 1.32.1 failed to build, we can also add a corresponding test:

 ```js
-httpErrors: {
-  401: 'private application not supported',
-  404: 'application not found',
-}
+t.create('Failing docs for version').get('/tokio/1.32.1.json').expectBadge({
+  label: 'docs@1.32.1',
+  message: 'failing',
+  color: 'red',
+})
 ```

-First we'll add a test for a project which will return a 404 error:
+Note that in these tests, we have specified a `color` parameter in `expectBadge`. This is helpful in a case like this when we want to test custom color logic, but it is only necessary to explicitly test color values if our badge implements custom logic for setting the badge colors.
+
+Having covered the typical and custom cases, we'll move on to errors. We should include a test for the 'not found' response and also tests for any other custom error handling. When a version is specified, the Docs.rs integration defines a custom error condition for 400 status codes:

 ```js
-t.create('Build status (application not found)')
-  .get('/build/some-project/that-doesnt-exist.json')
-  .expectBadge({ label: 'build', message: 'application not found' })
+httpErrors: version ? { 400: 'malformed version' } : {},
 ```

-In this case we are expecting a string literal instead of a pattern for `message`. This narrows down the expectation and gives us a more helpful error message if the test fails.
-
-We also want to include a test for the 'private application not supported' case. One way to do this would be to find another example of a private project which is unlikely to change. For example:
+First we'll add a test for a crate and a test for a version which will return 404 errors:

 ```js
-t.create('Build status (private application)')
-  .get('/build/wercker/blueprint.json')
-  .expectBadge({ label: 'build', message: 'private application not supported' })
+t.create('Crate not found')
+  .get('/not-a-crate/latest.json')
+  .expectBadge({ label: 'docs', message: 'not found' })
+
+t.create('Version not found')
+  .get('/tokio/0.8.json')
+  .expectBadge({ label: 'docs', message: 'not found' })
+```
+
+We also want to include a test for a case where a malformed version was specified. For example:
+
+```js
+t.create('Malformed version')
+  .get('/tokio/not-a-version.json')
+  .expectBadge({ label: 'docs', message: 'malformed version' })
 ```

 ## (5) Mocking Responses

-If we didn't have a stable example of a private project, another approach would be to mock the response. An alternative test for the 'private application' case might look like:
+If we didn't have a stable example of crate version with a failing documentation build, another approach would be to mock the response. An alternative test for the 'Failing docs for version' case might look like:

 ```js
-t.create('Build status (private application)')
-  .get('/build/wercker/go-wercker-api.json')
+t.create('Failing docs for version')
+  .get('/tokio/1.32.1.json')
  .intercept(nock =>
-    nock('https://app.wercker.com/api/v3/applications/')
-      .get('/wercker/go-wercker-api/builds?limit=1')
-      .reply(401),
+    nock('https://docs.rs/crate')
+      .get('/tokio/1.32.1/status.json')
+      .reply(200, { doc_status: false }),
  )
-  .expectBadge({ label: 'build', message: 'private application not supported' })
+  .expectBadge({
+    label: 'docs@1.32.1',
+    message: 'failing',
+    color: 'red',
+  })
 ```

 This will intercept the request and provide our own mock response.
@@ -204,49 +226,6 @@ and path.
 [icedfrisby-nock]: https://github.com/paulmelnikow/icedfrisby-nock#usage
 [nock]: https://github.com/node-nock/nock

-Our test suite should also include service tests which receive a known value from the API. For example, in the `render()` method of our service, there is some logic which sets the badge color based on the build status:
-
-```js
-static render({ status, result }) {
-  if (status === 'finished') {
-    if (result === 'passed') {
-      return { message: 'passing', color: 'brightgreen' }
-    } else {
-      return { message: result, color: 'red' }
-    }
-  }
-  return { message: status }
-}
-```
-
-We can also use nock to intercept API calls to return a known response body.
-
-```js
-t.create('Build passed')
-  .get('/build/wercker/go-wercker-api.json')
-  .intercept(nock =>
-    nock('https://app.wercker.com/api/v3/applications/')
-      .get('/wercker/go-wercker-api/builds?limit=1')
-      .reply(200, [{ status: 'finished', result: 'passed' }]),
-  )
-  .expectBadge({
-    label: 'build',
-    message: 'passing',
-    color: 'brightgreen',
-  })
-
-t.create('Build failed')
-  .get('/build/wercker/go-wercker-api.json')
-  .intercept(nock =>
-    nock('https://app.wercker.com/api/v3/applications/')
-      .get('/wercker/go-wercker-api/builds?limit=1')
-      .reply(200, [{ status: 'finished', result: 'failed' }]),
-  )
-  .expectBadge({ label: 'build', message: 'failed', color: 'red' })
-```
-
-Note that in these tests, we have specified a `color` parameter in `expectBadge`. This is helpful in a case like this when we want to test custom color logic, but it is only necessary to explicitly test color values if our badge implements custom logic for setting the badge colors.
-
 ## Code coverage

 By checking code coverage, we can make sure we've covered all our bases.
@@ -254,7 +233,7 @@ By checking code coverage, we can make sure we've covered all our bases.
 We can generate a coverage report and open it:

 ```
-npm run coverage:test:services -- -- --only=wercker
+npm run coverage:test:services -- -- --only=docsrs
 npm run coverage:report:open
 ```

--- a/frontend/blog/2023-11-29-simpleicons10.md
+++ b/frontend/blog/2023-11-29-simpleicons10.md
@@ -0,0 +1,14 @@
+---
+slug: simple-icons-10
+title: Simple Icons 10
+authors:
+  name: chris48s
+  title: Shields.io Core Team
+  url: https://github.com/chris48s
+  image_url: https://avatars.githubusercontent.com/u/6025893
+tags: []
+---
+
+Logos on Shields.io are provided by SimpleIcons. We've recently upgraded to SimpleIcons 10. This release removes 45 icons. A full list of the removals can be found in the [release notes](https://github.com/simple-icons/simple-icons/releases/tag/10.0.0).
+
+Please remember that we are just consumers of SimpleIcons. Decisions about changes and removals are made by the [SimpleIcons](https://github.com/simple-icons/simple-icons) project.
--- a/frontend/blog/2024-01-13-simpleicons11.md
+++ b/frontend/blog/2024-01-13-simpleicons11.md
@@ -0,0 +1,21 @@
+---
+slug: simple-icons-11
+title: Simple Icons 11
+authors:
+  name: chris48s
+  title: Shields.io Core Team
+  url: https://github.com/chris48s
+  image_url: https://avatars.githubusercontent.com/u/6025893
+tags: []
+---
+
+Logos on Shields.io are provided by SimpleIcons. We've recently upgraded to SimpleIcons 11. This release removes the following 4 icons:
+
+- Babylon.js
+- Hulu
+- Pepsi
+- Uno
+
+More details can be found in the [release notes](https://github.com/simple-icons/simple-icons/releases/tag/11.0.0).
+
+Please remember that we are just consumers of SimpleIcons. Decisions about changes and removals are made by the [SimpleIcons](https://github.com/simple-icons/simple-icons) project.
--- a/frontend/blog/2024-06-01-simpleicons12.md
+++ b/frontend/blog/2024-06-01-simpleicons12.md
@@ -0,0 +1,33 @@
+---
+slug: simple-icons-12
+title: Simple Icons 12
+authors:
+  name: chris48s
+  title: Shields.io Core Team
+  url: https://github.com/chris48s
+  image_url: https://avatars.githubusercontent.com/u/6025893
+tags: []
+---
+
+Logos on Shields.io are provided by SimpleIcons. We've recently upgraded to SimpleIcons 12. This release removes the following 10 icons:
+
+- FITE
+- Flattr
+- Google Bard
+- Integromat
+- Niantic
+- Nintendo Network
+- Rome
+- Shotcut
+- Skynet
+- Twitter
+
+And renames the following 3:
+
+- Airbrake.io to Airbrake
+- Amazon AWS to Amazon Web Services
+- RStudio to RStudio IDE
+
+More details can be found in the [release notes](https://github.com/simple-icons/simple-icons/releases/tag/12.0.0).
+
+Please remember that we are just consumers of SimpleIcons. Decisions about changes and removals are made by the [SimpleIcons](https://github.com/simple-icons/simple-icons) project.
--- a/frontend/docusaurus.config.cjs
+++ b/frontend/docusaurus.config.cjs
@@ -1,5 +1,6 @@
 const lightCodeTheme = require('prism-react-renderer').themes.github
 const darkCodeTheme = require('prism-react-renderer').themes.dracula
+const stripCodeBlockLinks = require('./src/plugins/strip-code-block-links')

 /** @type {import('@docusaurus/types').Config} */
 const config = {
@@ -24,6 +25,14 @@ const config = {
    ],
  ],

+  markdown: {
+    mdx1Compat: {
+      comments: true,
+      admonitions: true,
+      headingIds: true,
+    },
+  },
+
  presets: [
    [
      'docusaurus-preset-openapi',
@@ -43,6 +52,7 @@ const config = {
        api: {
          path: 'categories',
          routeBasePath: 'badges',
+          rehypePlugins: [stripCodeBlockLinks],
        },
      }),
    ],
@@ -92,10 +102,6 @@ const config = {
                label: 'Discord',
                href: 'https://discord.gg/HjJCwm5',
              },
-              {
-                label: 'Twitter',
-                href: 'https://twitter.com/shields_io',
-              },
              {
                label: 'Awesome Badges',
                href: 'https://github.com/badges/awesome-badges',
--- a/frontend/src/pages/community.md
+++ b/frontend/src/pages/community.md
@@ -8,14 +8,10 @@ Shields.io is possible thanks to the people and companies who donate money, serv

 <ul>
    <li>
-        <a href="https://nodeping.com/">
-        NodePing
-        </a>
+        <a href="https://nodeping.com/">NodePing</a>
    </li>
    <li>
-        <a href="https://sentry.io/">
-        Sentry
-        </a>
+        <a href="https://sentry.io/">Sentry</a>
    </li>
 </ul>

@@ -23,8 +19,8 @@ Shields.io is possible thanks to the people and companies who donate money, serv

 <p>
    <object
-        data="https://opencollective.com/shields/sponsors.svg?avatarHeight=80&width=600"
-        class="opencollective-image"
+        data="https://opencollective.com/shields/tiers/sponsor.svg?avatarHeight=80&width=600"
+        className="opencollective-image"
    ></object>
 </p>

@@ -34,8 +30,8 @@ Shields.io is possible thanks to the people and companies who donate money, serv

 <p>
    <object
-        data="https://opencollective.com/shields/backers.svg?width=600"
-        class="opencollective-image">
+        data="https://opencollective.com/shields/tiers/backer.svg?width=600"
+        className="opencollective-image">
    </object>
 </p>

@@ -46,7 +42,7 @@ Shields.io is possible thanks to the people and companies who donate money, serv
 <p>
    <object
        data="https://opencollective.com/shields/contributors.svg?width=600"
-        class="opencollective-image"
+        className="opencollective-image"
    ></object>
 </p>

--- a/frontend/src/plugins/strip-code-block-links.js
+++ b/frontend/src/plugins/strip-code-block-links.js
@@ -0,0 +1,30 @@
+const { visit } = require('unist-util-visit')
+
+function stripCodeBlockLinks() {
+  /*
+  Docusaurus 3 uses [remark-gfm](https://github.com/remarkjs/remark-gfm)
+  One of the "features" of remark-gfm is that it automatically looks for URLs
+  and email addresses, and automatically wraps them in <a> tags.
+
+  This happens even if the URL is inside a <code> block.
+  This behaviour is
+  a) mostly unhelpful and
+  b) non-configurable
+
+  This plugin removes <a> tags which appear inside a <code> block.
+  */
+  return tree => {
+    visit(tree, ['mdxJsxTextElement', 'mdxJsxFlowElement', 'element'], node => {
+      if (node.name === 'code' || node.tagName === 'code') {
+        const links = node.children.filter(child => child.tagName === 'a')
+        links.forEach(link => {
+          const linkText = link.children.map(child => child.value).join('')
+          const linkIndex = node.children.indexOf(link)
+          node.children.splice(linkIndex, 1, { type: 'text', value: linkText })
+        })
+      }
+    })
+  }
+}
+
+module.exports = stripCodeBlockLinks
--- a/frontend/src/theme/ApiDemoPanel/Curl/index.js
+++ b/frontend/src/theme/ApiDemoPanel/Curl/index.js
@@ -234,6 +234,7 @@ function Curl({ postman, codeSamples }) {
            )}
            key={lang.tabName || lang.label}
            onClick={() => setLanguage(lang)}
+            type="button"
          >
            {lang.tabName || lang.label}
          </button>
--- a/lib/load-simple-icons.js
+++ b/lib/load-simple-icons.js
@@ -1,5 +1,4 @@
 import * as originalSimpleIcons from 'simple-icons/icons'
-import { svg2base64 } from './svg-helpers.js'

 function loadSimpleIcons() {
  const simpleIcons = {}
@@ -16,10 +15,10 @@ function loadSimpleIcons() {
    const icon = originalSimpleIcons[key]
    const { title, slug, hex } = icon

-    icon.base64 = {
-      default: svg2base64(icon.svg.replace('<svg', `<svg fill="#${hex}"`)),
-      light: svg2base64(icon.svg.replace('<svg', '<svg fill="whitesmoke"')),
-      dark: svg2base64(icon.svg.replace('<svg', '<svg fill="#333"')),
+    icon.styles = {
+      default: icon.svg.replace('<svg', `<svg fill="#${hex}"`),
+      light: icon.svg.replace('<svg', '<svg fill="whitesmoke"'),
+      dark: icon.svg.replace('<svg', '<svg fill="#333"'),
    }

    // There are a few instances where multiple icons have the same title
--- a/lib/load-simple-icons.spec.js
+++ b/lib/load-simple-icons.spec.js
@@ -8,7 +8,7 @@ describe('loadSimpleIcons', function () {
  })

  it('prepares three color themes', function () {
-    expect(simpleIcons.sentry.base64).to.have.all.keys(
+    expect(simpleIcons.sentry.styles).to.have.all.keys(
      'default',
      'light',
      'dark',
--- a/lib/logos.js
+++ b/lib/logos.js
@@ -5,7 +5,7 @@ import {
  normalizeColor,
 } from '../badge-maker/lib/color.js'
 import coalesce from '../core/base-service/coalesce.js'
-import { svg2base64 } from './svg-helpers.js'
+import { svg2base64, getIconSize, resetIconPosition } from './svg-helpers.js'
 import loadLogos from './load-logos.js'
 import loadSimpleIcons from './load-simple-icons.js'
 const logos = loadLogos()
@@ -88,25 +88,42 @@ function getSimpleIconStyle({ icon, style }) {
  return 'default'
 }

-function getSimpleIcon({ name, color, style }) {
+// The `size` parameter is used to determine whether the icon should be resized
+// to fit the badge. If `size` is 'auto', the icon will be resized to fit the
+// badge. If `size` is not 'auto', the icon will be displayed at its original.
+// https://github.com/badges/shields/pull/9191
+function getSimpleIcon({ name, color, style, size }) {
  const key = name === 'travis' ? 'travis-ci' : name.replace(/ /g, '-')

  if (!(key in simpleIcons)) {
    return undefined
  }

+  let iconSvg
+
  const svgColor = toSvgColor(color)
  if (svgColor) {
-    return svg2base64(
-      simpleIcons[key].svg.replace('<svg', `<svg fill="${svgColor}"`),
-    )
+    iconSvg = simpleIcons[key].svg.replace('<svg', `<svg fill="${svgColor}"`)
  } else {
    const iconStyle = getSimpleIconStyle({ icon: simpleIcons[key], style })
-    return simpleIcons[key].base64[iconStyle]
+    iconSvg = simpleIcons[key].styles[iconStyle]
  }
+
+  if (size === 'auto') {
+    const { width: iconWidth, height: iconHeight } = getIconSize(key)
+
+    if (iconWidth > iconHeight) {
+      const path = resetIconPosition(simpleIcons[key].path)
+      iconSvg = iconSvg
+        .replace('viewBox="0 0 24 24"', `viewBox="0 0 24 ${iconHeight}"`)
+        .replace(/<path d=".*"\/>/, `<path d="${path}"/>`)
+    }
+  }
+
+  return svg2base64(iconSvg)
 }

-function prepareNamedLogo({ name, color, style }) {
+function prepareNamedLogo({ name, color, style, size }) {
  if (typeof name !== 'string') {
    return undefined
  }
@@ -118,7 +135,8 @@ function prepareNamedLogo({ name, color, style }) {
  }

  return (
-    getShieldsIcon({ name, color }) || getSimpleIcon({ name, color, style })
+    getShieldsIcon({ name, color }) ||
+    getSimpleIcon({ name, color, style, size })
  )
 }

@@ -131,6 +149,7 @@ function makeLogo(defaultNamedLogo, overrides) {
      name: coalesce(overrides.logo, defaultNamedLogo),
      color: overrides.logoColor,
      style: overrides.style,
+      size: overrides.logoSize,
    })
  }
 }
--- a/lib/logos.spec.js
+++ b/lib/logos.spec.js
@@ -57,6 +57,14 @@ describe('Logo helpers', function () {
    given({ name: 'github', color: 'red' }).expect(
      'data:image/svg+xml;base64,PHN2ZyBmaWxsPSIjZTA1ZDQ0IiByb2xlPSJpbWciIHZpZXdCb3g9IjAgMCAyNCAyNCIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48dGl0bGU+R2l0SHViPC90aXRsZT48cGF0aCBkPSJNMTIgLjI5N2MtNi42MyAwLTEyIDUuMzczLTEyIDEyIDAgNS4zMDMgMy40MzggOS44IDguMjA1IDExLjM4NS42LjExMy44Mi0uMjU4LjgyLS41NzcgMC0uMjg1LS4wMS0xLjA0LS4wMTUtMi4wNC0zLjMzOC43MjQtNC4wNDItMS42MS00LjA0Mi0xLjYxQzQuNDIyIDE4LjA3IDMuNjMzIDE3LjcgMy42MzMgMTcuN2MtMS4wODctLjc0NC4wODQtLjcyOS4wODQtLjcyOSAxLjIwNS4wODQgMS44MzggMS4yMzYgMS44MzggMS4yMzYgMS4wNyAxLjgzNSAyLjgwOSAxLjMwNSAzLjQ5NS45OTguMTA4LS43NzYuNDE3LTEuMzA1Ljc2LTEuNjA1LTIuNjY1LS4zLTUuNDY2LTEuMzMyLTUuNDY2LTUuOTMgMC0xLjMxLjQ2NS0yLjM4IDEuMjM1LTMuMjItLjEzNS0uMzAzLS41NC0xLjUyMy4xMDUtMy4xNzYgMCAwIDEuMDA1LS4zMjIgMy4zIDEuMjMuOTYtLjI2NyAxLjk4LS4zOTkgMy0uNDA1IDEuMDIuMDA2IDIuMDQuMTM4IDMgLjQwNSAyLjI4LTEuNTUyIDMuMjg1LTEuMjMgMy4yODUtMS4yMy42NDUgMS42NTMuMjQgMi44NzMuMTIgMy4xNzYuNzY1Ljg0IDEuMjMgMS45MSAxLjIzIDMuMjIgMCA0LjYxLTIuODA1IDUuNjI1LTUuNDc1IDUuOTIuNDIuMzYuODEgMS4wOTYuODEgMi4yMiAwIDEuNjA2LS4wMTUgMi44OTYtLjAxNSAzLjI4NiAwIC4zMTUuMjEuNjkuODI1LjU3QzIwLjU2NSAyMi4wOTIgMjQgMTcuNTkyIDI0IDEyLjI5N2MwLTYuNjI3LTUuMzczLTEyLTEyLTEyIi8+PC9zdmc+',
    )
+    // use simple icon with auto logo size
+    given({ name: 'amd', size: 'auto' }).expect(
+      'data:image/svg+xml;base64,PHN2ZyBmaWxsPSJ3aGl0ZXNtb2tlIiByb2xlPSJpbWciIHZpZXdCb3g9IjAgMCAyNCA1LjcyNTk5OTk5OTk5OTk5OSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48dGl0bGU+QU1EPC90aXRsZT48cGF0aCBkPSJNMTguMzI0IDBMMTkuODgzIDEuNTZIMjIuNDM5VjQuMTE3TDI0IDUuNjc3VjBaTTIgMC4zODNMMCA1LjM0M0gxLjMwOUwxLjY3OSA0LjM2MUgzLjlMNC4zMDggNS4zNDNINS42NDZMMy40MzIgMC4zODNaTTYuMjA5IDAuMzgzVjUuMzM4SDcuNDQ3VjIuMjQ2TDguNzg1IDMuODA4SDguOTczTDEwLjMxMSAyLjI1MlY1LjM0M0gxMS41NDlWMC4zODNIMTAuNDdMOC44NzggMi4yMjhMNy4yODcgMC4zODNaTTEyLjQ5MiAwLjM4M1Y1LjM0M0gxNC41NDlDMTYuNTI4IDUuMzQzIDE3LjQyOSA0LjI5NyAxNy40MjkgMi44NzFDMTcuNDI5IDEuNTExIDE2LjQ5MiAwLjM4MyAxNC42ODIgMC4zODNaTTEzLjcyOSAxLjI5M0gxNC41MjFDMTUuNjkxIDEuMjkzIDE2LjE1MSAyLjAwNCAxNi4xNTEgMi44NjNDMTYuMTUxIDMuNTkxIDE1Ljc3OSA0LjQzNSAxNC41MzUgNC40MzVIMTMuNzI5Wk0yLjc0NCAxLjU2NkwzLjUzNSAzLjQ5OEgyLjAwOFpNMTkuODgxIDEuODczTDE4LjI3NyAzLjQ3NlY1LjcyNkgyMC41MjNMMjIuMTI3IDQuMTE5SDE5Ljg4MVoiLz48L3N2Zz4=',
+    )
+    // use simple icon with color & auto logo size
+    given({ name: 'amd', color: 'white', size: 'auto' }).expect(
+      'data:image/svg+xml;base64,PHN2ZyBmaWxsPSJ3aGl0ZSIgcm9sZT0iaW1nIiB2aWV3Qm94PSIwIDAgMjQgNS43MjU5OTk5OTk5OTk5OTkiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PHRpdGxlPkFNRDwvdGl0bGU+PHBhdGggZD0iTTE4LjMyNCAwTDE5Ljg4MyAxLjU2SDIyLjQzOVY0LjExN0wyNCA1LjY3N1YwWk0yIDAuMzgzTDAgNS4zNDNIMS4zMDlMMS42NzkgNC4zNjFIMy45TDQuMzA4IDUuMzQzSDUuNjQ2TDMuNDMyIDAuMzgzWk02LjIwOSAwLjM4M1Y1LjMzOEg3LjQ0N1YyLjI0Nkw4Ljc4NSAzLjgwOEg4Ljk3M0wxMC4zMTEgMi4yNTJWNS4zNDNIMTEuNTQ5VjAuMzgzSDEwLjQ3TDguODc4IDIuMjI4TDcuMjg3IDAuMzgzWk0xMi40OTIgMC4zODNWNS4zNDNIMTQuNTQ5QzE2LjUyOCA1LjM0MyAxNy40MjkgNC4yOTcgMTcuNDI5IDIuODcxQzE3LjQyOSAxLjUxMSAxNi40OTIgMC4zODMgMTQuNjgyIDAuMzgzWk0xMy43MjkgMS4yOTNIMTQuNTIxQzE1LjY5MSAxLjI5MyAxNi4xNTEgMi4wMDQgMTYuMTUxIDIuODYzQzE2LjE1MSAzLjU5MSAxNS43NzkgNC40MzUgMTQuNTM1IDQuNDM1SDEzLjcyOVpNMi43NDQgMS41NjZMMy41MzUgMy40OThIMi4wMDhaTTE5Ljg4MSAxLjg3M0wxOC4yNzcgMy40NzZWNS43MjZIMjAuNTIzTDIyLjEyNyA0LjExOUgxOS44ODFaIi8+PC9zdmc+',
+    )

    // use travis shield icon
    given({ name: 'travis' }).expect(
--- a/lib/svg-helpers.js
+++ b/lib/svg-helpers.js
@@ -1,7 +1,38 @@
+import SVGPathCommander from 'svg-path-commander'
+import loadSimpleIcons from './load-simple-icons.js'
+
+const simpleIcons = loadSimpleIcons()
+
 function svg2base64(svg) {
  return `data:image/svg+xml;base64,${Buffer.from(svg.trim()).toString(
    'base64',
  )}`
 }

-export { svg2base64 }
+function getIconSize(iconKey) {
+  if (!(iconKey in simpleIcons)) {
+    return undefined
+  }
+
+  const {
+    width,
+    height,
+    x: x0,
+    y: y0,
+    x2: x1,
+    y2: y1,
+  } = SVGPathCommander.getPathBBox(simpleIcons[iconKey].path)
+
+  return { width, height, x0, y0, x1, y1 }
+}
+
+function resetIconPosition(path) {
+  const { x: offsetX, y: offsetY } = SVGPathCommander.getPathBBox(path)
+  const pathReset = new SVGPathCommander(path)
+    .transform({ translate: [-offsetX, -offsetY] })
+    .toString()
+
+  return pathReset
+}
+
+export { svg2base64, getIconSize, resetIconPosition }
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -21,9 +21,9 @@
    "url": "https://github.com/badges/shields"
  },
  "dependencies": {
-    "@renovate/pep440": "^1.0.0",
-    "@renovatebot/ruby-semver": "^3.0.13",
-    "@sentry/node": "^7.66.0",
+    "@renovatebot/pep440": "^3.0.20",
+    "@renovatebot/ruby-semver": "^3.0.23",
+    "@sentry/node": "^8.11.0",
    "@shields_io/camp": "^18.1.2",
    "@xmldom/xmldom": "0.8.10",
    "badge-maker": "file:badge-maker",
@@ -32,19 +32,19 @@
    "chalk": "^5.3.0",
    "check-node-version": "^4.2.1",
    "cloudflare-middleware": "^1.0.4",
-    "config": "^3.3.9",
+    "config": "^3.3.11",
    "cross-env": "^7.0.3",
-    "dayjs": "^1.11.9",
+    "dayjs": "^1.11.11",
    "decamelize": "^3.2.0",
    "emojic": "^1.1.17",
    "escape-string-regexp": "^4.0.0",
-    "fast-xml-parser": "^4.2.7",
-    "glob": "^10.3.4",
+    "fast-xml-parser": "^4.4.0",
+    "glob": "^10.4.2",
    "global-agent": "^3.0.0",
-    "got": "^13.0.0",
-    "graphql": "16.8.0",
+    "got": "^14.4.1",
+    "graphql": "16.8.2",
    "graphql-tag": "^2.12.6",
-    "joi": "17.10.1",
+    "joi": "17.13.3",
    "joi-extension-semver": "5.0.0",
    "js-yaml": "^4.1.0",
    "jsonpath": "~1.1.1",
@@ -53,20 +53,21 @@
    "lodash.times": "^4.3.2",
    "matcher": "^5.0.0",
    "node-env-flag": "^0.1.0",
-    "node-pg-migrate": "^6.2.2",
+    "node-pg-migrate": "^7.5.0",
    "parse-link-header": "^2.0.0",
-    "path-to-regexp": "^6.2.1",
-    "pg": "^8.11.3",
+    "path-to-regexp": "^6.2.2",
+    "pg": "^8.12.0",
    "pretty-bytes": "^6.1.1",
    "priorityqueuejs": "^2.0.0",
-    "prom-client": "^14.2.0",
-    "qs": "^6.11.2",
-    "query-string": "^8.1.0",
-    "semver": "~7.5.4",
-    "simple-icons": "9.12.0",
-    "smol-toml": "1.1.2",
-    "webextension-store-meta": "^1.0.5",
-    "xpath": "~0.0.33"
+    "prom-client": "^15.1.2",
+    "qs": "^6.12.1",
+    "query-string": "^9.0.0",
+    "semver": "~7.6.2",
+    "simple-icons": "12.3.0",
+    "smol-toml": "1.2.1",
+    "svg-path-commander": "^2.0.9",
+    "webextension-store-meta": "^1.2.3",
+    "xpath": "~0.0.34"
  },
  "scripts": {
    "coverage:test:core": "c8 npm run test:core",
@@ -97,7 +98,7 @@
    "pretest": "cross-env BASE_URL=http://localhost:8080 run-s --silent defs",
    "test": "run-s --silent --continue-on-error lint test:package test:core test:entrypoint check-types:package prettier:check",
    "check-types:package": "tsd badge-maker",
-    "depcheck": "check-node-version --node \">= 18.0\"",
+    "depcheck": "check-node-version --node \">= 20.0\"",
    "prebuild": "run-s --silent depcheck",
    "defs": "node scripts/export-openapi-cli.js",
    "build": "rimraf public && run-s defs docusaurus:build",
@@ -144,77 +145,78 @@
    ]
  },
  "devDependencies": {
-    "@docusaurus/core": "^2.0.0",
-    "@easyops-cn/docusaurus-search-local": "^0.35.0",
-    "@mdx-js/react": "^1.6.21",
-    "@typescript-eslint/parser": "^6.5.0",
-    "c8": "^8.0.1",
+    "@docusaurus/core": "^3.4.0",
+    "@docusaurus/preset-classic": "^3.4.0",
+    "@easyops-cn/docusaurus-search-local": "^0.44.2",
+    "@mdx-js/react": "^3.0.1",
+    "@typescript-eslint/parser": "^7.13.1",
+    "c8": "^10.1.2",
    "caller": "^1.1.0",
-    "chai": "^4.3.8",
-    "chai-as-promised": "^7.1.1",
+    "chai": "^4.4.1",
+    "chai-as-promised": "^8.0.0",
    "chai-datetime": "^1.8.0",
    "chai-string": "^1.4.0",
    "child-process-promise": "^2.2.1",
-    "clsx": "^2.0.0",
-    "concurrently": "^8.2.1",
-    "cypress": "^13.1.0",
+    "clsx": "^2.1.1",
+    "concurrently": "^8.2.2",
+    "cypress": "^13.12.0",
    "cypress-wait-for-stable-dom": "^0.1.0",
-    "danger": "^11.2.8",
+    "danger": "^12.3.3",
    "deepmerge": "^4.3.1",
-    "docusaurus-preset-openapi": "0.6.4",
-    "eslint": "8.48.0",
-    "eslint-config-prettier": "^9.0.0",
+    "docusaurus-preset-openapi": "0.7.5",
+    "eslint": "8.57.0",
+    "eslint-config-prettier": "^9.1.0",
    "eslint-config-standard": "17.1.0",
    "eslint-config-standard-jsx": "11.0.0",
    "eslint-config-standard-react": "13.0.0",
-    "eslint-plugin-chai-friendly": "^0.7.2",
-    "eslint-plugin-cypress": "^2.14.0",
+    "eslint-plugin-chai-friendly": "^1.0.0",
+    "eslint-plugin-cypress": "^3.3.0",
    "eslint-plugin-icedfrisby": "^0.1.0",
-    "eslint-plugin-import": "^2.28.1",
-    "eslint-plugin-jsdoc": "^46.5.1",
-    "eslint-plugin-mocha": "^10.1.0",
+    "eslint-plugin-import": "^2.29.1",
+    "eslint-plugin-jsdoc": "^48.2.12",
+    "eslint-plugin-mocha": "^10.4.3",
    "eslint-plugin-no-extension-in-require": "^0.2.0",
    "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-promise": "6.1.1",
-    "eslint-plugin-react": "^7.33.2",
-    "eslint-plugin-react-hooks": "^4.6.0",
-    "eslint-plugin-sort-class-members": "^1.18.0",
+    "eslint-plugin-promise": "6.2.0",
+    "eslint-plugin-react": "^7.34.3",
+    "eslint-plugin-react-hooks": "^4.6.2",
+    "eslint-plugin-sort-class-members": "^1.20.0",
    "form-data": "^4.0.0",
    "icedfrisby": "4.0.0",
    "icedfrisby-nock": "^2.1.0",
-    "is-svg": "^5.0.0",
-    "jsdoc": "^4.0.2",
-    "lint-staged": "^14.0.1",
+    "is-svg": "^5.0.1",
+    "jsdoc": "^4.0.3",
+    "lint-staged": "^15.2.7",
    "lodash.difference": "^4.5.0",
    "minimist": "^1.2.8",
-    "mocha": "^10.2.0",
+    "mocha": "^10.4.0",
    "mocha-env-reporter": "^4.0.0",
    "mocha-junit-reporter": "^2.2.1",
    "mocha-yaml-loader": "^1.0.3",
-    "nock": "13.3.3",
-    "node-mocks-http": "^1.13.0",
-    "nodemon": "^3.0.1",
+    "nock": "13.5.4",
+    "node-mocks-http": "^1.14.1",
+    "nodemon": "^3.1.4",
    "npm-run-all": "^4.1.5",
-    "open-cli": "^7.2.0",
+    "open-cli": "^8.0.0",
    "portfinder": "^1.0.32",
-    "prettier": "3.0.3",
-    "prism-react-renderer": "^2.0.6",
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2",
+    "prettier": "3.3.2",
+    "prism-react-renderer": "^2.3.1",
+    "react": "^18.3.0",
+    "react-dom": "^18.3.1",
    "read-all-stdin-sync": "^1.0.5",
-    "rimraf": "^5.0.1",
+    "rimraf": "^5.0.7",
    "sazerac": "^2.0.0",
-    "simple-git-hooks": "^2.9.0",
-    "sinon": "^15.2.0",
+    "simple-git-hooks": "^2.11.1",
+    "sinon": "^18.0.0",
    "sinon-chai": "^3.7.0",
    "snap-shot-it": "^7.9.10",
-    "start-server-and-test": "2.0.0",
-    "tsd": "^0.29.0",
-    "url": "^0.11.1"
+    "start-server-and-test": "2.0.4",
+    "tsd": "^0.31.1",
+    "url": "^0.11.3"
  },
  "engines": {
-    "node": "^18.16.0",
-    "npm": "^9.0.0"
+    "node": "^20.10.0",
+    "npm": "^9.0.0 || ^10.0.0"
  },
  "type": "module",
  "collective": {
--- a/scripts/export-openapi-cli.js
+++ b/scripts/export-openapi-cli.js
@@ -27,7 +27,7 @@ function writeSpec(filename, spec) {

    writeSpec(
      path.join(specsPath, `${category.id}.yaml`),
-      category2openapi(category, services),
+      category2openapi({ category, services, sort: true }),
    )
  }

@@ -44,6 +44,10 @@ function writeSpec(filename, spec) {
  )
  writeSpec(
    path.join(specsPath, '1core.yaml'),
-    category2openapi({ name: 'Core' }, coreServices),
+    category2openapi({
+      category: { name: 'Core' },
+      services: coreServices,
+      sort: false,
+    }),
  )
 })()
--- a/server.js
+++ b/server.js
@@ -2,7 +2,7 @@ import fs from 'fs'
 import path from 'path'
 import { fileURLToPath } from 'url'
 import configModule from 'config'
-import Sentry from '@sentry/node'
+import * as Sentry from '@sentry/node'
 import Server from './core/server/server.js'

 // Set up Sentry reporting as early in the process as possible.
--- a/services/amo/amo-base.js
+++ b/services/amo/amo-base.js
@@ -2,7 +2,8 @@ import Joi from 'joi'
 import { nonNegativeInteger } from '../validators.js'
 import { BaseJsonService } from '../index.js'

-const keywords = ['amo', 'firefox']
+const description =
+  '[addons.mozilla.org](https://addons.mozilla.org) (AMO) publishes extensions for Mozilla Firefox'

 const schema = Joi.object({
  average_daily_users: nonNegativeInteger,
@@ -26,4 +27,4 @@ class BaseAmoService extends BaseJsonService {
  }
 }

-export { BaseAmoService, keywords }
+export { BaseAmoService, description }
--- a/services/amo/amo-downloads.service.js
+++ b/services/amo/amo-downloads.service.js
@@ -1,8 +1,9 @@
 import { renderDownloadsBadge } from '../downloads.js'
 import { redirector, pathParams } from '../index.js'
-import { BaseAmoService } from './amo-base.js'
+import { BaseAmoService, description as baseDescription } from './amo-base.js'
+
+const description = `${baseDescription}

-const description = `
 Previously \`amo/d\` provided a &ldquo;total downloads&rdquo; badge. However,
 [updates to the v3 API](https://github.com/badges/shields/issues/3079)
 only give us weekly downloads. The route \`amo/d\` redirects to \`amo/dw\`.
--- a/services/amo/amo-rating.service.js
+++ b/services/amo/amo-rating.service.js
@@ -1,7 +1,7 @@
 import { starRating } from '../text-formatters.js'
 import { floorCount as floorCountColor } from '../color-formatters.js'
 import { pathParams } from '../index.js'
-import { BaseAmoService } from './amo-base.js'
+import { BaseAmoService, description } from './amo-base.js'

 export default class AmoRating extends BaseAmoService {
  static category = 'rating'
@@ -11,12 +11,14 @@ export default class AmoRating extends BaseAmoService {
    '/amo/rating/{addonId}': {
      get: {
        summary: 'Mozilla Add-on Rating',
+        description,
        parameters: pathParams({ name: 'addonId', example: 'dustman' }),
      },
    },
    '/amo/stars/{addonId}': {
      get: {
        summary: 'Mozilla Add-on Stars',
+        description,
        parameters: pathParams({ name: 'addonId', example: 'dustman' }),
      },
    },
--- a/Show More
+++ b/Show More