load and manage persisted tokens with scope support

allow github service classes to define scope requirements
support scoped and unscoped tokens in API Provider
2021-09-19 11:41:26 -05:00 · 2021-09-19 11:40:21 -05:00 · 2021-09-19 11:39:48 -05:00 · 2021-09-19 11:38:53 -05:00 · 2021-09-19 11:37:18 -05:00
851 changed files with 47684 additions and 48119 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -0,0 +1,359 @@
+version: 2
+
+main_steps: &main_steps
+  steps:
+    - checkout
+
+    - run:
+        name: Install dependencies
+        command: npm ci
+        environment:
+          # https://docs.cypress.io/guides/getting-started/installing-cypress.html#Skipping-installation
+          # We don't need to install the Cypress binary in jobs that aren't actually running Cypress.
+          CYPRESS_INSTALL_BINARY: 0
+
+    - run:
+        name: Linter
+        when: always
+        command: npm run lint
+
+    - run:
+        name: Core tests
+        when: always
+        environment:
+          mocha_reporter: mocha-junit-reporter
+          MOCHA_FILE: junit/core/results.xml
+        command: npm run test:core
+
+    - run:
+        name: Entrypoint tests
+        when: always
+        environment:
+          mocha_reporter: mocha-junit-reporter
+          MOCHA_FILE: junit/entrypoint/results.xml
+        command: npm run test:entrypoint
+
+    - store_test_results:
+        path: junit
+
+    - run:
+        name: 'Prettier check (quick fix: `npm run prettier`)'
+        when: always
+        command: npm run prettier:check
+
+integration_steps: &integration_steps
+  steps:
+    - checkout
+
+    - run:
+        name: Install dependencies
+        command: npm ci
+        environment:
+          CYPRESS_INSTALL_BINARY: 0
+
+    - run:
+        name: Integration tests
+        when: always
+        environment:
+          mocha_reporter: mocha-junit-reporter
+          MOCHA_FILE: junit/integration/results.xml
+        command: npm run test:integration
+
+    - store_test_results:
+        path: junit
+
+services_steps: &services_steps
+  steps:
+    - checkout
+
+    - run:
+        name: Install dependencies
+        command: npm ci
+        environment:
+          CYPRESS_INSTALL_BINARY: 0
+
+    - run:
+        name: Identify services tagged in the PR title
+        command: npm run test:services:pr:prepare
+
+    - run:
+        name: Run tests for tagged services
+        environment:
+          mocha_reporter: mocha-junit-reporter
+          MOCHA_FILE: junit/services/results.xml
+        command: RETRY_COUNT=3 npm run test:services:pr:run
+
+    - store_test_results:
+        path: junit
+
+package_steps: &package_steps
+  steps:
+    - checkout
+
+    - run:
+        name: Install node and npm
+        command: |
+          set +e
+          export NVM_DIR="/opt/circleci/.nvm"
+          [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
+          nvm install v14
+          nvm use v14
+          npm install -g npm
+
+    # Run the package tests on each currently supported node version. See:
+    # https://github.com/badges/shields/blob/master/badge-maker/README.md#node-version-support
+    # https://nodejs.org/en/about/releases/
+
+    - run:
+        environment:
+          mocha_reporter: mocha-junit-reporter
+          MOCHA_FILE: junit/badge-maker/v12/results.xml
+          NODE_VERSION: v12
+          CYPRESS_INSTALL_BINARY: 0
+        name: Run package tests on Node 12
+        command: scripts/run_package_tests.sh
+
+    - run:
+        environment:
+          mocha_reporter: mocha-junit-reporter
+          MOCHA_FILE: junit/badge-maker/v14/results.xml
+          NODE_VERSION: v14
+          CYPRESS_INSTALL_BINARY: 0
+        name: Run package tests on Node 14
+        command: scripts/run_package_tests.sh
+
+    - run:
+        environment:
+          mocha_reporter: mocha-junit-reporter
+          MOCHA_FILE: junit/badge-maker/v16/results.xml
+          NODE_VERSION: v16
+          CYPRESS_INSTALL_BINARY: 0
+        name: Run package tests on Node 16
+        command: scripts/run_package_tests.sh
+
+    - store_test_results:
+        path: junit
+
+jobs:
+  main:
+    docker:
+      - image: circleci/node:14
+
+    <<: *main_steps
+
+  main@node-16:
+    docker:
+      - image: circleci/node:16
+
+    <<: *main_steps
+
+  integration:
+    docker:
+      - image: circleci/node:14
+      - image: redis
+
+    <<: *integration_steps
+
+  integration@node-16:
+    docker:
+      - image: circleci/node:16
+      - image: redis
+
+    <<: *integration_steps
+
+  danger:
+    docker:
+      - image: circleci/node:14
+    steps:
+      - checkout
+
+      - run:
+          name: Install dependencies
+          command: npm ci
+          environment:
+            CYPRESS_INSTALL_BINARY: 0
+
+      - run:
+          name: Danger
+          when: always
+          environment:
+            # https://github.com/gatsbyjs/gatsby/pull/11555
+            NODE_ENV: test
+          command: npm run danger ci
+
+  frontend:
+    docker:
+      - image: circleci/node:14
+    steps:
+      - checkout
+
+      - run:
+          name: Install dependencies
+          command: npm ci
+          environment:
+            CYPRESS_INSTALL_BINARY: 0
+
+      - run:
+          name: Prepare frontend tests
+          command: npm run defs && npm run features
+
+      - run:
+          name: Check types
+          command: npm run check-types:frontend
+
+      - run:
+          name: Frontend unit tests
+          environment:
+            mocha_reporter: mocha-junit-reporter
+            MOCHA_FILE: junit/frontend/results.xml
+          when: always
+          command: npm run test:frontend
+
+      - store_test_results:
+          path: junit
+
+      - run:
+          name: Frontend build completes successfully
+          when: always
+          command: npm run build
+
+  package:
+    machine: true
+
+    <<: *package_steps
+
+  services:
+    docker:
+      - image: circleci/node:14
+
+    <<: *services_steps
+
+  services@node-16:
+    docker:
+      - image: circleci/node:16
+
+    <<: *services_steps
+
+  e2e:
+    docker:
+      - image: cypress/base:14.16.0
+    steps:
+      - checkout
+
+      - restore_cache:
+          name: Restore Cypress binary
+          keys:
+            - v2-cypress-dependencies-{{ checksum "package-lock.json" }}
+
+      - run:
+          name: Install dependencies
+          command: npm ci
+
+      - run:
+          name: Frontend build
+          command: GATSBY_BASE_URL=http://localhost:8080 npm run build
+
+      - run:
+          name: Run tests
+          environment:
+            CYPRESS_REPORTER: junit
+            MOCHA_FILE: junit/e2e/results.xml
+          command: npm run e2e-on-build
+
+      - store_test_results:
+          path: junit
+
+      - store_artifacts:
+          path: cypress/videos
+
+      - store_artifacts:
+          path: cypress/screenshots
+
+      - save_cache:
+          name: Cache Cypress binary
+          paths:
+            # https://docs.cypress.io/guides/getting-started/installing-cypress.html#Binary-cache
+            - ~/.cache/Cypress
+          key: v2-cypress-dependencies-{{ checksum "package-lock.json" }}
+
+workflows:
+  version: 2
+
+  on-commit:
+    jobs:
+      - main:
+          filters:
+            branches:
+              ignore: gh-pages
+      - main@node-16:
+          filters:
+            branches:
+              ignore: gh-pages
+      - integration@node-16:
+          filters:
+            branches:
+              ignore: gh-pages
+      - frontend:
+          filters:
+            branches:
+              ignore: gh-pages
+      - package:
+          filters:
+            branches:
+              ignore: gh-pages
+      - services:
+          filters:
+            branches:
+              ignore:
+                - master
+                - gh-pages
+      - services@node-16:
+          filters:
+            branches:
+              ignore:
+                - master
+                - gh-pages
+      - danger:
+          filters:
+            branches:
+              ignore:
+                - master
+                - gh-pages
+                - /dependabot\/.*/
+      - e2e:
+          filters:
+            branches:
+              ignore: gh-pages
+  # on-commit-with-cache:
+  #   jobs:
+  #     - npm-install:
+  #         filters:
+  #           branches:
+  #             ignore: gh-pages
+  #     - main:
+  #         requires:
+  #           - npm-install
+  #     - main@node-latest:
+  #         requires:
+  #           - npm-install
+  #     - frontend:
+  #         requires:
+  #           - npm-install
+  #     - services:
+  #         requires:
+  #           - npm-install
+  #         filters:
+  #           branches:
+  #             ignore: master
+  #     - services@node-latest:
+  #         requires:
+  #           - npm-install
+  #         filters:
+  #           branches:
+  #             ignore: master
+  #     - danger:
+  #         requires:
+  #           - npm-install
+  #         filters:
+  #           branches:
+  #             ignore: /dependabot\/.*/
--- a/.dockerignore
+++ b/.dockerignore
@@ -3,7 +3,6 @@ shields.env
 .git/
 .gitignore
 .vscode/
-fly.toml

 # Improve layer cacheability.
 Dockerfile
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -2,6 +2,7 @@ extends:
  - standard
  - standard-jsx
  - standard-react
+  - plugin:@typescript-eslint/recommended
  - prettier
  - eslint:recommended

@@ -17,13 +18,12 @@ settings:
  react:
    version: '16.8'
  jsdoc:
-    mode: typescript
+    mode: jsdoc

 plugins:
  - chai-friendly
  - jsdoc
  - mocha
-  - icedfrisby
  - no-extension-in-require
  - sort-class-members
  - import
@@ -35,34 +35,40 @@ overrides:
  # list of rules, even if they only apply to certain files. That way the
  # rules listed here are only ones which conflict.

-  - files:
-      - 'badge-maker/**/*.js'
-      - '**/*.cjs'
-    env:
-      node: true
-      es6: true
-
  - files:
      - '**/*.js'
      - '!frontend/**/*.js'
-      - '!badge-maker/**/*.js'
    env:
      node: true
      es6: true
+    rules:
+      no-console: 'off'
+      '@typescript-eslint/explicit-module-boundary-types': 'off'
+
+  - files:
+      - '**/*.@(ts|tsx)'
    parserOptions:
      sourceType: 'module'
    parser: '@typescript-eslint/parser'
    rules:
-      no-console: 'off'
+      # Argh.
+      '@typescript-eslint/explicit-function-return-type':
+        ['error', { 'allowExpressions': true }]
+      '@typescript-eslint/no-empty-function': 'error'
+      '@typescript-eslint/no-var-requires': 'error'
+      '@typescript-eslint/no-object-literal-type-assertion': 'off'
+      '@typescript-eslint/no-explicit-any': 'error'
+      '@typescript-eslint/ban-ts-ignore': 'off'
+      '@typescript-eslint/explicit-module-boundary-types': 'off'

  - files:
-      - '**/*.ts'
+      - core/**/*.ts
    parserOptions:
      sourceType: 'module'
    parser: '@typescript-eslint/parser'
-
  - files:
-      - 'frontend/**/*.js'
+      - gatsby-browser.js
+      - 'frontend/**/*.@(js|ts|tsx)'
    parserOptions:
      sourceType: 'module'
    env:
@@ -107,20 +113,21 @@ overrides:
      mocha: true
    rules:
      mocha/no-exclusive-tests: 'error'
-      mocha/no-skipped-tests: 'error'
      mocha/no-mocha-arrows: 'error'
      mocha/prefer-arrow-callback: 'error'

-  - files:
-      - 'services/**/*.tester.js'
-    rules:
-      icedfrisby/no-exclusive-tests: 'error'
-      icedfrisby/no-skipped-tests: 'error'
-
 rules:
  # Disable some rules from eslint:recommended.
  no-empty: ['error', { 'allowEmptyCatch': true }]

+  # Allow unused parameters. In callbacks, removing them seems to obscure
+  # what the functions are doing.
+  '@typescript-eslint/no-unused-vars': ['error', { 'args': 'none' }]
+  no-unused-vars: 'off'
+
+  '@typescript-eslint/no-var-requires': 'off'
+
+  '@typescript-eslint/no-use-before-define': 'error'
  no-use-before-define: 'off'

  # These should be disabled by eslint-config-prettier, but are not.
@@ -137,8 +144,6 @@ rules:
  func-style: ['error', 'declaration', { 'allowArrowFunctions': true }]
  new-cap: ['error', { 'capIsNew': true }]
  import/order: ['error', { 'newlines-between': 'never' }]
-  quotes:
-    ['error', 'single', { 'avoidEscape': true, 'allowTemplateLiterals': false }]

  # Account for destructuring responses from upstream services,
  # many of which do not follow camelcase
@@ -171,7 +176,7 @@ rules:
  jsdoc/check-tag-names: 'error'
  jsdoc/check-types: 'error'
  jsdoc/implements-on-classes: 'error'
-  jsdoc/tag-lines: ['error', 'any', { 'startLines': 1 }]
+  jsdoc/newline-after-description: 'error'
  jsdoc/require-param: 'error'
  jsdoc/require-param-description: 'error'
  jsdoc/require-param-name: 'error'
@@ -182,7 +187,11 @@ rules:
  jsdoc/require-returns-type: 'error'
  jsdoc/valid-types: 'error'

-  react/prop-types: 'off'
+  # Disable some from TypeScript.
+  '@typescript-eslint/camelcase': off
+  '@typescript-eslint/explicit-function-return-type': 'off'
+  '@typescript-eslint/no-empty-function': 'off'
+
  react/jsx-sort-props: 'error'
  react-hooks/rules-of-hooks: 'error'
  react-hooks/exhaustive-deps: 'error'
--- a/.github/ISSUE_TEMPLATE/2_Failing_service_test.md
+++ b/.github/ISSUE_TEMPLATE/2_Failing_service_test.md
@@ -22,7 +22,7 @@ labels: 'keep-service-tests-green'

 <!-- Provide a link to the failing test in CircleCI. -->

-:lady_beetle: **Stack trace**
+:beetle: **Stack trace**

 ```
 <!-- Provide the complete stack trace from the CircleCI test summary. -->
--- a/.github/ISSUE_TEMPLATE/3_Badge_request.md
+++ b/.github/ISSUE_TEMPLATE/3_Badge_request.md
@@ -0,0 +1,37 @@
+---
+name: 💡 Badge Request
+about: Ideas for new badges
+labels: 'service-badge'
+---
+
+:clipboard: **Description**
+
+<!--
+A clear and concise description of the new badge.
+
+- Which service is this badge for e.g: GitHub, Travis CI
+- What sort of information should this badge show?
+  Provide an example in plain text e.g: "version | v1.01" or as a static badge
+  (static badge generator can be found at https://shields.io)
+-->
+
+:link: **Data**
+
+<!--
+Where can we get the data from?
+
+- Is there a public API?
+- Does the API requires an API key?
+- Link to the API documentation.
+-->
+
+:microphone: **Motivation**
+
+<!--
+Please explain why this feature should be implemented and how it would be used.
+
+- What is the specific use case?
+-->
+
+<!-- Love Shields? Please consider donating $10 to sustain our activities:
+👉  https://opencollective.com/shields -->
--- a/.github/ISSUE_TEMPLATE/3_Badge_request.yml
+++ b/.github/ISSUE_TEMPLATE/3_Badge_request.yml
@@ -1,62 +0,0 @@
-name: '💡 Badge Request'
-description: Ideas for new badges
-labels: ['service-badge']
-body:
-  - type: markdown
-    attributes:
-      value: >
-        ## Ideas for new badges
-
-
-        This issue template is for suggesting new badges which
-        **fetch and display data from an upstream service**.
-        If your suggestion is for a static badge
-        (which shows the same information every time it is requested), it is
-        [already possible to make these](https://github.com/badges/shields/blob/master/doc/static-badges.md).
-        We don't add specific routes for badges which only show static information.
-
-  - type: textarea
-    id: description
-    attributes:
-      label: '📋 Description'
-      description: |
-        A clear and concise description of the new badge.
-
-        - Which service is this badge for e.g: GitHub, Travis CI
-        - What sort of information should this badge show?
-          Provide an example in plain text e.g: "version | v1.01" or as a static badge
-          (static badge generator can be found at https://shields.io/#your-badge )
-    validations:
-      required: true
-
-  - type: textarea
-    id: data
-    attributes:
-      label: '🔗 Data'
-      description: |
-        Where can we get the data from?
-
-        Please consider and cover details like:
-        - Is there a public API?
-        - Does the API require authentication or an API key?
-          If so, please review our documentation on [Badges Requiring Authentication](https://github.com/badges/shields/blob/master/doc/authentication.md)
-        - Link to the API documentation.
-    validations:
-      required: true
-
-  - type: textarea
-    id: motivation
-    attributes:
-      label: '🎤 Motivation'
-      description: |
-        Please explain why this feature should be implemented and how it would be used.
-
-        - What is the specific use case?
-    validations:
-      required: true
-
-  - type: markdown
-    attributes:
-      value: |
-        ## :heart: Love Shields?
-        Please consider donating $10 to sustain our activities: [https://opencollective.com/shields](https://opencollective.com/shields)
--- a/.github/actions/close-bot/action.yml
+++ b/.github/actions/close-bot/action.yml
@@ -8,5 +8,5 @@ inputs:
    description: 'The GITHUB_TOKEN secret'
    required: true
 runs:
-  using: 'node16'
+  using: 'node12'
  main: 'index.js'
--- a/.github/actions/close-bot/helpers.js
+++ b/.github/actions/close-bot/helpers.js
@@ -35,6 +35,7 @@ function allChangelogLinesAreVersionBump(changelogLines) {

 function isPointlessVersionBump(body) {
  const pointlessBumpLinks = [
+    'https://github.com/gatsbyjs/gatsby',
    'https://github.com/typescript-eslint/typescript-eslint',
  ]

@@ -55,12 +56,6 @@ function isPointlessVersionBump(body) {
      line => !line.startsWith('See <a href="https://conventionalcommits.org">')
    )
    .filter(line => !line.startsWith('<!--'))
-    .filter(
-      line =>
-        !line.startsWith(
-          '<p><a href="https://www.gatsbyjs.com/docs/reference/release-notes/'
-        )
-    )
  return allChangelogLinesAreVersionBump(changelogLines)
 }

--- a/.github/actions/close-bot/index.js
+++ b/.github/actions/close-bot/index.js
@@ -27,7 +27,7 @@ async function run() {
          state: 'closed',
        })

-        core.debug('Done.')
+        core.debug(`Done.`)
      }
    }
  } catch (error) {
--- a/.github/actions/close-bot/package-lock.json
+++ b/.github/actions/close-bot/package-lock.json
@@ -9,54 +9,50 @@
      "version": "0.0.0",
      "license": "CC0",
      "dependencies": {
-        "@actions/core": "^1.10.0",
-        "@actions/github": "^5.1.1"
+        "@actions/core": "^1.5.0",
+        "@actions/github": "^5.0.0"
      }
    },
    "node_modules/@actions/core": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.10.0.tgz",
-      "integrity": "sha512-2aZDDa3zrrZbP5ZYg159sNoLRb61nQ7awl5pSvIq5Qpj81vwDzdMRKzkWJGJuwVvWpvZKx7vspJALyvaaIQyug==",
-      "dependencies": {
-        "@actions/http-client": "^2.0.1",
-        "uuid": "^8.3.2"
-      }
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.5.0.tgz",
+      "integrity": "sha512-eDOLH1Nq9zh+PJlYLqEMkS/jLQxhksPNmUGNBHfa4G+tQmnIhzpctxmchETtVGyBOvXgOVVpYuE40+eS4cUnwQ=="
    },
    "node_modules/@actions/github": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/@actions/github/-/github-5.1.1.tgz",
-      "integrity": "sha512-Nk59rMDoJaV+mHCOJPXuvB1zIbomlKS0dmSIqPGxd0enAXBnOfn4VWF+CGtRCwXZG9Epa54tZA7VIRlJDS8A6g==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@actions/github/-/github-5.0.0.tgz",
+      "integrity": "sha512-QvE9eAAfEsS+yOOk0cylLBIO/d6WyWIOvsxxzdrPFaud39G6BOkUwScXZn1iBzQzHyu9SBkkLSWlohDWdsasAQ==",
      "dependencies": {
-        "@actions/http-client": "^2.0.1",
-        "@octokit/core": "^3.6.0",
-        "@octokit/plugin-paginate-rest": "^2.17.0",
-        "@octokit/plugin-rest-endpoint-methods": "^5.13.0"
+        "@actions/http-client": "^1.0.11",
+        "@octokit/core": "^3.4.0",
+        "@octokit/plugin-paginate-rest": "^2.13.3",
+        "@octokit/plugin-rest-endpoint-methods": "^5.1.1"
      }
    },
    "node_modules/@actions/http-client": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-2.0.1.tgz",
-      "integrity": "sha512-PIXiMVtz6VvyaRsGY268qvj57hXQEpsYogYOu2nrQhlf+XCGmZstmuZBbAybUl1nQGnvS1k1eEsQ69ZoD7xlSw==",
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-1.0.11.tgz",
+      "integrity": "sha512-VRYHGQV1rqnROJqdMvGUbY/Kn8vriQe/F9HR2AlYHzmKuM/p3kjNuXhmdBfcVgsvRWTz5C5XW5xvndZrVBuAYg==",
      "dependencies": {
-        "tunnel": "^0.0.6"
+        "tunnel": "0.0.6"
      }
    },
    "node_modules/@octokit/auth-token": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.5.0.tgz",
-      "integrity": "sha512-r5FVUJCOLl19AxiuZD2VRZ/ORjp/4IN98Of6YJoJOkY75CIBuYfmiNHGrDwXr+aLGG55igl9QrxX3hbiXlLb+g==",
+      "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==",
      "dependencies": {
        "@octokit/types": "^6.0.3"
      }
    },
    "node_modules/@octokit/core": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/@octokit/core/-/core-3.6.0.tgz",
-      "integrity": "sha512-7RKRKuA4xTjMhY+eG3jthb3hlZCsOwg3rztWh75Xc+ShDWOfDDATWbeZpAHBNRpm4Tv9WgBMOy1zEJYXG6NJ7Q==",
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/@octokit/core/-/core-3.4.0.tgz",
+      "integrity": "sha512-6/vlKPP8NF17cgYXqucdshWqmMZGXkuvtcrWCgU5NOI0Pl2GjlmZyWgBMrU8zJ3v2MJlM6++CiB45VKYmhiWWg==",
      "dependencies": {
        "@octokit/auth-token": "^2.4.4",
        "@octokit/graphql": "^4.5.8",
-        "@octokit/request": "^5.6.3",
+        "@octokit/request": "^5.4.12",
        "@octokit/request-error": "^2.0.5",
        "@octokit/types": "^6.0.3",
        "before-after-hook": "^2.2.0",
@@ -64,9 +60,9 @@
      }
    },
    "node_modules/@octokit/endpoint": {
-      "version": "6.0.12",
-      "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.12.tgz",
-      "integrity": "sha512-lF3puPwkQWGfkMClXb4k/eUT/nZKQfxinRWJrdZaJO85Dqwo/G0yOC434Jr2ojwafWJMYqFGFa5ms4jJUgujdA==",
+      "version": "6.0.11",
+      "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.11.tgz",
+      "integrity": "sha512-fUIPpx+pZyoLW4GCs3yMnlj2LfoXTWDUVPTC4V3MUEKZm48W+XYpeWSZCv+vYF1ZABUm2CqnDVf1sFtIYrj7KQ==",
      "dependencies": {
        "@octokit/types": "^6.0.3",
        "is-plain-object": "^5.0.0",
@@ -74,37 +70,37 @@
      }
    },
    "node_modules/@octokit/graphql": {
-      "version": "4.8.0",
-      "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-4.8.0.tgz",
-      "integrity": "sha512-0gv+qLSBLKF0z8TKaSKTsS39scVKF9dbMxJpj3U0vC7wjNWFuIpL/z76Qe2fiuCbDRcJSavkXsVtMS6/dtQQsg==",
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-4.6.2.tgz",
+      "integrity": "sha512-WmsIR1OzOr/3IqfG9JIczI8gMJUMzzyx5j0XXQ4YihHtKlQc+u35VpVoOXhlKAlaBntvry1WpAzPl/a+s3n89Q==",
      "dependencies": {
-        "@octokit/request": "^5.6.0",
+        "@octokit/request": "^5.3.0",
        "@octokit/types": "^6.0.3",
        "universal-user-agent": "^6.0.0"
      }
    },
    "node_modules/@octokit/openapi-types": {
-      "version": "11.2.0",
-      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-11.2.0.tgz",
-      "integrity": "sha512-PBsVO+15KSlGmiI8QAzaqvsNlZlrDlyAJYcrXBCvVUxCp7VnXjkwPoFHgjEJXx3WF9BAwkA6nfCUA7i9sODzKA=="
+      "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=="
    },
    "node_modules/@octokit/plugin-paginate-rest": {
-      "version": "2.17.0",
-      "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.17.0.tgz",
-      "integrity": "sha512-tzMbrbnam2Mt4AhuyCHvpRkS0oZ5MvwwcQPYGtMv4tUa5kkzG58SVB0fcsLulOZQeRnOgdkZWkRUiyBlh0Bkyw==",
+      "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==",
      "dependencies": {
-        "@octokit/types": "^6.34.0"
+        "@octokit/types": "^6.11.0"
      },
      "peerDependencies": {
        "@octokit/core": ">=2"
      }
    },
    "node_modules/@octokit/plugin-rest-endpoint-methods": {
-      "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==",
+      "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==",
      "dependencies": {
-        "@octokit/types": "^6.34.0",
+        "@octokit/types": "^6.14.1",
        "deprecation": "^2.3.1"
      },
      "peerDependencies": {
@@ -112,22 +108,22 @@
      }
    },
    "node_modules/@octokit/request": {
-      "version": "5.6.3",
-      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-5.6.3.tgz",
-      "integrity": "sha512-bFJl0I1KVc9jYTe9tdGGpAMPy32dLBXXo1dS/YwSCTL/2nd9XeHsY616RE3HPXDVk+a+dBuzyz5YdlXwcDTr2A==",
+      "version": "5.4.15",
+      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-5.4.15.tgz",
+      "integrity": "sha512-6UnZfZzLwNhdLRreOtTkT9n57ZwulCve8q3IT/Z477vThu6snfdkBuhxnChpOKNGxcQ71ow561Qoa6uqLdPtag==",
      "dependencies": {
        "@octokit/endpoint": "^6.0.1",
-        "@octokit/request-error": "^2.1.0",
-        "@octokit/types": "^6.16.1",
+        "@octokit/request-error": "^2.0.0",
+        "@octokit/types": "^6.7.1",
        "is-plain-object": "^5.0.0",
-        "node-fetch": "^2.6.7",
+        "node-fetch": "^2.6.1",
        "universal-user-agent": "^6.0.0"
      }
    },
    "node_modules/@octokit/request-error": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.1.0.tgz",
-      "integrity": "sha512-1VIvgXxs9WHSjicsRwq8PlR2LR2x6DwsJAaFgzdi0JfJoGSO8mYI/cHJQ+9FbN21aa+DrgNLnwObmyeSC8Rmpg==",
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.0.5.tgz",
+      "integrity": "sha512-T/2wcCFyM7SkXzNoyVNWjyVlUwBvW3igM3Btr/eKYiPmucXTtkxt2RBsf6gn3LTzaLSLTQtNmvg+dGsOxQrjZg==",
      "dependencies": {
        "@octokit/types": "^6.0.3",
        "deprecation": "^2.0.0",
@@ -135,17 +131,17 @@
      }
    },
    "node_modules/@octokit/types": {
-      "version": "6.34.0",
-      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-6.34.0.tgz",
-      "integrity": "sha512-s1zLBjWhdEI2zwaoSgyOFoKSl109CUcVBCc7biPJ3aAf6LGLU6szDvi31JPU7bxfla2lqfhjbbg/5DdFNxOwHw==",
+      "version": "6.14.2",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-6.14.2.tgz",
+      "integrity": "sha512-wiQtW9ZSy4OvgQ09iQOdyXYNN60GqjCL/UdMsepDr1Gr0QzpW6irIKbH3REuAHXAhxkEk9/F2a3Gcs1P6kW5jA==",
      "dependencies": {
-        "@octokit/openapi-types": "^11.2.0"
+        "@octokit/openapi-types": "^7.0.0"
      }
    },
    "node_modules/before-after-hook": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.2.2.tgz",
-      "integrity": "sha512-3pZEU3NT5BFUo/AD5ERPWOgQOCZITni6iavr5AUw5AUwQjMlI0kzu5btnyD39AF0gUEsDPwJT+oY1ORBJijPjQ=="
+      "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=="
    },
    "node_modules/deprecation": {
      "version": "2.3.1",
@@ -161,22 +157,11 @@
      }
    },
    "node_modules/node-fetch": {
-      "version": "2.6.7",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
-      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
-      "dependencies": {
-        "whatwg-url": "^5.0.0"
-      },
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
+      "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==",
      "engines": {
        "node": "4.x || >=6.0.0"
-      },
-      "peerDependencies": {
-        "encoding": "^0.1.0"
-      },
-      "peerDependenciesMeta": {
-        "encoding": {
-          "optional": true
-        }
      }
    },
    "node_modules/once": {
@@ -187,11 +172,6 @@
        "wrappy": "1"
      }
    },
-    "node_modules/tr46": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-      "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o="
-    },
    "node_modules/tunnel": {
      "version": "0.0.6",
      "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz",
@@ -205,28 +185,6 @@
      "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.0.tgz",
      "integrity": "sha512-isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w=="
    },
-    "node_modules/uuid": {
-      "version": "8.3.2",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
-      "bin": {
-        "uuid": "dist/bin/uuid"
-      }
-    },
-    "node_modules/webidl-conversions": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-      "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE="
-    },
-    "node_modules/whatwg-url": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-      "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=",
-      "dependencies": {
-        "tr46": "~0.0.3",
-        "webidl-conversions": "^3.0.0"
-      }
-    },
    "node_modules/wrappy": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
@@ -235,49 +193,45 @@
  },
  "dependencies": {
    "@actions/core": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.10.0.tgz",
-      "integrity": "sha512-2aZDDa3zrrZbP5ZYg159sNoLRb61nQ7awl5pSvIq5Qpj81vwDzdMRKzkWJGJuwVvWpvZKx7vspJALyvaaIQyug==",
-      "requires": {
-        "@actions/http-client": "^2.0.1",
-        "uuid": "^8.3.2"
-      }
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.5.0.tgz",
+      "integrity": "sha512-eDOLH1Nq9zh+PJlYLqEMkS/jLQxhksPNmUGNBHfa4G+tQmnIhzpctxmchETtVGyBOvXgOVVpYuE40+eS4cUnwQ=="
    },
    "@actions/github": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/@actions/github/-/github-5.1.1.tgz",
-      "integrity": "sha512-Nk59rMDoJaV+mHCOJPXuvB1zIbomlKS0dmSIqPGxd0enAXBnOfn4VWF+CGtRCwXZG9Epa54tZA7VIRlJDS8A6g==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@actions/github/-/github-5.0.0.tgz",
+      "integrity": "sha512-QvE9eAAfEsS+yOOk0cylLBIO/d6WyWIOvsxxzdrPFaud39G6BOkUwScXZn1iBzQzHyu9SBkkLSWlohDWdsasAQ==",
      "requires": {
-        "@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": "^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": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-2.0.1.tgz",
-      "integrity": "sha512-PIXiMVtz6VvyaRsGY268qvj57hXQEpsYogYOu2nrQhlf+XCGmZstmuZBbAybUl1nQGnvS1k1eEsQ69ZoD7xlSw==",
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-1.0.11.tgz",
+      "integrity": "sha512-VRYHGQV1rqnROJqdMvGUbY/Kn8vriQe/F9HR2AlYHzmKuM/p3kjNuXhmdBfcVgsvRWTz5C5XW5xvndZrVBuAYg==",
      "requires": {
-        "tunnel": "^0.0.6"
+        "tunnel": "0.0.6"
      }
    },
    "@octokit/auth-token": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.5.0.tgz",
-      "integrity": "sha512-r5FVUJCOLl19AxiuZD2VRZ/ORjp/4IN98Of6YJoJOkY75CIBuYfmiNHGrDwXr+aLGG55igl9QrxX3hbiXlLb+g==",
+      "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==",
      "requires": {
        "@octokit/types": "^6.0.3"
      }
    },
    "@octokit/core": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/@octokit/core/-/core-3.6.0.tgz",
-      "integrity": "sha512-7RKRKuA4xTjMhY+eG3jthb3hlZCsOwg3rztWh75Xc+ShDWOfDDATWbeZpAHBNRpm4Tv9WgBMOy1zEJYXG6NJ7Q==",
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/@octokit/core/-/core-3.4.0.tgz",
+      "integrity": "sha512-6/vlKPP8NF17cgYXqucdshWqmMZGXkuvtcrWCgU5NOI0Pl2GjlmZyWgBMrU8zJ3v2MJlM6++CiB45VKYmhiWWg==",
      "requires": {
        "@octokit/auth-token": "^2.4.4",
        "@octokit/graphql": "^4.5.8",
-        "@octokit/request": "^5.6.3",
+        "@octokit/request": "^5.4.12",
        "@octokit/request-error": "^2.0.5",
        "@octokit/types": "^6.0.3",
        "before-after-hook": "^2.2.0",
@@ -285,9 +239,9 @@
      }
    },
    "@octokit/endpoint": {
-      "version": "6.0.12",
-      "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.12.tgz",
-      "integrity": "sha512-lF3puPwkQWGfkMClXb4k/eUT/nZKQfxinRWJrdZaJO85Dqwo/G0yOC434Jr2ojwafWJMYqFGFa5ms4jJUgujdA==",
+      "version": "6.0.11",
+      "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.11.tgz",
+      "integrity": "sha512-fUIPpx+pZyoLW4GCs3yMnlj2LfoXTWDUVPTC4V3MUEKZm48W+XYpeWSZCv+vYF1ZABUm2CqnDVf1sFtIYrj7KQ==",
      "requires": {
        "@octokit/types": "^6.0.3",
        "is-plain-object": "^5.0.0",
@@ -295,54 +249,54 @@
      }
    },
    "@octokit/graphql": {
-      "version": "4.8.0",
-      "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-4.8.0.tgz",
-      "integrity": "sha512-0gv+qLSBLKF0z8TKaSKTsS39scVKF9dbMxJpj3U0vC7wjNWFuIpL/z76Qe2fiuCbDRcJSavkXsVtMS6/dtQQsg==",
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-4.6.2.tgz",
+      "integrity": "sha512-WmsIR1OzOr/3IqfG9JIczI8gMJUMzzyx5j0XXQ4YihHtKlQc+u35VpVoOXhlKAlaBntvry1WpAzPl/a+s3n89Q==",
      "requires": {
-        "@octokit/request": "^5.6.0",
+        "@octokit/request": "^5.3.0",
        "@octokit/types": "^6.0.3",
        "universal-user-agent": "^6.0.0"
      }
    },
    "@octokit/openapi-types": {
-      "version": "11.2.0",
-      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-11.2.0.tgz",
-      "integrity": "sha512-PBsVO+15KSlGmiI8QAzaqvsNlZlrDlyAJYcrXBCvVUxCp7VnXjkwPoFHgjEJXx3WF9BAwkA6nfCUA7i9sODzKA=="
+      "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=="
    },
    "@octokit/plugin-paginate-rest": {
-      "version": "2.17.0",
-      "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.17.0.tgz",
-      "integrity": "sha512-tzMbrbnam2Mt4AhuyCHvpRkS0oZ5MvwwcQPYGtMv4tUa5kkzG58SVB0fcsLulOZQeRnOgdkZWkRUiyBlh0Bkyw==",
+      "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==",
      "requires": {
-        "@octokit/types": "^6.34.0"
+        "@octokit/types": "^6.11.0"
      }
    },
    "@octokit/plugin-rest-endpoint-methods": {
-      "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==",
+      "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==",
      "requires": {
-        "@octokit/types": "^6.34.0",
+        "@octokit/types": "^6.14.1",
        "deprecation": "^2.3.1"
      }
    },
    "@octokit/request": {
-      "version": "5.6.3",
-      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-5.6.3.tgz",
-      "integrity": "sha512-bFJl0I1KVc9jYTe9tdGGpAMPy32dLBXXo1dS/YwSCTL/2nd9XeHsY616RE3HPXDVk+a+dBuzyz5YdlXwcDTr2A==",
+      "version": "5.4.15",
+      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-5.4.15.tgz",
+      "integrity": "sha512-6UnZfZzLwNhdLRreOtTkT9n57ZwulCve8q3IT/Z477vThu6snfdkBuhxnChpOKNGxcQ71ow561Qoa6uqLdPtag==",
      "requires": {
        "@octokit/endpoint": "^6.0.1",
-        "@octokit/request-error": "^2.1.0",
-        "@octokit/types": "^6.16.1",
+        "@octokit/request-error": "^2.0.0",
+        "@octokit/types": "^6.7.1",
        "is-plain-object": "^5.0.0",
-        "node-fetch": "^2.6.7",
+        "node-fetch": "^2.6.1",
        "universal-user-agent": "^6.0.0"
      }
    },
    "@octokit/request-error": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.1.0.tgz",
-      "integrity": "sha512-1VIvgXxs9WHSjicsRwq8PlR2LR2x6DwsJAaFgzdi0JfJoGSO8mYI/cHJQ+9FbN21aa+DrgNLnwObmyeSC8Rmpg==",
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.0.5.tgz",
+      "integrity": "sha512-T/2wcCFyM7SkXzNoyVNWjyVlUwBvW3igM3Btr/eKYiPmucXTtkxt2RBsf6gn3LTzaLSLTQtNmvg+dGsOxQrjZg==",
      "requires": {
        "@octokit/types": "^6.0.3",
        "deprecation": "^2.0.0",
@@ -350,17 +304,17 @@
      }
    },
    "@octokit/types": {
-      "version": "6.34.0",
-      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-6.34.0.tgz",
-      "integrity": "sha512-s1zLBjWhdEI2zwaoSgyOFoKSl109CUcVBCc7biPJ3aAf6LGLU6szDvi31JPU7bxfla2lqfhjbbg/5DdFNxOwHw==",
+      "version": "6.14.2",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-6.14.2.tgz",
+      "integrity": "sha512-wiQtW9ZSy4OvgQ09iQOdyXYNN60GqjCL/UdMsepDr1Gr0QzpW6irIKbH3REuAHXAhxkEk9/F2a3Gcs1P6kW5jA==",
      "requires": {
-        "@octokit/openapi-types": "^11.2.0"
+        "@octokit/openapi-types": "^7.0.0"
      }
    },
    "before-after-hook": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.2.2.tgz",
-      "integrity": "sha512-3pZEU3NT5BFUo/AD5ERPWOgQOCZITni6iavr5AUw5AUwQjMlI0kzu5btnyD39AF0gUEsDPwJT+oY1ORBJijPjQ=="
+      "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=="
    },
    "deprecation": {
      "version": "2.3.1",
@@ -373,12 +327,9 @@
      "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q=="
    },
    "node-fetch": {
-      "version": "2.6.7",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
-      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
-      "requires": {
-        "whatwg-url": "^5.0.0"
-      }
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
+      "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw=="
    },
    "once": {
      "version": "1.4.0",
@@ -388,11 +339,6 @@
        "wrappy": "1"
      }
    },
-    "tr46": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-      "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o="
-    },
    "tunnel": {
      "version": "0.0.6",
      "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz",
@@ -403,25 +349,6 @@
      "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.0.tgz",
      "integrity": "sha512-isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w=="
    },
-    "uuid": {
-      "version": "8.3.2",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="
-    },
-    "webidl-conversions": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-      "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE="
-    },
-    "whatwg-url": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-      "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=",
-      "requires": {
-        "tr46": "~0.0.3",
-        "webidl-conversions": "^3.0.0"
-      }
-    },
    "wrappy": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
--- a/.github/actions/close-bot/package.json
+++ b/.github/actions/close-bot/package.json
@@ -10,7 +10,7 @@
  "author": "chris48s",
  "license": "CC0",
  "dependencies": {
-    "@actions/core": "^1.10.0",
-    "@actions/github": "^5.1.1"
+    "@actions/core": "^1.5.0",
+    "@actions/github": "^5.0.0"
  }
 }
--- a/.github/actions/core-tests/action.yml
+++ b/.github/actions/core-tests/action.yml
@@ -1,21 +0,0 @@
-name: 'Core tests'
-description: 'Run core and entrypoint tests'
-runs:
-  using: 'composite'
-  steps:
-    - name: Core tests
-      if: always()
-      run: npm run test:core -- --reporter json --reporter-option 'output=reports/core.json'
-      shell: bash
-
-    - name: Entrypoint tests
-      if: always()
-      run: npm run test:entrypoint -- --reporter json --reporter-option 'output=reports/entrypoint.json'
-      shell: bash
-
-    - name: Write Markdown Summary
-      if: always()
-      run: |
-        node scripts/mocha2md.js Core reports/core.json >> $GITHUB_STEP_SUMMARY
-        node scripts/mocha2md.js Entrypoint reports/entrypoint.json >> $GITHUB_STEP_SUMMARY
-      shell: bash
--- a/.github/actions/integration-tests/action.yml
+++ b/.github/actions/integration-tests/action.yml
@@ -1,28 +0,0 @@
-name: 'Integration tests'
-description: 'Run integration tests'
-inputs:
-  github-token:
-    description: 'The GITHUB_TOKEN secret'
-    required: true
-runs:
-  using: 'composite'
-  steps:
-    - name: Migrate DB
-      if: always()
-      run: npm run migrate up
-      env:
-        POSTGRES_URL: postgresql://postgres:postgres@localhost:5432/ci_test
-      shell: bash
-
-    - name: Integration Tests
-      if: always()
-      run: npm run test:integration -- --reporter json --reporter-option 'output=reports/integration-tests.json'
-      env:
-        GH_TOKEN: '${{ inputs.github-token }}'
-        POSTGRES_URL: postgresql://postgres:postgres@localhost:5432/ci_test
-      shell: bash
-
-    - name: Write Markdown Summary
-      if: always()
-      run: node scripts/mocha2md.js Integration reports/integration-tests.json >> $GITHUB_STEP_SUMMARY
-      shell: bash
--- a/.github/actions/package-tests/action.yml
+++ b/.github/actions/package-tests/action.yml
@@ -1,26 +0,0 @@
-name: 'Package tests'
-description: 'Run package tests and check types'
-runs:
-  using: 'composite'
-  steps:
-    - name: Tests
-      if: always()
-      run: npm run test:package -- --reporter json --reporter-option 'output=reports/package-tests.json'
-      shell: bash
-
-    - name: Type Checks
-      if: always()
-      run: |
-        set -o pipefail
-        npm run check-types:package 2>&1 | tee reports/package-types.txt
-      shell: bash
-
-    - name: Write Markdown Summary
-      if: always()
-      run: |
-        node scripts/mocha2md.js 'Package Tests' reports/package-tests.json >> $GITHUB_STEP_SUMMARY
-        echo '# Package Types' >> $GITHUB_STEP_SUMMARY
-        echo '```' >> $GITHUB_STEP_SUMMARY
-        cat reports/package-types.txt >> $GITHUB_STEP_SUMMARY
-        echo '```' >> $GITHUB_STEP_SUMMARY
-      shell: bash
--- a/.github/actions/service-tests/action.yml
+++ b/.github/actions/service-tests/action.yml
@@ -1,86 +0,0 @@
-name: 'Service tests'
-description: 'Run tests for selected services'
-inputs:
-  github-token:
-    description: 'The GITHUB_TOKEN secret'
-    required: true
-  librariesio-tokens:
-    description: 'The SERVICETESTS_LIBRARIESIO_TOKENS secret'
-    required: false
-    default: ''
-  obs-user:
-    description: 'The SERVICETESTS_OBS_USER secret'
-    required: false
-    default: ''
-  obs-pass:
-    description: 'The SERVICETESTS_OBS_PASS secret'
-    required: false
-    default: ''
-  sl-insight-user-uuid:
-    description: 'The SERVICETESTS_SL_INSIGHT_USER_UUID secret'
-    required: false
-    default: ''
-  sl-insight-api-token:
-    description: 'The SERVICETESTS_SL_INSIGHT_API_TOKEN secret'
-    required: false
-    default: ''
-  twitch-client-id:
-    description: 'The SERVICETESTS_TWITCH_CLIENT_ID secret'
-    required: false
-    default: ''
-  twitch-client-secret:
-    description: 'The SERVICETESTS_TWITCH_CLIENT_SECRET secret'
-    required: false
-    default: ''
-  wheelmap-token:
-    description: 'The SERVICETESTS_WHEELMAP_TOKEN secret'
-    required: false
-    default: ''
-  youtube-api-key:
-    description: 'The SERVICETESTS_YOUTUBE_API_KEY secret'
-    required: false
-    default: ''
-
-runs:
-  using: 'composite'
-  steps:
-    - name: Derive list of service tests to run
-      # Note: In this step we are using an intermediate env var instead of
-      # passing github.event.pull_request.title as an argument
-      # to prevent a shell injection attack. Further reading:
-      # https://securitylab.github.com/research/github-actions-untrusted-input/#exploitability-and-impact
-      # https://securitylab.github.com/research/github-actions-untrusted-input/#remediation
-      if: always()
-      env:
-        TITLE: ${{ github.event.pull_request.title }}
-      run: npm run test:services:pr:prepare "$TITLE"
-      shell: bash
-
-    - name: Run service tests
-      if: always()
-      run: npm run test:services:pr:run -- --reporter json --reporter-option 'output=reports/service-tests.json'
-      shell: bash
-      env:
-        RETRY_COUNT: 3
-        GH_TOKEN: '${{ inputs.github-token }}'
-        LIBRARIESIO_TOKENS: '${{ inputs.librariesio-tokens }}'
-        OBS_USER: '${{ inputs.obs-user }}'
-        OBS_PASS: '${{ inputs.obs-pass }}'
-        SL_INSIGHT_USER_UUID: '${{ inputs.sl-insight-user-uuid }}'
-        SL_INSIGHT_API_TOKEN: '${{ inputs.sl-insight-api-token }}'
-        TWITCH_CLIENT_ID: '${{ inputs.twitch-client-id }}'
-        TWITCH_CLIENT_SECRET: '${{ inputs.twitch-client-secret }}'
-        WHEELMAP_TOKEN: '${{ inputs.wheelmap-token }}'
-        YOUTUBE_API_KEY: '${{ inputs.youtube-api-key }}'
-
-    - name: Write Markdown Summary
-      if: always()
-      run: |
-        if test -f 'reports/service-tests.json'; then
-          echo '# Services' >> $GITHUB_STEP_SUMMARY
-          sed -e 's/^/- /' pull-request-services.log >> $GITHUB_STEP_SUMMARY
-          node scripts/mocha2md.js Report reports/service-tests.json >> $GITHUB_STEP_SUMMARY
-        else
-          echo 'No services found. Nothing to do.' >> $GITHUB_STEP_SUMMARY
-        fi
-      shell: bash
--- a/.github/actions/setup/action.yml
+++ b/.github/actions/setup/action.yml
@@ -1,36 +0,0 @@
-name: 'Set up project'
-description: 'Set up project'
-inputs:
-  node-version:
-    description: 'Version Spec of the version to use. Examples: 12.x, 10.15.1, >=10.15.0.'
-    required: true
-  cypress:
-    description: 'Install Cypress binary (boolean)'
-    type: boolean
-    # https://docs.cypress.io/guides/getting-started/installing-cypress.html#Skipping-installation
-    # We don't need to install the Cypress binary in jobs that aren't actually running Cypress.
-    required: false
-    default: false
-runs:
-  using: 'composite'
-  steps:
-    - name: Install Node JS ${{ inputs.node-version }}
-      uses: actions/setup-node@v3
-      with:
-        node-version: ${{ inputs.node-version }}
-
-    - name: Install dependencies
-      if: ${{ inputs.cypress == 'false' }}
-      env:
-        CYPRESS_INSTALL_BINARY: 0
-      run: |
-        echo "skipping cypress binary"
-        npm ci
-      shell: bash
-
-    - name: Install dependencies (including cypress binary)
-      if: ${{ inputs.cypress == 'true' }}
-      run: |
-        echo "installing cypress binary"
-        npm ci
-      shell: bash
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -8,17 +8,6 @@ updates:
      day: friday
      time: '12:00'
    open-pull-requests-limit: 99
-    rebase-strategy: disabled
-    ignore:
-      # https://github.com/badges/shields/issues/7324
-      # https://github.com/badges/shields/issues/7447
-      # we're stuck with these versions until Safari is compatible with lookbehind regex syntax
-      # https://caniuse.com/js-regexp-lookbehind
-      - dependency-name: 'decamelize'
-      - dependency-name: 'humanize-string'
-
-      # https://github.com/badges/shields/pull/7288#issuecomment-974699240
-      - dependency-name: '@types/node'

  # badge-maker package dependencies
  - package-ecosystem: npm
@@ -28,7 +17,6 @@ updates:
      day: friday
      time: '12:00'
    open-pull-requests-limit: 99
-    rebase-strategy: disabled

  # close-bot package dependencies
  - package-ecosystem: npm
@@ -38,12 +26,3 @@ updates:
      day: friday
      time: '12:00'
    open-pull-requests-limit: 99
-    rebase-strategy: disabled
-
-  # GH actions
-  - package-ecosystem: 'github-actions'
-    directory: '/'
-    schedule:
-      interval: weekly
-    open-pull-requests-limit: 99
-    rebase-strategy: disabled
--- a/.github/scripts/cleanup-review-apps.sh
+++ b/.github/scripts/cleanup-review-apps.sh
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-set -euxo pipefail
-
-apps=$(flyctl apps list --json | jq -r .[].ID | grep -E "pr-[0-9]+-badges-shields") || exit 0
-
-for app in $apps
-do
-  flyctl apps destroy "$app" -y
-done
--- a/.github/scripts/deploy-review-app.sh
+++ b/.github/scripts/deploy-review-app.sh
@@ -1,34 +0,0 @@
-#!/bin/bash
-
-set -euxo pipefail
-
-app="pr-$PR_NUMBER-badges-shields"
-region="ewr"
-org="shields-io"
-
-# Get PR JSON from the API
-# This will fail if $PR_NUMBER is not a valid PR
-pr_json=$(curl --fail "https://api.github.com/repos/badges/shields/pulls/$PR_NUMBER")
-
-# Checkout the PR branch
-git config user.name "actions[bot]"
-git config user.email "actions@users.noreply.github.com"
-git fetch origin "pull/$PR_NUMBER/head:pr-$PR_NUMBER"
-git checkout "pr-$PR_NUMBER"
-
-# If the app does not already exist, create it
-if ! flyctl status --app "$app"; then
-  flyctl launch --no-deploy --copy-config --name "$app" --region "$region" --org "$org"
-  echo $SECRETS | tr " " "\n" | flyctl secrets import --app "$app"
-fi
-
-# Deploy
-flyctl deploy --app "$app" --region "$region"
-
-# Post a comment on the PR
-app_url=$(flyctl status --app "$app" --json | jq -r .Hostname)
-comment_url=$(echo "$pr_json" | jq .comments_url -r)
-curl "$comment_url" \
-    -X POST \
-    -H "Authorization: token $GITHUB_TOKEN" \
-    --data "{\"body\":\"🚀 Updated review app: https://$app_url\"}"
--- a/.github/workflows/auto-close.yml
+++ b/.github/workflows/auto-close.yml
@@ -1,18 +1,16 @@
 name: Auto close
-on:
-  pull_request_target:
-    types: [opened]
+on: pull_request_target

 permissions:
  pull-requests: write

 jobs:
-  auto-close:
+  build:
    runs-on: ubuntu-latest
    if: github.actor == 'dependabot[bot]'
    steps:
      - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2

      - 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
@@ -3,25 +3,18 @@ on:
  pull_request:

 jobs:
-  build-docker-image:
+  build:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2

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

      - name: Build
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v2
        with:
          context: .
          push: false
-          tags: ghcr.io/badges/shields:pr-validation
-          build-args: |
-            version=${{ env.SHORT_SHA }}
+          tags: shieldsio/shields:pr-validation
--- a/.github/workflows/cleanup-review-apps.yml
+++ b/.github/workflows/cleanup-review-apps.yml
@@ -1,24 +0,0 @@
-name: Cleanup Review Apps
-on:
-  schedule:
-    - cron: '0 7 * * *'
-    # At 07:00, daily
-  workflow_dispatch:
-
-jobs:
-  cleanup-review-apps:
-    runs-on: ubuntu-latest
-    environment: 'Review Apps'
-    steps:
-      - uses: actions/checkout@v3
-      - uses: superfly/flyctl-actions/setup-flyctl@master
-
-      - name: install jq
-        run: |
-          sudo apt-get -qq update
-          sudo apt-get install -y jq
-
-      - run: .github/scripts/cleanup-review-apps.sh
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}
--- a/.github/workflows/create-release.yml
+++ b/.github/workflows/create-release.yml
@@ -4,10 +4,6 @@ on:
  pull_request:
    types: [closed]

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

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

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

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

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

      - name: Build and push snapshot release to DockerHub
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v2
        with:
          context: .
          push: true
          tags: shieldsio/shields:server-${{ steps.date.outputs.date }}
-          build-args: |
-            version=server-${{ steps.date.outputs.date }}
-
-      - name: Login to GHCR
-        uses: docker/login-action@v2
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build and push snapshot release to GHCR
-        uses: docker/build-push-action@v4
-        with:
-          context: .
-          push: true
-          tags: ghcr.io/badges/shields:server-${{ steps.date.outputs.date }}
-          build-args: |
-            version=server-${{ steps.date.outputs.date }}
--- a/.github/workflows/danger.yml
+++ b/.github/workflows/danger.yml
@@ -1,29 +0,0 @@
-name: Danger
-on:
-  pull_request_target:
-    types: [opened, reopened, synchronize]
-
-permissions:
-  checks: write
-  pull-requests: write
-  statuses: write
-
-jobs:
-  danger:
-    runs-on: ubuntu-latest
-    if: github.actor != 'dependabot[bot]' && github.actor != 'repo-ranger[bot]'
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Setup
-        uses: ./.github/actions/setup
-        with:
-          node-version: 16
-
-      - name: Danger
-        run: npm run danger ci
-        env:
-          # https://github.com/gatsbyjs/gatsby/pull/11555
-          NODE_ENV: test
-          GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
--- a/.github/workflows/deploy-docs.yml
+++ b/.github/workflows/deploy-docs.yml
@@ -3,30 +3,24 @@ on:
  push:
    branches:
      - master
-
-permissions:
-  contents: write
-
 jobs:
-  deploy-docs:
+  build-and-deploy:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2.3.1
        with:
          persist-credentials: false

-      - name: Setup
-        uses: ./.github/actions/setup
-        with:
-          node-version: 16
-
      - name: Build
-        run: npm run build-docs
+        run: |
+          npm ci
+          npm run build-docs

      - name: Deploy
-        uses: JamesIves/github-pages-deploy-action@v4
+        uses: JamesIves/github-pages-deploy-action@3.7.1
        with:
-          branch: gh-pages
-          folder: api-docs
-          clean: true
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          BRANCH: gh-pages
+          FOLDER: api-docs
+          CLEAN: true
--- a/.github/workflows/deploy-review-app.yml
+++ b/.github/workflows/deploy-review-app.yml
@@ -1,43 +0,0 @@
-name: Create/Update Review App
-on:
-  workflow_dispatch:
-    inputs:
-      pr_number:
-        description: 'PR Number to deploy e.g: 1234'
-        required: true
-
-permissions:
-  pull-requests: write
-
-jobs:
-  deploy-review-app:
-    runs-on: ubuntu-latest
-    environment: 'Review Apps'
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - uses: superfly/flyctl-actions/setup-flyctl@master
-
-      - name: install jq
-        run: |
-          sudo apt-get -qq update
-          sudo apt-get install -y jq
-
-      - run: .github/scripts/deploy-review-app.sh
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}
-          PR_NUMBER: ${{ github.event.inputs.pr_number }}
-          # credentials to set when we create the review app
-          SECRETS: |
-            GH_TOKEN=${{ secrets.GH_PAT }}
-            LIBRARIESIO_TOKENS=${{ secrets.SERVICETESTS_LIBRARIESIO_TOKENS }}
-            OBS_USER=${{ secrets.SERVICETESTS_OBS_USER }}
-            OBS_PASS=${{ secrets.SERVICETESTS_OBS_PASS }}
-            SL_INSIGHT_API_TOKEN=${{ secrets.SERVICETESTS_SL_INSIGHT_USER_UUID }}
-            SL_INSIGHT_USER_UUID=${{ secrets.SERVICETESTS_SL_INSIGHT_API_TOKEN }}
-            TWITCH_CLIENT_ID=${{ secrets.SERVICETESTS_TWITCH_CLIENT_ID }}
-            TWITCH_CLIENT_SECRET=${{ secrets.SERVICETESTS_TWITCH_CLIENT_SECRET }}
-            WHEELMAP_TOKEN=${{ secrets.SERVICETESTS_WHEELMAP_TOKEN }}
-            YOUTUBE_API_KEY=${{ secrets.SERVICETESTS_YOUTUBE_API_KEY }}
--- a/.github/workflows/draft-release.yml
+++ b/.github/workflows/draft-release.yml
@@ -5,16 +5,12 @@ on:
    # At 01:00 on the first day of every month
  workflow_dispatch:

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

      - name: Draft Release
        uses: ./.github/actions/draft-release
--- a/.github/workflows/enforce-dependency-review.yml
+++ b/.github/workflows/enforce-dependency-review.yml
@@ -1,13 +0,0 @@
-name: 'Dependency Review'
-on:
-  pull_request:
-    types: [opened, reopened, synchronize]
-
-jobs:
-  enforce-dependency-review:
-    runs-on: ubuntu-latest
-    steps:
-      - name: 'Checkout Repository'
-        uses: actions/checkout@v3
-      - name: 'Dependency Review'
-        uses: actions/dependency-review-action@v3
--- a/.github/workflows/publish-docker-next.yml
+++ b/.github/workflows/publish-docker-next.yml
@@ -4,51 +4,25 @@ on:
    branches:
      - master

-permissions:
-  packages: write
-
 jobs:
-  publish-docker-next:
+  build:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2

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

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

-      - name: Set Git Short SHA
-        run: echo "SHORT_SHA=${GITHUB_SHA::7}" >> $GITHUB_ENV
-
-      - name: Build and push to DockerHub
-        uses: docker/build-push-action@v4
+      - name: Build and push
+        uses: docker/build-push-action@v2
        with:
          context: .
          push: true
          tags: shieldsio/shields:next
-          build-args: |
-            version=${{ env.SHORT_SHA }}
-
-      - name: Login to GHCR
-        uses: docker/login-action@v2
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build and push to GHCR
-        uses: docker/build-push-action@v4
-        with:
-          context: .
-          push: true
-          tags: ghcr.io/badges/shields:next
-          build-args: |
-            version=${{ env.SHORT_SHA }}
--- a/.github/workflows/test-e2e.yml
+++ b/.github/workflows/test-e2e.yml
@@ -1,49 +0,0 @@
-name: E2E
-on:
-  pull_request:
-    types: [opened, reopened, synchronize]
-  push:
-    branches-ignore:
-      - 'gh-pages'
-      - 'dependabot/**'
-
-jobs:
-  test-e2e:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Cache Cypress binary
-        id: cache-cypress
-        uses: actions/cache@v3
-        env:
-          cache-name: cache-cypress
-        with:
-          path: ~/.cache/Cypress
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
-
-      - name: Setup
-        uses: ./.github/actions/setup
-        with:
-          node-version: 16
-          cypress: true
-
-      - name: Run tests
-        env:
-          GH_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
-        run: npm run e2e
-
-      - name: Archive videos
-        if: always()
-        uses: actions/upload-artifact@v3
-        with:
-          name: videos
-          path: cypress/videos
-
-      - name: Archive screenshots
-        if: always()
-        uses: actions/upload-artifact@v3
-        with:
-          name: screenshots
-          path: cypress/screenshots
--- a/.github/workflows/test-integration-18.yml
+++ b/.github/workflows/test-integration-18.yml
@@ -1,52 +0,0 @@
-name: Integration@node 18
-on:
-  pull_request:
-    types: [opened, reopened, synchronize]
-  push:
-    branches-ignore:
-      - 'gh-pages'
-      - 'dependabot/**'
-
-jobs:
-  test-integration-18:
-    runs-on: ubuntu-latest
-    env:
-      PAT_EXISTS: ${{ secrets.GH_PAT != '' }}
-
-    services:
-      postgres:
-        image: postgres
-        env:
-          POSTGRES_USER: postgres
-          POSTGRES_PASSWORD: postgres
-          POSTGRES_DB: ci_test
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-        ports:
-          - 5432:5432
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Setup
-        uses: ./.github/actions/setup
-        with:
-          node-version: 18
-        env:
-          NPM_CONFIG_ENGINE_STRICT: 'false'
-
-      - name: Integration Tests (with PAT)
-        if: ${{ env.PAT_EXISTS == 'true' }}
-        uses: ./.github/actions/integration-tests
-        with:
-          github-token: '${{ secrets.GH_PAT }}'
-
-      - name: Integration Tests (with workflow token)
-        if: ${{ env.PAT_EXISTS == 'false' }}
-        uses: ./.github/actions/integration-tests
-        with:
-          github-token: '${{ secrets.GITHUB_TOKEN }}'
--- a/.github/workflows/test-integration.yml
+++ b/.github/workflows/test-integration.yml
@@ -1,50 +0,0 @@
-name: Integration
-on:
-  pull_request:
-    types: [opened, reopened, synchronize]
-  push:
-    branches-ignore:
-      - 'gh-pages'
-      - 'dependabot/**'
-
-jobs:
-  test-integration:
-    runs-on: ubuntu-latest
-    env:
-      PAT_EXISTS: ${{ secrets.GH_PAT != '' }}
-
-    services:
-      postgres:
-        image: postgres
-        env:
-          POSTGRES_USER: postgres
-          POSTGRES_PASSWORD: postgres
-          POSTGRES_DB: ci_test
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-        ports:
-          - 5432:5432
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Setup
-        uses: ./.github/actions/setup
-        with:
-          node-version: 16
-
-      - name: Integration Tests (with PAT)
-        if: ${{ env.PAT_EXISTS == 'true' }}
-        uses: ./.github/actions/integration-tests
-        with:
-          github-token: '${{ secrets.GH_PAT }}'
-
-      - name: Integration Tests (with workflow token)
-        if: ${{ env.PAT_EXISTS == 'false' }}
-        uses: ./.github/actions/integration-tests
-        with:
-          github-token: '${{ secrets.GITHUB_TOKEN }}'
--- a/.github/workflows/test-lint.yml
+++ b/.github/workflows/test-lint.yml
@@ -1,28 +0,0 @@
-name: Lint
-on:
-  pull_request:
-    types: [opened, reopened, synchronize]
-  push:
-    branches-ignore:
-      - 'gh-pages'
-      - 'dependabot/**'
-
-jobs:
-  test-lint:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Setup
-        uses: ./.github/actions/setup
-        with:
-          node-version: 16
-
-      - name: ESLint
-        if: always()
-        run: npm run lint
-
-      - name: 'Prettier check (quick fix: `npm run prettier`)'
-        if: always()
-        run: npm run prettier:check
--- a/.github/workflows/test-main-18.yml
+++ b/.github/workflows/test-main-18.yml
@@ -1,25 +0,0 @@
-name: Main@node 18
-on:
-  pull_request:
-    types: [opened, reopened, synchronize]
-  push:
-    branches-ignore:
-      - 'gh-pages'
-      - 'dependabot/**'
-
-jobs:
-  test-main-18:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Setup
-        uses: ./.github/actions/setup
-        with:
-          node-version: 18
-        env:
-          NPM_CONFIG_ENGINE_STRICT: 'false'
-
-      - name: Core tests
-        uses: ./.github/actions/core-tests
--- a/.github/workflows/test-main.yml
+++ b/.github/workflows/test-main.yml
@@ -1,28 +0,0 @@
-name: Main
-on:
-  pull_request:
-    types: [opened, reopened, synchronize]
-  push:
-    branches-ignore:
-      - 'gh-pages'
-      - 'dependabot/**'
-
-jobs:
-  test-main:
-    strategy:
-      matrix:
-        os: ['ubuntu-latest', 'windows-latest']
-
-    runs-on: ${{ matrix.os }}
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Setup
-        uses: ./.github/actions/setup
-        with:
-          node-version: 16
-
-      - name: Core tests
-        uses: ./.github/actions/core-tests
--- a/.github/workflows/test-package-cli.yml
+++ b/.github/workflows/test-package-cli.yml
@@ -1,41 +0,0 @@
-name: Package CLI
-on:
-  pull_request:
-    types: [opened, reopened, synchronize]
-  push:
-    branches-ignore:
-      - 'gh-pages'
-      - 'dependabot/**'
-
-# Smoke test (render a badge with the CLI) with only the package
-# dependencies installed.
-
-jobs:
-  test-package-cli:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        include:
-          - node: '14'
-          - node: '16'
-          - node: '18'
-          - node: '20'
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Install Node JS ${{ inputs.node-version }}
-        uses: actions/setup-node@v3
-        with:
-          node-version: ${{ matrix.node }}
-
-      - name: Install dependencies
-        run: |
-          cd badge-maker
-          npm install
-          npm link
-
-      - name: Render a badge with the CLI
-        run: |
-          cd badge-maker
-          badge cactus grown :green @flat
--- a/.github/workflows/test-package-lib.yml
+++ b/.github/workflows/test-package-lib.yml
@@ -1,36 +0,0 @@
-name: Package Library
-on:
-  pull_request:
-    types: [opened, reopened, synchronize]
-  push:
-    branches-ignore:
-      - 'gh-pages'
-      - 'dependabot/**'
-
-jobs:
-  test-package-lib:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        include:
-          - node: '14'
-            engine-strict: 'false'
-          - node: '16'
-            engine-strict: 'true'
-          - node: '18'
-            engine-strict: 'false'
-          - node: '20'
-            engine-strict: 'false'
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Setup
-        uses: ./.github/actions/setup
-        with:
-          node-version: ${{ matrix.node }}
-        env:
-          NPM_CONFIG_ENGINE_STRICT: ${{ matrix.engine-strict }}
-
-      - name: Package tests
-        uses: ./.github/actions/package-tests
--- a/.github/workflows/test-services-18.yml
+++ b/.github/workflows/test-services-18.yml
@@ -1,40 +0,0 @@
-name: Services@node 18
-on:
-  pull_request:
-    types: [opened, edited, reopened, synchronize]
-
-jobs:
-  test-services-18:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Setup
-        uses: ./.github/actions/setup
-        with:
-          node-version: 18
-        env:
-          NPM_CONFIG_ENGINE_STRICT: 'false'
-
-      - name: Service tests (triggered from local branch)
-        if: github.event.pull_request.head.repo.full_name == github.repository
-        uses: ./.github/actions/service-tests
-        with:
-          github-token: '${{ secrets.GH_PAT }}'
-          librariesio-tokens: '${{ secrets.SERVICETESTS_LIBRARIESIO_TOKENS }}'
-          obs-user: '${{ secrets.SERVICETESTS_OBS_USER }}'
-          obs-pass: '${{ secrets.SERVICETESTS_OBS_PASS }}'
-          sl-insight-user-uuid: '${{ secrets.SERVICETESTS_SL_INSIGHT_USER_UUID }}'
-          sl-insight-api-token: '${{ secrets.SERVICETESTS_SL_INSIGHT_API_TOKEN }}'
-          twitch-client-id: '${{ secrets.SERVICETESTS_TWITCH_CLIENT_ID }}'
-          twitch-client-secret: '${{ secrets.SERVICETESTS_TWITCH_CLIENT_SECRET }}'
-          wheelmap-token: '${{ secrets.SERVICETESTS_WHEELMAP_TOKEN }}'
-          youtube-api-key: '${{ secrets.SERVICETESTS_YOUTUBE_API_KEY }}'
-
-      - name: Service tests (triggered from fork)
-        if: github.event.pull_request.head.repo.full_name != github.repository
-        uses: ./.github/actions/service-tests
-        with:
-          github-token: '${{ secrets.GITHUB_TOKEN }}'
--- a/.github/workflows/test-services.yml
+++ b/.github/workflows/test-services.yml
@@ -1,38 +0,0 @@
-name: Services
-on:
-  pull_request:
-    types: [opened, edited, reopened, synchronize]
-
-jobs:
-  test-services:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Setup
-        uses: ./.github/actions/setup
-        with:
-          node-version: 16
-
-      - name: Service tests (triggered from local branch)
-        if: github.event.pull_request.head.repo.full_name == github.repository
-        uses: ./.github/actions/service-tests
-        with:
-          github-token: '${{ secrets.GH_PAT }}'
-          librariesio-tokens: '${{ secrets.SERVICETESTS_LIBRARIESIO_TOKENS }}'
-          obs-user: '${{ secrets.SERVICETESTS_OBS_USER }}'
-          obs-pass: '${{ secrets.SERVICETESTS_OBS_PASS }}'
-          sl-insight-user-uuid: '${{ secrets.SERVICETESTS_SL_INSIGHT_USER_UUID }}'
-          sl-insight-api-token: '${{ secrets.SERVICETESTS_SL_INSIGHT_API_TOKEN }}'
-          twitch-client-id: '${{ secrets.SERVICETESTS_TWITCH_CLIENT_ID }}'
-          twitch-client-secret: '${{ secrets.SERVICETESTS_TWITCH_CLIENT_SECRET }}'
-          wheelmap-token: '${{ secrets.SERVICETESTS_WHEELMAP_TOKEN }}'
-          youtube-api-key: '${{ secrets.SERVICETESTS_YOUTUBE_API_KEY }}'
-
-      - name: Service tests (triggered from fork)
-        if: github.event.pull_request.head.repo.full_name != github.repository
-        uses: ./.github/actions/service-tests
-        with:
-          github-token: '${{ secrets.GITHUB_TOKEN }}'
--- a/.github/workflows/update-github-api.yml
+++ b/.github/workflows/update-github-api.yml
@@ -1,33 +0,0 @@
-name: Update GitHub API Version
-on:
-  schedule:
-    - cron: '0 7 * * 6'
-    # At 07:00 on Saturday
-  workflow_dispatch:
-
-permissions:
-  pull-requests: write
-  contents: write
-
-jobs:
-  update-github-api:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Setup
-        uses: ./.github/actions/setup
-        with:
-          node-version: 16
-
-      - name: Check for new GitHub API version
-        run: node scripts/update-github-api.js
-
-      - name: Create Pull Request if config has changed
-        uses: peter-evans/create-pull-request@v5
-        with:
-          token: '${{ secrets.GITHUB_TOKEN }}'
-          commit-message: Update GitHub API Version
-          title: Update [GitHub] API Version
-          branch-suffix: random
--- a/.gitignore
+++ b/.gitignore
@@ -92,7 +92,10 @@ typings/

 # Temporary build artifacts.
 /build
-frontend/categories/*.yaml
+.next
+badge-examples.json
+supported-features.json
+service-definitions.yml

 # Local runtime configuration.
 /config/local*.yml
@@ -100,6 +103,11 @@ frontend/categories/*.yaml
 # Template for the local runtime configuration.
 !/config/local*.template.yml

+# Gatsby
+/frontend/.cache
+/frontend/public
+/public
+
 # Cypress
 /cypress/videos/
 /cypress/screenshots/
@@ -109,11 +117,3 @@ frontend/categories/*.yaml

 # Flamebearer
 flamegraph.html
-
-# config file for node-pg-migrate
-migrations-config.json
-
-# Frontend/Docusaurus
-frontend/.docusaurus
-frontend/.cache-loader
-/public
--- a/.mocharc-frontend.yml
+++ b/.mocharc-frontend.yml
@@ -0,0 +1,5 @@
+reporter: mocha-env-reporter
+require:
+  - '@babel/polyfill'
+  - '@babel/register'
+  - mocha-yaml-loader
--- a/.npmrc
+++ b/.npmrc
@@ -1,2 +0,0 @@
-engine-strict=true
-strict-peer-deps=true
--- a/.nycrc-frontend.json
+++ b/.nycrc-frontend.json
@@ -0,0 +1,10 @@
+{
+  "reporter": ["lcov"],
+  "all": false,
+  "silent": true,
+  "clean": false,
+  "sourceMap": false,
+  "instrument": false,
+  "include": ["frontend/**/*.js"],
+  "exclude": ["**/*.spec.js", "**/mocha-*.js"]
+}
--- a/.prettierignore
+++ b/.prettierignore
@@ -10,5 +10,5 @@ public
 private/*.json
 /.nyc_output
 analytics.json
-frontend/.docusaurus
-frontend/categories
+supported-features.json
+service-definitions.yml
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,323 +4,6 @@ Note: this changelog is for the shields.io server. The changelog for the badge-m

 ---

-## server-2023-07-01
-
- add a bit of border to text boxes [#9324](https://github.com/badges/shields/issues/9324)
- allow negative timestamps in relative [date] badge [#9321](https://github.com/badges/shields/issues/9321)
- Adjust `deploy-review-app` script [#9317](https://github.com/badges/shields/issues/9317)
- temp fix: wrap code examples tabs in narrow browser windows [#9302](https://github.com/badges/shields/issues/9302)
- upgrade to graphql 16 [#9290](https://github.com/badges/shields/issues/9290)
- chore(frontend): open homepage feature links in new tab [#9300](https://github.com/badges/shields/issues/9300)
- adapt opencollective images to theme background [#9298](https://github.com/badges/shields/issues/9298)
- run package tests on node 20 [#9293](https://github.com/badges/shields/issues/9293)
- try running tests on node 18 [#9292](https://github.com/badges/shields/issues/9292)
- Upgrade to ESLint 8; affects [docker factorio] [#9289](https://github.com/badges/shields/issues/9289)
- remove obsolete travis .org examples [#9284](https://github.com/badges/shields/issues/9284)
- increase max age on reddit badges [#9282](https://github.com/badges/shields/issues/9282)
- set a sensible meta description [#9283](https://github.com/badges/shields/issues/9283)
- fix a load of spacing issues in frontend content [#9281](https://github.com/badges/shields/issues/9281)
- migrate frontend to docusaurus [#9014](https://github.com/badges/shields/issues/9014)
- feat: Add author filter option for [GithubCommitActivity] [#9251](https://github.com/badges/shields/issues/9251)
- Fix: [GithubCommitActivity] invalid branch error handling [#9258](https://github.com/badges/shields/issues/9258)
- Implement a pattern for dealing with upstream APIs which are slow on the first hit; affects [endpoint] [#9233](https://github.com/badges/shields/issues/9233)
- Delete old deprecated services [#9254](https://github.com/badges/shields/issues/9254)
- Fix [CodeClimate] tests and examples [#9253](https://github.com/badges/shields/issues/9253)
- embiggen youtube cache, again [#9250](https://github.com/badges/shields/issues/9250)
- feat: add 'canceled' status to netlify deploy badge [#9240](https://github.com/badges/shields/issues/9240)
- php-version.js: Fix typos [#9239](https://github.com/badges/shields/issues/9239)
- increase default cache on youtube badges [#9238](https://github.com/badges/shields/issues/9238)
- disable dependabot auto rebase [#9234](https://github.com/badges/shields/issues/9234)
- Dependency updates
-
-## server-2023-06-01
-
- feat: Add total commits to [GitHubCommitActivity] [#9196](https://github.com/badges/shields/issues/9196)
- set a custom error on 429 [#9159](https://github.com/badges/shields/issues/9159)
- deprecate [travis].org badges [#9171](https://github.com/badges/shields/issues/9171)
- count private sponsors on [GithubSponsors] badge [#9170](https://github.com/badges/shields/issues/9170)
- Dependency updates
-
-## server-2023-05-01
-
-** Removal:** For users who need to maintain a Github Token pool, storage has been provided via the `RedisTokenPersistence` and `REDIS_URL` settings. This feature was deprecated in `server-2023-03-01`. As of this release, the `RedisTokenPersistence` backend is now removed. If you are using this feature, you will need to migrate to using the `SQLTokenPersistence` backend for storage and provide a postgres connection string via the `POSTGRES_URL` setting. [#8922](https://github.com/badges/shields/issues/8922)
-
- fail to start server if there are duplicate service names [#9099](https://github.com/badges/shields/issues/9099)
- [SourceForge] Added badges for SourceForge [#9078](https://github.com/badges/shields/issues/9078) [#9102](https://github.com/badges/shields/issues/9102)
- crates: Use `?include=` to reduce crates.io backend load [#9081](https://github.com/badges/shields/issues/9081)
- Dependency updates
-
-## server-2023-04-02
-
- [JenkinsCoverage] Update Jenkins Code Coverage API for new plugin version [#9010](https://github.com/badges/shields/issues/9010)
- [CTAN] fallback to date if version is empty [#9036](https://github.com/badges/shields/issues/9036)
- Update to [CTAN] API version 2.0 [#9016](https://github.com/badges/shields/issues/9016)
- handle missing statistics array in [VisualStudioMarketplace] badges [#8985](https://github.com/badges/shields/issues/8985)
- [Netlify] upgrade colors for SVG parsing [#8971](https://github.com/badges/shields/issues/8971)
- Fix [Vcpkg] version service for different version fields [#8945](https://github.com/badges/shields/issues/8945)
- only try to close pool if one exists [#8947](https://github.com/badges/shields/issues/8947)
- misc minor fixes to [githubsize node pypi] [#8946](https://github.com/badges/shields/issues/8946)
- Dependency updates
-
-## server-2023-03-01
-
-**Deprecation:** For users who need to maintain a Github Token pool, storage has been provided via the `RedisTokenPersistence` and `REDIS_URL` settings. As of this release, the `RedisTokenPersistence` backend is now deprecated and will be removed in a future release. If you are using this feature, you will need to migrate to using the `SQLTokenPersistence` backend for storage and provide a postgres connection string via the `POSTGRES_URL` setting. [#8922](https://github.com/badges/shields/issues/8922)
-
- fix: for crates.io versions, use max_stable_version if it exists [#8687](https://github.com/badges/shields/issues/8687)
- don't autofocus search [#8927](https://github.com/badges/shields/issues/8927)
- Add [Vcpkg] version service [#8923](https://github.com/badges/shields/issues/8923)
- fix: Set uid/gid in docker image to 0 [#8908](https://github.com/badges/shields/issues/8908)
- expose port 443 in Dockerfile [#8889](https://github.com/badges/shields/issues/8889)
- Dependency updates
-
-## server-2023-02-01
-
- replace [twitter] badge with static fallback [#8842](https://github.com/badges/shields/issues/8842)
- Add various [Polymart] badges [#8811](https://github.com/badges/shields/issues/8811)
- update [githubpipenv] tests/examples [#8797](https://github.com/badges/shields/issues/8797)
- deprecate [apm] service [#8773](https://github.com/badges/shields/issues/8773)
- deprecate lgtm [#8771](https://github.com/badges/shields/issues/8771)
- Dependency updates
-
-## server-2023-01-01
-
- Breaking change: Routes for GitHub workflows badge have changed. See https://github.com/badges/shields/issues/8671 for more details
- Behaviour change: In this release we fixed a long standing bug. GitHub badges were previously not reading the base URL from the `config.service.baseUri`.
-  This release fixes that bug, bringing the code into line with the documented behaviour. This should not cause a behaviour change for most users,
-  but users who had previously set a value in `config.service.baseUri` which was previously ignored could see this now have an effect.
-  Users who configure their instance using env vars rather than yaml should see no change.
- Send `X-GitHub-Api-Version` when calling [GitHub] v3 API [#8669](https://github.com/badges/shields/issues/8669)
- add [VpmVersion] badge [#8755](https://github.com/badges/shields/issues/8755)
- Add [modrinth] game versions [#8673](https://github.com/badges/shields/issues/8673)
- fix debug logging of undefined query params [#8540](https://github.com/badges/shields/issues/8540), [#8757](https://github.com/badges/shields/issues/8757)
- fall back to classifiers if [pypi] license text is really long [#8690](https://github.com/badges/shields/issues/8690)
- allow passing key to [stackexchange] [#8539](https://github.com/badges/shields/issues/8539)
- Dependency updates
-
-## server-2022-12-01
-
- fix: support logoColor to shield icons. [#8263](https://github.com/badges/shields/issues/8263)
- handle missing properties array in [VisualStudioMarketplaceVersion] [#8603](https://github.com/badges/shields/issues/8603)
- deprecate [wercker] service [#8642](https://github.com/badges/shields/issues/8642)
- Add [Coincap] Cryptocurrency badges [#8623](https://github.com/badges/shields/issues/8623)
- Add [modrinth] version [#8604](https://github.com/badges/shields/issues/8604)
- [factorio-mod-portal] services [#8625](https://github.com/badges/shields/issues/8625)
- [Coveralls] for GitLab [#8584](https://github.com/badges/shields/issues/8584), [#8644](https://github.com/badges/shields/issues/8644)
- Remove 'suggest badges' feature [#8311](https://github.com/badges/shields/issues/8311)
- Add [modrinth] followers [#8601](https://github.com/badges/shields/issues/8601)
- Update the [modrinth] API to v2 [#8600](https://github.com/badges/shields/issues/8600)
- tidy up [GitHubGist] routes [#8510](https://github.com/badges/shields/issues/8510)
- fix [flathub] version error handling [#8500](https://github.com/badges/shields/issues/8500)
- Dependency updates
-
-## server-2022-11-01
-
- [Ansible] Add collection badge [#8578](https://github.com/badges/shields/issues/8578)
- [VisualStudioMarketplace] Add support to prerelease extensions version (Issue #8207) [#8561](https://github.com/badges/shields/issues/8561)
- feat: add [GitlabLastCommit] service [#8508](https://github.com/badges/shields/issues/8508)
- fix [swagger] service tests (allow 0 items in array) [#8564](https://github.com/badges/shields/issues/8564)
- fix codecov badge for non-default branch [#8565](https://github.com/badges/shields/issues/8565)
- Add [GitHubLastCommit] by committer badge [#8537](https://github.com/badges/shields/issues/8537)
- [GitHubReleaseDate] - published_at field [#8543](https://github.com/badges/shields/issues/8543)
- Fix [Testspace] with new "untested" value in case_counts array [#8544](https://github.com/badges/shields/issues/8544)
- fix: Support WAITING status for GitHub deployments [#8521](https://github.com/badges/shields/issues/8521)
- [Whatpulse] badge for a user and for a team [#8466](https://github.com/badges/shields/issues/8466)
- deprecate [pkgreview] service [#8499](https://github.com/badges/shields/issues/8499)
- Dependency updates
-
-## server-2022-10-08
-
- deprecate [criterion] service [#8501](https://github.com/badges/shields/issues/8501)
- fix formatRelativeDate error handling; run [date] [#8497](https://github.com/badges/shields/issues/8497)
- allow/validate bitbucket_username / bitbucket_password in private config schema [#8472](https://github.com/badges/shields/issues/8472)
- fix [pub] points badge test and example [#8498](https://github.com/badges/shields/issues/8498)
- feat: add [GitlabLanguageCount] service [#8377](https://github.com/badges/shields/issues/8377)
- [GitHubGistStars] add GitHub Gist Stars [#8471](https://github.com/badges/shields/issues/8471)
- fix display/search of CII badge examples [#8473](https://github.com/badges/shields/issues/8473)
- feat: add 2022 support to GitHub Hacktoberfest [#8468](https://github.com/badges/shields/issues/8468)
- fix [GitLabCoverage] subgroup bug [#8401](https://github.com/badges/shields/issues/8401)
- implement ruby gems-specific version sort/color functions [#8434](https://github.com/badges/shields/issues/8434)
- Add `rc` to pre-release identifiers [#8435](https://github.com/badges/shields/issues/8435)
- add [GitHub] Number of commits between branches/tags/commits [#8394](https://github.com/badges/shields/issues/8394)
- add [Packagist] dependency version [#8371](https://github.com/badges/shields/issues/8371)
- fix Docker build status invalid response data bug [#8392](https://github.com/badges/shields/issues/8392)
- Dependency updates
-
-## server-2022-09-04
-
- fix frontend compile for users running on Windows [#8350](https://github.com/badges/shields/issues/8350)
- [DockerSize] Docker image size multi arch [#8290](https://github.com/badges/shields/issues/8290)
- upgrade gatsby [#8334](https://github.com/badges/shields/issues/8334)
- Custom domains for [JitPack] artifacts [#8333](https://github.com/badges/shields/issues/8333)
- fix [dockerstars] service [#8316](https://github.com/badges/shields/issues/8316)
- [BountySource] Fix: Broken Badge generation for decimal activity values [#8315](https://github.com/badges/shields/issues/8315)
- feat: add [gitlabmergerequests] service [#8166](https://github.com/badges/shields/issues/8166)
- Fix terminology for [ROS] version service [#8292](https://github.com/badges/shields/issues/8292)
- feat: add [GitlabStars] service [#8209](https://github.com/badges/shields/issues/8209)
- Fix invalid `rst` format when `alt` or `target` is present [#8275](https://github.com/badges/shields/issues/8275)
- [GithubGistLastCommit] GitHub gist last commit [#8272](https://github.com/badges/shields/issues/8272)
- [GitHub] GitHub file size for a specific branch [#8262](https://github.com/badges/shields/issues/8262)
- Dependency updates
-
-## server-2022-08-01
-
- [pypi] Add Framework Version Badges support [#8261](https://github.com/badges/shields/issues/8261)
- feat: add [GitlabForks] server [#8208](https://github.com/badges/shields/issues/8208)
- Update PyPI api according to https://warehouse.pypa.io/api-reference/json.html [#8251](https://github.com/badges/shields/issues/8251)
- Add [galaxytoolshed] Activity [#8164](https://github.com/badges/shields/issues/8164)
- [greasyfork] Add Greasy Fork rating badges [#8087](https://github.com/badges/shields/issues/8087)
- refactor(deps): Replace moment with dayjs [#8192](https://github.com/badges/shields/issues/8192)
- add spaces round pipe in [conda] badge [#8189](https://github.com/badges/shields/issues/8189)
- Add [ROS] version service [#8169](https://github.com/badges/shields/issues/8169)
- feat: add [gitlabissues] service [#8108](https://github.com/badges/shields/issues/8108)
- Dependency updates
-
-## 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)
- remove suspended [github] tokens from the pool [#7654](https://github.com/badges/shields/issues/7654)
- generate links without trailing : if port not set [#7655](https://github.com/badges/shields/issues/7655)
- Use the latest build status when checking docs.rs [#7613](https://github.com/badges/shields/issues/7613)
- Remove no download handling and add API warning to [Wordpress] badges [#7606](https://github.com/badges/shields/issues/7606)
- set a higher default cacheLength on rating/star category [#7587](https://github.com/badges/shields/issues/7587)
- Update [amo] to use v4 API, set custom `cacheLength`s [#7586](https://github.com/badges/shields/issues/7586)
- fix(amo): include trailing slash in API call [#7585](https://github.com/badges/shields/issues/7585)
- fix docker image user agent [#7582](https://github.com/badges/shields/issues/7582)
- Delete deprecated Codetally and continuousphp services [#7572](https://github.com/badges/shields/issues/7572)
- Deprecate [Requires] service [#7571](https://github.com/badges/shields/issues/7571)
- [AUR] Fix RPC URL [#7570](https://github.com/badges/shields/issues/7570)
- Dependency updates
-
-## server-2022-02-01
-
- [Depfu] Add support for Gitlab [#7475](https://github.com/badges/shields/issues/7475)
- replace label in hn-user-karma with U/ [#7500](https://github.com/badges/shields/issues/7500)
- Support [Feedz] response with multiple pages without items [#7476](https://github.com/badges/shields/issues/7476)
- revert decamelize and humanize-string to old versions [#7449](https://github.com/badges/shields/issues/7449)
- Dependency updates
-
-## server-2022-01-01
-
- minor [reddit] improvements [#7436](https://github.com/badges/shields/issues/7436)
- [HackerNews] Show User Karma [#7411](https://github.com/badges/shields/issues/7411)
- [YouTube] Drop support for removed dislikes [#7410](https://github.com/badges/shields/issues/7410)
- change closed GitHub issue color to purple [#7374](https://github.com/badges/shields/issues/7374)
- restore cors header injection from #4171 [#4255](https://github.com/badges/shields/issues/4255)
- [GithubPackageJson] Get version from monorepo subfolder package.json [#7350](https://github.com/badges/shields/issues/7350)
- Dependency updates
-
-## server-2021-12-01
-
- Send better user-agent values [#7309](https://github.com/badges/shields/issues/7309)
-  Self-hosting users now send a user agent which indicates the server version and starts `shields (self-hosted)/` by default.
-  This can be configured using the env var `USER_AGENT_BASE`
- upgrade to node 16 [#7271](https://github.com/badges/shields/issues/7271)
- feat: deprecate dependabot badges [#7274](https://github.com/badges/shields/issues/7274)
- fix: npmversion tagged service test [#7269](https://github.com/badges/shields/issues/7269)
- feat: create new Test Results category [#7218](https://github.com/badges/shields/issues/7218)
- Migration from Request to Got for all HTTP requests is completed in this release
- Dependency updates
-
-## server-2021-11-04
-
- migrate regularUpdate() from request-->got [#7215](https://github.com/badges/shields/issues/7215)
- migrate github badges to use got instead of request; affects [github librariesio] [#7212](https://github.com/badges/shields/issues/7212)
- deprecate David badges [#7197](https://github.com/badges/shields/issues/7197)
- fix: ensure libraries.io header values are processed numerically [#7196](https://github.com/badges/shields/issues/7196)
- Add authentication for Libraries.io-based badges, run [Libraries Bower] [#7080](https://github.com/badges/shields/issues/7080)
- fixes and tests for pipenv helpers [#7194](https://github.com/badges/shields/issues/7194)
- add GitLab Release badge, run all [GitLab] [#7021](https://github.com/badges/shields/issues/7021)
- set content-length header on badge responses [#7179](https://github.com/badges/shields/issues/7179)
- fix [github] release/tag/download schema [#7170](https://github.com/badges/shields/issues/7170)
- Supported nested groups on [GitLabPipeline] badge [#7159](https://github.com/badges/shields/issues/7159)
- Support nested groups on [GitLabTag] badge [#7158](https://github.com/badges/shields/issues/7158)
- Fixing incorrect JetBrains Plugin rating values for [JetBrainsRating] [#7140](https://github.com/badges/shields/issues/7140)
- support using release or tag name in [GitHub] Release version badge [#7075](https://github.com/badges/shields/issues/7075)
- feat: support branches in sonar badges [#7065](https://github.com/badges/shields/issues/7065)
- Add [Modrinth] total downloads badge [#7132](https://github.com/badges/shields/issues/7132)
- remove [github] admin routes [#7105](https://github.com/badges/shields/issues/7105)
- Dependency updates
-
-## server-2021-10-04
-
- feat: add 2021 support to GitHub Hacktoberfest [#7086](https://github.com/badges/shields/issues/7086)
- Add [ClearlyDefined] service [#6944](https://github.com/badges/shields/issues/6944)
- handle null licenses in crates.io response schema, run [crates] [#7074](https://github.com/badges/shields/issues/7074)
- [OBS] add Open Build Service service-badge [#6993](https://github.com/badges/shields/issues/6993)
- Correction of badges url in self-hosting configuration with a custom port. Issue 7025 [#7036](https://github.com/badges/shields/issues/7036)
- fix: support gitlab token via env var [#7023](https://github.com/badges/shields/issues/7023)
- Add API-based support for [GitLab] badges, add new GitLab Tag badge [#6988](https://github.com/badges/shields/issues/6988)
- [freecodecamp]: allow + symbol in username [#7016](https://github.com/badges/shields/issues/7016)
- Rename Riot to Element in Matrix badge help [#6996](https://github.com/badges/shields/issues/6996)
- Fixed Reddit Negative Karma Issue [#6992](https://github.com/badges/shields/issues/6992)
- Dependency updates
-
 ## server-2021-09-01

 - use multi-stage build to reduce size of docker images [#6938](https://github.com/badges/shields/issues/6938)
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -134,19 +134,9 @@ Prettier before a commit by default.
 When adding or changing a service [please write tests][service-tests], and ensure the [title of your Pull Requests follows the required conventions](#running-service-tests-in-pull-requests) to ensure your tests are executed.
 When changing other code, please add unit tests.

-The integration tests are not run by default. For most contributions it is OK to skip these unless you're working directly on the code for storing the GitHub token pool in postgres.
-
-To run the integration tests:
-
- You must have PostgreSQL installed. Use `brew install postgresql`, `apt-get install postgresql`, etc.
- Set a connection string either with an env var `POSTGRES_URL=postgresql://user:pass@127.0.0.1:5432/db_name` or by using
-  ```yaml
-  private:
-    postgres_url: 'postgresql://user:pass@127.0.0.1:5432/db_name'
-  ```
-  in a yaml config file.
- Run `npm run migrate up` to apply DB migrations
- Run `npm run test:integration` to run the tests
+To run the integration tests, you must have redis installed and in your PATH.
+Use `brew install redis`, `yum install redis`, etc. The test runner will
+start the server automatically.

 [service-tests]: https://github.com/badges/shields/blob/master/doc/service-tests.md

--- a/17
+++ b/17
@@ -1,4 +1,4 @@
-FROM node:16-alpine AS Builder
+FROM node:14-alpine AS Builder

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

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

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

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

 WORKDIR /usr/src/app
-COPY --from=Builder --chown=0:0 /usr/src/app /usr/src/app
+COPY --from=Builder /usr/src/app /usr/src/app

 CMD node server

-EXPOSE 80 443
+EXPOSE 80
--- a/README.md
+++ b/README.md
@@ -19,6 +19,9 @@
    <a href="https://coveralls.io/github/badges/shields">
        <img src="https://img.shields.io/coveralls/github/badges/shields"
            alt="coverage"></a>
+    <a href="https://lgtm.com/projects/g/badges/shields/alerts/">
+        <img src="https://img.shields.io/lgtm/alerts/g/badges/shields"
+            alt="Total alerts"/></a>
    <a href="https://discord.gg/HjJCwm5">
        <img src="https://img.shields.io/discord/308323056592486420?logo=discord"
            alt="chat on Discord"></a>
@@ -32,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 870 million images and is used by some of the
+Every month it serves over 770 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.

@@ -98,8 +101,8 @@ You can read a [tutorial on how to add a badge][tutorial].

 ## Development

-1. Install Node 16 or later. You can use the [package manager][] of your choice.
-   Tests need to pass in Node 16 and 17.
+1. Install Node 14 or later. You can use the [package manager][] of your choice.
+   Tests need to pass in Node 14 and 16.
 2. Clone this repository.
 3. Run `npm ci` to install the dependencies.
 4. Run `npm start` to start the badge server and the frontend dev server.
@@ -107,7 +110,7 @@ You can read a [tutorial on how to add a badge][tutorial].

 When server source files change, the badge server should automatically restart
 itself (using [nodemon][]). When the frontend files change, the frontend dev
-server (`docusaurus start`) should also automatically reload. However the badge
+server (`gatsby dev`) should also automatically reload. However the badge
 definitions are built only before the server first starts. To regenerate those,
 either run `npm run defs` or manually restart the server.

--- a/SECURITY.md
+++ b/SECURITY.md
@@ -7,10 +7,10 @@ Please follow this guidance when reporting security issues affecting:
 - [Shields.io](https://shields.io)
 - [Raster.shields.io](https://raster.shields.io)
 - Self-hosted Shields instances
- The [squint](https://github.com/badges/squint) raster proxy
+- The [svg-to-image-proxy](https://www.npmjs.com/package/svg-to-image-proxy) NPM package
 - The [badge-maker](https://www.npmjs.com/package/badge-maker) NPM package

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

 ## Reporting a Vulnerability

--- a/app.json
+++ b/app.json
@@ -35,16 +35,6 @@
    "WEBLATE_API_KEY": {
      "description": "Configure the API key to be used for the Weblate service.",
      "required": false
-    },
-    "METRICS_INFLUX_ENABLED": {
-      "description": "Disable influx metrics",
-      "value": "false",
-      "required": false
-    },
-    "REQUIRE_CLOUDFLARE": {
-      "description": "Allow direct traffic",
-      "value": "false",
-      "required": false
    }
  },
  "formation": {
--- a/badge-maker/CHANGELOG.md
+++ b/badge-maker/CHANGELOG.md
@@ -2,7 +2,7 @@

 ## 4.0.0 [WIP]

- Drop compatibility with Node < 14
+- Drop compatibility with Node 10

 ## 3.3.1

--- a/badge-maker/lib/badge-cli.spec.js
+++ b/badge-maker/lib/badge-cli.spec.js
@@ -1,6 +1,7 @@
 'use strict'

 const path = require('path')
+const isSvg = require('is-svg')
 const { spawn } = require('child-process-promise')
 const { expect, use } = require('chai')
 use(require('chai-string'))
@@ -19,7 +20,6 @@ describe('The CLI', function () {
  })

  it('should produce default badges', async function () {
-    const { default: isSvg } = await import('is-svg')
    const { stdout } = await runCli(['cactus', 'grown'])
    expect(stdout)
      .to.satisfy(isSvg)
@@ -28,13 +28,11 @@ describe('The CLI', function () {
  })

  it('should produce colorschemed badges', async function () {
-    const { default: isSvg } = await import('is-svg')
    const { stdout } = await runCli(['cactus', 'grown', ':green'])
    expect(stdout).to.satisfy(isSvg)
  })

  it('should produce right-color badges', async function () {
-    const { default: isSvg } = await import('is-svg')
    const { stdout } = await runCli(['cactus', 'grown', '#abcdef'])
    expect(stdout).to.satisfy(isSvg).and.to.include('#abcdef')
  })
--- a/badge-maker/lib/index.spec.js
+++ b/badge-maker/lib/index.spec.js
@@ -1,11 +1,11 @@
 'use strict'

 const { expect } = require('chai')
+const isSvg = require('is-svg')
 const { makeBadge, ValidationError } = require('.')

 describe('makeBadge function', function () {
-  it('should produce badge with valid input', async function () {
-    const { default: isSvg } = await import('is-svg')
+  it('should produce badge with valid input', function () {
    expect(
      makeBadge({
        label: 'build',
--- a/badge-maker/lib/make-badge.spec.js
+++ b/badge-maker/lib/make-badge.spec.js
@@ -3,6 +3,7 @@
 const { test, given, forCases } = require('sazerac')
 const { expect } = require('chai')
 const snapshot = require('snap-shot-it')
+const isSvg = require('is-svg')
 const prettier = require('prettier')
 const makeBadge = require('./make-badge')

@@ -79,8 +80,7 @@ describe('The badge generator', function () {
  })

  describe('SVG', function () {
-    it('should produce SVG', async function () {
-      const { default: isSvg } = await import('is-svg')
+    it('should produce SVG', function () {
      expect(makeBadge({ label: 'cactus', message: 'grown', format: 'svg' }))
        .to.satisfy(isSvg)
        .and.to.include('cactus')
@@ -113,8 +113,7 @@ describe('The badge generator', function () {
      })
    })

-    it('should replace undefined svg badge style with "flat"', async function () {
-      const { default: isSvg } = await import('is-svg')
+    it('should replace undefined svg badge style with "flat"', function () {
      const jsonBadgeWithUnknownStyle = makeBadge({
        label: 'name',
        message: 'Bob',
--- a/badge-maker/lib/xml.js
+++ b/badge-maker/lib/xml.js
@@ -33,7 +33,7 @@ class XmlElement {
   * @param {object} attrs Refer to individual attrs
   * @param {string} attrs.name
   *    Name of the XML tag
-   * @param {Array.<string|module:badge-maker/lib/xml~XmlElement>} [attrs.content=[]]
+   * @param {Array.<string|module:badge-maker/lib/xml-element~XmlElement>} [attrs.content=[]]
   *    Array of objects to render inside the tag. content may contain a mix of
   *    string and XmlElement objects. If content is `[]` or ommitted the
   *    element will be rendered as a self-closing element.
--- a/badge-maker/package.json
+++ b/badge-maker/package.json
@@ -26,7 +26,7 @@
    "badge": "lib/badge-cli.js"
  },
  "engines": {
-    "node": ">= 14",
+    "node": ">= 12",
    "npm": ">= 6"
  },
  "collective": {
--- a/config/custom-environment-variables.yml
+++ b/config/custom-environment-variables.yml
@@ -50,8 +50,6 @@ public:
      authorizedOrigins: 'NEXUS_ORIGINS'
    npm:
      authorizedOrigins: 'NPM_ORIGINS'
-    obs:
-      authorizedOrigins: 'OBS_ORIGINS'
    sonar:
      authorizedOrigins: 'SONAR_ORIGINS'
    teamcity:
@@ -64,7 +62,6 @@ public:
    defaultCacheLengthSeconds: 'BADGE_MAX_AGE_SECONDS'

  fetchLimit: 'FETCH_LIMIT'
-  userAgentBase: 'USER_AGENT_BASE'

  requestTimeoutSeconds: 'REQUEST_TIMEOUT_SECONDS'
  requestTimeoutMaxAgeSeconds: 'REQUEST_TIMEOUT_MAX_AGE_SECONDS'
@@ -87,19 +84,15 @@ private:
  jenkins_pass: 'JENKINS_PASS'
  jira_user: 'JIRA_USER'
  jira_pass: 'JIRA_PASS'
-  librariesio_tokens: 'LIBRARIESIO_TOKENS'
  nexus_user: 'NEXUS_USER'
  nexus_pass: 'NEXUS_PASS'
  npm_token: 'NPM_TOKEN'
-  obs_user: 'OBS_USER'
-  obs_pass: 'OBS_PASS'
  redis_url: 'REDIS_URL'
-  postgres_url: 'POSTGRES_URL'
  sentry_dsn: 'SENTRY_DSN'
+  shields_secret: 'SHIELDS_SECRET'
  sl_insight_userUuid: 'SL_INSIGHT_USER_UUID'
  sl_insight_apiToken: 'SL_INSIGHT_API_TOKEN'
  sonarqube_token: 'SONARQUBE_TOKEN'
-  stackapps_api_key: 'STACKAPPS_API_KEY'
  teamcity_user: 'TEAMCITY_USER'
  teamcity_pass: 'TEAMCITY_PASS'
  twitch_client_id: 'TWITCH_CLIENT_ID'
--- a/config/default.yml
+++ b/config/default.yml
@@ -1,6 +1,7 @@
 public:
  bind:
    address: '::'
+
  metrics:
    prometheus:
      enabled: false
@@ -11,26 +12,30 @@ public:
      intervalSeconds: 15
  ssl:
    isSecure: false
+
  cors:
    allowedOrigin: []
+
  services:
    github:
-      baseUri: 'https://api.github.com'
+      baseUri: 'https://api.github.com/'
      debug:
        enabled: false
        intervalSeconds: 200
-      restApiVersion: '2022-11-28'
-    obs:
-      authorizedOrigins: 'https://api.opensuse.org'
    weblate:
      authorizedOrigins: 'https://hosted.weblate.org'
    trace: false
+
  cacheHeaders:
    defaultCacheLengthSeconds: 120
+
  handleInternalErrors: true
+
  fetchLimit: '10MB'
-  userAgentBase: 'shields (self-hosted)'
+
  requestTimeoutSeconds: 120
  requestTimeoutMaxAgeSeconds: 30
+
  requireCloudflare: false
+
 private: {}
--- a/config/local-shields-io-production.template.yml
+++ b/config/local-shields-io-production.template.yml
@@ -4,6 +4,7 @@ private:
  gh_client_id: ...
  gh_client_secret: ...
  gitlab_token: ...
+  redis_url: ...
  sentry_dsn: ...
  shields_secret: ...
  sl_insight_userUuid: ...
--- a/config/local.template.yml
+++ b/config/local.template.yml
@@ -6,8 +6,6 @@ private:
  # preferable for self hosting.
  gh_token: '...'
  gitlab_token: '...'
-  obs_user: '...'
-  obs_pass: '...'
  twitch_client_id: '...'
  twitch_client_secret: '...'
  weblate_api_key: '...'
--- a/config/shields-io-production.yml
+++ b/config/shields-io-production.yml
@@ -6,20 +6,13 @@ public:
      enabled: true
      url: https://metrics.shields.io/telegraf
      instanceIdFrom: env-var
-      instanceIdEnvVarName: FLY_ALLOC_ID
+      instanceIdEnvVarName: HEROKU_DYNO_ID
      envLabel: shields-production

  ssl:
-    isSecure: false
+    isSecure: true

  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/badge-urls/make-badge-url.d.ts
+++ b/core/badge-urls/make-badge-url.d.ts
@@ -0,0 +1,112 @@
+export function badgeUrlFromPath({
+  baseUrl,
+  path,
+  queryParams,
+  style,
+  format,
+  longCache,
+}: {
+  baseUrl?: string
+  path: string
+  queryParams: { [k: string]: string | number | boolean }
+  style?: string
+  format?: string
+  longCache?: boolean
+}): string
+
+export function badgeUrlFromPattern({
+  baseUrl,
+  pattern,
+  namedParams,
+  queryParams,
+  style,
+  format,
+  longCache,
+}: {
+  baseUrl?: string
+  pattern: string
+  namedParams: { [k: string]: string }
+  queryParams: { [k: string]: string | number | boolean }
+  style?: string
+  format?: string
+  longCache?: boolean
+}): string
+
+export function encodeField(s: string): string
+
+export function staticBadgeUrl({
+  baseUrl,
+  label,
+  message,
+  labelColor,
+  color,
+  style,
+  namedLogo,
+  format,
+  links,
+}: {
+  baseUrl?: string
+  label: string
+  message: string
+  labelColor?: string
+  color?: string
+  style?: string
+  namedLogo?: string
+  format?: string
+  links?: string[]
+}): string
+
+export function queryStringStaticBadgeUrl({
+  baseUrl,
+  label,
+  message,
+  color,
+  labelColor,
+  style,
+  namedLogo,
+  logoColor,
+  logoWidth,
+  logoPosition,
+  format,
+}: {
+  baseUrl?: string
+  label: string
+  message: string
+  color?: string
+  labelColor?: string
+  style?: string
+  namedLogo?: string
+  logoColor?: string
+  logoWidth?: number
+  logoPosition?: number
+  format?: string
+}): string
+
+export function dynamicBadgeUrl({
+  baseUrl,
+  datatype,
+  label,
+  dataUrl,
+  query,
+  prefix,
+  suffix,
+  color,
+  style,
+  format,
+}: {
+  baseUrl?: string
+  datatype: string
+  label: string
+  dataUrl: string
+  query: string
+  prefix: string
+  suffix: string
+  color?: string
+  style?: string
+  format?: string
+}): string
+
+export function rasterRedirectUrl(
+  { rasterUrl }: { rasterUrl: string },
+  badgeUrl: string
+): string
--- a/core/badge-urls/make-badge-url.js
+++ b/core/badge-urls/make-badge-url.js
@@ -1,5 +1,147 @@
 // Avoid "Attempted import error: 'URL' is not exported from 'url'" in frontend.
 import url from 'url'
+import queryString from 'query-string'
+import { compile } from 'path-to-regexp'
+
+function badgeUrlFromPath({
+  baseUrl = '',
+  path,
+  queryParams,
+  style,
+  format = '',
+  longCache = false,
+}) {
+  const outExt = format.length ? `.${format}` : ''
+
+  const outQueryString = queryString.stringify({
+    cacheSeconds: longCache ? '2592000' : undefined,
+    style,
+    ...queryParams,
+  })
+  const suffix = outQueryString ? `?${outQueryString}` : ''
+
+  return `${baseUrl}${path}${outExt}${suffix}`
+}
+
+function badgeUrlFromPattern({
+  baseUrl = '',
+  pattern,
+  namedParams,
+  queryParams,
+  style,
+  format = '',
+  longCache = false,
+}) {
+  const toPath = compile(pattern, {
+    strict: true,
+    sensitive: true,
+    encode: encodeURIComponent,
+  })
+
+  const path = toPath(namedParams)
+
+  return badgeUrlFromPath({
+    baseUrl,
+    path,
+    queryParams,
+    style,
+    format,
+    longCache,
+  })
+}
+
+function encodeField(s) {
+  return encodeURIComponent(s.replace(/-/g, '--').replace(/_/g, '__'))
+}
+
+function staticBadgeUrl({
+  baseUrl = '',
+  label,
+  message,
+  labelColor,
+  color = 'lightgray',
+  style,
+  namedLogo,
+  format = '',
+  links = [],
+}) {
+  const path = [label, message, color].map(encodeField).join('-')
+  const outQueryString = queryString.stringify({
+    labelColor,
+    style,
+    logo: namedLogo,
+    link: links,
+  })
+  const outExt = format.length ? `.${format}` : ''
+  const suffix = outQueryString ? `?${outQueryString}` : ''
+  return `${baseUrl}/badge/${path}${outExt}${suffix}`
+}
+
+function queryStringStaticBadgeUrl({
+  baseUrl = '',
+  label,
+  message,
+  color,
+  labelColor,
+  style,
+  namedLogo,
+  logoColor,
+  logoWidth,
+  logoPosition,
+  format = '',
+}) {
+  // schemaVersion could be a parameter if we iterate on it,
+  // for now it's hardcoded to the only supported version.
+  const schemaVersion = '1'
+  const suffix = `?${queryString.stringify({
+    label,
+    message,
+    color,
+    labelColor,
+    style,
+    logo: namedLogo,
+    logoColor,
+    logoWidth,
+    logoPosition,
+  })}`
+  const outExt = format.length ? `.${format}` : ''
+  return `${baseUrl}/static/v${schemaVersion}${outExt}${suffix}`
+}
+
+function dynamicBadgeUrl({
+  baseUrl,
+  datatype,
+  label,
+  dataUrl,
+  query,
+  prefix,
+  suffix,
+  color,
+  style,
+  format = '',
+}) {
+  const outExt = format.length ? `.${format}` : ''
+
+  const queryParams = {
+    label,
+    url: dataUrl,
+    query,
+    style,
+  }
+
+  if (color) {
+    queryParams.color = color
+  }
+  if (prefix) {
+    queryParams.prefix = prefix
+  }
+  if (suffix) {
+    queryParams.suffix = suffix
+  }
+
+  const outQueryString = queryString.stringify(queryParams)
+  return `${baseUrl}/badge/dynamic/${datatype}${outExt}?${outQueryString}`
+}

 function rasterRedirectUrl({ rasterUrl }, badgeUrl) {
  // Ensure we're always using the `rasterUrl` by using just the path from
@@ -10,4 +152,12 @@ function rasterRedirectUrl({ rasterUrl }, badgeUrl) {
  return result
 }

-export { rasterRedirectUrl }
+export {
+  badgeUrlFromPath,
+  badgeUrlFromPattern,
+  encodeField,
+  staticBadgeUrl,
+  queryStringStaticBadgeUrl,
+  dynamicBadgeUrl,
+  rasterRedirectUrl,
+}
--- a/core/badge-urls/make-badge-url.spec.js
+++ b/core/badge-urls/make-badge-url.spec.js
@@ -0,0 +1,155 @@
+import { test, given } from 'sazerac'
+import {
+  badgeUrlFromPath,
+  badgeUrlFromPattern,
+  encodeField,
+  staticBadgeUrl,
+  queryStringStaticBadgeUrl,
+  dynamicBadgeUrl,
+} from './make-badge-url.js'
+
+describe('Badge URL generation functions', function () {
+  test(badgeUrlFromPath, () => {
+    given({
+      baseUrl: 'http://example.com',
+      path: '/npm/v/gh-badges',
+      style: 'flat-square',
+      longCache: true,
+    }).expect(
+      'http://example.com/npm/v/gh-badges?cacheSeconds=2592000&style=flat-square'
+    )
+  })
+
+  test(badgeUrlFromPattern, () => {
+    given({
+      baseUrl: 'http://example.com',
+      pattern: '/npm/v/:packageName',
+      namedParams: { packageName: 'gh-badges' },
+      style: 'flat-square',
+      longCache: true,
+    }).expect(
+      'http://example.com/npm/v/gh-badges?cacheSeconds=2592000&style=flat-square'
+    )
+  })
+
+  test(encodeField, () => {
+    given('foo').expect('foo')
+    given('').expect('')
+    given('happy go lucky').expect('happy%20go%20lucky')
+    given('do-right').expect('do--right')
+    given('it_is_a_snake').expect('it__is__a__snake')
+  })
+
+  test(staticBadgeUrl, () => {
+    given({
+      label: 'foo',
+      message: 'bar',
+      color: 'blue',
+      style: 'flat-square',
+    }).expect('/badge/foo-bar-blue?style=flat-square')
+    given({
+      label: 'foo',
+      message: 'bar',
+      color: 'blue',
+      style: 'flat-square',
+      format: 'png',
+      namedLogo: 'github',
+    }).expect('/badge/foo-bar-blue.png?logo=github&style=flat-square')
+    given({
+      label: 'Hello World',
+      message: 'Привет Мир',
+      color: '#aabbcc',
+    }).expect(
+      '/badge/Hello%20World-%D0%9F%D1%80%D0%B8%D0%B2%D0%B5%D1%82%20%D0%9C%D0%B8%D1%80-%23aabbcc'
+    )
+    given({
+      label: '123-123',
+      message: 'abc-abc',
+      color: 'blue',
+    }).expect('/badge/123--123-abc--abc-blue')
+    given({
+      label: '123-123',
+      message: '',
+      color: 'blue',
+      style: 'social',
+    }).expect('/badge/123--123--blue?style=social')
+    given({
+      label: '',
+      message: 'blue',
+      color: 'blue',
+    }).expect('/badge/-blue-blue')
+  })
+
+  test(queryStringStaticBadgeUrl, () => {
+    // the query-string library sorts parameters by name
+    given({
+      label: 'foo',
+      message: 'bar',
+      color: 'blue',
+      style: 'flat-square',
+    }).expect('/static/v1?color=blue&label=foo&message=bar&style=flat-square')
+    given({
+      label: 'foo Bar',
+      message: 'bar Baz',
+      color: 'blue',
+      style: 'flat-square',
+      format: 'png',
+      namedLogo: 'github',
+    }).expect(
+      '/static/v1.png?color=blue&label=foo%20Bar&logo=github&message=bar%20Baz&style=flat-square'
+    )
+    given({
+      label: 'Hello World',
+      message: 'Привет Мир',
+      color: '#aabbcc',
+    }).expect(
+      '/static/v1?color=%23aabbcc&label=Hello%20World&message=%D0%9F%D1%80%D0%B8%D0%B2%D0%B5%D1%82%20%D0%9C%D0%B8%D1%80'
+    )
+  })
+
+  test(dynamicBadgeUrl, () => {
+    const dataUrl = 'http://example.com/foo.json'
+    const query = '$.bar'
+    const prefix = 'value: '
+    given({
+      baseUrl: 'http://img.example.com',
+      datatype: 'json',
+      label: 'foo',
+      dataUrl,
+      query,
+      prefix,
+      style: 'plastic',
+    }).expect(
+      [
+        'http://img.example.com/badge/dynamic/json',
+        '?label=foo',
+        `&prefix=${encodeURIComponent(prefix)}`,
+        `&query=${encodeURIComponent(query)}`,
+        '&style=plastic',
+        `&url=${encodeURIComponent(dataUrl)}`,
+      ].join('')
+    )
+    const suffix = '<- value'
+    const color = 'blue'
+    given({
+      baseUrl: 'http://img.example.com',
+      datatype: 'json',
+      label: 'foo',
+      dataUrl,
+      query,
+      suffix,
+      color,
+      style: 'plastic',
+    }).expect(
+      [
+        'http://img.example.com/badge/dynamic/json',
+        '?color=blue',
+        '&label=foo',
+        `&query=${encodeURIComponent(query)}`,
+        '&style=plastic',
+        `&suffix=${encodeURIComponent(suffix)}`,
+        `&url=${encodeURIComponent(dataUrl)}`,
+      ].join('')
+    )
+  })
+})
--- a/core/base-service/auth-helper.js
+++ b/core/base-service/auth-helper.js
@@ -74,7 +74,7 @@ class AuthHelper {
  }

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

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

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

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

  static _mergeQueryParams(requestParams, query) {
-    const {
-      options: { searchParams: existingQuery, ...restOptions } = {},
-      ...rest
-    } = requestParams
+    const { options: { qs: existingQuery, ...restOptions } = {}, ...rest } =
+      requestParams
    return {
      options: {
-        searchParams: {
+        qs: {
          ...existingQuery,
          ...query,
        },
--- a/core/base-service/auth-helper.spec.js
+++ b/core/base-service/auth-helper.spec.js
@@ -104,14 +104,14 @@ describe('AuthHelper', function () {
          { userKey: 'myci_user', passKey: 'myci_pass' },
          { myci_user: 'admin', myci_pass: 'abc123' }
        ),
-      ]).expect({ username: 'admin', password: 'abc123' })
+      ]).expect({ user: 'admin', pass: 'abc123' })
      given({ userKey: 'myci_user' }, { myci_user: 'admin' }).expect({
-        username: 'admin',
-        password: '',
+        user: 'admin',
+        pass: undefined,
      })
      given({ passKey: 'myci_pass' }, { myci_pass: 'abc123' }).expect({
-        username: '',
-        password: 'abc123',
+        user: undefined,
+        pass: 'abc123',
      })
      given({ userKey: 'myci_user', passKey: 'myci_pass' }, {}).expect(
        undefined
@@ -120,8 +120,8 @@ describe('AuthHelper', function () {
        { passKey: 'myci_pass', defaultToEmptyStringForUser: true },
        { myci_pass: 'abc123' }
      ).expect({
-        username: '',
-        password: 'abc123',
+        user: '',
+        pass: 'abc123',
      })
    })
  })
@@ -131,18 +131,15 @@ describe('AuthHelper', function () {
      forCases([
        given({ url: 'http://example.test' }),
        given({ url: 'http://example.test', options: {} }),
+        given({ url: 'http://example.test', options: { strictSSL: true } }),
        given({
          url: 'http://example.test',
-          options: { https: { rejectUnauthorized: true } },
-        }),
-        given({
-          url: 'http://example.test',
-          options: { https: { rejectUnauthorized: undefined } },
+          options: { strictSSL: undefined },
        }),
      ]).expect(false)
      given({
        url: 'http://example.test',
-        options: { https: { rejectUnauthorized: false } },
+        options: { strictSSL: false },
      }).expect(true)
    })
  })
@@ -166,9 +163,7 @@ describe('AuthHelper', function () {
      })
      it('throws for insecure requests', function () {
        expect(() =>
-          authHelper.enforceStrictSsl({
-            options: { https: { rejectUnauthorized: false } },
-          })
+          authHelper.enforceStrictSsl({ options: { strictSSL: false } })
        ).to.throw(InvalidParameter)
      })
    })
@@ -190,9 +185,7 @@ describe('AuthHelper', function () {
      })
      it('does not throw for insecure requests', function () {
        expect(() =>
-          authHelper.enforceStrictSsl({
-            options: { https: { rejectUnauthorized: false } },
-          })
+          authHelper.enforceStrictSsl({ options: { strictSSL: false } })
        ).not.to.throw()
      })
    })
@@ -227,7 +220,7 @@ describe('AuthHelper', function () {
        test(shouldAuthenticateRequest, () => {
          given({
            url: 'https://myci.test/api',
-            options: { https: { rejectUnauthorized: false } },
+            options: { strictSSL: false },
          }).expect(false)
        })
      })
@@ -265,7 +258,7 @@ describe('AuthHelper', function () {
        test(shouldAuthenticateRequest, () => {
          given({
            url: 'https://myci.test',
-            options: { https: { rejectUnauthorized: false } },
+            options: { strictSSL: false },
          }).expect(true)
        })
      })
@@ -330,8 +323,7 @@ describe('AuthHelper', function () {
        }).expect({
          url: 'https://myci.test/api',
          options: {
-            username: 'admin',
-            password: 'abc123',
+            auth: { user: 'admin', pass: 'abc123' },
          },
        })
        given({
@@ -343,8 +335,7 @@ describe('AuthHelper', function () {
          url: 'https://myci.test/api',
          options: {
            headers: { Accept: 'application/json' },
-            username: 'admin',
-            password: 'abc123',
+            auth: { user: 'admin', pass: 'abc123' },
          },
        })
      })
@@ -375,7 +366,7 @@ describe('AuthHelper', function () {
      expect(() =>
        withBasicAuth({
          url: 'https://myci.test/api',
-          options: { https: { rejectUnauthorized: false } },
+          options: { strictSSL: false },
        })
      ).to.throw(InvalidParameter)
    })
--- a/core/base-service/base-graphql.js
+++ b/core/base-service/base-graphql.js
@@ -38,18 +38,12 @@ class BaseGraphqlService extends BaseService {
   *    representing the query clause of GraphQL POST body
   *    e.g. gql`{ query { ... } }`
   * @param {object} attrs.variables Variables clause of GraphQL POST body
-   * @param {object} [attrs.options={}] Options to pass to got. See
-   *    [documentation](https://github.com/sindresorhus/got/blob/main/documentation/2-options.md)
+   * @param {object} [attrs.options={}] Options to pass to request. See
+   *    [documentation](https://github.com/request/request#requestoptions-callback)
   * @param {object} [attrs.httpErrorMessages={}] Key-value map of HTTP status codes
   *    and custom error messages e.g: `{ 404: 'package not found' }`.
   *    This can be used to extend or override the
   *    [default](https://github.com/badges/shields/blob/master/core/base-service/check-error-response.js#L5)
-   * @param {object} [attrs.systemErrors={}] Key-value map of got network exception codes
-   *    and an object of params to pass when we construct an Inaccessible exception object
-   *    e.g: `{ ECONNRESET: { prettyMessage: 'connection reset' } }`.
-   *    See {@link https://github.com/sindresorhus/got/blob/main/documentation/7-retry.md#errorcodes got error codes}
-   *    for allowed keys
-   *    and {@link module:core/base-service/errors~RuntimeErrorProps} for allowed values
   * @param {Function} [attrs.transformJson=data => data] Function which takes the raw json and transforms it before
   * further procesing. In case of multiple query in a single graphql call and few of them
   * throw error, partial data might be used ignoring the error.
@@ -59,7 +53,7 @@ class BaseGraphqlService extends BaseService {
   *    The default is to return the first entry of the `errors` array as
   *    an InvalidResponse.
   * @returns {object} Parsed response
-   * @see https://github.com/sindresorhus/got/blob/main/documentation/2-options.md
+   * @see https://github.com/request/request#requestoptions-callback
   */
  async _requestGraphql({
    schema,
@@ -68,7 +62,6 @@ class BaseGraphqlService extends BaseService {
    variables = {},
    options = {},
    httpErrorMessages = {},
-    systemErrors = {},
    transformJson = data => data,
    transformErrors = defaultTransformErrors,
  }) {
@@ -81,8 +74,7 @@ class BaseGraphqlService extends BaseService {
    const { buffer } = await this._request({
      url,
      options: mergedOptions,
-      httpErrors: httpErrorMessages,
-      systemErrors,
+      errorMessages: httpErrorMessages,
    })
    const json = transformJson(this._parseJson(buffer))
    if (json.errors) {
--- a/core/base-service/base-graphql.spec.js
+++ b/core/base-service/base-graphql.spec.js
@@ -29,9 +29,9 @@ class DummyGraphqlService extends BaseGraphqlService {

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

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

-      expect(requestFetcher).to.have.been.calledOnceWith(
+      expect(sendAndCacheRequest).to.have.been.calledOnceWith(
        'http://example.com/graphql',
        {
-          body: '{"query":"{\\n  requiredString\\n}","variables":{}}',
+          body: '{"query":"{\\n  requiredString\\n}\\n","variables":{}}',
          headers: { Accept: 'application/json' },
          method: 'POST',
        }
      )
    })

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

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

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

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

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

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

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

-      const requestFetcher = async () => ({
+      const sendAndCacheRequest = async () => ({
        buffer: '{ "errors": [ { "message": "oh noes!!" } ] }',
        res: { statusCode: 200 },
      })
      expect(
        await WithErrorHandler.invoke(
-          { requestFetcher },
+          { sendAndCacheRequest },
          { handleInternalErrors: false }
        )
      ).to.deep.equal({
--- a/core/base-service/base-json.js
+++ b/core/base-service/base-json.js
@@ -28,28 +28,16 @@ class BaseJsonService extends BaseService {
   * @param {object} attrs Refer to individual attrs
   * @param {Joi} attrs.schema Joi schema to validate the response against
   * @param {string} attrs.url URL to request
-   * @param {object} [attrs.options={}] Options to pass to got. See
-   *    [documentation](https://github.com/sindresorhus/got/blob/main/documentation/2-options.md)
-   * @param {object} [attrs.httpErrors={}] Key-value map of status codes
+   * @param {object} [attrs.options={}] Options to pass to request. See
+   *    [documentation](https://github.com/request/request#requestoptions-callback)
+   * @param {object} [attrs.errorMessages={}] Key-value map of status codes
   *    and custom error messages e.g: `{ 404: 'package not found' }`.
   *    This can be used to extend or override the
   *    [default](https://github.com/badges/shields/blob/master/core/base-service/check-error-response.js#L5)
-   * @param {object} [attrs.systemErrors={}] Key-value map of got network exception codes
-   *    and an object of params to pass when we construct an Inaccessible exception object
-   *    e.g: `{ ECONNRESET: { prettyMessage: 'connection reset' } }`.
-   *    See {@link https://github.com/sindresorhus/got/blob/main/documentation/7-retry.md#errorcodes got error codes}
-   *    for allowed keys
-   *    and {@link module:core/base-service/errors~RuntimeErrorProps} for allowed values
   * @returns {object} Parsed response
-   * @see https://github.com/sindresorhus/got/blob/main/documentation/2-options.md
+   * @see https://github.com/request/request#requestoptions-callback
   */
-  async _requestJson({
-    schema,
-    url,
-    options = {},
-    httpErrors = {},
-    systemErrors = {},
-  }) {
+  async _requestJson({ schema, url, options = {}, errorMessages = {} }) {
    const mergedOptions = {
      ...{ headers: { Accept: 'application/json' } },
      ...options,
@@ -57,8 +45,7 @@ class BaseJsonService extends BaseService {
    const { buffer } = await this._request({
      url,
      options: mergedOptions,
-      httpErrors,
-      systemErrors,
+      errorMessages,
    })
    const json = this._parseJson(buffer)
    return this.constructor._validate(json, schema)
--- a/core/base-service/base-json.spec.js
+++ b/core/base-service/base-json.spec.js
@@ -22,9 +22,9 @@ class DummyJsonService extends BaseJsonService {

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

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

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

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

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

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

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

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

    it('handles unparseable json responses', async function () {
-      const requestFetcher = async () => ({
+      const sendAndCacheRequest = async () => ({
        buffer: 'not json',
        res: { statusCode: 200 },
      })
      expect(
        await DummyJsonService.invoke(
-          { requestFetcher },
+          { sendAndCacheRequest },
          { handleInternalErrors: false }
        )
      ).to.deep.equal({
--- a/core/base-service/base-svg-scraping.js
+++ b/core/base-service/base-svg-scraping.js
@@ -51,28 +51,21 @@ class BaseSvgScrapingService extends BaseService {
   * @param {RegExp} attrs.valueMatcher
   *    RegExp to match the value we want to parse from the SVG
   * @param {string} attrs.url URL to request
-   * @param {object} [attrs.options={}] Options to pass to got. See
-   *    [documentation](https://github.com/sindresorhus/got/blob/main/documentation/2-options.md)
-   * @param {object} [attrs.httpErrors={}] Key-value map of status codes
+   * @param {object} [attrs.options={}] Options to pass to request. See
+   *    [documentation](https://github.com/request/request#requestoptions-callback)
+   * @param {object} [attrs.errorMessages={}] Key-value map of status codes
   *    and custom error messages e.g: `{ 404: 'package not found' }`.
   *    This can be used to extend or override the
   *    [default](https://github.com/badges/shields/blob/master/core/base-service/check-error-response.js#L5)
-   * @param {object} [attrs.systemErrors={}] Key-value map of got network exception codes
-   *    and an object of params to pass when we construct an Inaccessible exception object
-   *    e.g: `{ ECONNRESET: { prettyMessage: 'connection reset' } }`.
-   *    See {@link https://github.com/sindresorhus/got/blob/main/documentation/7-retry.md#errorcodes got error codes}
-   *    for allowed keys
-   *    and {@link module:core/base-service/errors~RuntimeErrorProps} for allowed values
   * @returns {object} Parsed response
-   * @see https://github.com/sindresorhus/got/blob/main/documentation/2-options.md
+   * @see https://github.com/request/request#requestoptions-callback
   */
  async _requestSvg({
    schema,
    valueMatcher,
    url,
    options = {},
-    httpErrors = {},
-    systemErrors = {},
+    errorMessages = {},
  }) {
    const logTrace = (...args) => trace.logTrace('fetch', ...args)
    const mergedOptions = {
@@ -82,8 +75,7 @@ class BaseSvgScrapingService extends BaseService {
    const { buffer } = await this._request({
      url,
      options: mergedOptions,
-      httpErrors,
-      systemErrors,
+      errorMessages,
    })
    logTrace(emojic.dart, 'Response SVG', buffer)
    const data = {
--- a/core/base-service/base-svg-scraping.spec.js
+++ b/core/base-service/base-svg-scraping.spec.js
@@ -34,9 +34,9 @@ describe('BaseSvgScrapingService', function () {
  })

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

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

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

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

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

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

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

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

 // See available emoji at http://emoji.muan.co/
 import emojic from 'emojic'
-import { XMLParser, XMLValidator } from 'fast-xml-parser'
+import fastXmlParser from 'fast-xml-parser'
 import BaseService from './base.js'
 import trace from './trace.js'
 import { InvalidResponse } from './errors.js'
@@ -22,30 +22,23 @@ class BaseXmlService extends BaseService {
   * @param {object} attrs Refer to individual attrs
   * @param {Joi} attrs.schema Joi schema to validate the response against
   * @param {string} attrs.url URL to request
-   * @param {object} [attrs.options={}] Options to pass to got. See
-   *    [documentation](https://github.com/sindresorhus/got/blob/main/documentation/2-options.md)
-   * @param {object} [attrs.httpErrors={}] Key-value map of status codes
+   * @param {object} [attrs.options={}] Options to pass to request. See
+   *    [documentation](https://github.com/request/request#requestoptions-callback)
+   * @param {object} [attrs.errorMessages={}] Key-value map of status codes
   *    and custom error messages e.g: `{ 404: 'package not found' }`.
   *    This can be used to extend or override the
   *    [default](https://github.com/badges/shields/blob/master/core/base-service/check-error-response.js#L5)
-   * @param {object} [attrs.systemErrors={}] Key-value map of got network exception codes
-   *    and an object of params to pass when we construct an Inaccessible exception object
-   *    e.g: `{ ECONNRESET: { prettyMessage: 'connection reset' } }`.
-   *    See {@link https://github.com/sindresorhus/got/blob/main/documentation/7-retry.md#errorcodes got error codes}
-   *    for allowed keys
-   *    and {@link module:core/base-service/errors~RuntimeErrorProps} for allowed values
   * @param {object} [attrs.parserOptions={}] Options to pass to fast-xml-parser. See
   *    [documentation](https://github.com/NaturalIntelligence/fast-xml-parser#xml-to-json)
   * @returns {object} Parsed response
-   * @see https://github.com/sindresorhus/got/blob/main/documentation/2-options.md
+   * @see https://github.com/request/request#requestoptions-callback
   * @see https://github.com/NaturalIntelligence/fast-xml-parser#xml-to-json
   */
  async _requestXml({
    schema,
    url,
    options = {},
-    httpErrors = {},
-    systemErrors = {},
+    errorMessages = {},
    parserOptions = {},
  }) {
    const logTrace = (...args) => trace.logTrace('fetch', ...args)
@@ -56,18 +49,16 @@ class BaseXmlService extends BaseService {
    const { buffer } = await this._request({
      url,
      options: mergedOptions,
-      httpErrors,
-      systemErrors,
+      errorMessages,
    })
-    const validateResult = XMLValidator.validate(buffer)
+    const validateResult = fastXmlParser.validate(buffer)
    if (validateResult !== true) {
      throw new InvalidResponse({
        prettyMessage: 'unparseable xml response',
        underlyingError: validateResult.err,
      })
    }
-    const parser = new XMLParser(parserOptions)
-    const xml = parser.parse(buffer)
+    const xml = fastXmlParser.parse(buffer, parserOptions)
    logTrace(emojic.dart, 'Response XML (before validation)', xml, {
      deep: true,
    })
--- a/core/base-service/base-xml.spec.js
+++ b/core/base-service/base-xml.spec.js
@@ -22,9 +22,9 @@ class DummyXmlService extends BaseXmlService {

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

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

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

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

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

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

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

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

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

    it('handles unparseable xml responses', async function () {
-      const requestFetcher = async () => ({
+      const sendAndCacheRequest = async () => ({
        buffer: 'not xml',
        res: { statusCode: 200 },
      })
      expect(
        await DummyXmlService.invoke(
-          { requestFetcher },
+          { sendAndCacheRequest },
          { handleInternalErrors: false }
        )
      ).to.deep.equal({
--- a/core/base-service/base-yaml.js
+++ b/core/base-service/base-yaml.js
@@ -21,28 +21,21 @@ class BaseYamlService extends BaseService {
   * @param {object} attrs Refer to individual attrs
   * @param {Joi} attrs.schema Joi schema to validate the response against
   * @param {string} attrs.url URL to request
-   * @param {object} [attrs.options={}] Options to pass to got. See
-   *    [documentation](https://github.com/sindresorhus/got/blob/main/documentation/2-options.md)
-   * @param {object} [attrs.httpErrors={}] Key-value map of status codes
+   * @param {object} [attrs.options={}] Options to pass to request. See
+   *    [documentation](https://github.com/request/request#requestoptions-callback)
+   * @param {object} [attrs.errorMessages={}] Key-value map of status codes
   *    and custom error messages e.g: `{ 404: 'package not found' }`.
   *    This can be used to extend or override the
   *    [default](https://github.com/badges/shields/blob/master/core/base-service/check-error-response.js#L5)
-   * @param {object} [attrs.systemErrors={}] Key-value map of got network exception codes
-   *    and an object of params to pass when we construct an Inaccessible exception object
-   *    e.g: `{ ECONNRESET: { prettyMessage: 'connection reset' } }`.
-   *    See {@link https://github.com/sindresorhus/got/blob/main/documentation/7-retry.md#errorcodes got error codes}
-   *    for allowed keys
-   *    and {@link module:core/base-service/errors~RuntimeErrorProps} for allowed values
   * @param {object} [attrs.encoding='utf8'] Character encoding
   * @returns {object} Parsed response
-   * @see https://github.com/sindresorhus/got/blob/main/documentation/2-options.md
+   * @see https://github.com/request/request#requestoptions-callback
   */
  async _requestYaml({
    schema,
    url,
    options = {},
-    httpErrors = {},
-    systemErrors = {},
+    errorMessages = {},
    encoding = 'utf8',
  }) {
    const logTrace = (...args) => trace.logTrace('fetch', ...args)
@@ -58,8 +51,7 @@ class BaseYamlService extends BaseService {
    const { buffer } = await this._request({
      url,
      options: mergedOptions,
-      httpErrors,
-      systemErrors,
+      errorMessages,
    })
    let parsed
    try {
--- a/core/base-service/base-yaml.spec.js
+++ b/core/base-service/base-yaml.spec.js
@@ -38,9 +38,9 @@ foo: baz

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

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

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

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

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

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

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

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

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

-  /**
-   * Optional: an OpenAPI Paths Object describing this service's
-   * route or routes in OpenAPI format.
-   *
-   * @see https://swagger.io/specification/#paths-object
-   * @abstract
-   */
-  static openApi = undefined
-
  static get _cacheLength() {
    const cacheLengths = {
      build: 30,
@@ -156,7 +144,6 @@ class BaseService {
      version: 300,
      debug: 60,
      downloads: 900,
-      rating: 900,
      social: 900,
    }
    return cacheLengths[this.category]
@@ -192,7 +179,7 @@ class BaseService {
  }

  static getDefinition() {
-    const { category, name, isDeprecated, openApi } = this
+    const { category, name, isDeprecated } = this
    const { base, format, pattern } = this.route
    const queryParams = getQueryParamNames(this.route)

@@ -209,7 +196,7 @@ class BaseService {
      route = undefined
    }

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

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

@@ -217,43 +204,33 @@ class BaseService {
  }

  constructor(
-    { requestFetcher, authHelper, metricHelper },
+    { sendAndCacheRequest, authHelper, metricHelper },
    { handleInternalErrors }
  ) {
-    this._requestFetcher = requestFetcher
+    this._requestFetcher = sendAndCacheRequest
    this.authHelper = authHelper
    this._handleInternalErrors = handleInternalErrors
    this._metricHelper = metricHelper
  }

-  async _request({ url, options = {}, httpErrors = {}, systemErrors = {} }) {
+  async _request({ url, options = {}, errorMessages = {} }) {
    const logTrace = (...args) => trace.logTrace('fetch', ...args)
    let logUrl = url
    const logOptions = Object.assign({}, options)
-    if ('searchParams' in options && options.searchParams != null) {
-      const params = new URLSearchParams(
-        Object.fromEntries(
-          Object.entries(options.searchParams).filter(
-            ([k, v]) => v !== undefined
-          )
-        )
-      )
+    if ('qs' in options) {
+      const params = new URLSearchParams(options.qs)
      logUrl = `${url}?${params.toString()}`
-      delete logOptions.searchParams
+      delete logOptions.qs
    }
    logTrace(
      emojic.bowAndArrow,
      'Request',
      `${logUrl}\n${JSON.stringify(logOptions, null, 2)}`
    )
-    const { res, buffer } = await this._requestFetcher(
-      url,
-      options,
-      systemErrors
-    )
+    const { res, buffer } = await this._requestFetcher(url, options)
    await this._meterResponse(res, buffer)
    logTrace(emojic.dart, 'Response status code', res.statusCode)
-    return checkErrorResponse(httpErrors)({ buffer, res })
+    return checkErrorResponse(errorMessages)({ buffer, res })
  }

  static enabledMetrics = []
@@ -298,7 +275,7 @@ class BaseService {
  /**
   * Asynchronous function to handle requests for this service. Take the route
   * parameters (as defined in the `route` property), perform a request using
-   * `this._requestFetcher`, and return the badge data.
+   * `this._sendAndCacheRequest`, and return the badge data.
   *
   * @abstract
   * @param {object} namedParams Params parsed from route pattern
@@ -332,15 +309,11 @@ class BaseService {
      error instanceof Deprecated
    ) {
      trace.logTrace('outbound', emojic.noGoodWoman, 'Handled error', error)
-      const serviceData = {
+      return {
        isError: true,
        message: error.prettyMessage,
        color: 'lightgray',
      }
-      if (error.cacheSeconds !== undefined) {
-        serviceData.cacheSeconds = error.cacheSeconds
-      }
-      return serviceData
    } else if (this._handleInternalErrors) {
      if (
        !trace.logTrace(
@@ -447,16 +420,10 @@ class BaseService {
  }

  static register(
-    {
-      camp,
-      handleRequest,
-      githubApiProvider,
-      librariesIoApiProvider,
-      metricInstance,
-    },
+    { camp, handleRequest, githubApiProvider, metricInstance },
    serviceConfig
  ) {
-    const { cacheHeaders: cacheHeaderConfig } = serviceConfig
+    const { cacheHeaders: cacheHeaderConfig, fetchLimitBytes } = serviceConfig
    const { regex, captureNames } = prepareRoute(this.route)
    const queryParams = getQueryParamNames(this.route)

@@ -465,19 +432,21 @@ class BaseService {
      ServiceClass: this,
    })

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

          const namedParams = namedParamsForMatch(captureNames, match, this)
          const serviceData = await this.invoke(
            {
-              requestFetcher: fetch,
+              sendAndCacheRequest: fetcher,
+              sendAndCacheRequestWithCallbacks: request,
              githubApiProvider,
-              librariesIoApiProvider,
              metricHelper,
            },
            serviceConfig,
@@ -498,6 +467,7 @@ class BaseService {
          metricHandle.noteResponseSent()
        },
        cacheLength: this._cacheLength,
+        fetchLimitBytes,
      })
    )
  }
--- a/core/base-service/base.spec.js
+++ b/core/base-service/base.spec.js
@@ -124,11 +124,15 @@ describe('BaseService', function () {
  })

  describe('Logging', function () {
+    let sandbox
    beforeEach(function () {
-      sinon.stub(trace, 'logTrace')
+      sandbox = sinon.createSandbox()
    })
    afterEach(function () {
-      sinon.restore()
+      sandbox.restore()
+    })
+    beforeEach(function () {
+      sandbox.stub(trace, 'logTrace')
    })
    it('Invokes the logger as expected', async function () {
      await DummyService.invoke(
@@ -422,39 +426,36 @@ describe('BaseService', function () {
  })

  describe('request', function () {
+    let sandbox
    beforeEach(function () {
-      sinon.stub(trace, 'logTrace')
+      sandbox = sinon.createSandbox()
    })
    afterEach(function () {
-      sinon.restore()
+      sandbox.restore()
+    })
+    beforeEach(function () {
+      sandbox.stub(trace, 'logTrace')
    })

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

      const url = 'some-url'
-      const options = {
-        headers: { Cookie: 'some-cookie' },
-        searchParams: { param1: 'foobar', param2: undefined },
-      }
+      const options = { headers: { Cookie: 'some-cookie' } }
      await serviceInstance._request({ url, options })

      expect(trace.logTrace).to.be.calledWithMatch(
        'fetch',
        sinon.match.string,
        'Request',
-        `${url}?param1=foobar\n${JSON.stringify(
-          { headers: options.headers },
-          null,
-          2
-        )}`
+        `${url}\n${JSON.stringify(options, null, 2)}`
      )
      expect(trace.logTrace).to.be.calledWithMatch(
        'fetch',
@@ -465,12 +466,12 @@ describe('BaseService', function () {
    })

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

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

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

--- a/core/base-service/cache-headers.js
+++ b/core/base-service/cache-headers.js
@@ -39,7 +39,6 @@ function coalesceCacheLength({
  assert(defaultCacheLengthSeconds !== undefined)

  const cacheLength = coalesce(
-    serviceOverrideCacheLengthSeconds,
    serviceDefaultCacheLengthSeconds,
    defaultCacheLengthSeconds
  )
@@ -47,6 +46,7 @@ function coalesceCacheLength({
  // Overrides can apply _more_ caching, but not less. Query param overriding
  // can request more overriding than service override, but not less.
  const candidateOverrides = [
+    serviceOverrideCacheLengthSeconds,
    overrideCacheLengthFromQueryParams(queryParams),
  ].filter(x => x !== undefined)

--- a/core/base-service/cache-headers.spec.js
+++ b/core/base-service/cache-headers.spec.js
@@ -74,12 +74,12 @@ describe('Cache header functions', function () {
        serviceDefaultCacheLengthSeconds: 900,
        serviceOverrideCacheLengthSeconds: 400,
        queryParams: {},
-      }).expect(400)
+      }).expect(900)
      given({
        cacheHeaderConfig,
        serviceOverrideCacheLengthSeconds: 400,
        queryParams: {},
-      }).expect(400)
+      }).expect(777)
      given({
        cacheHeaderConfig,
        serviceOverrideCacheLengthSeconds: 900,
@@ -99,11 +99,14 @@ describe('Cache header functions', function () {
  })

  describe('setHeadersForCacheLength', function () {
+    let sandbox
    beforeEach(function () {
-      sinon.useFakeTimers()
+      sandbox = sinon.createSandbox()
+      sandbox.useFakeTimers()
    })
    afterEach(function () {
-      sinon.restore()
+      sandbox.restore()
+      sandbox = undefined
    })

    it('should set the correct Date header', function () {
--- a/core/base-service/check-error-response.js
+++ b/core/base-service/check-error-response.js
@@ -2,22 +2,21 @@ import { NotFound, InvalidResponse, Inaccessible } from './errors.js'

 const defaultErrorMessages = {
  404: 'not found',
-  429: 'rate limited by upstream service',
 }

-export default function checkErrorResponse(httpErrors = {}) {
+export default function checkErrorResponse(errorMessages = {}) {
  return async function ({ buffer, res }) {
    let error
-    httpErrors = { ...defaultErrorMessages, ...httpErrors }
+    errorMessages = { ...defaultErrorMessages, ...errorMessages }
    if (res.statusCode === 404) {
-      error = new NotFound({ prettyMessage: httpErrors[404] })
+      error = new NotFound({ prettyMessage: errorMessages[404] })
    } else if (res.statusCode !== 200) {
      const underlying = Error(
        `Got status code ${res.statusCode} (expected 200)`
      )
      const props = { underlyingError: underlying }
-      if (httpErrors[res.statusCode] !== undefined) {
-        props.prettyMessage = httpErrors[res.statusCode]
+      if (errorMessages[res.statusCode] !== undefined) {
+        props.prettyMessage = errorMessages[res.statusCode]
      }
      if (res.statusCode >= 500) {
        error = new Inaccessible(props)
--- a/core/base-service/check-error-response.spec.js
+++ b/core/base-service/check-error-response.spec.js
@@ -45,42 +45,6 @@ describe('async error handler', function () {
    })
  })

-  context('when status is 429', function () {
-    const buffer = Buffer.from('some stuff')
-    const res = { statusCode: 429 }
-
-    it('throws InvalidResponse', async function () {
-      try {
-        await checkErrorResponse()({ res, buffer })
-        expect.fail('Expected to throw')
-      } catch (e) {
-        expect(e).to.be.an.instanceof(InvalidResponse)
-        expect(e.message).to.equal(
-          'Invalid Response: Got status code 429 (expected 200)'
-        )
-        expect(e.prettyMessage).to.equal('rate limited by upstream service')
-        expect(e.response).to.equal(res)
-        expect(e.buffer).to.equal(buffer)
-      }
-    })
-
-    it('displays the custom too many requests', async function () {
-      const notFoundMessage = "terribly sorry but that's one too many requests"
-      try {
-        await checkErrorResponse({ 429: notFoundMessage })({ res, buffer })
-        expect.fail('Expected to throw')
-      } catch (e) {
-        expect(e).to.be.an.instanceof(InvalidResponse)
-        expect(e.message).to.equal(
-          'Invalid Response: Got status code 429 (expected 200)'
-        )
-        expect(e.prettyMessage).to.equal(
-          "terribly sorry but that's one too many requests"
-        )
-      }
-    })
-  })
-
  context('when status is 4xx', function () {
    it('throws InvalidResponse', async function () {
      const res = { statusCode: 499 }
--- a/core/base-service/coalesce-badge.js
+++ b/core/base-service/coalesce-badge.js
@@ -16,15 +16,16 @@ import toArray from './to-array.js'
 //
 // Logos are resolved in this manner:
 //
-// 1. When `?logo=` contains a named logo or the name of one of the Shields
-//    logos or contains base64-encoded SVG, that logo is used. When a
-//    `&logoColor=` is specified, that color is used (except for the
-//    base64-encoded logos). Otherwise the default color is used. If the color
-//    is specified for a multicolor Shield logo, the named logo will be used and
-//    colored. The appearance of the logo can be customized using `logoWidth`,
-//    and in the case of the popout badge, `logoPosition`. When `?logo=` is
-//    specified, any logo-related parameters specified dynamically by the
-//    service, or by default in the service, are ignored.
+// 1. When `?logo=` contains the name of one of the Shields logos, or contains
+//    base64-encoded SVG, that logo is used. In the case of a named logo, when
+//    a `&logoColor=` is specified, that color is used. Otherwise the default
+//    color is used. `logoColor` will not be applied to a custom
+//    (base64-encoded) logo; if a custom color is desired the logo should be
+//    recolored prior to making the request. The appearance of the logo can be
+//    customized using `logoWidth`, and in the case of the popout badge,
+//    `logoPosition`. When `?logo=` is specified, any logo-related parameters
+//    specified dynamically by the service, or by default in the service, are
+//    ignored.
 // 2. The second precedence is the dynamic logo returned by a service. This is
 //    used only by the Endpoint badge. The `logoColor` can be overridden by the
 //    query string.
--- a/core/base-service/coalesce-badge.spec.js
+++ b/core/base-service/coalesce-badge.spec.js
@@ -153,18 +153,10 @@ describe('coalesceBadge', function () {
      ).and.not.to.be.empty
    })

-    it('applies the named monochrome logo with color', function () {
-      expect(
-        coalesceBadge({}, { namedLogo: 'dependabot', logoColor: 'blue' }, {})
-          .logo
-      ).to.equal(getShieldsIcon({ name: 'dependabot', color: 'blue' })).and.not
-        .to.be.empty
-    })
-
-    it('applies the named multicolored logo with color', function () {
+    it('applies the named logo with color', function () {
      expect(
        coalesceBadge({}, { namedLogo: 'npm', logoColor: 'blue' }, {}).logo
-      ).to.equal(getSimpleIcon({ name: 'npm', color: 'blue' })).and.not.to.be
+      ).to.equal(getShieldsIcon({ name: 'npm', color: 'blue' })).and.not.to.be
        .empty
    })

@@ -174,25 +166,15 @@ describe('coalesceBadge', function () {
      ).to.equal(getShieldsIcon({ name: 'npm' })).and.not.be.empty
    })

-    it('overrides the monochrome logo with a color', function () {
-      expect(
-        coalesceBadge(
-          { logo: 'dependabot', logoColor: 'blue' },
-          { namedLogo: 'appveyor' },
-          {}
-        ).logo
-      ).to.equal(getShieldsIcon({ name: 'dependabot', color: 'blue' })).and.not
-        .be.empty
-    })
-
-    it('overrides multicolored logo with a color', function () {
+    it('overrides the logo with a color', function () {
      expect(
        coalesceBadge(
          { logo: 'npm', logoColor: 'blue' },
          { namedLogo: 'appveyor' },
          {}
        ).logo
-      ).to.equal(getSimpleIcon({ name: 'npm', color: 'blue' })).and.not.be.empty
+      ).to.equal(getShieldsIcon({ name: 'npm', color: 'blue' })).and.not.be
+        .empty
    })

    it("when the logo is overridden, it ignores the service's logo color, position, and width", function () {
@@ -210,25 +192,15 @@ describe('coalesceBadge', function () {
      ).to.equal(getShieldsIcon({ name: 'npm' })).and.not.be.empty
    })

-    it("overrides the service monochome logo's color", function () {
-      expect(
-        coalesceBadge(
-          { logoColor: 'blue' },
-          { namedLogo: 'dependabot', logoColor: 'red' },
-          {}
-        ).logo
-      ).to.equal(getShieldsIcon({ name: 'dependabot', color: 'blue' })).and.not
-        .be.empty
-    })
-
-    it("overrides the service multicolored logo's color", function () {
+    it("overrides the service logo's color", function () {
      expect(
        coalesceBadge(
          { logoColor: 'blue' },
          { namedLogo: 'npm', logoColor: 'red' },
          {}
        ).logo
-      ).to.equal(getSimpleIcon({ name: 'npm', color: 'blue' })).and.not.be.empty
+      ).to.equal(getShieldsIcon({ name: 'npm', color: 'blue' })).and.not.be
+        .empty
    })

    // https://github.com/badges/shields/issues/2998
--- a/core/base-service/errors.js
+++ b/core/base-service/errors.js
@@ -42,7 +42,6 @@ class ShieldsRuntimeError extends Error {
    if (props.underlyingError) {
      this.stack = props.underlyingError.stack
    }
-    this.cacheSeconds = props.cacheSeconds
  }
 }

@@ -207,9 +206,6 @@ class Deprecated extends ShieldsRuntimeError {
 * @property {string} prettyMessage User-facing error message to override the
 * value of `defaultPrettyMessage()`. This is the text that will appear on the
 * badge when we catch and render the exception (Optional)
- * @property {number} cacheSeconds Length of time to cache this error response
- * for. Defaults to the cacheLength of the service class throwing the error
- * (Optional)
 */

 export {
--- a/core/base-service/examples.js
+++ b/core/base-service/examples.js
@@ -129,7 +129,6 @@ function transformExample(inExample, index, ServiceClass) {
    ServiceClass
  )

-  const category = categories.find(c => c.id === ServiceClass.category)
  return {
    title,
    example: {
@@ -147,7 +146,9 @@ function transformExample(inExample, index, ServiceClass) {
      style: style === 'flat' ? undefined : style,
      namedLogo,
    },
-    keywords: category ? keywords.concat(category.keywords) : keywords,
+    keywords: keywords.concat(
+      categories.find(c => c.id === ServiceClass.category).keywords
+    ),
    documentation: documentation ? { __html: documentation } : undefined,
  }
 }
--- a/core/base-service/got-config.js
+++ b/core/base-service/got-config.js
@@ -1,26 +0,0 @@
-import bytes from 'bytes'
-import configModule from 'config'
-import Joi from 'joi'
-import { fileSize } from '../../services/validators.js'
-
-const schema = Joi.object({
-  fetchLimit: fileSize,
-  userAgentBase: Joi.string().required(),
-}).required()
-const config = configModule.util.toObject()
-const publicConfig = Joi.attempt(config.public, schema, { allowUnknown: true })
-
-const fetchLimitBytes = bytes(publicConfig.fetchLimit)
-
-function getUserAgent(userAgentBase = publicConfig.userAgentBase) {
-  let version = 'dev'
-  if (process.env.DOCKER_SHIELDS_VERSION) {
-    version = process.env.DOCKER_SHIELDS_VERSION
-  }
-  if (process.env.HEROKU_SLUG_COMMIT) {
-    version = process.env.HEROKU_SLUG_COMMIT.substring(0, 7)
-  }
-  return `${userAgentBase}/${version}`
-}
-
-export { fetchLimitBytes, getUserAgent }
--- a/core/base-service/got-config.spec.js
+++ b/core/base-service/got-config.spec.js
@@ -1,27 +0,0 @@
-import { expect } from 'chai'
-import { getUserAgent } from './got-config.js'
-
-describe('getUserAgent function', function () {
-  afterEach(function () {
-    delete process.env.HEROKU_SLUG_COMMIT
-    delete process.env.DOCKER_SHIELDS_VERSION
-  })
-
-  it('uses the default userAgentBase', function () {
-    expect(getUserAgent()).to.equal('shields (self-hosted)/dev')
-  })
-
-  it('applies custom userAgentBase', function () {
-    expect(getUserAgent('custom')).to.equal('custom/dev')
-  })
-
-  it('uses short commit SHA from HEROKU_SLUG_COMMIT if available', function () {
-    process.env.HEROKU_SLUG_COMMIT = '92090bd44742a5fac03bcb117002088fc7485834'
-    expect(getUserAgent('custom')).to.equal('custom/92090bd')
-  })
-
-  it('uses short commit SHA from DOCKER_SHIELDS_VERSION if available', function () {
-    process.env.DOCKER_SHIELDS_VERSION = 'server-2021-11-22'
-    expect(getUserAgent('custom')).to.equal('custom/server-2021-11-22')
-  })
-})
--- a/core/base-service/got.js
+++ b/core/base-service/got.js
@@ -1,38 +1,70 @@
-import got, { CancelError } from 'got'
+import got from 'got'
 import { Inaccessible, InvalidResponse } from './errors.js'
-import {
-  fetchLimitBytes as fetchLimitBytesDefault,
-  getUserAgent,
-} from './got-config.js'

-const userAgent = getUserAgent()
+const userAgent = 'Shields.io/2003a'

-async function sendRequest(gotWrapper, url, options = {}, systemErrors = {}) {
-  const gotOptions = Object.assign({}, options)
+function requestOptions2GotOptions(options) {
+  const requestOptions = Object.assign({}, options)
+  const gotOptions = {}
+  const interchangableOptions = ['body', 'form', 'headers', 'method', 'url']
+
+  interchangableOptions.forEach(function (opt) {
+    if (opt in requestOptions) {
+      gotOptions[opt] = requestOptions[opt]
+      delete requestOptions[opt]
+    }
+  })
+
+  if ('qs' in requestOptions) {
+    gotOptions.searchParams = requestOptions.qs
+    delete requestOptions.qs
+  }
+
+  if ('gzip' in requestOptions) {
+    gotOptions.decompress = requestOptions.gzip
+    delete requestOptions.gzip
+  }
+
+  if ('strictSSL' in requestOptions) {
+    gotOptions.https = {
+      rejectUnauthorized: requestOptions.strictSSL,
+    }
+    delete requestOptions.strictSSL
+  }
+
+  if ('auth' in requestOptions) {
+    gotOptions.username = requestOptions.auth.user
+    gotOptions.password = requestOptions.auth.pass
+    delete requestOptions.auth
+  }
+
+  if (Object.keys(requestOptions).length > 0) {
+    throw new Error(`Found unrecognised options ${Object.keys(requestOptions)}`)
+  }
+
+  return gotOptions
+}
+
+async function sendRequest(gotWrapper, url, options) {
+  const gotOptions = requestOptions2GotOptions(options)
  gotOptions.throwHttpErrors = false
-  gotOptions.retry = { limit: 0 }
+  gotOptions.retry = 0
  gotOptions.headers = gotOptions.headers || {}
  gotOptions.headers['User-Agent'] = userAgent
  try {
    const resp = await gotWrapper(url, gotOptions)
    return { res: resp, buffer: resp.body }
  } catch (err) {
-    if (err instanceof CancelError) {
+    if (err instanceof got.CancelError) {
      throw new InvalidResponse({
        underlyingError: new Error('Maximum response size exceeded'),
      })
    }
-    if (err.code in systemErrors) {
-      throw new Inaccessible({
-        ...systemErrors[err.code],
-        underlyingError: err,
-      })
-    }
    throw new Inaccessible({ underlyingError: err })
  }
 }

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

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

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

  it('should throw an Inaccessible error if the request throws a (non-HTTP) error', async function () {
    nock('https://www.google.com').get('/foo/bar').replyWithError('oh no')
-    const sendRequest = _fetchFactory(1024)
+    const sendRequest = fetchFactory(1024)
    return expect(
      sendRequest('https://www.google.com/foo/bar')
    ).to.be.rejectedWith(Inaccessible, 'oh no')
@@ -36,7 +71,7 @@ describe('got wrapper', function () {
  it('should throw an Inaccessible error if the host can not be accessed', async function () {
    this.timeout(5000)
    nock.disableNetConnect()
-    const sendRequest = _fetchFactory(1024)
+    const sendRequest = fetchFactory(1024)
    return expect(
      sendRequest('https://www.google.com/foo/bar')
    ).to.be.rejectedWith(
@@ -45,48 +80,18 @@ describe('got wrapper', function () {
    )
  })

-  it('should throw a custom error if provided', async function () {
-    const sendRequest = _fetchFactory(1024)
-    return (
-      expect(
-        sendRequest(
-          'https://www.google.com/foo/bar',
-          { timeout: { request: 1 } },
-          {
-            ETIMEDOUT: {
-              prettyMessage: 'Oh no! A terrible thing has happened',
-              cacheSeconds: 10,
-            },
-          }
-        )
-      )
-        .to.be.rejectedWith(
-          Inaccessible,
-          "Inaccessible: Timeout awaiting 'request' for 1ms"
-        )
-        // eslint-disable-next-line promise/prefer-await-to-then
-        .then(error => {
-          expect(error).to.have.property(
-            'prettyMessage',
-            'Oh no! A terrible thing has happened'
-          )
-          expect(error).to.have.property('cacheSeconds', 10)
-        })
-    )
-  })
-
  it('should pass a custom user agent header', async function () {
    nock('https://www.google.com', {
      reqheaders: {
        'user-agent': function (agent) {
-          return agent.startsWith('shields (self-hosted)')
+          return agent.startsWith('Shields.io')
        },
      },
    })
      .get('/foo/bar')
      .once()
      .reply(200)
-    const sendRequest = _fetchFactory(1024)
+    const sendRequest = fetchFactory(1024)
    await sendRequest('https://www.google.com/foo/bar')
  })

--- a/core/base-service/index.js
+++ b/core/base-service/index.js
@@ -13,7 +13,6 @@ import {
  Inaccessible,
  InvalidParameter,
  Deprecated,
-  ImproperlyConfigured,
 } from './errors.js'

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

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

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

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

  return (queryParams, match, end, ask) => {
    /*
@@ -65,7 +90,7 @@ function handleRequest(cacheHeaderConfig, handlerOptions) {
    */
    if (match[0] === '/endpoint' && Object.keys(queryParams).length === 0) {
      ask.res.statusCode = 301
-      ask.res.setHeader('Location', '/badges/endpoint-badge')
+      ask.res.setHeader('Location', '/endpoint/')
      ask.res.end()
      return
    }
@@ -73,9 +98,11 @@ function handleRequest(cacheHeaderConfig, handlerOptions) {
    // `defaultCacheLengthSeconds` can be overridden by
    // `serviceDefaultCacheLengthSeconds` (either by category or on a badge-
    // by-badge basis). Then in turn that can be overridden by
-    // `serviceOverrideCacheLengthSeconds`.
-    // Then the `cacheSeconds` query param can also override both of those
-    // but only if `cacheSeconds` is longer.
+    // `serviceOverrideCacheLengthSeconds` (which we expect to be used only in
+    // the dynamic badge) but only if `serviceOverrideCacheLengthSeconds` is
+    // longer than `serviceDefaultCacheLengthSeconds` and then the `cacheSeconds`
+    // query param can also override both of those but again only if `cacheSeconds`
+    // is longer.
    //
    // When the legacy services have been rewritten, all the code in here
    // will go away, which should achieve this goal in a simpler way.
@@ -112,6 +139,40 @@ function handleRequest(cacheHeaderConfig, handlerOptions) {
      makeSend(extension, ask.res, end)(svg)
    }, 25000)

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

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

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

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

-      it('should allow serviceData to override the default cache headers with longer value', async function () {
+      it('should let live service data override the default cache headers with longer value', async function () {
        camp.route(
          /^\/testing\/([^/]+)\.(svg|png|gif|jpg|json)$/,
          handleRequest(
@@ -168,7 +245,7 @@ describe('The request handler', function () {
        expect(headers['cache-control']).to.equal('max-age=400, s-maxage=400')
      })

-      it('should allow serviceData to override the default cache headers with shorter value', async function () {
+      it('should not let live service data override the default cache headers with shorter value', async function () {
        camp.route(
          /^\/testing\/([^/]+)\.(svg|png|gif|jpg|json)$/,
          handleRequest(
@@ -185,7 +262,7 @@ describe('The request handler', function () {
        )

        const { headers } = await got(`${baseUrl}/testing/123.json`)
-        expect(headers['cache-control']).to.equal('max-age=200, s-maxage=200')
+        expect(headers['cache-control']).to.equal('max-age=300, s-maxage=300')
      })

      it('should set the expires header to current time + cacheSeconds', async function () {
--- a/core/base-service/legacy-result-sender.js
+++ b/core/base-service/legacy-result-sender.js
@@ -11,14 +11,12 @@ function streamFromString(str) {

 function sendSVG(res, askres, end) {
  askres.setHeader('Content-Type', 'image/svg+xml;charset=utf-8')
-  askres.setHeader('Content-Length', Buffer.byteLength(res, 'utf8'))
  end(null, { template: streamFromString(res) })
 }

 function sendJSON(res, askres, end) {
  askres.setHeader('Content-Type', 'application/json')
  askres.setHeader('Access-Control-Allow-Origin', '*')
-  askres.setHeader('Content-Length', Buffer.byteLength(res, 'utf8'))
  end(null, { template: streamFromString(res) })
 }

--- a/core/base-service/loader-test-fixtures/invalid-mixed.fixture.js
+++ b/core/base-service/loader-test-fixtures/invalid-mixed.fixture.js
@@ -1,10 +1,10 @@
 import BaseJsonService from '../base-json.js'

 class BadBaseService {}
-class GoodMixedService extends BaseJsonService {
+class GoodService extends BaseJsonService {
  static category = 'build'
  static route = { base: 'it/is', pattern: 'good' }
 }
-class BadMixedService extends BadBaseService {}
+class BadService extends BadBaseService {}

-export default [GoodMixedService, BadMixedService]
+export default [GoodService, BadService]
--- a/core/base-service/loader-test-fixtures/invalid-no-base.fixture.js
+++ b/core/base-service/loader-test-fixtures/invalid-no-base.fixture.js
@@ -1,3 +1,3 @@
-class BadNoBaseService {}
+class BadService {}

-export default BadNoBaseService
+export default BadService
--- a/core/base-service/loader-test-fixtures/invalid-wrong-base.fixture.js
+++ b/core/base-service/loader-test-fixtures/invalid-wrong-base.fixture.js
@@ -1,4 +1,4 @@
 class BadBaseService {}
-class BadChildService extends BadBaseService {}
+class BadService extends BadBaseService {}

-export default BadChildService
+export default BadService
--- a/core/base-service/loader-test-fixtures/valid-array.fixture.js
+++ b/core/base-service/loader-test-fixtures/valid-array.fixture.js
@@ -1,12 +1,12 @@
 import BaseJsonService from '../base-json.js'

-class GoodServiceArrayOne extends BaseJsonService {
+class GoodServiceOne extends BaseJsonService {
  static category = 'build'
  static route = { base: 'good', pattern: 'one' }
 }
-class GoodServiceArrayTwo extends BaseJsonService {
+class GoodServiceTwo extends BaseJsonService {
  static category = 'build'
  static route = { base: 'good', pattern: 'two' }
 }

-export default [GoodServiceArrayOne, GoodServiceArrayTwo]
+export default [GoodServiceOne, GoodServiceTwo]
--- a/core/base-service/loader-test-fixtures/valid-object.fixture.js
+++ b/core/base-service/loader-test-fixtures/valid-object.fixture.js
@@ -1,12 +1,12 @@
 import BaseJsonService from '../base-json.js'

-class GoodServiceObjectOne extends BaseJsonService {
+class GoodServiceOne extends BaseJsonService {
  static category = 'build'
  static route = { base: 'good', pattern: 'one' }
 }
-class GoodServiceObjectTwo extends BaseJsonService {
+class GoodServiceTwo extends BaseJsonService {
  static category = 'build'
  static route = { base: 'good', pattern: 'two' }
 }

-export { GoodServiceObjectOne, GoodServiceObjectTwo }
+export { GoodServiceOne, GoodServiceTwo }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Caleb Cartwright	c6e31d7f32	load and manage persisted tokens with scope support	2021-09-19 11:41:26 -05:00
Caleb Cartwright	3aadb79325	allow github service classes to define scope requirements	2021-09-19 11:40:21 -05:00
Caleb Cartwright	b8412fd80b	support scoped and unscoped tokens in API Provider	2021-09-19 11:39:48 -05:00
Caleb Cartwright	345188e34b	expose token pools internal counts of held tokens	2021-09-19 11:38:53 -05:00
Caleb Cartwright	a92dc72ff5	support including scopes on oauth authorization	2021-09-19 11:37:18 -05:00