Changelog for Release server-2021-08-01 (#6848 )

* Update Changelog Co-authored-by: release[bot] <actions@users.noreply.github.com> Co-authored-by: chris48s <chris48s@users.noreply.github.com>
add github actions to build/push docker images (#6679 )
2021-08-01 21:55:19 +01:00 · 2021-08-01 21:42:02 +01:00 · 2021-07-31 20:30:10 +01:00 · 2021-07-31 20:20:32 +01:00 · 2021-07-31 20:12:37 +01:00 · 2021-07-31 10:20:14 -05:00
1163 changed files with 8889 additions and 11285 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -236,7 +236,7 @@ jobs:

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

--- a/.dependabot/config.yml
+++ b/.dependabot/config.yml
@@ -1,38 +0,0 @@
-version: 1
-update_configs:
-  # shields.io dependencies
-  - package_manager: 'javascript'
-    directory: '/'
-    update_schedule: 'weekly'
-    automerged_updates:
-      - match:
-          dependency_name: 'chai*'
-          update_type: 'semver:minor'
-      - match:
-          dependency_name: 'cypress'
-          update_type: 'semver:minor'
-      - match:
-          dependency_name: 'eslint*'
-          update_type: 'semver:minor'
-      - match:
-          dependency_name: 'mocha*'
-          update_type: 'semver:minor'
-      - match:
-          dependency_name: 'sazerac'
-          update_type: 'semver:minor'
-      - match:
-          dependency_name: 'sinon*'
-          update_type: 'semver:minor'
-      - match:
-          dependency_name: 'snap-shot-it'
-          update_type: 'semver:minor'
-
-  # badge-maker package dependencies
-  - package_manager: 'javascript'
-    directory: '/badge-maker'
-    update_schedule: 'weekly'
-
-  # approve-bot package dependencies
-  - package_manager: 'javascript'
-    directory: '.github/actions/approve-bot'
-    update_schedule: 'weekly'
--- a/.eslintignore
+++ b/.eslintignore
@@ -2,6 +2,6 @@
 /build
 /coverage
 /__snapshots__
-/public
+public
 badge-maker/node_modules/
 !.github/
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -136,7 +136,6 @@ rules:
  # Shields additions.
  no-var: 'error'
  prefer-const: 'error'
-  strict: 'error'
  arrow-body-style: ['error', 'as-needed']
  no-extension-in-require/main: 'error'
  object-shorthand: ['error', 'properties']
--- a/.github/actions/approve-bot/package-lock.json
+++ b/.github/actions/approve-bot/package-lock.json
@@ -1,170 +0,0 @@
-{
-  "name": "approve-bot",
-  "version": "0.0.0",
-  "lockfileVersion": 1,
-  "requires": true,
-  "dependencies": {
-    "@actions/core": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.4.0.tgz",
-      "integrity": "sha512-CGx2ilGq5i7zSLgiiGUtBCxhRRxibJYU6Fim0Q1Wg2aQL2LTnF27zbqZOrxfvFQ55eSBW0L8uVStgtKMpa0Qlg=="
-    },
-    "@actions/github": {
-      "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": "^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": "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"
-      }
-    },
-    "@octokit/auth-token": {
-      "version": "2.4.5",
-      "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.4.5.tgz",
-      "integrity": "sha512-BpGYsPgJt05M7/L/5FoE1PiAbdxXFZkX/3kDYcsvd1v6UhlnE5e96dTDr0ezX/EFwciQxf3cNV0loipsURU+WA==",
-      "requires": {
-        "@octokit/types": "^6.0.3"
-      }
-    },
-    "@octokit/core": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/@octokit/core/-/core-3.4.0.tgz",
-      "integrity": "sha512-6/vlKPP8NF17cgYXqucdshWqmMZGXkuvtcrWCgU5NOI0Pl2GjlmZyWgBMrU8zJ3v2MJlM6++CiB45VKYmhiWWg==",
-      "requires": {
-        "@octokit/auth-token": "^2.4.4",
-        "@octokit/graphql": "^4.5.8",
-        "@octokit/request": "^5.4.12",
-        "@octokit/request-error": "^2.0.5",
-        "@octokit/types": "^6.0.3",
-        "before-after-hook": "^2.2.0",
-        "universal-user-agent": "^6.0.0"
-      }
-    },
-    "@octokit/endpoint": {
-      "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",
-        "universal-user-agent": "^6.0.0"
-      }
-    },
-    "@octokit/graphql": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-4.6.2.tgz",
-      "integrity": "sha512-WmsIR1OzOr/3IqfG9JIczI8gMJUMzzyx5j0XXQ4YihHtKlQc+u35VpVoOXhlKAlaBntvry1WpAzPl/a+s3n89Q==",
-      "requires": {
-        "@octokit/request": "^5.3.0",
-        "@octokit/types": "^6.0.3",
-        "universal-user-agent": "^6.0.0"
-      }
-    },
-    "@octokit/openapi-types": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-7.0.0.tgz",
-      "integrity": "sha512-gV/8DJhAL/04zjTI95a7FhQwS6jlEE0W/7xeYAzuArD0KVAVWDLP2f3vi98hs3HLTczxXdRK/mF0tRoQPpolEw=="
-    },
-    "@octokit/plugin-paginate-rest": {
-      "version": "2.13.3",
-      "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.13.3.tgz",
-      "integrity": "sha512-46lptzM9lTeSmIBt/sVP/FLSTPGx6DCzAdSX3PfeJ3mTf4h9sGC26WpaQzMEq/Z44cOcmx8VsOhO+uEgE3cjYg==",
-      "requires": {
-        "@octokit/types": "^6.11.0"
-      }
-    },
-    "@octokit/plugin-rest-endpoint-methods": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.1.1.tgz",
-      "integrity": "sha512-u4zy0rVA8darm/AYsIeWkRalhQR99qPL1D/EXHejV2yaECMdHfxXiTXtba8NMBSajOJe8+C9g+EqMKSvysx0dg==",
-      "requires": {
-        "@octokit/types": "^6.14.1",
-        "deprecation": "^2.3.1"
-      }
-    },
-    "@octokit/request": {
-      "version": "5.4.15",
-      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-5.4.15.tgz",
-      "integrity": "sha512-6UnZfZzLwNhdLRreOtTkT9n57ZwulCve8q3IT/Z477vThu6snfdkBuhxnChpOKNGxcQ71ow561Qoa6uqLdPtag==",
-      "requires": {
-        "@octokit/endpoint": "^6.0.1",
-        "@octokit/request-error": "^2.0.0",
-        "@octokit/types": "^6.7.1",
-        "is-plain-object": "^5.0.0",
-        "node-fetch": "^2.6.1",
-        "universal-user-agent": "^6.0.0"
-      }
-    },
-    "@octokit/request-error": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.0.5.tgz",
-      "integrity": "sha512-T/2wcCFyM7SkXzNoyVNWjyVlUwBvW3igM3Btr/eKYiPmucXTtkxt2RBsf6gn3LTzaLSLTQtNmvg+dGsOxQrjZg==",
-      "requires": {
-        "@octokit/types": "^6.0.3",
-        "deprecation": "^2.0.0",
-        "once": "^1.4.0"
-      }
-    },
-    "@octokit/types": {
-      "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": "^7.0.0"
-      }
-    },
-    "before-after-hook": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.2.1.tgz",
-      "integrity": "sha512-/6FKxSTWoJdbsLDF8tdIjaRiFXiE6UHsEHE3OPI/cwPURCVi1ukP0gmLn7XWEiFk5TcwQjjY5PWsU+j+tgXgmw=="
-    },
-    "deprecation": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/deprecation/-/deprecation-2.3.1.tgz",
-      "integrity": "sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ=="
-    },
-    "is-plain-object": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
-      "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q=="
-    },
-    "node-fetch": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
-      "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw=="
-    },
-    "once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "requires": {
-        "wrappy": "1"
-      }
-    },
-    "tunnel": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz",
-      "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg=="
-    },
-    "universal-user-agent": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.0.tgz",
-      "integrity": "sha512-isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w=="
-    },
-    "wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
-    }
-  }
-}
--- a/.github/actions/approve-bot/action.yml
+++ b/.github/actions/approve-bot/action.yml
--- a/.github/actions/approve-bot/helpers.js
+++ b/.github/actions/approve-bot/helpers.js
@@ -59,10 +59,4 @@ function isPointlessVersionBump(body) {
  return allChangelogLinesAreVersionBump(changelogLines)
 }

-function shouldAutoMerge(body) {
-  return body.includes(
-    'If all status checks pass Dependabot will automatically merge this pull request'
-  )
-}
-
-module.exports = { isPointlessVersionBump, shouldAutoMerge }
+module.exports = { isPointlessVersionBump }
--- a/.github/actions/approve-bot/index.js
+++ b/.github/actions/approve-bot/index.js
@@ -2,7 +2,7 @@

 const core = require('@actions/core')
 const github = require('@actions/github')
-const { isPointlessVersionBump, shouldAutoMerge } = require('./helpers')
+const { isPointlessVersionBump } = require('./helpers')

 async function run() {
  try {
@@ -27,24 +27,6 @@ async function run() {
          state: 'closed',
        })

-        core.debug(`Done.`)
-      } else if (shouldAutoMerge(pr.body)) {
-        core.debug(`Adding label to pull request #${pr.number}`)
-        await client.rest.issues.addLabels({
-          owner: github.context.repo.owner,
-          repo: github.context.repo.repo,
-          issue_number: pr.number,
-          labels: ['squash when passing'],
-        })
-
-        core.debug(`Creating approving review for pull request #${pr.number}`)
-        await client.rest.pulls.createReview({
-          owner: github.context.repo.owner,
-          repo: github.context.repo.repo,
-          pull_number: pr.number,
-          event: 'APPROVE',
-        })
-
        core.debug(`Done.`)
      }
    }
--- a/.github/actions/close-bot/package-lock.json
+++ b/.github/actions/close-bot/package-lock.json
@@ -0,0 +1,358 @@
+{
+  "name": "close-bot",
+  "version": "0.0.0",
+  "lockfileVersion": 2,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "close-bot",
+      "version": "0.0.0",
+      "license": "CC0",
+      "dependencies": {
+        "@actions/core": "^1.4.0",
+        "@actions/github": "^5.0.0"
+      }
+    },
+    "node_modules/@actions/core": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.4.0.tgz",
+      "integrity": "sha512-CGx2ilGq5i7zSLgiiGUtBCxhRRxibJYU6Fim0Q1Wg2aQL2LTnF27zbqZOrxfvFQ55eSBW0L8uVStgtKMpa0Qlg=="
+    },
+    "node_modules/@actions/github": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@actions/github/-/github-5.0.0.tgz",
+      "integrity": "sha512-QvE9eAAfEsS+yOOk0cylLBIO/d6WyWIOvsxxzdrPFaud39G6BOkUwScXZn1iBzQzHyu9SBkkLSWlohDWdsasAQ==",
+      "dependencies": {
+        "@actions/http-client": "^1.0.11",
+        "@octokit/core": "^3.4.0",
+        "@octokit/plugin-paginate-rest": "^2.13.3",
+        "@octokit/plugin-rest-endpoint-methods": "^5.1.1"
+      }
+    },
+    "node_modules/@actions/http-client": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-1.0.11.tgz",
+      "integrity": "sha512-VRYHGQV1rqnROJqdMvGUbY/Kn8vriQe/F9HR2AlYHzmKuM/p3kjNuXhmdBfcVgsvRWTz5C5XW5xvndZrVBuAYg==",
+      "dependencies": {
+        "tunnel": "0.0.6"
+      }
+    },
+    "node_modules/@octokit/auth-token": {
+      "version": "2.4.5",
+      "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.4.5.tgz",
+      "integrity": "sha512-BpGYsPgJt05M7/L/5FoE1PiAbdxXFZkX/3kDYcsvd1v6UhlnE5e96dTDr0ezX/EFwciQxf3cNV0loipsURU+WA==",
+      "dependencies": {
+        "@octokit/types": "^6.0.3"
+      }
+    },
+    "node_modules/@octokit/core": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/@octokit/core/-/core-3.4.0.tgz",
+      "integrity": "sha512-6/vlKPP8NF17cgYXqucdshWqmMZGXkuvtcrWCgU5NOI0Pl2GjlmZyWgBMrU8zJ3v2MJlM6++CiB45VKYmhiWWg==",
+      "dependencies": {
+        "@octokit/auth-token": "^2.4.4",
+        "@octokit/graphql": "^4.5.8",
+        "@octokit/request": "^5.4.12",
+        "@octokit/request-error": "^2.0.5",
+        "@octokit/types": "^6.0.3",
+        "before-after-hook": "^2.2.0",
+        "universal-user-agent": "^6.0.0"
+      }
+    },
+    "node_modules/@octokit/endpoint": {
+      "version": "6.0.11",
+      "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.11.tgz",
+      "integrity": "sha512-fUIPpx+pZyoLW4GCs3yMnlj2LfoXTWDUVPTC4V3MUEKZm48W+XYpeWSZCv+vYF1ZABUm2CqnDVf1sFtIYrj7KQ==",
+      "dependencies": {
+        "@octokit/types": "^6.0.3",
+        "is-plain-object": "^5.0.0",
+        "universal-user-agent": "^6.0.0"
+      }
+    },
+    "node_modules/@octokit/graphql": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-4.6.2.tgz",
+      "integrity": "sha512-WmsIR1OzOr/3IqfG9JIczI8gMJUMzzyx5j0XXQ4YihHtKlQc+u35VpVoOXhlKAlaBntvry1WpAzPl/a+s3n89Q==",
+      "dependencies": {
+        "@octokit/request": "^5.3.0",
+        "@octokit/types": "^6.0.3",
+        "universal-user-agent": "^6.0.0"
+      }
+    },
+    "node_modules/@octokit/openapi-types": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-7.0.0.tgz",
+      "integrity": "sha512-gV/8DJhAL/04zjTI95a7FhQwS6jlEE0W/7xeYAzuArD0KVAVWDLP2f3vi98hs3HLTczxXdRK/mF0tRoQPpolEw=="
+    },
+    "node_modules/@octokit/plugin-paginate-rest": {
+      "version": "2.13.3",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.13.3.tgz",
+      "integrity": "sha512-46lptzM9lTeSmIBt/sVP/FLSTPGx6DCzAdSX3PfeJ3mTf4h9sGC26WpaQzMEq/Z44cOcmx8VsOhO+uEgE3cjYg==",
+      "dependencies": {
+        "@octokit/types": "^6.11.0"
+      },
+      "peerDependencies": {
+        "@octokit/core": ">=2"
+      }
+    },
+    "node_modules/@octokit/plugin-rest-endpoint-methods": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.1.1.tgz",
+      "integrity": "sha512-u4zy0rVA8darm/AYsIeWkRalhQR99qPL1D/EXHejV2yaECMdHfxXiTXtba8NMBSajOJe8+C9g+EqMKSvysx0dg==",
+      "dependencies": {
+        "@octokit/types": "^6.14.1",
+        "deprecation": "^2.3.1"
+      },
+      "peerDependencies": {
+        "@octokit/core": ">=3"
+      }
+    },
+    "node_modules/@octokit/request": {
+      "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.0.0",
+        "@octokit/types": "^6.7.1",
+        "is-plain-object": "^5.0.0",
+        "node-fetch": "^2.6.1",
+        "universal-user-agent": "^6.0.0"
+      }
+    },
+    "node_modules/@octokit/request-error": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.0.5.tgz",
+      "integrity": "sha512-T/2wcCFyM7SkXzNoyVNWjyVlUwBvW3igM3Btr/eKYiPmucXTtkxt2RBsf6gn3LTzaLSLTQtNmvg+dGsOxQrjZg==",
+      "dependencies": {
+        "@octokit/types": "^6.0.3",
+        "deprecation": "^2.0.0",
+        "once": "^1.4.0"
+      }
+    },
+    "node_modules/@octokit/types": {
+      "version": "6.14.2",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-6.14.2.tgz",
+      "integrity": "sha512-wiQtW9ZSy4OvgQ09iQOdyXYNN60GqjCL/UdMsepDr1Gr0QzpW6irIKbH3REuAHXAhxkEk9/F2a3Gcs1P6kW5jA==",
+      "dependencies": {
+        "@octokit/openapi-types": "^7.0.0"
+      }
+    },
+    "node_modules/before-after-hook": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.2.1.tgz",
+      "integrity": "sha512-/6FKxSTWoJdbsLDF8tdIjaRiFXiE6UHsEHE3OPI/cwPURCVi1ukP0gmLn7XWEiFk5TcwQjjY5PWsU+j+tgXgmw=="
+    },
+    "node_modules/deprecation": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/deprecation/-/deprecation-2.3.1.tgz",
+      "integrity": "sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ=="
+    },
+    "node_modules/is-plain-object": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
+      "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/node-fetch": {
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
+      "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==",
+      "engines": {
+        "node": "4.x || >=6.0.0"
+      }
+    },
+    "node_modules/once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "dependencies": {
+        "wrappy": "1"
+      }
+    },
+    "node_modules/tunnel": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz",
+      "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==",
+      "engines": {
+        "node": ">=0.6.11 <=0.7.0 || >=0.7.3"
+      }
+    },
+    "node_modules/universal-user-agent": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.0.tgz",
+      "integrity": "sha512-isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w=="
+    },
+    "node_modules/wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+    }
+  },
+  "dependencies": {
+    "@actions/core": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.4.0.tgz",
+      "integrity": "sha512-CGx2ilGq5i7zSLgiiGUtBCxhRRxibJYU6Fim0Q1Wg2aQL2LTnF27zbqZOrxfvFQ55eSBW0L8uVStgtKMpa0Qlg=="
+    },
+    "@actions/github": {
+      "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": "^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": "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"
+      }
+    },
+    "@octokit/auth-token": {
+      "version": "2.4.5",
+      "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.4.5.tgz",
+      "integrity": "sha512-BpGYsPgJt05M7/L/5FoE1PiAbdxXFZkX/3kDYcsvd1v6UhlnE5e96dTDr0ezX/EFwciQxf3cNV0loipsURU+WA==",
+      "requires": {
+        "@octokit/types": "^6.0.3"
+      }
+    },
+    "@octokit/core": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/@octokit/core/-/core-3.4.0.tgz",
+      "integrity": "sha512-6/vlKPP8NF17cgYXqucdshWqmMZGXkuvtcrWCgU5NOI0Pl2GjlmZyWgBMrU8zJ3v2MJlM6++CiB45VKYmhiWWg==",
+      "requires": {
+        "@octokit/auth-token": "^2.4.4",
+        "@octokit/graphql": "^4.5.8",
+        "@octokit/request": "^5.4.12",
+        "@octokit/request-error": "^2.0.5",
+        "@octokit/types": "^6.0.3",
+        "before-after-hook": "^2.2.0",
+        "universal-user-agent": "^6.0.0"
+      }
+    },
+    "@octokit/endpoint": {
+      "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",
+        "universal-user-agent": "^6.0.0"
+      }
+    },
+    "@octokit/graphql": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-4.6.2.tgz",
+      "integrity": "sha512-WmsIR1OzOr/3IqfG9JIczI8gMJUMzzyx5j0XXQ4YihHtKlQc+u35VpVoOXhlKAlaBntvry1WpAzPl/a+s3n89Q==",
+      "requires": {
+        "@octokit/request": "^5.3.0",
+        "@octokit/types": "^6.0.3",
+        "universal-user-agent": "^6.0.0"
+      }
+    },
+    "@octokit/openapi-types": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-7.0.0.tgz",
+      "integrity": "sha512-gV/8DJhAL/04zjTI95a7FhQwS6jlEE0W/7xeYAzuArD0KVAVWDLP2f3vi98hs3HLTczxXdRK/mF0tRoQPpolEw=="
+    },
+    "@octokit/plugin-paginate-rest": {
+      "version": "2.13.3",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.13.3.tgz",
+      "integrity": "sha512-46lptzM9lTeSmIBt/sVP/FLSTPGx6DCzAdSX3PfeJ3mTf4h9sGC26WpaQzMEq/Z44cOcmx8VsOhO+uEgE3cjYg==",
+      "requires": {
+        "@octokit/types": "^6.11.0"
+      }
+    },
+    "@octokit/plugin-rest-endpoint-methods": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.1.1.tgz",
+      "integrity": "sha512-u4zy0rVA8darm/AYsIeWkRalhQR99qPL1D/EXHejV2yaECMdHfxXiTXtba8NMBSajOJe8+C9g+EqMKSvysx0dg==",
+      "requires": {
+        "@octokit/types": "^6.14.1",
+        "deprecation": "^2.3.1"
+      }
+    },
+    "@octokit/request": {
+      "version": "5.4.15",
+      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-5.4.15.tgz",
+      "integrity": "sha512-6UnZfZzLwNhdLRreOtTkT9n57ZwulCve8q3IT/Z477vThu6snfdkBuhxnChpOKNGxcQ71ow561Qoa6uqLdPtag==",
+      "requires": {
+        "@octokit/endpoint": "^6.0.1",
+        "@octokit/request-error": "^2.0.0",
+        "@octokit/types": "^6.7.1",
+        "is-plain-object": "^5.0.0",
+        "node-fetch": "^2.6.1",
+        "universal-user-agent": "^6.0.0"
+      }
+    },
+    "@octokit/request-error": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.0.5.tgz",
+      "integrity": "sha512-T/2wcCFyM7SkXzNoyVNWjyVlUwBvW3igM3Btr/eKYiPmucXTtkxt2RBsf6gn3LTzaLSLTQtNmvg+dGsOxQrjZg==",
+      "requires": {
+        "@octokit/types": "^6.0.3",
+        "deprecation": "^2.0.0",
+        "once": "^1.4.0"
+      }
+    },
+    "@octokit/types": {
+      "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": "^7.0.0"
+      }
+    },
+    "before-after-hook": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.2.1.tgz",
+      "integrity": "sha512-/6FKxSTWoJdbsLDF8tdIjaRiFXiE6UHsEHE3OPI/cwPURCVi1ukP0gmLn7XWEiFk5TcwQjjY5PWsU+j+tgXgmw=="
+    },
+    "deprecation": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/deprecation/-/deprecation-2.3.1.tgz",
+      "integrity": "sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ=="
+    },
+    "is-plain-object": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
+      "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q=="
+    },
+    "node-fetch": {
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
+      "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw=="
+    },
+    "once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "requires": {
+        "wrappy": "1"
+      }
+    },
+    "tunnel": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz",
+      "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg=="
+    },
+    "universal-user-agent": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.0.tgz",
+      "integrity": "sha512-isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w=="
+    },
+    "wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+    }
+  }
+}
--- a/.github/actions/approve-bot/package.json
+++ b/.github/actions/approve-bot/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "approve-bot",
+  "name": "close-bot",
  "version": "0.0.0",
  "description": "",
  "main": "index.js",
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -0,0 +1,28 @@
+version: 2
+updates:
+  # shields.io dependencies
+  - package-ecosystem: npm
+    directory: '/'
+    schedule:
+      interval: weekly
+      day: friday
+      time: '12:00'
+    open-pull-requests-limit: 99
+
+  # badge-maker package dependencies
+  - package-ecosystem: npm
+    directory: '/badge-maker'
+    schedule:
+      interval: weekly
+      day: friday
+      time: '12:00'
+    open-pull-requests-limit: 99
+
+  # close-bot package dependencies
+  - package-ecosystem: npm
+    directory: '/.github/actions/close-bot'
+    schedule:
+      interval: weekly
+      day: friday
+      time: '12:00'
+    open-pull-requests-limit: 99
--- a/.github/workflows/auto-approve.yml
+++ b/.github/workflows/auto-approve.yml
@@ -1,16 +1,20 @@
-name: Auto approve
-on: pull_request
+name: Auto close
+on: pull_request_target
+
+permissions:
+  pull_request: write

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

      - name: Install action dependencies
-        run: cd .github/actions/approve-bot && npm ci
+        run: cd .github/actions/close-bot && npm ci

-      - uses: ./.github/actions/approve-bot
+      - uses: ./.github/actions/close-bot
        with:
          github-token: '${{ secrets.GITHUB_TOKEN }}'
--- a/.github/workflows/publish-docker-next.yml
+++ b/.github/workflows/publish-docker-next.yml
@@ -0,0 +1,28 @@
+name: Build and Publish Next Docker Image
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          push: true
+          tags: shieldsio/shields:next
--- a/.github/workflows/publish-docker-snapshot.yml
+++ b/.github/workflows/publish-docker-snapshot.yml
@@ -0,0 +1,30 @@
+name: Build and Publish Snapshot Docker Image
+on: create
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    if: ${{ github.event.ref_type == 'tag' && startsWith(github.ref, 'refs/tags/server-') }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Get tag name
+        id: get_version
+        run: echo ::set-output name=TAG_NAME::$(echo $GITHUB_REF | cut -d / -f 3)
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          push: true
+          tags: shieldsio/shields:${{ steps.get_version.outputs.TAG_NAME }}
--- a/.gitignore
+++ b/.gitignore
@@ -104,7 +104,8 @@ service-definitions.yml
 !/config/local*.template.yml

 # Gatsby
-/.cache
+/frontend/.cache
+/frontend/public
 /public

 # Cypress
--- a/.mocharc-frontend.yml
+++ b/.mocharc-frontend.yml
@@ -3,4 +3,3 @@ require:
  - '@babel/polyfill'
  - '@babel/register'
  - mocha-yaml-loader
-  - frontend/mocha-ignore-pngs
--- a/.nycrc.json
+++ b/.nycrc.json
@@ -22,6 +22,7 @@
    "scripts",
    "coverage",
    "build",
-    ".github"
+    ".github",
+    "**/public/"
  ]
 }
--- a/.prettierignore
+++ b/.prettierignore
@@ -2,10 +2,10 @@ package.json
 package-lock.json
 /__snapshots__
 /.next
-/.cache
+.cache
 /api-docs
 /build
-/public
+public
 /coverage
 private/*.json
 /.nyc_output
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,23 @@ Note: this changelog is for the shields.io server. The changelog for the badge-m

 ---

+## server-2021-08-01
+
+- use v5 API for [AUR] badges [#6836](https://github.com/badges/shields/issues/6836)
+- [Sonar] Fix invalid fetch query to sonarqube >=6.6 [#6636](https://github.com/badges/shields/issues/6636)
+- Delegate discord logo to simple-icons, which matches the current branding [#6764](https://github.com/badges/shields/issues/6764)
+- Re-apply 'Migrate request to got (part 1)' [#6755](https://github.com/badges/shields/issues/6755)
+- Delete old deprecated badges [#6756](https://github.com/badges/shields/issues/6756)
+- Replace opn-cli with open-cli [#6747](https://github.com/badges/shields/issues/6747)
+- Verify that Node 14 is installed in development [#6748](https://github.com/badges/shields/issues/6748)
+- Migrate from CommonJS to ESM [#6651](https://github.com/badges/shields/issues/6651)
+- Add Wikiapiary Extension Badge [WikiapiaryInstalls] [#6678](https://github.com/badges/shields/issues/6678)
+- deprecate [beerpay] [#6708](https://github.com/badges/shields/issues/6708)
+- deprecate [microbadger] [#6709](https://github.com/badges/shields/issues/6709)
+- [npmsioscore] Support npm score [#6630](https://github.com/badges/shields/issues/6630)
+- Add [Weblate] badges [#6677](https://github.com/badges/shields/issues/6677)
+- Dependency updates
+
 ## server-2021-07-01

 - improve [MavenCentral], [MavenMetadata], and [GradlePluginPortal] [#6628](https://github.com/badges/shields/issues/6628)
--- a/README.md
+++ b/README.md
@@ -156,6 +156,21 @@ There is documentation about [hosting your own server][self-hosting].

 [self-hosting]: https://github.com/badges/shields/blob/master/doc/self-hosting.md

+## Related projects
+
+[![Awesome](https://awesome.re/badge.svg)](https://awesome.re)
+
+Status badges are used widely across open-source and private software projects.
+Academics have studied the "signal" badges provide about software project
+quality. There are many existing libraries for rendering these badges, and
+alternatives to the hosted Shields badge service. [awesome-badges][] is a
+curated collection of such resources.
+[Contributions][contributing to awesome-badges] may be considered there.
+(The presence of a project in that collection should not be interpreted as an endorsement nor promotion from the Shields project)
+
+[awesome-badges]: https://github.com/badges/awesome-badges
+[contributing to awesome-badges]: https://github.com/badges/awesome-badges/blob/main/CONTRIBUTING.md
+
 ## History

 b.adge.me was the original website for this service. Heroku back then had a
@@ -207,14 +222,6 @@ Alumni:
 - [espadrine](https://github.com/espadrine)
 - [olivierlacan](https://github.com/olivierlacan)

-## Related projects
-
- [poser PHP library][poser]
- [pybadges python library][pybadges]
-
-[poser]: https://github.com/badges/poser
-[pybadges]: https://github.com/google/pybadges
-
 ## License

 All assets and code are under the [CC0 LICENSE](LICENSE) and in the public
--- a/app.json
+++ b/app.json
@@ -31,6 +31,10 @@
    "TWITCH_CLIENT_SECRET": {
      "description": "Configure the client secret to be used for the Twitch service.",
      "required": false
+    },
+    "WEBLATE_API_KEY": {
+      "description": "Configure the API key to be used for the Weblate service.",
+      "required": false
    }
  },
  "formation": {
--- a/config/custom-environment-variables.yml
+++ b/config/custom-environment-variables.yml
@@ -52,6 +52,8 @@ public:
      authorizedOrigins: 'SONAR_ORIGINS'
    teamcity:
      authorizedOrigins: 'TEAMCITY_ORIGINS'
+    weblate:
+      authorizedOrigins: 'WEBLATE_ORIGINS'
    trace: 'TRACE_SERVICES'

  cacheHeaders:
@@ -95,4 +97,5 @@ private:
  wheelmap_token: 'WHEELMAP_TOKEN'
  influx_username: 'INFLUX_USERNAME'
  influx_password: 'INFLUX_PASSWORD'
+  weblate_api_key: 'WEBLATE_API_KEY'
  youtube_api_key: 'YOUTUBE_API_KEY'
--- a/config/default.yml
+++ b/config/default.yml
@@ -22,6 +22,8 @@ public:
      debug:
        enabled: false
        intervalSeconds: 200
+    weblate:
+      authorizedOrigins: 'https://hosted.weblate.org'
    trace: false

  cacheHeaders:
--- a/config/local-shields-io-production.template.yml
+++ b/config/local-shields-io-production.template.yml
@@ -10,5 +10,6 @@ private:
  sl_insight_apiToken: ...
  twitch_client_id: ...
  twitch_client_secret: ...
+  weblate_api_key: ...
  wheelmap_token: ...
  youtube_api_key: ...
--- a/config/local.template.yml
+++ b/config/local.template.yml
@@ -7,5 +7,6 @@ private:
  gh_token: '...'
  twitch_client_id: '...'
  twitch_client_secret: '...'
+  weblate_api_key: '...'
  wheelmap_token: '...'
  youtube_api_key: '...'
--- a/core/badge-urls/make-badge-url.js
+++ b/core/badge-urls/make-badge-url.js
@@ -1,8 +1,7 @@
-'use strict'
-
-const { URL } = require('url')
-const queryString = require('query-string')
-const { compile } = require('path-to-regexp')
+// 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 = '',
@@ -147,13 +146,13 @@ function dynamicBadgeUrl({
 function rasterRedirectUrl({ rasterUrl }, badgeUrl) {
  // Ensure we're always using the `rasterUrl` by using just the path from
  // the request URL.
-  const { pathname, search } = new URL(badgeUrl, 'https://bogus.test')
-  const result = new URL(pathname, rasterUrl)
+  const { pathname, search } = new url.URL(badgeUrl, 'https://bogus.test')
+  const result = new url.URL(pathname, rasterUrl)
  result.search = search
  return result
 }

-module.exports = {
+export {
  badgeUrlFromPath,
  badgeUrlFromPattern,
  encodeField,
--- a/core/badge-urls/make-badge-url.spec.js
+++ b/core/badge-urls/make-badge-url.spec.js
@@ -1,14 +1,12 @@
-'use strict'
-
-const { test, given } = require('sazerac')
-const {
+import { test, given } from 'sazerac'
+import {
  badgeUrlFromPath,
  badgeUrlFromPattern,
  encodeField,
  staticBadgeUrl,
  queryStringStaticBadgeUrl,
  dynamicBadgeUrl,
-} = require('./make-badge-url')
+} from './make-badge-url.js'

 describe('Badge URL generation functions', function () {
  test(badgeUrlFromPath, () => {
--- a/core/badge-urls/path-helpers.js
+++ b/core/badge-urls/path-helpers.js
@@ -1,5 +1,3 @@
-'use strict'
-
 // Escapes `t` using the format specified in
 // <https://github.com/espadrine/gh-badges/issues/12#issuecomment-31518129>
 function escapeFormat(t) {
@@ -13,6 +11,4 @@ function escapeFormat(t) {
  )
 }

-module.exports = {
-  escapeFormat,
-}
+export { escapeFormat }
--- a/core/badge-urls/path-helpers.spec.js
+++ b/core/badge-urls/path-helpers.spec.js
@@ -1,7 +1,5 @@
-'use strict'
-
-const { test, given } = require('sazerac')
-const { escapeFormat } = require('./path-helpers')
+import { test, given } from 'sazerac'
+import { escapeFormat } from './path-helpers.js'

 describe('Badge URL helper functions', function () {
  test(escapeFormat, () => {
--- a/core/base-service/auth-helper.js
+++ b/core/base-service/auth-helper.js
@@ -1,7 +1,5 @@
-'use strict'
-
-const { URL } = require('url')
-const { InvalidParameter } = require('./errors')
+import { URL } from 'url'
+import { InvalidParameter } from './errors.js'

 class AuthHelper {
  constructor(
@@ -207,4 +205,4 @@ class AuthHelper {
  }
 }

-module.exports = { AuthHelper }
+export { AuthHelper }
--- a/core/base-service/auth-helper.spec.js
+++ b/core/base-service/auth-helper.spec.js
@@ -1,9 +1,7 @@
-'use strict'
-
-const { expect } = require('chai')
-const { test, given, forCases } = require('sazerac')
-const { AuthHelper } = require('./auth-helper')
-const { InvalidParameter } = require('./errors')
+import { expect } from 'chai'
+import { test, given, forCases } from 'sazerac'
+import { AuthHelper } from './auth-helper.js'
+import { InvalidParameter } from './errors.js'

 describe('AuthHelper', function () {
  describe('constructor checks', function () {
--- a/core/base-service/base-graphql.js
+++ b/core/base-service/base-graphql.js
@@ -2,12 +2,10 @@
 * @module
 */

-'use strict'
-
-const { print } = require('graphql/language/printer')
-const BaseService = require('./base')
-const { InvalidResponse, ShieldsRuntimeError } = require('./errors')
-const { parseJson } = require('./json')
+import { print } from 'graphql/language/printer.js'
+import BaseService from './base.js'
+import { InvalidResponse, ShieldsRuntimeError } from './errors.js'
+import { parseJson } from './json.js'

 function defaultTransformErrors(errors) {
  return new InvalidResponse({ prettyMessage: errors[0].message })
@@ -93,4 +91,4 @@ class BaseGraphqlService extends BaseService {
  }
 }

-module.exports = BaseGraphqlService
+export default BaseGraphqlService
--- a/core/base-service/base-graphql.spec.js
+++ b/core/base-service/base-graphql.spec.js
@@ -1,11 +1,9 @@
-'use strict'
-
-const Joi = require('joi')
-const { expect } = require('chai')
-const gql = require('graphql-tag')
-const sinon = require('sinon')
-const BaseGraphqlService = require('./base-graphql')
-const { InvalidResponse } = require('./errors')
+import Joi from 'joi'
+import { expect } from 'chai'
+import gql from 'graphql-tag'
+import sinon from 'sinon'
+import BaseGraphqlService from './base-graphql.js'
+import { InvalidResponse } from './errors.js'

 const dummySchema = Joi.object({
  requiredString: Joi.string().required(),
--- a/core/base-service/base-json.js
+++ b/core/base-service/base-json.js
@@ -2,10 +2,8 @@
 * @module
 */

-'use strict'
-
-const BaseService = require('./base')
-const { parseJson } = require('./json')
+import BaseService from './base.js'
+import { parseJson } from './json.js'

 /**
 * Services which query a JSON endpoint should extend BaseJsonService
@@ -54,4 +52,4 @@ class BaseJsonService extends BaseService {
  }
 }

-module.exports = BaseJsonService
+export default BaseJsonService
--- a/core/base-service/base-json.spec.js
+++ b/core/base-service/base-json.spec.js
@@ -1,9 +1,7 @@
-'use strict'
-
-const Joi = require('joi')
-const { expect } = require('chai')
-const sinon = require('sinon')
-const BaseJsonService = require('./base-json')
+import Joi from 'joi'
+import { expect } from 'chai'
+import sinon from 'sinon'
+import BaseJsonService from './base-json.js'

 const dummySchema = Joi.object({
  requiredString: Joi.string().required(),
--- a/core/base-service/base-static.js
+++ b/core/base-service/base-static.js
@@ -1,17 +1,15 @@
-'use strict'
-
-const makeBadge = require('../../badge-maker/lib/make-badge')
-const BaseService = require('./base')
-const {
+import makeBadge from '../../badge-maker/lib/make-badge.js'
+import BaseService from './base.js'
+import {
  serverHasBeenUpSinceResourceCached,
  setCacheHeadersForStaticResource,
-} = require('./cache-headers')
-const { makeSend } = require('./legacy-result-sender')
-const { MetricHelper } = require('./metric-helper')
-const coalesceBadge = require('./coalesce-badge')
-const { prepareRoute, namedParamsForMatch } = require('./route')
+} from './cache-headers.js'
+import { makeSend } from './legacy-result-sender.js'
+import { MetricHelper } from './metric-helper.js'
+import coalesceBadge from './coalesce-badge.js'
+import { prepareRoute, namedParamsForMatch } from './route.js'

-module.exports = class BaseStaticService extends BaseService {
+export default class BaseStaticService extends BaseService {
  static register({ camp, metricInstance }, serviceConfig) {
    const { regex, captureNames } = prepareRoute(this.route)

--- a/core/base-service/base-svg-scraping.js
+++ b/core/base-service/base-svg-scraping.js
@@ -2,13 +2,11 @@
 * @module
 */

-'use strict'
-
 // See available emoji at http://emoji.muan.co/
-const emojic = require('emojic')
-const BaseService = require('./base')
-const trace = require('./trace')
-const { InvalidResponse } = require('./errors')
+import emojic from 'emojic'
+import BaseService from './base.js'
+import trace from './trace.js'
+import { InvalidResponse } from './errors.js'

 const defaultValueMatcher = />([^<>]+)<\/text><\/g>/
 const leadingWhitespace = /(?:\r\n\s*|\r\s*|\n\s*)/g
@@ -90,4 +88,4 @@ class BaseSvgScrapingService extends BaseService {
  }
 }

-module.exports = BaseSvgScrapingService
+export default BaseSvgScrapingService
--- a/core/base-service/base-svg-scraping.spec.js
+++ b/core/base-service/base-svg-scraping.spec.js
@@ -1,10 +1,8 @@
-'use strict'
-
-const { expect } = require('chai')
-const sinon = require('sinon')
-const Joi = require('joi')
-const makeBadge = require('../../badge-maker/lib/make-badge')
-const BaseSvgScrapingService = require('./base-svg-scraping')
+import { expect } from 'chai'
+import sinon from 'sinon'
+import Joi from 'joi'
+import makeBadge from '../../badge-maker/lib/make-badge.js'
+import BaseSvgScrapingService from './base-svg-scraping.js'

 const schema = Joi.object({
  message: Joi.string().required(),
--- a/core/base-service/base-xml.js
+++ b/core/base-service/base-xml.js
@@ -2,14 +2,12 @@
 * @module
 */

-'use strict'
-
 // See available emoji at http://emoji.muan.co/
-const emojic = require('emojic')
-const fastXmlParser = require('fast-xml-parser')
-const BaseService = require('./base')
-const trace = require('./trace')
-const { InvalidResponse } = require('./errors')
+import emojic from 'emojic'
+import fastXmlParser from 'fast-xml-parser'
+import BaseService from './base.js'
+import trace from './trace.js'
+import { InvalidResponse } from './errors.js'

 /**
 * Services which query a XML endpoint should extend BaseXmlService
@@ -68,4 +66,4 @@ class BaseXmlService extends BaseService {
  }
 }

-module.exports = BaseXmlService
+export default BaseXmlService
--- a/core/base-service/base-xml.spec.js
+++ b/core/base-service/base-xml.spec.js
@@ -1,9 +1,7 @@
-'use strict'
-
-const Joi = require('joi')
-const { expect } = require('chai')
-const sinon = require('sinon')
-const BaseXmlService = require('./base-xml')
+import Joi from 'joi'
+import { expect } from 'chai'
+import sinon from 'sinon'
+import BaseXmlService from './base-xml.js'

 const dummySchema = Joi.object({
  requiredString: Joi.string().required(),
--- a/core/base-service/base-yaml.js
+++ b/core/base-service/base-yaml.js
@@ -2,13 +2,11 @@
 * @module
 */

-'use strict'
-
-const emojic = require('emojic')
-const yaml = require('js-yaml')
-const BaseService = require('./base')
-const { InvalidResponse } = require('./errors')
-const trace = require('./trace')
+import emojic from 'emojic'
+import yaml from 'js-yaml'
+import BaseService from './base.js'
+import { InvalidResponse } from './errors.js'
+import trace from './trace.js'

 /**
 * Services which query a YAML endpoint should extend BaseYamlService
@@ -72,4 +70,4 @@ class BaseYamlService extends BaseService {
  }
 }

-module.exports = BaseYamlService
+export default BaseYamlService
--- a/core/base-service/base-yaml.spec.js
+++ b/core/base-service/base-yaml.spec.js
@@ -1,9 +1,7 @@
-'use strict'
-
-const Joi = require('joi')
-const { expect } = require('chai')
-const sinon = require('sinon')
-const BaseYamlService = require('./base-yaml')
+import Joi from 'joi'
+import { expect } from 'chai'
+import sinon from 'sinon'
+import BaseYamlService from './base-yaml.js'

 const dummySchema = Joi.object({
  requiredString: Joi.string().required(),
--- a/core/base-service/base.js
+++ b/core/base-service/base.js
@@ -1,36 +1,36 @@
-'use strict'
 /**
 * @module
 */

 // See available emoji at http://emoji.muan.co/
-const emojic = require('emojic')
-const Joi = require('joi')
-const log = require('../server/log')
-const { AuthHelper } = require('./auth-helper')
-const { MetricHelper, MetricNames } = require('./metric-helper')
-const { assertValidCategory } = require('./categories')
-const checkErrorResponse = require('./check-error-response')
-const coalesceBadge = require('./coalesce-badge')
-const {
+import emojic from 'emojic'
+import Joi from 'joi'
+import log from '../server/log.js'
+import { AuthHelper } from './auth-helper.js'
+import { MetricHelper, MetricNames } from './metric-helper.js'
+import { assertValidCategory } from './categories.js'
+import checkErrorResponse from './check-error-response.js'
+import coalesceBadge from './coalesce-badge.js'
+import {
  NotFound,
  InvalidResponse,
  Inaccessible,
  ImproperlyConfigured,
  InvalidParameter,
  Deprecated,
-} = require('./errors')
-const { validateExample, transformExample } = require('./examples')
-const {
+} from './errors.js'
+import { validateExample, transformExample } from './examples.js'
+import { fetchFactory } from './got.js'
+import {
  makeFullUrl,
  assertValidRoute,
  prepareRoute,
  namedParamsForMatch,
  getQueryParamNames,
-} = require('./route')
-const { assertValidServiceDefinition } = require('./service-definitions')
-const trace = require('./trace')
-const validate = require('./validate')
+} from './route.js'
+import { assertValidServiceDefinition } from './service-definitions.js'
+import trace from './trace.js'
+import validate from './validate.js'

 const defaultBadgeDataSchema = Joi.object({
  label: Joi.string(),
@@ -432,6 +432,8 @@ class BaseService {
      ServiceClass: this,
    })

+    const fetcher = fetchFactory(fetchLimitBytes)
+
    camp.route(
      regex,
      handleRequest(cacheHeaderConfig, {
@@ -442,7 +444,7 @@ class BaseService {
          const namedParams = namedParamsForMatch(captureNames, match, this)
          const serviceData = await this.invoke(
            {
-              sendAndCacheRequest: request.asPromise,
+              sendAndCacheRequest: fetcher,
              sendAndCacheRequestWithCallbacks: request,
              githubApiProvider,
              metricHelper,
@@ -565,4 +567,4 @@ class BaseService {
 *    An HTML string that is included in the badge popup.
 */

-module.exports = BaseService
+export default BaseService
--- a/core/base-service/base.spec.js
+++ b/core/base-service/base.spec.js
@@ -1,23 +1,22 @@
-'use strict'
-
-const Joi = require('joi')
-const chai = require('chai')
-const { expect } = chai
-const sinon = require('sinon')
-const prometheus = require('prom-client')
-const PrometheusMetrics = require('../server/prometheus-metrics')
-const trace = require('./trace')
-const {
+import Joi from 'joi'
+import chai from 'chai'
+import sinon from 'sinon'
+import prometheus from 'prom-client'
+import chaiAsPromised from 'chai-as-promised'
+import PrometheusMetrics from '../server/prometheus-metrics.js'
+import trace from './trace.js'
+import {
  NotFound,
  Inaccessible,
  InvalidResponse,
  InvalidParameter,
  Deprecated,
-} = require('./errors')
-const BaseService = require('./base')
-const { MetricHelper, MetricNames } = require('./metric-helper')
-require('../register-chai-plugins.spec')
-chai.use(require('chai-as-promised'))
+} from './errors.js'
+import BaseService from './base.js'
+import { MetricHelper, MetricNames } from './metric-helper.js'
+import '../register-chai-plugins.spec.js'
+const { expect } = chai
+chai.use(chaiAsPromised)

 const queryParamSchema = Joi.object({
  queryParamA: Joi.string(),
--- a/core/base-service/cache-headers.js
+++ b/core/base-service/cache-headers.js
@@ -1,8 +1,6 @@
-'use strict'
-
-const assert = require('assert')
-const Joi = require('joi')
-const coalesce = require('./coalesce')
+import assert from 'assert'
+import Joi from 'joi'
+import coalesce from './coalesce.js'

 const serverStartTimeGMTString = new Date().toGMTString()
 const serverStartTimestamp = Date.now()
@@ -104,7 +102,7 @@ function serverHasBeenUpSinceResourceCached(req) {
  )
 }

-module.exports = {
+export {
  coalesceCacheLength,
  setCacheHeaders,
  setHeadersForCacheLength,
--- a/core/base-service/cache-headers.spec.js
+++ b/core/base-service/cache-headers.spec.js
@@ -1,19 +1,16 @@
-'use strict'
-
-const { test, given } = require('sazerac')
-const chai = require('chai')
-const { expect } = require('chai')
-const sinon = require('sinon')
-const httpMocks = require('node-mocks-http')
-const {
+import { test, given } from 'sazerac'
+import chai, { expect } from 'chai'
+import sinon from 'sinon'
+import httpMocks from 'node-mocks-http'
+import chaiDatetime from 'chai-datetime'
+import {
  coalesceCacheLength,
  setHeadersForCacheLength,
  setCacheHeaders,
  setCacheHeadersForStaticResource,
  serverHasBeenUpSinceResourceCached,
-} = require('./cache-headers')
-
-chai.use(require('chai-datetime'))
+} from './cache-headers.js'
+chai.use(chaiDatetime)

 describe('Cache header functions', function () {
  let res
--- a/core/base-service/categories.js
+++ b/core/base-service/categories.js
@@ -1,7 +1,5 @@
-'use strict'
-
-const Joi = require('joi')
-const categories = require('../../services/categories')
+import Joi from 'joi'
+import categories from '../../services/categories.js'

 const isRealCategory = Joi.equal(...categories.map(({ id }) => id)).required()

@@ -13,7 +11,4 @@ function assertValidCategory(category, message = undefined) {
  Joi.assert(category, isValidCategory, message)
 }

-module.exports = {
-  isValidCategory,
-  assertValidCategory,
-}
+export { isValidCategory, assertValidCategory }
--- a/core/base-service/check-error-response.js
+++ b/core/base-service/check-error-response.js
@@ -1,12 +1,10 @@
-'use strict'
-
-const { NotFound, InvalidResponse, Inaccessible } = require('./errors')
+import { NotFound, InvalidResponse, Inaccessible } from './errors.js'

 const defaultErrorMessages = {
  404: 'not found',
 }

-module.exports = function checkErrorResponse(errorMessages = {}) {
+export default function checkErrorResponse(errorMessages = {}) {
  return async function ({ buffer, res }) {
    let error
    errorMessages = { ...defaultErrorMessages, ...errorMessages }
--- a/core/base-service/check-error-response.spec.js
+++ b/core/base-service/check-error-response.spec.js
@@ -1,8 +1,6 @@
-'use strict'
-
-const { expect } = require('chai')
-const { NotFound, InvalidResponse, Inaccessible } = require('./errors')
-const checkErrorResponse = require('./check-error-response')
+import { expect } from 'chai'
+import { NotFound, InvalidResponse, Inaccessible } from './errors.js'
+import checkErrorResponse from './check-error-response.js'

 describe('async error handler', function () {
  const buffer = Buffer.from('some stuff')
--- a/core/base-service/coalesce-badge.js
+++ b/core/base-service/coalesce-badge.js
@@ -1,12 +1,10 @@
-'use strict'
-
-const {
+import {
  decodeDataUrlFromQueryParam,
  prepareNamedLogo,
-} = require('../../lib/logos')
-const { svg2base64 } = require('../../lib/svg-helpers')
-const coalesce = require('./coalesce')
-const toArray = require('./to-array')
+} from '../../lib/logos.js'
+import { svg2base64 } from '../../lib/svg-helpers.js'
+import coalesce from './coalesce.js'
+import toArray from './to-array.js'

 // Translate modern badge data to the legacy schema understood by the badge
 // maker. Allow the user to override the label, color, logo, etc. through the
@@ -34,7 +32,7 @@ const toArray = require('./to-array')
 // 3. In the case of the `social` style only, the last precedence is the
 //    service's default logo. The `logoColor` can be overridden by the query
 //    string.
-module.exports = function coalesceBadge(
+export default function coalesceBadge(
  overrides,
  serviceData,
  // These two parameters were kept separate to make tests clearer.
--- a/core/base-service/coalesce-badge.spec.js
+++ b/core/base-service/coalesce-badge.spec.js
@@ -1,8 +1,6 @@
-'use strict'
-
-const { expect } = require('chai')
-const { getShieldsIcon, getSimpleIcon } = require('../../lib/logos')
-const coalesceBadge = require('./coalesce-badge')
+import { expect } from 'chai'
+import { getShieldsIcon, getSimpleIcon } from '../../lib/logos.js'
+import coalesceBadge from './coalesce-badge.js'

 describe('coalesceBadge', function () {
  describe('Label', function () {
--- a/core/base-service/coalesce.js
+++ b/core/base-service/coalesce.js
@@ -1,5 +1,3 @@
-'use strict'
-
-module.exports = function coalesce(...candidates) {
+export default function coalesce(...candidates) {
  return candidates.find(c => c !== undefined && c !== null)
 }
--- a/core/base-service/coalesce.spec.js
+++ b/core/base-service/coalesce.spec.js
@@ -1,7 +1,5 @@
-'use strict'
-
-const { test, given } = require('sazerac')
-const coalesce = require('./coalesce')
+import { test, given } from 'sazerac'
+import coalesce from './coalesce.js'

 // Sticking with our one-line spread implementation, and defaulting to
 // `undefined` instead of `null`, though h/t to
--- a/core/base-service/deprecated-service.js
+++ b/core/base-service/deprecated-service.js
@@ -1,11 +1,9 @@
-'use strict'
-
-const Joi = require('joi')
-const camelcase = require('camelcase')
-const BaseService = require('./base')
-const { isValidCategory } = require('./categories')
-const { Deprecated } = require('./errors')
-const { isValidRoute } = require('./route')
+import Joi from 'joi'
+import camelcase from 'camelcase'
+import BaseService from './base.js'
+import { isValidCategory } from './categories.js'
+import { Deprecated } from './errors.js'
+import { isValidRoute } from './route.js'

 const attrSchema = Joi.object({
  route: isValidRoute,
@@ -44,4 +42,4 @@ function deprecatedService(attrs) {
  }
 }

-module.exports = deprecatedService
+export default deprecatedService
--- a/core/base-service/deprecated-service.spec.js
+++ b/core/base-service/deprecated-service.spec.js
@@ -1,7 +1,5 @@
-'use strict'
-
-const { expect } = require('chai')
-const deprecatedService = require('./deprecated-service')
+import { expect } from 'chai'
+import deprecatedService from './deprecated-service.js'

 describe('DeprecatedService', function () {
  const route = {
--- a/core/base-service/errors.js
+++ b/core/base-service/errors.js
@@ -4,8 +4,6 @@
 * @module
 */

-'use strict'
-
 /**
 * Base error class
 *
@@ -210,7 +208,7 @@ class Deprecated extends ShieldsRuntimeError {
 * badge when we catch and render the exception (Optional)
 */

-module.exports = {
+export {
  ShieldsRuntimeError,
  NotFound,
  ImproperlyConfigured,
--- a/core/base-service/examples.js
+++ b/core/base-service/examples.js
@@ -1,10 +1,8 @@
-'use strict'
-
-const Joi = require('joi')
-const { pathToRegexp, compile } = require('path-to-regexp')
-const categories = require('../../services/categories')
-const coalesceBadge = require('./coalesce-badge')
-const { makeFullUrl } = require('./route')
+import Joi from 'joi'
+import { pathToRegexp, compile } from 'path-to-regexp'
+import categories from '../../services/categories.js'
+import coalesceBadge from './coalesce-badge.js'
+import { makeFullUrl } from './route.js'

 const optionalObjectOfKeyValues = Joi.object().pattern(
  /./,
@@ -155,7 +153,4 @@ function transformExample(inExample, index, ServiceClass) {
  }
 }

-module.exports = {
-  validateExample,
-  transformExample,
-}
+export { validateExample, transformExample }
--- a/core/base-service/examples.spec.js
+++ b/core/base-service/examples.spec.js
@@ -1,8 +1,6 @@
-'use strict'
-
-const { expect } = require('chai')
-const { test, given } = require('sazerac')
-const { validateExample, transformExample } = require('./examples')
+import { expect } from 'chai'
+import { test, given } from 'sazerac'
+import { validateExample, transformExample } from './examples.js'

 describe('validateExample function', function () {
  it('passes valid examples', function () {
--- a/core/base-service/got.js
+++ b/core/base-service/got.js
@@ -0,0 +1,96 @@
+import got from 'got'
+import { Inaccessible, InvalidResponse } from './errors.js'
+
+const userAgent = 'Shields.io/2003a'
+
+function requestOptions2GotOptions(options) {
+  const requestOptions = Object.assign({}, options)
+  const gotOptions = {}
+  const interchangableOptions = ['body', 'form', 'headers', 'method', 'url']
+
+  interchangableOptions.forEach(function (opt) {
+    if (opt in requestOptions) {
+      gotOptions[opt] = requestOptions[opt]
+      delete requestOptions[opt]
+    }
+  })
+
+  if ('qs' in requestOptions) {
+    gotOptions.searchParams = requestOptions.qs
+    delete requestOptions.qs
+  }
+
+  if ('gzip' in requestOptions) {
+    gotOptions.decompress = requestOptions.gzip
+    delete requestOptions.gzip
+  }
+
+  if ('strictSSL' in requestOptions) {
+    gotOptions.https = {
+      rejectUnauthorized: requestOptions.strictSSL,
+    }
+    delete requestOptions.strictSSL
+  }
+
+  if ('auth' in requestOptions) {
+    gotOptions.username = requestOptions.auth.user
+    gotOptions.password = requestOptions.auth.pass
+    delete requestOptions.auth
+  }
+
+  if (Object.keys(requestOptions).length > 0) {
+    throw new Error(`Found unrecognised options ${Object.keys(requestOptions)}`)
+  }
+
+  return gotOptions
+}
+
+async function sendRequest(gotWrapper, url, options) {
+  const gotOptions = requestOptions2GotOptions(options)
+  gotOptions.throwHttpErrors = false
+  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 got.CancelError) {
+      throw new InvalidResponse({
+        underlyingError: new Error('Maximum response size exceeded'),
+      })
+    }
+    throw new Inaccessible({ underlyingError: err })
+  }
+}
+
+function fetchFactory(fetchLimitBytes) {
+  const gotWithLimit = got.extend({
+    handlers: [
+      (options, next) => {
+        const promiseOrStream = next(options)
+        promiseOrStream.on('downloadProgress', progress => {
+          if (
+            progress.transferred > fetchLimitBytes &&
+            // just accept the file if we've already finished downloading
+            // the entire file before we went over the limit
+            progress.percent !== 1
+          ) {
+            /*
+            TODO: we should be able to pass cancel() a message
+            https://github.com/sindresorhus/got/blob/main/documentation/advanced-creation.md#examples
+            but by the time we catch it, err.message is just "Promise was canceled"
+            */
+            promiseOrStream.cancel('Maximum response size exceeded')
+          }
+        })
+
+        return promiseOrStream
+      },
+    ],
+  })
+
+  return sendRequest.bind(sendRequest, gotWithLimit)
+}
+
+export { requestOptions2GotOptions, fetchFactory }
--- a/core/base-service/got.spec.js
+++ b/core/base-service/got.spec.js
@@ -0,0 +1,102 @@
+import { expect } from 'chai'
+import nock from 'nock'
+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 { res } = await sendRequest('https://www.google.com/foo/bar')
+    expect(res.statusCode).to.equal(200)
+  })
+
+  it('should throw an InvalidResponse error if the response is > fetchLimitBytes', async function () {
+    nock('https://www.google.com')
+      .get('/foo/bar')
+      .once()
+      .reply(200, 'x'.repeat(101))
+    const sendRequest = fetchFactory(100)
+    return expect(
+      sendRequest('https://www.google.com/foo/bar')
+    ).to.be.rejectedWith(InvalidResponse, 'Maximum response size exceeded')
+  })
+
+  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)
+    return expect(
+      sendRequest('https://www.google.com/foo/bar')
+    ).to.be.rejectedWith(Inaccessible, 'oh no')
+  })
+
+  it('should throw an Inaccessible error if the host can not be accessed', async function () {
+    this.timeout(5000)
+    nock.disableNetConnect()
+    const sendRequest = fetchFactory(1024)
+    return expect(
+      sendRequest('https://www.google.com/foo/bar')
+    ).to.be.rejectedWith(
+      Inaccessible,
+      'Nock: Disallowed net connect for "www.google.com:443/foo/bar"'
+    )
+  })
+
+  it('should pass a custom user agent header', async function () {
+    nock('https://www.google.com', {
+      reqheaders: {
+        'user-agent': function (agent) {
+          return agent.startsWith('Shields.io')
+        },
+      },
+    })
+      .get('/foo/bar')
+      .once()
+      .reply(200)
+    const sendRequest = fetchFactory(1024)
+    await sendRequest('https://www.google.com/foo/bar')
+  })
+
+  afterEach(function () {
+    nock.cleanAll()
+    nock.enableNetConnect()
+  })
+})
--- a/core/base-service/graphql.js
+++ b/core/base-service/graphql.js
@@ -1,4 +1,3 @@
-'use strict'
 /**
 * @module
 */
@@ -49,4 +48,4 @@ function mergeQueries(...queries) {
  return merged
 }

-module.exports = { mergeQueries }
+export { mergeQueries }
--- a/core/base-service/graphql.spec.js
+++ b/core/base-service/graphql.spec.js
@@ -1,11 +1,9 @@
-'use strict'
+import { expect } from 'chai'
+import gql from 'graphql-tag'
+import { print } from 'graphql/language/printer.js'
+import { mergeQueries } from './graphql.js'

-const { expect } = require('chai')
-const gql = require('graphql-tag')
-const { print } = require('graphql/language/printer')
-const { mergeQueries } = require('./graphql')
-
-require('../register-chai-plugins.spec')
+import '../register-chai-plugins.spec.js'

 describe('mergeQueries function', function () {
  it('merges valid gql queries', function () {
--- a/core/base-service/index.js
+++ b/core/base-service/index.js
@@ -1,23 +1,21 @@
-'use strict'
-
-const BaseService = require('./base')
-const BaseJsonService = require('./base-json')
-const BaseGraphqlService = require('./base-graphql')
-const BaseStaticService = require('./base-static')
-const BaseSvgScrapingService = require('./base-svg-scraping')
-const BaseXmlService = require('./base-xml')
-const BaseYamlService = require('./base-yaml')
-const deprecatedService = require('./deprecated-service')
-const redirector = require('./redirector')
-const {
+import BaseService from './base.js'
+import BaseJsonService from './base-json.js'
+import BaseGraphqlService from './base-graphql.js'
+import BaseStaticService from './base-static.js'
+import BaseSvgScrapingService from './base-svg-scraping.js'
+import BaseXmlService from './base-xml.js'
+import BaseYamlService from './base-yaml.js'
+import deprecatedService from './deprecated-service.js'
+import redirector from './redirector.js'
+import {
  NotFound,
  InvalidResponse,
  Inaccessible,
  InvalidParameter,
  Deprecated,
-} = require('./errors')
+} from './errors.js'

-module.exports = {
+export {
  BaseService,
  BaseJsonService,
  BaseGraphqlService,
--- a/core/base-service/json.js
+++ b/core/base-service/json.js
@@ -1,9 +1,7 @@
-'use strict'
-
 // See available emoji at http://emoji.muan.co/
-const emojic = require('emojic')
-const { InvalidResponse } = require('./errors')
-const trace = require('./trace')
+import emojic from 'emojic'
+import { InvalidResponse } from './errors.js'
+import trace from './trace.js'

 function parseJson(buffer) {
  const logTrace = (...args) => trace.logTrace('fetch', ...args)
@@ -23,6 +21,4 @@ function parseJson(buffer) {
  return json
 }

-module.exports = {
-  parseJson,
-}
+export { parseJson }
--- a/core/base-service/legacy-request-handler.js
+++ b/core/base-service/legacy-request-handler.js
@@ -1,15 +1,9 @@
-'use strict'
-
-const request = require('request')
-const makeBadge = require('../../badge-maker/lib/make-badge')
-const { setCacheHeaders } = require('./cache-headers')
-const {
-  Inaccessible,
-  InvalidResponse,
-  ShieldsRuntimeError,
-} = require('./errors')
-const { makeSend } = require('./legacy-result-sender')
-const coalesceBadge = require('./coalesce-badge')
+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'

@@ -206,8 +200,4 @@ function handleRequest(cacheHeaderConfig, handlerOptions) {
  }
 }

-module.exports = {
-  handleRequest,
-  promisify,
-  userAgent,
-}
+export { handleRequest, promisify, userAgent }
--- a/core/base-service/legacy-request-handler.spec.js
+++ b/core/base-service/legacy-request-handler.spec.js
@@ -1,12 +1,10 @@
-'use strict'
-
-const { expect } = require('chai')
-const nock = require('nock')
-const portfinder = require('portfinder')
-const Camp = require('@shields_io/camp')
-const got = require('../got-test-client')
-const coalesceBadge = require('./coalesce-badge')
-const { handleRequest } = require('./legacy-request-handler')
+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'
+import coalesceBadge from './coalesce-badge.js'
+import { handleRequest } from './legacy-request-handler.js'

 async function performTwoRequests(baseUrl, first, second) {
  expect((await got(`${baseUrl}${first}`)).statusCode).to.equal(200)
--- a/core/base-service/legacy-result-sender.js
+++ b/core/base-service/legacy-result-sender.js
@@ -1,6 +1,4 @@
-'use strict'
-
-const stream = require('stream')
+import stream from 'stream'

 function streamFromString(str) {
  const newStream = new stream.Readable()
@@ -32,6 +30,4 @@ function makeSend(format, askres, end) {
  }
 }

-module.exports = {
-  makeSend,
-}
+export { makeSend }
--- a/core/base-service/loader-test-fixtures/empty-array.fixture.js
+++ b/core/base-service/loader-test-fixtures/empty-array.fixture.js
@@ -1,3 +1 @@
-'use strict'
-
-module.exports = []
+export default []
--- a/core/base-service/loader-test-fixtures/empty-no-export.fixture.js
+++ b/core/base-service/loader-test-fixtures/empty-no-export.fixture.js
@@ -1,4 +1,2 @@
 /* eslint-disable */
-'use strict'
-
-class BadService {}
+class BadService {} // lgtm [js/unused-local-variable]
--- a/core/base-service/loader-test-fixtures/empty-object.fixture.js
+++ b/core/base-service/loader-test-fixtures/empty-object.fixture.js
@@ -1,3 +1 @@
-'use strict'
-
-module.exports = {}
+export {}
--- a/core/base-service/loader-test-fixtures/empty-undefined.fixture.js
+++ b/core/base-service/loader-test-fixtures/empty-undefined.fixture.js
@@ -1,3 +1 @@
-'use strict'
-
-module.exports = undefined
+export default undefined
--- a/core/base-service/loader-test-fixtures/invalid-mixed.fixture.js
+++ b/core/base-service/loader-test-fixtures/invalid-mixed.fixture.js
@@ -1,9 +1,10 @@
-'use strict'
-
-const BaseJsonService = require('../base-json')
+import BaseJsonService from '../base-json.js'

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

-module.exports = [GoodService, BadService]
+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,5 +1,3 @@
-'use strict'
-
 class BadService {}

-module.exports = BadService
+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,6 +1,4 @@
-'use strict'
-
 class BadBaseService {}
 class BadService extends BadBaseService {}

-module.exports = BadService
+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,6 +1,4 @@
-'use strict'
-
-const BaseJsonService = require('../base-json')
+import BaseJsonService from '../base-json.js'

 class GoodServiceOne extends BaseJsonService {
  static category = 'build'
@@ -11,4 +9,4 @@ class GoodServiceTwo extends BaseJsonService {
  static route = { base: 'good', pattern: 'two' }
 }

-module.exports = [GoodServiceOne, GoodServiceTwo]
+export default [GoodServiceOne, GoodServiceTwo]
--- a/core/base-service/loader-test-fixtures/valid-class.fixture.js
+++ b/core/base-service/loader-test-fixtures/valid-class.fixture.js
@@ -1,10 +1,8 @@
-'use strict'
-
-const BaseJsonService = require('../base-json')
+import BaseJsonService from '../base-json.js'

 class GoodService extends BaseJsonService {
  static category = 'build'
  static route = { base: 'it/is', pattern: 'good' }
 }

-module.exports = GoodService
+export default GoodService
--- a/core/base-service/loader-test-fixtures/valid-object.fixture.js
+++ b/core/base-service/loader-test-fixtures/valid-object.fixture.js
@@ -1,6 +1,4 @@
-'use strict'
-
-const BaseJsonService = require('../base-json')
+import BaseJsonService from '../base-json.js'

 class GoodServiceOne extends BaseJsonService {
  static category = 'build'
@@ -11,4 +9,4 @@ class GoodServiceTwo extends BaseJsonService {
  static route = { base: 'good', pattern: 'two' }
 }

-module.exports = { GoodServiceOne, GoodServiceTwo }
+export { GoodServiceOne, GoodServiceTwo }
--- a/core/base-service/loader.js
+++ b/core/base-service/loader.js
@@ -1,13 +1,17 @@
-'use strict'
+import path from 'path'
+import { fileURLToPath } from 'url'
+import glob from 'glob'
+import countBy from 'lodash.countby'
+import categories from '../../services/categories.js'
+import BaseService from './base.js'
+import { assertValidServiceDefinitionExport } from './service-definitions.js'

-const path = require('path')
-const glob = require('glob')
-const countBy = require('lodash.countby')
-const categories = require('../../services/categories')
-const BaseService = require('./base')
-const { assertValidServiceDefinitionExport } = require('./service-definitions')
-
-const serviceDir = path.join(__dirname, '..', '..', 'services')
+const serviceDir = path.join(
+  path.dirname(fileURLToPath(import.meta.url)),
+  '..',
+  '..',
+  'services'
+)

 class InvalidService extends Error {
  constructor(message) {
@@ -16,54 +20,38 @@ class InvalidService extends Error {
  }
 }

-function loadServiceClasses(servicePaths) {
+async function loadServiceClasses(servicePaths) {
  if (!servicePaths) {
    servicePaths = glob.sync(path.join(serviceDir, '**', '*.service.js'))
  }

-  let serviceClasses = []
-  servicePaths.forEach(servicePath => {
-    const module = require(servicePath)
+  const serviceClasses = []
+  for await (const servicePath of servicePaths) {
+    const currentServiceClasses = Object.values(
+      await import(`file://${servicePath}`)
+    ).flatMap(element =>
+      typeof element === 'object' ? Object.values(element) : element
+    )

-    const theseServiceClasses = []
-    if (
-      !module ||
-      (module.constructor === Array && module.length === 0) ||
-      (module.constructor === Object && Object.keys(module).length === 0)
-    ) {
+    if (currentServiceClasses.length === 0) {
      throw new InvalidService(
        `Expected ${servicePath} to export a service or a collection of services`
      )
-    } else if (module.prototype instanceof BaseService) {
-      theseServiceClasses.push(module)
-    } else if (module.constructor === Array || module.constructor === Object) {
-      for (const key in module) {
-        const serviceClass = module[key]
-        if (serviceClass.prototype instanceof BaseService) {
-          theseServiceClasses.push(serviceClass)
-        } else {
-          throw new InvalidService(
-            `Expected ${servicePath} to export a service or a collection of services; one of them was ${serviceClass}`
-          )
-        }
-      }
-    } else {
-      throw new InvalidService(
-        `Expected ${servicePath} to export a service or a collection of services; got ${module}`
-      )
    }
-
-    // Decorate each service class with the directory that contains it.
-    theseServiceClasses.forEach(serviceClass => {
-      serviceClass.serviceFamily = servicePath
-        .replace(serviceDir, '')
-        .split(path.sep)[1]
+    currentServiceClasses.forEach(serviceClass => {
+      if (serviceClass && serviceClass.prototype instanceof BaseService) {
+        // Decorate each service class with the directory that contains it.
+        serviceClass.serviceFamily = servicePath
+          .replace(serviceDir, '')
+          .split(path.sep)[1]
+        serviceClass.validateDefinition()
+        return serviceClasses.push(serviceClass)
+      }
+      throw new InvalidService(
+        `Expected ${servicePath} to export a service or a collection of services; one of them was ${serviceClass}`
+      )
    })
-
-    serviceClasses = serviceClasses.concat(theseServiceClasses)
-  })
-
-  serviceClasses.forEach(ServiceClass => ServiceClass.validateDefinition())
+  }

  return serviceClasses
 }
@@ -80,8 +68,8 @@ function assertNamesUnique(names, { message }) {
  }
 }

-function checkNames() {
-  const services = loadServiceClasses()
+async function checkNames() {
+  const services = await loadServiceClasses()
  assertNamesUnique(
    services.map(({ name }) => name),
    {
@@ -90,8 +78,8 @@ function checkNames() {
  )
 }

-function collectDefinitions() {
-  const services = loadServiceClasses()
+async function collectDefinitions() {
+  const services = (await loadServiceClasses())
    // flatMap.
    .map(ServiceClass => ServiceClass.getDefinition())
    .reduce((accum, these) => accum.concat(these), [])
@@ -103,13 +91,15 @@ function collectDefinitions() {
  return result
 }

-function loadTesters() {
-  return glob
-    .sync(path.join(serviceDir, '**', '*.tester.js'))
-    .map(path => require(path))
+async function loadTesters() {
+  return Promise.all(
+    glob
+      .sync(path.join(serviceDir, '**', '*.tester.js'))
+      .map(async path => await import(`file://${path}`))
+  )
 }

-module.exports = {
+export {
  InvalidService,
  loadServiceClasses,
  checkNames,
--- a/core/base-service/loader.spec.js
+++ b/core/base-service/loader.spec.js
@@ -1,59 +1,67 @@
-'use strict'
+import path from 'path'
+import { fileURLToPath } from 'url'
+import chai from 'chai'
+import chaiAsPromised from 'chai-as-promised'
+import { loadServiceClasses, InvalidService } from './loader.js'
+chai.use(chaiAsPromised)

-const { expect } = require('chai')
-const { loadServiceClasses, InvalidService } = require('./loader')
+const { expect } = chai
+const fixturesDir = path.join(
+  path.dirname(fileURLToPath(import.meta.url)),
+  'loader-test-fixtures'
+)

 describe('loadServiceClasses function', function () {
-  it('throws if module exports empty', function () {
-    expect(() =>
-      loadServiceClasses(['./loader-test-fixtures/empty-undefined.fixture.js'])
-    ).to.throw(InvalidService)
-    expect(() =>
-      loadServiceClasses(['./loader-test-fixtures/empty-array.fixture.js'])
-    ).to.throw()
-    expect(() =>
-      loadServiceClasses(['./loader-test-fixtures/empty-object.fixture.js'])
-    ).to.throw(InvalidService)
-    expect(() =>
-      loadServiceClasses(['./loader-test-fixtures/empty-no-export.fixture.js'])
-    ).to.throw(InvalidService)
-    expect(() =>
+  it('throws if module exports empty', async function () {
+    await expect(
+      loadServiceClasses([path.join(fixturesDir, 'empty-undefined.fixture.js')])
+    ).to.be.rejectedWith(InvalidService)
+    await expect(
+      loadServiceClasses([path.join(fixturesDir, 'empty-array.fixture.js')])
+    ).to.be.rejectedWith(InvalidService)
+    await expect(
+      loadServiceClasses([path.join(fixturesDir, 'empty-object.fixture.js')])
+    ).to.be.rejectedWith(InvalidService)
+    await expect(
+      loadServiceClasses([path.join(fixturesDir, 'empty-no-export.fixture.js')])
+    ).to.be.rejectedWith(InvalidService)
+    await expect(
      loadServiceClasses([
-        './loader-test-fixtures/valid-array.fixture.js',
-        './loader-test-fixtures/valid-class.fixture.js',
-        './loader-test-fixtures/empty-array.fixture.js',
+        path.join(fixturesDir, 'valid-array.fixture.js'),
+        path.join(fixturesDir, 'valid-class.fixture.js'),
+        path.join(fixturesDir, 'empty-array.fixture.js'),
      ])
-    ).to.throw(InvalidService)
+    ).to.be.rejectedWith(InvalidService)
  })

-  it('throws if module exports invalid', function () {
-    expect(() =>
-      loadServiceClasses(['./loader-test-fixtures/invalid-no-base.fixture.js'])
-    ).to.throw(InvalidService)
-    expect(() =>
+  it('throws if module exports invalid', async function () {
+    await expect(
+      loadServiceClasses([path.join(fixturesDir, 'invalid-no-base.fixture.js')])
+    ).to.be.rejectedWith(InvalidService)
+    await expect(
      loadServiceClasses([
-        './loader-test-fixtures/invalid-wrong-base.fixture.js',
+        path.join(fixturesDir, 'invalid-wrong-base.fixture.js'),
      ])
-    ).to.throw(InvalidService)
-    expect(() =>
-      loadServiceClasses(['./loader-test-fixtures/invalid-mixed.fixture.js'])
-    ).to.throw(InvalidService)
-    expect(() =>
+    ).to.be.rejectedWith(InvalidService)
+    await expect(
+      loadServiceClasses([path.join(fixturesDir, 'invalid-mixed.fixture.js')])
+    ).to.be.rejectedWith(InvalidService)
+    await expect(
      loadServiceClasses([
-        './loader-test-fixtures/valid-array.fixture.js',
-        './loader-test-fixtures/valid-class.fixture.js',
-        './loader-test-fixtures/invalid-no-base.fixture.js',
+        path.join(fixturesDir, 'valid-array.fixture.js'),
+        path.join(fixturesDir, 'valid-class.fixture.js'),
+        path.join(fixturesDir, 'invalid-no-base.fixture.js'),
      ])
-    ).to.throw(InvalidService)
+    ).to.be.rejectedWith(InvalidService)
  })

-  it('registers services if module exports valid service classes', function () {
-    expect(
+  it('registers services if module exports valid service classes', async function () {
+    await expect(
      loadServiceClasses([
-        './loader-test-fixtures/valid-array.fixture.js',
-        './loader-test-fixtures/valid-object.fixture.js',
-        './loader-test-fixtures/valid-class.fixture.js',
+        path.join(fixturesDir, 'valid-array.fixture.js'),
+        path.join(fixturesDir, 'valid-object.fixture.js'),
+        path.join(fixturesDir, 'valid-class.fixture.js'),
      ])
-    ).to.have.length(5)
+    ).to.eventually.have.length(5)
  })
 })
--- a/core/base-service/metric-helper.js
+++ b/core/base-service/metric-helper.js
@@ -1,6 +1,4 @@
-'use strict'
-
-const { performance } = require('perf_hooks')
+import { performance } from 'perf_hooks'

 class MetricHelper {
  constructor({ metricInstance }, { category, serviceFamily, name }) {
@@ -59,4 +57,4 @@ const MetricNames = Object.freeze({
  SERVICE_RESPONSE_SIZE: Symbol('service-response-size'),
 })

-module.exports = { MetricHelper, MetricNames }
+export { MetricHelper, MetricNames }
--- a/core/base-service/redirector.js
+++ b/core/base-service/redirector.js
@@ -1,18 +1,16 @@
-'use strict'
-
-const camelcase = require('camelcase')
-const emojic = require('emojic')
-const Joi = require('joi')
-const queryString = require('query-string')
-const BaseService = require('./base')
-const {
+import camelcase from 'camelcase'
+import emojic from 'emojic'
+import Joi from 'joi'
+import queryString from 'query-string'
+import BaseService from './base.js'
+import {
  serverHasBeenUpSinceResourceCached,
  setCacheHeadersForStaticResource,
-} = require('./cache-headers')
-const { isValidCategory } = require('./categories')
-const { MetricHelper } = require('./metric-helper')
-const { isValidRoute, prepareRoute, namedParamsForMatch } = require('./route')
-const trace = require('./trace')
+} from './cache-headers.js'
+import { isValidCategory } from './categories.js'
+import { MetricHelper } from './metric-helper.js'
+import { isValidRoute, prepareRoute, namedParamsForMatch } from './route.js'
+import trace from './trace.js'

 const attrSchema = Joi.object({
  name: Joi.string().min(3),
@@ -32,7 +30,7 @@ const attrSchema = Joi.object({
  overrideTransformedQueryParams: Joi.bool().optional(),
 }).required()

-module.exports = function redirector(attrs) {
+export default function redirector(attrs) {
  const {
    name,
    category,
--- a/core/base-service/redirector.spec.js
+++ b/core/base-service/redirector.spec.js
@@ -1,10 +1,8 @@
-'use strict'
-
-const Camp = require('@shields_io/camp')
-const portfinder = require('portfinder')
-const { expect } = require('chai')
-const got = require('../got-test-client')
-const redirector = require('./redirector')
+import Camp from '@shields_io/camp'
+import portfinder from 'portfinder'
+import { expect } from 'chai'
+import got from '../got-test-client.js'
+import redirector from './redirector.js'

 describe('Redirector', function () {
  const route = {
--- a/core/base-service/route.js
+++ b/core/base-service/route.js
@@ -1,8 +1,6 @@
-'use strict'
-
-const escapeStringRegexp = require('escape-string-regexp')
-const Joi = require('joi')
-const { pathToRegexp } = require('path-to-regexp')
+import escapeStringRegexp from 'escape-string-regexp'
+import Joi from 'joi'
+import { pathToRegexp } from 'path-to-regexp'

 function makeFullUrl(base, partialUrl) {
  return `/${[base, partialUrl].filter(Boolean).join('/')}`
@@ -74,7 +72,7 @@ function getQueryParamNames({ queryParamSchema }) {
  }
 }

-module.exports = {
+export {
  makeFullUrl,
  isValidRoute,
  assertValidRoute,
--- a/core/base-service/route.spec.js
+++ b/core/base-service/route.spec.js
@@ -1,13 +1,11 @@
-'use strict'
-
-const { expect } = require('chai')
-const Joi = require('joi')
-const { test, given, forCases } = require('sazerac')
-const {
+import { expect } from 'chai'
+import Joi from 'joi'
+import { test, given, forCases } from 'sazerac'
+import {
  prepareRoute,
  namedParamsForMatch,
  getQueryParamNames,
-} = require('./route')
+} from './route.js'

 describe('Route helpers', function () {
  context('A `pattern` with a named param is declared', function () {
--- a/core/base-service/service-definitions.js
+++ b/core/base-service/service-definitions.js
@@ -1,6 +1,4 @@
-'use strict'
-
-const Joi = require('joi')
+import Joi from 'joi'

 // This should be kept in sync with the schema in
 // `frontend/lib/service-definitions/index.ts`.
@@ -72,7 +70,7 @@ function assertValidServiceDefinitionExport(examples, message = undefined) {
  Joi.assert(examples, serviceDefinitionExport, message)
 }

-module.exports = {
+export {
  serviceDefinition,
  assertValidServiceDefinition,
  serviceDefinitionExport,
--- a/core/base-service/to-array.js
+++ b/core/base-service/to-array.js
@@ -1,6 +1,4 @@
-'use strict'
-
-module.exports = function toArray(val) {
+export default function toArray(val) {
  if (val === undefined) {
    return []
  } else if (Object(val) instanceof Array) {
--- a/core/base-service/trace.js
+++ b/core/base-service/trace.js
@@ -1,7 +1,6 @@
-'use strict'
-
-const chalk = require('chalk')
-const config = require('config').util.toObject()
+import chalk from 'chalk'
+import config from 'config'
+const objectConfig = config.util.toObject()

 // Config is loaded globally but it would be better to inject it. To do that,
 // there needs to be one instance of the service created at registration time,
@@ -10,7 +9,7 @@ const config = require('config').util.toObject()
 // thereby gaining access to the injected config.
 const {
  services: { trace: enableTraceLogging },
-} = config.public
+} = objectConfig.public

 function _formatLabelForStage(stage, label) {
  const colorFn = {
@@ -37,6 +36,6 @@ function logTrace(stage, symbol, label, content, { deep = false } = {}) {
  }
 }

-module.exports = {
+export default {
  logTrace,
 }
--- a/core/base-service/validate.js
+++ b/core/base-service/validate.js
@@ -1,8 +1,6 @@
-'use strict'
-
-const emojic = require('emojic')
-const Joi = require('joi')
-const trace = require('./trace')
+import emojic from 'emojic'
+import Joi from 'joi'
+import trace from './trace.js'

 function validate(
  {
@@ -50,4 +48,4 @@ function validate(
  }
 }

-module.exports = validate
+export default validate
--- a/core/base-service/validate.spec.js
+++ b/core/base-service/validate.spec.js
@@ -1,11 +1,9 @@
-'use strict'
-
-const Joi = require('joi')
-const { expect } = require('chai')
-const sinon = require('sinon')
-const trace = require('./trace')
-const { InvalidParameter } = require('./errors')
-const validate = require('./validate')
+import Joi from 'joi'
+import { expect } from 'chai'
+import sinon from 'sinon'
+import trace from './trace.js'
+import { InvalidParameter } from './errors.js'
+import validate from './validate.js'

 describe('validate', function () {
  const schema = Joi.object({
--- a/core/got-test-client.js
+++ b/core/got-test-client.js
@@ -1,6 +1,4 @@
-'use strict'
-
-const got = require('got')
+import got from 'got'

 // https://github.com/nock/nock/issues/1523
-module.exports = got.extend({ retry: 0 })
+export default got.extend({ retry: 0 })
--- a/core/legacy/regular-update.js
+++ b/core/legacy/regular-update.js
@@ -1,6 +1,5 @@
-'use strict'
-
-const { Inaccessible, InvalidResponse } = require('../base-service/errors')
+import requestModule from 'request'
+import { Inaccessible, InvalidResponse } from '../base-service/errors.js'

 // Map from URL to { timestamp: last fetch time, data: data }.
 let regularUpdateCache = Object.create(null)
@@ -11,8 +10,8 @@ let regularUpdateCache = Object.create(null)
 //
 // To use this from a service:
 //
-// const { promisify } = require('util')
-// const { regularUpdate } = require('../../core/legacy/regular-update')
+// import { promisify } from 'util'
+// import { regularUpdate } from '../../core/legacy/regular-update.js'
 //
 // function getThing() {
 //   return promisify(regularUpdate)({
@@ -32,7 +31,7 @@ function regularUpdate(
    json = true,
    scraper = buffer => buffer,
    options = {},
-    request = require('request'),
+    request = requestModule,
  },
  cb
 ) {
@@ -95,7 +94,4 @@ function clearRegularUpdateCache() {
  regularUpdateCache = Object.create(null)
 }

-module.exports = {
-  regularUpdate,
-  clearRegularUpdateCache,
-}
+export { regularUpdate, clearRegularUpdateCache }
--- a/core/register-chai-plugins.spec.js
+++ b/core/register-chai-plugins.spec.js
@@ -1,6 +1,5 @@
-'use strict'
-
-const { use } = require('chai')
-
-use(require('chai-string'))
-use(require('sinon-chai'))
+import { use } from 'chai'
+import chaiString from 'chai-string'
+import sinonChai from 'sinon-chai'
+use(chaiString)
+use(sinonChai)
--- a/core/server/in-process-server-test-helpers.js
+++ b/core/server/in-process-server-test-helpers.js
@@ -1,18 +1,14 @@
-'use strict'
-
-const merge = require('deepmerge')
-const config = require('config').util.toObject()
-const portfinder = require('portfinder')
-const Server = require('./server')
+import merge from 'deepmerge'
+import config from 'config'
+import portfinder from 'portfinder'
+import Server from './server.js'

 async function createTestServer(customConfig = {}) {
-  const mergedConfig = merge(config, customConfig)
+  const mergedConfig = merge(config.util.toObject(), customConfig)
  if (!mergedConfig.public.bind.port) {
    mergedConfig.public.bind.port = await portfinder.getPortPromise()
  }
  return new Server(mergedConfig)
 }

-module.exports = {
-  createTestServer,
-}
+export { createTestServer }
--- a/core/server/influx-metrics.js
+++ b/core/server/influx-metrics.js
@@ -1,11 +1,10 @@
-'use strict'
-const os = require('os')
-const got = require('got')
-const generateInstanceId = require('./instance-id-generator')
-const { promClientJsonToInfluxV2 } = require('./metrics/format-converters')
-const log = require('./log')
+import os from 'os'
+import got from 'got'
+import generateInstanceId from './instance-id-generator.js'
+import { promClientJsonToInfluxV2 } from './metrics/format-converters.js'
+import log from './log.js'

-module.exports = class InfluxMetrics {
+export default class InfluxMetrics {
  constructor(metricInstance, config) {
    this._metricInstance = metricInstance
    this._config = config
--- a/core/server/influx-metrics.spec.js
+++ b/core/server/influx-metrics.spec.js
@@ -1,11 +1,10 @@
-'use strict'
-const os = require('os')
-const nock = require('nock')
-const sinon = require('sinon')
-const { expect } = require('chai')
-const log = require('./log')
-const InfluxMetrics = require('./influx-metrics')
-require('../register-chai-plugins.spec')
+import os from 'os'
+import nock from 'nock'
+import sinon from 'sinon'
+import { expect } from 'chai'
+import log from './log.js'
+import InfluxMetrics from './influx-metrics.js'
+import '../register-chai-plugins.spec.js'
 describe('Influx metrics', function () {
  const metricInstance = {
    metrics() {
--- a/core/server/instance-id-generator.js
+++ b/core/server/instance-id-generator.js
@@ -1,8 +1,6 @@
-'use strict'
-
 function generateInstanceId() {
  // from https://gist.github.com/gordonbrander/2230317
  return Math.random().toString(36).substr(2, 9)
 }

-module.exports = generateInstanceId
+export default generateInstanceId
--- a/core/server/log.js
+++ b/core/server/log.js
@@ -1,5 +1,4 @@
-'use strict'
-const Sentry = require('@sentry/node')
+import Sentry from '@sentry/node'

 const listeners = []

@@ -23,27 +22,32 @@ function date() {
  )
 }

-module.exports = function log(...msg) {
+const log = (...msg) => {
  const d = date()
  listeners.forEach(f => f(d, ...msg))
  console.log(d, ...msg)
 }

-module.exports.error = function error(err) {
+const error = err => {
  const d = date()
  listeners.forEach(f => f(d, err))
  Sentry.captureException(err)
  console.error(d, err)
 }

-module.exports.addListener = function addListener(func) {
-  listeners.push(func)
-}
+const addListener = func => listeners.push(func)

-module.exports.removeListener = function removeListener(func) {
+const removeListener = func => {
  const index = listeners.indexOf(func)
  if (index < 0) {
    return
  }
  listeners.splice(index, 1)
 }
+
+export default {
+  log,
+  error,
+  addListener,
+  removeListener,
+}
--- a/core/server/metrics/format-converters.js
+++ b/core/server/metrics/format-converters.js
@@ -1,5 +1,4 @@
-'use strict'
-const groupBy = require('lodash.groupby')
+import groupBy from 'lodash.groupby'

 function promClientJsonToInfluxV2(metrics, extraLabels = {}) {
  return metrics
@@ -24,4 +23,4 @@ function promClientJsonToInfluxV2(metrics, extraLabels = {}) {
    .join('\n')
 }

-module.exports = { promClientJsonToInfluxV2 }
+export { promClientJsonToInfluxV2 }
--- a/core/server/metrics/format-converters.spec.js
+++ b/core/server/metrics/format-converters.spec.js
@@ -1,8 +1,6 @@
-'use strict'
-
-const { expect } = require('chai')
-const prometheus = require('prom-client')
-const { promClientJsonToInfluxV2 } = require('./format-converters')
+import { expect } from 'chai'
+import prometheus from 'prom-client'
+import { promClientJsonToInfluxV2 } from './format-converters.js'

 describe('Metric format converters', function () {
  describe('prom-client JSON to InfluxDB line protocol (version 2)', function () {
--- a/core/server/prometheus-metrics.js
+++ b/core/server/prometheus-metrics.js
@@ -1,9 +1,7 @@
-'use strict'
+import decamelize from 'decamelize'
+import prometheus from 'prom-client'

-const decamelize = require('decamelize')
-const prometheus = require('prom-client')
-
-module.exports = class PrometheusMetrics {
+export default class PrometheusMetrics {
  constructor({ register } = {}) {
    this.register = register || new prometheus.Registry()
    this.counters = {
--- a/Show More
+++ b/Show More