Changelog for Release server-2022-07-03 (#8163 )

* Update Changelog Co-authored-by: release[bot] <actions@users.noreply.github.com> Co-authored-by: chris48s <chris48s@users.noreply.github.com>
chore(deps): bump qs from 6.10.5 to 6.11.0 (#8157 )
2022-07-03 19:10:06 +01:00 · 2022-07-03 17:52:57 +00:00 · 2022-07-02 21:12:15 +00:00 · 2022-07-02 21:04:51 +00:00 · 2022-07-02 20:57:36 +00:00 · 2022-07-02 20:48:21 +00:00
152 changed files with 6297 additions and 2747 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -7,7 +7,6 @@ main_steps: &main_steps
    - run:
        name: Install dependencies
        command: |
-          npm install --dry-run
          npm ci
        environment:
          # https://docs.cypress.io/guides/getting-started/installing-cypress.html#Skipping-installation
@@ -50,7 +49,6 @@ integration_steps: &integration_steps
    - run:
        name: Install dependencies
        command: |
-          npm install --dry-run
          npm ci
        environment:
          CYPRESS_INSTALL_BINARY: 0
@@ -73,7 +71,6 @@ services_steps: &services_steps
    - run:
        name: Install dependencies
        command: |
-          npm install --dry-run
          npm ci
        environment:
          CYPRESS_INSTALL_BINARY: 0
@@ -116,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

@@ -125,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

@@ -143,39 +142,33 @@ package_steps: &package_steps
 jobs:
  main:
    docker:
-      - image: circleci/node:16
-        environment:
-          NPM_CONFIG_ENGINE_STRICT: 'true'
-          NPM_CONFIG_STRICT_PEER_DEPS: 'true'
+      - image: cimg/node:16.15

    <<: *main_steps

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

    <<: *main_steps

  integration:
    docker:
-      - image: circleci/node:16
-        environment:
-          NPM_CONFIG_ENGINE_STRICT: 'true'
-          NPM_CONFIG_STRICT_PEER_DEPS: 'true'
+      - image: cimg/node:16.15
      - image: redis

    <<: *integration_steps

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

    <<: *integration_steps

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

@@ -195,17 +188,14 @@ jobs:

  frontend:
    docker:
-      - image: circleci/node:16
-        environment:
-          NPM_CONFIG_ENGINE_STRICT: 'true'
-          NPM_CONFIG_STRICT_PEER_DEPS: 'true'
+      - image: cimg/node:16.15
+
    steps:
      - checkout

      - run:
          name: Install dependencies
          command: |
-            npm install --dry-run
            npm ci
          environment:
            CYPRESS_INSTALL_BINARY: 0
@@ -235,31 +225,27 @@ jobs:
          command: npm run build

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

    <<: *package_steps

  services:
    docker:
-      - image: circleci/node:16
-        environment:
-          NPM_CONFIG_ENGINE_STRICT: 'true'
-          NPM_CONFIG_STRICT_PEER_DEPS: 'true'
+      - image: cimg/node:16.15

    <<: *services_steps

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

    <<: *services_steps

  e2e:
    docker:
-      - image: cypress/base:16.13.0
-        environment:
-          NPM_CONFIG_ENGINE_STRICT: 'true'
-          NPM_CONFIG_STRICT_PEER_DEPS: 'true'
+      - image: cypress/base:16.14.0
+
    steps:
      - checkout

@@ -271,7 +257,6 @@ jobs:
      - run:
          name: Install dependencies
          command: |
-            npm install --dry-run
            npm ci

      - run:
--- 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.9.0",
+        "@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.9.0",
+      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.9.0.tgz",
+      "integrity": "sha512-5pbM693Ih59ZdUhgk+fts+bUWTnIdHV3kwOSr+QIoFHMLg7Gzhwm0cifDY/AG68ekEJAkHnQVpcy4f6GjmzBCA==",
      "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",
@@ -226,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.9.0",
+      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.9.0.tgz",
+      "integrity": "sha512-5pbM693Ih59ZdUhgk+fts+bUWTnIdHV3kwOSr+QIoFHMLg7Gzhwm0cifDY/AG68ekEJAkHnQVpcy4f6GjmzBCA==",
      "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",
@@ -275,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",
@@ -285,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",
@@ -340,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",
--- 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.9.0",
+    "@actions/github": "^5.0.3"
  }
 }
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -36,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,16 +7,16 @@ 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
--- 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,16 +34,16 @@ 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
--- 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@v2
--- a/.github/workflows/publish-docker-next.yml
+++ b/.github/workflows/publish-docker-next.yml
@@ -9,13 +9,13 @@ 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 }}
@@ -24,7 +24,7 @@ jobs:
        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
--- a/.npmrc
+++ b/.npmrc
@@ -0,0 +1,2 @@
+engine-strict=true
+strict-peer-deps=true
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,72 @@ Note: this changelog is for the shields.io server. The changelog for the badge-m

 ---

+## server-2022-07-03
+
+- Add [galaxytoolshed] services [#8114](https://github.com/badges/shields/issues/8114)
+- fix [gitlab] auth [#8145](https://github.com/badges/shields/issues/8145) [#8162](https://github.com/badges/shields/issues/8162)
+- increase cache length on AUR version badge, run [AUR] [#8110](https://github.com/badges/shields/issues/8110)
+- Use GraphQL to fix GitHub file count badges [github] [#8112](https://github.com/badges/shields/issues/8112)
+- feat: add [gitlab] contributors service [#8084](https://github.com/badges/shields/issues/8084)
+- [greasyfork] Add Greasy Fork service badges [#8080](https://github.com/badges/shields/issues/8080)
+- Add [gitlablicense] services [#8024](https://github.com/badges/shields/issues/8024)
+- [Spack] Package Manager: Update Domain [#8046](https://github.com/badges/shields/issues/8046)
+- switch [jitpack] to use latestOk endpoint [#8041](https://github.com/badges/shields/issues/8041)
+- Dependency updates
+
+## 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)
--- a/4
+++ b/4
@@ -9,7 +9,7 @@ COPY package.json package-lock.json /usr/src/app/
 COPY badge-maker /usr/src/app/badge-maker/

 RUN apk add python3 make g++
-RUN npm install -g "npm@>=7"
+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

@@ -23,6 +23,8 @@ 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.

--- 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/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
@@ -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())
--- a/core/service-test-runner/infer-pull-request.js
+++ b/core/service-test-runner/infer-pull-request.js
@@ -59,7 +59,9 @@ function _inferPullRequestFromTravisEnv(env) {
 }

 function _inferPullRequestFromCircleEnv(env) {
-  return parseGithubPullRequestUrl(env.CI_PULL_REQUEST)
+  return parseGithubPullRequestUrl(
+    env.CI_PULL_REQUEST || env.CIRCLE_PULL_REQUEST
+  )
 }

 /**
--- 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 >=16 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
--- 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,9 +16,8 @@ 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             |
@@ -95,13 +94,10 @@ The raster server `raster.shields.io` (a.k.a. the rasterizing proxy) is
 hosted on Heroku. It's managed in the
 [squint](https://github.com/badges/squint/) repo.

-### Heroku Deployment
+### Fly.io 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

@@ -109,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
@@ -119,7 +119,7 @@ machine.

 If you want to host PNG badges, you can also self-host a [raster server][]
 which points to your badge server. It's a docker container. We host it on
-Heroku but should be possible to host on a wide variety of platforms.
+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`.
--- a/frontend/pages/endpoint.tsx
+++ b/frontend/pages/endpoint.tsx
@@ -134,7 +134,7 @@ export default function EndpointPage(): JSX.Element {
        </p>
        <p>
          The endpoint badge is a better alternative than redirecting to the
-          static badge enpoint or generating SVG on your server:
+          static badge endpoint or generating SVG on your server:
        </p>
        <ol>
          <li>
@@ -142,7 +142,7 @@ export default function EndpointPage(): JSX.Element {
              Content and presentation are separate.
            </a>{' '}
            The service provider authors the badge, and Shields takes input from
-            the user to format it. As a service provider you author the badge
+            the user to format it. As a service provider, you author the badge
            but don't have to concern yourself with styling. You don't even have
            to pass the formatting options through to Shields.
          </li>
@@ -152,12 +152,12 @@ export default function EndpointPage(): JSX.Element {
          </li>
          <li>
            A JSON response is easy to implement; easier than an HTTP redirect.
-            It is trivial in almost any framework, and is more compatible with
+            It is trivial in almost any framework and is more compatible with
            hosting environments such as{' '}
            <a href="https://runkit.com/docs/endpoint">RunKit endpoints</a>.
          </li>
          <li>
-            As a service provider you can rely on the Shields CDN. There's no
+            As a service provider, you can rely on the Shields CDN. There's no
            need to study the HTTP headers. Adjusting cache behavior is as
            simple as setting a property in the JSON response.
          </li>
@@ -197,7 +197,7 @@ export default function EndpointPage(): JSX.Element {
        <dd>
          Default: <code>false</code>. <code>true</code> to treat this as an
          error badge. This prevents the user from overriding the color. In the
-          future it may affect cache behavior.
+          future, it may affect cache behavior.
        </dd>
        <dt>namedLogo</dt>
        <dd>
--- a/lib/load-simple-icons.js
+++ b/lib/load-simple-icons.js
@@ -1,4 +1,4 @@
-import originalSimpleIcons from 'simple-icons'
+import * as originalSimpleIcons from 'simple-icons/icons'
 import { svg2base64 } from './svg-helpers.js'

 function loadSimpleIcons() {
@@ -14,10 +14,10 @@ function loadSimpleIcons() {
  // https://github.com/badges/shields/issues/4273
  Object.keys(originalSimpleIcons).forEach(key => {
    const icon = originalSimpleIcons[key]
-    const title = icon.title.toLowerCase()
-    const legacyTitle = title.replace(/ /g, '-')
+    const { title, slug, hex } = icon
+
    icon.base64 = {
-      default: svg2base64(icon.svg.replace('<svg', `<svg fill="#${icon.hex}"`)),
+      default: svg2base64(icon.svg.replace('<svg', `<svg fill="#${hex}"`)),
      light: svg2base64(icon.svg.replace('<svg', `<svg fill="whitesmoke"`)),
      dark: svg2base64(icon.svg.replace('<svg', `<svg fill="#333"`)),
    }
@@ -26,14 +26,17 @@ function loadSimpleIcons() {
    // (e.g. 'Hive'). If a by-title reference we generate for
    // backwards compatibility collides with a proper slug from Simple Icons
    // then do nothing, so that the proper slug will always map to the correct icon.
-    if (!(title in originalSimpleIcons)) {
-      simpleIcons[title] = icon
+    // Starting in v7, the exported object with the full icon set has updated the keys
+    // to include a lowercase `si` prefix, and utilizes proper case naming conventions.
+    if (!(`si${title}` in originalSimpleIcons)) {
+      simpleIcons[title.toLowerCase()] = icon
    }
-    if (!(legacyTitle in originalSimpleIcons)) {
-      simpleIcons[legacyTitle] = icon
+    const legacyTitle = title.replace(/ /g, '-')
+    if (!(`si${legacyTitle}` in originalSimpleIcons)) {
+      simpleIcons[legacyTitle.toLowerCase()] = icon
    }

-    simpleIcons[key] = icon
+    simpleIcons[slug] = icon
  })
  return simpleIcons
 }
--- 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
@@ -21,28 +21,29 @@
    "url": "https://github.com/badges/shields"
  },
  "dependencies": {
-    "@fontsource/lato": "^4.5.2",
-    "@fontsource/lekton": "^4.5.3",
-    "@sentry/node": "^6.18.0",
+    "@fontsource/lato": "^4.5.8",
+    "@fontsource/lekton": "^4.5.9",
+    "@renovate/pep440": "^1.0.0",
+    "@sentry/node": "^7.4.1",
    "@shields_io/camp": "^18.1.1",
    "badge-maker": "file:badge-maker",
    "bytes": "^3.1.2",
-    "camelcase": "^6.3.0",
-    "chalk": "^5.0.0",
+    "camelcase": "^7.0.0",
+    "chalk": "^5.0.1",
    "check-node-version": "^4.2.1",
    "cloudflare-middleware": "^1.0.4",
    "config": "^3.3.7",
    "cross-env": "^7.0.3",
    "decamelize": "^3.2.0",
-    "emojic": "^1.1.16",
+    "emojic": "^1.1.17",
    "escape-string-regexp": "^4.0.0",
-    "fast-xml-parser": "^4.0.3",
-    "glob": "^7.2.0",
+    "fast-xml-parser": "^4.0.8",
+    "glob": "^8.0.3",
    "global-agent": "^3.0.0",
-    "got": "^12.0.1",
+    "got": "^12.1.0",
    "graphql": "^15.6.1",
    "graphql-tag": "^2.12.6",
-    "ioredis": "4.28.5",
+    "ioredis": "5.1.0",
    "joi": "17.6.0",
    "joi-extension-semver": "5.0.0",
    "js-yaml": "^4.1.0",
@@ -50,17 +51,17 @@
    "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": "^2.0.0",
-    "path-to-regexp": "^6.2.0",
+    "path-to-regexp": "^6.2.1",
    "pretty-bytes": "^6.0.0",
    "priorityqueuejs": "^2.0.0",
    "prom-client": "^14.0.1",
-    "qs": "^6.10.3",
+    "qs": "^6.11.0",
    "query-string": "^7.1.1",
-    "semver": "~7.3.5",
-    "simple-icons": "6.11.0",
+    "semver": "~7.3.7",
+    "simple-icons": "7.3.0",
    "webextension-store-meta": "^1.0.5",
    "xmldom": "~0.6.0",
    "xpath": "~0.0.32"
@@ -140,108 +141,108 @@
    ]
  },
  "devDependencies": {
-    "@babel/core": "^7.17.5",
+    "@babel/core": "^7.18.6",
    "@babel/polyfill": "^7.12.1",
-    "@babel/register": "7.17.0",
+    "@babel/register": "7.18.6",
    "@istanbuljs/schema": "^0.1.3",
    "@mapbox/react-click-to-select": "^2.2.1",
-    "@types/chai": "^4.3.0",
-    "@types/lodash.debounce": "^4.0.6",
-    "@types/lodash.groupby": "^4.6.6",
-    "@types/mocha": "^9.1.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.5",
    "@types/react-modal": "^3.13.1",
    "@types/react-select": "^4.0.17",
-    "@types/styled-components": "5.1.23",
-    "@typescript-eslint/eslint-plugin": "^5.12.1",
-    "@typescript-eslint/parser": "^5.10.0",
+    "@types/styled-components": "5.1.25",
+    "@typescript-eslint/eslint-plugin": "^5.30.0",
+    "@typescript-eslint/parser": "^5.27.0",
    "babel-plugin-inline-react-svg": "^2.0.1",
-    "babel-preset-gatsby": "^2.5.1",
-    "c8": "^7.11.0",
-    "caller": "^1.0.1",
+    "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": "^7.0.0",
-    "cypress": "^9.5.0",
-    "danger": "^11.0.2",
+    "concurrently": "^7.2.2",
+    "cypress": "^10.3.0",
+    "danger": "^11.0.7",
    "danger-plugin-no-test-shortcuts": "^2.0.0",
    "deepmerge": "^4.2.2",
    "eslint": "^7.32.0",
-    "eslint-config-prettier": "^8.4.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.4",
-    "eslint-plugin-jsdoc": "^37.9.4",
-    "eslint-plugin-mocha": "^10.0.3",
+    "eslint-plugin-import": "^2.26.0",
+    "eslint-plugin-jsdoc": "^39.3.3",
+    "eslint-plugin-mocha": "^10.0.5",
    "eslint-plugin-no-extension-in-require": "^0.2.0",
    "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-promise": "^6.0.0",
-    "eslint-plugin-react": "^7.29.1",
-    "eslint-plugin-react-hooks": "^4.3.0",
+    "eslint-plugin-promise": "^5.2.0",
+    "eslint-plugin-react": "^7.30.1",
+    "eslint-plugin-react-hooks": "^4.6.0",
    "eslint-plugin-sort-class-members": "^1.14.1",
    "fetch-ponyfill": "^7.1.0",
    "form-data": "^4.0.0",
    "gatsby": "4.6.2",
-    "gatsby-plugin-catch-links": "^4.5.0",
+    "gatsby-plugin-catch-links": "^4.11.0",
    "gatsby-plugin-page-creator": "^4.7.0",
-    "gatsby-plugin-react-helmet": "^5.2.0",
-    "gatsby-plugin-remove-trailing-slashes": "^4.7.0",
-    "gatsby-plugin-styled-components": "^5.2.0",
-    "gatsby-plugin-typescript": "^4.2.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.2",
    "js-yaml-loader": "^1.2.2",
    "jsdoc": "^3.6.10",
-    "lint-staged": "^12.3.4",
+    "lint-staged": "^13.0.3",
    "lodash.debounce": "^4.0.8",
    "lodash.difference": "^4.5.0",
-    "minimist": "^1.2.5",
-    "mocha": "^9.2.1",
+    "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.2.4",
+    "nock": "13.2.8",
    "node-mocks-http": "^1.11.0",
-    "nodemon": "^2.0.15",
+    "nodemon": "^2.0.18",
    "npm-run-all": "^4.1.5",
    "open-cli": "^7.0.1",
    "portfinder": "^1.0.28",
-    "prettier": "2.5.1",
+    "prettier": "2.7.1",
    "react": "^17.0.2",
    "react-dom": "^17.0.2",
-    "react-error-overlay": "^6.0.10",
+    "react-error-overlay": "^6.0.11",
    "react-helmet": "^6.1.0",
-    "react-modal": "^3.14.4",
+    "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": "^13.0.1",
+    "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": "^9.0.2",
-    "tsd": "^0.19.1",
-    "typescript": "^4.5.5",
+    "styled-components": "^5.3.5",
+    "ts-mocha": "^10.0.0",
+    "tsd": "^0.22.0",
+    "typescript": "^4.7.4",
    "url": "^0.11.0"
  },
  "engines": {
-    "node": "^16.13.0",
-    "npm": ">=7.0.0"
+    "node": ">=16.13.0",
+    "npm": ">=8.0.0"
  },
  "type": "module",
  "collective": {
--- a/services/aur/aur.service.js
+++ b/services/aur/aur.service.js
@@ -108,9 +108,7 @@ class AurVotes extends BaseAurService {

 class AurVersion extends BaseAurService {
  static category = 'version'
-
  static route = { base: 'aur/version', pattern: ':packageName' }
-
  static examples = [
    {
      title: 'AUR version',
@@ -119,6 +117,8 @@ class AurVersion extends BaseAurService {
    },
  ]

+  static _cacheLength = 3600
+
  static render({ version, outOfDate }) {
    const color = outOfDate === null ? 'blue' : 'orange'
    return { message: addv(version), color }
--- 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' }),
    },
  ]
--- 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
@@ -1,5 +1,7 @@
-import Joi from 'joi'
-import { isVPlusDottedVersionAtLeastOne } from '../test-validators.js'
+import {
+  isVPlusDottedVersionAtLeastOne,
+  isVPlusDottedVersionNClausesWithOptionalSuffix,
+} from '../test-validators.js'
 import { ServiceTester } from '../tester.js'
 export const t = new ServiceTester({
  id: 'BowerVersion',
@@ -7,21 +9,17 @@ export const t = new ServiceTester({
  pathPrefix: '/bower',
 })

-const isBowerPrereleaseVersion = Joi.string().regex(
-  /^v\d+(\.\d+)?(\.\d+)?(-?[.\w\d])+?$/
-)
-
-t.create('version').timeout(10000).get('/v/bootstrap.json').expectBadge({
+t.create('version').timeout(10000).get('/v/angular.json').expectBadge({
  label: 'bower',
  message: isVPlusDottedVersionAtLeastOne,
 })

-t.create('pre version') // e.g. bower|v0.2.5-alpha-rc-pre
+t.create('pre version')
  .timeout(10000)
-  .get('/v/bootstrap.json?include_prereleases')
+  .get('/v/angular.json?include_prereleases')
  .expectBadge({
    label: 'bower',
-    message: isBowerPrereleaseVersion,
+    message: isVPlusDottedVersionNClausesWithOptionalSuffix,
  })

 t.create('Version for Invalid Package')
@@ -33,7 +31,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/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/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/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' }),
    },
  ]
--- 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: { 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/services/codeclimate/codeclimate-coverage.service.js
+++ b/services/codeclimate/codeclimate-coverage.service.js
@@ -53,15 +53,19 @@ export default class CodeclimateCoverage extends BaseJsonService {
  }

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

+t.create('test coverage when outer user repos query returns multiple items')
+  .get('/coverage/codeclimate/codeclimate.json')
+  .intercept(nock =>
+    nock('https://api.codeclimate.com', { allowUnmocked: true })
+      .get('/v1/repos?github_slug=codeclimate%2Fcodeclimate')
+      .reply(200, {
+        data: [
+          {
+            id: '558479d6e30ba034120008a8',
+            relationships: {
+              latest_default_branch_snapshot: {
+                data: null,
+              },
+              latest_default_branch_test_report: {
+                data: null,
+              },
+            },
+          },
+          {
+            id: '558479d6e30ba034120008a9',
+            relationships: {
+              latest_default_branch_snapshot: {
+                data: null,
+              },
+              latest_default_branch_test_report: {
+                data: {
+                  id: '62110434a7160b00010b4b59',
+                  type: 'test_reports',
+                },
+              },
+            },
+          },
+        ],
+      })
+  )
+  .networkOn() // Combined with allowUnmocked: true, this allows the inner test reports query to go through.
+  .expectBadge({
+    label: 'coverage',
+    message: isIntegerPercentage,
+  })
+
 t.create('test coverage percentage for non-existent repo')
  .get('/coverage/unknown/unknown.json')
  .expectBadge({
--- a/services/color-formatters.js
+++ b/services/color-formatters.js
@@ -1,9 +1,19 @@
 /**
 * Commonly-used functions for determining the colour to use for a badge,
 * including colours based off download count, version number, etc.
+ *
+ * @module
 */
-import moment from 'moment'

+import moment from 'moment'
+import pep440 from '@renovate/pep440'
+
+/**
+ * Determines the color used for a badge based on version.
+ *
+ * @param {string|number} version Version used for determining badge color
+ * @returns {string} Badge color
+ */
 function version(version) {
  if (typeof version !== 'string' && typeof version !== 'number') {
    throw new Error(`Can't generate a version color for ${version}`)
@@ -20,6 +30,35 @@ function version(version) {
  }
 }

+/**
+ * Determines the color used for a badge based on PEP440 versioning.
+ *
+ * @param {string|number} version Version used for determining badge color
+ * @returns {string} Badge color
+ */
+function pep440VersionColor(version) {
+  if (!pep440.valid(version)) {
+    return 'lightgrey'
+  }
+  const parsedVersion = pep440.explain(version)
+  if (parsedVersion.is_prerelease || parsedVersion.public.startsWith('0.')) {
+    return 'orange'
+  }
+  return 'blue'
+}
+
+/**
+ * Determines the color used for a badge by comparing the value and floor count values.
+ * The color can vary from red to bright green depending on the range the value lies in.
+ * Decreasing the value will shift the color towards red.
+ * Increasing the value will shift the color towards bright green.
+ *
+ * @param {number} value Current value
+ * @param {number} yellow Yellow color threshold, should be greater than 0
+ * @param {number} yellowgreen Yellowgreen color threshold, should be greater than yellow
+ * @param {number} green Green color threshold, should be greater than yellowgreen
+ * @returns {string} Badge color
+ */
 function floorCount(value, yellow, yellowgreen, green) {
  if (value <= 0) {
    return 'red'
@@ -34,14 +73,37 @@ function floorCount(value, yellow, yellowgreen, green) {
  }
 }

+/**
+ * Determines the color used for a badge by comparing the download count and floor values.
+ * The color varies from red to bright green as the download count increases.
+ *
+ * @param {number} downloads Download count
+ * @returns {string} Badge color
+ */
 function downloadCount(downloads) {
  return floorCount(downloads, 10, 100, 1000)
 }

+/**
+ * Determines the color used for a badge by comparing percentage and floor values.
+ * The color varies from red to bright green as the percentage increases.
+ *
+ * @param {number} percentage Percentage value
+ * @returns {string} Badge color
+ */
 function coveragePercentage(percentage) {
  return floorCount(percentage, 80, 90, 100)
 }

+/**
+ * Determines the color used for a badge by matching score with grade values.
+ * The color varies from bright green to red as the score decreases.
+ * The score can be one of the following grade value: ['A', 'B', 'C', 'D', 'E'].
+ * The color defaults to red if the score does not matches with any of the grade values.
+ *
+ * @param {string} score Score value
+ * @returns {string} Badge color
+ */
 function letterScore(score) {
  if (score === 'A') {
    return 'brightgreen'
@@ -58,6 +120,18 @@ function letterScore(score) {
  }
 }

+/**
+ * Creates a callback function that determines badge color from the colors array.
+ * If the colors array is provided then for n steps, there should be n + 1 color.
+ * If the colors array is not provided then it is chosen from the default colors array
+ * according to the size of the steps array.
+ *
+ * @param {number[]} steps Steps array
+ * @param {string[]} colors Colors array. If provided, should be of length steps.length + 1
+ * @param {boolean} reversed If true then the colors array will be considered in reverse order
+ * @returns {function(number): string} Function that finds the step index by comparing value
+ * with steps array and returns color from colors array for the corresponding step index
+ */
 function colorScale(steps, colors, reversed) {
  if (steps === undefined) {
    throw Error('When invoking colorScale, steps should be provided.')
@@ -98,6 +172,14 @@ function colorScale(steps, colors, reversed) {
  }
 }

+/**
+ * Determines the color used for a badge according to the age.
+ * Age is calculated as days elapsed till current date.
+ * The color varies from bright green to red as the age increases.
+ *
+ * @param {string} date Date string
+ * @returns {string} Badge color
+ */
 function age(date) {
  const colorByAge = colorScale([7, 30, 180, 365, 730], undefined, true)
  const daysElapsed = moment().diff(moment(date), 'days')
@@ -106,6 +188,7 @@ function age(date) {

 export {
  version,
+  pep440VersionColor,
  downloadCount,
  coveragePercentage,
  floorCount,
--- a/services/color-formatters.spec.js
+++ b/services/color-formatters.spec.js
@@ -6,6 +6,7 @@ import {
  letterScore,
  age,
  version,
+  pep440VersionColor,
 } from './color-formatters.js'

 describe('Color formatters', function () {
@@ -106,4 +107,45 @@ describe('Color formatters', function () {
      "Can't generate a version color for [object Object]"
    )
  })
+
+  test(pep440VersionColor, () => {
+    forCases([
+      given('1.0.1'),
+      given('v2.1.6'),
+      given('1.0.1+abcd'),
+      given('1.0'),
+      given('v1'),
+      given(9),
+      given(1.0),
+    ]).expect('blue')
+
+    forCases([
+      given('1.0.1-rc1'),
+      given('1.0.1rc1'),
+      given('1.0.0-Beta'),
+      given('1.0.0Beta'),
+      given('1.1.0-alpha'),
+      given('1.1.0alpha'),
+      given('1.0.1-dev'),
+      given('1.0.1dev'),
+      given('2.1.6-b1'),
+      given('2.1.6b1'),
+      given('0.1.0'),
+      given('v0.1.0'),
+      given('v2.1.6-b1'),
+      given('0.1.0+abcd'),
+      given('2.1.6-b1+abcd'),
+      given('0.0.0'),
+      given(0.1),
+      given('0.9'),
+    ]).expect('orange')
+
+    forCases([
+      given('6.0.0-SNAPSHOT'),
+      given('2.1.6-prerelease'),
+      given(true),
+      given(null),
+      given('cheese'),
+    ]).expect('lightgrey')
+  })
 })
--- a/services/contributor-count.js
+++ b/services/contributor-count.js
@@ -1,5 +1,18 @@
+/**
+ * Common functions and utilities for tasks related to contributor count.
+ *
+ * @module
+ */
+
 import { metric } from './text-formatters.js'

+/**
+ * Determines the color used for a badge based on the contributor count.
+ * The color varies from red to bright green as the contributor count increases.
+ *
+ * @param {number} contributorCount Contributor count
+ * @returns {string} Badge color
+ */
 function contributorColor(contributorCount) {
  if (contributorCount > 2) {
    return 'brightgreen'
@@ -10,6 +23,15 @@ function contributorColor(contributorCount) {
  }
 }

+/**
+ * Handles rendering concerns of badges that display contributor count.
+ * Determines the message and color of the badge according to the contributor count.
+ *
+ * @param {object} attrs Refer to individual attributes
+ * @param {string} [attrs.label] If provided then badge label is set to this value
+ * @param {number} attrs.contributorCount Contributor count
+ * @returns {object} Badge with label, message and color properties
+ */
 function renderContributorBadge({ label, contributorCount }) {
  return {
    label,
--- a/services/deprecation-helpers.js
+++ b/services/deprecation-helpers.js
@@ -1,9 +0,0 @@
-import { Deprecated } from './index.js'
-
-function enforceDeprecation(effectiveDate) {
-  if (Date.now() >= effectiveDate.getTime()) {
-    throw new Deprecated()
-  }
-}
-
-export { enforceDeprecation }
--- a/services/deprecation-helpers.spec.js
+++ b/services/deprecation-helpers.spec.js
@@ -1,15 +0,0 @@
-import { expect } from 'chai'
-import { Deprecated } from '../core/base-service/errors.js'
-import { enforceDeprecation } from './deprecation-helpers.js'
-
-describe('enforceDeprecation', function () {
-  it('throws Deprecated for a date in the past', function () {
-    expect(() => enforceDeprecation(new Date())).to.throw(Deprecated)
-  })
-
-  it('does not throw for a date in the future', function () {
-    expect(() =>
-      enforceDeprecation(new Date(Date.now() + 10000))
-    ).not.to.throw()
-  })
-})
--- a/services/dynamic-common.js
+++ b/services/dynamic-common.js
@@ -1,22 +1,54 @@
+/**
+ * Common functions and utilities for tasks related to dynamic badges.
+ *
+ * @module
+ */
+
 import Joi from 'joi'
 import toArray from '../core/base-service/to-array.js'
 import validate from '../core/base-service/validate.js'
 import { InvalidResponse } from './index.js'

+/**
+ * Map of error codes and their corresponding error messages.
+ *
+ * @type {object}
+ */
 const errorMessages = {
  404: 'resource not found',
 }

+/**
+ * Joi schema for validating individual value.
+ * Checks if the individual value is of type string or number.
+ *
+ * @type {object}
+ */
 const individualValueSchema = Joi.alternatives()
  .try(Joi.string(), Joi.number())
  .required()

+/**
+ * Joi schema for validating compound value.
+ * Checks if the compound value is of type individualValueSchema, array of individualValueSchema or empty array.
+ *
+ * @type {object}
+ */
 const compoundValueSchema = Joi.alternatives().try(
  individualValueSchema,
  Joi.array().items(individualValueSchema).required(),
  Joi.array().length(0)
 )

+/**
+ * Look up the value in the data object by key and validate the value against compoundValueSchema.
+ *
+ * @param {object} attrs Refer to individual attributes
+ * @param {object} attrs.data Object containing the data for validation
+ * @param {string} attrs.key Key to retrieve the data from object for validation
+ * @throws {InvalidResponse|Error} Error if Joi validation fails due to invalid or no schema
+ * @returns {object} Value if Joi validation is success
+ */
 function transformAndValidate({ data, key }) {
  return validate(
    {
@@ -30,6 +62,20 @@ function transformAndValidate({ data, key }) {
  )
 }

+/**
+ * Handles rendering concerns of dynamic badges.
+ * Determines the label of the badge according to the tag and defaultLabel.
+ * Determines the message of the badge according to the prefix, suffix and value.
+ * Sets the color of the badge to blue.
+ *
+ * @param {object} attrs Refer to individual attributes
+ * @param {string} attrs.defaultLabel default badge label
+ * @param {string} [attrs.tag] If provided then this value will be appended to the badge label, e.g. `foobar@v1.23`
+ * @param {any} attrs.value Value or array of value to be used for the badge message
+ * @param {string} [attrs.prefix] If provided then the badge message will use this value as a prefix
+ * @param {string} [attrs.suffix] If provided then the badge message will use this value as a suffix
+ * @returns {object} Badge with label, message and color properties
+ */
 function renderDynamicBadge({
  defaultLabel,
  tag,
--- a/services/endpoint-common.js
+++ b/services/endpoint-common.js
@@ -1,3 +1,9 @@
+/**
+ * Common functions and utilities for tasks related to endpoint badges.
+ *
+ * @module
+ */
+
 import Joi from 'joi'
 import validate from '../core/base-service/validate.js'
 import { InvalidResponse } from './index.js'
@@ -14,6 +20,11 @@ const optionalNumberWhenAnyLogoPresent = Joi.alternatives()
  .conditional('namedLogo', { is: Joi.string().required(), then: Joi.number() })
  .conditional('logoSvg', { is: Joi.string().required(), then: Joi.number() })

+/**
+ * Joi schema for validating endpoint.
+ *
+ * @type {object}
+ */
 const endpointSchema = Joi.object({
  schemaVersion: 1,
  label: Joi.string().allow('').required(),
@@ -33,9 +44,18 @@ const endpointSchema = Joi.object({
  .oxor('namedLogo', 'logoSvg')
  .required()

-// Strictly validate according to the endpoint schema. This rejects unknown /
-// invalid keys. Optionally it prints those keys in the message in order to
-// provide detailed feedback.
+/**
+ * Strictly validate the data according to the endpoint schema.
+ * This rejects unknown/invalid keys.
+ * Optionally it prints those keys in the message to provide detailed feedback.
+ *
+ * @param {object} data Object containing the data for validation
+ * @param {object} attrs Refer to individual attributes
+ * @param {string} [attrs.prettyErrorMessage] If provided then error message is set to this value
+ * @param {boolean} [attrs.includeKeys] If true then includes error details in error message, defaults to false
+ * @throws {InvalidResponse|Error} Error if Joi validation fails due to invalid or no schema
+ * @returns {object} Value if Joi validation is success
+ */
 function validateEndpointData(
  data,
  { prettyErrorMessage = 'invalid response data', includeKeys = false } = {}
@@ -56,6 +76,17 @@ function validateEndpointData(

 const anySchema = Joi.any()

+/**
+ * Fetches data from the endpoint and validates the data.
+ *
+ * @param {object} serviceInstance Instance of Endpoint class
+ * @param {object} attrs Refer to individual attributes
+ * @param {string} attrs.url Endpoint URL
+ * @param {object} attrs.errorMessages Object containing error messages for different error codes
+ * @param {string} attrs.validationPrettyErrorMessage If provided then the error message is set to this value
+ * @param {boolean} attrs.includeKeys If true then includes error details in error message
+ * @returns {object} Data fetched from endpoint
+ */
 async function fetchEndpointData(
  serviceInstance,
  { url, errorMessages, validationPrettyErrorMessage, includeKeys }
--- a/services/flathub/flathub-downloads.service.js
+++ b/services/flathub/flathub-downloads.service.js
@@ -0,0 +1,33 @@
+import Joi from 'joi'
+import { BaseJsonService } from '../index.js'
+import { renderDownloadsBadge } from '../downloads.js'
+
+const schema = Joi.object({
+  installs_total: Joi.number().integer().required(),
+}).required()
+
+export default class FlathubDownloads extends BaseJsonService {
+  static category = 'downloads'
+  static route = { base: 'flathub/downloads', pattern: ':packageName' }
+  static examples = [
+    {
+      title: 'Flathub',
+      namedParams: {
+        packageName: 'org.mozilla.firefox',
+      },
+      staticPreview: renderDownloadsBadge({ downloads: '277136' }),
+    },
+  ]
+
+  static defaultBadgeData = { label: 'installs' }
+
+  async handle({ packageName }) {
+    const data = await this._requestJson({
+      schema,
+      url: `https://flathub.org/api/v2/stats/${encodeURIComponent(
+        packageName
+      )}`,
+    })
+    return renderDownloadsBadge({ downloads: data.installs_total })
+  }
+}
--- a/services/flathub/flathub-downloads.tester.js
+++ b/services/flathub/flathub-downloads.tester.js
@@ -0,0 +1,14 @@
+import { isMetric } from '../test-validators.js'
+import { createServiceTester } from '../tester.js'
+export const t = await createServiceTester()
+
+t.create('Flathub Downloads (valid)')
+  .get('/org.mozilla.firefox.json')
+  .expectBadge({
+    label: 'installs',
+    message: isMetric,
+  })
+
+t.create('Flathub Downloads  (not found)')
+  .get('/not.a.package.json')
+  .expectBadge({ label: 'installs', message: 'not found' })
--- a/services/galaxytoolshed/galaxytoolshed-base.js
+++ b/services/galaxytoolshed/galaxytoolshed-base.js
@@ -0,0 +1,54 @@
+import Joi from 'joi'
+import { nonNegativeInteger } from '../validators.js'
+import { NotFound, BaseJsonService } from '../index.js'
+
+const orderedInstallableRevisionsSchema = Joi.array()
+  .items(Joi.string())
+  .required()
+
+const repositoryRevisionInstallInfoSchema = Joi.array()
+  .ordered(
+    Joi.object({
+      times_downloaded: nonNegativeInteger,
+    }).required()
+  )
+  .items(Joi.any())
+
+export default class BaseGalaxyToolshedService extends BaseJsonService {
+  static defaultBadgeData = { label: 'galaxytoolshed' }
+  static baseUrl = 'https://toolshed.g2.bx.psu.edu'
+
+  async fetchOrderedInstallableRevisionsSchema({ repository, owner }) {
+    return this._requestJson({
+      schema: orderedInstallableRevisionsSchema,
+      url: `${this.constructor.baseUrl}/api/repositories/get_ordered_installable_revisions?name=${repository}&owner=${owner}`,
+    })
+  }
+
+  async fetchRepositoryRevisionInstallInfoSchema({
+    repository,
+    owner,
+    changesetRevision,
+  }) {
+    return this._requestJson({
+      schema: repositoryRevisionInstallInfoSchema,
+      url: `${this.constructor.baseUrl}/api/repositories/get_repository_revision_install_info?name=${repository}&owner=${owner}&changeset_revision=${changesetRevision}`,
+    })
+  }
+
+  async fetchLastOrderedInstallableRevisionsSchema({ repository, owner }) {
+    const changesetRevisions =
+      await this.fetchOrderedInstallableRevisionsSchema({
+        repository,
+        owner,
+      })
+    if (!Array.isArray(changesetRevisions) || !changesetRevisions.length) {
+      throw new NotFound({ prettyMessage: 'changesetRevision not found' })
+    }
+    return this.fetchRepositoryRevisionInstallInfoSchema({
+      repository,
+      owner,
+      changesetRevision: changesetRevisions[0],
+    })
+  }
+}
--- a/services/galaxytoolshed/galaxytoolshed-downloads.service.js
+++ b/services/galaxytoolshed/galaxytoolshed-downloads.service.js
@@ -0,0 +1,34 @@
+import { renderDownloadsBadge } from '../downloads.js'
+import BaseGalaxyToolshedService from './galaxytoolshed-base.js'
+
+export default class GalaxyToolshedDownloads extends BaseGalaxyToolshedService {
+  static category = 'downloads'
+  static route = {
+    base: 'galaxytoolshed/downloads',
+    pattern: ':repository/:owner',
+  }
+
+  static examples = [
+    {
+      title: 'Galaxy Toolshed - Downloads',
+      namedParams: {
+        repository: 'sra_tools',
+        owner: 'iuc',
+      },
+      staticPreview: renderDownloadsBadge({ downloads: 10000 }),
+    },
+  ]
+
+  static defaultBadgeData = {
+    label: 'downloads',
+  }
+
+  async handle({ repository, owner }) {
+    const response = await this.fetchLastOrderedInstallableRevisionsSchema({
+      repository,
+      owner,
+    })
+    const { times_downloaded: downloads } = response[0]
+    return renderDownloadsBadge({ downloads })
+  }
+}
--- a/services/galaxytoolshed/galaxytoolshed-downloads.tester.js
+++ b/services/galaxytoolshed/galaxytoolshed-downloads.tester.js
@@ -0,0 +1,28 @@
+import { isMetric } from '../test-validators.js'
+import { createServiceTester } from '../tester.js'
+
+export const t = await createServiceTester()
+
+t.create('downloads - raw').get('/sra_tools/iuc.json').expectBadge({
+  label: 'downloads',
+  message: isMetric,
+})
+
+t.create('downloads - repository not found')
+  .get('/sra_tool/iuc.json')
+  .expectBadge({
+    label: 'downloads',
+    message: 'not found',
+  })
+
+t.create('downloads - owner not found').get('/sra_tools/iu.json').expectBadge({
+  label: 'downloads',
+  message: 'not found',
+})
+
+t.create('downloads - changesetRevision not found')
+  .get('/bioqc/badilla.json')
+  .expectBadge({
+    label: 'downloads',
+    message: 'changesetRevision not found',
+  })
--- a/services/gem/gem-owner.service.js
+++ b/services/gem/gem-owner.service.js
@@ -1,5 +1,6 @@
 import Joi from 'joi'
 import { floorCount as floorCountColor } from '../color-formatters.js'
+import { metric } from '../text-formatters.js'
 import { BaseJsonService } from '../index.js'

 const ownerSchema = Joi.array().required()
@@ -20,7 +21,7 @@ export default class GemOwner extends BaseJsonService {

  static render({ count }) {
    return {
-      message: count,
+      message: metric(count),
      color: floorCountColor(count, 10, 50, 100),
    }
  }
--- a/services/github/github-all-contributors.service.js
+++ b/services/github/github-all-contributors.service.js
@@ -2,7 +2,17 @@ import Joi from 'joi'
 import { renderContributorBadge } from '../contributor-count.js'
 import { ConditionalGithubAuthV3Service } from './github-auth-service.js'
 import { fetchJsonFromRepo } from './github-common-fetch.js'
-import { documentation } from './github-helpers.js'
+import { documentation as commonDocumentation } from './github-helpers.js'
+
+const documentation = `
+<p>
+  The All Contributors service allows you to recognize all your project
+  contributors, including those that don't push code. See
+  <a href="https://allcontributors.org">https://allcontributors.org</a>
+  for more information.
+</p>
+${commonDocumentation}
+`

 const schema = Joi.object({
  contributors: Joi.array().required(),
@@ -17,7 +27,7 @@ export default class GithubAllContributorsService extends ConditionalGithubAuthV

  static examples = [
    {
-      title: 'Github All Contributors',
+      title: 'GitHub contributors (via allcontributors.org)',
      namedParams: {
        repo: 'all-contributors',
        user: 'all-contributors',
--- a/services/github/github-deployments.service.js
+++ b/services/github/github-deployments.service.js
@@ -58,7 +58,7 @@ export default class GithubDeployments extends GithubAuthV4Service {
        environment: 'shields-staging',
      },
      staticPreview: this.render({
-        state: 'success',
+        state: 'SUCCESS',
      }),
      documentation,
    },
--- a/services/github/github-directory-file-count.service.js
+++ b/services/github/github-directory-file-count.service.js
@@ -1,11 +1,11 @@
-import path from 'path'
 import Joi from 'joi'
+import gql from 'graphql-tag'
 import { metric } from '../text-formatters.js'
 import { InvalidParameter } from '../index.js'
-import { ConditionalGithubAuthV3Service } from './github-auth-service.js'
+import { GithubAuthV4Service } from './github-auth-service.js'
 import {
  documentation as commonDocumentation,
-  errorMessagesFor,
+  transformErrors,
 } from './github-helpers.js'

 const documentation = `${commonDocumentation}
@@ -22,28 +22,29 @@ const documentation = `${commonDocumentation}
 </p>
 `

-const schema = Joi.alternatives(
-  /*
-   alternative empty object schema to provide a custom error message
-   in the event a file path is provided by the user instead of a directory
-  */
-  Joi.object({}).required(),
-  Joi.array()
-    .items(
-      Joi.object({
-        path: Joi.string().required(),
-        type: Joi.string().required(),
+const schema = Joi.object({
+  data: Joi.object({
+    repository: Joi.object({
+      object: Joi.object({
+        entries: Joi.array().items(
+          Joi.object({
+            type: Joi.string().required(),
+            extension: Joi.string().allow('').required(),
+          })
+        ),
      })
-    )
-    .required()
-)
+        .allow(null)
+        .required(),
+    }).required(),
+  }).required(),
+}).required()

 const queryParamSchema = Joi.object({
  type: Joi.any().valid('dir', 'file'),
  extension: Joi.string(),
 })

-export default class GithubDirectoryFileCount extends ConditionalGithubAuthV3Service {
+export default class GithubDirectoryFileCount extends GithubAuthV4Service {
  static category = 'size'

  static route = {
@@ -103,7 +104,7 @@ export default class GithubDirectoryFileCount extends ConditionalGithubAuthV3Ser
      title: 'GitHub repo file count (file extension)',
      pattern: ':user/:repo/:path',
      namedParams: { user: 'badges', repo: 'shields', path: 'services' },
-      queryParams: { extension: 'js' },
+      queryParams: { type: 'file', extension: 'js' },
      staticPreview: this.render({ count: 1 }),
      documentation,
    },
@@ -118,10 +119,25 @@ export default class GithubDirectoryFileCount extends ConditionalGithubAuthV3Ser
  }

  async fetch({ user, repo, path = '' }) {
-    return this._requestJson({
-      url: `/repos/${user}/${repo}/contents/${path}`,
+    const expression = `HEAD:${path}`
+    return this._requestGraphql({
+      query: gql`
+        query RepoFiles($user: String!, $repo: String!, $expression: String!) {
+          repository(owner: $user, name: $repo) {
+            object(expression: $expression) {
+              ... on Tree {
+                entries {
+                  type
+                  extension
+                }
+              }
+            }
+          }
+        }
+      `,
+      variables: { user, repo, expression },
      schema,
-      errorMessages: errorMessagesFor('repo or directory not found'),
+      transformErrors,
    })
  }

@@ -137,11 +153,12 @@ export default class GithubDirectoryFileCount extends ConditionalGithubAuthV3Ser
    }

    if (type) {
-      files = files.filter(file => file.type === type)
+      const objectType = type === 'dir' ? 'tree' : 'blob'
+      files = files.filter(file => file.type === objectType)
    }

    if (extension) {
-      files = files.filter(file => path.extname(file.path) === `.${extension}`)
+      files = files.filter(file => file.extension === `.${extension}`)
    }

    return {
@@ -150,7 +167,13 @@ export default class GithubDirectoryFileCount extends ConditionalGithubAuthV3Ser
  }

  async handle({ user, repo, path }, { type, extension }) {
-    const content = await this.fetch({ user, repo, path })
+    const json = await this.fetch({ user, repo, path })
+    if (json.data.repository.object === null) {
+      throw new InvalidParameter({
+        prettyMessage: 'directory not found',
+      })
+    }
+    const content = json.data.repository.object.entries
    const { count } = this.constructor.transform(content, { type, extension })
    return this.constructor.render({ count })
  }
--- a/services/github/github-directory-file-count.spec.js
+++ b/services/github/github-directory-file-count.spec.js
@@ -5,12 +5,12 @@ import GithubDirectoryFileCount from './github-directory-file-count.service.js'

 describe('GithubDirectoryFileCount', function () {
  const contents = [
-    { path: 'a', type: 'dir' },
-    { path: 'b', type: 'dir' },
-    { path: 'c.js', type: 'file' },
-    { path: 'd.js', type: 'file' },
-    { path: 'e.txt', type: 'file' },
-    { path: 'f', type: 'submodule' },
+    { extension: '', type: 'tree' },
+    { extension: '', type: 'tree' },
+    { extension: '.js', type: 'blob' },
+    { extension: '.js', type: 'blob' },
+    { extension: '.txt', type: 'blob' },
+    { extension: '', type: 'commit' },
  ]

  test(GithubDirectoryFileCount.transform, () => {
--- a/services/github/github-directory-file-count.tester.js
+++ b/services/github/github-directory-file-count.tester.js
@@ -14,11 +14,18 @@ t.create('directory file count (custom path)')
    message: isMetric,
  })

+t.create('directory file count (repo not found)')
+  .get('/badges/not_existing_repository.json')
+  .expectBadge({
+    label: 'files',
+    message: 'repo not found',
+  })
+
 t.create('directory file count (directory not found)')
  .get('/badges/shields/not_existing_directory.json')
  .expectBadge({
    label: 'files',
-    message: 'repo or directory not found',
+    message: 'directory not found',
  })

 t.create('directory file count (not a directory)')
--- a/services/github/github-issue-detail.service.js
+++ b/services/github/github-issue-detail.service.js
@@ -140,6 +140,26 @@ const ageUpdateMap = {
  }),
 }

+const milestoneMap = {
+  schema: Joi.object({
+    ...commonSchemaFields,
+    milestone: Joi.object({
+      title: Joi.string().required(),
+    }).allow(null),
+  }).required(),
+  transform: ({ json }) => {
+    if (!json.milestone) {
+      throw new InvalidResponse({ prettyMessage: 'no milestone' })
+    }
+    return json.milestone.title
+  },
+  render: ({ value }) => ({
+    label: 'milestone',
+    message: value,
+    color: 'informational',
+  }),
+}
+
 const propertyMap = {
  state: stateMap,
  title: titleMap,
@@ -148,6 +168,7 @@ const propertyMap = {
  comments: commentsMap,
  age: ageUpdateMap,
  'last-update': ageUpdateMap,
+  milestone: milestoneMap,
 }

 export default class GithubIssueDetail extends GithubAuthV3Service {
@@ -155,7 +176,7 @@ export default class GithubIssueDetail extends GithubAuthV3Service {
  static route = {
    base: 'github',
    pattern:
-      ':issueKind(issues|pulls)/detail/:property(state|title|author|label|comments|age|last-update)/:user/:repo/:number([0-9]+)',
+      ':issueKind(issues|pulls)/detail/:property(state|title|author|label|comments|age|last-update|milestone)/:user/:repo/:number([0-9]+)',
  }

  static examples = [
@@ -182,6 +203,7 @@ export default class GithubIssueDetail extends GithubAuthV3Service {
        'comments',
        'age',
        'last update',
+        'milestone',
      ],
      documentation,
    },
--- a/services/github/github-issue-detail.spec.js
+++ b/services/github/github-issue-detail.spec.js
@@ -90,6 +90,14 @@ describe('GithubIssueDetail', function () {
      message: formatDate('2019-04-02T20:09:31Z'),
      color: age('2019-04-02T20:09:31Z'),
    })
+    given({
+      property: 'milestone',
+      value: 'MS 1',
+    }).expect({
+      label: 'milestone',
+      message: 'MS 1',
+      color: 'informational',
+    })
  })

  test(GithubIssueDetail.prototype.transform, () => {
@@ -178,6 +186,13 @@ describe('GithubIssueDetail', function () {
      value: '2019-04-02T20:09:31Z',
      isPR: false,
    })
+    given({
+      property: 'milestone',
+      json: { milestone: { title: 'MS 1' } },
+    }).expect({
+      value: 'MS 1',
+      isPR: false,
+    })
  })

  context('transform()', function () {
@@ -194,4 +209,19 @@ describe('GithubIssueDetail', function () {
      }
    })
  })
+
+  context('transform()', function () {
+    it('throws InvalidResponse error when issue has no milestone', function () {
+      try {
+        GithubIssueDetail.prototype.transform({
+          property: 'milestone',
+          json: { milestone: null },
+        })
+        expect.fail('Expected to throw')
+      } catch (e) {
+        expect(e).to.be.an.instanceof(InvalidResponse)
+        expect(e.prettyMessage).to.equal('no milestone')
+      }
+    })
+  })
 })
--- a/services/github/github-issue-detail.tester.js
+++ b/services/github/github-issue-detail.tester.js
@@ -64,3 +64,16 @@ t.create('github pull request merge state (pull request not found)')
    label: 'issue/pull request',
    message: 'issue, pull request or repo not found',
  })
+
+t.create('github issue milestone')
+  .get('/issues/detail/milestone/badges/shields/4949.json')
+  .expectBadge({
+    label: 'milestone',
+    message: 'badge-maker v3.4',
+  })
+
+t.create('github issue milestone (without milestone)')
+  .get('/issues/detail/milestone/badges/shields/979.json')
+  .expectBadge({
+    message: 'no milestone',
+  })
--- a/services/github/github-issues.service.js
+++ b/services/github/github-issues.service.js
@@ -307,7 +307,9 @@ export default class GithubIssues extends GithubAuthV4Service {

    return {
      label: `${labelPrefix}${labelText}${labelSuffix}`,
-      message: `${metric(issueCount)} ${messageSuffix}`,
+      message: `${metric(issueCount)}${
+        messageSuffix ? ' ' : ''
+      }${messageSuffix}`,
      color: issueCount > 0 ? 'yellow' : 'brightgreen',
    }
  }
--- a/services/github/github-language-count.service.js
+++ b/services/github/github-language-count.service.js
@@ -1,3 +1,4 @@
+import { metric } from '../text-formatters.js'
 import { BaseGithubLanguage } from './github-languages-base.js'
 import { documentation } from './github-helpers.js'

@@ -20,7 +21,7 @@ export default class GithubLanguageCount extends BaseGithubLanguage {

  static render({ count }) {
    return {
-      message: count,
+      message: metric(count),
      color: 'blue',
    }
  }
--- a/services/github/github-milestone-detail.service.js
+++ b/services/github/github-milestone-detail.service.js
@@ -75,7 +75,7 @@ export default class GithubMilestoneDetail extends GithubAuthV3Service {
    }

    return {
-      label: `${milestone.title} ${label}`,
+      label: `${milestone.title}${label ? ' ' : ''}${label}`,
      message: metric(milestoneMetric),
      color,
    }
--- a/services/github/github-milestone.service.js
+++ b/services/github/github-milestone.service.js
@@ -43,7 +43,7 @@ export default class GithubMilestone extends GithubAuthV3Service {
  static render({ user, repo, variant, milestones }) {
    const milestoneLength = milestones.length
    let color
-    let label = ''
+    let qualifier = ''

    switch (variant) {
      case 'all':
@@ -51,16 +51,16 @@ export default class GithubMilestone extends GithubAuthV3Service {
        break
      case 'open':
        color = 'red'
-        label = 'active'
+        qualifier = 'active'
        break
      case 'closed':
        color = 'green'
-        label = 'completed'
+        qualifier = 'completed'
        break
    }

    return {
-      label: `${label} milestones`,
+      label: `${qualifier}${qualifier ? ' ' : ''}milestones`,
      message: metric(milestoneLength),
      color,
    }
--- a/services/github/github-pipenv.service.js
+++ b/services/github/github-pipenv.service.js
@@ -1,3 +1,4 @@
+import { pep440VersionColor } from '../color-formatters.js'
 import { renderVersionBadge } from '../version.js'
 import { isLockfile, getDependencyVersion } from '../pipenv-helpers.js'
 import { addv } from '../text-formatters.js'
@@ -80,6 +81,7 @@ class GithubPipenvLockedPythonVersion extends ConditionalGithubAuthV3Service {
      version,
      tag: branch,
      defaultLabel: 'python',
+      versionFormatter: pep440VersionColor,
    })
  }

@@ -147,7 +149,7 @@ class GithubPipenvLockedDependencyVersion extends ConditionalGithubAuthV3Service
    return {
      label: dependency,
      message: version ? addv(version) : ref,
-      color: 'blue',
+      color: version ? pep440VersionColor(version) : 'blue',
    }
  }

--- a/services/gitlab/gitlab-base.js
+++ b/services/gitlab/gitlab-base.js
@@ -8,7 +8,7 @@ export default class GitLabBase extends BaseJsonService {

  async fetch({ url, options, schema, errorMessages }) {
    return this._requestJson(
-      this.authHelper.withBasicAuth({
+      this.authHelper.withBearerAuthHeader({
        schema,
        url,
        options,
@@ -18,10 +18,12 @@ export default class GitLabBase extends BaseJsonService {
  }

  async fetchPage({ page, requestParams, schema }) {
-    const { res, buffer } = await this._request({
-      ...requestParams,
-      ...{ options: { searchParams: { page } } },
-    })
+    const { res, buffer } = await this._request(
+      this.authHelper.withBearerAuthHeader({
+        ...requestParams,
+        ...{ options: { searchParams: { page } } },
+      })
+    )

    const json = this._parseJson(buffer)
    const data = this.constructor._validate(json, schema)
@@ -35,7 +37,7 @@ export default class GitLabBase extends BaseJsonService {
    errorMessages,
    firstPageOnly = false,
  }) {
-    const requestParams = this.authHelper.withBasicAuth({
+    const requestParams = {
      url,
      options: {
        headers: { Accept: 'application/json' },
@@ -43,7 +45,7 @@ export default class GitLabBase extends BaseJsonService {
        ...options,
      },
      errorMessages,
-    })
+    }

    const {
      res: { headers },
--- a/services/gitlab/gitlab-contributors-redirect.service.js
+++ b/services/gitlab/gitlab-contributors-redirect.service.js
@@ -0,0 +1,12 @@
+import { redirector } from '../index.js'
+
+// https://github.com/badges/shields/issues/8138
+export default redirector({
+  category: 'build',
+  route: {
+    base: 'gitlab/v/contributor',
+    pattern: ':project+',
+  },
+  transformPath: ({ project }) => `/gitlab/contributors/${project}`,
+  dateAdded: new Date('2022-06-29'),
+})
--- a/services/gitlab/gitlab-contributors-redirect.tester.js
+++ b/services/gitlab/gitlab-contributors-redirect.tester.js
@@ -0,0 +1,9 @@
+import { createServiceTester } from '../tester.js'
+export const t = await createServiceTester()
+
+t.create('Contributors redirect')
+  .get('/gitlab-org/gitlab', {
+    followRedirect: false,
+  })
+  .expectStatus(301)
+  .expectHeader('Location', '/gitlab/contributors/gitlab-org/gitlab.svg')
--- a/services/gitlab/gitlab-contributors.service.js
+++ b/services/gitlab/gitlab-contributors.service.js
@@ -0,0 +1,78 @@
+import Joi from 'joi'
+import { optionalUrl, nonNegativeInteger } from '../validators.js'
+import { renderContributorBadge } from '../contributor-count.js'
+import GitLabBase from './gitlab-base.js'
+
+const schema = Joi.object({ 'x-total': nonNegativeInteger }).required()
+
+const queryParamSchema = Joi.object({
+  gitlab_url: optionalUrl,
+}).required()
+
+const documentation = `
+<p>
+  You may use your GitLab Project Id (e.g. 278964) or your Project Path (e.g. gitlab-org/gitlab )
+</p>
+`
+
+const customDocumentation = `
+<p>
+  Note that only network-accessible jihulab.com and other self-managed GitLab instances are supported.
+  You may use your GitLab Project Id (e.g. 13953) or your Project Path (e.g. gitlab-cn/gitlab ) in <a href="https://jihulab.com">https://jihulab.com</a>
+</p>
+`
+
+export default class GitlabContributors extends GitLabBase {
+  static category = 'activity'
+  static route = {
+    base: 'gitlab/contributors',
+    pattern: ':project+',
+    queryParamSchema,
+  }
+
+  static examples = [
+    {
+      title: 'GitLab contributors',
+      namedParams: {
+        project: 'gitlab-org/gitlab',
+      },
+      staticPreview: this.render({ contributorCount: 418 }),
+      documentation,
+    },
+    {
+      title: 'GitLab (self-managed) contributors',
+      queryParams: { gitlab_url: 'https://jihulab.com' },
+      namedParams: {
+        project: 'gitlab-cn/gitlab',
+      },
+      staticPreview: this.render({ contributorCount: 415 }),
+      documentation: customDocumentation,
+    },
+  ]
+
+  static defaultBadgeData = { label: 'contributors' }
+
+  static render({ contributorCount }) {
+    return renderContributorBadge({ contributorCount })
+  }
+
+  async handle({ project }, { gitlab_url: baseUrl = 'https://gitlab.com' }) {
+    // https://docs.gitlab.com/ee/api/repositories.html#contributors
+    const { res } = await this._request(
+      this.authHelper.withBearerAuthHeader({
+        url: `${baseUrl}/api/v4/projects/${encodeURIComponent(
+          project
+        )}/repository/contributors`,
+        options: { searchParams: { page: '1', per_page: '1' } },
+        errorMessages: {
+          404: 'project not found',
+        },
+      })
+    )
+    const data = this.constructor._validate(res.headers, schema)
+    // The total number of contributors is in the `x-total` field in the headers.
+    // https://docs.gitlab.com/ee/api/index.html#other-pagination-headers
+    const contributorCount = data['x-total']
+    return this.constructor.render({ contributorCount })
+  }
+}
--- a/services/gitlab/gitlab-contributors.tester.js
+++ b/services/gitlab/gitlab-contributors.tester.js
@@ -0,0 +1,42 @@
+import { createServiceTester } from '../tester.js'
+import { isMetric } from '../test-validators.js'
+import { noToken } from '../test-helpers.js'
+import _noGitLabToken from './gitlab-contributors.service.js'
+export const t = await createServiceTester()
+const noGitLabToken = noToken(_noGitLabToken)
+
+t.create('Contributors')
+  .get('/guoxudong.io/shields-test/licenced-test.json')
+  .expectBadge({
+    label: 'contributors',
+    message: isMetric,
+  })
+
+t.create('Contributors (repo not found)')
+  .get('/guoxudong.io/shields-test/do-not-exist.json')
+  .expectBadge({
+    label: 'contributors',
+    message: 'project not found',
+  })
+
+t.create('Mocking the missing x-total header')
+  .get('/group/project.json')
+  .intercept(nock =>
+    nock('https://gitlab.com')
+      .get(
+        '/api/v4/projects/group%2Fproject/repository/contributors?page=1&per_page=1'
+      )
+      .reply(200)
+  )
+  .expectBadge({
+    label: 'contributors',
+    message: 'invalid response data',
+  })
+
+t.create('Contributors (private repo)')
+  .skipWhen(noGitLabToken)
+  .get('/shields-ops-group/test.json')
+  .expectBadge({
+    label: 'contributors',
+    message: isMetric,
+  })
--- a/services/gitlab/gitlab-coverage.service.js
+++ b/services/gitlab/gitlab-coverage.service.js
@@ -68,14 +68,14 @@ export default class GitlabCoverage extends BaseSvgScrapingService {
      documentation,
    },
    {
-      title: 'Gitlab code coverage (self-hosted)',
+      title: 'Gitlab code coverage (self-managed)',
      namedParams: { user: 'GNOME', repo: 'at-spi2-core', branch: 'master' },
      queryParams: { gitlab_url: 'https://gitlab.gnome.org' },
      staticPreview: this.render({ coverage: 93 }),
      documentation,
    },
    {
-      title: 'Gitlab code coverage (self-hosted, specific job)',
+      title: 'Gitlab code coverage (self-managed, specific job)',
      namedParams: { user: 'GNOME', repo: 'libhandy', branch: 'master' },
      queryParams: {
        gitlab_url: 'https://gitlab.gnome.org',
--- a/services/gitlab/gitlab-license-redirect.service.js
+++ b/services/gitlab/gitlab-license-redirect.service.js
@@ -0,0 +1,12 @@
+import { redirector } from '../index.js'
+
+// https://github.com/badges/shields/issues/8138
+export default redirector({
+  category: 'build',
+  route: {
+    base: 'gitlab/v/license',
+    pattern: ':project+',
+  },
+  transformPath: ({ project }) => `/gitlab/license/${project}`,
+  dateAdded: new Date('2022-06-29'),
+})
--- a/services/gitlab/gitlab-license-redirect.tester.js
+++ b/services/gitlab/gitlab-license-redirect.tester.js
@@ -0,0 +1,9 @@
+import { createServiceTester } from '../tester.js'
+export const t = await createServiceTester()
+
+t.create('License redirect')
+  .get('/gitlab-org/gitlab', {
+    followRedirect: false,
+  })
+  .expectStatus(301)
+  .expectHeader('Location', '/gitlab/license/gitlab-org/gitlab.svg')
--- a/services/gitlab/gitlab-license.service.js
+++ b/services/gitlab/gitlab-license.service.js
@@ -0,0 +1,96 @@
+import Joi from 'joi'
+import { optionalUrl } from '../validators.js'
+import { renderLicenseBadge } from '../licenses.js'
+import GitLabBase from './gitlab-base.js'
+
+const schema = Joi.object({
+  license: Joi.object({
+    name: Joi.string().required(),
+  }).allow(null),
+}).required()
+
+const queryParamSchema = Joi.object({
+  gitlab_url: optionalUrl,
+}).required()
+
+const documentation = `
+<p>
+  You may use your GitLab Project Id (e.g. 278964) or your Project Path (e.g. gitlab-org/gitlab )
+</p>
+`
+
+const customDocumentation = `
+<p>
+  Note that only internet-accessible GitLab instances are supported, for example https://jihulab.com, https://gitlab.gnome.org, or https://gitlab.com/.
+  You may use your GitLab Project Id (e.g. 13953) or your Project Path (e.g. gitlab-cn/gitlab ) in <a href="https://jihulab.com">https://jihulab.com</a>
+</p>
+`
+
+export default class GitlabLicense extends GitLabBase {
+  static category = 'license'
+
+  static route = {
+    base: 'gitlab/license',
+    pattern: ':project+',
+    queryParamSchema,
+  }
+
+  static examples = [
+    {
+      title: 'GitLab',
+      namedParams: {
+        project: 'gitlab-org/gitlab',
+      },
+      staticPreview: {
+        label: 'license',
+        message: 'MIT License',
+        color: 'green',
+      },
+      documentation,
+    },
+    {
+      title: 'GitLab (self-managed)',
+      namedParams: {
+        project: 'gitlab-cn/gitlab',
+      },
+      queryParams: { gitlab_url: 'https://jihulab.com' },
+      staticPreview: {
+        label: 'license',
+        message: 'MIT License',
+        color: 'green',
+      },
+      documentation: customDocumentation,
+    },
+  ]
+
+  static defaultBadgeData = { label: 'license' }
+
+  static render({ license }) {
+    if (license) {
+      return renderLicenseBadge({ license })
+    } else {
+      return { message: 'not specified' }
+    }
+  }
+
+  async fetch({ project, baseUrl }) {
+    // https://docs.gitlab.com/ee/api/projects.html#get-single-project
+    return super.fetch({
+      schema,
+      url: `${baseUrl}/api/v4/projects/${encodeURIComponent(project)}`,
+      options: { searchParams: { license: '1' } },
+      errorMessages: {
+        404: 'repo not found',
+      },
+    })
+  }
+
+  async handle({ project }, { gitlab_url: baseUrl = 'https://gitlab.com' }) {
+    const { license: licenseObject } = await this.fetch({
+      project,
+      baseUrl,
+    })
+    const license = licenseObject ? licenseObject.name : undefined
+    return this.constructor.render({ license })
+  }
+}
--- a/services/gitlab/gitlab-license.tester.js
+++ b/services/gitlab/gitlab-license.tester.js
@@ -0,0 +1,69 @@
+import { licenseToColor } from '../licenses.js'
+import { createServiceTester } from '../tester.js'
+import { noToken } from '../test-helpers.js'
+import _noGitLabToken from './gitlab-license.service.js'
+export const t = await createServiceTester()
+const noGitLabToken = noToken(_noGitLabToken)
+
+const publicDomainLicenseColor = licenseToColor('MIT License')
+const unknownLicenseColor = licenseToColor()
+
+t.create('License')
+  .get('/guoxudong.io/shields-test/licenced-test.json')
+  .expectBadge({
+    label: 'license',
+    message: 'MIT License',
+    color: `${publicDomainLicenseColor}`,
+  })
+
+t.create('License for repo without a license')
+  .get('/guoxudong.io/shields-test/no-license-test.json')
+  .expectBadge({
+    label: 'license',
+    message: 'not specified',
+    color: 'lightgrey',
+  })
+
+t.create('Other license').get('/gitlab-org/gitlab-foss.json').expectBadge({
+  label: 'license',
+  message: 'Other',
+  color: unknownLicenseColor,
+})
+
+t.create('License for unknown repo')
+  .get('/user1/gitlab-does-not-have-this-repo.json')
+  .expectBadge({
+    label: 'license',
+    message: 'repo not found',
+    color: 'red',
+  })
+
+t.create('Mocking License')
+  .get('/group/project.json')
+  .intercept(nock =>
+    nock('https://gitlab.com')
+      .get('/api/v4/projects/group%2Fproject?license=1')
+      .reply(200, {
+        license: {
+          key: 'apache-2.0',
+          name: 'Apache License 2.0',
+          nickname: '',
+          html_url: 'http://choosealicense.com/licenses/apache-2.0/',
+          source_url: '',
+        },
+      })
+  )
+  .expectBadge({
+    label: 'license',
+    message: 'Apache License 2.0',
+    color: unknownLicenseColor,
+  })
+
+t.create('License (private repo)')
+  .skipWhen(noGitLabToken)
+  .get('/shields-ops-group/test.json')
+  .expectBadge({
+    label: 'license',
+    message: 'MIT License',
+    color: `${publicDomainLicenseColor}`,
+  })
--- a/services/gitlab/gitlab-pipeline-status.service.js
+++ b/services/gitlab/gitlab-pipeline-status.service.js
@@ -54,7 +54,7 @@ class GitlabPipelineStatus extends BaseSvgScrapingService {
      documentation,
    },
    {
-      title: 'Gitlab pipeline status (self-hosted)',
+      title: 'Gitlab pipeline status (self-managed)',
      namedParams: { project: 'GNOME/pango' },
      queryParams: { gitlab_url: 'https://gitlab.gnome.org', branch: 'master' },
      staticPreview: this.render({ status: 'passed' }),
--- a/services/gitlab/gitlab-pipeline-status.tester.js
+++ b/services/gitlab/gitlab-pipeline-status.tester.js
@@ -15,7 +15,7 @@ t.create('Pipeline status')

 t.create('Pipeline status (nested groups)')
  .get(
-    '/pipeline-status/megabyte-labs/dockerfile/ci-pipeline/ansible-lint.json?branch=master'
+    '/pipeline-status/megabyte-labs/docker/ci-pipeline/ansible.json?branch=master'
  )
  .expectBadge({
    label: 'build',
--- a/services/gitlab/gitlab-release.service.js
+++ b/services/gitlab/gitlab-release.service.js
@@ -65,7 +65,7 @@ export default class GitLabRelease extends GitLabBase {
      staticPreview: renderVersionBadge({ version: 'v5.0.0-beta.1' }),
    },
    {
-      title: 'GitLab Release (custom instance)',
+      title: 'GitLab Release (self-managed)',
      namedParams: {
        project: 'GNOME/librsvg',
      },
--- a/services/gitlab/gitlab-release.spec.js
+++ b/services/gitlab/gitlab-release.spec.js
@@ -0,0 +1,48 @@
+import { expect } from 'chai'
+import nock from 'nock'
+import { cleanUpNockAfterEach, defaultContext } from '../test-helpers.js'
+import GitLabRelease from './gitlab-release.service.js'
+
+describe('GitLabRelease', function () {
+  describe('auth', function () {
+    cleanUpNockAfterEach()
+
+    const fakeToken = 'abc123'
+    const config = {
+      public: {
+        services: {
+          gitlab: {
+            authorizedOrigins: ['https://gitlab.com'],
+          },
+        },
+      },
+      private: {
+        gitlab_token: fakeToken,
+      },
+    }
+
+    it('sends the auth information as configured', async function () {
+      const scope = nock('https://gitlab.com/')
+        .get('/api/v4/projects/foo%2Fbar/releases?page=1')
+        // This ensures that the expected credentials are actually being sent with the HTTP request.
+        // Without this the request wouldn't match and the test would fail.
+        .matchHeader('Authorization', `Bearer ${fakeToken}`)
+        .reply(200, [{ name: '1.9', tag_name: '1.9' }])
+
+      expect(
+        await GitLabRelease.invoke(
+          defaultContext,
+          config,
+          { project: 'foo/bar' },
+          {}
+        )
+      ).to.deep.equal({
+        label: undefined,
+        message: 'v1.9',
+        color: 'blue',
+      })
+
+      scope.done()
+    })
+  })
+})
--- a/services/gitlab/gitlab-release.tester.js
+++ b/services/gitlab/gitlab-release.tester.js
@@ -36,7 +36,7 @@ t.create('Release (release display name)')
  .get('/gitlab-org/gitlab.json?display_name=release')
  .expectBadge({ label: 'release', message: isGitLabDisplayVersion })

-t.create('Release (custom instance')
+t.create('Release (custom instance)')
  .get('/GNOME/librsvg.json?gitlab_url=https://gitlab.gnome.org')
  .expectBadge({ label: 'release', message: isSemver, color: 'blue' })

--- a/services/gitlab/gitlab-tag.service.js
+++ b/services/gitlab/gitlab-tag.service.js
@@ -62,7 +62,7 @@ export default class GitlabTag extends GitLabBase {
      staticPreview: this.render({ version: 'v5.0.0-beta.1', sort: 'semver' }),
    },
    {
-      title: 'GitLab tag (custom instance)',
+      title: 'GitLab tag (self-managed)',
      namedParams: {
        project: 'GNOME/librsvg',
      },
--- a/services/gitlab/gitlab-tag.spec.js
+++ b/services/gitlab/gitlab-tag.spec.js
@@ -26,7 +26,7 @@ describe('GitLabTag', function () {
        .get('/api/v4/projects/foo%2Fbar/repository/tags?order_by=updated')
        // This ensures that the expected credentials are actually being sent with the HTTP request.
        // Without this the request wouldn't match and the test would fail.
-        .basicAuth({ user: '', pass: fakeToken })
+        .matchHeader('Authorization', `Bearer ${fakeToken}`)
        .reply(200, [{ name: '1.9' }])

      expect(
--- a/services/gitlab/gitlab-tag.tester.js
+++ b/services/gitlab/gitlab-tag.tester.js
@@ -7,7 +7,7 @@ t.create('Tag (latest by date)')
  .expectBadge({ label: 'tag', message: 'v2.0.0', color: 'blue' })

 t.create('Tag (nested groups)')
-  .get('/megabyte-labs/docker/ci-pipeline/ansible-lint.json')
+  .get('/megabyte-labs/docker/ci-pipeline/ansible.json')
  .expectBadge({ label: 'tag', message: isSemver, color: 'blue' })

 t.create('Tag (project id latest by date)')
--- a/services/greasyfork/greasyfork-base.js
+++ b/services/greasyfork/greasyfork-base.js
@@ -0,0 +1,24 @@
+import Joi from 'joi'
+import { nonNegativeInteger } from '../validators.js'
+import { BaseJsonService } from '../index.js'
+
+const schema = Joi.object({
+  daily_installs: nonNegativeInteger,
+  total_installs: nonNegativeInteger,
+  good_ratings: nonNegativeInteger,
+  ok_ratings: nonNegativeInteger,
+  bad_ratings: nonNegativeInteger,
+  version: Joi.string().required(),
+  license: Joi.string().allow(null).required(),
+}).required()
+
+export default class BaseGreasyForkService extends BaseJsonService {
+  static defaultBadgeData = { label: 'greasy fork' }
+
+  async fetch({ scriptId }) {
+    return this._requestJson({
+      schema,
+      url: `https://greasyfork.org/scripts/${scriptId}.json`,
+    })
+  }
+}
--- a/services/greasyfork/greasyfork-downloads.service.js
+++ b/services/greasyfork/greasyfork-downloads.service.js
@@ -0,0 +1,35 @@
+import { renderDownloadsBadge } from '../downloads.js'
+import BaseGreasyForkService from './greasyfork-base.js'
+
+export default class GreasyForkInstalls extends BaseGreasyForkService {
+  static category = 'downloads'
+  static route = { base: 'greasyfork', pattern: ':variant(dt|dd)/:scriptId' }
+
+  static examples = [
+    {
+      title: 'Greasy Fork',
+      pattern: 'dd/:scriptId',
+      namedParams: { scriptId: '407466' },
+      staticPreview: renderDownloadsBadge({ downloads: 17, interval: 'day' }),
+    },
+    {
+      title: 'Greasy Fork',
+      pattern: 'dt/:scriptId',
+      namedParams: { scriptId: '407466' },
+      staticPreview: renderDownloadsBadge({ downloads: 3420 }),
+    },
+  ]
+
+  static defaultBadgeData = { label: 'installs' }
+
+  async handle({ variant, scriptId }) {
+    const data = await this.fetch({ scriptId })
+    if (variant === 'dd') {
+      const downloads = data.daily_installs
+      const interval = 'day'
+      return renderDownloadsBadge({ downloads, interval })
+    }
+    const downloads = data.total_installs
+    return renderDownloadsBadge({ downloads })
+  }
+}
--- a/services/greasyfork/greasyfork-downloads.tester.js
+++ b/services/greasyfork/greasyfork-downloads.tester.js
@@ -0,0 +1,19 @@
+import { createServiceTester } from '../tester.js'
+import { isMetric, isMetricOverTimePeriod } from '../test-validators.js'
+export const t = await createServiceTester()
+
+t.create('Daily Installs')
+  .get('/dd/407466.json')
+  .expectBadge({ label: 'installs', message: isMetricOverTimePeriod })
+
+t.create('Daily Installs (not found)')
+  .get('/dd/000000.json')
+  .expectBadge({ label: 'installs', message: 'not found' })
+
+t.create('Total Installs')
+  .get('/dt/407466.json')
+  .expectBadge({ label: 'installs', message: isMetric })
+
+t.create('Total Installs (not found)')
+  .get('/dt/000000.json')
+  .expectBadge({ label: 'installs', message: 'not found' })
--- a/services/greasyfork/greasyfork-license.service.js
+++ b/services/greasyfork/greasyfork-license.service.js
@@ -0,0 +1,34 @@
+import { renderLicenseBadge } from '../licenses.js'
+import { InvalidResponse } from '../index.js'
+import BaseGreasyForkService from './greasyfork-base.js'
+
+export default class GreasyForkLicense extends BaseGreasyForkService {
+  static category = 'license'
+  static route = { base: 'greasyfork', pattern: 'l/:scriptId' }
+
+  static examples = [
+    {
+      title: 'Greasy Fork',
+      namedParams: { scriptId: '407466' },
+      staticPreview: renderLicenseBadge({ licenses: ['MIT'] }),
+    },
+  ]
+
+  static defaultBadgeData = { label: 'license' }
+
+  transform({ data }) {
+    if (data.license === null) {
+      throw new InvalidResponse({
+        prettyMessage: 'license not found',
+      })
+    }
+    // remove suffix " License" from data.license
+    return { license: data.license.replace(/ License$/, '') }
+  }
+
+  async handle({ scriptId }) {
+    const data = await this.fetch({ scriptId })
+    const { license } = this.transform({ data })
+    return renderLicenseBadge({ licenses: [license] })
+  }
+}
--- a/services/greasyfork/greasyfork-license.tester.js
+++ b/services/greasyfork/greasyfork-license.tester.js
@@ -0,0 +1,11 @@
+import { createServiceTester } from '../tester.js'
+export const t = await createServiceTester()
+
+t.create('License (valid)').get('/l/407466.json').expectBadge({
+  label: 'license',
+  message: 'MIT',
+})
+
+t.create('License (not found)')
+  .get('/l/000000.json')
+  .expectBadge({ label: 'license', message: 'not found' })
--- a/services/greasyfork/greasyfork-version.service.js
+++ b/services/greasyfork/greasyfork-version.service.js
@@ -0,0 +1,20 @@
+import { renderVersionBadge } from '../version.js'
+import BaseGreasyForkService from './greasyfork-base.js'
+
+export default class GreasyForkVersion extends BaseGreasyForkService {
+  static category = 'version'
+  static route = { base: 'greasyfork', pattern: 'v/:scriptId' }
+
+  static examples = [
+    {
+      title: 'Greasy Fork',
+      namedParams: { scriptId: '407466' },
+      staticPreview: renderVersionBadge({ version: '3.9.3' }),
+    },
+  ]
+
+  async handle({ scriptId }) {
+    const data = await this.fetch({ scriptId })
+    return renderVersionBadge({ version: data.version })
+  }
+}
--- a/services/greasyfork/greasyfork-version.tester.js
+++ b/services/greasyfork/greasyfork-version.tester.js
@@ -0,0 +1,12 @@
+import { isVPlusDottedVersionAtLeastOne } from '../test-validators.js'
+import { createServiceTester } from '../tester.js'
+export const t = await createServiceTester()
+
+t.create('Version').get('/v/407466.json').expectBadge({
+  label: 'greasy fork',
+  message: isVPlusDottedVersionAtLeastOne,
+})
+
+t.create('Version (not found)')
+  .get('/v/000000.json')
+  .expectBadge({ label: 'greasy fork', message: 'not found' })
--- a/services/hexpm/hexpm.service.js
+++ b/services/hexpm/hexpm.service.js
@@ -1,7 +1,7 @@
 import Joi from 'joi'
 import { renderDownloadsBadge } from '../downloads.js'
-import { addv, maybePluralize } from '../text-formatters.js'
-import { version as versionColor } from '../color-formatters.js'
+import { maybePluralize } from '../text-formatters.js'
+import { renderVersionBadge } from '../version.js'
 import { BaseJsonService } from '../index.js'

 const hexSchema = Joi.object({
@@ -14,7 +14,8 @@ const hexSchema = Joi.object({
  meta: Joi.object({
    licenses: Joi.array().required(),
  }).required(),
-  latest_stable_version: Joi.string().required(),
+  latest_stable_version: Joi.string(),
+  latest_version: Joi.string().required(),
 }).required()

 class BaseHexPmService extends BaseJsonService {
@@ -84,12 +85,14 @@ class HexPmVersion extends BaseHexPmService {
  ]

  static render({ version }) {
-    return { message: addv(version), color: versionColor(version) }
+    return renderVersionBadge({ version })
  }

  async handle({ packageName }) {
    const json = await this.fetch({ packageName })
-    return this.constructor.render({ version: json.latest_stable_version })
+    return this.constructor.render({
+      version: json.latest_stable_version || json.latest_version,
+    })
  }
 }

--- a/services/hexpm/hexpm.tester.js
+++ b/services/hexpm/hexpm.tester.js
@@ -1,8 +1,10 @@
 import Joi from 'joi'
 import { ServiceTester } from '../tester.js'
-import { isMetric, isMetricOverTimePeriod } from '../test-validators.js'
-
-const isHexpmVersion = Joi.string().regex(/^v\d+.\d+.?\d?$/)
+import {
+  isMetric,
+  isMetricOverTimePeriod,
+  isVPlusDottedVersionNClausesWithOptionalSuffix,
+} from '../test-validators.js'

 export const t = new ServiceTester({ id: 'hexpm', title: 'Hex.pm' })

@@ -22,6 +24,7 @@ t.create('downloads (zero for period)')
      .reply(200, {
        downloads: { all: 100 }, // there is no 'day' key here
        latest_stable_version: '1.0',
+        latest_version: '1.0',
        meta: { licenses: ['MIT'] },
      })
  )
@@ -35,9 +38,26 @@ t.create('downloads (not found)')
  .get('/dt/this-package-does-not-exist.json')
  .expectBadge({ label: 'downloads', message: 'not found' })

-t.create('version')
-  .get('/v/cowboy.json')
-  .expectBadge({ label: 'hex', message: isHexpmVersion })
+t.create('version').get('/v/cowboy.json').expectBadge({
+  label: 'hex',
+  message: isVPlusDottedVersionNClausesWithOptionalSuffix,
+})
+
+t.create('version (no stable version)')
+  .get('/v/prima_opentelemetry_ex.json')
+  .intercept(nock =>
+    nock('https://hex.pm/')
+      .get('/api/packages/prima_opentelemetry_ex')
+      .reply(200, {
+        downloads: { all: 100 },
+        latest_version: '1.0.0-rc.3',
+        meta: { licenses: ['MIT'] },
+      })
+  )
+  .expectBadge({
+    label: 'hex',
+    message: isVPlusDottedVersionNClausesWithOptionalSuffix,
+  })

 t.create('version (not found)')
  .get('/v/this-package-does-not-exist.json')
@@ -57,6 +77,7 @@ t.create('license (multiple licenses)')
      .reply(200, {
        downloads: { all: 100 },
        latest_stable_version: '1.0',
+        latest_version: '1.0',
        meta: { licenses: ['GPLv2', 'MIT'] },
      })
  )
@@ -74,6 +95,7 @@ t.create('license (no license)')
      .reply(200, {
        downloads: { all: 100 },
        latest_stable_version: '1.0',
+        latest_version: '1.0',
        meta: { licenses: [] },
      })
  )
--- a/services/jitpack/jitpack-version.service.js
+++ b/services/jitpack/jitpack-version.service.js
@@ -31,7 +31,7 @@ export default class JitPackVersion extends BaseJsonService {
  static defaultBadgeData = { label: 'jitpack' }

  async fetch({ vcs, user, repo }) {
-    const url = `https://jitpack.io/api/builds/com.${vcs}.${user}/${repo}/latest`
+    const url = `https://jitpack.io/api/builds/com.${vcs}.${user}/${repo}/latestOk`

    return this._requestJson({
      schema,
--- a/Show More
+++ b/Show More