tests(reuse): increase service test timeout

Bumps [qs](https://github.com/ljharb/qs) from 6.10.3 to 6.10.5.
- [Release notes](https://github.com/ljharb/qs/releases)
- [Changelog](https://github.com/ljharb/qs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ljharb/qs/compare/v6.10.3...v6.10.5)

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

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

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

.circleci/config.yml

@@ -7,7 +7,6 @@ main_steps: &main_steps
     - run:
         name: Install dependencies
         command: |
-          npm install --dry-run
           npm ci
         environment:
           # https://docs.cypress.io/guides/getting-started/installing-cypress.html#Skipping-installation
@@ -50,7 +49,6 @@ integration_steps: &integration_steps
     - run:
         name: Install dependencies
         command: |
-          npm install --dry-run
           npm ci
         environment:
           CYPRESS_INSTALL_BINARY: 0
@@ -73,7 +71,6 @@ services_steps: &services_steps
     - run:
         name: Install dependencies
         command: |
-          npm install --dry-run
           npm ci
         environment:
           CYPRESS_INSTALL_BINARY: 0
@@ -116,6 +113,7 @@ package_steps: &package_steps
           MOCHA_FILE: junit/badge-maker/v12/results.xml
           NODE_VERSION: v12
           CYPRESS_INSTALL_BINARY: 0
+          NPM_CONFIG_ENGINE_STRICT: 'false'
         name: Run package tests on Node 12
         command: scripts/run_package_tests.sh
 
@@ -125,6 +123,7 @@ package_steps: &package_steps
           MOCHA_FILE: junit/badge-maker/v14/results.xml
           NODE_VERSION: v14
           CYPRESS_INSTALL_BINARY: 0
+          NPM_CONFIG_ENGINE_STRICT: 'false'
         name: Run package tests on Node 14
         command: scripts/run_package_tests.sh
 
@@ -143,39 +142,33 @@ package_steps: &package_steps
 jobs:
   main:
     docker:
-      - image: cimg/node:16.14
-        environment:
-          NPM_CONFIG_ENGINE_STRICT: 'true'
-          NPM_CONFIG_STRICT_PEER_DEPS: 'true'
+      - image: cimg/node:16.15
 
     <<: *main_steps
 
   main@node-17:
     docker:
-      - image: cimg/node:17.7
+      - image: cimg/node:17.9
 
     <<: *main_steps
 
   integration:
     docker:
-      - image: cimg/node:16.14
-        environment:
-          NPM_CONFIG_ENGINE_STRICT: 'true'
-          NPM_CONFIG_STRICT_PEER_DEPS: 'true'
+      - image: cimg/node:16.15
       - image: redis
 
     <<: *integration_steps
 
   integration@node-17:
     docker:
-      - image: cimg/node:17.7
+      - image: cimg/node:17.9
       - image: redis
 
     <<: *integration_steps
 
   danger:
     docker:
-      - image: cimg/node:16.14
+      - image: cimg/node:16.15
     steps:
       - checkout
 
@@ -195,17 +188,14 @@ jobs:
 
   frontend:
     docker:
-      - image: cimg/node:16.14
-        environment:
-          NPM_CONFIG_ENGINE_STRICT: 'true'
-          NPM_CONFIG_STRICT_PEER_DEPS: 'true'
+      - image: cimg/node:16.15
+
     steps:
       - checkout
 
       - run:
           name: Install dependencies
           command: |
-            npm install --dry-run
             npm ci
           environment:
             CYPRESS_INSTALL_BINARY: 0
@@ -242,25 +232,20 @@ jobs:
 
   services:
     docker:
-      - image: cimg/node:16.14
-        environment:
-          NPM_CONFIG_ENGINE_STRICT: 'true'
-          NPM_CONFIG_STRICT_PEER_DEPS: 'true'
+      - image: cimg/node:16.15
 
     <<: *services_steps
 
   services@node-17:
     docker:
-      - image: cimg/node:17.7
+      - image: cimg/node:17.9
 
     <<: *services_steps
 
   e2e:
     docker:
-      - image: cypress/base:16.13.0
-        environment:
-          NPM_CONFIG_ENGINE_STRICT: 'true'
-          NPM_CONFIG_STRICT_PEER_DEPS: 'true'
+      - image: cypress/base:16.14.0
+
     steps:
       - checkout
 
@@ -272,7 +257,6 @@ jobs:
       - run:
           name: Install dependencies
           command: |
-            npm install --dry-run
             npm ci
 
       - run:

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

@@ -9,35 +9,35 @@
       "version": "0.0.0",
       "license": "CC0",
       "dependencies": {
-        "@actions/core": "^1.6.0",
-        "@actions/github": "^5.0.1"
+        "@actions/core": "^1.8.2",
+        "@actions/github": "^5.0.3"
       }
     },
     "node_modules/@actions/core": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.6.0.tgz",
-      "integrity": "sha512-NB1UAZomZlCV/LmJqkLhNTqtKfFXJZAUPcfl/zqG7EfsQdeUJtaWO98SGbuQ3pydJ3fHl2CvI/51OKYlCYYcaw==",
+      "version": "1.8.2",
+      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.8.2.tgz",
+      "integrity": "sha512-FXcBL7nyik8K5ODeCKlxi+vts7torOkoDAKfeh61EAkAy1HAvwn9uVzZBY0f15YcQTcZZ2/iSGBFHEuioZWfDA==",
       "dependencies": {
-        "@actions/http-client": "^1.0.11"
+        "@actions/http-client": "^2.0.1"
       }
     },
     "node_modules/@actions/github": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/@actions/github/-/github-5.0.1.tgz",
-      "integrity": "sha512-JZGyPM9ektb8NVTTI/2gfJ9DL7Rk98tQ7OVyTlgTuaQroariRBsOnzjy0I2EarX4xUZpK88YyO503fhmjFdyAg==",
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/@actions/github/-/github-5.0.3.tgz",
+      "integrity": "sha512-myjA/pdLQfhUGLtRZC/J4L1RXOG4o6aYdiEq+zr5wVVKljzbFld+xv10k1FX6IkIJtNxbAq44BdwSNpQ015P0A==",
       "dependencies": {
-        "@actions/http-client": "^1.0.11",
+        "@actions/http-client": "^2.0.1",
         "@octokit/core": "^3.6.0",
         "@octokit/plugin-paginate-rest": "^2.17.0",
         "@octokit/plugin-rest-endpoint-methods": "^5.13.0"
       }
     },
     "node_modules/@actions/http-client": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-1.0.11.tgz",
-      "integrity": "sha512-VRYHGQV1rqnROJqdMvGUbY/Kn8vriQe/F9HR2AlYHzmKuM/p3kjNuXhmdBfcVgsvRWTz5C5XW5xvndZrVBuAYg==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-2.0.1.tgz",
+      "integrity": "sha512-PIXiMVtz6VvyaRsGY268qvj57hXQEpsYogYOu2nrQhlf+XCGmZstmuZBbAybUl1nQGnvS1k1eEsQ69ZoD7xlSw==",
       "dependencies": {
-        "tunnel": "0.0.6"
+        "tunnel": "^0.0.6"
       }
     },
     "node_modules/@octokit/auth-token": {
@@ -226,30 +226,30 @@
   },
   "dependencies": {
     "@actions/core": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.6.0.tgz",
-      "integrity": "sha512-NB1UAZomZlCV/LmJqkLhNTqtKfFXJZAUPcfl/zqG7EfsQdeUJtaWO98SGbuQ3pydJ3fHl2CvI/51OKYlCYYcaw==",
+      "version": "1.8.2",
+      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.8.2.tgz",
+      "integrity": "sha512-FXcBL7nyik8K5ODeCKlxi+vts7torOkoDAKfeh61EAkAy1HAvwn9uVzZBY0f15YcQTcZZ2/iSGBFHEuioZWfDA==",
       "requires": {
-        "@actions/http-client": "^1.0.11"
+        "@actions/http-client": "^2.0.1"
       }
     },
     "@actions/github": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/@actions/github/-/github-5.0.1.tgz",
-      "integrity": "sha512-JZGyPM9ektb8NVTTI/2gfJ9DL7Rk98tQ7OVyTlgTuaQroariRBsOnzjy0I2EarX4xUZpK88YyO503fhmjFdyAg==",
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/@actions/github/-/github-5.0.3.tgz",
+      "integrity": "sha512-myjA/pdLQfhUGLtRZC/J4L1RXOG4o6aYdiEq+zr5wVVKljzbFld+xv10k1FX6IkIJtNxbAq44BdwSNpQ015P0A==",
       "requires": {
-        "@actions/http-client": "^1.0.11",
+        "@actions/http-client": "^2.0.1",
         "@octokit/core": "^3.6.0",
         "@octokit/plugin-paginate-rest": "^2.17.0",
         "@octokit/plugin-rest-endpoint-methods": "^5.13.0"
       }
     },
     "@actions/http-client": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-1.0.11.tgz",
-      "integrity": "sha512-VRYHGQV1rqnROJqdMvGUbY/Kn8vriQe/F9HR2AlYHzmKuM/p3kjNuXhmdBfcVgsvRWTz5C5XW5xvndZrVBuAYg==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-2.0.1.tgz",
+      "integrity": "sha512-PIXiMVtz6VvyaRsGY268qvj57hXQEpsYogYOu2nrQhlf+XCGmZstmuZBbAybUl1nQGnvS1k1eEsQ69ZoD7xlSw==",
       "requires": {
-        "tunnel": "0.0.6"
+        "tunnel": "^0.0.6"
       }
     },
     "@octokit/auth-token": {

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

@@ -10,7 +10,7 @@
   "author": "chris48s",
   "license": "CC0",
   "dependencies": {
-    "@actions/core": "^1.6.0",
-    "@actions/github": "^5.0.1"
+    "@actions/core": "^1.8.2",
+    "@actions/github": "^5.0.3"
   }
 }

.github/dependabot.yml

@@ -36,3 +36,8 @@ updates:
       day: friday
       time: '12:00'
     open-pull-requests-limit: 99
+  - package-ecosystem: 'github-actions'
+    directory: '/'
+    schedule:
+      interval: weekly
+    open-pull-requests-limit: 99

.github/workflows/auto-close.yml

@@ -10,7 +10,7 @@ jobs:
     if: github.actor == 'dependabot[bot]'
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Install action dependencies
         run: cd .github/actions/close-bot && npm ci

.github/workflows/build-docker-image.yml

@@ -7,16 +7,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
 
       - name: Set Git Short SHA
         run: echo "SHORT_SHA=${GITHUB_SHA::7}" >> $GITHUB_ENV
 
       - name: Build
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3
         with:
           context: .
           push: false

.github/workflows/create-release.yml

@@ -4,6 +4,9 @@ on:
   pull_request:
     types: [closed]
 
+permissions:
+  contents: write
+
 jobs:
   create-release:
     if: |
@@ -20,7 +23,7 @@ jobs:
         run: echo "::set-output name=date::$(date --rfc-3339=date)"
 
       - name: Checkout branch "master"
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           ref: 'master'
 
@@ -31,16 +34,16 @@ jobs:
           tag: server-${{ steps.date.outputs.date }}
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
 
       - name: Login to DockerHub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Build and push snapshot release to DockerHub
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3
         with:
           context: .
           push: true

.github/workflows/deploy-docs.yml

@@ -3,12 +3,16 @@ on:
   push:
     branches:
       - master
+
+permissions:
+  contents: write
+
 jobs:
   build-and-deploy:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2.3.1
+        uses: actions/checkout@v3
         with:
           persist-credentials: false
 
@@ -18,9 +22,8 @@ jobs:
           npm run build-docs
 
       - name: Deploy
-        uses: JamesIves/github-pages-deploy-action@3.7.1
+        uses: JamesIves/github-pages-deploy-action@v4
         with:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          BRANCH: gh-pages
-          FOLDER: api-docs
-          CLEAN: true
+          branch: gh-pages
+          folder: api-docs
+          clean: true

.github/workflows/draft-release.yml

@@ -5,12 +5,16 @@ on:
     # At 01:00 on the first day of every month
   workflow_dispatch:
 
+permissions:
+  pull-requests: write
+  contents: write
+
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Draft Release
         uses: ./.github/actions/draft-release

.github/workflows/enforce-dependency-review.yml

@@ -1,9 +1,6 @@
 name: 'Dependency Review'
 on: [pull_request]
 
-permissions:
-  contents: read
-
 jobs:
   dependency-review:
     runs-on: ubuntu-latest

.github/workflows/publish-docker-next.yml

@@ -9,13 +9,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
 
       - name: Login to DockerHub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -24,7 +24,7 @@ jobs:
         run: echo "SHORT_SHA=${GITHUB_SHA::7}" >> $GITHUB_ENV
 
       - name: Build and push
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3
         with:
           context: .
           push: true

.npmrc

@@ -0,0 +1,2 @@
+engine-strict=true
+strict-peer-deps=true

CHANGELOG.md

@@ -4,6 +4,28 @@ Note: this changelog is for the shields.io server. The changelog for the badge-m
 
 ---
 
+## server-2022-06-01
+
+- Update GitLab logo (2022) [#7984](https://github.com/badges/shields/issues/7984)
+- [GitHub] Added milestone property to GitHub issue details service [#7864](https://github.com/badges/shields/issues/7864)
+- [Spack] Package Manager: Update Endpoint [#7957](https://github.com/badges/shields/issues/7957)
+- Update Chocolatey API endpoint URL [#7952](https://github.com/badges/shields/issues/7952)
+- [Flathub]Add downloads badge [#7724](https://github.com/badges/shields/issues/7724)
+- replace the outdated Telegram logo with the newest [#7831](https://github.com/badges/shields/issues/7831)
+- add [PUB] points badge [#7918](https://github.com/badges/shields/issues/7918)
+- add [PUB] popularity badge [#7920](https://github.com/badges/shields/issues/7920)
+- add [PUB] likes badge [#7916](https://github.com/badges/shields/issues/7916)
+- Dependency updates
+
+## server-2022-05-03
+
+- [OSSFScorecard] Create scorecard badge service [#7687](https://github.com/badges/shields/issues/7687)
+- Stringify [githublanguagecount] message [#7881](https://github.com/badges/shields/issues/7881)
+- Stringify and trim whitespace from a few services [#7880](https://github.com/badges/shields/issues/7880)
+- add labels to Dockerfile [#7862](https://github.com/badges/shields/issues/7862)
+- handle missing 'fly-client-ip' [#7814](https://github.com/badges/shields/issues/7814)
+- Dependency updates
+
 ## server-2022-04-03
 
 - Breaking change: This release updates ioredis from v4 to v5.

Dockerfile

@@ -9,7 +9,7 @@ COPY package.json package-lock.json /usr/src/app/
 COPY badge-maker /usr/src/app/badge-maker/
 
 RUN apk add python3 make g++
-RUN npm install -g "npm@>=7"
+RUN npm install -g "npm@>=8"
 # We need dev deps to build the front end. We don't need Cypress, though.
 RUN NODE_ENV=development CYPRESS_INSTALL_BINARY=0 npm ci
 

cypress.config.js

@@ -0,0 +1,13 @@
+import { defineConfig } from 'cypress'
+
+export default defineConfig({
+  fixturesFolder: false,
+  env: {
+    backend_url: 'http://localhost:8080',
+  },
+  e2e: {
+    setupNodeEvents(on, config) {},
+    baseUrl: 'http://localhost:3000',
+    supportFile: false,
+  },
+})

cypress.json

@@ -1,9 +0,0 @@
-{
-  "baseUrl": "http://localhost:3000",
-  "fixturesFolder": false,
-  "pluginsFile": false,
-  "supportFile": false,
-  "env": {
-    "backend_url": "http://localhost:8080"
-  }
-}

doc/TUTORIAL.md

@@ -25,7 +25,7 @@ and learn about the [GitHub workflow](http://try.github.io/).
 
 #### Node, NPM
 
-Node >=16 and NPM >=7 is required. If you don't already have them,
+Node >=16 and NPM >=8 is required. If you don't already have them,
 install node and npm: https://nodejs.org/en/download/
 
 ### Setup a dev install

doc/logos.md

@@ -40,7 +40,7 @@ If you are submitting a pull request for a custom logo, please:
     - Install SVGO
       - With npm: `npm install -g svgo`
       - With Homebrew: `brew install svgo`
-    - Run the following command `svgo --precision=3 icon.svg icon.min.svg`
+    - Run the following command `svgo --precision=3 icon.svg -o icon.min.svg`
     - Check if there is a loss of quality in the output, if so increase the precision.
   - The [SVGOMG Online Tool][svgomg]
     - Click "Open SVG" and select an SVG file.

doc/production-hosting.md

@@ -16,9 +16,8 @@ Production hosting is managed by the Shields ops team:
 
 | Component                     | Subcomponent                    | People with access                                              |
 | ----------------------------- | ------------------------------- | --------------------------------------------------------------- |
-| shields-production-us         | Account owner                   | @calebcartwright, @paulmelnikow                                 |
-| shields-production-us         | Full access                     | @calebcartwright, @chris48s, @paulmelnikow, @pyvesb             |
-| shields-production-us         | Access management               | @calebcartwright, @chris48s, @paulmelnikow, @pyvesb             |
+| shields-io-production         | Full access                     | @calebcartwright, @chris48s, @paulmelnikow                      |
+| shields-io-production         | Access management               | @calebcartwright, @chris48s, @paulmelnikow                      |
 | Compose.io Redis              | Account owner                   | @paulmelnikow                                                   |
 | Compose.io Redis              | Account access                  | @paulmelnikow                                                   |
 | Compose.io Redis              | Database connection credentials | @calebcartwright, @chris48s, @paulmelnikow, @pyvesb             |
@@ -95,13 +94,10 @@ The raster server `raster.shields.io` (a.k.a. the rasterizing proxy) is
 hosted on Heroku. It's managed in the
 [squint](https://github.com/badges/squint/) repo.
 
-### Heroku Deployment
+### Fly.io Deployment
 
-Both the badge server and frontend are served from Heroku.
-
-After merging a commit to master, heroku should create a staging deploy. Check this has deployed correctly in the `shields-staging` pipeline and review https://shields-staging.herokuapp.com/
-
-If we're happy with it, "promote to production". This will deploy what's on staging to the `shields-production-eu` and `shields-production-us` pieplines.
+Both the badge server and frontend are served from Fly.io. Deployments are
+triggered using GitHub actions in a private repo.
 
 ## DNS
 
@@ -109,19 +105,15 @@ DNS is registered with [DNSimple][].
 
 [dnsimple]: https://dnsimple.com/
 
-## Logs
-
-Logs can be retrieved [from heroku](https://devcenter.heroku.com/articles/logging#log-retrieval).
-
 ## Error reporting
 
 [Error reporting][sentry] is one of the most useful tools we have for monitoring
 the server. It's generously donated by [Sentry][sentry home]. We bundle
-[`raven`][raven] into the application, and the Sentry DSN is configured via
-`local-shields-io-production.yml` (see [documentation][sentry configuration]).
+[`@sentry/node`][sentry-node] into the application, and the Sentry DSN is configured
+via `local-shields-io-production.yml` (see [documentation][sentry configuration]).
 
 [sentry]: https://sentry.io/shields/
-[raven]: https://www.npmjs.com/package/raven
+[sentry-node]: https://www.npmjs.com/package/@sentry/node
 [sentry home]: https://sentry.io/shields/
 [sentry configuration]: https://github.com/badges/shields/blob/master/doc/self-hosting.md#sentry
 

doc/self-hosting.md

@@ -119,7 +119,7 @@ machine.
 
 If you want to host PNG badges, you can also self-host a [raster server][]
 which points to your badge server. It's a docker container. We host it on
-Heroku but should be possible to host on a wide variety of platforms.
+Fly.io but should be possible to host on a wide variety of platforms.
 
 - In your raster instance, set `BASE_URL` to your Shields instance, e.g.
   `https://shields.example.co`.

logo/gitlab.svg

@@ -1 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="M23.956 13.587l-1.344-4.133a4549.814 4549.814 0 0 0-2.663-8.189.456.456 0 0 0-.87 0l-2.658 8.189H7.585L4.92 1.265a.456.456 0 0 0-.87 0A4549.814 4549.814 0 0 0 .044 13.587a.908.908 0 0 0 .336 1.02L12 23.054l11.62-8.447a.908.908 0 0 0 .336-1.02" fill="#fc6d26"/><path d="M12 23.054l4.421-13.6H7.58z" fill="#e24329"/><path d="M7.579 9.454H1.388L12 23.054z" fill="#fc6d26"/><path d="M1.388 9.454L.044 13.587a.908.908 0 0 0 .336 1.02L12 23.054z" fill="#fca326"/><path d="M7.579 9.454L4.92 1.265a.456.456 0 0 0-.87 0L1.388 9.454z" fill="#e24329"/><path d="M16.421 9.454h6.191L12 23.054z" fill="#fc6d26"/><path d="M22.612 9.454l1.344 4.133a.908.908 0 0 1-.336 1.02L12 23.054z" fill="#fca326"/><path d="M16.421 9.454l2.658-8.189a.456.456 0 0 1 .87 0l2.663 8.189z" fill="#e24329"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="93 93 194 194"><defs><style>.b{fill:#fc6d26}</style></defs><path style="fill:#e24329" d="m282.83 170.73-.27-.69-26.14-68.22a6.81 6.81 0 0 0-2.69-3.24 7 7 0 0 0-8 .43 7 7 0 0 0-2.32 3.52l-17.65 54h-71.47l-17.65-54a6.86 6.86 0 0 0-2.32-3.53 7 7 0 0 0-8-.43 6.87 6.87 0 0 0-2.69 3.24L97.44 170l-.26.69a48.54 48.54 0 0 0 16.1 56.1l.09.07.24.17 39.82 29.82 19.7 14.91 12 9.06a8.07 8.07 0 0 0 9.76 0l12-9.06 19.7-14.91 40.06-30 .1-.08a48.56 48.56 0 0 0 16.08-56.04Z"/><path class="b" d="m282.83 170.73-.27-.69a88.3 88.3 0 0 0-35.15 15.8L190 229.25c19.55 14.79 36.57 27.64 36.57 27.64l40.06-30 .1-.08a48.56 48.56 0 0 0 16.1-56.08Z"/><path style="fill:#fca326" d="m153.43 256.89 19.7 14.91 12 9.06a8.07 8.07 0 0 0 9.76 0l12-9.06 19.7-14.91S209.55 244 190 229.25c-19.55 14.75-36.57 27.64-36.57 27.64Z"/><path class="b" d="M132.58 185.84A88.19 88.19 0 0 0 97.44 170l-.26.69a48.54 48.54 0 0 0 16.1 56.1l.09.07.24.17 39.82 29.82L190 229.21Z"/></svg>

logo/telegram.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><circle cx="12" cy="12" r="12" fill="#2ca5e0"/><path d="M9.8 17.5c-.389 0-.323-.147-.457-.517L8.2 13.221 17 8" fill="#a9c9dd"/><path d="M9.8 17.5c.3 0 .433-.137.6-.3l1.6-1.556-1.996-1.203" fill="#c8daea"/><path d="M10.004 14.441l4.836 3.573c.552.304.95.147 1.088-.512l1.968-9.277c.202-.808-.308-1.174-.836-.935L5.501 11.748c-.789.316-.784.756-.144.952l2.967.926 6.867-4.332c.324-.197.622-.091.377.125" fill="#fff"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12 24c6.627 0 12-5.373 12-12S18.627 0 12 0 0 5.373 0 12s5.373 12 12 12Z" fill="url(#a)"/><path fill-rule="evenodd" clip-rule="evenodd" d="M5.425 11.871a796.414 796.414 0 0 1 6.994-3.018c3.328-1.388 4.027-1.628 4.477-1.638.1 0 .32.02.47.14.12.1.15.23.17.33.02.1.04.31.02.47-.18 1.898-.96 6.504-1.36 8.622-.17.9-.5 1.199-.819 1.229-.7.06-1.229-.46-1.898-.9-1.06-.689-1.649-1.119-2.678-1.798-1.19-.78-.42-1.209.26-1.908.18-.18 3.247-2.978 3.307-3.228.01-.03.01-.15-.06-.21-.07-.06-.17-.04-.25-.02-.11.02-1.788 1.14-5.056 3.348-.48.33-.909.49-1.299.48-.43-.01-1.248-.24-1.868-.44-.75-.24-1.349-.37-1.299-.79.03-.22.33-.44.89-.669Z" fill="#fff"/><defs><linearGradient id="a" x1="11.99" y1="0" x2="11.99" y2="23.81" gradientUnits="userSpaceOnUse"><stop stop-color="#2AABEE"/><stop offset="1" stop-color="#229ED9"/></linearGradient></defs></svg>

package.json

@@ -21,14 +21,14 @@
     "url": "https://github.com/badges/shields"
   },
   "dependencies": {
-    "@fontsource/lato": "^4.5.5",
-    "@fontsource/lekton": "^4.5.6",
+    "@fontsource/lato": "^4.5.8",
+    "@fontsource/lekton": "^4.5.9",
     "@renovate/pep440": "^1.0.0",
-    "@sentry/node": "^6.19.6",
+    "@sentry/node": "^7.1.1",
     "@shields_io/camp": "^18.1.1",
     "badge-maker": "file:badge-maker",
     "bytes": "^3.1.2",
-    "camelcase": "^6.3.0",
+    "camelcase": "^7.0.0",
     "chalk": "^5.0.1",
     "check-node-version": "^4.2.1",
     "cloudflare-middleware": "^1.0.4",
@@ -37,13 +37,13 @@
     "decamelize": "^3.2.0",
     "emojic": "^1.1.17",
     "escape-string-regexp": "^4.0.0",
-    "fast-xml-parser": "^4.0.7",
-    "glob": "^8.0.1",
+    "fast-xml-parser": "^4.0.8",
+    "glob": "^8.0.3",
     "global-agent": "^3.0.0",
-    "got": "^12.0.3",
+    "got": "^12.1.0",
     "graphql": "^15.6.1",
     "graphql-tag": "^2.12.6",
-    "ioredis": "5.0.4",
+    "ioredis": "5.0.6",
     "joi": "17.6.0",
     "joi-extension-semver": "5.0.0",
     "js-yaml": "^4.1.0",
@@ -54,14 +54,14 @@
     "moment": "^2.29.3",
     "node-env-flag": "^0.1.0",
     "parse-link-header": "^2.0.0",
-    "path-to-regexp": "^6.2.0",
+    "path-to-regexp": "^6.2.1",
     "pretty-bytes": "^6.0.0",
     "priorityqueuejs": "^2.0.0",
     "prom-client": "^14.0.1",
-    "qs": "^6.10.3",
+    "qs": "^6.10.5",
     "query-string": "^7.1.1",
     "semver": "~7.3.7",
-    "simple-icons": "6.19.0",
+    "simple-icons": "6.23.0",
     "webextension-store-meta": "^1.0.5",
     "xmldom": "~0.6.0",
     "xpath": "~0.0.32"
@@ -141,7 +141,7 @@
     ]
   },
   "devDependencies": {
-    "@babel/core": "^7.17.9",
+    "@babel/core": "^7.18.2",
     "@babel/polyfill": "^7.12.1",
     "@babel/register": "7.17.7",
     "@istanbuljs/schema": "^0.1.3",
@@ -155,11 +155,11 @@
     "@types/react-modal": "^3.13.1",
     "@types/react-select": "^4.0.17",
     "@types/styled-components": "5.1.25",
-    "@typescript-eslint/eslint-plugin": "^5.21.0",
-    "@typescript-eslint/parser": "^5.15.0",
+    "@typescript-eslint/eslint-plugin": "^5.27.1",
+    "@typescript-eslint/parser": "^5.27.0",
     "babel-plugin-inline-react-svg": "^2.0.1",
-    "babel-preset-gatsby": "^2.11.1",
-    "c8": "^7.11.2",
+    "babel-preset-gatsby": "^2.14.0",
+    "c8": "^7.11.3",
     "caller": "^1.1.0",
     "chai": "^4.3.6",
     "chai-as-promised": "^7.1.1",
@@ -167,9 +167,9 @@
     "chai-string": "^1.4.0",
     "child-process-promise": "^2.2.1",
     "clipboard-copy": "^4.0.1",
-    "concurrently": "^7.1.0",
-    "cypress": "^9.5.4",
-    "danger": "^11.0.5",
+    "concurrently": "^7.2.1",
+    "cypress": "^10.0.3",
+    "danger": "^11.0.7",
     "danger-plugin-no-test-shortcuts": "^2.0.0",
     "deepmerge": "^4.2.2",
     "eslint": "^7.32.0",
@@ -180,13 +180,13 @@
     "eslint-plugin-chai-friendly": "^0.7.2",
     "eslint-plugin-cypress": "^2.12.1",
     "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-jsdoc": "^39.2.7",
-    "eslint-plugin-mocha": "^10.0.3",
+    "eslint-plugin-jsdoc": "^39.3.2",
+    "eslint-plugin-mocha": "^10.0.5",
     "eslint-plugin-no-extension-in-require": "^0.2.0",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^5.2.0",
-    "eslint-plugin-react": "^7.29.4",
-    "eslint-plugin-react-hooks": "^4.4.0",
+    "eslint-plugin-react": "^7.30.0",
+    "eslint-plugin-react-hooks": "^4.5.0",
     "eslint-plugin-sort-class-members": "^1.14.1",
     "fetch-ponyfill": "^7.1.0",
     "form-data": "^4.0.0",
@@ -203,7 +203,7 @@
     "is-svg": "^4.3.2",
     "js-yaml-loader": "^1.2.2",
     "jsdoc": "^3.6.10",
-    "lint-staged": "^12.4.1",
+    "lint-staged": "^13.0.1",
     "lodash.debounce": "^4.0.8",
     "lodash.difference": "^4.5.0",
     "minimist": "^1.2.6",
@@ -211,9 +211,9 @@
     "mocha-env-reporter": "^4.0.0",
     "mocha-junit-reporter": "^2.0.2",
     "mocha-yaml-loader": "^1.0.3",
-    "nock": "13.2.4",
+    "nock": "13.2.6",
     "node-mocks-http": "^1.11.0",
-    "nodemon": "^2.0.15",
+    "nodemon": "^2.0.16",
     "npm-run-all": "^4.1.5",
     "open-cli": "^7.0.1",
     "portfinder": "^1.0.28",
@@ -222,27 +222,27 @@
     "react-dom": "^17.0.2",
     "react-error-overlay": "^6.0.11",
     "react-helmet": "^6.1.0",
-    "react-modal": "^3.14.4",
+    "react-modal": "^3.15.1",
     "react-pose": "^4.0.10",
     "react-select": "^4.3.1",
     "read-all-stdin-sync": "^1.0.5",
     "redis-server": "^1.2.2",
     "rimraf": "^3.0.2",
     "sazerac": "^2.0.0",
-    "simple-git-hooks": "^2.7.0",
-    "sinon": "^13.0.2",
+    "simple-git-hooks": "^2.8.0",
+    "sinon": "^14.0.0",
     "sinon-chai": "^3.7.0",
     "snap-shot-it": "^7.9.6",
     "start-server-and-test": "1.14.0",
     "styled-components": "^5.3.5",
-    "ts-mocha": "^9.0.2",
+    "ts-mocha": "^10.0.0",
     "tsd": "^0.20.0",
-    "typescript": "^4.6.4",
+    "typescript": "^4.7.3",
     "url": "^0.11.0"
   },
   "engines": {
-    "node": "^16.13.0",
-    "npm": ">=7.0.0"
+    "node": ">=16.13.0",
+    "npm": ">=8.0.0"
   },
   "type": "module",
   "collective": {

services/build-status.js

@@ -1,3 +1,9 @@
+/**
+ * Common functions and schemas for tasks related to build status.
+ *
+ * @module
+ */
+
 import Joi from 'joi'
 
 const greenStatuses = [
@@ -50,8 +56,23 @@ const allStatuses = greenStatuses
   .concat(redStatuses)
   .concat(otherStatuses)
 
+/**
+ * Joi schema for validating Build Status.
+ * Checks if the build status is present in the list of allowed build status.
+ *
+ * @type {object}
+ */
 const isBuildStatus = Joi.equal(...allStatuses)
 
+/**
+ * Handles rendering concerns of badges that display build status.
+ * Determines the message and color of the badge according to the build status.
+ *
+ * @param {object} attrs Refer to individual attributes
+ * @param {string} [attrs.label] If provided then badge label is set to this value
+ * @param {string} attrs.status Build status
+ * @returns {object} Badge with label, message and color properties
+ */
 function renderBuildStatusBadge({ label, status }) {
   let message
   let color

services/chocolatey/chocolatey.service.js

@@ -3,7 +3,7 @@ import { createServiceFamily } from '../nuget/nuget-v2-service-family.js'
 export default createServiceFamily({
   defaultLabel: 'chocolatey',
   serviceBaseUrl: 'chocolatey',
-  apiBaseUrl: 'https://www.chocolatey.org/api/v2',
+  apiBaseUrl: 'https://community.chocolatey.org/api/v2',
   odataFormat: 'json',
   title: 'Chocolatey',
   examplePackageName: 'git',

services/color-formatters.js

@@ -1,10 +1,19 @@
 /**
  * Commonly-used functions for determining the colour to use for a badge,
  * including colours based off download count, version number, etc.
+ *
+ * @module
  */
+
 import moment from 'moment'
 import pep440 from '@renovate/pep440'
 
+/**
+ * Determines the color used for a badge based on version.
+ *
+ * @param {string|number} version Version used for determining badge color
+ * @returns {string} Badge color
+ */
 function version(version) {
   if (typeof version !== 'string' && typeof version !== 'number') {
     throw new Error(`Can't generate a version color for ${version}`)
@@ -21,6 +30,12 @@ function version(version) {
   }
 }
 
+/**
+ * Determines the color used for a badge based on PEP440 versioning.
+ *
+ * @param {string|number} version Version used for determining badge color
+ * @returns {string} Badge color
+ */
 function pep440VersionColor(version) {
   if (!pep440.valid(version)) {
     return 'lightgrey'
@@ -32,6 +47,18 @@ function pep440VersionColor(version) {
   return 'blue'
 }
 
+/**
+ * Determines the color used for a badge by comparing the value and floor count values.
+ * The color can vary from red to bright green depending on the range the value lies in.
+ * Decreasing the value will shift the color towards red.
+ * Increasing the value will shift the color towards bright green.
+ *
+ * @param {number} value Current value
+ * @param {number} yellow Yellow color threshold, should be greater than 0
+ * @param {number} yellowgreen Yellowgreen color threshold, should be greater than yellow
+ * @param {number} green Green color threshold, should be greater than yellowgreen
+ * @returns {string} Badge color
+ */
 function floorCount(value, yellow, yellowgreen, green) {
   if (value <= 0) {
     return 'red'
@@ -46,14 +73,37 @@ function floorCount(value, yellow, yellowgreen, green) {
   }
 }
 
+/**
+ * Determines the color used for a badge by comparing the download count and floor values.
+ * The color varies from red to bright green as the download count increases.
+ *
+ * @param {number} downloads Download count
+ * @returns {string} Badge color
+ */
 function downloadCount(downloads) {
   return floorCount(downloads, 10, 100, 1000)
 }
 
+/**
+ * Determines the color used for a badge by comparing percentage and floor values.
+ * The color varies from red to bright green as the percentage increases.
+ *
+ * @param {number} percentage Percentage value
+ * @returns {string} Badge color
+ */
 function coveragePercentage(percentage) {
   return floorCount(percentage, 80, 90, 100)
 }
 
+/**
+ * Determines the color used for a badge by matching score with grade values.
+ * The color varies from bright green to red as the score decreases.
+ * The score can be one of the following grade value: ['A', 'B', 'C', 'D', 'E'].
+ * The color defaults to red if the score does not matches with any of the grade values.
+ *
+ * @param {string} score Score value
+ * @returns {string} Badge color
+ */
 function letterScore(score) {
   if (score === 'A') {
     return 'brightgreen'
@@ -70,6 +120,18 @@ function letterScore(score) {
   }
 }
 
+/**
+ * Creates a callback function that determines badge color from the colors array.
+ * If the colors array is provided then for n steps, there should be n + 1 color.
+ * If the colors array is not provided then it is chosen from the default colors array
+ * according to the size of the steps array.
+ *
+ * @param {number[]} steps Steps array
+ * @param {string[]} colors Colors array. If provided, should be of length steps.length + 1
+ * @param {boolean} reversed If true then the colors array will be considered in reverse order
+ * @returns {function(number): string} Function that finds the step index by comparing value
+ * with steps array and returns color from colors array for the corresponding step index
+ */
 function colorScale(steps, colors, reversed) {
   if (steps === undefined) {
     throw Error('When invoking colorScale, steps should be provided.')
@@ -110,6 +172,14 @@ function colorScale(steps, colors, reversed) {
   }
 }
 
+/**
+ * Determines the color used for a badge according to the age.
+ * Age is calculated as days elapsed till current date.
+ * The color varies from bright green to red as the age increases.
+ *
+ * @param {string} date Date string
+ * @returns {string} Badge color
+ */
 function age(date) {
   const colorByAge = colorScale([7, 30, 180, 365, 730], undefined, true)
   const daysElapsed = moment().diff(moment(date), 'days')

services/contributor-count.js

@@ -1,5 +1,18 @@
+/**
+ * Common functions and utilities for tasks related to contributor count.
+ *
+ * @module
+ */
+
 import { metric } from './text-formatters.js'
 
+/**
+ * Determines the color used for a badge based on the contributor count.
+ * The color varies from red to bright green as the contributor count increases.
+ *
+ * @param {number} contributorCount Contributor count
+ * @returns {string} Badge color
+ */
 function contributorColor(contributorCount) {
   if (contributorCount > 2) {
     return 'brightgreen'
@@ -10,6 +23,15 @@ function contributorColor(contributorCount) {
   }
 }
 
+/**
+ * Handles rendering concerns of badges that display contributor count.
+ * Determines the message and color of the badge according to the contributor count.
+ *
+ * @param {object} attrs Refer to individual attributes
+ * @param {string} [attrs.label] If provided then badge label is set to this value
+ * @param {number} attrs.contributorCount Contributor count
+ * @returns {object} Badge with label, message and color properties
+ */
 function renderContributorBadge({ label, contributorCount }) {
   return {
     label,

services/deprecation-helpers.js

@@ -1,9 +0,0 @@
-import { Deprecated } from './index.js'
-
-function enforceDeprecation(effectiveDate) {
-  if (Date.now() >= effectiveDate.getTime()) {
-    throw new Deprecated()
-  }
-}
-
-export { enforceDeprecation }

services/deprecation-helpers.spec.js

@@ -1,15 +0,0 @@
-import { expect } from 'chai'
-import { Deprecated } from '../core/base-service/errors.js'
-import { enforceDeprecation } from './deprecation-helpers.js'
-
-describe('enforceDeprecation', function () {
-  it('throws Deprecated for a date in the past', function () {
-    expect(() => enforceDeprecation(new Date())).to.throw(Deprecated)
-  })
-
-  it('does not throw for a date in the future', function () {
-    expect(() =>
-      enforceDeprecation(new Date(Date.now() + 10000))
-    ).not.to.throw()
-  })
-})

services/dynamic-common.js

@@ -1,22 +1,54 @@
+/**
+ * Common functions and utilities for tasks related to dynamic badges.
+ *
+ * @module
+ */
+
 import Joi from 'joi'
 import toArray from '../core/base-service/to-array.js'
 import validate from '../core/base-service/validate.js'
 import { InvalidResponse } from './index.js'
 
+/**
+ * Map of error codes and their corresponding error messages.
+ *
+ * @type {object}
+ */
 const errorMessages = {
   404: 'resource not found',
 }
 
+/**
+ * Joi schema for validating individual value.
+ * Checks if the individual value is of type string or number.
+ *
+ * @type {object}
+ */
 const individualValueSchema = Joi.alternatives()
   .try(Joi.string(), Joi.number())
   .required()
 
+/**
+ * Joi schema for validating compound value.
+ * Checks if the compound value is of type individualValueSchema, array of individualValueSchema or empty array.
+ *
+ * @type {object}
+ */
 const compoundValueSchema = Joi.alternatives().try(
   individualValueSchema,
   Joi.array().items(individualValueSchema).required(),
   Joi.array().length(0)
 )
 
+/**
+ * Look up the value in the data object by key and validate the value against compoundValueSchema.
+ *
+ * @param {object} attrs Refer to individual attributes
+ * @param {object} attrs.data Object containing the data for validation
+ * @param {string} attrs.key Key to retrieve the data from object for validation
+ * @throws {InvalidResponse|Error} Error if Joi validation fails due to invalid or no schema
+ * @returns {object} Value if Joi validation is success
+ */
 function transformAndValidate({ data, key }) {
   return validate(
     {
@@ -30,6 +62,20 @@ function transformAndValidate({ data, key }) {
   )
 }
 
+/**
+ * Handles rendering concerns of dynamic badges.
+ * Determines the label of the badge according to the tag and defaultLabel.
+ * Determines the message of the badge according to the prefix, suffix and value.
+ * Sets the color of the badge to blue.
+ *
+ * @param {object} attrs Refer to individual attributes
+ * @param {string} attrs.defaultLabel default badge label
+ * @param {string} [attrs.tag] If provided then this value will be appended to the badge label, e.g. `foobar@v1.23`
+ * @param {any} attrs.value Value or array of value to be used for the badge message
+ * @param {string} [attrs.prefix] If provided then the badge message will use this value as a prefix
+ * @param {string} [attrs.suffix] If provided then the badge message will use this value as a suffix
+ * @returns {object} Badge with label, message and color properties
+ */
 function renderDynamicBadge({
   defaultLabel,
   tag,

services/flathub/flathub-downloads.service.js

@@ -0,0 +1,33 @@
+import Joi from 'joi'
+import { BaseJsonService } from '../index.js'
+import { renderDownloadsBadge } from '../downloads.js'
+
+const schema = Joi.object({
+  installs_total: Joi.number().integer().required(),
+}).required()
+
+export default class FlathubDownloads extends BaseJsonService {
+  static category = 'downloads'
+  static route = { base: 'flathub/downloads', pattern: ':packageName' }
+  static examples = [
+    {
+      title: 'Flathub',
+      namedParams: {
+        packageName: 'org.mozilla.firefox',
+      },
+      staticPreview: renderDownloadsBadge({ downloads: '277136' }),
+    },
+  ]
+
+  static defaultBadgeData = { label: 'installs' }
+
+  async handle({ packageName }) {
+    const data = await this._requestJson({
+      schema,
+      url: `https://flathub.org/api/v2/stats/${encodeURIComponent(
+        packageName
+      )}`,
+    })
+    return renderDownloadsBadge({ downloads: data.installs_total })
+  }
+}

services/flathub/flathub-downloads.tester.js

@@ -0,0 +1,14 @@
+import { isMetric } from '../test-validators.js'
+import { createServiceTester } from '../tester.js'
+export const t = await createServiceTester()
+
+t.create('Flathub Downloads (valid)')
+  .get('/org.mozilla.firefox.json')
+  .expectBadge({
+    label: 'installs',
+    message: isMetric,
+  })
+
+t.create('Flathub Downloads  (not found)')
+  .get('/not.a.package.json')
+  .expectBadge({ label: 'installs', message: 'not found' })

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

@@ -140,6 +140,26 @@ const ageUpdateMap = {
   }),
 }
 
+const milestoneMap = {
+  schema: Joi.object({
+    ...commonSchemaFields,
+    milestone: Joi.object({
+      title: Joi.string().required(),
+    }).allow(null),
+  }).required(),
+  transform: ({ json }) => {
+    if (!json.milestone) {
+      throw new InvalidResponse({ prettyMessage: 'no milestone' })
+    }
+    return json.milestone.title
+  },
+  render: ({ value }) => ({
+    label: 'milestone',
+    message: value,
+    color: 'informational',
+  }),
+}
+
 const propertyMap = {
   state: stateMap,
   title: titleMap,
@@ -148,6 +168,7 @@ const propertyMap = {
   comments: commentsMap,
   age: ageUpdateMap,
   'last-update': ageUpdateMap,
+  milestone: milestoneMap,
 }
 
 export default class GithubIssueDetail extends GithubAuthV3Service {
@@ -155,7 +176,7 @@ export default class GithubIssueDetail extends GithubAuthV3Service {
   static route = {
     base: 'github',
     pattern:
-      ':issueKind(issues|pulls)/detail/:property(state|title|author|label|comments|age|last-update)/:user/:repo/:number([0-9]+)',
+      ':issueKind(issues|pulls)/detail/:property(state|title|author|label|comments|age|last-update|milestone)/:user/:repo/:number([0-9]+)',
   }
 
   static examples = [
@@ -182,6 +203,7 @@ export default class GithubIssueDetail extends GithubAuthV3Service {
         'comments',
         'age',
         'last update',
+        'milestone',
       ],
       documentation,
     },

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

@@ -90,6 +90,14 @@ describe('GithubIssueDetail', function () {
       message: formatDate('2019-04-02T20:09:31Z'),
       color: age('2019-04-02T20:09:31Z'),
     })
+    given({
+      property: 'milestone',
+      value: 'MS 1',
+    }).expect({
+      label: 'milestone',
+      message: 'MS 1',
+      color: 'informational',
+    })
   })
 
   test(GithubIssueDetail.prototype.transform, () => {
@@ -178,6 +186,13 @@ describe('GithubIssueDetail', function () {
       value: '2019-04-02T20:09:31Z',
       isPR: false,
     })
+    given({
+      property: 'milestone',
+      json: { milestone: { title: 'MS 1' } },
+    }).expect({
+      value: 'MS 1',
+      isPR: false,
+    })
   })
 
   context('transform()', function () {
@@ -194,4 +209,19 @@ describe('GithubIssueDetail', function () {
       }
     })
   })
+
+  context('transform()', function () {
+    it('throws InvalidResponse error when issue has no milestone', function () {
+      try {
+        GithubIssueDetail.prototype.transform({
+          property: 'milestone',
+          json: { milestone: null },
+        })
+        expect.fail('Expected to throw')
+      } catch (e) {
+        expect(e).to.be.an.instanceof(InvalidResponse)
+        expect(e.prettyMessage).to.equal('no milestone')
+      }
+    })
+  })
 })

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

@@ -64,3 +64,16 @@ t.create('github pull request merge state (pull request not found)')
     label: 'issue/pull request',
     message: 'issue, pull request or repo not found',
   })
+
+t.create('github issue milestone')
+  .get('/issues/detail/milestone/badges/shields/4949.json')
+  .expectBadge({
+    label: 'milestone',
+    message: 'badge-maker v3.4',
+  })
+
+t.create('github issue milestone (without milestone)')
+  .get('/issues/detail/milestone/badges/shields/979.json')
+  .expectBadge({
+    message: 'no milestone',
+  })

services/gitlab/gitlab-license.service.js

@@ -0,0 +1,89 @@
+import Joi from 'joi'
+import { optionalUrl } from '../validators.js'
+import { renderLicenseBadge } from '../licenses.js'
+import GitLabBase from './gitlab-base.js'
+
+const schema = Joi.object({
+  license: Joi.object({
+    name: Joi.string().required(),
+  }).allow(null),
+}).required()
+
+const queryParamSchema = Joi.object({
+  gitlab_url: optionalUrl,
+}).required()
+
+const documentation = `
+<p>
+  You may use your GitLab Project Id (e.g. 13083) or your Project Path (e.g. gitlab-org/gitlab-foss )
+</p>
+`
+const commonProps = {
+  namedParams: {
+    project: 'gitlab-org/gitlab-foss',
+  },
+  documentation,
+}
+
+export default class GitlabLicense extends GitLabBase {
+  static category = 'license'
+
+  static route = {
+    base: 'gitlab/v/license',
+    pattern: ':project+',
+    queryParamSchema,
+  }
+
+  static examples = [
+    {
+      title: 'GitLab',
+      ...commonProps,
+      staticPreview: {
+        label: 'license',
+        message: 'MIT License',
+        color: 'green',
+      },
+    },
+    {
+      title: 'GitLab (custom server)',
+      ...commonProps,
+      queryParams: { gitlab_url: 'https://jihulab.com' },
+      staticPreview: {
+        label: 'license',
+        message: 'MIT License',
+        color: 'green',
+      },
+    },
+  ]
+
+  static defaultBadgeData = { label: 'license' }
+
+  static render({ license }) {
+    if (license) {
+      return renderLicenseBadge({ license })
+    } else {
+      return { message: 'not specified' }
+    }
+  }
+
+  async fetch({ project, baseUrl }) {
+    // https://docs.gitlab.com/ee/api/projects.html#get-single-project
+    return super.fetch({
+      schema,
+      url: `${baseUrl}/api/v4/projects/${encodeURIComponent(project)}`,
+      options: { searchParams: { license: '1' } },
+      errorMessages: {
+        404: 'repo not found',
+      },
+    })
+  }
+
+  async handle({ project }, { gitlab_url: baseUrl = 'https://gitlab.com' }) {
+    const { license: licenseObject } = await this.fetch({
+      project,
+      baseUrl,
+    })
+    const license = licenseObject ? licenseObject.name : undefined
+    return this.constructor.render({ license })
+  }
+}

services/gitlab/gitlab-license.tester.js

@@ -0,0 +1,57 @@
+import { licenseToColor } from '../licenses.js'
+import { createServiceTester } from '../tester.js'
+export const t = await createServiceTester()
+
+const publicDomainLicenseColor = licenseToColor('MIT License')
+const unknownLicenseColor = licenseToColor()
+
+t.create('License')
+  .get('/guoxudong.io/shields-test/licenced-test.json')
+  .expectBadge({
+    label: 'license',
+    message: 'MIT License',
+    color: `${publicDomainLicenseColor}`,
+  })
+
+t.create('License for repo without a license')
+  .get('/guoxudong.io/shields-test/no-license-test.json')
+  .expectBadge({
+    label: 'license',
+    message: 'not specified',
+    color: 'lightgrey',
+  })
+
+t.create('Other license').get('/gitlab-org/gitlab-foss.json').expectBadge({
+  label: 'license',
+  message: 'Other',
+  color: unknownLicenseColor,
+})
+
+t.create('License for unknown repo')
+  .get('/user1/gitlab-does-not-have-this-repo.json')
+  .expectBadge({
+    label: 'license',
+    message: 'repo not found',
+    color: 'red',
+  })
+
+t.create('Mocking License')
+  .get('/group/project.json')
+  .intercept(nock =>
+    nock('https://gitlab.com')
+      .get('/api/v4/projects/group%2Fproject?license=1')
+      .reply(200, {
+        license: {
+          key: 'apache-2.0',
+          name: 'Apache License 2.0',
+          nickname: '',
+          html_url: 'http://choosealicense.com/licenses/apache-2.0/',
+          source_url: '',
+        },
+      })
+  )
+  .expectBadge({
+    label: 'license',
+    message: 'Apache License 2.0',
+    color: unknownLicenseColor,
+  })

services/jitpack/jitpack-version.service.js

@@ -31,7 +31,7 @@ export default class JitPackVersion extends BaseJsonService {
   static defaultBadgeData = { label: 'jitpack' }
 
   async fetch({ vcs, user, repo }) {
-    const url = `https://jitpack.io/api/builds/com.${vcs}.${user}/${repo}/latest`
+    const url = `https://jitpack.io/api/builds/com.${vcs}.${user}/${repo}/latestOk`
 
     return this._requestJson({
       schema,

services/pub/pub-likes.service.js

@@ -0,0 +1,53 @@
+import Joi from 'joi'
+import { BaseJsonService } from '../index.js'
+import { metric } from '../text-formatters.js'
+import { nonNegativeInteger } from '../validators.js'
+
+const documentation = `<p>A measure of how many developers have liked a package. This provides a raw measure of the overall sentiment of a package from peer developers.</p>`
+
+const keywords = ['dart', 'flutter']
+
+const schema = Joi.object({
+  likeCount: nonNegativeInteger,
+}).required()
+
+const title = 'Pub Likes'
+
+export default class PubLikes extends BaseJsonService {
+  static category = 'rating'
+
+  static route = { base: 'pub/likes', pattern: ':packageName' }
+
+  static examples = [
+    {
+      title,
+      keywords,
+      documentation,
+      namedParams: { packageName: 'analysis_options' },
+      staticPreview: this.render({ likeCount: 1000 }),
+    },
+  ]
+
+  static defaultBadgeData = { label: 'likes' }
+
+  static render({ likeCount }) {
+    return {
+      label: 'likes',
+      message: metric(likeCount),
+      color: 'blue',
+    }
+  }
+
+  async fetch({ packageName }) {
+    return this._requestJson({
+      schema,
+      url: `https://pub.dev/api/packages/${packageName}/score`,
+    })
+  }
+
+  async handle({ packageName }) {
+    const score = await this.fetch({ packageName })
+    const likeCount = score.likeCount
+    return this.constructor.render({ likeCount })
+  }
+}

services/pub/pub-likes.tester.js

@@ -0,0 +1,22 @@
+import { isMetric } from '../test-validators.js'
+import { createServiceTester } from '../tester.js'
+
+export const t = await createServiceTester()
+
+t.create('pub likes (valid)').get('/analysis_options.json').expectBadge({
+  label: 'likes',
+  message: isMetric,
+  color: 'blue',
+})
+
+t.create('pub likes (not found)').get('/analysisoptions.json').expectBadge({
+  label: 'likes',
+  message: 'not found',
+  color: 'red',
+})
+
+t.create('pub likes (invalid)').get('/analysis-options.json').expectBadge({
+  label: 'likes',
+  message: 'invalid',
+  color: 'lightgrey',
+})

services/pub/pub-points.service.js

@@ -0,0 +1,55 @@
+import Joi from 'joi'
+import { floorCount } from '../color-formatters.js'
+import { BaseJsonService } from '../index.js'
+import { nonNegativeInteger } from '../validators.js'
+
+const documentation = `<p>A measure of quality. This includes several dimensions of quality such as code style, platform support, and maintainability.</p>`
+
+const keywords = ['dart', 'flutter']
+
+const schema = Joi.object({
+  grantedPoints: nonNegativeInteger,
+  maxPoints: nonNegativeInteger,
+}).required()
+
+const title = 'Pub Points'
+
+export default class PubPoints extends BaseJsonService {
+  static category = 'rating'
+
+  static route = { base: 'pub/points', pattern: ':packageName' }
+
+  static examples = [
+    {
+      title,
+      keywords,
+      documentation,
+      namedParams: { packageName: 'analysis_options' },
+      staticPreview: this.render({ grantedPoints: 120, maxPoints: 130 }),
+    },
+  ]
+
+  static defaultBadgeData = { label: 'points' }
+
+  static render({ grantedPoints, maxPoints }) {
+    return {
+      label: 'points',
+      message: `${grantedPoints}/${maxPoints}`,
+      color: floorCount((grantedPoints / maxPoints) * 100, 40, 60, 80),
+    }
+  }
+
+  async fetch({ packageName }) {
+    return this._requestJson({
+      schema,
+      url: `https://pub.dev/api/packages/${packageName}/score`,
+    })
+  }
+
+  async handle({ packageName }) {
+    const score = await this.fetch({ packageName })
+    const grantedPoints = score.grantedPoints
+    const maxPoints = score.maxPoints
+    return this.constructor.render({ grantedPoints, maxPoints })
+  }
+}

services/pub/pub-points.tester.js

@@ -0,0 +1,23 @@
+import Joi from 'joi'
+import { createServiceTester } from '../tester.js'
+
+export const t = await createServiceTester()
+
+t.create('pub points (valid)')
+  .get('/analysis_options.json')
+  .expectBadge({
+    label: 'points',
+    message: Joi.string().regex(/^\d+\/130$/),
+  })
+
+t.create('pub points (not found)').get('/analysisoptions.json').expectBadge({
+  label: 'points',
+  message: 'not found',
+  color: 'red',
+})
+
+t.create('pub points (invalid)').get('/analysis-options.json').expectBadge({
+  label: 'points',
+  message: 'invalid',
+  color: 'lightgrey',
+})

services/pub/pub-popularity.service.js

@@ -0,0 +1,53 @@
+import Joi from 'joi'
+import { floorCount } from '../color-formatters.js'
+import { BaseJsonService } from '../index.js'
+
+const documentation = `<p>A measure of how many developers use a package, providing insight into what other developers are using.</p>`
+
+const keywords = ['dart', 'flutter']
+
+const schema = Joi.object({
+  popularityScore: Joi.number().min(0).max(1).required(),
+}).required()
+
+const title = 'Pub Popularity'
+
+export default class PubPopularity extends BaseJsonService {
+  static category = 'rating'
+
+  static route = { base: 'pub/popularity', pattern: ':packageName' }
+
+  static examples = [
+    {
+      title,
+      keywords,
+      documentation,
+      namedParams: { packageName: 'analysis_options' },
+      staticPreview: this.render({ popularityScore: 0.9 }),
+    },
+  ]
+
+  static defaultBadgeData = { label: 'popularity' }
+
+  static render({ popularityScore }) {
+    const roundedScore = Math.round(popularityScore * 100)
+    return {
+      label: 'popularity',
+      message: `${roundedScore}%`,
+      color: floorCount(roundedScore, 40, 60, 80),
+    }
+  }
+
+  async fetch({ packageName }) {
+    return this._requestJson({
+      schema,
+      url: `https://pub.dev/api/packages/${packageName}/score`,
+    })
+  }
+
+  async handle({ packageName }) {
+    const score = await this.fetch({ packageName })
+    const popularityScore = score.popularityScore
+    return this.constructor.render({ popularityScore })
+  }
+}

services/pub/pub-popularity.tester.js

@@ -0,0 +1,23 @@
+import { isIntegerPercentage } from '../test-validators.js'
+import { createServiceTester } from '../tester.js'
+
+export const t = await createServiceTester()
+
+t.create('pub popularity (valid)').get('/analysis_options.json').expectBadge({
+  label: 'popularity',
+  message: isIntegerPercentage,
+})
+
+t.create('pub popularity (not found)')
+  .get('/analysisoptions.json')
+  .expectBadge({
+    label: 'popularity',
+    message: 'not found',
+    color: 'red',
+  })
+
+t.create('pub popularity (invalid)').get('/analysis-options.json').expectBadge({
+  label: 'popularity',
+  message: 'invalid',
+  color: 'lightgrey',
+})

services/pub/pub-publisher.tester.js

@@ -12,7 +12,7 @@ t.create('package not verified publisher').get('/utf.json').expectBadge({
   color: 'lightgrey',
 })
 
-t.create('package not found').get('/does-not-exist.json').expectBadge({
+t.create('package not found').get('/doesnotexist.json').expectBadge({
   label: 'publisher',
   message: 'not found',
 })

services/pub/pub.tester.js

@@ -18,7 +18,7 @@ t.create('package pre-release version')
     message: isVPlusTripleDottedVersion,
   })
 
-t.create('package not found').get('/v/does-not-exist.json').expectBadge({
+t.create('package not found').get('/v/doesnotexist.json').expectBadge({
   label: 'pub',
   message: 'not found',
 })

services/reuse/reuse-compliance.tester.js

@@ -62,7 +62,10 @@ t.create('valid repo -- unregistered')
     color: COLOR_MAP.unregistered,
   })
 
-t.create('invalid repo').get('/github.com/repo/invalid-repo.json').expectBadge({
-  label: 'reuse',
-  message: 'Not a Git repository',
-})
+t.create('invalid repo')
+  .timeout(10000)
+  .get('/github.com/repo/invalid-repo.json')
+  .expectBadge({
+    label: 'reuse',
+    message: 'Not a Git repository',
+  })

services/scoop/scoop-version.service.js

@@ -53,8 +53,8 @@ export default class ScoopVersion extends ConditionalGithubAuthV3Service {
     if (!this.buckets) {
       this.buckets = await fetchJsonFromRepo(this, {
         schema: bucketsSchema,
-        user: 'lukesampson',
-        repo: 'scoop',
+        user: 'ScoopInstaller',
+        repo: 'Scoop',
         branch: 'master',
         filename: 'buckets.json',
       })

services/spack/spack.service.js

@@ -17,7 +17,7 @@ export default class SpackVersion extends BaseJsonService {
     {
       title: 'Spack',
       namedParams: { packageName: 'adios2' },
-      staticPreview: this.render({ version: '2.3.1' }),
+      staticPreview: this.render({ version: '2.8.0' }),
       keywords: ['hpc'],
     },
   ]
@@ -29,10 +29,9 @@ export default class SpackVersion extends BaseJsonService {
   }
 
   async fetch({ packageName }) {
-    const firstLetter = packageName[0]
     return this._requestJson({
       schema,
-      url: `https://packages.spack.io/api/${firstLetter}/${packageName}.json`,
+      url: `https://packages.spack.io/data/packages/${packageName}.json`,
       errorMessages: {
         404: 'package not found',
       },