fix

Bumps [query-string](https://github.com/sindresorhus/query-string) from 7.1.0 to 7.1.1.
- [Release notes](https://github.com/sindresorhus/query-string/releases)
- [Commits](https://github.com/sindresorhus/query-string/compare/v7.1.0...v7.1.1)

---
updated-dependencies:
- dependency-name: query-string
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.circleci/config.yml

@@ -6,7 +6,9 @@ main_steps: &main_steps
 
     - run:
         name: Install dependencies
-        command: npm ci
+        command: |
+          npm install --dry-run
+          npm ci
         environment:
           # https://docs.cypress.io/guides/getting-started/installing-cypress.html#Skipping-installation
           # We don't need to install the Cypress binary in jobs that aren't actually running Cypress.
@@ -47,7 +49,9 @@ integration_steps: &integration_steps
 
     - run:
         name: Install dependencies
-        command: npm ci
+        command: |
+          npm install --dry-run
+          npm ci
         environment:
           CYPRESS_INSTALL_BINARY: 0
 
@@ -68,7 +72,9 @@ services_steps: &services_steps
 
     - run:
         name: Install dependencies
-        command: npm ci
+        command: |
+          npm install --dry-run
+          npm ci
         environment:
           CYPRESS_INSTALL_BINARY: 0
 
@@ -138,6 +144,9 @@ jobs:
   main:
     docker:
       - image: circleci/node:16
+        environment:
+          NPM_CONFIG_ENGINE_STRICT: 'true'
+          NPM_CONFIG_STRICT_PEER_DEPS: 'true'
 
     <<: *main_steps
 
@@ -150,6 +159,9 @@ jobs:
   integration:
     docker:
       - image: circleci/node:16
+        environment:
+          NPM_CONFIG_ENGINE_STRICT: 'true'
+          NPM_CONFIG_STRICT_PEER_DEPS: 'true'
       - image: redis
 
     <<: *integration_steps
@@ -184,12 +196,17 @@ jobs:
   frontend:
     docker:
       - image: circleci/node:16
+        environment:
+          NPM_CONFIG_ENGINE_STRICT: 'true'
+          NPM_CONFIG_STRICT_PEER_DEPS: 'true'
     steps:
       - checkout
 
       - run:
           name: Install dependencies
-          command: npm ci
+          command: |
+            npm install --dry-run
+            npm ci
           environment:
             CYPRESS_INSTALL_BINARY: 0
 
@@ -225,6 +242,9 @@ jobs:
   services:
     docker:
       - image: circleci/node:16
+        environment:
+          NPM_CONFIG_ENGINE_STRICT: 'true'
+          NPM_CONFIG_STRICT_PEER_DEPS: 'true'
 
     <<: *services_steps
 
@@ -237,6 +257,9 @@ jobs:
   e2e:
     docker:
       - image: cypress/base:16.13.0
+        environment:
+          NPM_CONFIG_ENGINE_STRICT: 'true'
+          NPM_CONFIG_STRICT_PEER_DEPS: 'true'
     steps:
       - checkout
 
@@ -247,7 +270,9 @@ jobs:
 
       - run:
           name: Install dependencies
-          command: npm ci
+          command: |
+            npm install --dry-run
+            npm ci
 
       - run:
           name: Frontend build

.github/actions/close-bot/helpers.js

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

.github/actions/close-bot/package-lock.json

@@ -160,11 +160,22 @@
       }
     },
     "node_modules/node-fetch": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
-      "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==",
+      "version": "2.6.7",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
+      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
+      "dependencies": {
+        "whatwg-url": "^5.0.0"
+      },
       "engines": {
         "node": "4.x || >=6.0.0"
+      },
+      "peerDependencies": {
+        "encoding": "^0.1.0"
+      },
+      "peerDependenciesMeta": {
+        "encoding": {
+          "optional": true
+        }
       }
     },
     "node_modules/once": {
@@ -175,6 +186,11 @@
         "wrappy": "1"
       }
     },
+    "node_modules/tr46": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+      "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o="
+    },
     "node_modules/tunnel": {
       "version": "0.0.6",
       "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz",
@@ -188,6 +204,20 @@
       "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.0.tgz",
       "integrity": "sha512-isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w=="
     },
+    "node_modules/webidl-conversions": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+      "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE="
+    },
+    "node_modules/whatwg-url": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+      "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=",
+      "dependencies": {
+        "tr46": "~0.0.3",
+        "webidl-conversions": "^3.0.0"
+      }
+    },
     "node_modules/wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
@@ -333,9 +363,12 @@
       "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q=="
     },
     "node-fetch": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
-      "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw=="
+      "version": "2.6.7",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
+      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
+      "requires": {
+        "whatwg-url": "^5.0.0"
+      }
     },
     "once": {
       "version": "1.4.0",
@@ -345,6 +378,11 @@
         "wrappy": "1"
       }
     },
+    "tr46": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+      "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o="
+    },
     "tunnel": {
       "version": "0.0.6",
       "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz",
@@ -355,6 +393,20 @@
       "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.0.tgz",
       "integrity": "sha512-isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w=="
     },
+    "webidl-conversions": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+      "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE="
+    },
+    "whatwg-url": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+      "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=",
+      "requires": {
+        "tr46": "~0.0.3",
+        "webidl-conversions": "^3.0.0"
+      }
+    },
     "wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",

.github/actions/tester/action.yml

@@ -0,0 +1,12 @@
+name: 'Tester'
+description: 'Just for debugging purposes'
+branding:
+  icon: 'check-circle'
+  color: 'green'
+inputs:
+  build-args:
+    description: 'List of build-time variables'
+    required: true
+runs:
+  using: 'node12'
+  main: 'index.js'

.github/actions/tester/index.js

@@ -0,0 +1,10 @@
+'use strict'
+
+const core = require('@actions/core')
+
+async function run() {
+  const buildArgs = await core.getInput('build-args', true)
+  console.log(buildArgs)
+}
+
+run()

.github/actions/tester/package-lock.json

@@ -0,0 +1,416 @@
+{
+  "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.6.0",
+        "@actions/github": "^5.0.0"
+      }
+    },
+    "node_modules/@actions/core": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.6.0.tgz",
+      "integrity": "sha512-NB1UAZomZlCV/LmJqkLhNTqtKfFXJZAUPcfl/zqG7EfsQdeUJtaWO98SGbuQ3pydJ3fHl2CvI/51OKYlCYYcaw==",
+      "dependencies": {
+        "@actions/http-client": "^1.0.11"
+      }
+    },
+    "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.7",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
+      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
+      "dependencies": {
+        "whatwg-url": "^5.0.0"
+      },
+      "engines": {
+        "node": "4.x || >=6.0.0"
+      },
+      "peerDependencies": {
+        "encoding": "^0.1.0"
+      },
+      "peerDependenciesMeta": {
+        "encoding": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "dependencies": {
+        "wrappy": "1"
+      }
+    },
+    "node_modules/tr46": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+      "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o="
+    },
+    "node_modules/tunnel": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz",
+      "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/webidl-conversions": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+      "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE="
+    },
+    "node_modules/whatwg-url": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+      "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=",
+      "dependencies": {
+        "tr46": "~0.0.3",
+        "webidl-conversions": "^3.0.0"
+      }
+    },
+    "node_modules/wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+    }
+  },
+  "dependencies": {
+    "@actions/core": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.6.0.tgz",
+      "integrity": "sha512-NB1UAZomZlCV/LmJqkLhNTqtKfFXJZAUPcfl/zqG7EfsQdeUJtaWO98SGbuQ3pydJ3fHl2CvI/51OKYlCYYcaw==",
+      "requires": {
+        "@actions/http-client": "^1.0.11"
+      }
+    },
+    "@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.7",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
+      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
+      "requires": {
+        "whatwg-url": "^5.0.0"
+      }
+    },
+    "once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "requires": {
+        "wrappy": "1"
+      }
+    },
+    "tr46": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+      "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o="
+    },
+    "tunnel": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz",
+      "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=="
+    },
+    "webidl-conversions": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+      "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE="
+    },
+    "whatwg-url": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+      "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=",
+      "requires": {
+        "tr46": "~0.0.3",
+        "webidl-conversions": "^3.0.0"
+      }
+    },
+    "wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+    }
+  }
+}

.github/actions/tester/package.json

@@ -0,0 +1,16 @@
+{
+  "name": "close-bot",
+  "version": "0.0.0",
+  "description": "",
+  "main": "index.js",
+  "private": true,
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "chris48s",
+  "license": "CC0",
+  "dependencies": {
+    "@actions/core": "^1.6.0",
+    "@actions/github": "^5.0.0"
+  }
+}

.github/dependabot.yml

@@ -8,6 +8,16 @@ updates:
       day: friday
       time: '12:00'
     open-pull-requests-limit: 99
+    ignore:
+      # https://github.com/badges/shields/issues/7324
+      # https://github.com/badges/shields/issues/7447
+      # we're stuck with these versions until Safari is compatible with lookbehind regex syntax
+      # https://caniuse.com/js-regexp-lookbehind
+      - dependency-name: 'decamelize'
+      - dependency-name: 'humanize-string'
+
+      # https://github.com/badges/shields/pull/7288#issuecomment-974699240
+      - dependency-name: '@types/node'
 
   # badge-maker package dependencies
   - package-ecosystem: npm

.github/workflows/test-build-args.yml

@@ -0,0 +1,20 @@
+name: Tester
+on: push
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Install action dependencies
+        run: cd .github/actions/tester && npm ci
+
+      - name: Set Git Short SHA
+        run: echo "SHORT_SHA=${GITHUB_SHA::7}" >> $GITHUB_ENV
+
+      - uses: ./.github/actions/tester
+        with:
+          build-args: |
+            version=${{ env.SHORT_SHA }}

CHANGELOG.md

@@ -4,6 +4,24 @@ Note: this changelog is for the shields.io server. The changelog for the badge-m
 
 ---
 
+## server-2022-02-01
+
+- [Depfu] Add support for Gitlab [#7475](https://github.com/badges/shields/issues/7475)
+- replace label in hn-user-karma with U/ [#7500](https://github.com/badges/shields/issues/7500)
+- Support [Feedz] response with multiple pages without items [#7476](https://github.com/badges/shields/issues/7476)
+- revert decamelize and humanize-string to old versions [#7449](https://github.com/badges/shields/issues/7449)
+- Dependency updates
+
+## server-2022-01-01
+
+- minor [reddit] improvements [#7436](https://github.com/badges/shields/issues/7436)
+- [HackerNews] Show User Karma [#7411](https://github.com/badges/shields/issues/7411)
+- [YouTube] Drop support for removed dislikes [#7410](https://github.com/badges/shields/issues/7410)
+- change closed GitHub issue color to purple [#7374](https://github.com/badges/shields/issues/7374)
+- restore cors header injection from #4171 [#4255](https://github.com/badges/shields/issues/4255)
+- [GithubPackageJson] Get version from monorepo subfolder package.json [#7350](https://github.com/badges/shields/issues/7350)
+- Dependency updates
+
 ## server-2021-12-01
 
 - Send better user-agent values [#7309](https://github.com/badges/shields/issues/7309)

SECURITY.md

@@ -7,7 +7,7 @@ Please follow this guidance when reporting security issues affecting:
 - [Shields.io](https://shields.io)
 - [Raster.shields.io](https://raster.shields.io)
 - Self-hosted Shields instances
-- The [svg-to-image-proxy](https://www.npmjs.com/package/svg-to-image-proxy) NPM package
+- The [squint](https://github.com/badges/squint) raster proxy
 - The [badge-maker](https://www.npmjs.com/package/badge-maker) NPM package
 
 The [gh-badges](https://www.npmjs.com/package/gh-badges) NPM package is now deprecated and will no longer receive fixes for bugs or security issues.

core/base-service/auth-helper.js

@@ -108,7 +108,9 @@ class AuthHelper {
 
   get _basicAuth() {
     const { _user: username, _pass: password } = this
-    return this.isConfigured ? { username, password } : undefined
+    return this.isConfigured
+      ? { username: username || '', password: password || '' }
+      : undefined
   }
 
   /*

core/base-service/auth-helper.spec.js

@@ -107,10 +107,10 @@ describe('AuthHelper', function () {
       ]).expect({ username: 'admin', password: 'abc123' })
       given({ userKey: 'myci_user' }, { myci_user: 'admin' }).expect({
         username: 'admin',
-        password: undefined,
+        password: '',
       })
       given({ passKey: 'myci_pass' }, { myci_pass: 'abc123' }).expect({
-        username: undefined,
+        username: '',
         password: 'abc123',
       })
       given({ userKey: 'myci_user', passKey: 'myci_pass' }, {}).expect(

core/base-service/base-xml.js

@@ -4,7 +4,7 @@
 
 // See available emoji at http://emoji.muan.co/
 import emojic from 'emojic'
-import fastXmlParser from 'fast-xml-parser'
+import { XMLParser, XMLValidator } from 'fast-xml-parser'
 import BaseService from './base.js'
 import trace from './trace.js'
 import { InvalidResponse } from './errors.js'
@@ -51,14 +51,15 @@ class BaseXmlService extends BaseService {
       options: mergedOptions,
       errorMessages,
     })
-    const validateResult = fastXmlParser.validate(buffer)
+    const validateResult = XMLValidator.validate(buffer)
     if (validateResult !== true) {
       throw new InvalidResponse({
         prettyMessage: 'unparseable xml response',
         underlyingError: validateResult.err,
       })
     }
-    const xml = fastXmlParser.parse(buffer, parserOptions)
+    const parser = new XMLParser(parserOptions)
+    const xml = parser.parse(buffer)
     logTrace(emojic.dart, 'Response XML (before validation)', xml, {
       deep: true,
     })

core/base-service/got.js

@@ -1,4 +1,4 @@
-import got from 'got'
+import got, { CancelError } from 'got'
 import { Inaccessible, InvalidResponse } from './errors.js'
 import {
   fetchLimitBytes as fetchLimitBytesDefault,
@@ -10,14 +10,14 @@ const userAgent = getUserAgent()
 async function sendRequest(gotWrapper, url, options) {
   const gotOptions = Object.assign({}, options)
   gotOptions.throwHttpErrors = false
-  gotOptions.retry = 0
+  gotOptions.retry = { limit: 0 }
   gotOptions.headers = gotOptions.headers || {}
   gotOptions.headers['User-Agent'] = userAgent
   try {
     const resp = await gotWrapper(url, gotOptions)
     return { res: resp, buffer: resp.body }
   } catch (err) {
-    if (err instanceof got.CancelError) {
+    if (err instanceof CancelError) {
       throw new InvalidResponse({
         underlyingError: new Error('Maximum response size exceeded'),
       })

core/got-test-client.js

@@ -1,4 +1,4 @@
 import got from 'got'
 
 // https://github.com/nock/nock/issues/1523
-export default got.extend({ retry: 0 })
+export default got.extend({ retry: { limit: 0 } })

core/server/influx-metrics.js

@@ -16,7 +16,7 @@ export default class InfluxMetrics {
       url: this._config.url,
       headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
       body: await this.metrics(),
-      timeout: this._config.timeoutMillseconds,
+      timeout: { request: this._config.timeoutMillseconds },
       username: this._config.username,
       password: this._config.password,
       throwHttpErrors: false,

core/server/influx-metrics.spec.js

@@ -5,6 +5,7 @@ import { expect } from 'chai'
 import log from './log.js'
 import InfluxMetrics from './influx-metrics.js'
 import '../register-chai-plugins.spec.js'
+
 describe('Influx metrics', function () {
   const metricInstance = {
     metrics() {

core/server/server.js

@@ -506,6 +506,12 @@ class Server {
     const { apiProvider: githubApiProvider } = this.githubConstellation
     setRoutes(allowedOrigin, githubApiProvider, camp)
 
+    // https://github.com/badges/shields/issues/3273
+    camp.handle((req, res, next) => {
+      res.setHeader('Access-Control-Allow-Origin', '*')
+      next()
+    })
+
     this.registerErrorHandlers()
     this.registerRedirects()
     await this.registerServices()

core/server/server.spec.js

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

core/service-test-runner/icedfrisby-shields.js

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

doc/deprecating-badges.md

@@ -94,6 +94,8 @@ Here is a listing of all deleted badges that were once part of the Shields.io se
 - Cauditor
 - CocoaPods Apps
 - CocoaPods Downloads
+- Codetally
+- continuousphp
 - Coverity
 - Dockbit
 - Dotnet Status

doc/production-hosting.md

@@ -22,8 +22,6 @@ Production hosting is managed by the Shields ops team:
 | Compose.io Redis              | Account owner                   | @paulmelnikow                                                   |
 | Compose.io Redis              | Account access                  | @paulmelnikow                                                   |
 | Compose.io Redis              | Database connection credentials | @calebcartwright, @chris48s, @paulmelnikow, @pyvesb             |
-| Zeit Now                      | Team owner                      | @paulmelnikow                                                   |
-| Zeit Now                      | Team members                    | @paulmelnikow, @chris48s, @calebcartwright, @platan             |
 | Raster server                 | Full access as team members     | @paulmelnikow, @chris48s, @calebcartwright, @platan             |
 | shields-server.com redirector | Full access as team members     | @paulmelnikow, @chris48s, @calebcartwright, @platan             |
 | Cloudflare (CDN)              | Account owner                   | @espadrine                                                      |
@@ -94,11 +92,8 @@ Cloudflare is configured to respect the servers' cache headers.
 ## Raster server
 
 The raster server `raster.shields.io` (a.k.a. the rasterizing proxy) is
-hosted on [Zeit Now][]. It's managed in the
-[svg-to-image-proxy repo][svg-to-image-proxy].
-
-[zeit now]: https://zeit.co/now
-[svg-to-image-proxy]: https://github.com/badges/svg-to-image-proxy
+hosted on Heroku. It's managed in the
+[squint](https://github.com/badges/squint/) repo.
 
 ### Heroku Deployment
 

doc/self-hosting.md

@@ -118,10 +118,8 @@ machine.
 ## Raster server
 
 If you want to host PNG badges, you can also self-host a [raster server][]
-which points to your badge server. It's designed as a web function which is
-tested on Zeit Now, though you may be able to run it on AWS Lambda. It's
-built on the [micro][] framework, and comes with a `start` script that allows
-it to run as a standalone Node service.
+which points to your badge server. It's a docker container. We host it on
+Heroku but should be possible to host on a wide variety of platforms.
 
 - In your raster instance, set `BASE_URL` to your Shields instance, e.g.
   `https://shields.example.co`.
@@ -130,11 +128,9 @@ it to run as a standalone Node service.
   for the legacy raster URLs instead of 404's.
 
 If anyone has set this up, more documentation on how to do this would be
-welcome! It would also be nice to ship a Docker image that includes a
-preconfigured raster server.
+welcome!
 
-[raster server]: https://github.com/badges/svg-to-image-proxy
-[micro]: https://github.com/zeit/micro
+[raster server]: https://github.com/badges/squint
 
 ## Server secrets
 

frontend/pages/community.tsx

@@ -5,7 +5,6 @@ import Meta from '../components/meta'
 import Header from '../components/header'
 import Footer from '../components/footer'
 import { BaseFont, GlobalStyle, H3 } from '../components/common'
-import Heroku from '../../static/images/heroku-logotype-horizontal-purple.svg'
 import NodePing from '../../static/images/nodeping.svg'
 import Sentry from '../../static/images/sentry-logo-black.svg'
 const MainContainer = styled(BaseFont)`
@@ -43,11 +42,6 @@ export default function SponsorsPage(): JSX.Element {
         ❤️ These companies help us by donating their services to shields:
         <ul style={{ listStyleType: 'none' }}>
           <SponsorItems>
-            <li>
-              <a href="https://www.heroku.com/">
-                <Heroku alt="heroku_logo" height={120} />
-              </a>
-            </li>
             <li>
               <a href="https://nodeping.com/">
                 <NodePing alt="nodeping_logo" height={60} />

package.json

@@ -12,8 +12,7 @@
   ],
   "homepage": "https://shields.io",
   "bugs": {
-    "url": "https://github.com/badges/shields/issues",
-    "email": "thaddee.tyl@gmail.com"
+    "url": "https://github.com/badges/shields/issues"
   },
   "license": "CC0-1.0",
   "author": "Thaddée Tyl <thaddee.tyl@gmail.com>",
@@ -22,29 +21,29 @@
     "url": "https://github.com/badges/shields"
   },
   "dependencies": {
-    "@fontsource/lato": "^4.5.0",
-    "@fontsource/lekton": "^4.5.0",
-    "@sentry/node": "^6.15.0",
+    "@fontsource/lato": "^4.5.1",
+    "@fontsource/lekton": "^4.5.2",
+    "@sentry/node": "^6.17.4",
     "@shields_io/camp": "^18.1.1",
     "badge-maker": "file:badge-maker",
-    "bytes": "^3.1.1",
-    "camelcase": "^6.2.1",
+    "bytes": "^3.1.2",
+    "camelcase": "^6.3.0",
     "chalk": "^5.0.0",
     "check-node-version": "^4.2.1",
     "cloudflare-middleware": "^1.0.4",
-    "config": "^3.3.6",
+    "config": "^3.3.7",
     "cross-env": "^7.0.3",
-    "decamelize": "^6.0.0",
+    "decamelize": "^3.2.0",
     "emojic": "^1.1.16",
     "escape-string-regexp": "^4.0.0",
-    "fast-xml-parser": "^3.21.1",
+    "fast-xml-parser": "^4.0.2",
     "glob": "^7.2.0",
     "global-agent": "^3.0.0",
-    "got": "11.8.3",
+    "got": "^12.0.1",
     "graphql": "^15.6.1",
     "graphql-tag": "^2.12.6",
-    "ioredis": "4.28.1",
-    "joi": "17.4.2",
+    "ioredis": "4.28.4",
+    "joi": "17.6.0",
     "joi-extension-semver": "5.0.0",
     "js-yaml": "^4.1.0",
     "jsonpath": "~1.1.1",
@@ -53,15 +52,15 @@
     "lodash.times": "^4.3.2",
     "moment": "^2.29.1",
     "node-env-flag": "^0.1.0",
-    "parse-link-header": "^1.0.1",
+    "parse-link-header": "^2.0.0",
     "path-to-regexp": "^6.2.0",
     "pretty-bytes": "^5.6.0",
     "priorityqueuejs": "^2.0.0",
     "prom-client": "^14.0.1",
-    "qs": "^6.10.1",
-    "query-string": "^7.0.1",
+    "qs": "^6.10.3",
+    "query-string": "^7.1.1",
     "semver": "~7.3.5",
-    "simple-icons": "5.24.0",
+    "simple-icons": "6.8.0",
     "webextension-store-meta": "^1.0.5",
     "xmldom": "~0.6.0",
     "xpath": "~0.0.32"
@@ -141,35 +140,35 @@
     ]
   },
   "devDependencies": {
-    "@babel/core": "^7.16.0",
+    "@babel/core": "^7.17.0",
     "@babel/polyfill": "^7.12.1",
-    "@babel/register": "7.16.0",
+    "@babel/register": "7.17.0",
+    "@istanbuljs/schema": "^0.1.3",
     "@mapbox/react-click-to-select": "^2.2.1",
-    "@types/chai": "^4.2.22",
+    "@types/chai": "^4.3.0",
     "@types/lodash.debounce": "^4.0.6",
     "@types/lodash.groupby": "^4.6.6",
-    "@types/mocha": "^9.0.0",
+    "@types/mocha": "^9.1.0",
     "@types/node": "^16.7.10",
-    "@types/react-helmet": "^6.1.4",
+    "@types/react-helmet": "^6.1.5",
     "@types/react-modal": "^3.13.1",
     "@types/react-select": "^4.0.17",
-    "@types/styled-components": "5.1.15",
-    "@typescript-eslint/eslint-plugin": "^5.4.0",
-    "@typescript-eslint/parser": "^5.3.0",
+    "@types/styled-components": "5.1.22",
+    "@typescript-eslint/eslint-plugin": "^5.10.2",
+    "@typescript-eslint/parser": "^5.10.0",
     "babel-plugin-inline-react-svg": "^2.0.1",
-    "babel-plugin-istanbul": "^6.1.1",
-    "babel-preset-gatsby": "^2.2.0",
-    "c8": "^7.10.0",
+    "babel-preset-gatsby": "^2.5.1",
+    "c8": "^7.11.0",
     "caller": "^1.0.1",
-    "chai": "^4.3.4",
+    "chai": "^4.3.6",
     "chai-as-promised": "^7.1.1",
     "chai-datetime": "^1.8.0",
     "chai-string": "^1.4.0",
     "child-process-promise": "^2.2.1",
     "clipboard-copy": "^4.0.1",
-    "concurrently": "^6.4.0",
-    "cypress": "^9.1.0",
-    "danger": "^10.7.1",
+    "concurrently": "^7.0.0",
+    "cypress": "^9.4.1",
+    "danger": "^11.0.2",
     "danger-plugin-no-test-shortcuts": "^2.0.0",
     "deepmerge": "^4.2.2",
     "eslint": "^7.32.0",
@@ -179,48 +178,48 @@
     "eslint-config-standard-react": "^11.0.1",
     "eslint-plugin-chai-friendly": "^0.7.2",
     "eslint-plugin-cypress": "^2.12.1",
-    "eslint-plugin-import": "^2.25.3",
-    "eslint-plugin-jsdoc": "^37.0.3",
-    "eslint-plugin-mocha": "^9.0.0",
+    "eslint-plugin-import": "^2.25.4",
+    "eslint-plugin-jsdoc": "^37.7.1",
+    "eslint-plugin-mocha": "^10.0.3",
     "eslint-plugin-no-extension-in-require": "^0.2.0",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-promise": "^5.1.1",
-    "eslint-plugin-react": "^7.27.1",
+    "eslint-plugin-promise": "^6.0.0",
+    "eslint-plugin-react": "^7.28.0",
     "eslint-plugin-react-hooks": "^4.3.0",
-    "eslint-plugin-sort-class-members": "^1.14.0",
+    "eslint-plugin-sort-class-members": "^1.14.1",
     "fetch-ponyfill": "^7.1.0",
     "form-data": "^4.0.0",
-    "gatsby": "4.2.0",
-    "gatsby-plugin-catch-links": "^4.2.0",
-    "gatsby-plugin-page-creator": "^4.2.0",
+    "gatsby": "4.6.2",
+    "gatsby-plugin-catch-links": "^4.5.0",
+    "gatsby-plugin-page-creator": "^4.3.0",
     "gatsby-plugin-react-helmet": "^5.2.0",
     "gatsby-plugin-remove-trailing-slashes": "^4.2.0",
     "gatsby-plugin-styled-components": "^5.2.0",
     "gatsby-plugin-typescript": "^4.2.0",
-    "humanize-string": "^3.0.0",
+    "humanize-string": "^2.1.0",
     "icedfrisby": "4.0.0",
     "icedfrisby-nock": "^2.1.0",
     "is-svg": "^4.3.2",
     "js-yaml-loader": "^1.2.2",
-    "jsdoc": "^3.6.7",
-    "lint-staged": "^12.1.2",
+    "jsdoc": "^3.6.10",
+    "lint-staged": "^12.3.3",
     "lodash.debounce": "^4.0.8",
     "lodash.difference": "^4.5.0",
     "minimist": "^1.2.5",
-    "mocha": "^9.1.3",
+    "mocha": "^9.2.0",
     "mocha-env-reporter": "^4.0.0",
     "mocha-junit-reporter": "^2.0.2",
     "mocha-yaml-loader": "^1.0.3",
-    "nock": "13.2.1",
+    "nock": "13.2.4",
     "node-mocks-http": "^1.11.0",
     "nodemon": "^2.0.15",
     "npm-run-all": "^4.1.5",
     "open-cli": "^7.0.1",
     "portfinder": "^1.0.28",
-    "prettier": "2.5.0",
+    "prettier": "2.5.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
-    "react-error-overlay": "^6.0.9",
+    "react-error-overlay": "^6.0.10",
     "react-helmet": "^6.1.0",
     "react-modal": "^3.14.4",
     "react-pose": "^4.0.10",
@@ -230,29 +229,21 @@
     "rimraf": "^3.0.2",
     "sazerac": "^2.0.0",
     "simple-git-hooks": "^2.7.0",
-    "sinon": "^12.0.1",
+    "sinon": "^13.0.1",
     "sinon-chai": "^3.7.0",
     "snap-shot-it": "^7.9.6",
     "start-server-and-test": "1.14.0",
     "styled-components": "^5.3.3",
-    "ts-mocha": "^8.0.0",
-    "tsd": "^0.19.0",
-    "typescript": "^4.5.2"
+    "ts-mocha": "^9.0.2",
+    "tsd": "^0.19.1",
+    "typescript": "^4.5.5",
+    "url": "^0.11.0"
   },
   "engines": {
     "node": "^16.13.0",
     "npm": ">=7.0.0"
   },
   "type": "module",
-  "babel": {
-    "env": {
-      "test": {
-        "plugins": [
-          "istanbul"
-        ]
-      }
-    }
-  },
   "collective": {
     "type": "opencollective",
     "url": "https://opencollective.com/shields",

services/aur/aur.service.js

@@ -42,7 +42,7 @@ class BaseAurService extends BaseJsonService {
     // https://wiki.archlinux.org/index.php/Aurweb_RPC_interface
     return this._requestJson({
       schema: aurSchema,
-      url: 'https://aur.archlinux.org/rpc.php',
+      url: 'https://aur.archlinux.org/rpc',
       options: { searchParams: { v: 5, type: 'info', arg: packageName } },
     })
   }

services/aur/aur.tester.js

@@ -45,7 +45,7 @@ t.create('license (no license)')
   .get('/license/vscodium-bin.json')
   .intercept(nock =>
     nock('https://aur.archlinux.org')
-      .get('/rpc.php')
+      .get('/rpc')
       .query({
         v: 5,
         type: 'info',

services/codacy/codacy-coverage.service.js

@@ -16,14 +16,14 @@ export default class CodacyCoverage extends BaseSvgScrapingService {
     {
       title: 'Codacy coverage',
       pattern: ':projectId',
-      namedParams: { projectId: 'e02de8d738bb4701b6345624ea2de66c' },
+      namedParams: { projectId: 'd5402a91aa7b4234bd1c19b5e86a63be' },
       staticPreview: this.render({ percentage: 90 }),
     },
     {
       title: 'Codacy branch coverage',
       pattern: ':projectId/:branch',
       namedParams: {
-        projectId: 'e02de8d738bb4701b6345624ea2de66c',
+        projectId: 'd5402a91aa7b4234bd1c19b5e86a63be',
         branch: 'master',
       },
       staticPreview: this.render({ percentage: 90 }),

services/codacy/codacy-coverage.tester.js

@@ -2,22 +2,22 @@ import { isIntegerPercentage } from '../test-validators.js'
 import { createServiceTester } from '../tester.js'
 export const t = await createServiceTester()
 
-// https://app.codacy.com/gh/Seagate/cortx-s3server/dashboard?_ga=2.227678553.575705995.1626641804-993201653.1626641804
-// https://github.com/Seagate/cortx-s3server
-t.create('Coverage').get('/e02de8d738bb4701b6345624ea2de66c.json').expectBadge({
+// https://app.codacy.com/gh/kronenthaler/openstep-parser/dashboard
+// https://github.com/kronenthaler/openstep-parser
+t.create('Coverage').get('/d5402a91aa7b4234bd1c19b5e86a63be.json').expectBadge({
   label: 'coverage',
   message: isIntegerPercentage,
 })
 
 t.create('Coverage on branch')
-  .get('/e02de8d738bb4701b6345624ea2de66c/main.json')
+  .get('/d5402a91aa7b4234bd1c19b5e86a63be/master.json')
   .expectBadge({
     label: 'coverage',
     message: isIntegerPercentage,
   })
 
 t.create('Coverage not enabled')
-  .get('/e27821fb6289410b8f58338c7e0bc686.json')
+  .get('/0cb32ce695b743d68257021455330c66.json')
   .expectBadge({
     label: 'coverage',
     message: 'not enabled for this project',

services/codacy/codacy-grade.service.js

@@ -12,14 +12,14 @@ export default class CodacyGrade extends BaseSvgScrapingService {
     {
       title: 'Codacy grade',
       pattern: ':projectId',
-      namedParams: { projectId: 'a994873f30d045b9b4b83606c3eb3498' },
+      namedParams: { projectId: '0cb32ce695b743d68257021455330c66' },
       staticPreview: this.render({ grade: 'A' }),
     },
     {
       title: 'Codacy branch grade',
       pattern: ':projectId/:branch',
       namedParams: {
-        projectId: 'a994873f30d045b9b4b83606c3eb3498',
+        projectId: '0cb32ce695b743d68257021455330c66',
         branch: 'master',
       },
       staticPreview: this.render({ grade: 'A' }),

services/codacy/codacy-grade.tester.js

@@ -2,17 +2,17 @@ import { createServiceTester } from '../tester.js'
 import { codacyGrade } from './codacy-helpers.js'
 export const t = await createServiceTester()
 
-// https://github.com/netdata/netdata/
-// https://app.codacy.com/manual/netdata/netdata/dashboard
+// https://app.codacy.com/gh/NicolasCARPi/jquery_jeditable/dashboard
+// https://github.com/NicolasCARPi/jquery_jeditable
 t.create('Code quality')
-  .get('/a994873f30d045b9b4b83606c3eb3498.json')
+  .get('/0cb32ce695b743d68257021455330c66.json')
   .expectBadge({
     label: 'code quality',
     message: codacyGrade,
   })
 
 t.create('Code quality on branch')
-  .get('/a994873f30d045b9b4b83606c3eb3498/master.json')
+  .get('/0cb32ce695b743d68257021455330c66/master.json')
   .expectBadge({
     label: 'code quality',
     message: codacyGrade,

services/codefactor/codefactor-grade.service.js

@@ -18,9 +18,9 @@ export default class CodeFactorGrade extends BaseSvgScrapingService {
       title: 'CodeFactor Grade',
       namedParams: {
         vcsType: 'github',
-        user: 'pallets',
-        repo: 'flask',
-        branch: 'master',
+        user: 'microsoft',
+        repo: 'powertoys',
+        branch: 'main',
       },
       staticPreview: this.render({ grade: 'B+' }),
     },

services/codefactor/codefactor-grade.tester.js

@@ -2,13 +2,13 @@ import { createServiceTester } from '../tester.js'
 import { isValidGrade } from './codefactor-helpers.js'
 export const t = await createServiceTester()
 
-t.create('Grade').get('/github/google/guava.json').expectBadge({
+t.create('Grade').get('/github/microsoft/powertoys.json').expectBadge({
   label: 'code quality',
   message: isValidGrade,
 })
 
 t.create('Grade (branch)')
-  .get('/github/pallets/flask/master.json')
+  .get('/github/spring-projects/spring-boot/main.json')
   .expectBadge({
     label: 'code quality',
     message: isValidGrade,

services/codetally/codetally.service.js

@@ -1,13 +0,0 @@
-import { deprecatedService } from '../index.js'
-
-export default [
-  deprecatedService({
-    category: 'funding',
-    label: 'codetally',
-    route: {
-      base: 'codetally',
-      pattern: ':owner/:repo',
-    },
-    dateAdded: new Date('2020-09-05'),
-  }),
-]

services/codetally/codetally.tester.js

@@ -1,14 +0,0 @@
-import { ServiceTester } from '../tester.js'
-
-export const t = new ServiceTester({
-  id: 'Codetally',
-  title: 'Codetally',
-  pathPrefix: '/codetally',
-})
-
-t.create('no longer available')
-  .get('/triggerman722/colorstrap.json')
-  .expectBadge({
-    label: 'codetally',
-    message: 'no longer available',
-  })

services/continuousphp/continuousphp.service.js

@@ -1,11 +0,0 @@
-import { deprecatedService } from '../index.js'
-
-export default deprecatedService({
-  category: 'build',
-  route: {
-    base: 'continuousphp',
-    pattern: ':various+',
-  },
-  label: 'continuousphp',
-  dateAdded: new Date('2020-12-12'),
-})

services/continuousphp/continuousphp.tester.js

@@ -1,20 +0,0 @@
-import { ServiceTester } from '../tester.js'
-
-export const t = new ServiceTester({
-  id: 'continuousphp',
-  title: 'Continuousphp',
-})
-
-t.create('no longer available (previously build status on default branch)')
-  .get('/git-hub/doctrine/dbal.json')
-  .expectBadge({
-    label: 'continuousphp',
-    message: 'no longer available',
-  })
-
-t.create('no longer available (previously build status on named branch)')
-  .get('/git-hub/doctrine/dbal/develop.json')
-  .expectBadge({
-    label: 'continuousphp',
-    message: 'no longer available',
-  })

services/depfu/depfu.service.js

@@ -1,18 +1,22 @@
 import Joi from 'joi'
-import { BaseJsonService } from '../index.js'
+import { BaseJsonService, InvalidParameter, redirector } from '../index.js'
 
 const depfuSchema = Joi.object({
   text: Joi.string().required(),
   colorscheme: Joi.string().required(),
 }).required()
 
-export default class Depfu extends BaseJsonService {
+class Depfu extends BaseJsonService {
   static category = 'dependencies'
-  static route = { base: 'depfu', pattern: ':user/:repo' }
+  static route = {
+    base: 'depfu/dependencies',
+    pattern: ':vcsType(github|gitlab)/:project+',
+  }
+
   static examples = [
     {
       title: 'Depfu',
-      namedParams: { user: 'depfu', repo: 'example-ruby' },
+      namedParams: { vcsType: 'github', project: 'depfu/example-ruby' },
       staticPreview: this.render({
         text: 'recent',
         colorscheme: 'brightgreen',
@@ -29,13 +33,31 @@ export default class Depfu extends BaseJsonService {
     }
   }
 
-  async fetch({ user, repo }) {
-    const url = `https://depfu.com/github/shields/${user}/${repo}`
+  async fetch({ vcsType, project }) {
+    const separatorPosition = project.lastIndexOf('/')
+    if (separatorPosition < 0) {
+      throw new InvalidParameter()
+    }
+    const user = encodeURIComponent(project.substr(0, separatorPosition))
+    const repo = project.substr(separatorPosition)
+    const url = `https://depfu.com/${vcsType}/shields/${user}/${repo}`
     return this._requestJson({ url, schema: depfuSchema })
   }
 
-  async handle({ user, repo }) {
-    const { text, colorscheme } = await this.fetch({ user, repo })
+  async handle({ vcsType, project }) {
+    const { text, colorscheme } = await this.fetch({ vcsType, project })
     return this.constructor.render({ text, colorscheme })
   }
 }
+
+const legacyRoutes = [
+  redirector({
+    category: 'dependencies',
+    route: { base: 'depfu', pattern: ':user/:repo' },
+    transformPath: ({ user, repo }) =>
+      `/depfu/dependencies/github/${user}/${repo}`,
+    dateAdded: new Date('2022-01-11'),
+  }),
+]
+
+export default { ...legacyRoutes, Depfu }

services/depfu/depfu.tester.js

@@ -10,13 +10,51 @@ const isDependencyStatus = Joi.string().valid(
 
 export const t = new ServiceTester({ id: 'depfu', title: 'Depfu' })
 
-t.create('depfu dependencies (valid)')
-  .get('/depfu/example-ruby.json')
+t.create('depfu Github dependencies (valid)')
+  .get('/dependencies/github/depfu/example-ruby.json')
   .expectBadge({
     label: 'dependencies',
     message: isDependencyStatus,
   })
 
-t.create('depfu dependencies (repo not found)')
-  .get('/pyvesb/emptyrepo.json')
+t.create('depfu Github dependencies (repo not found)')
+  .get('/dependencies/github/pyvesb/emptyrepo.json')
   .expectBadge({ label: 'dependencies', message: 'not found' })
+
+t.create('depfu Gitlab dependencies (valid)')
+  .get('/dependencies/gitlab/depfu/example-ruby.json')
+  .expectBadge({
+    label: 'dependencies',
+    message: isDependencyStatus,
+  })
+
+t.create('depfu Github dependencies (no separator)')
+  .get('/dependencies/github/example-ruby.json')
+  .expectBadge({
+    label: 'dependencies',
+    message: 'invalid parameter',
+  })
+
+t.create('depfu Gitlab dependencies (valid with subgroup)')
+  .get(
+    '/dependencies/gitlab/shields-example-group/subgroup/example-nodejs.json'
+  )
+  .expectBadge({
+    label: 'dependencies',
+    message: isDependencyStatus,
+  })
+
+t.create('depfu Gitlab dependencies (repo not found)')
+  .get('/dependencies/gitlab/fdroid/nonexistant.json')
+  .expectBadge({ label: 'dependencies', message: 'not found' })
+
+t.create('depfu Gitlab dependencies (no separator)')
+  .get('/dependencies/gitlab/example-ruby.json')
+  .expectBadge({
+    label: 'dependencies',
+    message: 'invalid parameter',
+  })
+
+t.create('legacy route (assume "github" as a default VCS)')
+  .get('/depfu/example-ruby.svg')
+  .expectRedirect('/depfu/dependencies/github/depfu/example-ruby.svg')

services/docsrs/docsrs.tester.js

@@ -14,5 +14,5 @@ t.create('Getting latest version works')
   .get('/rand/latest.json')
   .expectBadge({
     label: 'docs',
-    messsage: Joi.allow('passing', 'failing'),
+    message: Joi.allow('passing', 'failing'),
   })

services/drone/drone-build.service.js

@@ -27,7 +27,7 @@ export default class DroneBuild extends BaseJsonService {
       title: 'Drone (cloud)',
       pattern: ':user/:repo',
       namedParams: {
-        user: 'drone',
+        user: 'harness',
         repo: 'drone',
       },
       staticPreview: renderBuildStatusBadge({ status: 'success' }),
@@ -36,7 +36,7 @@ export default class DroneBuild extends BaseJsonService {
       title: 'Drone (cloud) with branch',
       pattern: ':user/:repo/:branch',
       namedParams: {
-        user: 'drone',
+        user: 'harness',
         repo: 'drone',
         branch: 'master',
       },

services/drone/drone-build.tester.js

@@ -10,14 +10,14 @@ const isDroneBuildStatus = Joi.alternatives().try(
 )
 
 t.create('cloud-hosted build status on default branch')
-  .get('/drone/drone.json')
+  .get('/harness/drone.json')
   .expectBadge({
     label: 'build',
     message: isDroneBuildStatus,
   })
 
 t.create('cloud-hosted build status on named branch')
-  .get('/drone/drone/master.json')
+  .get('/harness/drone/master.json')
   .expectBadge({
     label: 'build',
     message: isDroneBuildStatus,

services/feedz/feedz.service.js

@@ -7,22 +7,23 @@ import {
   selectVersion,
 } from '../nuget/nuget-helpers.js'
 
-const schema = Joi.object({
+const singlePageSchema = Joi.object({
+  '@id': Joi.string().required(),
   items: Joi.array()
     .items(
       Joi.object({
-        items: Joi.array().items(
-          Joi.object({
-            catalogEntry: Joi.object({
-              version: Joi.string().required(),
-            }).required(),
-          })
-        ),
-      }).required()
+        catalogEntry: Joi.object({
+          version: Joi.string().required(),
+        }).required(),
+      })
     )
     .default([]),
 }).required()
 
+const packageSchema = Joi.object({
+  items: Joi.array().items(singlePageSchema).default([]),
+}).required()
+
 class FeedzVersionService extends BaseJsonService {
   static category = 'version'
 
@@ -72,7 +73,7 @@ class FeedzVersionService extends BaseJsonService {
       'RegistrationsBaseUrl'
     )
     return await this._requestJson({
-      schema,
+      schema: packageSchema,
       url: `${registrationsBaseUrl}${packageName}/index.json`,
       errorMessages: {
         404: 'repository or package not found',
@@ -80,6 +81,25 @@ class FeedzVersionService extends BaseJsonService {
     })
   }
 
+  async fetchItems({ json }) {
+    if (json.items.length === 0 || json.items.some(i => i.catalogEntry)) {
+      return json
+    } else {
+      const items = await Promise.all(
+        json.items.map(i =>
+          this._requestJson({
+            schema: singlePageSchema,
+            url: i['@id'],
+            errorMessages: {
+              404: 'repository or package not found',
+            },
+          })
+        )
+      )
+      return { items }
+    }
+  }
+
   transform({ json, includePrereleases }) {
     const versions = json.items.flatMap(tl =>
       tl.items.map(i => stripBuildMetadata(i.catalogEntry.version))
@@ -95,7 +115,8 @@ class FeedzVersionService extends BaseJsonService {
     const includePrereleases = which === 'vpre'
     const baseUrl = this.apiUrl({ organization, repository })
     const json = await this.fetch({ baseUrl, packageName })
-    const version = this.transform({ json, includePrereleases })
+    const fetchedJson = await this.fetchItems({ json })
+    const version = this.transform({ json: fetchedJson, includePrereleases })
     return this.constructor.render({
       version,
       feed: FeedzVersionService.defaultBadgeData.label,

services/feedz/feedz.tester.js

@@ -11,6 +11,8 @@ export const t = new ServiceTester({
 //  - Shields.TestPackage: 0.0.1, 0.1.0-pre, 1.0.0
 //  - Shields.TestPreOnly: 0.1.0-pre
 //  - Shields.MultiPage: 0.1.0-0.1.100 plus 1.0.0 but the response has multiple top-level `items`
+//  - Shields.MultiPageNoItems: 0.0.0-0.0.256 plus 1.0.0 but the response has multiple top-level
+//    `items` without `catalogEntries`
 // The source code of these packages is here: https://github.com/jakubfijalkowski/shields-test-packages
 
 // version
@@ -46,6 +48,14 @@ t.create('multi-page')
     color: 'blue',
   })
 
+t.create('multi-page-no-items')
+  .get('/feedz/v/shieldstests/public/Shields.MultiPageNoItems.json')
+  .expectBadge({
+    label: 'feedz',
+    message: 'v1.0.0',
+    color: 'blue',
+  })
+
 t.create('repository (not found)')
   .get('/feedz/v/foo/bar/not-a-real-package.json')
   .expectBadge({ label: 'feedz', message: 'repository or package not found' })

services/github/github-helpers.js

@@ -10,8 +10,8 @@ const documentation = `
 </p>
 `
 
-function stateColor(s) {
-  return { open: '2cbe4e', closed: 'cb2431', merged: '6f42c1' }[s]
+function issueStateColor(s) {
+  return { open: '2cbe4e', closed: '6f42c1' }[s]
 }
 
 function errorMessagesFor(notFoundMessage = 'repo not found') {
@@ -33,7 +33,7 @@ const commentsColor = colorScale([1, 3, 10, 25], undefined, true)
 
 export {
   documentation,
-  stateColor,
+  issueStateColor,
   commentsColor,
   errorMessagesFor,
   transformErrors,

services/github/github-issue-detail.service.js

@@ -7,7 +7,7 @@ import { GithubAuthV3Service } from './github-auth-service.js'
 import {
   documentation,
   errorMessagesFor,
-  stateColor,
+  issueStateColor,
   commentsColor,
 } from './github-helpers.js'
 
@@ -33,7 +33,7 @@ const stateMap = {
 
     if (!isPR || state === 'open') {
       return {
-        color: stateColor(state),
+        color: issueStateColor(state),
         label,
         message: state,
       }

services/github/github-issue-detail.spec.js

@@ -4,7 +4,7 @@ import { age } from '../color-formatters.js'
 import { formatDate, metric } from '../text-formatters.js'
 import { InvalidResponse } from '../index.js'
 import GithubIssueDetail from './github-issue-detail.service.js'
-import { stateColor, commentsColor } from './github-helpers.js'
+import { issueStateColor, commentsColor } from './github-helpers.js'
 
 describe('GithubIssueDetail', function () {
   test(GithubIssueDetail.render, () => {
@@ -16,7 +16,7 @@ describe('GithubIssueDetail', function () {
     }).expect({
       label: 'pull request 12',
       message: 'open',
-      color: stateColor('open'),
+      color: issueStateColor('open'),
     })
     given({
       property: 'state',
@@ -26,7 +26,7 @@ describe('GithubIssueDetail', function () {
     }).expect({
       label: 'issue 15',
       message: 'closed',
-      color: stateColor('closed'),
+      color: issueStateColor('closed'),
     })
     given({
       property: 'title',

services/github/github-package-json.service.js

@@ -16,11 +16,16 @@ const versionSchema = Joi.object({
   version: semver,
 }).required()
 
+const subfolderQueryParamSchema = Joi.object({
+  filename: Joi.string(),
+}).required()
+
 class GithubPackageJsonVersion extends ConditionalGithubAuthV3Service {
   static category = 'version'
   static route = {
     base: 'github/package-json/v',
     pattern: ':user/:repo/:branch*',
+    queryParamSchema: subfolderQueryParamSchema,
   }
 
   static examples = [
@@ -44,6 +49,20 @@ class GithubPackageJsonVersion extends ConditionalGithubAuthV3Service {
       documentation,
       keywords,
     },
+    {
+      title: 'GitHub package.json version (subfolder of monorepo)',
+      pattern: ':user/:repo',
+      namedParams: {
+        user: 'metabolize',
+        repo: 'anafanafo',
+      },
+      queryParams: {
+        filename: 'packages/char-width-table-builder/package.json',
+      },
+      staticPreview: this.render({ version: '2.0.0' }),
+      documentation,
+      keywords,
+    },
   ]
 
   static render({ version, branch }) {
@@ -54,29 +73,25 @@ class GithubPackageJsonVersion extends ConditionalGithubAuthV3Service {
     })
   }
 
-  async handle({ user, repo, branch }) {
+  async handle({ user, repo, branch }, { filename = 'package.json' }) {
     const { version } = await fetchJsonFromRepo(this, {
       schema: versionSchema,
       user,
       repo,
       branch,
-      filename: 'package.json',
+      filename,
     })
     return this.constructor.render({ version, branch })
   }
 }
 
-const dependencyQueryParamSchema = Joi.object({
-  filename: Joi.string(),
-}).required()
-
 class GithubPackageJsonDependencyVersion extends ConditionalGithubAuthV3Service {
   static category = 'platform-support'
   static route = {
     base: 'github/package-json/dependency-version',
     pattern:
       ':user/:repo/:kind(dev|peer|optional)?/:scope(@[^/]+)?/:packageName/:branch*',
-    queryParamSchema: dependencyQueryParamSchema,
+    queryParamSchema: subfolderQueryParamSchema,
   }
 
   static examples = [

services/github/github-package-json.tester.js

@@ -21,6 +21,17 @@ t.create('Package version (repo not found)')
     message: 'repo not found, branch not found, or package.json missing',
   })
 
+t.create('Package version (monorepo)')
+  .get(
+    `/v/metabolize/anafanafo.json?filename=${encodeURIComponent(
+      'packages/char-width-table-builder/package.json'
+    )}`
+  )
+  .expectBadge({
+    label: 'version',
+    message: isSemver,
+  })
+
 t.create('Package name')
   .get('/n/badges/shields.json')
   .expectBadge({ label: 'name', message: 'shields.io' })

services/gitlab/gitlab-coverage.service.js

@@ -69,7 +69,7 @@ export default class GitlabCoverage extends BaseSvgScrapingService {
     },
     {
       title: 'Gitlab code coverage (self-hosted)',
-      namedParams: { user: 'GNOME', repo: 'libhandy', branch: 'master' },
+      namedParams: { user: 'GNOME', repo: 'at-spi2-core', branch: 'master' },
       queryParams: { gitlab_url: 'https://gitlab.gnome.org' },
       staticPreview: this.render({ coverage: 93 }),
       documentation,

services/gitlab/gitlab-coverage.tester.js

@@ -47,7 +47,7 @@ t.create('Coverage (custom invalid job)')
   })
 
 t.create('Coverage (custom gitlab URL)')
-  .get('/GNOME/libhandy/master.json?gitlab_url=https://gitlab.gnome.org')
+  .get('/GNOME/at-spi2-core/master.json?gitlab_url=https://gitlab.gnome.org')
   .expectBadge({
     label: 'coverage',
     message: isIntegerPercentage,

services/gitlab/gitlab-tag.tester.js

@@ -7,7 +7,7 @@ t.create('Tag (latest by date)')
   .expectBadge({ label: 'tag', message: 'v2.0.0', color: 'blue' })
 
 t.create('Tag (nested groups)')
-  .get('/megabyte-labs/dockerfile/ci-pipeline/ansible-lint.json')
+  .get('/megabyte-labs/docker/ci-pipeline/ansible-lint.json')
   .expectBadge({ label: 'tag', message: isSemver, color: 'blue' })
 
 t.create('Tag (project id latest by date)')

services/hackernews/hackernews-user-karma.service.js

@@ -0,0 +1,64 @@
+import Joi from 'joi'
+import { metric } from '../text-formatters.js'
+import { BaseJsonService, NotFound } from '../index.js'
+import { anyInteger } from '../validators.js'
+
+const schema = Joi.object({
+  karma: anyInteger,
+})
+  .allow(null)
+  .required()
+
+export default class HackerNewsUserKarma extends BaseJsonService {
+  static category = 'social'
+
+  static route = {
+    base: 'hackernews/user-karma',
+    pattern: ':id',
+  }
+
+  static examples = [
+    {
+      title: 'HackerNews User Karma',
+      namedParams: { id: 'pg' },
+      staticPreview: this.render({ id: 'pg', karma: 15536 }),
+    },
+  ]
+
+  static defaultBadgeData = {
+    label: 'Karma',
+    namedLogo: 'ycombinator',
+  }
+
+  static render({ karma, id }) {
+    const color = karma > 0 ? 'brightgreen' : karma === 0 ? 'orange' : 'red'
+    return {
+      label: `U/${id} karma`,
+      message: metric(karma),
+      color,
+      style: 'social',
+    }
+  }
+
+  async fetch({ id }) {
+    return this._requestJson({
+      schema,
+      url: `https://hacker-news.firebaseio.com/v0/user/${id}.json`,
+      errorMessages: {
+        404: 'user not found',
+      },
+    })
+  }
+
+  async handle({ id }) {
+    const json = await this.fetch({ id })
+    if (json == null) {
+      throw new NotFound({ prettyMessage: 'user not found' })
+    }
+    const { karma } = json
+    return this.constructor.render({
+      karma,
+      id,
+    })
+  }
+}

services/hackernews/hackernews-user-karma.tester.js

@@ -0,0 +1,26 @@
+import { createServiceTester } from '../tester.js'
+import { isMetricAllowNegative } from '../test-validators.js'
+
+export const t = await createServiceTester()
+
+t.create('valid repo').get('/pg.json').expectBadge({
+  label: 'U/pg karma',
+  message: isMetricAllowNegative,
+})
+
+t.create('valid repo -- negative karma')
+  .get('/negative.json')
+  .intercept(nock =>
+    nock('https://hacker-news.firebaseio.com/v0/user')
+      .get('/negative.json')
+      .reply(200, { karma: -1234 })
+  )
+  .expectBadge({
+    label: 'U/negative karma',
+    message: isMetricAllowNegative,
+  })
+
+t.create('invalid user').get('/hopefullythisdoesnotexist.json').expectBadge({
+  label: 'Karma',
+  message: 'user not found',
+})

services/jenkins/jenkins-coverage.tester.js

@@ -39,6 +39,6 @@ t.create('code coverage API: job not found')
 
 t.create('code coverage API: job found')
   .get(
-    '/api.json?jobUrl=https://jenkins.library.illinois.edu/job/OpenSourceProjects/job/Speedwagon/job/master'
+    '/api.json?jobUrl=http://loneraver.duckdns.org:8082/job/github/job/VisVid/job/master/'
   )
   .expectBadge({ label: 'coverage', message: isIntegerPercentage })

services/jetbrains/jetbrains-base.js

@@ -35,7 +35,7 @@ export default class JetbrainsBase extends BaseXmlService {
 
   async fetchIntelliJPluginData({ pluginId, schema }) {
     const parserOptions = {
-      parseNodeValue: false,
+      parseTagValue: false,
       ignoreAttributes: false,
     }
     return this._requestXml({

services/maven-metadata/maven-metadata.service.js

@@ -52,7 +52,7 @@ export default class MavenMetadata extends BaseXmlService {
     return this._requestXml({
       schema,
       url: metadataUrl,
-      parserOptions: { parseNodeValue: false },
+      parserOptions: { parseTagValue: false },
     })
   }
 

services/nexus/nexus.tester.js

@@ -42,7 +42,9 @@ t.create('Nexus 2 - search snapshot version of an nonexistent artifact')
   })
 
 t.create('Nexus 2 - repository version')
-  .get('/public/asm/asm.json?server=http://repo.e-iceblue.com/nexus')
+  .get(
+    '/developer/ai.h2o/h2o-automl.json?server=https://repository.jboss.org/nexus'
+  )
   .expectBadge({
     label: 'nexus',
     message: isVersion,
@@ -310,11 +312,11 @@ t.create('Nexus 3 - repository version with query')
 t.create('Nexus 3 - search release version without snapshots')
   .get(
     // Limit the version from above, so that any later artifacts don't break this test.
-    `/r/org.pentaho.adaptive/daemon.json?server=https://nexus.pentaho.org&nexusVersion=3&queryOpt=${encodeURIComponent(
-      ':maven.baseVersion=<8.1.0.1'
+    `/r/org.pentaho.adaptive/pdi-engines.json?server=https://nexus.pentaho.org&nexusVersion=3&queryOpt=${encodeURIComponent(
+      ':maven.baseVersion=<8.0.0.1'
     )}`
   )
   .expectBadge({
     label: 'nexus',
-    message: 'v8.1.0.0-365',
+    message: 'v8.0.0.0-28',
   })

services/opm/opm-version.service.js

@@ -40,7 +40,7 @@ export default class OpmVersion extends BaseService {
     })
 
     // TODO: set followRedirect to false and intercept 302 redirects
-    const location = res.request.redirects[0]
+    const location = res.redirectUrls[0].toString()
     if (!location) {
       throw new NotFound({ prettyMessage: 'module not found' })
     }

services/reddit/user-karma.service.js

@@ -25,7 +25,7 @@ export default class RedditUserKarma extends BaseJsonService {
       staticPreview: {
         label: 'combined karma',
         message: 56,
-        color: 'red',
+        color: 'brightgreen',
         style: 'social',
       },
     },
@@ -44,7 +44,7 @@ export default class RedditUserKarma extends BaseJsonService {
     return {
       label,
       message: metric(karma),
-      color: 'red',
+      color: karma > 0 ? 'brightgreen' : karma === 0 ? 'orange' : 'red',
       link: [`https://www.reddit.com/u/${user}`],
     }
   }

services/reddit/user-karma.tester.js

@@ -1,4 +1,4 @@
-import { isMetric } from '../test-validators.js'
+import { isMetricAllowNegative } from '../test-validators.js'
 import { createServiceTester } from '../tester.js'
 export const t = await createServiceTester()
 
@@ -6,21 +6,21 @@ t.create('user-karma (valid - link)')
   .get('/link/user_simulator.json')
   .expectBadge({
     label: 'u/user_simulator karma (link)',
-    message: isMetric,
+    message: isMetricAllowNegative,
   })
 
 t.create('user-karma (valid - comment')
   .get('/comment/user_simulator.json')
   .expectBadge({
     label: 'u/user_simulator karma (comment)',
-    message: isMetric,
+    message: isMetricAllowNegative,
   })
 
 t.create('user-karma (valid - combined)')
   .get('/combined/user_simulator.json')
   .expectBadge({
     label: 'u/user_simulator karma',
-    message: isMetric,
+    message: isMetricAllowNegative,
   })
 
 t.create('user-karma (non-existing user)')

services/requires/requires.service.js

@@ -1,65 +1,11 @@
-import Joi from 'joi'
-import { BaseJsonService } from '../index.js'
+import { deprecatedService } from '../index.js'
 
-const statusSchema = Joi.object({
-  status: Joi.string().required(),
-}).required()
-
-export default class RequiresIo extends BaseJsonService {
-  static category = 'dependencies'
-
-  static route = {
+export default deprecatedService({
+  category: 'dependencies',
+  route: {
     base: 'requires',
-    pattern: ':service/:user/:repo/:branch*',
-  }
-
-  static examples = [
-    {
-      title: 'Requires.io',
-      pattern: ':service/:user/:repo',
-      namedParams: { service: 'github', user: 'zulip', repo: 'zulip' },
-      staticPreview: this.render({ status: 'up-to-date' }),
-    },
-    {
-      title: 'Requires.io (branch)',
-      pattern: ':service/:user/:repo/:branch',
-      namedParams: {
-        service: 'github',
-        user: 'zulip',
-        repo: 'zulip',
-        branch: 'master',
-      },
-      staticPreview: this.render({ status: 'up-to-date' }),
-    },
-  ]
-
-  static defaultBadgeData = { label: 'requirements' }
-
-  static render({ status }) {
-    let message = status
-    let color = 'lightgrey'
-    if (status === 'up-to-date') {
-      message = 'up to date'
-      color = 'brightgreen'
-    } else if (status === 'outdated') {
-      color = 'yellow'
-    } else if (status === 'insecure') {
-      color = 'red'
-    }
-    return { message, color }
-  }
-
-  async fetch({ service, user, repo, branch }) {
-    const url = `https://requires.io/api/v1/status/${service}/${user}/${repo}`
-    return this._requestJson({
-      url,
-      schema: statusSchema,
-      options: { searchParams: { branch } },
-    })
-  }
-
-  async handle({ service, user, repo, branch }) {
-    const { status } = await this.fetch({ service, user, repo, branch })
-    return this.constructor.render({ status })
-  }
-}
+    format: '(?:.+?)',
+  },
+  label: 'requirements',
+  dateAdded: new Date('2022-02-05'),
+})

services/requires/requires.tester.js

@@ -1,44 +1,20 @@
-import Joi from 'joi'
-import { createServiceTester } from '../tester.js'
-export const t = await createServiceTester()
+import { ServiceTester } from '../tester.js'
 
-const isRequireStatus = Joi.string().regex(
-  /^(up to date|outdated|insecure|unknown)$/
-)
+export const t = new ServiceTester({
+  id: 'requires',
+  title: 'Requires.io',
+})
 
-// Package targets can be found at https://requires.io/public
-// However, there does seem to be some retention issues where
-// results for projects are purged after some number of days.
-// https://github.com/badges/shields/issues/7015
-// https://github.com/requires/api/issues/5
-t.create('requirements (valid GitHub, without branch)')
-  .get('/github/Hongbo-Miao/hongbomiao.com.json')
-  .expectBadge({
-    label: 'requirements',
-    message: isRequireStatus,
-  })
-
-t.create('requirements (valid GitHub, with branch)')
-  .get('/github/Hongbo-Miao/hongbomiao.com/main.json')
-  .expectBadge({
-    label: 'requirements',
-    message: isRequireStatus,
-  })
-
-t.create('requirements (valid Bitbucket, without branch)')
+t.create('no longer available (previously Bitbucket without branch)')
   .get('/bitbucket/code-orange/django-ispstack.json')
   .expectBadge({
     label: 'requirements',
-    message: isRequireStatus,
+    message: 'no longer available',
   })
 
-t.create('requirements (valid Bitbucket, with branch)')
-  .get('/bitbucket/code-orange/django-ispstack/master.json')
+t.create('no longer available (previously GitHub with branch)')
+  .get('/github/Hongbo-Miao/hongbomiao.com/main.json')
   .expectBadge({
     label: 'requirements',
-    message: isRequireStatus,
+    message: 'no longer available',
   })
-
-t.create('requirements (not found)')
-  .get('/github/PyvesB/EmptyRepo.json')
-  .expectBadge({ label: 'requirements', message: 'not found' })

services/test-validators.js

@@ -62,6 +62,11 @@ const isStarRating = withRegex(
 // Required to be > 0, because accepting zero masks many problems.
 const isMetric = withRegex(/^([1-9][0-9]*[kMGTPEZY]?|[1-9]\.[1-9][kMGTPEZY])$/)
 
+// Same as isMetric, but tests for negative numbers also.
+const isMetricAllowNegative = withRegex(
+  /^(0|-?[1-9][0-9]*[kMGTPEZY]?|-?[0-9]\.[0-9][kMGTPEZY])$/
+)
+
 /**
  * @param {RegExp} nestedRegexp Pattern that must appear after the metric.
  * @returns {Function} A function that returns a RegExp that matches a metric followed by another pattern.
@@ -159,6 +164,7 @@ export {
   isPhpVersionReduction,
   isStarRating,
   isMetric,
+  isMetricAllowNegative,
   isMetricWithPattern,
   isMetricOpenIssues,
   isMetricOverMetric,

services/text-formatters.js

@@ -46,27 +46,31 @@ function ordinalNumber(n) {
   return n + (s[(v - 20) % 10] || s[v] || s[0])
 }
 
-// Given a number, string with appropriate unit in the metric system, SI.
+// Given a number (positive or negative), string with appropriate unit in the metric system, SI.
 // Note: numbers beyond the peta- cannot be represented as integers in JS.
 const metricPrefix = ['k', 'M', 'G', 'T', 'P', 'E', 'Z', 'Y']
 const metricPower = metricPrefix.map((a, i) => Math.pow(1000, i + 1))
 function metric(n) {
   for (let i = metricPrefix.length - 1; i >= 0; i--) {
     const limit = metricPower[i]
-    if (n >= limit) {
-      const scaledN = n / limit
+    const absN = Math.abs(n)
+    if (absN >= limit) {
+      const scaledN = absN / limit
       if (scaledN < 10) {
         // For "small" numbers, display one decimal digit unless it is 0.
         const oneDecimalN = scaledN.toFixed(1)
         if (oneDecimalN.charAt(oneDecimalN.length - 1) !== '0') {
-          return `${oneDecimalN}${metricPrefix[i]}`
+          const res = `${oneDecimalN}${metricPrefix[i]}`
+          return n > 0 ? res : `-${res}`
         }
       }
       const roundedN = Math.round(scaledN)
       if (roundedN < 1000) {
-        return `${roundedN}${metricPrefix[i]}`
+        const res = `${roundedN}${metricPrefix[i]}`
+        return n > 0 ? res : `-${res}`
       } else {
-        return `1${metricPrefix[i + 1]}`
+        const res = `1${metricPrefix[i + 1]}`
+        return n > 0 ? res : `-${res}`
       }
     }
   }

services/text-formatters.spec.js

@@ -40,6 +40,7 @@ describe('Text formatters', function () {
   test(metric, () => {
     /* eslint-disable no-loss-of-precision */
     /* eslint-disable @typescript-eslint/no-loss-of-precision */
+    given(0).expect('0')
     given(999).expect('999')
     given(1000).expect('1k')
     given(1100).expect('1.1k')
@@ -60,6 +61,27 @@ describe('Text formatters', function () {
     given(1100000000000000000000).expect('1.1Z')
     given(2222222222222222222222222).expect('2.2Y')
     given(22222222222222222222222222).expect('22Y')
+    given(-999).expect('-999')
+    given(-999).expect('-999')
+    given(-1000).expect('-1k')
+    given(-1100).expect('-1.1k')
+    given(-10100).expect('-10k')
+    given(-999499).expect('-999k')
+    given(-999500).expect('-1M')
+    given(-1100000).expect('-1.1M')
+    given(-1578896212).expect('-1.6G')
+    given(-20000000000).expect('-20G')
+    given(-15788962120).expect('-16G')
+    given(-9949999999999).expect('-9.9T')
+    given(-9950000000001).expect('-10T')
+    given(-4000000000000001).expect('-4P')
+    given(-4200000000000001).expect('-4.2P')
+    given(-7100700010058000200).expect('-7.1E')
+    given(-71007000100580002000).expect('-71E')
+    given(-1000000000000000000000).expect('-1Z')
+    given(-1100000000000000000000).expect('-1.1Z')
+    given(-2222222222222222222222222).expect('-2.2Y')
+    given(-22222222222222222222222222).expect('-22Y')
     /* eslint-enable */
   })
 

services/tokei/tokei.tester.js

@@ -8,7 +8,8 @@ t.create('GitHub LOC')
   .expectBadge({ label: 'total lines', message: isMetric })
 
 t.create('GitLab LOC')
-  .get('/lines/gitlab/tezos/tezos.json')
+  .get('/lines/gitlab/shields-ops-group/tag-test.json')
+  .timeout(15000)
   .expectBadge({ label: 'total lines', message: isMetric })
 
 t.create('GitHub LOC (with .com)')
@@ -16,7 +17,8 @@ t.create('GitHub LOC (with .com)')
   .expectBadge({ label: 'total lines', message: isMetric })
 
 t.create('GitLab LOC (with .com)')
-  .get('/lines/gitlab.com/tezos/tezos.json')
+  .get('/lines/gitlab.com/shields-ops-group/tag-test.json')
+  .timeout(15000)
   .expectBadge({ label: 'total lines', message: isMetric })
 
 t.create('BitBucket LOC')

services/youtube/youtube-base.js

@@ -18,7 +18,6 @@ const schema = Joi.object({
         Joi.object({
           viewCount: nonNegativeInteger,
           likeCount: nonNegativeInteger,
-          dislikeCount: nonNegativeInteger,
           commentCount: nonNegativeInteger,
         }),
         Joi.object({

services/youtube/youtube-likes.service.js

@@ -1,24 +1,9 @@
-import Joi from 'joi'
-import { metric } from '../text-formatters.js'
 import { documentation, YouTubeVideoBase } from './youtube-base.js'
 
-const documentationWithDislikes = `
-  ${documentation}
-  <p>
-    When enabling the <code>withDislikes</code> option, 👍 corresponds to the number
-    of likes of a given video, 👎 corresponds to the number of dislikes.
-  </p>
-`
-
-const queryParamSchema = Joi.object({
-  withDislikes: Joi.equal(''),
-}).required()
-
 export default class YouTubeLikes extends YouTubeVideoBase {
   static route = {
     base: 'youtube/likes',
     pattern: ':videoId',
-    queryParamSchema,
   }
 
   static get examples() {
@@ -26,16 +11,8 @@ export default class YouTubeLikes extends YouTubeVideoBase {
       statistics: { likeCount: 7 },
       id: 'abBdk8bSPKU',
     })
-    const previewVotes = this.render(
-      {
-        statistics: { likeCount: 10236, dislikeCount: 396 },
-        id: 'pU9Q6oiQNd0',
-      },
-      { withDislikes: '' }
-    )
     // link[] is not allowed in examples
     delete previewLikes.link
-    delete previewVotes.link
     return [
       {
         title: 'YouTube Video Likes',
@@ -43,32 +20,15 @@ export default class YouTubeLikes extends YouTubeVideoBase {
         staticPreview: previewLikes,
         documentation,
       },
-      {
-        title: 'YouTube Video Likes and Dislikes',
-        namedParams: { videoId: 'pU9Q6oiQNd0' },
-        staticPreview: previewVotes,
-        queryParams: {
-          withDislikes: null,
-        },
-        documentation: documentationWithDislikes,
-      },
     ]
   }
 
   static render({ statistics, id }, queryParams) {
-    let renderedBadge = super.renderSingleStat({
+    const renderedBadge = super.renderSingleStat({
       statistics,
       statisticName: 'like',
       id,
     })
-    if (queryParams && typeof queryParams.withDislikes !== 'undefined') {
-      renderedBadge = {
-        ...renderedBadge,
-        message: `${metric(statistics.likeCount)} 👍 ${metric(
-          statistics.dislikeCount
-        )} 👎`,
-      }
-    }
     return renderedBadge
   }
 }

services/youtube/youtube-likes.tester.js

@@ -1,4 +1,3 @@
-import Joi from 'joi'
 import { createServiceTester } from '../tester.js'
 import { noToken } from '../test-helpers.js'
 import { isMetric } from '../test-validators.js'
@@ -16,21 +15,9 @@ t.create('video like count')
     link: ['https://www.youtube.com/video/pU9Q6oiQNd0'],
   })
 
-t.create('video vote count')
-  .skipWhen(noYouTubeToken)
-  .get('/pU9Q6oiQNd0.json?withDislikes')
-  .expectBadge({
-    label: 'likes',
-    message: Joi.string().regex(
-      /^([1-9][0-9]*[kMGTPEZY]?|[1-9]\.[1-9][kMGTPEZY]) 👍 ([1-9][0-9]*[kMGTPEZY]?|[1-9]\.[1-9][kMGTPEZY]) 👎$/
-    ),
-    color: 'red',
-    link: ['https://www.youtube.com/video/pU9Q6oiQNd0'],
-  })
-
 t.create('video not found')
   .skipWhen(noYouTubeToken)
-  .get('/doesnotexist.json?withDislikes')
+  .get('/doesnotexist.json')
   .expectBadge({
     label: 'youtube',
     message: 'video not found',

static/images/heroku-logotype-horizontal-purple.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="268" height="80" viewBox="0 0 268 80">
-  <path fill="#430098" fill-rule="evenodd" d="M64.8,0 C68.776,0 72,3.224 72,7.2 L72,7.2 L72,72.8 C72,76.776 68.776,80 64.8,80 L64.8,80 L7.2,80 C3.224,80 0,76.776 0,72.8 L0,72.8 L0,7.2 C0,3.224 3.224,0 7.2,0 L7.2,0 Z M64.8,4 L7.2,4 C5.436,4 4,5.435 4,7.2 L4,7.2 L4,72.8 C4,74.564 5.436,76 7.2,76 L7.2,76 L64.8,76 C66.565,76 68,74.564 68,72.8 L68,72.8 L68,7.2 C68,5.435 66.565,4 64.8,4 L64.8,4 Z M19,52 L28,60 L19,68 L19,52 Z M27,12 L27,34.711 C30.994,33.411 36.577,32 42,32 C46.945,32 49.905,33.944 51.517,35.575 C54.814625,38.91 54.995191,43.1202378 55.0003112,43.9159307 L55.0002258,68 L47,68 L47,44.11 C46.961,42.243 46.062,40 42,40 C34.230209,40 25.5570898,43.7328438 24.7166549,44.1028638 L24.651,44.132 L19,46.692 L19,12 L27,12 Z M191.995,25 C198.5525,25 205.37,29.165 205.37,39.15 C205.37,49.135 198.5525,53.3 191.995,53.3 C185.3975,53.2975 178.5825,49.135 178.5825,39.15 C178.5825,29.1675 185.3975,25 191.995,25 Z M251.99,25.5175 L251.99,41.805 C251.99,45.5625 253.205,47.2575 256.155,47.2575 C259.1025,47.2575 260.28,45.5625 260.28,41.805 L260.28,25.5175 L267.5,25.5175 L267.5,41.84 C267.5,49.0625 264.0375,53.1875 256.0775,53.1875 C248.1175,53.1875 244.62,49.0625 244.62,41.84 L244.62,25.5175 L251.99,25.5175 Z M220.94,25.5175 L220.94,35.3925 L228.4575,25.5175 L237.005,25.5175 L227.83,36.2775 L237.815,52.785 L229.4875,52.785 L223.04,41.8775 L220.94,44.31 L220.94,52.785 L213.57,52.785 L213.57,25.5175 L220.94,25.5175 Z M140.25,25.5175 L140.25,31.635 L128.165,31.635 L128.165,36.0575 L136.7875,36.0575 L136.7875,41.805 L128.165,41.805 L128.165,46.8525 L140.8775,46.8525 L140.8775,52.785 L120.7975,52.785 L120.7975,25.5175 L140.25,25.5175 Z M159.6175,25.5175 C166.6175,25.5175 170.8925,27.84 170.8925,34.3975 C170.8925,38.67 169.0875,41.1425 165.5125,42.355 L171.2975,52.7825 L163.4875,52.7825 L158.2175,43.315 L156.19,43.315 L156.19,52.7825 L148.9675,52.7825 L148.9675,25.5175 L159.6175,25.5175 Z M94.87,25.5175 L94.87,35.65 L103.935,35.65 L103.935,25.5175 L111.305,25.5175 L111.305,52.7825 L103.935,52.7825 L103.935,41.765 L94.87,41.765 L94.87,52.7825 L87.5,52.7825 L87.5,25.5175 L94.87,25.5175 Z M191.9925,31.0825 C188.1225,31.0825 185.95,34.14 185.95,39.15 C185.95,44.1625 188.125,47.405 191.9925,47.405 C195.825,47.4025 197.9975,44.1625 197.9975,39.15 C197.9975,34.14 195.8225,31.0825 191.9925,31.0825 Z M159.36,31.485 L156.1925,31.485 L156.1925,37.7125 L159.36,37.7125 C162.3825,37.7125 163.7075,36.865 163.7075,34.58 C163.7075,32.295 162.38,31.485 159.36,31.485 Z M55,12 C54.46,16.544 52.618,20.9 49,25 L49,25 L41,25 C44.144,20.875 46.118,16.534 47,12 L47,12 Z"/>
-</svg>