Merge branch 'master' into no-babel

.changeset/quick-plants-peel.md

@@ -0,0 +1,7 @@
+---
+'skuba': minor
+---
+
+**format:** Execute ESLint with `--report-unused-disable-directives`
+
+`skuba format` will now flag unused disable directives, and will [automatically remove](https://eslint.org/blog/2021/06/whats-coming-in-eslint-8.0.0#unused-disable-directives-are-now-fixable) them once ESLint v8 is released.

.changeset/tender-ads-cover.md

@@ -0,0 +1,7 @@
+---
+'skuba': patch
+---
+
+**template:** Propagate BUILDKITE environment variable to Docker
+
+This forces serial execution of certain **skuba** commands to avoid overwhelming underprovisioned Buildkite agents. See [docs/buildkite.md](https://github.com/seek-oss/skuba/tree/master/docs/buildkite.md) for more information.

.github/workflows/release.yml

@@ -35,3 +35,9 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           NPM_TOKEN: ${{ secrets.SEEK_OSS_CI_NPM_TOKEN }}
+
+      - name: Deploy to GitHub Pages
+        run: yarn deploy
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          IS_GITHUB_PAGES: true

package.json

@@ -22,6 +22,7 @@
   "license": "MIT",
   "scripts": {
     "build": "yarn skuba build && scripts/postbuild.sh",
+    "deploy": "scripts/deploy.sh",
     "format": "yarn skuba format",
     "lint": "yarn skuba lint",
     "release": "yarn build && changeset publish",

scripts/deploy.sh

@@ -0,0 +1,46 @@
+#!/usr/bin/env sh
+
+set -e
+
+echo '=> Packaging...'
+
+rm -rf dist-docs
+
+mkdir -p dist-docs
+
+cp README.md dist-docs/
+
+cp -R docs dist-docs/docs/
+
+exit 0
+
+cd dist-docs
+
+git init
+
+git add --all
+
+git \
+-c 'user.email=<>' \
+-c 'user.name=skuba' \
+commit \
+--author 'skuba <>' \
+--message 'Deploy to GitHub Pages' \
+--quiet
+
+echo '=> Deploying...'
+
+{
+  GIT_URL="[email protected]:seek-oss/skuba.git"
+
+  if [ "${IS_GITHUB_PAGES:-}" = 'true' ]; then
+    GIT_URL="https://${GITHUB_ACTOR}:${GITHUB_TOKEN}@github.com/seek-oss/skuba.git"
+  fi
+
+  git push --force --quiet "${GIT_URL}" 'master:gh-pages'
+}
+
+cd ..
+rm -rf dist-docs
+
+echo "=> Deployed: https://seek-oss.github.io/skuba"

src/cli/format.test.ts

@@ -35,6 +35,7 @@ describe('format', () => {
         "eslint",
         "--ext=js,ts,tsx",
         "--fix",
+        "--report-unused-disable-directives",
         ".",
         Object {
           "localDir": "REDACTED",
@@ -71,6 +72,7 @@ describe('format', () => {
         "--debug",
         "--ext=js,ts,tsx",
         "--fix",
+        "--report-unused-disable-directives",
         ".",
         Object {
           "localDir": "REDACTED",

src/cli/format.ts

@@ -10,6 +10,7 @@ export const format = async () => {
     ...(debug ? ['--debug'] : []),
     '--ext=js,ts,tsx',
     '--fix',
+    '--report-unused-disable-directives',
     '.',
   );
   log.ok('✔ ESLint');

template/express-rest-api/docker-compose.yml

@@ -2,6 +2,8 @@ version: '3.7'
 
 services:
   app:
+    env:
+      - BUILDKITE
     image: ${BUILDKITE_PLUGIN_DOCKER_IMAGE:-''}
     init: true
     volumes:

template/greeter/docker-compose.yml

@@ -2,6 +2,8 @@ version: '3.7'
 
 services:
   app:
+    env:
+      - BUILDKITE
     image: ${BUILDKITE_PLUGIN_DOCKER_IMAGE:-''}
     init: true
     volumes:

template/koa-rest-api/docker-compose.yml

@@ -2,6 +2,8 @@ version: '3.7'
 
 services:
   app:
+    env:
+      - BUILDKITE
     image: ${BUILDKITE_PLUGIN_DOCKER_IMAGE:-''}
     init: true
     volumes:

template/lambda-sqs-worker-cdk/docker-compose.yml

@@ -3,6 +3,7 @@ version: '3.7'
 services:
   app:
     environment:
+      - BUILDKITE
       - BUILDKITE_COMMIT
       - ENVIRONMENT
       - VERSION

template/lambda-sqs-worker/docker-compose.yml

@@ -3,6 +3,7 @@ version: '3.7'
 services:
   app:
     environment:
+      - BUILDKITE
       - BUILDKITE_COMMIT
       - ENVIRONMENT
       - VERSION