tests(reuse): increase service test timeout

chore(deps): bump qs from 6.10.3 to 6.10.5 (#8064 )
Bumps [qs](https://github.com/ljharb/qs) from 6.10.3 to 6.10.5. - [Release notes](https://github.com/ljharb/qs/releases) - [Changelog](https://github.com/ljharb/qs/blob/main/CHANGELOG.md) - [Commits](https://github.com/ljharb/qs/compare/v6.10.3...v6.10.5) --- updated-dependencies: - dependency-name: qs dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: repo-ranger[bot] <39074581+repo-ranger[bot]@users.noreply.github.com>
2022-06-12 19:14:43 -05:00 · 2022-06-12 19:34:06 +00:00 · 2022-06-12 16:58:50 +00:00 · 2022-06-12 16:52:28 +00:00 · 2022-06-12 16:44:16 +00:00 · 2022-06-12 16:37:59 +00:00
312 changed files with 15116 additions and 14302 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -6,7 +6,8 @@ main_steps: &main_steps

    - run:
        name: Install dependencies
-        command: npm ci
+        command: |
+          npm ci
        environment:
          # https://docs.cypress.io/guides/getting-started/installing-cypress.html#Skipping-installation
          # We don't need to install the Cypress binary in jobs that aren't actually running Cypress.
@@ -47,7 +48,8 @@ integration_steps: &integration_steps

    - run:
        name: Install dependencies
-        command: npm ci
+        command: |
+          npm ci
        environment:
          CYPRESS_INSTALL_BINARY: 0

@@ -68,7 +70,8 @@ services_steps: &services_steps

    - run:
        name: Install dependencies
-        command: npm ci
+        command: |
+          npm ci
        environment:
          CYPRESS_INSTALL_BINARY: 0

@@ -110,6 +113,7 @@ package_steps: &package_steps
          MOCHA_FILE: junit/badge-maker/v12/results.xml
          NODE_VERSION: v12
          CYPRESS_INSTALL_BINARY: 0
+          NPM_CONFIG_ENGINE_STRICT: 'false'
        name: Run package tests on Node 12
        command: scripts/run_package_tests.sh

@@ -119,6 +123,7 @@ package_steps: &package_steps
          MOCHA_FILE: junit/badge-maker/v14/results.xml
          NODE_VERSION: v14
          CYPRESS_INSTALL_BINARY: 0
+          NPM_CONFIG_ENGINE_STRICT: 'false'
        name: Run package tests on Node 14
        command: scripts/run_package_tests.sh

@@ -137,33 +142,33 @@ package_steps: &package_steps
 jobs:
  main:
    docker:
-      - image: circleci/node:14
+      - image: cimg/node:16.15

    <<: *main_steps

-  main@node-16:
+  main@node-17:
    docker:
-      - image: circleci/node:16
+      - image: cimg/node:17.9

    <<: *main_steps

  integration:
    docker:
-      - image: circleci/node:14
+      - image: cimg/node:16.15
      - image: redis

    <<: *integration_steps

-  integration@node-16:
+  integration@node-17:
    docker:
-      - image: circleci/node:16
+      - image: cimg/node:17.9
      - image: redis

    <<: *integration_steps

  danger:
    docker:
-      - image: circleci/node:14
+      - image: cimg/node:16.15
    steps:
      - checkout

@@ -183,13 +188,15 @@ jobs:

  frontend:
    docker:
-      - image: circleci/node:14
+      - image: cimg/node:16.15
+
    steps:
      - checkout

      - run:
          name: Install dependencies
-          command: npm ci
+          command: |
+            npm ci
          environment:
            CYPRESS_INSTALL_BINARY: 0

@@ -218,25 +225,27 @@ jobs:
          command: npm run build

  package:
-    machine: true
+    machine:
+      image: 'ubuntu-2004:202111-02'

    <<: *package_steps

  services:
    docker:
-      - image: circleci/node:14
+      - image: cimg/node:16.15

    <<: *services_steps

-  services@node-16:
+  services@node-17:
    docker:
-      - image: circleci/node:16
+      - image: cimg/node:17.9

    <<: *services_steps

  e2e:
    docker:
-      - image: cypress/base:14.16.0
+      - image: cypress/base:16.14.0
+
    steps:
      - checkout

@@ -247,7 +256,8 @@ jobs:

      - run:
          name: Install dependencies
-          command: npm ci
+          command: |
+            npm ci

      - run:
          name: Frontend build
@@ -285,11 +295,11 @@ workflows:
          filters:
            branches:
              ignore: gh-pages
-      - main@node-16:
+      - main@node-17:
          filters:
            branches:
              ignore: gh-pages
-      - integration@node-16:
+      - integration@node-17:
          filters:
            branches:
              ignore: gh-pages
@@ -307,7 +317,7 @@ workflows:
              ignore:
                - master
                - gh-pages
-      - services@node-16:
+      - services@node-17:
          filters:
            branches:
              ignore:
--- a/.github/actions/close-bot/helpers.js
+++ b/.github/actions/close-bot/helpers.js
@@ -56,6 +56,12 @@ function isPointlessVersionBump(body) {
      line => !line.startsWith('See <a href="https://conventionalcommits.org">')
    )
    .filter(line => !line.startsWith('<!--'))
+    .filter(
+      line =>
+        !line.startsWith(
+          '<p><a href="https://www.gatsbyjs.com/docs/reference/release-notes/'
+        )
+    )
  return allChangelogLinesAreVersionBump(changelogLines)
 }

--- a/.github/actions/close-bot/package-lock.json
+++ b/.github/actions/close-bot/package-lock.json
@@ -9,53 +9,53 @@
      "version": "0.0.0",
      "license": "CC0",
      "dependencies": {
-        "@actions/core": "^1.6.0",
-        "@actions/github": "^5.0.0"
+        "@actions/core": "^1.8.2",
+        "@actions/github": "^5.0.3"
      }
    },
    "node_modules/@actions/core": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.6.0.tgz",
-      "integrity": "sha512-NB1UAZomZlCV/LmJqkLhNTqtKfFXJZAUPcfl/zqG7EfsQdeUJtaWO98SGbuQ3pydJ3fHl2CvI/51OKYlCYYcaw==",
+      "version": "1.8.2",
+      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.8.2.tgz",
+      "integrity": "sha512-FXcBL7nyik8K5ODeCKlxi+vts7torOkoDAKfeh61EAkAy1HAvwn9uVzZBY0f15YcQTcZZ2/iSGBFHEuioZWfDA==",
      "dependencies": {
-        "@actions/http-client": "^1.0.11"
+        "@actions/http-client": "^2.0.1"
      }
    },
    "node_modules/@actions/github": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/@actions/github/-/github-5.0.0.tgz",
-      "integrity": "sha512-QvE9eAAfEsS+yOOk0cylLBIO/d6WyWIOvsxxzdrPFaud39G6BOkUwScXZn1iBzQzHyu9SBkkLSWlohDWdsasAQ==",
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/@actions/github/-/github-5.0.3.tgz",
+      "integrity": "sha512-myjA/pdLQfhUGLtRZC/J4L1RXOG4o6aYdiEq+zr5wVVKljzbFld+xv10k1FX6IkIJtNxbAq44BdwSNpQ015P0A==",
      "dependencies": {
-        "@actions/http-client": "^1.0.11",
-        "@octokit/core": "^3.4.0",
-        "@octokit/plugin-paginate-rest": "^2.13.3",
-        "@octokit/plugin-rest-endpoint-methods": "^5.1.1"
+        "@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"
      }
    },
    "node_modules/@actions/http-client": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-1.0.11.tgz",
-      "integrity": "sha512-VRYHGQV1rqnROJqdMvGUbY/Kn8vriQe/F9HR2AlYHzmKuM/p3kjNuXhmdBfcVgsvRWTz5C5XW5xvndZrVBuAYg==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-2.0.1.tgz",
+      "integrity": "sha512-PIXiMVtz6VvyaRsGY268qvj57hXQEpsYogYOu2nrQhlf+XCGmZstmuZBbAybUl1nQGnvS1k1eEsQ69ZoD7xlSw==",
      "dependencies": {
-        "tunnel": "0.0.6"
+        "tunnel": "^0.0.6"
      }
    },
    "node_modules/@octokit/auth-token": {
-      "version": "2.4.5",
-      "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.4.5.tgz",
-      "integrity": "sha512-BpGYsPgJt05M7/L/5FoE1PiAbdxXFZkX/3kDYcsvd1v6UhlnE5e96dTDr0ezX/EFwciQxf3cNV0loipsURU+WA==",
+      "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"
      }
    },
    "node_modules/@octokit/core": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/@octokit/core/-/core-3.4.0.tgz",
-      "integrity": "sha512-6/vlKPP8NF17cgYXqucdshWqmMZGXkuvtcrWCgU5NOI0Pl2GjlmZyWgBMrU8zJ3v2MJlM6++CiB45VKYmhiWWg==",
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/@octokit/core/-/core-3.6.0.tgz",
+      "integrity": "sha512-7RKRKuA4xTjMhY+eG3jthb3hlZCsOwg3rztWh75Xc+ShDWOfDDATWbeZpAHBNRpm4Tv9WgBMOy1zEJYXG6NJ7Q==",
      "dependencies": {
        "@octokit/auth-token": "^2.4.4",
        "@octokit/graphql": "^4.5.8",
-        "@octokit/request": "^5.4.12",
+        "@octokit/request": "^5.6.3",
        "@octokit/request-error": "^2.0.5",
        "@octokit/types": "^6.0.3",
        "before-after-hook": "^2.2.0",
@@ -63,9 +63,9 @@
      }
    },
    "node_modules/@octokit/endpoint": {
-      "version": "6.0.11",
-      "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.11.tgz",
-      "integrity": "sha512-fUIPpx+pZyoLW4GCs3yMnlj2LfoXTWDUVPTC4V3MUEKZm48W+XYpeWSZCv+vYF1ZABUm2CqnDVf1sFtIYrj7KQ==",
+      "version": "6.0.12",
+      "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.12.tgz",
+      "integrity": "sha512-lF3puPwkQWGfkMClXb4k/eUT/nZKQfxinRWJrdZaJO85Dqwo/G0yOC434Jr2ojwafWJMYqFGFa5ms4jJUgujdA==",
      "dependencies": {
        "@octokit/types": "^6.0.3",
        "is-plain-object": "^5.0.0",
@@ -73,37 +73,37 @@
      }
    },
    "node_modules/@octokit/graphql": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-4.6.2.tgz",
-      "integrity": "sha512-WmsIR1OzOr/3IqfG9JIczI8gMJUMzzyx5j0XXQ4YihHtKlQc+u35VpVoOXhlKAlaBntvry1WpAzPl/a+s3n89Q==",
+      "version": "4.8.0",
+      "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-4.8.0.tgz",
+      "integrity": "sha512-0gv+qLSBLKF0z8TKaSKTsS39scVKF9dbMxJpj3U0vC7wjNWFuIpL/z76Qe2fiuCbDRcJSavkXsVtMS6/dtQQsg==",
      "dependencies": {
-        "@octokit/request": "^5.3.0",
+        "@octokit/request": "^5.6.0",
        "@octokit/types": "^6.0.3",
        "universal-user-agent": "^6.0.0"
      }
    },
    "node_modules/@octokit/openapi-types": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-7.0.0.tgz",
-      "integrity": "sha512-gV/8DJhAL/04zjTI95a7FhQwS6jlEE0W/7xeYAzuArD0KVAVWDLP2f3vi98hs3HLTczxXdRK/mF0tRoQPpolEw=="
+      "version": "11.2.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-11.2.0.tgz",
+      "integrity": "sha512-PBsVO+15KSlGmiI8QAzaqvsNlZlrDlyAJYcrXBCvVUxCp7VnXjkwPoFHgjEJXx3WF9BAwkA6nfCUA7i9sODzKA=="
    },
    "node_modules/@octokit/plugin-paginate-rest": {
-      "version": "2.13.3",
-      "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.13.3.tgz",
-      "integrity": "sha512-46lptzM9lTeSmIBt/sVP/FLSTPGx6DCzAdSX3PfeJ3mTf4h9sGC26WpaQzMEq/Z44cOcmx8VsOhO+uEgE3cjYg==",
+      "version": "2.17.0",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.17.0.tgz",
+      "integrity": "sha512-tzMbrbnam2Mt4AhuyCHvpRkS0oZ5MvwwcQPYGtMv4tUa5kkzG58SVB0fcsLulOZQeRnOgdkZWkRUiyBlh0Bkyw==",
      "dependencies": {
-        "@octokit/types": "^6.11.0"
+        "@octokit/types": "^6.34.0"
      },
      "peerDependencies": {
        "@octokit/core": ">=2"
      }
    },
    "node_modules/@octokit/plugin-rest-endpoint-methods": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.1.1.tgz",
-      "integrity": "sha512-u4zy0rVA8darm/AYsIeWkRalhQR99qPL1D/EXHejV2yaECMdHfxXiTXtba8NMBSajOJe8+C9g+EqMKSvysx0dg==",
+      "version": "5.13.0",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.13.0.tgz",
+      "integrity": "sha512-uJjMTkN1KaOIgNtUPMtIXDOjx6dGYysdIFhgA52x4xSadQCz3b/zJexvITDVpANnfKPW/+E0xkOvLntqMYpviA==",
      "dependencies": {
-        "@octokit/types": "^6.14.1",
+        "@octokit/types": "^6.34.0",
        "deprecation": "^2.3.1"
      },
      "peerDependencies": {
@@ -111,22 +111,22 @@
      }
    },
    "node_modules/@octokit/request": {
-      "version": "5.4.15",
-      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-5.4.15.tgz",
-      "integrity": "sha512-6UnZfZzLwNhdLRreOtTkT9n57ZwulCve8q3IT/Z477vThu6snfdkBuhxnChpOKNGxcQ71ow561Qoa6uqLdPtag==",
+      "version": "5.6.3",
+      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-5.6.3.tgz",
+      "integrity": "sha512-bFJl0I1KVc9jYTe9tdGGpAMPy32dLBXXo1dS/YwSCTL/2nd9XeHsY616RE3HPXDVk+a+dBuzyz5YdlXwcDTr2A==",
      "dependencies": {
        "@octokit/endpoint": "^6.0.1",
-        "@octokit/request-error": "^2.0.0",
-        "@octokit/types": "^6.7.1",
+        "@octokit/request-error": "^2.1.0",
+        "@octokit/types": "^6.16.1",
        "is-plain-object": "^5.0.0",
-        "node-fetch": "^2.6.1",
+        "node-fetch": "^2.6.7",
        "universal-user-agent": "^6.0.0"
      }
    },
    "node_modules/@octokit/request-error": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.0.5.tgz",
-      "integrity": "sha512-T/2wcCFyM7SkXzNoyVNWjyVlUwBvW3igM3Btr/eKYiPmucXTtkxt2RBsf6gn3LTzaLSLTQtNmvg+dGsOxQrjZg==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.1.0.tgz",
+      "integrity": "sha512-1VIvgXxs9WHSjicsRwq8PlR2LR2x6DwsJAaFgzdi0JfJoGSO8mYI/cHJQ+9FbN21aa+DrgNLnwObmyeSC8Rmpg==",
      "dependencies": {
        "@octokit/types": "^6.0.3",
        "deprecation": "^2.0.0",
@@ -134,17 +134,17 @@
      }
    },
    "node_modules/@octokit/types": {
-      "version": "6.14.2",
-      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-6.14.2.tgz",
-      "integrity": "sha512-wiQtW9ZSy4OvgQ09iQOdyXYNN60GqjCL/UdMsepDr1Gr0QzpW6irIKbH3REuAHXAhxkEk9/F2a3Gcs1P6kW5jA==",
+      "version": "6.34.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-6.34.0.tgz",
+      "integrity": "sha512-s1zLBjWhdEI2zwaoSgyOFoKSl109CUcVBCc7biPJ3aAf6LGLU6szDvi31JPU7bxfla2lqfhjbbg/5DdFNxOwHw==",
      "dependencies": {
-        "@octokit/openapi-types": "^7.0.0"
+        "@octokit/openapi-types": "^11.2.0"
      }
    },
    "node_modules/before-after-hook": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.2.1.tgz",
-      "integrity": "sha512-/6FKxSTWoJdbsLDF8tdIjaRiFXiE6UHsEHE3OPI/cwPURCVi1ukP0gmLn7XWEiFk5TcwQjjY5PWsU+j+tgXgmw=="
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.2.2.tgz",
+      "integrity": "sha512-3pZEU3NT5BFUo/AD5ERPWOgQOCZITni6iavr5AUw5AUwQjMlI0kzu5btnyD39AF0gUEsDPwJT+oY1ORBJijPjQ=="
    },
    "node_modules/deprecation": {
      "version": "2.3.1",
@@ -160,11 +160,22 @@
      }
    },
    "node_modules/node-fetch": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
-      "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==",
+      "version": "2.6.7",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
+      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
+      "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": {
@@ -175,6 +186,11 @@
        "wrappy": "1"
      }
    },
+    "node_modules/tr46": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+      "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o="
+    },
    "node_modules/tunnel": {
      "version": "0.0.6",
      "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz",
@@ -188,6 +204,20 @@
      "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.0.tgz",
      "integrity": "sha512-isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w=="
    },
+    "node_modules/webidl-conversions": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+      "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE="
+    },
+    "node_modules/whatwg-url": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+      "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=",
+      "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",
@@ -196,48 +226,48 @@
  },
  "dependencies": {
    "@actions/core": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.6.0.tgz",
-      "integrity": "sha512-NB1UAZomZlCV/LmJqkLhNTqtKfFXJZAUPcfl/zqG7EfsQdeUJtaWO98SGbuQ3pydJ3fHl2CvI/51OKYlCYYcaw==",
+      "version": "1.8.2",
+      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.8.2.tgz",
+      "integrity": "sha512-FXcBL7nyik8K5ODeCKlxi+vts7torOkoDAKfeh61EAkAy1HAvwn9uVzZBY0f15YcQTcZZ2/iSGBFHEuioZWfDA==",
      "requires": {
-        "@actions/http-client": "^1.0.11"
+        "@actions/http-client": "^2.0.1"
      }
    },
    "@actions/github": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/@actions/github/-/github-5.0.0.tgz",
-      "integrity": "sha512-QvE9eAAfEsS+yOOk0cylLBIO/d6WyWIOvsxxzdrPFaud39G6BOkUwScXZn1iBzQzHyu9SBkkLSWlohDWdsasAQ==",
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/@actions/github/-/github-5.0.3.tgz",
+      "integrity": "sha512-myjA/pdLQfhUGLtRZC/J4L1RXOG4o6aYdiEq+zr5wVVKljzbFld+xv10k1FX6IkIJtNxbAq44BdwSNpQ015P0A==",
      "requires": {
-        "@actions/http-client": "^1.0.11",
-        "@octokit/core": "^3.4.0",
-        "@octokit/plugin-paginate-rest": "^2.13.3",
-        "@octokit/plugin-rest-endpoint-methods": "^5.1.1"
+        "@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": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-1.0.11.tgz",
-      "integrity": "sha512-VRYHGQV1rqnROJqdMvGUbY/Kn8vriQe/F9HR2AlYHzmKuM/p3kjNuXhmdBfcVgsvRWTz5C5XW5xvndZrVBuAYg==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-2.0.1.tgz",
+      "integrity": "sha512-PIXiMVtz6VvyaRsGY268qvj57hXQEpsYogYOu2nrQhlf+XCGmZstmuZBbAybUl1nQGnvS1k1eEsQ69ZoD7xlSw==",
      "requires": {
-        "tunnel": "0.0.6"
+        "tunnel": "^0.0.6"
      }
    },
    "@octokit/auth-token": {
-      "version": "2.4.5",
-      "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.4.5.tgz",
-      "integrity": "sha512-BpGYsPgJt05M7/L/5FoE1PiAbdxXFZkX/3kDYcsvd1v6UhlnE5e96dTDr0ezX/EFwciQxf3cNV0loipsURU+WA==",
+      "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==",
      "requires": {
        "@octokit/types": "^6.0.3"
      }
    },
    "@octokit/core": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/@octokit/core/-/core-3.4.0.tgz",
-      "integrity": "sha512-6/vlKPP8NF17cgYXqucdshWqmMZGXkuvtcrWCgU5NOI0Pl2GjlmZyWgBMrU8zJ3v2MJlM6++CiB45VKYmhiWWg==",
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/@octokit/core/-/core-3.6.0.tgz",
+      "integrity": "sha512-7RKRKuA4xTjMhY+eG3jthb3hlZCsOwg3rztWh75Xc+ShDWOfDDATWbeZpAHBNRpm4Tv9WgBMOy1zEJYXG6NJ7Q==",
      "requires": {
        "@octokit/auth-token": "^2.4.4",
        "@octokit/graphql": "^4.5.8",
-        "@octokit/request": "^5.4.12",
+        "@octokit/request": "^5.6.3",
        "@octokit/request-error": "^2.0.5",
        "@octokit/types": "^6.0.3",
        "before-after-hook": "^2.2.0",
@@ -245,9 +275,9 @@
      }
    },
    "@octokit/endpoint": {
-      "version": "6.0.11",
-      "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.11.tgz",
-      "integrity": "sha512-fUIPpx+pZyoLW4GCs3yMnlj2LfoXTWDUVPTC4V3MUEKZm48W+XYpeWSZCv+vYF1ZABUm2CqnDVf1sFtIYrj7KQ==",
+      "version": "6.0.12",
+      "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.12.tgz",
+      "integrity": "sha512-lF3puPwkQWGfkMClXb4k/eUT/nZKQfxinRWJrdZaJO85Dqwo/G0yOC434Jr2ojwafWJMYqFGFa5ms4jJUgujdA==",
      "requires": {
        "@octokit/types": "^6.0.3",
        "is-plain-object": "^5.0.0",
@@ -255,54 +285,54 @@
      }
    },
    "@octokit/graphql": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-4.6.2.tgz",
-      "integrity": "sha512-WmsIR1OzOr/3IqfG9JIczI8gMJUMzzyx5j0XXQ4YihHtKlQc+u35VpVoOXhlKAlaBntvry1WpAzPl/a+s3n89Q==",
+      "version": "4.8.0",
+      "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-4.8.0.tgz",
+      "integrity": "sha512-0gv+qLSBLKF0z8TKaSKTsS39scVKF9dbMxJpj3U0vC7wjNWFuIpL/z76Qe2fiuCbDRcJSavkXsVtMS6/dtQQsg==",
      "requires": {
-        "@octokit/request": "^5.3.0",
+        "@octokit/request": "^5.6.0",
        "@octokit/types": "^6.0.3",
        "universal-user-agent": "^6.0.0"
      }
    },
    "@octokit/openapi-types": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-7.0.0.tgz",
-      "integrity": "sha512-gV/8DJhAL/04zjTI95a7FhQwS6jlEE0W/7xeYAzuArD0KVAVWDLP2f3vi98hs3HLTczxXdRK/mF0tRoQPpolEw=="
+      "version": "11.2.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-11.2.0.tgz",
+      "integrity": "sha512-PBsVO+15KSlGmiI8QAzaqvsNlZlrDlyAJYcrXBCvVUxCp7VnXjkwPoFHgjEJXx3WF9BAwkA6nfCUA7i9sODzKA=="
    },
    "@octokit/plugin-paginate-rest": {
-      "version": "2.13.3",
-      "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.13.3.tgz",
-      "integrity": "sha512-46lptzM9lTeSmIBt/sVP/FLSTPGx6DCzAdSX3PfeJ3mTf4h9sGC26WpaQzMEq/Z44cOcmx8VsOhO+uEgE3cjYg==",
+      "version": "2.17.0",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.17.0.tgz",
+      "integrity": "sha512-tzMbrbnam2Mt4AhuyCHvpRkS0oZ5MvwwcQPYGtMv4tUa5kkzG58SVB0fcsLulOZQeRnOgdkZWkRUiyBlh0Bkyw==",
      "requires": {
-        "@octokit/types": "^6.11.0"
+        "@octokit/types": "^6.34.0"
      }
    },
    "@octokit/plugin-rest-endpoint-methods": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.1.1.tgz",
-      "integrity": "sha512-u4zy0rVA8darm/AYsIeWkRalhQR99qPL1D/EXHejV2yaECMdHfxXiTXtba8NMBSajOJe8+C9g+EqMKSvysx0dg==",
+      "version": "5.13.0",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.13.0.tgz",
+      "integrity": "sha512-uJjMTkN1KaOIgNtUPMtIXDOjx6dGYysdIFhgA52x4xSadQCz3b/zJexvITDVpANnfKPW/+E0xkOvLntqMYpviA==",
      "requires": {
-        "@octokit/types": "^6.14.1",
+        "@octokit/types": "^6.34.0",
        "deprecation": "^2.3.1"
      }
    },
    "@octokit/request": {
-      "version": "5.4.15",
-      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-5.4.15.tgz",
-      "integrity": "sha512-6UnZfZzLwNhdLRreOtTkT9n57ZwulCve8q3IT/Z477vThu6snfdkBuhxnChpOKNGxcQ71ow561Qoa6uqLdPtag==",
+      "version": "5.6.3",
+      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-5.6.3.tgz",
+      "integrity": "sha512-bFJl0I1KVc9jYTe9tdGGpAMPy32dLBXXo1dS/YwSCTL/2nd9XeHsY616RE3HPXDVk+a+dBuzyz5YdlXwcDTr2A==",
      "requires": {
        "@octokit/endpoint": "^6.0.1",
-        "@octokit/request-error": "^2.0.0",
-        "@octokit/types": "^6.7.1",
+        "@octokit/request-error": "^2.1.0",
+        "@octokit/types": "^6.16.1",
        "is-plain-object": "^5.0.0",
-        "node-fetch": "^2.6.1",
+        "node-fetch": "^2.6.7",
        "universal-user-agent": "^6.0.0"
      }
    },
    "@octokit/request-error": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.0.5.tgz",
-      "integrity": "sha512-T/2wcCFyM7SkXzNoyVNWjyVlUwBvW3igM3Btr/eKYiPmucXTtkxt2RBsf6gn3LTzaLSLTQtNmvg+dGsOxQrjZg==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.1.0.tgz",
+      "integrity": "sha512-1VIvgXxs9WHSjicsRwq8PlR2LR2x6DwsJAaFgzdi0JfJoGSO8mYI/cHJQ+9FbN21aa+DrgNLnwObmyeSC8Rmpg==",
      "requires": {
        "@octokit/types": "^6.0.3",
        "deprecation": "^2.0.0",
@@ -310,17 +340,17 @@
      }
    },
    "@octokit/types": {
-      "version": "6.14.2",
-      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-6.14.2.tgz",
-      "integrity": "sha512-wiQtW9ZSy4OvgQ09iQOdyXYNN60GqjCL/UdMsepDr1Gr0QzpW6irIKbH3REuAHXAhxkEk9/F2a3Gcs1P6kW5jA==",
+      "version": "6.34.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-6.34.0.tgz",
+      "integrity": "sha512-s1zLBjWhdEI2zwaoSgyOFoKSl109CUcVBCc7biPJ3aAf6LGLU6szDvi31JPU7bxfla2lqfhjbbg/5DdFNxOwHw==",
      "requires": {
-        "@octokit/openapi-types": "^7.0.0"
+        "@octokit/openapi-types": "^11.2.0"
      }
    },
    "before-after-hook": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.2.1.tgz",
-      "integrity": "sha512-/6FKxSTWoJdbsLDF8tdIjaRiFXiE6UHsEHE3OPI/cwPURCVi1ukP0gmLn7XWEiFk5TcwQjjY5PWsU+j+tgXgmw=="
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.2.2.tgz",
+      "integrity": "sha512-3pZEU3NT5BFUo/AD5ERPWOgQOCZITni6iavr5AUw5AUwQjMlI0kzu5btnyD39AF0gUEsDPwJT+oY1ORBJijPjQ=="
    },
    "deprecation": {
      "version": "2.3.1",
@@ -333,9 +363,12 @@
      "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q=="
    },
    "node-fetch": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
-      "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw=="
+      "version": "2.6.7",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
+      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
+      "requires": {
+        "whatwg-url": "^5.0.0"
+      }
    },
    "once": {
      "version": "1.4.0",
@@ -345,6 +378,11 @@
        "wrappy": "1"
      }
    },
+    "tr46": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+      "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o="
+    },
    "tunnel": {
      "version": "0.0.6",
      "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz",
@@ -355,6 +393,20 @@
      "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.0.tgz",
      "integrity": "sha512-isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w=="
    },
+    "webidl-conversions": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+      "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE="
+    },
+    "whatwg-url": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+      "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=",
+      "requires": {
+        "tr46": "~0.0.3",
+        "webidl-conversions": "^3.0.0"
+      }
+    },
    "wrappy": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
--- a/.github/actions/close-bot/package.json
+++ b/.github/actions/close-bot/package.json
@@ -10,7 +10,7 @@
  "author": "chris48s",
  "license": "CC0",
  "dependencies": {
-    "@actions/core": "^1.6.0",
-    "@actions/github": "^5.0.0"
+    "@actions/core": "^1.8.2",
+    "@actions/github": "^5.0.3"
  }
 }
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -8,6 +8,16 @@ updates:
      day: friday
      time: '12:00'
    open-pull-requests-limit: 99
+    ignore:
+      # https://github.com/badges/shields/issues/7324
+      # https://github.com/badges/shields/issues/7447
+      # we're stuck with these versions until Safari is compatible with lookbehind regex syntax
+      # https://caniuse.com/js-regexp-lookbehind
+      - dependency-name: 'decamelize'
+      - dependency-name: 'humanize-string'
+
+      # https://github.com/badges/shields/pull/7288#issuecomment-974699240
+      - dependency-name: '@types/node'

  # badge-maker package dependencies
  - package-ecosystem: npm
@@ -26,3 +36,8 @@ updates:
      day: friday
      time: '12:00'
    open-pull-requests-limit: 99
+  - package-ecosystem: 'github-actions'
+    directory: '/'
+    schedule:
+      interval: weekly
+    open-pull-requests-limit: 99
--- a/.github/workflows/auto-close.yml
+++ b/.github/workflows/auto-close.yml
@@ -10,7 +10,7 @@ jobs:
    if: github.actor == 'dependabot[bot]'
    steps:
      - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3

      - name: Install action dependencies
        run: cd .github/actions/close-bot && npm ci
--- a/.github/workflows/build-docker-image.yml
+++ b/.github/workflows/build-docker-image.yml
@@ -7,14 +7,19 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3

      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
+
+      - name: Set Git Short SHA
+        run: echo "SHORT_SHA=${GITHUB_SHA::7}" >> $GITHUB_ENV

      - name: Build
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3
        with:
          context: .
          push: false
          tags: shieldsio/shields:pr-validation
+          build-args: |
+            version=${{ env.SHORT_SHA }}
--- a/.github/workflows/create-release.yml
+++ b/.github/workflows/create-release.yml
@@ -4,6 +4,9 @@ on:
  pull_request:
    types: [closed]

+permissions:
+  contents: write
+
 jobs:
  create-release:
    if: |
@@ -20,7 +23,7 @@ jobs:
        run: echo "::set-output name=date::$(date --rfc-3339=date)"

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

@@ -31,17 +34,19 @@ jobs:
          tag: server-${{ steps.date.outputs.date }}

      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2

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

      - name: Build and push snapshot release to DockerHub
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3
        with:
          context: .
          push: true
          tags: shieldsio/shields:server-${{ steps.date.outputs.date }}
+          build-args: |
+            version=server-${{ steps.date.outputs.date }}
--- a/.github/workflows/deploy-docs.yml
+++ b/.github/workflows/deploy-docs.yml
@@ -3,12 +3,16 @@ on:
  push:
    branches:
      - master
+
+permissions:
+  contents: write
+
 jobs:
  build-and-deploy:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v2.3.1
+        uses: actions/checkout@v3
        with:
          persist-credentials: false

@@ -18,9 +22,8 @@ jobs:
          npm run build-docs

      - name: Deploy
-        uses: JamesIves/github-pages-deploy-action@3.7.1
+        uses: JamesIves/github-pages-deploy-action@v4
        with:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          BRANCH: gh-pages
-          FOLDER: api-docs
-          CLEAN: true
+          branch: gh-pages
+          folder: api-docs
+          clean: true
--- a/.github/workflows/draft-release.yml
+++ b/.github/workflows/draft-release.yml
@@ -5,12 +5,16 @@ on:
    # At 01:00 on the first day of every month
  workflow_dispatch:

+permissions:
+  pull-requests: write
+  contents: write
+
 jobs:
  build:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3

      - name: Draft Release
        uses: ./.github/actions/draft-release
--- a/.github/workflows/enforce-dependency-review.yml
+++ b/.github/workflows/enforce-dependency-review.yml
@@ -0,0 +1,11 @@
+name: 'Dependency Review'
+on: [pull_request]
+
+jobs:
+  dependency-review:
+    runs-on: ubuntu-latest
+    steps:
+      - name: 'Checkout Repository'
+        uses: actions/checkout@v3
+      - name: 'Dependency Review'
+        uses: actions/dependency-review-action@v1
--- a/.github/workflows/publish-docker-next.yml
+++ b/.github/workflows/publish-docker-next.yml
@@ -9,20 +9,25 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3

      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2

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

+      - name: Set Git Short SHA
+        run: echo "SHORT_SHA=${GITHUB_SHA::7}" >> $GITHUB_ENV
+
      - name: Build and push
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3
        with:
          context: .
          push: true
          tags: shieldsio/shields:next
+          build-args: |
+            version=${{ env.SHORT_SHA }}
--- a/.npmrc
+++ b/.npmrc
@@ -0,0 +1,2 @@
+engine-strict=true
+strict-peer-deps=true
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,105 @@ Note: this changelog is for the shields.io server. The changelog for the badge-m

 ---

+## server-2022-06-01
+
+- Update GitLab logo (2022) [#7984](https://github.com/badges/shields/issues/7984)
+- [GitHub] Added milestone property to GitHub issue details service [#7864](https://github.com/badges/shields/issues/7864)
+- [Spack] Package Manager: Update Endpoint [#7957](https://github.com/badges/shields/issues/7957)
+- Update Chocolatey API endpoint URL [#7952](https://github.com/badges/shields/issues/7952)
+- [Flathub]Add downloads badge [#7724](https://github.com/badges/shields/issues/7724)
+- replace the outdated Telegram logo with the newest [#7831](https://github.com/badges/shields/issues/7831)
+- add [PUB] points badge [#7918](https://github.com/badges/shields/issues/7918)
+- add [PUB] popularity badge [#7920](https://github.com/badges/shields/issues/7920)
+- add [PUB] likes badge [#7916](https://github.com/badges/shields/issues/7916)
+- Dependency updates
+
+## server-2022-05-03
+
+- [OSSFScorecard] Create scorecard badge service [#7687](https://github.com/badges/shields/issues/7687)
+- Stringify [githublanguagecount] message [#7881](https://github.com/badges/shields/issues/7881)
+- Stringify and trim whitespace from a few services [#7880](https://github.com/badges/shields/issues/7880)
+- add labels to Dockerfile [#7862](https://github.com/badges/shields/issues/7862)
+- handle missing 'fly-client-ip' [#7814](https://github.com/badges/shields/issues/7814)
+- Dependency updates
+
+## server-2022-04-03
+
+- Breaking change: This release updates ioredis from v4 to v5.
+  If you are using redis for GitHub token pooling, redis connection strings of the form
+  `redis://junkusername:authpassword@example.com:1234` will need to be updated to
+  `redis://:authpassword@example.com:1234`. See the
+  [ioredis upgrade guide](https://github.com/luin/ioredis/wiki/Upgrading-from-v4-to-v5)
+  for further details.
+- fix installation issue on npm >= 8.5.5 [#7809](https://github.com/badges/shields/issues/7809)
+- two fixes for [packagist] schemas [#7782](https://github.com/badges/shields/issues/7782)
+- allow requireCloudflare setting to work when hosted on fly.io [#7781](https://github.com/badges/shields/issues/7781)
+- fix [pypi] badges when package has null license [#7761](https://github.com/badges/shields/issues/7761)
+- Add a [pub] publisher badge [#7715](https://github.com/badges/shields/issues/7715)
+- Switch Steam file size badge to informational color [#7722](https://github.com/badges/shields/issues/7722)
+- Make W3C and Youtube documentation links clickable [#7721](https://github.com/badges/shields/issues/7721)
+- Improve Wercker examples [#7720](https://github.com/badges/shields/issues/7720)
+- Improve Cirrus CI examples [#7719](https://github.com/badges/shields/issues/7719)
+- Support [CodeClimate] responses with multiple data items [#7716](https://github.com/badges/shields/issues/7716)
+- Delete [TeamCityCoverage] and [BowerVersion] redirectors [#7718](https://github.com/badges/shields/issues/7718)
+- Deprecate [Shippable] service [#7717](https://github.com/badges/shields/issues/7717)
+- fix: restore version comparison updates from #4173 [#4254](https://github.com/badges/shields/issues/4254)
+- [piwheels], filter out versions with no files [#7696](https://github.com/badges/shields/issues/7696)
+- set a longer cacheLength on [librariesio] badges [#7692](https://github.com/badges/shields/issues/7692)
+- improve python version formatting [#7682](https://github.com/badges/shields/issues/7682)
+- Clarify GitHub All Contributors badge [#7690](https://github.com/badges/shields/issues/7690)
+- Support [HexPM] packages with no stable release [#7685](https://github.com/badges/shields/issues/7685)
+- Add Test at Scale Badge [#7612](https://github.com/badges/shields/issues/7612)
+- [packagist] api v2 support [#7681](https://github.com/badges/shields/issues/7681)
+- Add [piwheels] version badge [#7656](https://github.com/badges/shields/issues/7656)
+- Dependency updates
+
+## server-2022-03-01
+
+- Add [Conan] version service (#7460)
+- remove suspended [github] tokens from the pool [#7654](https://github.com/badges/shields/issues/7654)
+- generate links without trailing : if port not set [#7655](https://github.com/badges/shields/issues/7655)
+- Use the latest build status when checking docs.rs [#7613](https://github.com/badges/shields/issues/7613)
+- Remove no download handling and add API warning to [Wordpress] badges [#7606](https://github.com/badges/shields/issues/7606)
+- set a higher default cacheLength on rating/star category [#7587](https://github.com/badges/shields/issues/7587)
+- Update [amo] to use v4 API, set custom `cacheLength`s [#7586](https://github.com/badges/shields/issues/7586)
+- fix(amo): include trailing slash in API call [#7585](https://github.com/badges/shields/issues/7585)
+- fix docker image user agent [#7582](https://github.com/badges/shields/issues/7582)
+- Delete deprecated Codetally and continuousphp services [#7572](https://github.com/badges/shields/issues/7572)
+- Deprecate [Requires] service [#7571](https://github.com/badges/shields/issues/7571)
+- [AUR] Fix RPC URL [#7570](https://github.com/badges/shields/issues/7570)
+- Dependency updates
+
+## server-2022-02-01
+
+- [Depfu] Add support for Gitlab [#7475](https://github.com/badges/shields/issues/7475)
+- replace label in hn-user-karma with U/ [#7500](https://github.com/badges/shields/issues/7500)
+- Support [Feedz] response with multiple pages without items [#7476](https://github.com/badges/shields/issues/7476)
+- revert decamelize and humanize-string to old versions [#7449](https://github.com/badges/shields/issues/7449)
+- Dependency updates
+
+## server-2022-01-01
+
+- minor [reddit] improvements [#7436](https://github.com/badges/shields/issues/7436)
+- [HackerNews] Show User Karma [#7411](https://github.com/badges/shields/issues/7411)
+- [YouTube] Drop support for removed dislikes [#7410](https://github.com/badges/shields/issues/7410)
+- change closed GitHub issue color to purple [#7374](https://github.com/badges/shields/issues/7374)
+- restore cors header injection from #4171 [#4255](https://github.com/badges/shields/issues/4255)
+- [GithubPackageJson] Get version from monorepo subfolder package.json [#7350](https://github.com/badges/shields/issues/7350)
+- Dependency updates
+
+## server-2021-12-01
+
+- Send better user-agent values [#7309](https://github.com/badges/shields/issues/7309)
+  Self-hosting users now send a user agent which indicates the server version and starts `shields (self-hosted)/` by default.
+  This can be configured using the env var `USER_AGENT_BASE`
+- upgrade to node 16 [#7271](https://github.com/badges/shields/issues/7271)
+- feat: deprecate dependabot badges [#7274](https://github.com/badges/shields/issues/7274)
+- fix: npmversion tagged service test [#7269](https://github.com/badges/shields/issues/7269)
+- feat: create new Test Results category [#7218](https://github.com/badges/shields/issues/7218)
+- Migration from Request to Got for all HTTP requests is completed in this release
+- Dependency updates
+
 ## server-2021-11-04

 - migrate regularUpdate() from request-->got [#7215](https://github.com/badges/shields/issues/7215)
--- a/13
+++ b/13
@@ -1,4 +1,4 @@
-FROM node:14-alpine AS Builder
+FROM node:16-alpine AS Builder

 RUN mkdir -p /usr/src/app
 RUN mkdir /usr/src/app/private
@@ -8,7 +8,8 @@ COPY package.json package-lock.json /usr/src/app/
 # Without the badge-maker package.json and CLI script in place, `npm ci` will fail.
 COPY badge-maker /usr/src/app/badge-maker/

-RUN npm install -g "npm@>=7"
+RUN apk add python3 make g++
+RUN npm install -g "npm@>=8"
 # We need dev deps to build the front end. We don't need Cypress, though.
 RUN NODE_ENV=development CYPRESS_INSTALL_BINARY=0 npm ci

@@ -18,7 +19,13 @@ RUN npm prune --production
 RUN npm cache clean --force

 # Use multi-stage build to reduce size
-FROM node:14-alpine
+FROM node:16-alpine
+
+ARG version=dev
+ENV DOCKER_SHIELDS_VERSION=$version
+LABEL version=$version
+LABEL fly.version=$version
+
 # Run the server using production configs.
 ENV NODE_ENV production

--- a/README.md
+++ b/README.md
@@ -35,7 +35,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 770 million images and is used by some of the
+Every month it serves over 870 million 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 +101,8 @@ You can read a [tutorial on how to add a badge][tutorial].

 ## Development

-1. Install Node 14 or later. You can use the [package manager][] of your choice.
-   Tests need to pass in Node 14 and 16.
+1. Install Node 16 or later. You can use the [package manager][] of your choice.
+   Tests need to pass in Node 16 and 17.
 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.
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -7,10 +7,10 @@ Please follow this guidance when reporting security issues affecting:
 - [Shields.io](https://shields.io)
 - [Raster.shields.io](https://raster.shields.io)
 - Self-hosted Shields instances
- The [svg-to-image-proxy](https://www.npmjs.com/package/svg-to-image-proxy) NPM package
+- The [squint](https://github.com/badges/squint) raster proxy
 - The [badge-maker](https://www.npmjs.com/package/badge-maker) NPM package

-The [gh-badges](https://www.npmjs.com/package/gh-badges) NPM package is now deprecated and will no longer receive fixes for bugs or security issues.
+The [gh-badges](https://www.npmjs.com/package/gh-badges) and [svg-to-image-proxy](https://www.npmjs.com/package/svg-to-image-proxy) NPM packages are now deprecated and will no longer receive fixes for bugs or security issues.

 ## Reporting a Vulnerability

--- a/config/custom-environment-variables.yml
+++ b/config/custom-environment-variables.yml
@@ -64,6 +64,7 @@ public:
    defaultCacheLengthSeconds: 'BADGE_MAX_AGE_SECONDS'

  fetchLimit: 'FETCH_LIMIT'
+  userAgentBase: 'USER_AGENT_BASE'

  requestTimeoutSeconds: 'REQUEST_TIMEOUT_SECONDS'
  requestTimeoutMaxAgeSeconds: 'REQUEST_TIMEOUT_MAX_AGE_SECONDS'
--- a/config/default.yml
+++ b/config/default.yml
@@ -34,6 +34,7 @@ public:
  handleInternalErrors: true

  fetchLimit: '10MB'
+  userAgentBase: 'shields (self-hosted)'

  requestTimeoutSeconds: 120
  requestTimeoutMaxAgeSeconds: 30
--- a/config/shields-io-production.yml
+++ b/config/shields-io-production.yml
@@ -6,13 +6,20 @@ public:
      enabled: true
      url: https://metrics.shields.io/telegraf
      instanceIdFrom: env-var
-      instanceIdEnvVarName: HEROKU_DYNO_ID
+      instanceIdEnvVarName: FLY_ALLOC_ID
      envLabel: shields-production

  ssl:
-    isSecure: true
+    isSecure: false

  cors:
    allowedOrigin: ['http://shields.io', 'https://shields.io']

+  services:
+    gitlab:
+      authorizedOrigins: 'https://gitlab.com'
+
  rasterUrl: 'https://raster.shields.io'
+  userAgentBase: 'Shields.io'
+  requireCloudflare: true
+  requestTimeoutSeconds: 20
--- a/core/base-service/auth-helper.js
+++ b/core/base-service/auth-helper.js
@@ -74,7 +74,7 @@ class AuthHelper {
  }

  static _isInsecureSslRequest({ options = {} }) {
-    const { strictSSL = true } = options
+    const strictSSL = options?.https?.rejectUnauthorized ?? true
    return strictSSL !== true
  }

@@ -107,8 +107,10 @@ class AuthHelper {
  }

  get _basicAuth() {
-    const { _user: user, _pass: pass } = this
-    return this.isConfigured ? { user, pass } : undefined
+    const { _user: username, _pass: password } = this
+    return this.isConfigured
+      ? { username: username || '', password: password || '' }
+      : undefined
  }

  /*
@@ -131,7 +133,7 @@ class AuthHelper {
    const { options, ...rest } = requestParams
    return {
      options: {
-        auth,
+        ...auth,
        ...options,
      },
      ...rest,
@@ -181,11 +183,13 @@ class AuthHelper {
  }

  static _mergeQueryParams(requestParams, query) {
-    const { options: { qs: existingQuery, ...restOptions } = {}, ...rest } =
-      requestParams
+    const {
+      options: { searchParams: existingQuery, ...restOptions } = {},
+      ...rest
+    } = requestParams
    return {
      options: {
-        qs: {
+        searchParams: {
          ...existingQuery,
          ...query,
        },
--- a/core/base-service/auth-helper.spec.js
+++ b/core/base-service/auth-helper.spec.js
@@ -104,14 +104,14 @@ describe('AuthHelper', function () {
          { userKey: 'myci_user', passKey: 'myci_pass' },
          { myci_user: 'admin', myci_pass: 'abc123' }
        ),
-      ]).expect({ user: 'admin', pass: 'abc123' })
+      ]).expect({ username: 'admin', password: 'abc123' })
      given({ userKey: 'myci_user' }, { myci_user: 'admin' }).expect({
-        user: 'admin',
-        pass: undefined,
+        username: 'admin',
+        password: '',
      })
      given({ passKey: 'myci_pass' }, { myci_pass: 'abc123' }).expect({
-        user: undefined,
-        pass: 'abc123',
+        username: '',
+        password: 'abc123',
      })
      given({ userKey: 'myci_user', passKey: 'myci_pass' }, {}).expect(
        undefined
@@ -120,8 +120,8 @@ describe('AuthHelper', function () {
        { passKey: 'myci_pass', defaultToEmptyStringForUser: true },
        { myci_pass: 'abc123' }
      ).expect({
-        user: '',
-        pass: 'abc123',
+        username: '',
+        password: 'abc123',
      })
    })
  })
@@ -131,15 +131,18 @@ describe('AuthHelper', function () {
      forCases([
        given({ url: 'http://example.test' }),
        given({ url: 'http://example.test', options: {} }),
-        given({ url: 'http://example.test', options: { strictSSL: true } }),
        given({
          url: 'http://example.test',
-          options: { strictSSL: undefined },
+          options: { https: { rejectUnauthorized: true } },
+        }),
+        given({
+          url: 'http://example.test',
+          options: { https: { rejectUnauthorized: undefined } },
        }),
      ]).expect(false)
      given({
        url: 'http://example.test',
-        options: { strictSSL: false },
+        options: { https: { rejectUnauthorized: false } },
      }).expect(true)
    })
  })
@@ -163,7 +166,9 @@ describe('AuthHelper', function () {
      })
      it('throws for insecure requests', function () {
        expect(() =>
-          authHelper.enforceStrictSsl({ options: { strictSSL: false } })
+          authHelper.enforceStrictSsl({
+            options: { https: { rejectUnauthorized: false } },
+          })
        ).to.throw(InvalidParameter)
      })
    })
@@ -185,7 +190,9 @@ describe('AuthHelper', function () {
      })
      it('does not throw for insecure requests', function () {
        expect(() =>
-          authHelper.enforceStrictSsl({ options: { strictSSL: false } })
+          authHelper.enforceStrictSsl({
+            options: { https: { rejectUnauthorized: false } },
+          })
        ).not.to.throw()
      })
    })
@@ -220,7 +227,7 @@ describe('AuthHelper', function () {
        test(shouldAuthenticateRequest, () => {
          given({
            url: 'https://myci.test/api',
-            options: { strictSSL: false },
+            options: { https: { rejectUnauthorized: false } },
          }).expect(false)
        })
      })
@@ -258,7 +265,7 @@ describe('AuthHelper', function () {
        test(shouldAuthenticateRequest, () => {
          given({
            url: 'https://myci.test',
-            options: { strictSSL: false },
+            options: { https: { rejectUnauthorized: false } },
          }).expect(true)
        })
      })
@@ -323,7 +330,8 @@ describe('AuthHelper', function () {
        }).expect({
          url: 'https://myci.test/api',
          options: {
-            auth: { user: 'admin', pass: 'abc123' },
+            username: 'admin',
+            password: 'abc123',
          },
        })
        given({
@@ -335,7 +343,8 @@ describe('AuthHelper', function () {
          url: 'https://myci.test/api',
          options: {
            headers: { Accept: 'application/json' },
-            auth: { user: 'admin', pass: 'abc123' },
+            username: 'admin',
+            password: 'abc123',
          },
        })
      })
@@ -366,7 +375,7 @@ describe('AuthHelper', function () {
      expect(() =>
        withBasicAuth({
          url: 'https://myci.test/api',
-          options: { strictSSL: false },
+          options: { https: { rejectUnauthorized: false } },
        })
      ).to.throw(InvalidParameter)
    })
--- a/core/base-service/base-graphql.js
+++ b/core/base-service/base-graphql.js
@@ -38,8 +38,8 @@ class BaseGraphqlService extends BaseService {
   *    representing the query clause of GraphQL POST body
   *    e.g. gql`{ query { ... } }`
   * @param {object} attrs.variables Variables clause of GraphQL POST body
-   * @param {object} [attrs.options={}] Options to pass to request. See
-   *    [documentation](https://github.com/request/request#requestoptions-callback)
+   * @param {object} [attrs.options={}] Options to pass to got. See
+   *    [documentation](https://github.com/sindresorhus/got/blob/main/documentation/2-options.md)
   * @param {object} [attrs.httpErrorMessages={}] Key-value map of HTTP status codes
   *    and custom error messages e.g: `{ 404: 'package not found' }`.
   *    This can be used to extend or override the
@@ -53,7 +53,7 @@ class BaseGraphqlService extends BaseService {
   *    The default is to return the first entry of the `errors` array as
   *    an InvalidResponse.
   * @returns {object} Parsed response
-   * @see https://github.com/request/request#requestoptions-callback
+   * @see https://github.com/sindresorhus/got/blob/main/documentation/2-options.md
   */
  async _requestGraphql({
    schema,
--- a/core/base-service/base-graphql.spec.js
+++ b/core/base-service/base-graphql.spec.js
@@ -29,9 +29,9 @@ class DummyGraphqlService extends BaseGraphqlService {

 describe('BaseGraphqlService', function () {
  describe('Making requests', function () {
-    let sendAndCacheRequest
+    let requestFetcher
    beforeEach(function () {
-      sendAndCacheRequest = sinon.stub().returns(
+      requestFetcher = sinon.stub().returns(
        Promise.resolve({
          buffer: '{"some": "json"}',
          res: { statusCode: 200 },
@@ -39,13 +39,13 @@ describe('BaseGraphqlService', function () {
      )
    })

-    it('invokes _sendAndCacheRequest', async function () {
+    it('invokes _requestFetcher', async function () {
      await DummyGraphqlService.invoke(
-        { sendAndCacheRequest },
+        { requestFetcher },
        { handleInternalErrors: false }
      )

-      expect(sendAndCacheRequest).to.have.been.calledOnceWith(
+      expect(requestFetcher).to.have.been.calledOnceWith(
        'http://example.com/graphql',
        {
          body: '{"query":"{\\n  requiredString\\n}\\n","variables":{}}',
@@ -55,7 +55,7 @@ describe('BaseGraphqlService', function () {
      )
    })

-    it('forwards options to _sendAndCacheRequest', async function () {
+    it('forwards options to _requestFetcher', async function () {
      class WithOptions extends DummyGraphqlService {
        async handle() {
          const { value } = await this._requestGraphql({
@@ -66,24 +66,24 @@ describe('BaseGraphqlService', function () {
                requiredString
              }
            `,
-            options: { qs: { queryParam: 123 } },
+            options: { searchParams: { queryParam: 123 } },
          })
          return { message: value }
        }
      }

      await WithOptions.invoke(
-        { sendAndCacheRequest },
+        { requestFetcher },
        { handleInternalErrors: false }
      )

-      expect(sendAndCacheRequest).to.have.been.calledOnceWith(
+      expect(requestFetcher).to.have.been.calledOnceWith(
        'http://example.com/graphql',
        {
          body: '{"query":"{\\n  requiredString\\n}\\n","variables":{}}',
          headers: { Accept: 'application/json' },
          method: 'POST',
-          qs: { queryParam: 123 },
+          searchParams: { queryParam: 123 },
        }
      )
    })
@@ -91,13 +91,13 @@ describe('BaseGraphqlService', function () {

  describe('Making badges', function () {
    it('handles valid json responses', async function () {
-      const sendAndCacheRequest = async () => ({
+      const requestFetcher = async () => ({
        buffer: '{"requiredString": "some-string"}',
        res: { statusCode: 200 },
      })
      expect(
        await DummyGraphqlService.invoke(
-          { sendAndCacheRequest },
+          { requestFetcher },
          { handleInternalErrors: false }
        )
      ).to.deep.equal({
@@ -106,13 +106,13 @@ describe('BaseGraphqlService', function () {
    })

    it('handles json responses which do not match the schema', async function () {
-      const sendAndCacheRequest = async () => ({
+      const requestFetcher = async () => ({
        buffer: '{"unexpectedKey": "some-string"}',
        res: { statusCode: 200 },
      })
      expect(
        await DummyGraphqlService.invoke(
-          { sendAndCacheRequest },
+          { requestFetcher },
          { handleInternalErrors: false }
        )
      ).to.deep.equal({
@@ -123,13 +123,13 @@ describe('BaseGraphqlService', function () {
    })

    it('handles unparseable json responses', async function () {
-      const sendAndCacheRequest = async () => ({
+      const requestFetcher = async () => ({
        buffer: 'not json',
        res: { statusCode: 200 },
      })
      expect(
        await DummyGraphqlService.invoke(
-          { sendAndCacheRequest },
+          { requestFetcher },
          { handleInternalErrors: false }
        )
      ).to.deep.equal({
@@ -142,13 +142,13 @@ describe('BaseGraphqlService', function () {

  describe('Error handling', function () {
    it('handles generic error', async function () {
-      const sendAndCacheRequest = async () => ({
+      const requestFetcher = async () => ({
        buffer: '{ "errors": [ { "message": "oh noes!!" } ] }',
        res: { statusCode: 200 },
      })
      expect(
        await DummyGraphqlService.invoke(
-          { sendAndCacheRequest },
+          { requestFetcher },
          { handleInternalErrors: false }
        )
      ).to.deep.equal({
@@ -181,13 +181,13 @@ describe('BaseGraphqlService', function () {
        }
      }

-      const sendAndCacheRequest = async () => ({
+      const requestFetcher = async () => ({
        buffer: '{ "errors": [ { "message": "oh noes!!" } ] }',
        res: { statusCode: 200 },
      })
      expect(
        await WithErrorHandler.invoke(
-          { sendAndCacheRequest },
+          { requestFetcher },
          { handleInternalErrors: false }
        )
      ).to.deep.equal({
--- a/core/base-service/base-json.js
+++ b/core/base-service/base-json.js
@@ -28,14 +28,14 @@ class BaseJsonService extends BaseService {
   * @param {object} attrs Refer to individual attrs
   * @param {Joi} attrs.schema Joi schema to validate the response against
   * @param {string} attrs.url URL to request
-   * @param {object} [attrs.options={}] Options to pass to request. See
-   *    [documentation](https://github.com/request/request#requestoptions-callback)
+   * @param {object} [attrs.options={}] Options to pass to got. See
+   *    [documentation](https://github.com/sindresorhus/got/blob/main/documentation/2-options.md)
   * @param {object} [attrs.errorMessages={}] Key-value map of status codes
   *    and custom error messages e.g: `{ 404: 'package not found' }`.
   *    This can be used to extend or override the
   *    [default](https://github.com/badges/shields/blob/master/core/base-service/check-error-response.js#L5)
   * @returns {object} Parsed response
-   * @see https://github.com/request/request#requestoptions-callback
+   * @see https://github.com/sindresorhus/got/blob/main/documentation/2-options.md
   */
  async _requestJson({ schema, url, options = {}, errorMessages = {} }) {
    const mergedOptions = {
--- a/core/base-service/base-json.spec.js
+++ b/core/base-service/base-json.spec.js
@@ -22,9 +22,9 @@ class DummyJsonService extends BaseJsonService {

 describe('BaseJsonService', function () {
  describe('Making requests', function () {
-    let sendAndCacheRequest
+    let requestFetcher
    beforeEach(function () {
-      sendAndCacheRequest = sinon.stub().returns(
+      requestFetcher = sinon.stub().returns(
        Promise.resolve({
          buffer: '{"some": "json"}',
          res: { statusCode: 200 },
@@ -32,13 +32,13 @@ describe('BaseJsonService', function () {
      )
    })

-    it('invokes _sendAndCacheRequest', async function () {
+    it('invokes _requestFetcher', async function () {
      await DummyJsonService.invoke(
-        { sendAndCacheRequest },
+        { requestFetcher },
        { handleInternalErrors: false }
      )

-      expect(sendAndCacheRequest).to.have.been.calledOnceWith(
+      expect(requestFetcher).to.have.been.calledOnceWith(
        'http://example.com/foo.json',
        {
          headers: { Accept: 'application/json' },
@@ -46,29 +46,29 @@ describe('BaseJsonService', function () {
      )
    })

-    it('forwards options to _sendAndCacheRequest', async function () {
+    it('forwards options to _requestFetcher', async function () {
      class WithOptions extends DummyJsonService {
        async handle() {
          const { value } = await this._requestJson({
            schema: dummySchema,
            url: 'http://example.com/foo.json',
-            options: { method: 'POST', qs: { queryParam: 123 } },
+            options: { method: 'POST', searchParams: { queryParam: 123 } },
          })
          return { message: value }
        }
      }

      await WithOptions.invoke(
-        { sendAndCacheRequest },
+        { requestFetcher },
        { handleInternalErrors: false }
      )

-      expect(sendAndCacheRequest).to.have.been.calledOnceWith(
+      expect(requestFetcher).to.have.been.calledOnceWith(
        'http://example.com/foo.json',
        {
          headers: { Accept: 'application/json' },
          method: 'POST',
-          qs: { queryParam: 123 },
+          searchParams: { queryParam: 123 },
        }
      )
    })
@@ -76,13 +76,13 @@ describe('BaseJsonService', function () {

  describe('Making badges', function () {
    it('handles valid json responses', async function () {
-      const sendAndCacheRequest = async () => ({
+      const requestFetcher = async () => ({
        buffer: '{"requiredString": "some-string"}',
        res: { statusCode: 200 },
      })
      expect(
        await DummyJsonService.invoke(
-          { sendAndCacheRequest },
+          { requestFetcher },
          { handleInternalErrors: false }
        )
      ).to.deep.equal({
@@ -91,13 +91,13 @@ describe('BaseJsonService', function () {
    })

    it('handles json responses which do not match the schema', async function () {
-      const sendAndCacheRequest = async () => ({
+      const requestFetcher = async () => ({
        buffer: '{"unexpectedKey": "some-string"}',
        res: { statusCode: 200 },
      })
      expect(
        await DummyJsonService.invoke(
-          { sendAndCacheRequest },
+          { requestFetcher },
          { handleInternalErrors: false }
        )
      ).to.deep.equal({
@@ -108,13 +108,13 @@ describe('BaseJsonService', function () {
    })

    it('handles unparseable json responses', async function () {
-      const sendAndCacheRequest = async () => ({
+      const requestFetcher = async () => ({
        buffer: 'not json',
        res: { statusCode: 200 },
      })
      expect(
        await DummyJsonService.invoke(
-          { sendAndCacheRequest },
+          { requestFetcher },
          { handleInternalErrors: false }
        )
      ).to.deep.equal({
--- a/core/base-service/base-svg-scraping.js
+++ b/core/base-service/base-svg-scraping.js
@@ -51,14 +51,14 @@ class BaseSvgScrapingService extends BaseService {
   * @param {RegExp} attrs.valueMatcher
   *    RegExp to match the value we want to parse from the SVG
   * @param {string} attrs.url URL to request
-   * @param {object} [attrs.options={}] Options to pass to request. See
-   *    [documentation](https://github.com/request/request#requestoptions-callback)
+   * @param {object} [attrs.options={}] Options to pass to got. See
+   *    [documentation](https://github.com/sindresorhus/got/blob/main/documentation/2-options.md)
   * @param {object} [attrs.errorMessages={}] Key-value map of status codes
   *    and custom error messages e.g: `{ 404: 'package not found' }`.
   *    This can be used to extend or override the
   *    [default](https://github.com/badges/shields/blob/master/core/base-service/check-error-response.js#L5)
   * @returns {object} Parsed response
-   * @see https://github.com/request/request#requestoptions-callback
+   * @see https://github.com/sindresorhus/got/blob/main/documentation/2-options.md
   */
  async _requestSvg({
    schema,
--- a/core/base-service/base-svg-scraping.spec.js
+++ b/core/base-service/base-svg-scraping.spec.js
@@ -34,9 +34,9 @@ describe('BaseSvgScrapingService', function () {
  })

  describe('Making requests', function () {
-    let sendAndCacheRequest
+    let requestFetcher
    beforeEach(function () {
-      sendAndCacheRequest = sinon.stub().returns(
+      requestFetcher = sinon.stub().returns(
        Promise.resolve({
          buffer: exampleSvg,
          res: { statusCode: 200 },
@@ -44,13 +44,13 @@ describe('BaseSvgScrapingService', function () {
      )
    })

-    it('invokes _sendAndCacheRequest with the expected header', async function () {
+    it('invokes _requestFetcher with the expected header', async function () {
      await DummySvgScrapingService.invoke(
-        { sendAndCacheRequest },
+        { requestFetcher },
        { handleInternalErrors: false }
      )

-      expect(sendAndCacheRequest).to.have.been.calledOnceWith(
+      expect(requestFetcher).to.have.been.calledOnceWith(
        'http://example.com/foo.svg',
        {
          headers: { Accept: 'image/svg+xml' },
@@ -58,7 +58,7 @@ describe('BaseSvgScrapingService', function () {
      )
    })

-    it('forwards options to _sendAndCacheRequest', async function () {
+    it('forwards options to _requestFetcher', async function () {
      class WithCustomOptions extends DummySvgScrapingService {
        async handle() {
          const { message } = await this._requestSvg({
@@ -66,7 +66,7 @@ describe('BaseSvgScrapingService', function () {
            url: 'http://example.com/foo.svg',
            options: {
              method: 'POST',
-              qs: { queryParam: 123 },
+              searchParams: { queryParam: 123 },
            },
          })
          return { message }
@@ -74,16 +74,16 @@ describe('BaseSvgScrapingService', function () {
      }

      await WithCustomOptions.invoke(
-        { sendAndCacheRequest },
+        { requestFetcher },
        { handleInternalErrors: false }
      )

-      expect(sendAndCacheRequest).to.have.been.calledOnceWith(
+      expect(requestFetcher).to.have.been.calledOnceWith(
        'http://example.com/foo.svg',
        {
          method: 'POST',
          headers: { Accept: 'image/svg+xml' },
-          qs: { queryParam: 123 },
+          searchParams: { queryParam: 123 },
        }
      )
    })
@@ -91,13 +91,13 @@ describe('BaseSvgScrapingService', function () {

  describe('Making badges', function () {
    it('handles valid svg responses', async function () {
-      const sendAndCacheRequest = async () => ({
+      const requestFetcher = async () => ({
        buffer: exampleSvg,
        res: { statusCode: 200 },
      })
      expect(
        await DummySvgScrapingService.invoke(
-          { sendAndCacheRequest },
+          { requestFetcher },
          { handleInternalErrors: false }
        )
      ).to.deep.equal({
@@ -117,13 +117,13 @@ describe('BaseSvgScrapingService', function () {
          })
        }
      }
-      const sendAndCacheRequest = async () => ({
+      const requestFetcher = async () => ({
        buffer: '<desc>a different message</desc>',
        res: { statusCode: 200 },
      })
      expect(
        await WithValueMatcher.invoke(
-          { sendAndCacheRequest },
+          { requestFetcher },
          { handleInternalErrors: false }
        )
      ).to.deep.equal({
@@ -132,13 +132,13 @@ describe('BaseSvgScrapingService', function () {
    })

    it('handles unparseable svg responses', async function () {
-      const sendAndCacheRequest = async () => ({
+      const requestFetcher = async () => ({
        buffer: 'not svg yo',
        res: { statusCode: 200 },
      })
      expect(
        await DummySvgScrapingService.invoke(
-          { sendAndCacheRequest },
+          { requestFetcher },
          { handleInternalErrors: false }
        )
      ).to.deep.equal({
--- a/core/base-service/base-xml.js
+++ b/core/base-service/base-xml.js
@@ -4,7 +4,7 @@

 // See available emoji at http://emoji.muan.co/
 import emojic from 'emojic'
-import fastXmlParser from 'fast-xml-parser'
+import { XMLParser, XMLValidator } from 'fast-xml-parser'
 import BaseService from './base.js'
 import trace from './trace.js'
 import { InvalidResponse } from './errors.js'
@@ -22,8 +22,8 @@ class BaseXmlService extends BaseService {
   * @param {object} attrs Refer to individual attrs
   * @param {Joi} attrs.schema Joi schema to validate the response against
   * @param {string} attrs.url URL to request
-   * @param {object} [attrs.options={}] Options to pass to request. See
-   *    [documentation](https://github.com/request/request#requestoptions-callback)
+   * @param {object} [attrs.options={}] Options to pass to got. See
+   *    [documentation](https://github.com/sindresorhus/got/blob/main/documentation/2-options.md)
   * @param {object} [attrs.errorMessages={}] Key-value map of status codes
   *    and custom error messages e.g: `{ 404: 'package not found' }`.
   *    This can be used to extend or override the
@@ -31,7 +31,7 @@ class BaseXmlService extends BaseService {
   * @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
-   * @see https://github.com/request/request#requestoptions-callback
+   * @see https://github.com/sindresorhus/got/blob/main/documentation/2-options.md
   * @see https://github.com/NaturalIntelligence/fast-xml-parser#xml-to-json
   */
  async _requestXml({
@@ -51,14 +51,15 @@ class BaseXmlService extends BaseService {
      options: mergedOptions,
      errorMessages,
    })
-    const validateResult = fastXmlParser.validate(buffer)
+    const validateResult = XMLValidator.validate(buffer)
    if (validateResult !== true) {
      throw new InvalidResponse({
        prettyMessage: 'unparseable xml response',
        underlyingError: validateResult.err,
      })
    }
-    const xml = fastXmlParser.parse(buffer, parserOptions)
+    const parser = new XMLParser(parserOptions)
+    const xml = parser.parse(buffer)
    logTrace(emojic.dart, 'Response XML (before validation)', xml, {
      deep: true,
    })
--- a/core/base-service/base-xml.spec.js
+++ b/core/base-service/base-xml.spec.js
@@ -22,9 +22,9 @@ class DummyXmlService extends BaseXmlService {

 describe('BaseXmlService', function () {
  describe('Making requests', function () {
-    let sendAndCacheRequest
+    let requestFetcher
    beforeEach(function () {
-      sendAndCacheRequest = sinon.stub().returns(
+      requestFetcher = sinon.stub().returns(
        Promise.resolve({
          buffer: '<requiredString>some-string</requiredString>',
          res: { statusCode: 200 },
@@ -32,13 +32,13 @@ describe('BaseXmlService', function () {
      )
    })

-    it('invokes _sendAndCacheRequest', async function () {
+    it('invokes _requestFetcher', async function () {
      await DummyXmlService.invoke(
-        { sendAndCacheRequest },
+        { requestFetcher },
        { handleInternalErrors: false }
      )

-      expect(sendAndCacheRequest).to.have.been.calledOnceWith(
+      expect(requestFetcher).to.have.been.calledOnceWith(
        'http://example.com/foo.xml',
        {
          headers: { Accept: 'application/xml, text/xml' },
@@ -46,7 +46,7 @@ describe('BaseXmlService', function () {
      )
    })

-    it('forwards options to _sendAndCacheRequest', async function () {
+    it('forwards options to _requestFetcher', async function () {
      class WithCustomOptions extends BaseXmlService {
        static route = {}

@@ -54,23 +54,23 @@ describe('BaseXmlService', function () {
          const { requiredString } = await this._requestXml({
            schema: dummySchema,
            url: 'http://example.com/foo.xml',
-            options: { method: 'POST', qs: { queryParam: 123 } },
+            options: { method: 'POST', searchParams: { queryParam: 123 } },
          })
          return { message: requiredString }
        }
      }

      await WithCustomOptions.invoke(
-        { sendAndCacheRequest },
+        { requestFetcher },
        { handleInternalErrors: false }
      )

-      expect(sendAndCacheRequest).to.have.been.calledOnceWith(
+      expect(requestFetcher).to.have.been.calledOnceWith(
        'http://example.com/foo.xml',
        {
          headers: { Accept: 'application/xml, text/xml' },
          method: 'POST',
-          qs: { queryParam: 123 },
+          searchParams: { queryParam: 123 },
        }
      )
    })
@@ -78,13 +78,13 @@ describe('BaseXmlService', function () {

  describe('Making badges', function () {
    it('handles valid xml responses', async function () {
-      const sendAndCacheRequest = async () => ({
+      const requestFetcher = async () => ({
        buffer: '<requiredString>some-string</requiredString>',
        res: { statusCode: 200 },
      })
      expect(
        await DummyXmlService.invoke(
-          { sendAndCacheRequest },
+          { requestFetcher },
          { handleInternalErrors: false }
        )
      ).to.deep.equal({
@@ -104,14 +104,14 @@ describe('BaseXmlService', function () {
          return { message: requiredString }
        }
      }
-      const sendAndCacheRequest = async () => ({
+      const requestFetcher = async () => ({
        buffer:
          '<requiredString>some-string with trailing whitespace   </requiredString>',
        res: { statusCode: 200 },
      })
      expect(
        await DummyXmlServiceWithParserOption.invoke(
-          { sendAndCacheRequest },
+          { requestFetcher },
          { handleInternalErrors: false }
        )
      ).to.deep.equal({
@@ -120,13 +120,13 @@ describe('BaseXmlService', function () {
    })

    it('handles xml responses which do not match the schema', async function () {
-      const sendAndCacheRequest = async () => ({
+      const requestFetcher = async () => ({
        buffer: '<unexpectedAttribute>some-string</unexpectedAttribute>',
        res: { statusCode: 200 },
      })
      expect(
        await DummyXmlService.invoke(
-          { sendAndCacheRequest },
+          { requestFetcher },
          { handleInternalErrors: false }
        )
      ).to.deep.equal({
@@ -137,13 +137,13 @@ describe('BaseXmlService', function () {
    })

    it('handles unparseable xml responses', async function () {
-      const sendAndCacheRequest = async () => ({
+      const requestFetcher = async () => ({
        buffer: 'not xml',
        res: { statusCode: 200 },
      })
      expect(
        await DummyXmlService.invoke(
-          { sendAndCacheRequest },
+          { requestFetcher },
          { handleInternalErrors: false }
        )
      ).to.deep.equal({
--- a/core/base-service/base-yaml.js
+++ b/core/base-service/base-yaml.js
@@ -21,15 +21,15 @@ class BaseYamlService extends BaseService {
   * @param {object} attrs Refer to individual attrs
   * @param {Joi} attrs.schema Joi schema to validate the response against
   * @param {string} attrs.url URL to request
-   * @param {object} [attrs.options={}] Options to pass to request. See
-   *    [documentation](https://github.com/request/request#requestoptions-callback)
+   * @param {object} [attrs.options={}] Options to pass to got. See
+   *    [documentation](https://github.com/sindresorhus/got/blob/main/documentation/2-options.md)
   * @param {object} [attrs.errorMessages={}] Key-value map of status codes
   *    and custom error messages e.g: `{ 404: 'package not found' }`.
   *    This can be used to extend or override the
   *    [default](https://github.com/badges/shields/blob/master/core/base-service/check-error-response.js#L5)
   * @param {object} [attrs.encoding='utf8'] Character encoding
   * @returns {object} Parsed response
-   * @see https://github.com/request/request#requestoptions-callback
+   * @see https://github.com/sindresorhus/got/blob/main/documentation/2-options.md
   */
  async _requestYaml({
    schema,
--- a/core/base-service/base-yaml.spec.js
+++ b/core/base-service/base-yaml.spec.js
@@ -38,9 +38,9 @@ foo: baz

 describe('BaseYamlService', function () {
  describe('Making requests', function () {
-    let sendAndCacheRequest
+    let requestFetcher
    beforeEach(function () {
-      sendAndCacheRequest = sinon.stub().returns(
+      requestFetcher = sinon.stub().returns(
        Promise.resolve({
          buffer: expectedYaml,
          res: { statusCode: 200 },
@@ -48,13 +48,13 @@ describe('BaseYamlService', function () {
      )
    })

-    it('invokes _sendAndCacheRequest', async function () {
+    it('invokes _requestFetcher', async function () {
      await DummyYamlService.invoke(
-        { sendAndCacheRequest },
+        { requestFetcher },
        { handleInternalErrors: false }
      )

-      expect(sendAndCacheRequest).to.have.been.calledOnceWith(
+      expect(requestFetcher).to.have.been.calledOnceWith(
        'http://example.com/foo.yaml',
        {
          headers: {
@@ -65,24 +65,24 @@ describe('BaseYamlService', function () {
      )
    })

-    it('forwards options to _sendAndCacheRequest', async function () {
+    it('forwards options to _requestFetcher', async function () {
      class WithOptions extends DummyYamlService {
        async handle() {
          const { requiredString } = await this._requestYaml({
            schema: dummySchema,
            url: 'http://example.com/foo.yaml',
-            options: { method: 'POST', qs: { queryParam: 123 } },
+            options: { method: 'POST', searchParams: { queryParam: 123 } },
          })
          return { message: requiredString }
        }
      }

      await WithOptions.invoke(
-        { sendAndCacheRequest },
+        { requestFetcher },
        { handleInternalErrors: false }
      )

-      expect(sendAndCacheRequest).to.have.been.calledOnceWith(
+      expect(requestFetcher).to.have.been.calledOnceWith(
        'http://example.com/foo.yaml',
        {
          headers: {
@@ -90,7 +90,7 @@ describe('BaseYamlService', function () {
              'text/x-yaml, text/yaml, application/x-yaml, application/yaml, text/plain',
          },
          method: 'POST',
-          qs: { queryParam: 123 },
+          searchParams: { queryParam: 123 },
        }
      )
    })
@@ -98,13 +98,13 @@ describe('BaseYamlService', function () {

  describe('Making badges', function () {
    it('handles valid yaml responses', async function () {
-      const sendAndCacheRequest = async () => ({
+      const requestFetcher = async () => ({
        buffer: expectedYaml,
        res: { statusCode: 200 },
      })
      expect(
        await DummyYamlService.invoke(
-          { sendAndCacheRequest },
+          { requestFetcher },
          { handleInternalErrors: false }
        )
      ).to.deep.equal({
@@ -113,13 +113,13 @@ describe('BaseYamlService', function () {
    })

    it('handles yaml responses which do not match the schema', async function () {
-      const sendAndCacheRequest = async () => ({
+      const requestFetcher = async () => ({
        buffer: unexpectedYaml,
        res: { statusCode: 200 },
      })
      expect(
        await DummyYamlService.invoke(
-          { sendAndCacheRequest },
+          { requestFetcher },
          { handleInternalErrors: false }
        )
      ).to.deep.equal({
@@ -130,13 +130,13 @@ describe('BaseYamlService', function () {
    })

    it('handles unparseable yaml responses', async function () {
-      const sendAndCacheRequest = async () => ({
+      const requestFetcher = async () => ({
        buffer: invalidYaml,
        res: { statusCode: 200 },
      })
      expect(
        await DummyYamlService.invoke(
-          { sendAndCacheRequest },
+          { requestFetcher },
          { handleInternalErrors: false }
        )
      ).to.deep.equal({
--- a/core/base-service/base.js
+++ b/core/base-service/base.js
@@ -20,7 +20,7 @@ import {
  Deprecated,
 } from './errors.js'
 import { validateExample, transformExample } from './examples.js'
-import { fetchFactory } from './got.js'
+import { fetch } from './got.js'
 import {
  makeFullUrl,
  assertValidRoute,
@@ -108,11 +108,14 @@ class BaseService {
   *
   * See also the config schema in `./server.js` and `doc/server-secrets.md`.
   *
-   * To use the configured auth in the handler or fetch method, pass the
-   * credentials to the request. For example:
-   * - `{ options: { auth: this.authHelper.basicAuth } }`
-   * - `{ options: { headers: this.authHelper.bearerAuthHeader } }`
-   * - `{ options: { qs: { token: this.authHelper._pass } } }`
+   * To use the configured auth in the handler or fetch method, wrap the
+   * _request() input params in a call to one of:
+   * - this.authHelper.withBasicAuth()
+   * - this.authHelper.withBearerAuthHeader()
+   * - this.authHelper.withQueryStringAuth()
+   *
+   * For example:
+   * this._request(this.authHelper.withBasicAuth({ url, schema, options }))
   *
   * @abstract
   * @type {module:core/base-service/base~Auth}
@@ -144,6 +147,7 @@ class BaseService {
      version: 300,
      debug: 60,
      downloads: 900,
+      rating: 900,
      social: 900,
    }
    return cacheLengths[this.category]
@@ -204,10 +208,10 @@ class BaseService {
  }

  constructor(
-    { sendAndCacheRequest, authHelper, metricHelper },
+    { requestFetcher, authHelper, metricHelper },
    { handleInternalErrors }
  ) {
-    this._requestFetcher = sendAndCacheRequest
+    this._requestFetcher = requestFetcher
    this.authHelper = authHelper
    this._handleInternalErrors = handleInternalErrors
    this._metricHelper = metricHelper
@@ -217,10 +221,10 @@ class BaseService {
    const logTrace = (...args) => trace.logTrace('fetch', ...args)
    let logUrl = url
    const logOptions = Object.assign({}, options)
-    if ('qs' in options) {
-      const params = new URLSearchParams(options.qs)
+    if ('searchParams' in options) {
+      const params = new URLSearchParams(options.searchParams)
      logUrl = `${url}?${params.toString()}`
-      delete logOptions.qs
+      delete logOptions.searchParams
    }
    logTrace(
      emojic.bowAndArrow,
@@ -275,7 +279,7 @@ class BaseService {
  /**
   * Asynchronous function to handle requests for this service. Take the route
   * parameters (as defined in the `route` property), perform a request using
-   * `this._sendAndCacheRequest`, and return the badge data.
+   * `this._requestFetcher`, and return the badge data.
   *
   * @abstract
   * @param {object} namedParams Params parsed from route pattern
@@ -429,7 +433,7 @@ class BaseService {
    },
    serviceConfig
  ) {
-    const { cacheHeaders: cacheHeaderConfig, fetchLimitBytes } = serviceConfig
+    const { cacheHeaders: cacheHeaderConfig } = serviceConfig
    const { regex, captureNames } = prepareRoute(this.route)
    const queryParams = getQueryParamNames(this.route)

@@ -438,19 +442,17 @@ class BaseService {
      ServiceClass: this,
    })

-    const fetcher = fetchFactory(fetchLimitBytes)
-
    camp.route(
      regex,
      handleRequest(cacheHeaderConfig, {
        queryParams,
-        handler: async (queryParams, match, sendBadge, request) => {
+        handler: async (queryParams, match, sendBadge) => {
          const metricHandle = metricHelper.startRequest()

          const namedParams = namedParamsForMatch(captureNames, match, this)
          const serviceData = await this.invoke(
            {
-              sendAndCacheRequest: fetcher, // TODO: rename sendAndCacheRequest
+              requestFetcher: fetch,
              githubApiProvider,
              librariesIoApiProvider,
              metricHelper,
@@ -473,7 +475,6 @@ class BaseService {
          metricHandle.noteResponseSent()
        },
        cacheLength: this._cacheLength,
-        fetchLimitBytes,
      })
    )
  }
--- a/core/base-service/base.spec.js
+++ b/core/base-service/base.spec.js
@@ -430,12 +430,12 @@ describe('BaseService', function () {
    })

    it('logs appropriate information', async function () {
-      const sendAndCacheRequest = async () => ({
+      const requestFetcher = async () => ({
        buffer: '',
        res: { statusCode: 200 },
      })
      const serviceInstance = new DummyService(
-        { sendAndCacheRequest },
+        { requestFetcher },
        defaultConfig
      )

@@ -458,12 +458,12 @@ describe('BaseService', function () {
    })

    it('handles errors', async function () {
-      const sendAndCacheRequest = async () => ({
+      const requestFetcher = async () => ({
        buffer: '',
        res: { statusCode: 404 },
      })
      const serviceInstance = new DummyService(
-        { sendAndCacheRequest },
+        { requestFetcher },
        defaultConfig
      )

@@ -490,13 +490,13 @@ describe('BaseService', function () {
        metricInstance: new PrometheusMetrics({ register }),
        ServiceClass: DummyServiceWithServiceResponseSizeMetricEnabled,
      })
-      const sendAndCacheRequest = async () => ({
+      const requestFetcher = async () => ({
        buffer: 'x'.repeat(65536 + 1),
        res: { statusCode: 200 },
      })
      const serviceInstance =
        new DummyServiceWithServiceResponseSizeMetricEnabled(
-          { sendAndCacheRequest, metricHelper },
+          { requestFetcher, metricHelper },
          defaultConfig
        )

@@ -516,12 +516,12 @@ describe('BaseService', function () {
        metricInstance: new PrometheusMetrics({ register }),
        ServiceClass: DummyService,
      })
-      const sendAndCacheRequest = async () => ({
+      const requestFetcher = async () => ({
        buffer: 'x',
        res: { statusCode: 200 },
      })
      const serviceInstance = new DummyService(
-        { sendAndCacheRequest, metricHelper },
+        { requestFetcher, metricHelper },
        defaultConfig
      )

--- a/core/base-service/got-config.js
+++ b/core/base-service/got-config.js
@@ -0,0 +1,26 @@
+import bytes from 'bytes'
+import configModule from 'config'
+import Joi from 'joi'
+import { fileSize } from '../../services/validators.js'
+
+const schema = Joi.object({
+  fetchLimit: fileSize,
+  userAgentBase: Joi.string().required(),
+}).required()
+const config = configModule.util.toObject()
+const publicConfig = Joi.attempt(config.public, schema, { allowUnknown: true })
+
+const fetchLimitBytes = bytes(publicConfig.fetchLimit)
+
+function getUserAgent(userAgentBase = publicConfig.userAgentBase) {
+  let version = 'dev'
+  if (process.env.DOCKER_SHIELDS_VERSION) {
+    version = process.env.DOCKER_SHIELDS_VERSION
+  }
+  if (process.env.HEROKU_SLUG_COMMIT) {
+    version = process.env.HEROKU_SLUG_COMMIT.substring(0, 7)
+  }
+  return `${userAgentBase}/${version}`
+}
+
+export { fetchLimitBytes, getUserAgent }
--- a/core/base-service/got-config.spec.js
+++ b/core/base-service/got-config.spec.js
@@ -0,0 +1,27 @@
+import { expect } from 'chai'
+import { getUserAgent } from './got-config.js'
+
+describe('getUserAgent function', function () {
+  afterEach(function () {
+    delete process.env.HEROKU_SLUG_COMMIT
+    delete process.env.DOCKER_SHIELDS_VERSION
+  })
+
+  it('uses the default userAgentBase', function () {
+    expect(getUserAgent()).to.equal('shields (self-hosted)/dev')
+  })
+
+  it('applies custom userAgentBase', function () {
+    expect(getUserAgent('custom')).to.equal('custom/dev')
+  })
+
+  it('uses short commit SHA from HEROKU_SLUG_COMMIT if available', function () {
+    process.env.HEROKU_SLUG_COMMIT = '92090bd44742a5fac03bcb117002088fc7485834'
+    expect(getUserAgent('custom')).to.equal('custom/92090bd')
+  })
+
+  it('uses short commit SHA from DOCKER_SHIELDS_VERSION if available', function () {
+    process.env.DOCKER_SHIELDS_VERSION = 'server-2021-11-22'
+    expect(getUserAgent('custom')).to.equal('custom/server-2021-11-22')
+  })
+})
--- a/core/base-service/got.js
+++ b/core/base-service/got.js
@@ -1,61 +1,23 @@
-import got from 'got'
+import got, { CancelError } from 'got'
 import { Inaccessible, InvalidResponse } from './errors.js'
+import {
+  fetchLimitBytes as fetchLimitBytesDefault,
+  getUserAgent,
+} from './got-config.js'

-const userAgent = 'Shields.io/2003a'
-
-function requestOptions2GotOptions(options) {
-  const requestOptions = Object.assign({}, options)
-  const gotOptions = {}
-  const interchangableOptions = ['body', 'form', 'headers', 'method', 'url']
-
-  interchangableOptions.forEach(function (opt) {
-    if (opt in requestOptions) {
-      gotOptions[opt] = requestOptions[opt]
-      delete requestOptions[opt]
-    }
-  })
-
-  if ('qs' in requestOptions) {
-    gotOptions.searchParams = requestOptions.qs
-    delete requestOptions.qs
-  }
-
-  if ('gzip' in requestOptions) {
-    gotOptions.decompress = requestOptions.gzip
-    delete requestOptions.gzip
-  }
-
-  if ('strictSSL' in requestOptions) {
-    gotOptions.https = {
-      rejectUnauthorized: requestOptions.strictSSL,
-    }
-    delete requestOptions.strictSSL
-  }
-
-  if ('auth' in requestOptions) {
-    gotOptions.username = requestOptions.auth.user
-    gotOptions.password = requestOptions.auth.pass
-    delete requestOptions.auth
-  }
-
-  if (Object.keys(requestOptions).length > 0) {
-    throw new Error(`Found unrecognised options ${Object.keys(requestOptions)}`)
-  }
-
-  return gotOptions
-}
+const userAgent = getUserAgent()

 async function sendRequest(gotWrapper, url, options) {
-  const gotOptions = requestOptions2GotOptions(options)
+  const gotOptions = Object.assign({}, options)
  gotOptions.throwHttpErrors = false
-  gotOptions.retry = 0
+  gotOptions.retry = { limit: 0 }
  gotOptions.headers = gotOptions.headers || {}
  gotOptions.headers['User-Agent'] = userAgent
  try {
    const resp = await gotWrapper(url, gotOptions)
    return { res: resp, buffer: resp.body }
  } catch (err) {
-    if (err instanceof got.CancelError) {
+    if (err instanceof CancelError) {
      throw new InvalidResponse({
        underlyingError: new Error('Maximum response size exceeded'),
      })
@@ -64,8 +26,7 @@ async function sendRequest(gotWrapper, url, options) {
  }
 }

-const TEN_MB = 10485760
-function fetchFactory(fetchLimitBytes = TEN_MB) {
+function _fetchFactory(fetchLimitBytes = fetchLimitBytesDefault) {
  const gotWithLimit = got.extend({
    handlers: [
      (options, next) => {
@@ -94,4 +55,6 @@ function fetchFactory(fetchLimitBytes = TEN_MB) {
  return sendRequest.bind(sendRequest, gotWithLimit)
 }

-export { requestOptions2GotOptions, fetchFactory }
+const fetch = _fetchFactory()
+
+export { fetch, _fetchFactory }
--- a/core/base-service/got.spec.js
+++ b/core/base-service/got.spec.js
@@ -1,50 +1,15 @@
 import { expect } from 'chai'
 import nock from 'nock'
-import { requestOptions2GotOptions, fetchFactory } from './got.js'
+import { _fetchFactory } from './got.js'
 import { Inaccessible, InvalidResponse } from './errors.js'

-describe('requestOptions2GotOptions function', function () {
-  it('translates valid options', function () {
-    expect(
-      requestOptions2GotOptions({
-        body: 'body',
-        form: 'form',
-        headers: 'headers',
-        method: 'method',
-        url: 'url',
-        qs: 'qs',
-        gzip: 'gzip',
-        strictSSL: 'strictSSL',
-        auth: { user: 'user', pass: 'pass' },
-      })
-    ).to.deep.equal({
-      body: 'body',
-      form: 'form',
-      headers: 'headers',
-      method: 'method',
-      url: 'url',
-      searchParams: 'qs',
-      decompress: 'gzip',
-      https: { rejectUnauthorized: 'strictSSL' },
-      username: 'user',
-      password: 'pass',
-    })
-  })
-
-  it('throws if unrecognised options are found', function () {
-    expect(() =>
-      requestOptions2GotOptions({ body: 'body', foobar: 'foobar' })
-    ).to.throw(Error, 'Found unrecognised options foobar')
-  })
-})
-
 describe('got wrapper', function () {
  it('should not throw an error if the response <= fetchLimitBytes', async function () {
    nock('https://www.google.com')
      .get('/foo/bar')
      .once()
      .reply(200, 'x'.repeat(100))
-    const sendRequest = fetchFactory(100)
+    const sendRequest = _fetchFactory(100)
    const { res } = await sendRequest('https://www.google.com/foo/bar')
    expect(res.statusCode).to.equal(200)
  })
@@ -54,7 +19,7 @@ describe('got wrapper', function () {
      .get('/foo/bar')
      .once()
      .reply(200, 'x'.repeat(101))
-    const sendRequest = fetchFactory(100)
+    const sendRequest = _fetchFactory(100)
    return expect(
      sendRequest('https://www.google.com/foo/bar')
    ).to.be.rejectedWith(InvalidResponse, 'Maximum response size exceeded')
@@ -62,7 +27,7 @@ describe('got wrapper', function () {

  it('should throw an Inaccessible error if the request throws a (non-HTTP) error', async function () {
    nock('https://www.google.com').get('/foo/bar').replyWithError('oh no')
-    const sendRequest = fetchFactory(1024)
+    const sendRequest = _fetchFactory(1024)
    return expect(
      sendRequest('https://www.google.com/foo/bar')
    ).to.be.rejectedWith(Inaccessible, 'oh no')
@@ -71,7 +36,7 @@ describe('got wrapper', function () {
  it('should throw an Inaccessible error if the host can not be accessed', async function () {
    this.timeout(5000)
    nock.disableNetConnect()
-    const sendRequest = fetchFactory(1024)
+    const sendRequest = _fetchFactory(1024)
    return expect(
      sendRequest('https://www.google.com/foo/bar')
    ).to.be.rejectedWith(
@@ -84,14 +49,14 @@ describe('got wrapper', function () {
    nock('https://www.google.com', {
      reqheaders: {
        'user-agent': function (agent) {
-          return agent.startsWith('Shields.io')
+          return agent.startsWith('shields (self-hosted)')
        },
      },
    })
      .get('/foo/bar')
      .once()
      .reply(200)
-    const sendRequest = fetchFactory(1024)
+    const sendRequest = _fetchFactory(1024)
    await sendRequest('https://www.google.com/foo/bar')
  })

--- a/core/base-service/legacy-request-handler.js
+++ b/core/base-service/legacy-request-handler.js
@@ -1,12 +1,8 @@
-import request from 'request'
 import makeBadge from '../../badge-maker/lib/make-badge.js'
 import { setCacheHeaders } from './cache-headers.js'
-import { Inaccessible, InvalidResponse, ShieldsRuntimeError } from './errors.js'
 import { makeSend } from './legacy-result-sender.js'
 import coalesceBadge from './coalesce-badge.js'

-const userAgent = 'Shields.io/2003a'
-
 // These query parameters are available to any badge. They are handled by
 // `coalesceBadge`.
 const globalQueryParams = new Set([
@@ -32,32 +28,12 @@ function flattenQueryParams(queryParams) {
  return Array.from(union).sort()
 }

-function promisify(cachingRequest) {
-  return (uri, options) =>
-    new Promise((resolve, reject) => {
-      cachingRequest(uri, options, (err, res, buffer) => {
-        if (err) {
-          if (err instanceof ShieldsRuntimeError) {
-            reject(err)
-          } else {
-            // Wrap the error in an Inaccessible so it can be identified
-            // by the BaseService handler.
-            reject(new Inaccessible({ underlyingError: err }))
-          }
-        } else {
-          resolve({ res, buffer })
-        }
-      })
-    })
-}
-
 // handlerOptions can contain:
 // - handler: The service's request handler function
 // - queryParams: An array of the field names of any custom query parameters
 //   the service uses
 // - cacheLength: An optional badge or category-specific cache length
 //   (in number of seconds) to be used in preference to the default
-// - fetchLimitBytes: A limit on the response size we're willing to parse
 //
 // For safety, the service must declare the query parameters it wants to use.
 // Only the declared parameters (and the global parameters) are provided to
@@ -77,8 +53,7 @@ function handleRequest(cacheHeaderConfig, handlerOptions) {
  }

  const allowedKeys = flattenQueryParams(handlerOptions.queryParams)
-  const { cacheLength: serviceDefaultCacheLengthSeconds, fetchLimitBytes } =
-    handlerOptions
+  const { cacheLength: serviceDefaultCacheLengthSeconds } = handlerOptions

  return (queryParams, match, end, ask) => {
    /*
@@ -139,40 +114,6 @@ function handleRequest(cacheHeaderConfig, handlerOptions) {
      makeSend(extension, ask.res, end)(svg)
    }, 25000)

-    function cachingRequest(uri, options, callback) {
-      if (typeof options === 'function' && !callback) {
-        callback = options
-      }
-      if (options && typeof options === 'object') {
-        options.uri = uri
-      } else if (typeof uri === 'string') {
-        options = { uri }
-      } else {
-        options = uri
-      }
-      options.headers = options.headers || {}
-      options.headers['User-Agent'] = userAgent
-
-      let bufferLength = 0
-      const r = request(options, callback)
-      r.on('data', chunk => {
-        bufferLength += chunk.length
-        if (bufferLength > fetchLimitBytes) {
-          r.abort()
-          r.emit(
-            'error',
-            new InvalidResponse({
-              prettyMessage: 'Maximum response size exceeded',
-            })
-          )
-        }
-      })
-    }
-
-    // Wrapper around `cachingRequest` that returns a promise rather than needing
-    // to pass a callback.
-    cachingRequest.asPromise = promisify(cachingRequest)
-
    const result = handlerOptions.handler(
      filteredQueryParams,
      match,
@@ -187,8 +128,7 @@ function handleRequest(cacheHeaderConfig, handlerOptions) {
        const svg = makeBadge(badgeData)
        setCacheHeadersOnResponse(ask.res, badgeData.cacheLengthSeconds)
        makeSend(format, ask.res, end)(svg)
-      },
-      cachingRequest
+      }
    )
    // eslint-disable-next-line promise/prefer-await-to-then
    if (result && result.catch) {
@@ -200,4 +140,4 @@ function handleRequest(cacheHeaderConfig, handlerOptions) {
  }
 }

-export { handleRequest, promisify, userAgent }
+export { handleRequest }
--- a/core/base-service/legacy-request-handler.spec.js
+++ b/core/base-service/legacy-request-handler.spec.js
@@ -1,5 +1,4 @@
 import { expect } from 'chai'
-import nock from 'nock'
 import portfinder from 'portfinder'
 import Camp from '@shields_io/camp'
 import got from '../got-test-client.js'
@@ -42,28 +41,6 @@ function createFakeHandlerWithCacheLength(cacheLengthSeconds) {
  }
 }

-function fakeHandlerWithNetworkIo(queryParams, match, sendBadge, request) {
-  const [, someValue, format] = match
-  request('https://www.google.com/foo/bar', (err, res, buffer) => {
-    let message
-    if (err) {
-      message = err.prettyMessage
-    } else {
-      message = someValue
-    }
-    const badgeData = coalesceBadge(
-      queryParams,
-      {
-        label: 'testing',
-        message,
-        format,
-      },
-      {}
-    )
-    sendBadge(format, badgeData)
-  })
-}
-
 describe('The request handler', function () {
  let port, baseUrl
  beforeEach(async function () {
@@ -133,60 +110,6 @@ describe('The request handler', function () {
    })
  })

-  describe('the response size limit', function () {
-    beforeEach(function () {
-      camp.route(
-        /^\/testing\/([^/]+)\.(svg|png|gif|jpg|json)$/,
-        handleRequest(standardCacheHeaders, {
-          handler: fakeHandlerWithNetworkIo,
-          fetchLimitBytes: 100,
-        })
-      )
-    })
-
-    it('should not throw an error if the response <= fetchLimitBytes', async function () {
-      nock('https://www.google.com')
-        .get('/foo/bar')
-        .once()
-        .reply(200, 'x'.repeat(100))
-      const { statusCode, body } = await got(`${baseUrl}/testing/123.json`, {
-        responseType: 'json',
-      })
-      expect(statusCode).to.equal(200)
-      expect(body).to.deep.equal({
-        name: 'testing',
-        value: '123',
-        label: 'testing',
-        message: '123',
-        color: 'lightgrey',
-        link: [],
-      })
-    })
-
-    it('should throw an error if the response is > fetchLimitBytes', async function () {
-      nock('https://www.google.com')
-        .get('/foo/bar')
-        .once()
-        .reply(200, 'x'.repeat(101))
-      const { statusCode, body } = await got(`${baseUrl}/testing/123.json`, {
-        responseType: 'json',
-      })
-      expect(statusCode).to.equal(200)
-      expect(body).to.deep.equal({
-        name: 'testing',
-        value: 'Maximum response size exceeded',
-        label: 'testing',
-        message: 'Maximum response size exceeded',
-        color: 'lightgrey',
-        link: [],
-      })
-    })
-
-    afterEach(function () {
-      nock.cleanAll()
-    })
-  })
-
  describe('caching', function () {
    describe('standard query parameters', function () {
      function register({ cacheHeaderConfig }) {
--- a/core/base-service/resource-cache.js
+++ b/core/base-service/resource-cache.js
@@ -2,37 +2,38 @@
 * @module
 */

-import { InvalidResponse } from '../base-service/errors.js'
-import { fetchFactory } from '../../core/base-service/got.js'
-import checkErrorResponse from '../../core/base-service/check-error-response.js'
-const fetcher = fetchFactory()
+import { InvalidResponse } from './errors.js'
+import { fetch } from './got.js'
+import checkErrorResponse from './check-error-response.js'
+
+const oneDay = 24 * 3600 * 1000 // 1 day in milliseconds

 // Map from URL to { timestamp: last fetch time, data: data }.
-let regularUpdateCache = Object.create(null)
+let resourceCache = Object.create(null)

 /**
 * Make a HTTP request using an in-memory cache
 *
 * @param {object} attrs Refer to individual attrs
 * @param {string} attrs.url URL to request
- * @param {number} attrs.intervalMillis Number of milliseconds to keep cached value for
+ * @param {number} attrs.ttl Number of milliseconds to keep cached value for
 * @param {boolean} [attrs.json=true] True if we expect to parse the response as JSON
 * @param {Function} [attrs.scraper=buffer => buffer] Function to extract value from the response
 * @param {object} [attrs.options={}] Options to pass to got
- * @param {Function} [attrs.requestFetcher=fetcher] Custom fetch function
+ * @param {Function} [attrs.requestFetcher=fetch] Custom fetch function
 * @returns {*} Parsed response
 */
-async function regularUpdate({
+async function getCachedResource({
  url,
-  intervalMillis,
+  ttl = oneDay,
  json = true,
  scraper = buffer => buffer,
  options = {},
-  requestFetcher = fetcher,
+  requestFetcher = fetch,
 }) {
  const timestamp = Date.now()
-  const cached = regularUpdateCache[url]
-  if (cached != null && timestamp - cached.timestamp < intervalMillis) {
+  const cached = resourceCache[url]
+  if (cached != null && timestamp - cached.timestamp < ttl) {
    return cached.data
  }

@@ -55,12 +56,12 @@ async function regularUpdate({
  }

  const data = scraper(reqData)
-  regularUpdateCache[url] = { timestamp, data }
+  resourceCache[url] = { timestamp, data }
  return data
 }

-function clearRegularUpdateCache() {
-  regularUpdateCache = Object.create(null)
+function clearResourceCache() {
+  resourceCache = Object.create(null)
 }

-export { regularUpdate, clearRegularUpdateCache }
+export { getCachedResource, clearResourceCache }
--- a/core/base-service/resource-cache.spec.js
+++ b/core/base-service/resource-cache.spec.js
@@ -0,0 +1,47 @@
+import { expect } from 'chai'
+import nock from 'nock'
+import { getCachedResource, clearResourceCache } from './resource-cache.js'
+
+describe('Resource Cache', function () {
+  beforeEach(function () {
+    clearResourceCache()
+  })
+
+  it('should use cached response if valid', async function () {
+    let resp
+
+    nock('https://www.foobar.com').get('/baz').reply(200, { value: 1 })
+    resp = await getCachedResource({ url: 'https://www.foobar.com/baz' })
+    expect(resp).to.deep.equal({ value: 1 })
+    expect(nock.isDone()).to.equal(true)
+    nock.cleanAll()
+
+    nock('https://www.foobar.com').get('/baz').reply(200, { value: 2 })
+    resp = await getCachedResource({ url: 'https://www.foobar.com/baz' })
+    expect(resp).to.deep.equal({ value: 1 })
+    expect(nock.isDone()).to.equal(false)
+    nock.cleanAll()
+  })
+
+  it('should not use cached response if expired', async function () {
+    let resp
+
+    nock('https://www.foobar.com').get('/baz').reply(200, { value: 1 })
+    resp = await getCachedResource({
+      url: 'https://www.foobar.com/baz',
+      ttl: 1,
+    })
+    expect(resp).to.deep.equal({ value: 1 })
+    expect(nock.isDone()).to.equal(true)
+    nock.cleanAll()
+
+    nock('https://www.foobar.com').get('/baz').reply(200, { value: 2 })
+    resp = await getCachedResource({
+      url: 'https://www.foobar.com/baz',
+      ttl: 1,
+    })
+    expect(resp).to.deep.equal({ value: 2 })
+    expect(nock.isDone()).to.equal(true)
+    nock.cleanAll()
+  })
+})
--- a/core/got-test-client.js
+++ b/core/got-test-client.js
@@ -1,4 +1,4 @@
 import got from 'got'

 // https://github.com/nock/nock/issues/1523
-export default got.extend({ retry: 0 })
+export default got.extend({ retry: { limit: 0 } })
--- a/core/server/influx-metrics.js
+++ b/core/server/influx-metrics.js
@@ -16,7 +16,7 @@ export default class InfluxMetrics {
      url: this._config.url,
      headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
      body: await this.metrics(),
-      timeout: this._config.timeoutMillseconds,
+      timeout: { request: this._config.timeoutMillseconds },
      username: this._config.username,
      password: this._config.password,
      throwHttpErrors: false,
--- a/core/server/influx-metrics.spec.js
+++ b/core/server/influx-metrics.spec.js
@@ -5,6 +5,7 @@ import { expect } from 'chai'
 import log from './log.js'
 import InfluxMetrics from './influx-metrics.js'
 import '../register-chai-plugins.spec.js'
+
 describe('Influx metrics', function () {
  const metricInstance = {
    metrics() {
--- a/core/server/public/monitor.html
+++ b/core/server/public/monitor.html
@@ -1,66 +0,0 @@
-<!doctype html><meta charset=utf-8>
-<title> Shields.io Admin Monitoring Interface </title>
-<style>
-#monitorPlatform { display: none; }
-</style>
-
-<div id=passwordRequest>
-  <p> Please enter your admin secret here:
-  <input type=password id=secretInput>
-</div>
-<div id=monitorPlatform>
-</div>
-
-<script>
-(function() {
-  let network;
-  const onLoad = function() {
-    const secretInput = document.getElementById('secretInput');
-    const onSecretChange = function() {
-      const secret = secretInput.value;
-      const authentication = `monitor:${secret}`;
-      const headers = new Headers({
-        Authorization: `Basic ${btoa(authentication)}`
-      })
-      fetch('/sys/network', {headers})
-      .then(res => res.json())
-      .then(networkData => {
-        network = networkData;
-        // Show monitor platform.
-        monitorPlatform.style.display = 'block';
-        passwordRequest.parentNode.removeChild(passwordRequest);
-
-        // Show logs for each server.
-        network.ips.forEach(ip => {
-          const logger = document.createElement('div');
-          const pre = document.createElement('pre');
-          logger.textContent = ip;
-          logger.appendChild(pre);
-          monitorPlatform.appendChild(logger);
-
-          // Set up the websocket.
-          const setUpWebsocket = () => {
-            const websocket = new WebSocket(
-              (window.location.protocol === 'http:' ? 'ws' : 'wss') + '://' +
-              ip + ':' + window.location.port + '/sys/logs');
-            websocket.addEventListener('message', event => {
-              pre.textContent += event.data + '\n';
-            });
-            websocket.addEventListener('close', () => {
-              setTimeout(setUpWebsocket, 100);
-            });
-            websocket.addEventListener('open', () => {
-              websocket.send(JSON.stringify({secret}));
-            });
-          };
-          setUpWebsocket();
-        });
-      })
-      .catch(alert)
-    };
-    secretInput.addEventListener('change', onSecretChange);
-  };
-
-  addEventListener('DOMContentLoaded', onLoad);
-}());
-</script>
--- a/core/server/server.js
+++ b/core/server/server.js
@@ -6,7 +6,6 @@ import path from 'path'
 import url, { fileURLToPath } from 'url'
 import { bootstrap } from 'global-agent'
 import cloudflareMiddleware from 'cloudflare-middleware'
-import bytes from 'bytes'
 import Camp from '@shields_io/camp'
 import originalJoi from 'joi'
 import makeBadge from '../../badge-maker/lib/make-badge.js'
@@ -16,9 +15,9 @@ import { setRoutes } from '../../services/suggest.js'
 import { loadServiceClasses } from '../base-service/loader.js'
 import { makeSend } from '../base-service/legacy-result-sender.js'
 import { handleRequest } from '../base-service/legacy-request-handler.js'
-import { clearRegularUpdateCache } from '../legacy/regular-update.js'
+import { clearResourceCache } from '../base-service/resource-cache.js'
 import { rasterRedirectUrl } from '../badge-urls/make-badge-url.js'
-import { nonNegativeInteger } from '../../services/validators.js'
+import { fileSize, nonNegativeInteger } from '../../services/validators.js'
 import log from './log.js'
 import PrometheusMetrics from './prometheus-metrics.js'
 import InfluxMetrics from './influx-metrics.js'
@@ -143,7 +142,8 @@ const publicConfigSchema = Joi.object({
  }).required(),
  cacheHeaders: { defaultCacheLengthSeconds: nonNegativeInteger },
  handleInternalErrors: Joi.boolean().required(),
-  fetchLimit: Joi.string().regex(/^[0-9]+(b|kb|mb|gb|tb)$/i),
+  fetchLimit: fileSize,
+  userAgentBase: Joi.string().required(),
  requestTimeoutSeconds: nonNegativeInteger,
  requestTimeoutMaxAgeSeconds: nonNegativeInteger,
  documentRoot: Joi.string().default(
@@ -201,6 +201,14 @@ function addHandlerAtIndex(camp, index, handlerFn) {
  camp.stack.splice(index, 0, handlerFn)
 }

+function isOnHeroku() {
+  return !!process.env.DYNO
+}
+
+function isOnFly() {
+  return !!process.env.FLY_APP_NAME
+}
+
 /**
 * The Server is based on the web framework Scoutcamp. It creates
 * an http server, sets up helpers for token persistence and monitoring.
@@ -301,13 +309,21 @@ class Server {
    // Set `req.ip`, which is expected by `cloudflareMiddleware()`. This is set
    // by Express but not Scoutcamp.
    addHandlerAtIndex(this.camp, 0, function (req, res, next) {
-      // On Heroku, `req.socket.remoteAddress` is the Heroku router. However,
-      // the router ensures that the last item in the `X-Forwarded-For` header
-      // is the real origin.
-      // https://stackoverflow.com/a/18517550/893113
-      req.ip = process.env.DYNO
-        ? req.headers['x-forwarded-for'].split(', ').pop()
-        : req.socket.remoteAddress
+      if (isOnHeroku()) {
+        // On Heroku, `req.socket.remoteAddress` is the Heroku router. However,
+        // the router ensures that the last item in the `X-Forwarded-For` header
+        // is the real origin.
+        // https://stackoverflow.com/a/18517550/893113
+        req.ip = req.headers['x-forwarded-for'].split(', ').pop()
+      } else if (isOnFly()) {
+        // On Fly we can use the Fly-Client-IP header
+        // https://fly.io/docs/reference/runtime-environment/#request-headers
+        req.ip = req.headers['fly-client-ip']
+          ? req.headers['fly-client-ip']
+          : req.socket.remoteAddress
+      } else {
+        req.ip = req.socket.remoteAddress
+      }
      next()
    })
    addHandlerAtIndex(this.camp, 1, cloudflareMiddleware())
@@ -433,7 +449,6 @@ class Server {
        {
          handleInternalErrors: config.public.handleInternalErrors,
          cacheHeaders: config.public.cacheHeaders,
-          fetchLimitBytes: bytes(config.public.fetchLimit),
          rasterUrl: config.public.rasterUrl,
          private: config.private,
          public: config.public,
@@ -507,6 +522,12 @@ class Server {
    const { apiProvider: githubApiProvider } = this.githubConstellation
    setRoutes(allowedOrigin, githubApiProvider, camp)

+    // https://github.com/badges/shields/issues/3273
+    camp.handle((req, res, next) => {
+      res.setHeader('Access-Control-Allow-Origin', '*')
+      next()
+    })
+
    this.registerErrorHandlers()
    this.registerRedirects()
    await this.registerServices()
@@ -532,7 +553,7 @@ class Server {
  static resetGlobalState() {
    // This state should be migrated to instance state. When possible, do not add new
    // global state.
-    clearRegularUpdateCache()
+    clearResourceCache()
  }

  reset() {
--- a/core/server/server.spec.js
+++ b/core/server/server.spec.js
@@ -64,6 +64,12 @@ describe('The server', function () {
      expect(headers['cache-control']).to.equal('max-age=3600, s-maxage=3600')
    })

+    it('should return cors header for the request', async function () {
+      const { statusCode, headers } = await got(`${baseUrl}npm/v/express.svg`)
+      expect(statusCode).to.equal(200)
+      expect(headers['access-control-allow-origin']).to.equal('*')
+    })
+
    it('should redirect colorscheme PNG badges as configured', async function () {
      const { statusCode, headers } = await got(
        `${baseUrl}:fruit-apple-green.png`,
@@ -201,6 +207,12 @@ describe('The server', function () {
        .and.to.include('410')
        .and.to.include('jpg no longer available')
    })
+
+    it('should return cors header for the request', async function () {
+      const { statusCode, headers } = await got(`${baseUrl}npm/v/express.svg`)
+      expect(statusCode).to.equal(200)
+      expect(headers['access-control-allow-origin']).to.equal('*')
+    })
  })

  context('`requireCloudflare` is enabled', function () {
--- a/core/service-test-runner/icedfrisby-shields.js
+++ b/core/service-test-runner/icedfrisby-shields.js
@@ -49,14 +49,29 @@ const factory = superclass =>
      return this
    }

-    expectBadge({ label, message, logoWidth, labelColor, color, link }) {
+    expectBadge(badge) {
+      const expectedKeys = [
+        'label',
+        'message',
+        'logoWidth',
+        'labelColor',
+        'color',
+        'link',
+      ]
+
+      for (const key of Object.keys(badge)) {
+        if (!expectedKeys.includes(key)) {
+          throw new Error(`Found unexpected object key '${key}'`)
+        }
+      }
+
      return this.afterJSON(json => {
-        this.constructor._expectField(json, 'label', label)
-        this.constructor._expectField(json, 'message', message)
-        this.constructor._expectField(json, 'logoWidth', logoWidth)
-        this.constructor._expectField(json, 'labelColor', labelColor)
-        this.constructor._expectField(json, 'color', color)
-        this.constructor._expectField(json, 'link', link)
+        this.constructor._expectField(json, 'label', badge.label)
+        this.constructor._expectField(json, 'message', badge.message)
+        this.constructor._expectField(json, 'logoWidth', badge.logoWidth)
+        this.constructor._expectField(json, 'labelColor', badge.labelColor)
+        this.constructor._expectField(json, 'color', badge.color)
+        this.constructor._expectField(json, 'link', badge.link)
      })
    }

--- a/cypress.config.js
+++ b/cypress.config.js
@@ -0,0 +1,13 @@
+import { defineConfig } from 'cypress'
+
+export default defineConfig({
+  fixturesFolder: false,
+  env: {
+    backend_url: 'http://localhost:8080',
+  },
+  e2e: {
+    setupNodeEvents(on, config) {},
+    baseUrl: 'http://localhost:3000',
+    supportFile: false,
+  },
+})
--- a/cypress.json
+++ b/cypress.json
@@ -1,9 +0,0 @@
-{
-  "baseUrl": "http://localhost:3000",
-  "fixturesFolder": false,
-  "pluginsFile": false,
-  "supportFile": false,
-  "env": {
-    "backend_url": "http://localhost:8080"
-  }
-}
--- a/cypress/integration/main-page.spec.js
+++ b/cypress/integration/main-page.spec.js
--- 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 >=14 and NPM >=7 is required. If you don't already have them,
+Node >=16 and NPM >=8 is required. If you don't already have them,
 install node and npm: https://nodejs.org/en/download/

 ### Setup a dev install
@@ -228,14 +228,14 @@ Description of the code:
 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.

   - `_requestJson()` automatically adds an Accept header, checks the status code, parses the response as JSON, and returns the parsed response.
-   - `_requestJson()` uses [request](https://github.com/request/request) to perform the HTTP request. Options can be passed to request, 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 `request` docs for [supported options](https://github.com/request/request#requestoptions-callback).
+   - `_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).
   - Error messages corresponding to each status code can be returned by passing a dictionary of status codes -> messages in `errorMessages`.
   - A more complex call to `_requestJson()` might look like this:
     ```js
     return this._requestJson({
       schema: mySchema,
       url,
-       options: { qs: { branch: 'master' } },
+       options: { searchParams: { branch: 'master' } },
       errorMessages: {
         401: 'private application not supported',
         404: 'application not found',
--- a/doc/code-walkthrough.md
+++ b/doc/code-walkthrough.md
@@ -96,7 +96,7 @@ test this kind of logic through unit tests (e.g. of `render()` and
    is created in a legacy helper function in
    [`legacy-request-handler.js`][legacy-request-handler]. This callback
    delegates to a callback in `BaseService.register` with four different
-    parameters `( queryParams, match, sendBadge, request )`, which
+    parameters `( queryParams, match, sendBadge )`, which
    then runs `BaseService.invoke`. `BaseService.invoke` instantiates the
    service and runs `BaseService#handle`.

@@ -129,12 +129,12 @@ test this kind of logic through unit tests (e.g. of `render()` and
    handle unresponsive service code and the next callback is invoked: the
    legacy handler function.
 3.  The legacy handler function receives
-    `( queryParams, match, sendBadge, request )`. Its job is to extract data
-    from the regex `match` and `queryParams`, invoke `request` to fetch
-    whatever data it needs, and then invoke `sendBadge` with the result.
+    `( queryParams, match, sendBadge )`. Its job is to extract data
+    from the regex `match` and `queryParams`, and then invoke `sendBadge`
+    with the result.
 4.  The implementation of this function is in `BaseService.register`. It
    works by running `BaseService.invoke`, which instantiates the service,
-    injects more dependencies, and invokes `BaseService#handle` which is
+    injects more dependencies, and invokes `BaseService.handle` which is
    implemented by the service subclass.
 5.  The job of `handle()`, which should be implemented by each service
    subclass, is to return an object which partially describes a badge or
--- a/doc/deprecating-badges.md
+++ b/doc/deprecating-badges.md
@@ -94,6 +94,8 @@ Here is a listing of all deleted badges that were once part of the Shields.io se
 - Cauditor
 - CocoaPods Apps
 - CocoaPods Downloads
+- Codetally
+- continuousphp
 - Coverity
 - Dockbit
 - Dotnet Status
--- a/doc/logos.md
+++ b/doc/logos.md
@@ -40,7 +40,7 @@ If you are submitting a pull request for a custom logo, please:
    - Install SVGO
      - With npm: `npm install -g svgo`
      - With Homebrew: `brew install svgo`
-    - Run the following command `svgo --precision=3 icon.svg icon.min.svg`
+    - Run the following command `svgo --precision=3 icon.svg -o icon.min.svg`
    - Check if there is a loss of quality in the output, if so increase the precision.
  - The [SVGOMG Online Tool][svgomg]
    - Click "Open SVG" and select an SVG file.
--- a/doc/production-hosting.md
+++ b/doc/production-hosting.md
@@ -16,14 +16,11 @@ Production hosting is managed by the Shields ops team:

 | Component                     | Subcomponent                    | People with access                                              |
 | ----------------------------- | ------------------------------- | --------------------------------------------------------------- |
-| shields-production-us         | Account owner                   | @calebcartwright, @paulmelnikow                                 |
-| shields-production-us         | Full access                     | @calebcartwright, @chris48s, @paulmelnikow, @pyvesb             |
-| shields-production-us         | Access management               | @calebcartwright, @chris48s, @paulmelnikow, @pyvesb             |
+| shields-io-production         | Full access                     | @calebcartwright, @chris48s, @paulmelnikow                      |
+| shields-io-production         | Access management               | @calebcartwright, @chris48s, @paulmelnikow                      |
 | Compose.io Redis              | Account owner                   | @paulmelnikow                                                   |
 | Compose.io Redis              | Account access                  | @paulmelnikow                                                   |
 | Compose.io Redis              | Database connection credentials | @calebcartwright, @chris48s, @paulmelnikow, @pyvesb             |
-| Zeit Now                      | Team owner                      | @paulmelnikow                                                   |
-| Zeit Now                      | Team members                    | @paulmelnikow, @chris48s, @calebcartwright, @platan             |
 | Raster server                 | Full access as team members     | @paulmelnikow, @chris48s, @calebcartwright, @platan             |
 | shields-server.com redirector | Full access as team members     | @paulmelnikow, @chris48s, @calebcartwright, @platan             |
 | Cloudflare (CDN)              | Account owner                   | @espadrine                                                      |
@@ -49,11 +46,11 @@ Shields has mercifully little persistent state:
 1. The GitHub tokens we collect are saved on each server in a cloud Redis
   database. They can also be fetched from the [GitHub auth admin endpoint][]
   for debugging.
-2. The server keeps the [regular-update cache][] in memory. It is neither
+2. The server keeps the [resource cache][] in memory. It is neither
   persisted nor inspectable.

 [github auth admin endpoint]: https://github.com/badges/shields/blob/master/services/github/auth/admin.js
-[regular-update cache]: https://github.com/badges/shields/blob/master/core/legacy/regular-update.js
+[resource cache]: https://github.com/badges/shields/blob/master/core/base-service/resource-cache.js

 ## Configuration

@@ -94,19 +91,13 @@ Cloudflare is configured to respect the servers' cache headers.
 ## Raster server

 The raster server `raster.shields.io` (a.k.a. the rasterizing proxy) is
-hosted on [Zeit Now][]. It's managed in the
-[svg-to-image-proxy repo][svg-to-image-proxy].
+hosted on Heroku. It's managed in the
+[squint](https://github.com/badges/squint/) repo.

-[zeit now]: https://zeit.co/now
-[svg-to-image-proxy]: https://github.com/badges/svg-to-image-proxy
+### Fly.io Deployment

-### Heroku Deployment
-
-Both the badge server and frontend are served from Heroku.
-
-After merging a commit to master, heroku should create a staging deploy. Check this has deployed correctly in the `shields-staging` pipeline and review https://shields-staging.herokuapp.com/
-
-If we're happy with it, "promote to production". This will deploy what's on staging to the `shields-production-eu` and `shields-production-us` pieplines.
+Both the badge server and frontend are served from Fly.io. Deployments are
+triggered using GitHub actions in a private repo.

 ## DNS

@@ -114,19 +105,15 @@ DNS is registered with [DNSimple][].

 [dnsimple]: https://dnsimple.com/

-## Logs
-
-Logs can be retrieved [from heroku](https://devcenter.heroku.com/articles/logging#log-retrieval).
-
 ## Error reporting

 [Error reporting][sentry] is one of the most useful tools we have for monitoring
 the server. It's generously donated by [Sentry][sentry home]. We bundle
-[`raven`][raven] into the application, and the Sentry DSN is configured via
-`local-shields-io-production.yml` (see [documentation][sentry configuration]).
+[`@sentry/node`][sentry-node] into the application, and the Sentry DSN is configured
+via `local-shields-io-production.yml` (see [documentation][sentry configuration]).

 [sentry]: https://sentry.io/shields/
-[raven]: https://www.npmjs.com/package/raven
+[sentry-node]: https://www.npmjs.com/package/@sentry/node
 [sentry home]: https://sentry.io/shields/
 [sentry configuration]: https://github.com/badges/shields/blob/master/doc/self-hosting.md#sentry

--- 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 14 or later, which you can install using a
+You will need Node 16 or later, which you can install using a
 [package manager][].

 On Ubuntu / Debian:

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

 ```sh
@@ -118,10 +118,8 @@ machine.
 ## Raster server

 If you want to host PNG badges, you can also self-host a [raster server][]
-which points to your badge server. It's designed as a web function which is
-tested on Zeit Now, though you may be able to run it on AWS Lambda. It's
-built on the [micro][] framework, and comes with a `start` script that allows
-it to run as a standalone Node service.
+which points to your badge server. It's a docker container. We host it on
+Fly.io but should be possible to host on a wide variety of platforms.

 - In your raster instance, set `BASE_URL` to your Shields instance, e.g.
  `https://shields.example.co`.
@@ -130,11 +128,9 @@ it to run as a standalone Node service.
  for the legacy raster URLs instead of 404's.

 If anyone has set this up, more documentation on how to do this would be
-welcome! It would also be nice to ship a Docker image that includes a
-preconfigured raster server.
+welcome!

-[raster server]: https://github.com/badges/svg-to-image-proxy
-[micro]: https://github.com/zeit/micro
+[raster server]: https://github.com/badges/squint

 ## Server secrets

--- a/frontend/constants.ts
+++ b/frontend/constants.ts
@@ -25,6 +25,9 @@ export function getBaseUrl(): string {
    if (['shields.io', 'www.shields.io'].includes(hostname)) {
      return 'https://img.shields.io'
    }
+    if (!port) {
+      return `${protocol}//${hostname}`
+    }
    return `${protocol}//${hostname}:${port}`
  } catch (e) {
    // server-side rendering
--- a/frontend/pages/community.tsx
+++ b/frontend/pages/community.tsx
@@ -5,7 +5,6 @@ import Meta from '../components/meta'
 import Header from '../components/header'
 import Footer from '../components/footer'
 import { BaseFont, GlobalStyle, H3 } from '../components/common'
-import Heroku from '../../static/images/heroku-logotype-horizontal-purple.svg'
 import NodePing from '../../static/images/nodeping.svg'
 import Sentry from '../../static/images/sentry-logo-black.svg'
 const MainContainer = styled(BaseFont)`
@@ -43,11 +42,6 @@ export default function SponsorsPage(): JSX.Element {
        ❤️ These companies help us by donating their services to shields:
        <ul style={{ listStyleType: 'none' }}>
          <SponsorItems>
-            <li>
-              <a href="https://www.heroku.com/">
-                <Heroku alt="heroku_logo" height={120} />
-              </a>
-            </li>
            <li>
              <a href="https://nodeping.com/">
                <NodePing alt="nodeping_logo" height={60} />
--- a/logo/gitlab.svg
+++ b/logo/gitlab.svg
@@ -1 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="M23.956 13.587l-1.344-4.133a4549.814 4549.814 0 0 0-2.663-8.189.456.456 0 0 0-.87 0l-2.658 8.189H7.585L4.92 1.265a.456.456 0 0 0-.87 0A4549.814 4549.814 0 0 0 .044 13.587a.908.908 0 0 0 .336 1.02L12 23.054l11.62-8.447a.908.908 0 0 0 .336-1.02" fill="#fc6d26"/><path d="M12 23.054l4.421-13.6H7.58z" fill="#e24329"/><path d="M7.579 9.454H1.388L12 23.054z" fill="#fc6d26"/><path d="M1.388 9.454L.044 13.587a.908.908 0 0 0 .336 1.02L12 23.054z" fill="#fca326"/><path d="M7.579 9.454L4.92 1.265a.456.456 0 0 0-.87 0L1.388 9.454z" fill="#e24329"/><path d="M16.421 9.454h6.191L12 23.054z" fill="#fc6d26"/><path d="M22.612 9.454l1.344 4.133a.908.908 0 0 1-.336 1.02L12 23.054z" fill="#fca326"/><path d="M16.421 9.454l2.658-8.189a.456.456 0 0 1 .87 0l2.663 8.189z" fill="#e24329"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="93 93 194 194"><defs><style>.b{fill:#fc6d26}</style></defs><path style="fill:#e24329" d="m282.83 170.73-.27-.69-26.14-68.22a6.81 6.81 0 0 0-2.69-3.24 7 7 0 0 0-8 .43 7 7 0 0 0-2.32 3.52l-17.65 54h-71.47l-17.65-54a6.86 6.86 0 0 0-2.32-3.53 7 7 0 0 0-8-.43 6.87 6.87 0 0 0-2.69 3.24L97.44 170l-.26.69a48.54 48.54 0 0 0 16.1 56.1l.09.07.24.17 39.82 29.82 19.7 14.91 12 9.06a8.07 8.07 0 0 0 9.76 0l12-9.06 19.7-14.91 40.06-30 .1-.08a48.56 48.56 0 0 0 16.08-56.04Z"/><path class="b" d="m282.83 170.73-.27-.69a88.3 88.3 0 0 0-35.15 15.8L190 229.25c19.55 14.79 36.57 27.64 36.57 27.64l40.06-30 .1-.08a48.56 48.56 0 0 0 16.1-56.08Z"/><path style="fill:#fca326" d="m153.43 256.89 19.7 14.91 12 9.06a8.07 8.07 0 0 0 9.76 0l12-9.06 19.7-14.91S209.55 244 190 229.25c-19.55 14.75-36.57 27.64-36.57 27.64Z"/><path class="b" d="M132.58 185.84A88.19 88.19 0 0 0 97.44 170l-.26.69a48.54 48.54 0 0 0 16.1 56.1l.09.07.24.17 39.82 29.82L190 229.21Z"/></svg>
--- a/logo/telegram.svg
+++ b/logo/telegram.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><circle cx="12" cy="12" r="12" fill="#2ca5e0"/><path d="M9.8 17.5c-.389 0-.323-.147-.457-.517L8.2 13.221 17 8" fill="#a9c9dd"/><path d="M9.8 17.5c.3 0 .433-.137.6-.3l1.6-1.556-1.996-1.203" fill="#c8daea"/><path d="M10.004 14.441l4.836 3.573c.552.304.95.147 1.088-.512l1.968-9.277c.202-.808-.308-1.174-.836-.935L5.501 11.748c-.789.316-.784.756-.144.952l2.967.926 6.867-4.332c.324-.197.622-.091.377.125" fill="#fff"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12 24c6.627 0 12-5.373 12-12S18.627 0 12 0 0 5.373 0 12s5.373 12 12 12Z" fill="url(#a)"/><path fill-rule="evenodd" clip-rule="evenodd" d="M5.425 11.871a796.414 796.414 0 0 1 6.994-3.018c3.328-1.388 4.027-1.628 4.477-1.638.1 0 .32.02.47.14.12.1.15.23.17.33.02.1.04.31.02.47-.18 1.898-.96 6.504-1.36 8.622-.17.9-.5 1.199-.819 1.229-.7.06-1.229-.46-1.898-.9-1.06-.689-1.649-1.119-2.678-1.798-1.19-.78-.42-1.209.26-1.908.18-.18 3.247-2.978 3.307-3.228.01-.03.01-.15-.06-.21-.07-.06-.17-.04-.25-.02-.11.02-1.788 1.14-5.056 3.348-.48.33-.909.49-1.299.48-.43-.01-1.248-.24-1.868-.44-.75-.24-1.349-.37-1.299-.79.03-.22.33-.44.89-.669Z" fill="#fff"/><defs><linearGradient id="a" x1="11.99" y1="0" x2="11.99" y2="23.81" gradientUnits="userSpaceOnUse"><stop stop-color="#2AABEE"/><stop offset="1" stop-color="#229ED9"/></linearGradient></defs></svg>
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -12,8 +12,7 @@
  ],
  "homepage": "https://shields.io",
  "bugs": {
-    "url": "https://github.com/badges/shields/issues",
-    "email": "thaddee.tyl@gmail.com"
+    "url": "https://github.com/badges/shields/issues"
  },
  "license": "CC0-1.0",
  "author": "Thaddée Tyl <thaddee.tyl@gmail.com>",
@@ -22,48 +21,48 @@
    "url": "https://github.com/badges/shields"
  },
  "dependencies": {
-    "@fontsource/lato": "^4.5.0",
-    "@fontsource/lekton": "^4.5.0",
-    "@sentry/node": "^6.13.3",
+    "@fontsource/lato": "^4.5.8",
+    "@fontsource/lekton": "^4.5.9",
+    "@renovate/pep440": "^1.0.0",
+    "@sentry/node": "^7.1.1",
    "@shields_io/camp": "^18.1.1",
    "badge-maker": "file:badge-maker",
-    "bytes": "^3.1.0",
-    "camelcase": "^6.2.0",
-    "chalk": "^4.1.2",
-    "check-node-version": "^4.1.0",
+    "bytes": "^3.1.2",
+    "camelcase": "^7.0.0",
+    "chalk": "^5.0.1",
+    "check-node-version": "^4.2.1",
    "cloudflare-middleware": "^1.0.4",
-    "config": "^3.3.6",
+    "config": "^3.3.7",
    "cross-env": "^7.0.3",
-    "decamelize": "^6.0.0",
-    "emojic": "^1.1.16",
+    "decamelize": "^3.2.0",
+    "emojic": "^1.1.17",
    "escape-string-regexp": "^4.0.0",
-    "fast-xml-parser": "^3.21.0",
-    "glob": "^7.2.0",
+    "fast-xml-parser": "^4.0.8",
+    "glob": "^8.0.3",
    "global-agent": "^3.0.0",
-    "got": "11.8.2",
+    "got": "^12.1.0",
    "graphql": "^15.6.1",
-    "graphql-tag": "^2.12.5",
-    "ioredis": "4.28.0",
-    "joi": "17.4.2",
+    "graphql-tag": "^2.12.6",
+    "ioredis": "5.0.6",
+    "joi": "17.6.0",
    "joi-extension-semver": "5.0.0",
    "js-yaml": "^4.1.0",
    "jsonpath": "~1.1.1",
    "lodash.countby": "^4.6.0",
    "lodash.groupby": "^4.6.0",
    "lodash.times": "^4.3.2",
-    "moment": "^2.29.1",
+    "moment": "^2.29.3",
    "node-env-flag": "^0.1.0",
-    "parse-link-header": "^1.0.1",
-    "path-to-regexp": "^6.2.0",
-    "pretty-bytes": "^5.6.0",
+    "parse-link-header": "^2.0.0",
+    "path-to-regexp": "^6.2.1",
+    "pretty-bytes": "^6.0.0",
    "priorityqueuejs": "^2.0.0",
-    "prom-client": "^14.0.0",
-    "qs": "^6.10.1",
-    "query-string": "^7.0.1",
-    "request": "~2.88.2",
-    "semver": "~7.3.5",
-    "simple-icons": "5.20.0",
-    "webextension-store-meta": "^1.0.4",
+    "prom-client": "^14.0.1",
+    "qs": "^6.10.5",
+    "query-string": "^7.1.1",
+    "semver": "~7.3.7",
+    "simple-icons": "6.23.0",
+    "webextension-store-meta": "^1.0.5",
    "xmldom": "~0.6.0",
    "xpath": "~0.0.32"
  },
@@ -99,7 +98,7 @@
    "test": "run-s --silent --continue-on-error lint test:frontend test:package test:core test:entrypoint check-types:package check-types:frontend prettier:check",
    "check-types:package": "tsd badge-maker",
    "check-types:frontend": "tsc --noEmit --project .",
-    "depcheck": "check-node-version --node \">= 14.0\"",
+    "depcheck": "check-node-version --node \">= 16.0\"",
    "prebuild": "run-s --silent depcheck",
    "features": "node scripts/export-supported-features-cli.js > ./frontend/supported-features.json",
    "defs": "node scripts/export-service-definitions-cli.js > ./frontend/service-definitions.yml",
@@ -142,118 +141,110 @@
    ]
  },
  "devDependencies": {
-    "@babel/core": "^7.15.8",
+    "@babel/core": "^7.18.2",
    "@babel/polyfill": "^7.12.1",
-    "@babel/register": "7.15.3",
+    "@babel/register": "7.17.7",
+    "@istanbuljs/schema": "^0.1.3",
    "@mapbox/react-click-to-select": "^2.2.1",
-    "@types/chai": "^4.2.22",
-    "@types/lodash.debounce": "^4.0.6",
-    "@types/lodash.groupby": "^4.6.6",
-    "@types/mocha": "^9.0.0",
+    "@types/chai": "^4.3.1",
+    "@types/lodash.debounce": "^4.0.7",
+    "@types/lodash.groupby": "^4.6.7",
+    "@types/mocha": "^9.1.1",
    "@types/node": "^16.7.10",
-    "@types/react-helmet": "^6.1.4",
+    "@types/react-helmet": "^6.1.5",
    "@types/react-modal": "^3.13.1",
    "@types/react-select": "^4.0.17",
-    "@types/styled-components": "5.1.15",
-    "@typescript-eslint/eslint-plugin": "^4.33.0",
-    "@typescript-eslint/parser": "^4.32.0",
+    "@types/styled-components": "5.1.25",
+    "@typescript-eslint/eslint-plugin": "^5.27.1",
+    "@typescript-eslint/parser": "^5.27.0",
    "babel-plugin-inline-react-svg": "^2.0.1",
-    "babel-plugin-istanbul": "^6.1.1",
-    "babel-preset-gatsby": "^2.0.0",
-    "c8": "^7.10.0",
-    "caller": "^1.0.1",
-    "chai": "^4.3.4",
+    "babel-preset-gatsby": "^2.14.0",
+    "c8": "^7.11.3",
+    "caller": "^1.1.0",
+    "chai": "^4.3.6",
    "chai-as-promised": "^7.1.1",
    "chai-datetime": "^1.8.0",
    "chai-string": "^1.4.0",
    "child-process-promise": "^2.2.1",
    "clipboard-copy": "^4.0.1",
-    "concurrently": "^6.3.0",
-    "cypress": "^8.7.0",
-    "danger": "^10.7.0",
+    "concurrently": "^7.2.1",
+    "cypress": "^10.0.3",
+    "danger": "^11.0.7",
    "danger-plugin-no-test-shortcuts": "^2.0.0",
    "deepmerge": "^4.2.2",
    "eslint": "^7.32.0",
-    "eslint-config-prettier": "^8.3.0",
+    "eslint-config-prettier": "^8.5.0",
    "eslint-config-standard": "^16.0.3",
    "eslint-config-standard-jsx": "^10.0.0",
    "eslint-config-standard-react": "^11.0.1",
    "eslint-plugin-chai-friendly": "^0.7.2",
    "eslint-plugin-cypress": "^2.12.1",
-    "eslint-plugin-import": "^2.25.2",
-    "eslint-plugin-jsdoc": "^37.0.3",
-    "eslint-plugin-mocha": "^9.0.0",
+    "eslint-plugin-import": "^2.26.0",
+    "eslint-plugin-jsdoc": "^39.3.2",
+    "eslint-plugin-mocha": "^10.0.5",
    "eslint-plugin-no-extension-in-require": "^0.2.0",
    "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-promise": "^5.1.1",
-    "eslint-plugin-react": "^7.26.1",
-    "eslint-plugin-react-hooks": "^4.2.0",
-    "eslint-plugin-sort-class-members": "^1.12.0",
+    "eslint-plugin-promise": "^5.2.0",
+    "eslint-plugin-react": "^7.30.0",
+    "eslint-plugin-react-hooks": "^4.5.0",
+    "eslint-plugin-sort-class-members": "^1.14.1",
    "fetch-ponyfill": "^7.1.0",
    "form-data": "^4.0.0",
-    "gatsby": "3.14.5",
-    "gatsby-plugin-catch-links": "^3.14.0",
-    "gatsby-plugin-page-creator": "^3.14.0",
-    "gatsby-plugin-react-helmet": "^4.14.0",
-    "gatsby-plugin-remove-trailing-slashes": "^3.14.0",
-    "gatsby-plugin-styled-components": "^4.14.0",
-    "gatsby-plugin-typescript": "^3.14.0",
-    "humanize-string": "^3.0.0",
+    "gatsby": "4.6.2",
+    "gatsby-plugin-catch-links": "^4.11.0",
+    "gatsby-plugin-page-creator": "^4.7.0",
+    "gatsby-plugin-react-helmet": "^5.10.0",
+    "gatsby-plugin-remove-trailing-slashes": "^4.9.0",
+    "gatsby-plugin-styled-components": "^5.11.0",
+    "gatsby-plugin-typescript": "^4.11.1",
+    "humanize-string": "^2.1.0",
    "icedfrisby": "4.0.0",
    "icedfrisby-nock": "^2.1.0",
-    "is-svg": "^4.3.1",
+    "is-svg": "^4.3.2",
    "js-yaml-loader": "^1.2.2",
-    "jsdoc": "^3.6.7",
-    "lint-staged": "^11.2.6",
+    "jsdoc": "^3.6.10",
+    "lint-staged": "^13.0.1",
    "lodash.debounce": "^4.0.8",
    "lodash.difference": "^4.5.0",
-    "minimist": "^1.2.5",
-    "mocha": "^9.1.3",
+    "minimist": "^1.2.6",
+    "mocha": "^9.2.2",
    "mocha-env-reporter": "^4.0.0",
    "mocha-junit-reporter": "^2.0.2",
    "mocha-yaml-loader": "^1.0.3",
-    "nock": "13.1.4",
+    "nock": "13.2.6",
    "node-mocks-http": "^1.11.0",
-    "nodemon": "^2.0.14",
+    "nodemon": "^2.0.16",
    "npm-run-all": "^4.1.5",
    "open-cli": "^7.0.1",
    "portfinder": "^1.0.28",
-    "prettier": "2.4.1",
+    "prettier": "2.6.2",
    "react": "^17.0.2",
    "react-dom": "^17.0.2",
-    "react-error-overlay": "^6.0.9",
+    "react-error-overlay": "^6.0.11",
    "react-helmet": "^6.1.0",
-    "react-modal": "^3.14.3",
+    "react-modal": "^3.15.1",
    "react-pose": "^4.0.10",
    "react-select": "^4.3.1",
    "read-all-stdin-sync": "^1.0.5",
    "redis-server": "^1.2.2",
    "rimraf": "^3.0.2",
    "sazerac": "^2.0.0",
-    "simple-git-hooks": "^2.7.0",
-    "sinon": "^11.1.2",
+    "simple-git-hooks": "^2.8.0",
+    "sinon": "^14.0.0",
    "sinon-chai": "^3.7.0",
    "snap-shot-it": "^7.9.6",
    "start-server-and-test": "1.14.0",
-    "styled-components": "^5.3.3",
-    "ts-mocha": "^8.0.0",
-    "tsd": "^0.18.0",
-    "typescript": "^4.4.4"
+    "styled-components": "^5.3.5",
+    "ts-mocha": "^10.0.0",
+    "tsd": "^0.20.0",
+    "typescript": "^4.7.3",
+    "url": "^0.11.0"
  },
  "engines": {
-    "node": "^14.17.1",
-    "npm": ">=7.0.0"
+    "node": ">=16.13.0",
+    "npm": ">=8.0.0"
  },
  "type": "module",
-  "babel": {
-    "env": {
-      "test": {
-        "plugins": [
-          "istanbul"
-        ]
-      }
-    }
-  },
  "collective": {
    "type": "opencollective",
    "url": "https://opencollective.com/shields",
--- a/services/amo/amo-base.js
+++ b/services/amo/amo-base.js
@@ -21,7 +21,7 @@ class BaseAmoService extends BaseJsonService {
  async fetch({ addonId }) {
    return this._requestJson({
      schema,
-      url: `https://addons.mozilla.org/api/v3/addons/addon/${addonId}`,
+      url: `https://addons.mozilla.org/api/v4/addons/addon/${addonId}/`,
    })
  }
 }
--- a/services/amo/amo-downloads.service.js
+++ b/services/amo/amo-downloads.service.js
@@ -24,6 +24,8 @@ class AmoWeeklyDownloads extends BaseAmoService {
    },
  ]

+  static _cacheLength = 21600
+
  static defaultBadgeData = { label: 'downloads' }

  static render({ downloads }) {
--- a/services/amo/amo-rating.service.js
+++ b/services/amo/amo-rating.service.js
@@ -23,6 +23,8 @@ export default class AmoRating extends BaseAmoService {
    },
  ]

+  static _cacheLength = 7200
+
  static render({ format, rating }) {
    rating = Math.round(rating)
    return {
--- a/services/amo/amo-users.service.js
+++ b/services/amo/amo-users.service.js
@@ -14,6 +14,8 @@ export default class AmoUsers extends BaseAmoService {
    },
  ]

+  static _cacheLength = 21600
+
  static defaultBadgeData = { label: 'users' }

  static render({ users: downloads }) {
--- a/services/appveyor/appveyor-tests.service.js
+++ b/services/appveyor/appveyor-tests.service.js
@@ -14,6 +14,7 @@ const commonPreviewProps = {
 }

 export default class AppVeyorTests extends AppVeyorBase {
+  static category = 'test-results'
  static route = {
    ...this.buildRoute('appveyor/tests'),
    queryParamSchema: testResultQueryParamSchema,
--- a/services/aur/aur.service.js
+++ b/services/aur/aur.service.js
@@ -42,8 +42,8 @@ class BaseAurService extends BaseJsonService {
    // https://wiki.archlinux.org/index.php/Aurweb_RPC_interface
    return this._requestJson({
      schema: aurSchema,
-      url: 'https://aur.archlinux.org/rpc.php',
-      options: { qs: { v: 5, type: 'info', arg: packageName } },
+      url: 'https://aur.archlinux.org/rpc',
+      options: { searchParams: { v: 5, type: 'info', arg: packageName } },
    })
  }
 }
--- a/services/aur/aur.tester.js
+++ b/services/aur/aur.tester.js
@@ -45,7 +45,7 @@ t.create('license (no license)')
  .get('/license/vscodium-bin.json')
  .intercept(nock =>
    nock('https://aur.archlinux.org')
-      .get('/rpc.php')
+      .get('/rpc')
      .query({
        v: 5,
        type: 'info',
--- a/services/azure-devops/azure-devops-base.js
+++ b/services/azure-devops/azure-devops-base.js
@@ -40,7 +40,7 @@ export default class AzureDevOpsBase extends BaseJsonService {
    // Microsoft documentation: https://docs.microsoft.com/en-us/rest/api/azure/devops/build/builds/list?view=azure-devops-rest-5.0
    const url = `https://dev.azure.com/${organization}/${project}/_apis/build/builds`
    const options = {
-      qs: {
+      searchParams: {
        definitions: definitionId,
        $top: 1,
        statusFilter: 'completed',
@@ -49,7 +49,7 @@ export default class AzureDevOpsBase extends BaseJsonService {
    }

    if (branch) {
-      options.qs.branchName = `refs/heads/${branch}`
+      options.searchParams.branchName = `refs/heads/${branch}`
    }

    const json = await this.fetch({
--- a/services/azure-devops/azure-devops-build.service.js
+++ b/services/azure-devops/azure-devops-build.service.js
@@ -104,7 +104,7 @@ export default class AzureDevOpsBuild extends BaseSvgScrapingService {
    // Microsoft documentation: https://docs.microsoft.com/en-us/rest/api/vsts/build/status/get
    const { status } = await fetch(this, {
      url: `https://dev.azure.com/${organization}/${projectId}/_apis/build/status/${definitionId}`,
-      qs: {
+      searchParams: {
        branchName: branch,
        stageName: stage,
        jobName: job,
--- a/services/azure-devops/azure-devops-coverage.service.js
+++ b/services/azure-devops/azure-devops-coverage.service.js
@@ -101,7 +101,7 @@ export default class AzureDevOpsCoverage extends AzureDevOpsBase {
    // Microsoft documentation: https://docs.microsoft.com/en-us/rest/api/azure/devops/test/code%20coverage/get%20build%20code%20coverage?view=azure-devops-rest-5.0
    const url = `https://dev.azure.com/${organization}/${project}/_apis/test/codecoverage`
    const options = {
-      qs: {
+      searchParams: {
        buildId,
        'api-version': '5.0-preview.1',
      },
--- a/services/azure-devops/azure-devops-helpers.js
+++ b/services/azure-devops/azure-devops-helpers.js
@@ -15,12 +15,15 @@ const schema = Joi.object({
    .required(),
 }).required()

-async function fetch(serviceInstance, { url, qs = {}, errorMessages }) {
+async function fetch(
+  serviceInstance,
+  { url, searchParams = {}, errorMessages }
+) {
  // Microsoft documentation: https://docs.microsoft.com/en-us/rest/api/vsts/build/status/get
  const { message: status } = await serviceInstance._requestSvg({
    schema,
    url,
-    options: { qs },
+    options: { searchParams },
    errorMessages,
  })
  return { status }
--- a/services/azure-devops/azure-devops-tests.service.js
+++ b/services/azure-devops/azure-devops-tests.service.js
@@ -61,8 +61,7 @@ const buildTestResultSummarySchema = Joi.object({
 }).required()

 export default class AzureDevOpsTests extends AzureDevOpsBase {
-  static category = 'build'
-
+  static category = 'test-results'
  static route = {
    base: 'azure-devops/tests',
    pattern: ':organization/:project/:definitionId/:branch*',
@@ -161,7 +160,7 @@ export default class AzureDevOpsTests extends AzureDevOpsBase {
    return await this.fetch({
      url: `https://dev.azure.com/${organization}/${project}/_apis/test/ResultSummaryByBuild`,
      options: {
-        qs: { buildId },
+        searchParams: { buildId },
      },
      schema: buildTestResultSummarySchema,
      errorMessages,
--- a/services/bitbucket/bitbucket-issues.service.js
+++ b/services/bitbucket/bitbucket-issues.service.js
@@ -44,7 +44,7 @@ function issueClassGenerator(raw) {
        schema: bitbucketIssuesSchema,
        // https://developer.atlassian.com/bitbucket/api/2/reference/meta/filtering#query-issues
        options: {
-          qs: { limit: 0, q: '(state = "new" OR state = "open")' },
+          searchParams: { limit: 0, q: '(state = "new" OR state = "open")' },
        },
        errorMessages: { 403: 'private repo' },
      })
--- a/services/bitbucket/bitbucket-pipelines.service.js
+++ b/services/bitbucket/bitbucket-pipelines.service.js
@@ -54,7 +54,7 @@ class BitbucketPipelines extends BaseJsonService {
      url,
      schema: bitbucketPipelinesSchema,
      options: {
-        qs: {
+        searchParams: {
          fields: 'values.state',
          page: 1,
          pagelen: 2,
--- a/services/bitbucket/bitbucket-pull-request.service.js
+++ b/services/bitbucket/bitbucket-pull-request.service.js
@@ -86,7 +86,7 @@ function pullRequestClassGenerator(raw) {
        this.bitbucketAuthHelper.withBasicAuth({
          url: `https://bitbucket.org/api/2.0/repositories/${user}/${repo}/pullrequests/`,
          schema,
-          options: { qs: { state: 'OPEN', limit: 0 } },
+          options: { searchParams: { state: 'OPEN', limit: 0 } },
          errorMessages,
        })
      )
@@ -99,7 +99,7 @@ function pullRequestClassGenerator(raw) {
          url: `${server}/rest/api/1.0/projects/${user}/repos/${repo}/pull-requests`,
          schema,
          options: {
-            qs: {
+            searchParams: {
              state: 'OPEN',
              limit: 100,
              withProperties: false,
--- a/services/bitrise/bitrise.service.js
+++ b/services/bitrise/bitrise.service.js
@@ -21,8 +21,8 @@ export default class Bitrise extends BaseJsonService {
  static examples = [
    {
      title: 'Bitrise',
-      namedParams: { appId: 'cde737473028420d', branch: 'master' },
-      queryParams: { token: 'GCIdEzacE4GW32jLVrZb7A' },
+      namedParams: { appId: '3ff11fe8457bd304', branch: 'master' },
+      queryParams: { token: 'lESRN9rEFFfDq92JtXs_jw' },
      staticPreview: this.render({ status: 'success' }),
    },
  ]
@@ -53,7 +53,7 @@ export default class Bitrise extends BaseJsonService {
      url: `https://app.bitrise.io/app/${encodeURIComponent(
        appId
      )}/status.json`,
-      options: { qs: { token, branch } },
+      options: { searchParams: { token, branch } },
      schema,
      errorMessages: {
        403: 'app not found or invalid token',
--- a/services/bitrise/bitrise.tester.js
+++ b/services/bitrise/bitrise.tester.js
@@ -3,14 +3,14 @@ import { createServiceTester } from '../tester.js'
 export const t = await createServiceTester()

 t.create('deploy status')
-  .get('/cde737473028420d.json?token=GCIdEzacE4GW32jLVrZb7A')
+  .get('/3ff11fe8457bd304.json?token=lESRN9rEFFfDq92JtXs_jw')
  .expectBadge({
    label: 'bitrise',
    message: isBuildStatus,
  })

 t.create('deploy status with branch')
-  .get('/cde737473028420d/master.json?token=GCIdEzacE4GW32jLVrZb7A')
+  .get('/3ff11fe8457bd304/master.json?token=lESRN9rEFFfDq92JtXs_jw')
  .expectBadge({
    label: 'bitrise',
    message: isBuildStatus,
--- a/services/bower/bower-version.service.js
+++ b/services/bower/bower-version.service.js
@@ -1,13 +1,13 @@
 import Joi from 'joi'
 import { renderVersionBadge } from '../version.js'
-import { InvalidResponse, redirector } from '../index.js'
+import { InvalidResponse } from '../index.js'
 import BaseBowerService from './bower-base.js'

 const queryParamSchema = Joi.object({
  include_prereleases: Joi.equal(''),
 }).required()

-class BowerVersion extends BaseBowerService {
+export default class BowerVersion extends BaseBowerService {
  static category = 'version'
  static route = { base: 'bower/v', pattern: ':packageName', queryParamSchema }

@@ -47,18 +47,3 @@ class BowerVersion extends BaseBowerService {
    return renderVersionBadge({ version })
  }
 }
-
-const BowerVersionRedirect = redirector({
-  category: 'version',
-  route: {
-    base: 'bower/vpre',
-    pattern: ':packageName',
-  },
-  transformPath: ({ packageName }) => `/bower/v/${packageName}`,
-  transformQueryParams: params => ({
-    include_prereleases: null,
-  }),
-  dateAdded: new Date('2019-12-15'),
-})
-
-export { BowerVersion, BowerVersionRedirect }
--- a/services/bower/bower-version.spec.js
+++ b/services/bower/bower-version.spec.js
@@ -4,7 +4,7 @@ import nock from 'nock'
 import { cleanUpNockAfterEach, defaultContext } from '../test-helpers.js'
 import { InvalidResponse } from '../index.js'
 import LibrariesIoApiProvider from '../librariesio/librariesio-api-provider.js'
-import { BowerVersion } from './bower-version.service.js'
+import BowerVersion from './bower-version.service.js'

 describe('BowerVersion', function () {
  test(BowerVersion.transform, () => {
--- a/services/bower/bower-version.tester.js
+++ b/services/bower/bower-version.tester.js
@@ -33,7 +33,3 @@ t.create('Pre Version for Invalid Package')
  .timeout(10000)
  .get('/v/it-is-a-invalid-package-should-error.json?include_prereleases')
  .expectBadge({ label: 'bower', message: 'package not found' })
-
-t.create('Version (legacy redirect: vpre)')
-  .get('/vpre/bootstrap.svg')
-  .expectRedirect('/bower/v/bootstrap.svg?include_prereleases')
--- a/services/bstats/bstats-players.service.js
+++ b/services/bstats/bstats-players.service.js
@@ -34,7 +34,7 @@ export default class BStatsPlayers extends BaseJsonService {
    return this._requestJson({
      schema,
      options: {
-        qs: {
+        searchParams: {
          maxElements: 1,
        },
      },
--- a/services/bstats/bstats-servers.service.js
+++ b/services/bstats/bstats-servers.service.js
@@ -34,7 +34,7 @@ export default class BStatsServers extends BaseJsonService {
    return this._requestJson({
      schema,
      options: {
-        qs: {
+        searchParams: {
          maxElements: 1,
        },
      },
--- a/services/build-status.js
+++ b/services/build-status.js
@@ -1,3 +1,9 @@
+/**
+ * Common functions and schemas for tasks related to build status.
+ *
+ * @module
+ */
+
 import Joi from 'joi'

 const greenStatuses = [
@@ -50,8 +56,23 @@ const allStatuses = greenStatuses
  .concat(redStatuses)
  .concat(otherStatuses)

+/**
+ * Joi schema for validating Build Status.
+ * Checks if the build status is present in the list of allowed build status.
+ *
+ * @type {object}
+ */
 const isBuildStatus = Joi.equal(...allStatuses)

+/**
+ * Handles rendering concerns of badges that display build status.
+ * Determines the message and color of the badge according to the build status.
+ *
+ * @param {object} attrs Refer to individual attributes
+ * @param {string} [attrs.label] If provided then badge label is set to this value
+ * @param {string} attrs.status Build status
+ * @returns {object} Badge with label, message and color properties
+ */
 function renderBuildStatusBadge({ label, status }) {
  let message
  let color
--- a/services/buildkite/buildkite.service.js
+++ b/services/buildkite/buildkite.service.js
@@ -35,7 +35,7 @@ export default class Buildkite extends BaseJsonService {

  async fetch({ identifier, branch }) {
    const url = `https://badge.buildkite.com/${identifier}.json`
-    const options = { qs: { branch } }
+    const options = { searchParams: { branch } }
    return this._requestJson({
      schema,
      url,
--- a/services/bundlephobia/bundlephobia.service.js
+++ b/services/bundlephobia/bundlephobia.service.js
@@ -79,7 +79,7 @@ export default class Bundlephobia extends BaseJsonService {
    const packageQuery = `${scope ? `${scope}/` : ''}${packageName}${
      version ? `@${version}` : ''
    }`
-    const options = { qs: { package: packageQuery } }
+    const options = { searchParams: { package: packageQuery } }
    return this._requestJson({
      schema,
      url: 'https://bundlephobia.com/api/size',
--- a/services/categories.js
+++ b/services/categories.js
@@ -1,6 +1,7 @@
 export default [
  { id: 'build', name: 'Build', keywords: ['build'] },
  { id: 'coverage', name: 'Code Coverage', keywords: ['coverage'] },
+  { id: 'test-results', name: 'Test Results', keywords: ['tests'] },
  { id: 'analysis', name: 'Analysis', keywords: ['analysis'] },
  { id: 'chat', name: 'Chat', keywords: ['chat'] },
  { id: 'dependencies', name: 'Dependencies', keywords: ['dependencies'] },
--- a/services/chocolatey/chocolatey.service.js
+++ b/services/chocolatey/chocolatey.service.js
@@ -3,7 +3,7 @@ import { createServiceFamily } from '../nuget/nuget-v2-service-family.js'
 export default createServiceFamily({
  defaultLabel: 'chocolatey',
  serviceBaseUrl: 'chocolatey',
-  apiBaseUrl: 'https://www.chocolatey.org/api/v2',
+  apiBaseUrl: 'https://community.chocolatey.org/api/v2',
  odataFormat: 'json',
  title: 'Chocolatey',
  examplePackageName: 'git',
--- a/services/circleci/circleci.service.js
+++ b/services/circleci/circleci.service.js
@@ -56,7 +56,7 @@ class CircleCi extends BaseSvgScrapingService {
      url: `https://circleci.com/${vcs}/${user}/${repo}${branchClause}.svg`,
      // Note that the unusual 'circle-token' query param name is required.
      // https://circleci.com/docs/api/#get-authenticated
-      options: { qs: { style: 'shield', 'circle-token': token } },
+      options: { searchParams: { style: 'shield', 'circle-token': token } },
      errorMessages: { 404: 'project not found' },
    })
    return this.constructor.render({ status: message })
--- a/services/cirrus/cirrus.service.js
+++ b/services/cirrus/cirrus.service.js
@@ -26,31 +26,29 @@ export default class Cirrus extends BaseJsonService {
      title: 'Cirrus CI - Base Branch Build Status',
      namedParams: { user: 'flutter', repo: 'flutter' },
      pattern: 'github/:user/:repo',
-      queryParams: { task: 'analyze', script: 'test' },
      staticPreview: this.render({ status: 'passing' }),
    },
    {
      title: 'Cirrus CI - Specific Branch Build Status',
      pattern: 'github/:user/:repo/:branch',
      namedParams: { user: 'flutter', repo: 'flutter', branch: 'master' },
-      queryParams: { task: 'analyze', script: 'test' },
      staticPreview: this.render({ status: 'passing' }),
    },
    {
      title: 'Cirrus CI - Specific Task Build Status',
      pattern: 'github/:user/:repo',
-      queryParams: { task: 'analyze' },
-      namedParams: { user: 'flutter', repo: 'flutter' },
-      staticPreview: this.render({ subject: 'analyze', status: 'passing' }),
+      queryParams: { task: 'build_docker' },
+      namedParams: { user: 'flutter', repo: 'cocoon' },
+      staticPreview: this.render({
+        subject: 'build_docker',
+        status: 'passing',
+      }),
    },
    {
      title: 'Cirrus CI - Task and Script Build Status',
      pattern: 'github/:user/:repo',
-      queryParams: { task: 'analyze', script: 'test' },
-      namedParams: {
-        user: 'flutter',
-        repo: 'flutter',
-      },
+      queryParams: { task: 'build_docker', script: 'test' },
+      namedParams: { user: 'flutter', repo: 'cocoon' },
      staticPreview: this.render({ subject: 'test', status: 'passing' }),
    },
  ]
@@ -65,7 +63,7 @@ export default class Cirrus extends BaseJsonService {
    const json = await this._requestJson({
      schema,
      url: `https://api.cirrus-ci.com/github/${user}/${repo}.json`,
-      options: { qs: { branch, script, task } },
+      options: { searchParams: { branch, script, task } },
    })

    return this.constructor.render(json)
--- a/services/codacy/codacy-coverage.service.js
+++ b/services/codacy/codacy-coverage.service.js
@@ -16,14 +16,14 @@ export default class CodacyCoverage extends BaseSvgScrapingService {
    {
      title: 'Codacy coverage',
      pattern: ':projectId',
-      namedParams: { projectId: 'e02de8d738bb4701b6345624ea2de66c' },
+      namedParams: { projectId: 'd5402a91aa7b4234bd1c19b5e86a63be' },
      staticPreview: this.render({ percentage: 90 }),
    },
    {
      title: 'Codacy branch coverage',
      pattern: ':projectId/:branch',
      namedParams: {
-        projectId: 'e02de8d738bb4701b6345624ea2de66c',
+        projectId: 'd5402a91aa7b4234bd1c19b5e86a63be',
        branch: 'master',
      },
      staticPreview: this.render({ percentage: 90 }),
@@ -51,7 +51,7 @@ export default class CodacyCoverage extends BaseSvgScrapingService {
      url: `https://api.codacy.com/project/badge/coverage/${encodeURIComponent(
        projectId
      )}`,
-      options: { qs: { branch } },
+      options: { searchParams: { branch } },
      valueMatcher: /text-anchor="middle">([^<>]+)<\/text>/,
      errorMessages: {
        404: 'project not found',
--- a/services/codacy/codacy-coverage.tester.js
+++ b/services/codacy/codacy-coverage.tester.js
@@ -2,22 +2,22 @@ import { isIntegerPercentage } from '../test-validators.js'
 import { createServiceTester } from '../tester.js'
 export const t = await createServiceTester()

-// https://app.codacy.com/gh/Seagate/cortx-s3server/dashboard?_ga=2.227678553.575705995.1626641804-993201653.1626641804
-// https://github.com/Seagate/cortx-s3server
-t.create('Coverage').get('/e02de8d738bb4701b6345624ea2de66c.json').expectBadge({
+// https://app.codacy.com/gh/kronenthaler/openstep-parser/dashboard
+// https://github.com/kronenthaler/openstep-parser
+t.create('Coverage').get('/d5402a91aa7b4234bd1c19b5e86a63be.json').expectBadge({
  label: 'coverage',
  message: isIntegerPercentage,
 })

 t.create('Coverage on branch')
-  .get('/e02de8d738bb4701b6345624ea2de66c/main.json')
+  .get('/d5402a91aa7b4234bd1c19b5e86a63be/master.json')
  .expectBadge({
    label: 'coverage',
    message: isIntegerPercentage,
  })

 t.create('Coverage not enabled')
-  .get('/e27821fb6289410b8f58338c7e0bc686.json')
+  .get('/0cb32ce695b743d68257021455330c66.json')
  .expectBadge({
    label: 'coverage',
    message: 'not enabled for this project',
--- a/services/codacy/codacy-grade.service.js
+++ b/services/codacy/codacy-grade.service.js
@@ -12,14 +12,14 @@ export default class CodacyGrade extends BaseSvgScrapingService {
    {
      title: 'Codacy grade',
      pattern: ':projectId',
-      namedParams: { projectId: 'a994873f30d045b9b4b83606c3eb3498' },
+      namedParams: { projectId: '0cb32ce695b743d68257021455330c66' },
      staticPreview: this.render({ grade: 'A' }),
    },
    {
      title: 'Codacy branch grade',
      pattern: ':projectId/:branch',
      namedParams: {
-        projectId: 'a994873f30d045b9b4b83606c3eb3498',
+        projectId: '0cb32ce695b743d68257021455330c66',
        branch: 'master',
      },
      staticPreview: this.render({ grade: 'A' }),
@@ -50,7 +50,7 @@ export default class CodacyGrade extends BaseSvgScrapingService {
      url: `https://api.codacy.com/project/badge/grade/${encodeURIComponent(
        projectId
      )}`,
-      options: { qs: { branch } },
+      options: { searchParams: { branch } },
      errorMessages: { 404: 'project or branch not found' },
      valueMatcher: /visibility="hidden">([^<>]+)<\/text>/,
    })
--- a/services/codacy/codacy-grade.tester.js
+++ b/services/codacy/codacy-grade.tester.js
@@ -2,17 +2,17 @@ import { createServiceTester } from '../tester.js'
 import { codacyGrade } from './codacy-helpers.js'
 export const t = await createServiceTester()

-// https://github.com/netdata/netdata/
-// https://app.codacy.com/manual/netdata/netdata/dashboard
+// https://app.codacy.com/gh/NicolasCARPi/jquery_jeditable/dashboard
+// https://github.com/NicolasCARPi/jquery_jeditable
 t.create('Code quality')
-  .get('/a994873f30d045b9b4b83606c3eb3498.json')
+  .get('/0cb32ce695b743d68257021455330c66.json')
  .expectBadge({
    label: 'code quality',
    message: codacyGrade,
  })

 t.create('Code quality on branch')
-  .get('/a994873f30d045b9b4b83606c3eb3498/master.json')
+  .get('/0cb32ce695b743d68257021455330c66/master.json')
  .expectBadge({
    label: 'code quality',
    message: codacyGrade,
--- a/services/codeclimate/codeclimate-analysis.service.js
+++ b/services/codeclimate/codeclimate-analysis.service.js
@@ -138,15 +138,19 @@ export default class CodeclimateAnalysis extends BaseJsonService {
  }

  async fetch({ user, repo }) {
+    const repoInfos = await fetchRepo(this, { user, repo })
+    const repoInfosWithSnapshot = repoInfos.filter(
+      repoInfo => repoInfo.relationships.latest_default_branch_snapshot.data
+    )
+    if (repoInfosWithSnapshot.length === 0) {
+      throw new NotFound({ prettyMessage: 'snapshot not found' })
+    }
    const {
      id: repoId,
      relationships: {
        latest_default_branch_snapshot: { data: snapshotInfo },
      },
-    } = await fetchRepo(this, { user, repo })
-    if (snapshotInfo === null) {
-      throw new NotFound({ prettyMessage: 'snapshot not found' })
-    }
+    } = repoInfosWithSnapshot[0]
    const { data } = await this._requestJson({
      schema,
      url: `https://api.codeclimate.com/v1/repos/${repoId}/snapshots/${snapshotInfo.id}`,
--- a/services/codeclimate/codeclimate-analysis.tester.js
+++ b/services/codeclimate/codeclimate-analysis.tester.js
@@ -32,6 +32,47 @@ t.create('maintainability letter')
    message: Joi.equal('A', 'B', 'C', 'D', 'E', 'F'),
  })

+t.create('issues when outer user repos query returns multiple items')
+  .get('/issues/angular/angular.json')
+  .intercept(nock =>
+    nock('https://api.codeclimate.com', { allowUnmocked: true })
+      .get('/v1/repos?github_slug=angular%2Fangular')
+      .reply(200, {
+        data: [
+          {
+            id: '54fd4e6b6956804a10003df4',
+            relationships: {
+              latest_default_branch_snapshot: {
+                data: null,
+              },
+              latest_default_branch_test_report: {
+                data: null,
+              },
+            },
+          },
+          {
+            id: '54fd4e6b6956804a10003df3',
+            relationships: {
+              latest_default_branch_snapshot: {
+                data: {
+                  id: '620e2b491b6a72000100ca1d',
+                  type: 'snapshots',
+                },
+              },
+              latest_default_branch_test_report: {
+                data: null,
+              },
+            },
+          },
+        ],
+      })
+  )
+  .networkOn() // Combined with allowUnmocked: true, this allows the inner snapshots query to go through.
+  .expectBadge({
+    label: 'issues',
+    message: Joi.number().integer().positive(),
+  })
+
 t.create('maintainability letter for non-existent repo')
  .get('/maintainability/unknown/unknown.json')
  .expectBadge({
--- a/services/codeclimate/codeclimate-common.js
+++ b/services/codeclimate/codeclimate-common.js
@@ -7,7 +7,6 @@ const isLetterGrade = Joi.equal('A', 'B', 'C', 'D', 'E', 'F').required()

 const repoSchema = Joi.object({
  data: Joi.array()
-    .max(1)
    .items(
      Joi.object({
        id: Joi.string().required(),
@@ -29,17 +28,15 @@ const repoSchema = Joi.object({
 }).required()

 async function fetchRepo(serviceInstance, { user, repo }) {
-  const {
-    data: [repoInfo],
-  } = await serviceInstance._requestJson({
+  const { data: repoInfos } = await serviceInstance._requestJson({
    schema: repoSchema,
    url: 'https://api.codeclimate.com/v1/repos',
-    options: { qs: { github_slug: `${user}/${repo}` } },
+    options: { searchParams: { github_slug: `${user}/${repo}` } },
  })
-  if (repoInfo === undefined) {
+  if (repoInfos.length === 0) {
    throw new NotFound({ prettyMessage: 'repo not found' })
  }
-  return repoInfo
+  return repoInfos
 }

 export { keywords, isLetterGrade, fetchRepo }
--- a/Show More
+++ b/Show More