skuba 4.0.0 → 4.2.0-beta.0

package/lib/cli/lint/autofix.js

@@ -0,0 +1,114 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.autofix = void 0;
+const simple_git_1 = __importDefault(require("simple-git"));
+const Git = __importStar(require("../../api/git"));
+const eslint_1 = require("../../cli/adapter/eslint");
+const prettier_1 = require("../../cli/adapter/prettier");
+const env_1 = require("../../utils/env");
+const logging_1 = require("../../utils/logging");
+const AUTOFIX_COMMIT_MESSAGE = 'Run `skuba format`';
+const shouldPush = (dir) => __awaiter(void 0, void 0, void 0, function* () {
+    if (!(0, env_1.isCiEnv)()) {
+        // We're not running in a CI environment so we don't need to push autofixes.
+        // Ideally we'd drive this off of repository write permissions, but that is
+        // non-trivial to infer without attempting an actual write.
+        return false;
+    }
+    try {
+        const currentBranch = yield Git.currentBranch({ dir });
+        const isDefaultBuildkiteBranch = currentBranch &&
+            [
+                process.env.BUILDKITE_PIPELINE_DEFAULT_BRANCH,
+                'master',
+                'main',
+            ].includes(currentBranch);
+        const isProtectedGitHubBranch = process.env.GITHUB_REF_PROTECTED === 'true';
+        if (isDefaultBuildkiteBranch || isProtectedGitHubBranch) {
+            // The current branch is a protected branch.
+            // We respect GitHub Flow; avoid pushing directly to the default branch.
+            return false;
+        }
+    }
+    catch (_a) { }
+    try {
+        const headCommitMessage = yield Git.getHeadCommitMessage({ dir });
+        if (headCommitMessage === AUTOFIX_COMMIT_MESSAGE) {
+            // Short circuit when the head commit appears to be one of our autofixes.
+            // Repeating the same operation is unlikely to correct outstanding issues.
+            return false;
+        }
+    }
+    catch (_b) { }
+    // Allow the push attempt to go ahead if our guards have been cleared.
+    return true;
+});
+const autofix = (input) => __awaiter(void 0, void 0, void 0, function* () {
+    const dir = process.cwd();
+    if (!(yield shouldPush(dir))) {
+        return;
+    }
+    // Naively try to autofix issues as we can't tell from ESLint output.
+    try {
+        logging_1.log.newline();
+        logging_1.log.warn(`Trying to autofix with ESLint and Prettier...`);
+        const logger = (0, logging_1.createLogger)(input.debug);
+        yield (0, eslint_1.runESLint)('format', logger);
+        yield (0, prettier_1.runPrettier)('format', logger);
+        const ref = yield Git.commitAllChanges({
+            dir,
+            message: AUTOFIX_COMMIT_MESSAGE,
+        });
+        if (!ref) {
+            return logging_1.log.warn('No autofixes detected.');
+        }
+        yield (process.env.GITHUB_ACTIONS
+            ? // GitHub's checkout action should preconfigure the Git CLI.
+                (0, simple_git_1.default)().push()
+            : // In other CI environments (Buildkite) we fall back to GitHub App auth.
+                Git.push({
+                    auth: { type: 'gitHubApp' },
+                    dir: process.cwd(),
+                    ref,
+                }));
+        logging_1.log.warn(`Pushed fix commit ${ref}.`);
+    }
+    catch (err) {
+        logging_1.log.warn(logging_1.log.bold('Failed to push fix commit.'));
+        logging_1.log.warn(logging_1.log.bold('Does your CI environment have write access to your Git repository?'));
+        logging_1.log.subtle(err);
+    }
+});
+exports.autofix = autofix;
+//# sourceMappingURL=autofix.js.map

package/lib/cli/lint/autofix.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"autofix.js","sourceRoot":"","sources":["../../../src/cli/lint/autofix.ts"],"names":[],"mappings":"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"}

package/lib/cli/lint/external.js

@@ -27,6 +27,7 @@ exports.externalLint = exports.StreamInterceptor = void 0;
 const stream_1 = __importDefault(require("stream"));
 const logging_1 = require("../../utils/logging");
 const annotate_1 = require("./annotate");
+const autofix_1 = require("./autofix");
 const eslint_1 = require("./eslint");
 const prettier_1 = require("./prettier");
 const tsc_1 = require("./tsc");
@@ -106,6 +107,11 @@ const externalLint = (input) => __awaiter(void 0, void 0, void 0, function* () {
     logging_1.log.newline();
     logging_1.log.err(`${tools.join(', ')} found issues that require triage.`);
     process.exitCode = 1;
+    if (eslint.ok && prettier.ok) {
+        // If these are fine then the issue lies with tsc, which we can't autofix.
+        return;
+    }
+    yield (0, autofix_1.autofix)(input);
 });
 exports.externalLint = externalLint;
 //# sourceMappingURL=external.js.map

package/lib/cli/lint/external.js.map

@@ -1 +1 @@
-{"version":3,"file":"external.js","sourceRoot":"","sources":["../../../src/cli/lint/external.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"external.js","sourceRoot":"","sources":["../../../src/cli/lint/external.ts"],"names":[],"mappings":"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"}

package/lib/cli/node.js

@@ -50,13 +50,16 @@ const node = () => __awaiter(void 0, void 0, void 0, function* () {
         });
         // Run a script with plain `node` to support inspector options.
         // https://github.com/TypeStrong/ts-node#programmatic
-        return exec('node', ...args.node, '--require', 'tsconfig-paths/register', '--require', 'ts-node/register/transpile-only', path_1.default.join(__dirname, '..', 'wrapper'), ...args.script);
+        return exec('node', ...args.node, '--require', 'dotenv/config', '--require', 'tsconfig-paths/register', '--require', 'ts-node/register/transpile-only', 
+        // Override dangerously warn-only default on Node.js <15 so that we
+        // predictably return a non-zero exit code on an unhandled rejection.
+        '--unhandled-rejections=throw', path_1.default.join(__dirname, '..', 'wrapper'), ...args.script);
     }
     // REPL with `ts-node` to support import statements.
     return tsNode
         .createRepl({
         service: tsNode.register({
-            require: ['tsconfig-paths/register'],
+            require: ['dotenv/config', 'tsconfig-paths/register'],
             transpileOnly: true,
         }),
     })

package/lib/cli/node.js.map

@@ -1 +1 @@
-{"version":3,"file":"node.js","sourceRoot":"","sources":["../../src/cli/node.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAwB;AAExB,wDAA+B;AAC/B,gDAAkC;AAElC,wCAA6C;AAC7C,wCAA2C;AAC3C,oDAA+C;AAExC,MAAM,IAAI,GAAG,GAAS,EAAE;IAC7B,MAAM,IAAI,GAAG,IAAA,mBAAY,EAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IAEjD,MAAM,aAAa,GAAG,MAAM,IAAA,kBAAO,GAAE,CAAC;IAEtC,IAAI,IAAI,CAAC,UAAU,EAAE;QACnB,MAAM,IAAI,GAAG,IAAA,iBAAU,EAAC;YACtB,GAAG,EAAE;gBACH,mBAAmB,EAAE,IAAI,CAAC,UAAU;gBACpC,YAAY,EAAE,MAAM,CAAC,IAAA,qBAAQ,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,aAAa,CAAC;aACtE;SACF,CAAC,CAAC;QAEH,+DAA+D;QAC/D,qDAAqD;QACrD,OAAO,IAAI,CACT,MAAM,EACN,GAAG,IAAI,CAAC,IAAI,EACZ,WAAW,EACX,yBAAyB,EACzB,WAAW,EACX,iCAAiC,EACjC,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,SAAS,CAAC,EACrC,GAAG,IAAI,CAAC,MAAM,CACf,CAAC;KACH;IAED,oDAAoD;IACpD,OAAO,MAAM;SACV,UAAU,CAAC;QACV,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC;YACvB,OAAO,EAAE,CAAC,yBAAyB,CAAC;YACpC,aAAa,EAAE,IAAI;SACpB,CAAC;KACH,CAAC;SACD,KAAK,EAAE,CAAC;AACb,CAAC,CAAA,CAAC;AApCW,QAAA,IAAI,QAoCf"}
+{"version":3,"file":"node.js","sourceRoot":"","sources":["../../src/cli/node.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAwB;AAExB,wDAA+B;AAC/B,gDAAkC;AAElC,wCAA6C;AAC7C,wCAA2C;AAC3C,oDAA+C;AAExC,MAAM,IAAI,GAAG,GAAS,EAAE;IAC7B,MAAM,IAAI,GAAG,IAAA,mBAAY,EAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IAEjD,MAAM,aAAa,GAAG,MAAM,IAAA,kBAAO,GAAE,CAAC;IAEtC,IAAI,IAAI,CAAC,UAAU,EAAE;QACnB,MAAM,IAAI,GAAG,IAAA,iBAAU,EAAC;YACtB,GAAG,EAAE;gBACH,mBAAmB,EAAE,IAAI,CAAC,UAAU;gBACpC,YAAY,EAAE,MAAM,CAAC,IAAA,qBAAQ,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,aAAa,CAAC;aACtE;SACF,CAAC,CAAC;QAEH,+DAA+D;QAC/D,qDAAqD;QACrD,OAAO,IAAI,CACT,MAAM,EACN,GAAG,IAAI,CAAC,IAAI,EACZ,WAAW,EACX,eAAe,EACf,WAAW,EACX,yBAAyB,EACzB,WAAW,EACX,iCAAiC;QACjC,mEAAmE;QACnE,qEAAqE;QACrE,8BAA8B,EAC9B,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,SAAS,CAAC,EACrC,GAAG,IAAI,CAAC,MAAM,CACf,CAAC;KACH;IAED,oDAAoD;IACpD,OAAO,MAAM;SACV,UAAU,CAAC;QACV,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC;YACvB,OAAO,EAAE,CAAC,eAAe,EAAE,yBAAyB,CAAC;YACrD,aAAa,EAAE,IAAI;SACpB,CAAC;KACH,CAAC;SACD,KAAK,EAAE,CAAC;AACb,CAAC,CAAA,CAAC;AAzCW,QAAA,IAAI,QAyCf"}

package/lib/cli/start.js

@@ -20,20 +20,19 @@ const exec_1 = require("../utils/exec");
 const manifest_1 = require("../utils/manifest");
 const validation_1 = require("../utils/validation");
 const start = () => __awaiter(void 0, void 0, void 0, function* () {
+    var _a;
     const [args, availablePort] = yield Promise.all([
         (0, args_1.parseRunArgs)(process.argv.slice(2)),
         (0, get_port_1.default)(),
     ]);
-    if (!args.entryPoint) {
-        args.entryPoint = yield (0, manifest_1.getEntryPointFromManifest)();
-    }
+    (_a = args.entryPoint) !== null && _a !== void 0 ? _a : (args.entryPoint = yield (0, manifest_1.getEntryPointFromManifest)());
     const execProcess = (0, exec_1.createExec)({
         env: {
             __SKUBA_ENTRY_POINT: args.entryPoint,
             __SKUBA_PORT: String((0, validation_1.isIpPort)(args.port) ? args.port : availablePort),
         },
     });
-    return execProcess('ts-node-dev', ...args.node, '--require', 'tsconfig-paths/register', '--respawn', '--transpile-only', path_1.default.join(__dirname, '..', 'wrapper'), ...args.script);
+    return execProcess('ts-node-dev', ...args.node, '--require', 'dotenv/config', '--require', 'tsconfig-paths/register', '--respawn', '--transpile-only', path_1.default.join(__dirname, '..', 'wrapper'), ...args.script);
 });
 exports.start = start;
 //# sourceMappingURL=start.js.map

package/lib/cli/start.js.map

@@ -1 +1 @@
-{"version":3,"file":"start.js","sourceRoot":"","sources":["../../src/cli/start.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,gDAAwB;AAExB,wDAA+B;AAE/B,wCAA6C;AAC7C,wCAA2C;AAC3C,gDAA8D;AAC9D,oDAA+C;AAExC,MAAM,KAAK,GAAG,GAAS,EAAE;IAC9B,MAAM,CAAC,IAAI,EAAE,aAAa,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QAC9C,IAAA,mBAAY,EAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACnC,IAAA,kBAAO,GAAE;KACV,CAAC,CAAC;IAEH,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;QACpB,IAAI,CAAC,UAAU,GAAG,MAAM,IAAA,oCAAyB,GAAE,CAAC;KACrD;IAED,MAAM,WAAW,GAAG,IAAA,iBAAU,EAAC;QAC7B,GAAG,EAAE;YACH,mBAAmB,EAAE,IAAI,CAAC,UAAU;YACpC,YAAY,EAAE,MAAM,CAAC,IAAA,qBAAQ,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,aAAa,CAAC;SACtE;KACF,CAAC,CAAC;IAEH,OAAO,WAAW,CAChB,aAAa,EACb,GAAG,IAAI,CAAC,IAAI,EACZ,WAAW,EACX,yBAAyB,EACzB,WAAW,EACX,kBAAkB,EAClB,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,SAAS,CAAC,EACrC,GAAG,IAAI,CAAC,MAAM,CACf,CAAC;AACJ,CAAC,CAAA,CAAC;AA3BW,QAAA,KAAK,SA2BhB"}
+{"version":3,"file":"start.js","sourceRoot":"","sources":["../../src/cli/start.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,gDAAwB;AAExB,wDAA+B;AAE/B,wCAA6C;AAC7C,wCAA2C;AAC3C,gDAA8D;AAC9D,oDAA+C;AAExC,MAAM,KAAK,GAAG,GAAS,EAAE;;IAC9B,MAAM,CAAC,IAAI,EAAE,aAAa,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QAC9C,IAAA,mBAAY,EAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACnC,IAAA,kBAAO,GAAE;KACV,CAAC,CAAC;IAEH,MAAA,IAAI,CAAC,UAAU,oCAAf,IAAI,CAAC,UAAU,GAAK,MAAM,IAAA,oCAAyB,GAAE,EAAC;IAEtD,MAAM,WAAW,GAAG,IAAA,iBAAU,EAAC;QAC7B,GAAG,EAAE;YACH,mBAAmB,EAAE,IAAI,CAAC,UAAU;YACpC,YAAY,EAAE,MAAM,CAAC,IAAA,qBAAQ,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,aAAa,CAAC;SACtE;KACF,CAAC,CAAC;IAEH,OAAO,WAAW,CAChB,aAAa,EACb,GAAG,IAAI,CAAC,IAAI,EACZ,WAAW,EACX,eAAe,EACf,WAAW,EACX,yBAAyB,EACzB,WAAW,EACX,kBAAkB,EAClB,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,SAAS,CAAC,EACrC,GAAG,IAAI,CAAC,MAAM,CACf,CAAC;AACJ,CAAC,CAAA,CAAC;AA3BW,QAAA,KAAK,SA2BhB"}

package/lib/utils/env.d.ts

@@ -0,0 +1,5 @@
+/// <reference types="node" />
+/**
+ * Whether the code is executing in a CI environment.
+ */
+export declare const isCiEnv: (env?: NodeJS.ProcessEnv) => boolean;

package/lib/utils/env.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isCiEnv = void 0;
+/**
+ * Whether the code is executing in a CI environment.
+ */
+const isCiEnv = (env = process.env) => Boolean(env.BUILDKITE || env.CI || env.GITHUB_ACTIONS);
+exports.isCiEnv = isCiEnv;
+//# sourceMappingURL=env.js.map

package/lib/utils/env.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"env.js","sourceRoot":"","sources":["../../src/utils/env.ts"],"names":[],"mappings":";;;AAAA;;GAEG;AACI,MAAM,OAAO,GAAG,CAAC,GAAG,GAAG,OAAO,CAAC,GAAG,EAAW,EAAE,CACpD,OAAO,CAAC,GAAG,CAAC,SAAS,IAAI,GAAG,CAAC,EAAE,IAAI,GAAG,CAAC,cAAc,CAAC,CAAC;AAD5C,QAAA,OAAO,WACqC"}

package/package.json

@@ -1,76 +1,22 @@
 {
-  "name": "skuba",
-  "description": "Toolkit for backend TypeScript development",
   "bin": {
     "skuba": "lib/skuba.js"
   },
-  "engines": {
-    "node": ">=14.18"
-  },
-  "version": "4.0.0",
-  "main": "lib/index.js",
-  "typings": "lib/index.d.ts",
-  "files": [
-    "config/**/*",
-    "jest/**/*",
-    "lib*/**/*.d.ts",
-    "lib*/**/*.js",
-    "lib*/**/*.js.map",
-    "template/**/*",
-    "jest-preset.js"
-  ],
-  "sideEffects": false,
-  "license": "MIT",
-  "scripts": {
-    "build": "ts-node --transpile-only src/skuba build && scripts/postbuild.sh",
-    "changeset:add": "changeset add && prettier --loglevel silent --write '.changeset/*.md'",
-    "deploy": "scripts/deploy.sh",
-    "format": "yarn skuba format",
-    "lint": "yarn skuba lint",
-    "release": "yarn build && changeset publish",
-    "stage": "changeset version && yarn format",
-    "skuba": "yarn build && node lib/skuba",
-    "test": "yarn skuba test",
-    "test:ci": "yarn skuba test --config jest.config.int.ts --runInBand",
-    "test:int": "yarn skuba test --config jest.config.int.ts --runInBand",
-    "test:template": "scripts/test-template.sh",
-    "test:watch": "yarn skuba test --config jest.config.int.ts --runInBand --watch"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/seek-oss/skuba.git"
-  },
-  "devDependencies": {
-    "@changesets/cli": "2.19.0",
-    "@changesets/get-github-info": "0.5.0",
-    "@jest/reporters": "27.4.6",
-    "@types/ejs": "3.1.0",
-    "@types/express": "4.17.13",
-    "@types/fs-extra": "9.0.13",
-    "@types/koa": "2.13.4",
-    "@types/lodash.mergewith": "4.6.6",
-    "@types/module-alias": "2.0.1",
-    "@types/npm-which": "3.0.1",
-    "@types/picomatch": "2.3.0",
-    "@types/supertest": "2.0.11",
-    "express": "4.17.2",
-    "jsonfile": "6.1.0",
-    "koa": "2.13.4",
-    "memfs": "3.4.1",
-    "semver": "7.3.5",
-    "supertest": "6.2.1",
-    "type-fest": "2.9.0"
+  "bugs": {
+    "url": "https://github.com/seek-oss/skuba/issues"
   },
   "dependencies": {
     "@octokit/rest": "^18.12.0",
     "@octokit/types": "^6.34.0",
     "@types/jest": "^27.4.0",
+    "@types/node": ">=14.18",
     "chalk": "^4.1.0",
     "concurrently": "^7.0.0",
+    "dotenv": "^16.0.0",
     "ejs": "^3.1.6",
     "enquirer": "^2.3.6",
     "eslint": "^7.27.0",
-    "eslint-config-skuba": "1.0.14",
+    "eslint-config-skuba": "1.0.15",
     "execa": "^5.0.0",
     "fdir": "^5.0.0",
     "fs-extra": "^10.0.0",
@@ -82,11 +28,11 @@
     "jest": "^27.4.5",
     "latest-version": "^5.1.0",
     "lodash.mergewith": "^4.6.2",
-    "normalize-package-data": "^3.0.0",
+    "normalize-package-data": "^4.0.0",
     "npm-run-path": "^4.0.1",
     "npm-which": "^3.0.1",
     "picomatch": "^2.2.2",
-    "prettier": "~2.5.0",
+    "prettier": "~2.6.0",
     "read-pkg-up": "^7.0.1",
     "runtypes": "^6.0.0",
     "semantic-release": "^19.0.0",
@@ -94,12 +40,50 @@
     "simple-git": "^3.0.0",
     "strip-ansi": "^6.0.1",
     "ts-jest": "^27.1.2",
-    "ts-node": "^9.1.1",
-    "ts-node-dev": "^1.1.8",
+    "ts-node": "^10.5.0",
+    "ts-node-dev": "^2.0.0-0",
     "tsconfig-paths": "^3.11.0",
     "tsconfig-seek": "1.0.2",
     "typescript": "~4.4.4"
   },
+  "description": "SEEK development toolkit for backend applications and packages",
+  "devDependencies": {
+    "@changesets/cli": "2.21.1",
+    "@changesets/get-github-info": "0.5.0",
+    "@jest/reporters": "27.5.1",
+    "@types/ejs": "3.1.0",
+    "@types/express": "4.17.13",
+    "@types/fs-extra": "9.0.13",
+    "@types/koa": "2.13.4",
+    "@types/lodash.mergewith": "4.6.6",
+    "@types/module-alias": "2.0.1",
+    "@types/npm-which": "3.0.1",
+    "@types/picomatch": "2.3.0",
+    "@types/supertest": "2.0.11",
+    "express": "4.17.3",
+    "jsonfile": "6.1.0",
+    "koa": "2.13.4",
+    "memfs": "3.4.1",
+    "semver": "7.3.5",
+    "supertest": "6.2.2",
+    "type-fest": "2.12.0"
+  },
+  "engines": {
+    "node": ">=14.18"
+  },
+  "files": [
+    "config/**/*",
+    "jest/**/*",
+    "lib*/**/*.d.ts",
+    "lib*/**/*.js",
+    "lib*/**/*.js.map",
+    "template/**/*",
+    "jest-preset.js"
+  ],
+  "homepage": "https://github.com/seek-oss/skuba#readme",
+  "license": "MIT",
+  "main": "lib/index.js",
+  "name": "skuba",
   "peerDependencies": {
     "skuba-dive": "1 || 2"
   },
@@ -108,7 +92,37 @@
       "optional": true
     }
   },
+  "private": false,
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/seek-oss/skuba.git"
+  },
   "resolutions": {
+    "**/@types/node": ">=14.18",
     "semantic-release/@semantic-release/npm/npm/**/ansi-regex": "5.0.1"
-  }
+  },
+  "scripts": {
+    "build": "ts-node --transpile-only src/skuba build && scripts/postbuild.sh",
+    "changeset:add": "changeset add && prettier --loglevel silent --write '.changeset/*.md'",
+    "deploy": "scripts/deploy.sh",
+    "format": "yarn skuba format",
+    "lint": "yarn skuba lint",
+    "release": "yarn build && changeset publish",
+    "stage": "changeset version && yarn format",
+    "skuba": "yarn build && node lib/skuba",
+    "test": "yarn skuba test",
+    "test:ci": "yarn skuba test --config jest.config.int.ts --runInBand",
+    "test:int": "yarn skuba test --config jest.config.int.ts --runInBand",
+    "test:template": "scripts/test-template.sh",
+    "test:watch": "yarn skuba test --config jest.config.int.ts --runInBand --watch"
+  },
+  "sideEffects": false,
+  "skuba": {
+    "entryPoint": "src/index.ts",
+    "template": null,
+    "type": "package",
+    "version": "4.0.0"
+  },
+  "types": "./lib/index.d.ts",
+  "version": "4.2.0-beta.0"
 }

package/template/base/jest.config.ts

@@ -10,6 +10,12 @@ export default Jest.mergePreset({
       statements: 0,
     },
   },
+  globals: {
+    'ts-jest': {
+      // seek-oss/skuba#626
+      isolatedModules: true,
+    },
+  },
   setupFiles: ['<rootDir>/jest.setup.ts'],
   testPathIgnorePatterns: ['/test\\.ts'],
 });

package/template/express-rest-api/.buildkite/pipeline.yml

@@ -1,13 +1,7 @@
-configs:
-  environments:
-    - &dev
-      agents:
-        queue: <%- devBuildkiteQueueName %>
-
-    - &prod
-      agents:
-        queue: <%- prodBuildkiteQueueName %>
+agents:
+  queue: <%- prodBuildkiteQueueName %>
 
+configs:
   plugins:
     - &aws-sm
       seek-oss/aws-sm#v2.3.1:
@@ -36,8 +30,7 @@ configs:
           permit_on_passed: true
 
 steps:
-  - <<: *prod
-    label: 🧖‍♀️ Warm Prod
+  - label: 🧖‍♀️ Warm Prod
     command: ':'
     key: warm-prod
     plugins:
@@ -45,8 +38,7 @@ steps:
       - *private-npm
       - *docker-ecr-cache
 
-  - <<: *prod
-    label: 🧪 Test & Lint
+  - label: 🧪 Test & Lint
     commands:
       - echo '+++ yarn test:ci'
       - yarn test:ci
@@ -62,14 +54,13 @@ steps:
       - docker-compose#v3.9.0:
           run: app
 
-  - <<: *prod
-    label: 📦 Build & Package
+  - label: 📦 Build & Package
     depends_on: warm-prod
     plugins:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - seek-jobs/gantry#v1.6.1:
+      - seek-jobs/gantry#v1.6.2:
           command: build
           file: gantry.build.yml
           region: <%- region %>
@@ -79,13 +70,14 @@ steps:
   - block: 🙋🏻‍♀️ Deploy Dev
     branches: '!${BUILDKITE_PIPELINE_DEFAULT_BRANCH}'
 
-  - <<: *dev
-    <<: *deploy
+  - <<: *deploy
+    agents:
+      queue: <%- devBuildkiteQueueName %>
     label: 🤞 Deploy Dev
     concurrency_group: <%- teamName %>/deploy/gantry/<%- devGantryEnvironmentName %>
     key: deploy-dev
     plugins:
-      - seek-jobs/gantry#v1.6.1:
+      - seek-jobs/gantry#v1.6.2:
           command: apply
           environment: <%- devGantryEnvironmentName %>
           file: gantry.apply.yml
@@ -94,14 +86,13 @@ steps:
             - .gantry/common.yml
             - .gantry/dev.yml
 
-  - <<: *prod
-    <<: *deploy
+  - <<: *deploy
     label: 🚀 Deploy Prod
     branches: ${BUILDKITE_PIPELINE_DEFAULT_BRANCH}
     concurrency_group: <%- teamName %>/deploy/gantry/<%- prodGantryEnvironmentName %>
     depends_on: deploy-dev
     plugins:
-      - seek-jobs/gantry#v1.6.1:
+      - seek-jobs/gantry#v1.6.2:
           command: apply
           environment: <%- prodGantryEnvironmentName %>
           file: gantry.apply.yml

package/template/express-rest-api/.env

@@ -0,0 +1 @@
+ENVIRONMENT=local

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

@@ -3,11 +3,13 @@ version: '3.7'
 services:
   app:
     environment:
-      # Enable Buildkite + GitHub annotation support.
+      # Enable Buildkite + GitHub integrations.
       - BUILDKITE
       - BUILDKITE_AGENT_ACCESS_TOKEN
+      - BUILDKITE_BRANCH
       - BUILDKITE_BUILD_NUMBER
       - BUILDKITE_JOB_ID
+      - BUILDKITE_PIPELINE_DEFAULT_BRANCH
       - BUILDKITE_STEP_ID
       - GITHUB_API_TOKEN
     image: ${BUILDKITE_PLUGIN_DOCKER_IMAGE:-''}

package/template/express-rest-api/gantry.apply.yml

@@ -108,6 +108,8 @@ cpu: 256
 memory: 512
 
 deployment:
+  # SEEK-Jobs/gantry#488
+  ignoreAlarms: true
   smokeTest:
     path: /smoke
     useExternalDns: true

package/template/express-rest-api/gantry.build.yml

@@ -9,4 +9,5 @@ buildArgs:
   BASE_IMAGE: '{{.Env.BUILDKITE_PLUGIN_DOCKER_ECR_CACHE_EXPORT_IMAGE}}'
   BASE_TAG: '{{.Env.BUILDKITE_PLUGIN_DOCKER_ECR_CACHE_EXPORT_TAG}}'
 
-failOnScanFindings: true
+# SEEK-Jobs/gantry#1661
+failOnScanFindings: false

package/template/express-rest-api/package.json

@@ -2,7 +2,7 @@
   "dependencies": {
     "@seek/logger": "^5.0.1",
     "express": "^4.17.1",
-    "skuba-dive": "^1.2.0"
+    "skuba-dive": "^2.0.0"
   },
   "devDependencies": {
     "@types/express": "^4.17.13",
@@ -21,7 +21,7 @@
     "build": "skuba build",
     "format": "skuba format",
     "lint": "skuba lint",
-    "start": "ENVIRONMENT=local skuba start --port <%- port %>",
+    "start": "skuba start --port <%- port %>",
     "start:debug": "yarn start --inspect-brk",
     "test": "skuba test",
     "test:ci": "skuba test --coverage",

package/template/greeter/.buildkite/pipeline.yml

@@ -1,11 +1,7 @@
-configs:
-  environments:
-    - &prod
-      agents:
-        queue: <%- prodBuildkiteQueueName %>
-      env:
-        ENVIRONMENT: prod
+agents:
+  queue: <%- prodBuildkiteQueueName %>
 
+configs:
   plugins:
     - &aws-sm
       seek-oss/aws-sm#v2.3.1:
@@ -24,8 +20,7 @@ configs:
         env: NPM_READ_TOKEN
 
 steps:
-  - <<: *prod
-    label: 🧪 Test & Lint
+  - label: 🧪 Test & Lint
     commands:
       - echo '+++ yarn test:ci'
       - yarn test:ci

package/template/greeter/docker-compose.yml

@@ -3,11 +3,13 @@ version: '3.7'
 services:
   app:
     environment:
-      # Enable Buildkite + GitHub annotation support.
+      # Enable Buildkite + GitHub integrations.
       - BUILDKITE
       - BUILDKITE_AGENT_ACCESS_TOKEN
+      - BUILDKITE_BRANCH
       - BUILDKITE_BUILD_NUMBER
       - BUILDKITE_JOB_ID
+      - BUILDKITE_PIPELINE_DEFAULT_BRANCH
       - BUILDKITE_STEP_ID
       - GITHUB_API_TOKEN
     image: ${BUILDKITE_PLUGIN_DOCKER_IMAGE:-''}

package/template/greeter/package.json

@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "skuba-dive": "^1.2.0"
+    "skuba-dive": "^2.0.0"
   },
   "devDependencies": {
     "@types/node": "^16.0.0",
@@ -15,7 +15,7 @@
     "build": "skuba build",
     "format": "skuba format",
     "lint": "skuba lint",
-    "start": "ENVIRONMENT=local skuba start",
+    "start": "skuba start",
     "start:debug": "yarn start --inspect-brk",
     "test": "skuba test",
     "test:ci": "skuba test --coverage",