skuba 7.5.0-timeout-20240210035306 → 7.5.1

package/lib/cli/migrate/nodeVersion/index.js

@@ -0,0 +1,110 @@
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var nodeVersion_exports = {};
+__export(nodeVersion_exports, {
+  nodeVersionMigration: () => nodeVersionMigration
+});
+module.exports = __toCommonJS(nodeVersion_exports);
+var import_util = require("util");
+var import_fast_glob = require("fast-glob");
+var import_fs_extra = __toESM(require("fs-extra"));
+var import_logging = require("../../../utils/logging");
+var import_project = require("../../configure/analysis/project");
+const subPatches = [
+  { file: ".nvmrc", replace: "<%- version %>\n" },
+  {
+    files: "Dockerfile*",
+    test: /^FROM(.*) node:[0-9.]+(\.[^- \n]+)?(-[^ \n]+)?( .+|)$/gm,
+    replace: "FROM$1 node:<%- version %>$3$4"
+  },
+  {
+    files: "Dockerfile*",
+    test: /^FROM(.*) gcr.io\/distroless\/nodejs\d+-debian(.+)$/gm,
+    replace: "FROM$1 gcr.io/distroless/nodejs<%- version %>-debian$2"
+  },
+  {
+    files: "serverless*.y*ml",
+    test: /nodejs\d+.x/gm,
+    replace: "nodejs<%- version %>.x"
+  },
+  {
+    files: "infra/**/*.ts",
+    test: /NODEJS_\d+_X/g,
+    replace: "NODEJS_<%- version %>_X"
+  },
+  {
+    files: ".buildkite/*",
+    test: /image: node:[0-9.]+(\.[^- \n]+)?(-[^ \n]+)?$/gm,
+    replace: "image: node:<%- version %>$2"
+  }
+];
+const runSubPatch = async (version, dir, patch) => {
+  const readFile = (0, import_project.createDestinationFileReader)(dir);
+  const paths = patch.file ? [patch.file] : await (0, import_fast_glob.glob)(patch.files ?? [], { cwd: dir });
+  await Promise.all(
+    paths.map(async (path) => {
+      const contents = await readFile(path);
+      if (!contents) {
+        return;
+      }
+      if (patch.test && !patch.test.test(contents)) {
+        return;
+      }
+      const templated = patch.replace.replaceAll(
+        "<%- version %>",
+        version.toString()
+      );
+      await import_fs_extra.default.promises.writeFile(
+        path,
+        patch.test ? contents.replaceAll(patch.test, templated) : templated
+      );
+    })
+  );
+};
+const upgrade = async (version, dir) => {
+  await Promise.all(
+    subPatches.map((subPatch) => runSubPatch(version, dir, subPatch))
+  );
+};
+const nodeVersionMigration = async (version, dir = process.cwd()) => {
+  import_logging.log.ok(`Upgrading to Node.js ${version}`);
+  try {
+    await upgrade(version, dir);
+    import_logging.log.ok("Upgraded to Node.js", version);
+  } catch (err) {
+    import_logging.log.err("Failed to upgrade");
+    import_logging.log.subtle((0, import_util.inspect)(err));
+    process.exitCode = 1;
+  }
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  nodeVersionMigration
+});
+//# sourceMappingURL=index.js.map

package/lib/cli/migrate/nodeVersion/index.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../../src/cli/migrate/nodeVersion/index.ts"],
+  "sourcesContent": ["import { inspect } from 'util';\n\nimport { glob } from 'fast-glob';\nimport fs from 'fs-extra';\n\nimport { log } from '../../../utils/logging';\nimport { createDestinationFileReader } from '../../configure/analysis/project';\n\ntype SubPatch = (\n  | { files: string; file?: never }\n  | { file: string; files?: never }\n) & {\n  test?: RegExp;\n  replace: string;\n};\n\nconst subPatches: SubPatch[] = [\n  { file: '.nvmrc', replace: '<%- version %>\\n' },\n  {\n    files: 'Dockerfile*',\n    test: /^FROM(.*) node:[0-9.]+(\\.[^- \\n]+)?(-[^ \\n]+)?( .+|)$/gm,\n    replace: 'FROM$1 node:<%- version %>$3$4',\n  },\n  {\n    files: 'Dockerfile*',\n    test: /^FROM(.*) gcr.io\\/distroless\\/nodejs\\d+-debian(.+)$/gm,\n    replace: 'FROM$1 gcr.io/distroless/nodejs<%- version %>-debian$2',\n  },\n  {\n    files: 'serverless*.y*ml',\n    test: /nodejs\\d+.x/gm,\n    replace: 'nodejs<%- version %>.x',\n  },\n  {\n    files: 'infra/**/*.ts',\n    test: /NODEJS_\\d+_X/g,\n    replace: 'NODEJS_<%- version %>_X',\n  },\n  {\n    files: '.buildkite/*',\n    test: /image: node:[0-9.]+(\\.[^- \\n]+)?(-[^ \\n]+)?$/gm,\n    replace: 'image: node:<%- version %>$2',\n  },\n];\n\nconst runSubPatch = async (version: number, dir: string, patch: SubPatch) => {\n  const readFile = createDestinationFileReader(dir);\n  const paths = patch.file\n    ? [patch.file]\n    : await glob(patch.files ?? [], { cwd: dir });\n\n  await Promise.all(\n    paths.map(async (path) => {\n      const contents = await readFile(path);\n      if (!contents) {\n        return;\n      }\n\n      if (patch.test && !patch.test.test(contents)) {\n        return;\n      }\n\n      const templated = patch.replace.replaceAll(\n        '<%- version %>',\n        version.toString(),\n      );\n\n      await fs.promises.writeFile(\n        path,\n        patch.test ? contents.replaceAll(patch.test, templated) : templated,\n      );\n    }),\n  );\n};\n\nconst upgrade = async (version: number, dir: string) => {\n  await Promise.all(\n    subPatches.map((subPatch) => runSubPatch(version, dir, subPatch)),\n  );\n};\n\nexport const nodeVersionMigration = async (\n  version: number,\n  dir = process.cwd(),\n) => {\n  log.ok(`Upgrading to Node.js ${version}`);\n  try {\n    await upgrade(version, dir);\n    log.ok('Upgraded to Node.js', version);\n  } catch (err) {\n    log.err('Failed to upgrade');\n    log.subtle(inspect(err));\n    process.exitCode = 1;\n  }\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAwB;AAExB,uBAAqB;AACrB,sBAAe;AAEf,qBAAoB;AACpB,qBAA4C;AAU5C,MAAM,aAAyB;AAAA,EAC7B,EAAE,MAAM,UAAU,SAAS,mBAAmB;AAAA,EAC9C;AAAA,IACE,OAAO;AAAA,IACP,MAAM;AAAA,IACN,SAAS;AAAA,EACX;AAAA,EACA;AAAA,IACE,OAAO;AAAA,IACP,MAAM;AAAA,IACN,SAAS;AAAA,EACX;AAAA,EACA;AAAA,IACE,OAAO;AAAA,IACP,MAAM;AAAA,IACN,SAAS;AAAA,EACX;AAAA,EACA;AAAA,IACE,OAAO;AAAA,IACP,MAAM;AAAA,IACN,SAAS;AAAA,EACX;AAAA,EACA;AAAA,IACE,OAAO;AAAA,IACP,MAAM;AAAA,IACN,SAAS;AAAA,EACX;AACF;AAEA,MAAM,cAAc,OAAO,SAAiB,KAAa,UAAoB;AAC3E,QAAM,eAAW,4CAA4B,GAAG;AAChD,QAAM,QAAQ,MAAM,OAChB,CAAC,MAAM,IAAI,IACX,UAAM,uBAAK,MAAM,SAAS,CAAC,GAAG,EAAE,KAAK,IAAI,CAAC;AAE9C,QAAM,QAAQ;AAAA,IACZ,MAAM,IAAI,OAAO,SAAS;AACxB,YAAM,WAAW,MAAM,SAAS,IAAI;AACpC,UAAI,CAAC,UAAU;AACb;AAAA,MACF;AAEA,UAAI,MAAM,QAAQ,CAAC,MAAM,KAAK,KAAK,QAAQ,GAAG;AAC5C;AAAA,MACF;AAEA,YAAM,YAAY,MAAM,QAAQ;AAAA,QAC9B;AAAA,QACA,QAAQ,SAAS;AAAA,MACnB;AAEA,YAAM,gBAAAA,QAAG,SAAS;AAAA,QAChB;AAAA,QACA,MAAM,OAAO,SAAS,WAAW,MAAM,MAAM,SAAS,IAAI;AAAA,MAC5D;AAAA,IACF,CAAC;AAAA,EACH;AACF;AAEA,MAAM,UAAU,OAAO,SAAiB,QAAgB;AACtD,QAAM,QAAQ;AAAA,IACZ,WAAW,IAAI,CAAC,aAAa,YAAY,SAAS,KAAK,QAAQ,CAAC;AAAA,EAClE;AACF;AAEO,MAAM,uBAAuB,OAClC,SACA,MAAM,QAAQ,IAAI,MACf;AACH,qBAAI,GAAG,wBAAwB,OAAO,EAAE;AACxC,MAAI;AACF,UAAM,QAAQ,SAAS,GAAG;AAC1B,uBAAI,GAAG,uBAAuB,OAAO;AAAA,EACvC,SAAS,KAAK;AACZ,uBAAI,IAAI,mBAAmB;AAC3B,uBAAI,WAAO,qBAAQ,GAAG,CAAC;AACvB,YAAQ,WAAW;AAAA,EACrB;AACF;",
+  "names": ["fs"]
+}

package/lib/cli/node.d.ts

@@ -1 +1,2 @@
+export declare const longRunning = true;
 export declare const node: () => Promise<void | import("execa").ExecaReturnValue<string>>;

package/lib/cli/node.js

@@ -28,6 +28,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var node_exports = {};
 __export(node_exports, {
+  longRunning: () => longRunning,
   node: () => node
 });
 module.exports = __toCommonJS(node_exports);
@@ -37,6 +38,7 @@ var tsNode = __toESM(require("ts-node"));
 var import_args = require("../utils/args");
 var import_exec = require("../utils/exec");
 var import_validation = require("../utils/validation");
+const longRunning = true;
 const node = async () => {
   const args = (0, import_args.parseRunArgs)(process.argv.slice(2));
   const availablePort = await (0, import_get_port.default)();
@@ -72,6 +74,7 @@ const node = async () => {
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  longRunning,
   node
 });
 //# sourceMappingURL=node.js.map

package/lib/cli/node.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/cli/node.ts"],
-  "sourcesContent": ["import path from 'path';\n\nimport getPort from 'get-port';\nimport * as tsNode from 'ts-node';\n\nimport { parseRunArgs } from '../utils/args';\nimport { createExec } from '../utils/exec';\nimport { isIpPort } from '../utils/validation';\n\nexport const node = async () => {\n  const args = parseRunArgs(process.argv.slice(2));\n\n  const availablePort = await getPort();\n\n  if (args.entryPoint) {\n    const exec = createExec({\n      env: {\n        __SKUBA_ENTRY_POINT: args.entryPoint,\n        __SKUBA_PORT: String(isIpPort(args.port) ? args.port : availablePort),\n      },\n    });\n\n    // Run a script with plain `node` to support inspector options.\n    // https://github.com/TypeStrong/ts-node#programmatic\n    return exec(\n      'node',\n      ...args.node,\n      '--require',\n      'dotenv/config',\n      '--require',\n      'tsconfig-paths/register',\n      '--require',\n      'ts-node/register/transpile-only',\n      // Override dangerously warn-only default on Node.js <15 so that we\n      // predictably return a non-zero exit code on an unhandled rejection.\n      '--unhandled-rejections=throw',\n      path.join(__dirname, '..', 'wrapper'),\n      ...args.script,\n    );\n  }\n\n  // REPL with `ts-node` to support import statements.\n  return tsNode\n    .createRepl({\n      service: tsNode.register({\n        require: ['dotenv/config', 'tsconfig-paths/register'],\n        transpileOnly: true,\n      }),\n    })\n    .start();\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AAEjB,sBAAoB;AACpB,aAAwB;AAExB,kBAA6B;AAC7B,kBAA2B;AAC3B,wBAAyB;AAElB,MAAM,OAAO,YAAY;AAC9B,QAAM,WAAO,0BAAa,QAAQ,KAAK,MAAM,CAAC,CAAC;AAE/C,QAAM,gBAAgB,UAAM,gBAAAA,SAAQ;AAEpC,MAAI,KAAK,YAAY;AACnB,UAAM,WAAO,wBAAW;AAAA,MACtB,KAAK;AAAA,QACH,qBAAqB,KAAK;AAAA,QAC1B,cAAc,WAAO,4BAAS,KAAK,IAAI,IAAI,KAAK,OAAO,aAAa;AAAA,MACtE;AAAA,IACF,CAAC;AAID,WAAO;AAAA,MACL;AAAA,MACA,GAAG,KAAK;AAAA,MACR;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA;AAAA;AAAA,MAGA;AAAA,MACA,YAAAC,QAAK,KAAK,WAAW,MAAM,SAAS;AAAA,MACpC,GAAG,KAAK;AAAA,IACV;AAAA,EACF;AAGA,SAAO,OACJ,WAAW;AAAA,IACV,SAAS,OAAO,SAAS;AAAA,MACvB,SAAS,CAAC,iBAAiB,yBAAyB;AAAA,MACpD,eAAe;AAAA,IACjB,CAAC;AAAA,EACH,CAAC,EACA,MAAM;AACX;",
+  "sourcesContent": ["import path from 'path';\n\nimport getPort from 'get-port';\nimport * as tsNode from 'ts-node';\n\nimport { parseRunArgs } from '../utils/args';\nimport { createExec } from '../utils/exec';\nimport { isIpPort } from '../utils/validation';\n\nexport const longRunning = true;\n\nexport const node = async () => {\n  const args = parseRunArgs(process.argv.slice(2));\n\n  const availablePort = await getPort();\n\n  if (args.entryPoint) {\n    const exec = createExec({\n      env: {\n        __SKUBA_ENTRY_POINT: args.entryPoint,\n        __SKUBA_PORT: String(isIpPort(args.port) ? args.port : availablePort),\n      },\n    });\n\n    // Run a script with plain `node` to support inspector options.\n    // https://github.com/TypeStrong/ts-node#programmatic\n    return exec(\n      'node',\n      ...args.node,\n      '--require',\n      'dotenv/config',\n      '--require',\n      'tsconfig-paths/register',\n      '--require',\n      'ts-node/register/transpile-only',\n      // Override dangerously warn-only default on Node.js <15 so that we\n      // predictably return a non-zero exit code on an unhandled rejection.\n      '--unhandled-rejections=throw',\n      path.join(__dirname, '..', 'wrapper'),\n      ...args.script,\n    );\n  }\n\n  // REPL with `ts-node` to support import statements.\n  return tsNode\n    .createRepl({\n      service: tsNode.register({\n        require: ['dotenv/config', 'tsconfig-paths/register'],\n        transpileOnly: true,\n      }),\n    })\n    .start();\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AAEjB,sBAAoB;AACpB,aAAwB;AAExB,kBAA6B;AAC7B,kBAA2B;AAC3B,wBAAyB;AAElB,MAAM,cAAc;AAEpB,MAAM,OAAO,YAAY;AAC9B,QAAM,WAAO,0BAAa,QAAQ,KAAK,MAAM,CAAC,CAAC;AAE/C,QAAM,gBAAgB,UAAM,gBAAAA,SAAQ;AAEpC,MAAI,KAAK,YAAY;AACnB,UAAM,WAAO,wBAAW;AAAA,MACtB,KAAK;AAAA,QACH,qBAAqB,KAAK;AAAA,QAC1B,cAAc,WAAO,4BAAS,KAAK,IAAI,IAAI,KAAK,OAAO,aAAa;AAAA,MACtE;AAAA,IACF,CAAC;AAID,WAAO;AAAA,MACL;AAAA,MACA,GAAG,KAAK;AAAA,MACR;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA;AAAA;AAAA,MAGA;AAAA,MACA,YAAAC,QAAK,KAAK,WAAW,MAAM,SAAS;AAAA,MACpC,GAAG,KAAK;AAAA,IACV;AAAA,EACF;AAGA,SAAO,OACJ,WAAW;AAAA,IACV,SAAS,OAAO,SAAS;AAAA,MACvB,SAAS,CAAC,iBAAiB,yBAAyB;AAAA,MACpD,eAAe;AAAA,IACjB,CAAC;AAAA,EACH,CAAC,EACA,MAAM;AACX;",
   "names": ["getPort", "path"]
 }

package/lib/skuba.d.ts

@@ -1,2 +1,11 @@
 #!/usr/bin/env node
+/**
+ * Entry point for the CLI.
+ *
+ * This is where you end up when you run:
+ *
+ * ```bash
+ * [pnpm|yarn] skuba help
+ * ```
+ */
 export {};

package/lib/skuba.js

@@ -22,7 +22,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));
-var import_why_is_node_running = __toESM(require("why-is-node-running"));
 var import_path = __toESM(require("path"));
 var import_args = require("./utils/args");
 var import_command = require("./utils/command");
@@ -44,6 +43,9 @@ const skuba = async () => {
       return;
     }
     const run = commandModule[moduleName];
+    if (commandModule.longRunning) {
+      return run();
+    }
     if (!(0, import_env.isCiEnv)() || process.env.SKUBA_NO_TIMEOUT === "true") {
       return run();
     }
@@ -53,7 +55,6 @@ const skuba = async () => {
           import_logging.log.bold(commandName),
           "timed out. This may indicate a process hanging - please file an issue."
         );
-        (0, import_why_is_node_running.default)();
         process.exit(1);
       },
       process.env.SKUBA_TIMEOUT_MS ? parseInt(process.env.SKUBA_TIMEOUT_MS, 10) : THIRTY_MINUTES

package/lib/skuba.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../src/skuba.ts"],
-  "sourcesContent": ["#!/usr/bin/env node\n\n// @ts-expect-error - no types\nimport whyIsNodeRunning from 'why-is-node-running';\n\n/**\n * Entry point for the CLI.\n *\n * This is where you end up when you run:\n *\n * ```bash\n * [pnpm|yarn] skuba help\n * ```\n */\n\n// eslint-disable-next-line import/order -- why-is-node-running must be imported before anything else\nimport path from 'path';\n\nimport { parseProcessArgs } from './utils/args';\nimport {\n  COMMAND_DIR,\n  COMMAND_SET,\n  type Command,\n  commandToModule,\n} from './utils/command';\nimport { isCiEnv } from './utils/env';\nimport { handleCliError } from './utils/error';\nimport { showHelp } from './utils/help';\nimport { log } from './utils/logging';\nimport { showLogoAndVersionInfo } from './utils/logo';\nimport { hasProp } from './utils/validation';\n\nconst THIRTY_MINUTES = 30 * 60 * 1000;\n\nconst skuba = async () => {\n  const { commandName } = parseProcessArgs(process.argv);\n\n  if (COMMAND_SET.has(commandName)) {\n    const moduleName = commandToModule(commandName as Command);\n\n    /* eslint-disable @typescript-eslint/no-var-requires */\n    const commandModule = require(\n      path.join(COMMAND_DIR, moduleName),\n    ) as unknown;\n\n    if (!hasProp(commandModule, moduleName)) {\n      log.err(log.bold(commandName), \"couldn't run! Please submit an issue.\");\n      process.exitCode = 1;\n      return;\n    }\n\n    const run = commandModule[moduleName] as () => Promise<unknown>;\n\n    // If we're not in a CI environment, we don't need to worry about timeouts, which are primarily to prevent\n    // builds running \"forever\" in CI without our knowledge.\n    // Local commands may run for a long time, e.g. `skuba node` and `skuba start`, which are unlikely to be used in CI.\n    if (!isCiEnv() || process.env.SKUBA_NO_TIMEOUT === 'true') {\n      return run();\n    }\n\n    const timeoutId = setTimeout(\n      () => {\n        log.err(\n          log.bold(commandName),\n          'timed out. This may indicate a process hanging - please file an issue.',\n        );\n        // eslint-disable-next-line @typescript-eslint/no-unsafe-call\n        whyIsNodeRunning();\n        // Need to force exit because promises may be hanging so node won't exit on its own.\n        process.exit(1);\n      },\n      process.env.SKUBA_TIMEOUT_MS\n        ? parseInt(process.env.SKUBA_TIMEOUT_MS, 10)\n        : THIRTY_MINUTES,\n    );\n\n    return run().finally(() => clearTimeout(timeoutId));\n  }\n\n  log.err(log.bold(commandName), 'is not recognised as a command.');\n  await showLogoAndVersionInfo();\n  showHelp();\n\n  process.exitCode = 1;\n  return;\n};\n\nskuba().catch(handleCliError);\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;AAGA,iCAA6B;AAa7B,kBAAiB;AAEjB,kBAAiC;AACjC,qBAKO;AACP,iBAAwB;AACxB,mBAA+B;AAC/B,kBAAyB;AACzB,qBAAoB;AACpB,kBAAuC;AACvC,wBAAwB;AAExB,MAAM,iBAAiB,KAAK,KAAK;AAEjC,MAAM,QAAQ,YAAY;AACxB,QAAM,EAAE,YAAY,QAAI,8BAAiB,QAAQ,IAAI;AAErD,MAAI,2BAAY,IAAI,WAAW,GAAG;AAChC,UAAM,iBAAa,gCAAgB,WAAsB;AAGzD,UAAM,gBAAgB,QACpB,YAAAA,QAAK,KAAK,4BAAa,UAAU,CACnC;AAEA,QAAI,KAAC,2BAAQ,eAAe,UAAU,GAAG;AACvC,yBAAI,IAAI,mBAAI,KAAK,WAAW,GAAG,uCAAuC;AACtE,cAAQ,WAAW;AACnB;AAAA,IACF;AAEA,UAAM,MAAM,cAAc,UAAU;AAKpC,QAAI,KAAC,oBAAQ,KAAK,QAAQ,IAAI,qBAAqB,QAAQ;AACzD,aAAO,IAAI;AAAA,IACb;AAEA,UAAM,YAAY;AAAA,MAChB,MAAM;AACJ,2BAAI;AAAA,UACF,mBAAI,KAAK,WAAW;AAAA,UACpB;AAAA,QACF;AAEA,uCAAAC,SAAiB;AAEjB,gBAAQ,KAAK,CAAC;AAAA,MAChB;AAAA,MACA,QAAQ,IAAI,mBACR,SAAS,QAAQ,IAAI,kBAAkB,EAAE,IACzC;AAAA,IACN;AAEA,WAAO,IAAI,EAAE,QAAQ,MAAM,aAAa,SAAS,CAAC;AAAA,EACpD;AAEA,qBAAI,IAAI,mBAAI,KAAK,WAAW,GAAG,iCAAiC;AAChE,YAAM,oCAAuB;AAC7B,4BAAS;AAET,UAAQ,WAAW;AACnB;AACF;AAEA,MAAM,EAAE,MAAM,2BAAc;",
-  "names": ["path", "whyIsNodeRunning"]
+  "sourcesContent": ["#!/usr/bin/env node\n\n/**\n * Entry point for the CLI.\n *\n * This is where you end up when you run:\n *\n * ```bash\n * [pnpm|yarn] skuba help\n * ```\n */\n\nimport path from 'path';\n\nimport { parseProcessArgs } from './utils/args';\nimport {\n  COMMAND_DIR,\n  COMMAND_SET,\n  type Command,\n  commandToModule,\n} from './utils/command';\nimport { isCiEnv } from './utils/env';\nimport { handleCliError } from './utils/error';\nimport { showHelp } from './utils/help';\nimport { log } from './utils/logging';\nimport { showLogoAndVersionInfo } from './utils/logo';\nimport { hasProp } from './utils/validation';\n\nconst THIRTY_MINUTES = 30 * 60 * 1000;\n\nconst skuba = async () => {\n  const { commandName } = parseProcessArgs(process.argv);\n\n  if (COMMAND_SET.has(commandName)) {\n    const moduleName = commandToModule(commandName as Command);\n\n    /* eslint-disable @typescript-eslint/no-var-requires */\n    const commandModule = require(\n      path.join(COMMAND_DIR, moduleName),\n    ) as unknown;\n\n    if (!hasProp(commandModule, moduleName)) {\n      log.err(log.bold(commandName), \"couldn't run! Please submit an issue.\");\n      process.exitCode = 1;\n      return;\n    }\n\n    const run = commandModule[moduleName] as () => Promise<unknown>;\n\n    if (commandModule.longRunning) {\n      // This is a long-running command, so we don't want to impose a timeout.\n      return run();\n    }\n\n    // If we're not in a CI environment, we don't need to worry about timeouts, which are primarily to prevent\n    // builds running \"forever\" in CI without our knowledge.\n    // Local commands may run for a long time, e.g. `skuba start` or `skuba test --watch`, which are unlikely to be used in CI.\n    if (!isCiEnv() || process.env.SKUBA_NO_TIMEOUT === 'true') {\n      return run();\n    }\n\n    const timeoutId = setTimeout(\n      () => {\n        log.err(\n          log.bold(commandName),\n          'timed out. This may indicate a process hanging - please file an issue.',\n        );\n\n        // Need to force exit because promises may be hanging so node won't exit on its own.\n        process.exit(1);\n      },\n      process.env.SKUBA_TIMEOUT_MS\n        ? parseInt(process.env.SKUBA_TIMEOUT_MS, 10)\n        : THIRTY_MINUTES,\n    );\n\n    return run().finally(() => clearTimeout(timeoutId));\n  }\n\n  log.err(log.bold(commandName), 'is not recognised as a command.');\n  await showLogoAndVersionInfo();\n  showHelp();\n\n  process.exitCode = 1;\n  return;\n};\n\nskuba().catch(handleCliError);\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;AAYA,kBAAiB;AAEjB,kBAAiC;AACjC,qBAKO;AACP,iBAAwB;AACxB,mBAA+B;AAC/B,kBAAyB;AACzB,qBAAoB;AACpB,kBAAuC;AACvC,wBAAwB;AAExB,MAAM,iBAAiB,KAAK,KAAK;AAEjC,MAAM,QAAQ,YAAY;AACxB,QAAM,EAAE,YAAY,QAAI,8BAAiB,QAAQ,IAAI;AAErD,MAAI,2BAAY,IAAI,WAAW,GAAG;AAChC,UAAM,iBAAa,gCAAgB,WAAsB;AAGzD,UAAM,gBAAgB,QACpB,YAAAA,QAAK,KAAK,4BAAa,UAAU,CACnC;AAEA,QAAI,KAAC,2BAAQ,eAAe,UAAU,GAAG;AACvC,yBAAI,IAAI,mBAAI,KAAK,WAAW,GAAG,uCAAuC;AACtE,cAAQ,WAAW;AACnB;AAAA,IACF;AAEA,UAAM,MAAM,cAAc,UAAU;AAEpC,QAAI,cAAc,aAAa;AAE7B,aAAO,IAAI;AAAA,IACb;AAKA,QAAI,KAAC,oBAAQ,KAAK,QAAQ,IAAI,qBAAqB,QAAQ;AACzD,aAAO,IAAI;AAAA,IACb;AAEA,UAAM,YAAY;AAAA,MAChB,MAAM;AACJ,2BAAI;AAAA,UACF,mBAAI,KAAK,WAAW;AAAA,UACpB;AAAA,QACF;AAGA,gBAAQ,KAAK,CAAC;AAAA,MAChB;AAAA,MACA,QAAQ,IAAI,mBACR,SAAS,QAAQ,IAAI,kBAAkB,EAAE,IACzC;AAAA,IACN;AAEA,WAAO,IAAI,EAAE,QAAQ,MAAM,aAAa,SAAS,CAAC;AAAA,EACpD;AAEA,qBAAI,IAAI,mBAAI,KAAK,WAAW,GAAG,iCAAiC;AAChE,YAAM,oCAAuB;AAC7B,4BAAS;AAET,UAAQ,WAAW;AACnB;AACF;AAEA,MAAM,EAAE,MAAM,2BAAc;",
+  "names": ["path"]
 }

package/lib/utils/command.d.ts

@@ -1,6 +1,6 @@
 export type Command = (typeof COMMAND_LIST)[number];
 export declare const COMMAND_ALIASES: Record<string, Command>;
 export declare const COMMAND_DIR: string;
-export declare const COMMAND_LIST: readonly ["build", "build-package", "configure", "format", "help", "init", "lint", "node", "release", "start", "test", "version"];
+export declare const COMMAND_LIST: readonly ["build", "build-package", "configure", "format", "help", "init", "lint", "migrate", "node", "release", "start", "test", "version"];
 export declare const COMMAND_SET: Set<string>;
 export declare const commandToModule: (command: Command) => string;

package/lib/utils/command.js

@@ -51,6 +51,7 @@ const COMMAND_LIST = [
   "help",
   "init",
   "lint",
+  "migrate",
   "node",
   "release",
   "start",

package/lib/utils/command.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/utils/command.ts"],
-  "sourcesContent": ["import path from 'path';\n\nexport type Command = (typeof COMMAND_LIST)[number];\n\nexport const COMMAND_ALIASES: Record<string, Command> = {\n  '-h': 'help',\n  '--help': 'help',\n  '-v': 'version',\n  '--version': 'version',\n};\n\nexport const COMMAND_DIR = path.join(__dirname, '..', 'cli');\n\nexport const COMMAND_LIST = [\n  'build',\n  'build-package',\n  'configure',\n  'format',\n  'help',\n  'init',\n  'lint',\n  'node',\n  'release',\n  'start',\n  'test',\n  'version',\n] as const;\n\nexport const COMMAND_SET = new Set<string>(COMMAND_LIST);\n\nexport const commandToModule = (command: Command): string =>\n  command\n    .split('-')\n    .map((segment, index) =>\n      index === 0\n        ? segment\n        : `${(segment[0] ?? '').toLocaleUpperCase()}${segment.slice(1)}`,\n    )\n    .join('');\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AAIV,MAAM,kBAA2C;AAAA,EACtD,MAAM;AAAA,EACN,UAAU;AAAA,EACV,MAAM;AAAA,EACN,aAAa;AACf;AAEO,MAAM,cAAc,YAAAA,QAAK,KAAK,WAAW,MAAM,KAAK;AAEpD,MAAM,eAAe;AAAA,EAC1B;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF;AAEO,MAAM,cAAc,IAAI,IAAY,YAAY;AAEhD,MAAM,kBAAkB,CAAC,YAC9B,QACG,MAAM,GAAG,EACT;AAAA,EAAI,CAAC,SAAS,UACb,UAAU,IACN,UACA,IAAI,QAAQ,CAAC,KAAK,IAAI,kBAAkB,CAAC,GAAG,QAAQ,MAAM,CAAC,CAAC;AAClE,EACC,KAAK,EAAE;",
+  "sourcesContent": ["import path from 'path';\n\nexport type Command = (typeof COMMAND_LIST)[number];\n\nexport const COMMAND_ALIASES: Record<string, Command> = {\n  '-h': 'help',\n  '--help': 'help',\n  '-v': 'version',\n  '--version': 'version',\n};\n\nexport const COMMAND_DIR = path.join(__dirname, '..', 'cli');\n\nexport const COMMAND_LIST = [\n  'build',\n  'build-package',\n  'configure',\n  'format',\n  'help',\n  'init',\n  'lint',\n  'migrate',\n  'node',\n  'release',\n  'start',\n  'test',\n  'version',\n] as const;\n\nexport const COMMAND_SET = new Set<string>(COMMAND_LIST);\n\nexport const commandToModule = (command: Command): string =>\n  command\n    .split('-')\n    .map((segment, index) =>\n      index === 0\n        ? segment\n        : `${(segment[0] ?? '').toLocaleUpperCase()}${segment.slice(1)}`,\n    )\n    .join('');\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AAIV,MAAM,kBAA2C;AAAA,EACtD,MAAM;AAAA,EACN,UAAU;AAAA,EACV,MAAM;AAAA,EACN,aAAa;AACf;AAEO,MAAM,cAAc,YAAAA,QAAK,KAAK,WAAW,MAAM,KAAK;AAEpD,MAAM,eAAe;AAAA,EAC1B;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF;AAEO,MAAM,cAAc,IAAI,IAAY,YAAY;AAEhD,MAAM,kBAAkB,CAAC,YAC9B,QACG,MAAM,GAAG,EACT;AAAA,EAAI,CAAC,SAAS,UACb,UAAU,IACN,UACA,IAAI,QAAQ,CAAC,KAAK,IAAI,kBAAkB,CAAC,GAAG,QAAQ,MAAM,CAAC,CAAC;AAClE,EACC,KAAK,EAAE;",
   "names": ["path"]
 }

package/lib/utils/dir.js

@@ -34,7 +34,6 @@ __export(dir_exports, {
 });
 module.exports = __toCommonJS(dir_exports);
 var import_path = __toESM(require("path"));
-var import_fdir = require("fdir");
 var import_fs_extra = __toESM(require("fs-extra"));
 var import_ignore = __toESM(require("ignore"));
 var import_picomatch = __toESM(require("picomatch"));
@@ -50,17 +49,10 @@ const crawlDirectory = async (root, ignoreFilenames = [".gitignore"]) => {
   const ignoreFileFilter = await createInclusionFilter(
     ignoreFilenames.map((ignoreFilename) => import_path.default.join(root, ignoreFilename))
   );
-  const output = await new import_fdir.fdir().crawlWithOptions(root, {
-    exclude: (dirname) => [".git", "node_modules"].includes(dirname),
-    filters: [
-      (pathname) => {
-        const relativePathname = import_path.default.relative(root, pathname);
-        return ignoreFileFilter(relativePathname);
-      }
-    ],
-    includeBasePath: true
-  }).withPromise();
-  const absoluteFilenames = output;
+  const absoluteFilenames = await crawl(root, {
+    includeDirName: (dirname) => ![".git", "node_modules"].includes(dirname),
+    includeFilePath: (pathname) => ignoreFileFilter(import_path.default.relative(root, pathname))
+  });
   const relativeFilepaths = absoluteFilenames.map(
     (filepath) => import_path.default.relative(root, filepath)
   );
@@ -82,6 +74,26 @@ const createInclusionFilter = async (ignoreFilepaths) => {
   const managers = ignoreFiles.filter((value) => typeof value === "string").map((value) => (0, import_ignore.default)().add(value));
   return (0, import_ignore.default)().add(".git").add(managers).createFilter();
 };
+async function crawl(directoryPath, filters, paths = []) {
+  try {
+    const entries = await import_fs_extra.default.promises.readdir(directoryPath, {
+      withFileTypes: true
+    });
+    await Promise.all(
+      entries.map(async (entry) => {
+        const fullPath = import_path.default.join(directoryPath, entry.name);
+        if ((entry.isFile() || entry.isSymbolicLink()) && filters.includeFilePath(fullPath)) {
+          paths.push(fullPath);
+        }
+        if (entry.isDirectory() && filters.includeDirName(entry.name)) {
+          await crawl(fullPath, filters, paths);
+        }
+      })
+    );
+  } catch {
+  }
+  return paths;
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   buildPatternToFilepathMap,

package/lib/utils/dir.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/utils/dir.ts"],
-  "sourcesContent": ["import path from 'path';\n\nimport { fdir as FDir } from 'fdir';\nimport fs from 'fs-extra';\nimport ignore from 'ignore';\nimport picomatch from 'picomatch';\n\nimport { isErrorWithCode } from './error';\n\n/**\n * Build a map that associates each glob pattern with its matching filepaths.\n */\nexport const buildPatternToFilepathMap = (\n  patterns: string[],\n  allFilepaths: string[],\n  options?: picomatch.PicomatchOptions,\n) =>\n  Object.fromEntries(\n    patterns.map((pattern) => {\n      const isMatch = picomatch(pattern, options);\n\n      const filepaths = allFilepaths.filter((filepath) => isMatch(filepath));\n\n      return [pattern, filepaths] as const;\n    }),\n  );\n\n/**\n * List relative filepaths contained within a directory root.\n *\n * This excludes:\n *\n * - Patterns in the ignore files specified in `ignoreFilenames`\n * - `.git` subdirectories\n * - `node_modules` subdirectories\n */\nexport const crawlDirectory = async (\n  root: string,\n  ignoreFilenames = ['.gitignore'],\n) => {\n  const ignoreFileFilter = await createInclusionFilter(\n    ignoreFilenames.map((ignoreFilename) => path.join(root, ignoreFilename)),\n  );\n\n  const output = await new FDir()\n    .crawlWithOptions(root, {\n      exclude: (dirname) => ['.git', 'node_modules'].includes(dirname),\n      filters: [\n        (pathname) => {\n          const relativePathname = path.relative(root, pathname);\n\n          return ignoreFileFilter(relativePathname);\n        },\n      ],\n      includeBasePath: true,\n    })\n    .withPromise();\n\n  // Patch over non-specific `fdir` typings.\n  const absoluteFilenames = output as string[];\n\n  const relativeFilepaths = absoluteFilenames.map((filepath) =>\n    path.relative(root, filepath),\n  );\n\n  return relativeFilepaths;\n};\n\n/**\n * Create a filter function that excludes filepaths based on ignore files like\n * `.gitignore` and `.prettierignore`.\n */\nexport const createInclusionFilter = async (ignoreFilepaths: string[]) => {\n  const ignoreFiles = await Promise.all(\n    ignoreFilepaths.map(async (ignoreFilepath) => {\n      try {\n        return await fs.promises.readFile(ignoreFilepath, 'utf8');\n      } catch (err) {\n        if (isErrorWithCode(err, 'ENOENT')) {\n          return;\n        }\n\n        throw err;\n      }\n    }),\n  );\n\n  const managers = ignoreFiles\n    .filter((value): value is string => typeof value === 'string')\n    .map((value) => ignore().add(value));\n\n  return ignore().add('.git').add(managers).createFilter();\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AAEjB,kBAA6B;AAC7B,sBAAe;AACf,oBAAmB;AACnB,uBAAsB;AAEtB,mBAAgC;AAKzB,MAAM,4BAA4B,CACvC,UACA,cACA,YAEA,OAAO;AAAA,EACL,SAAS,IAAI,CAAC,YAAY;AACxB,UAAM,cAAU,iBAAAA,SAAU,SAAS,OAAO;AAE1C,UAAM,YAAY,aAAa,OAAO,CAAC,aAAa,QAAQ,QAAQ,CAAC;AAErE,WAAO,CAAC,SAAS,SAAS;AAAA,EAC5B,CAAC;AACH;AAWK,MAAM,iBAAiB,OAC5B,MACA,kBAAkB,CAAC,YAAY,MAC5B;AACH,QAAM,mBAAmB,MAAM;AAAA,IAC7B,gBAAgB,IAAI,CAAC,mBAAmB,YAAAC,QAAK,KAAK,MAAM,cAAc,CAAC;AAAA,EACzE;AAEA,QAAM,SAAS,MAAM,IAAI,YAAAC,KAAK,EAC3B,iBAAiB,MAAM;AAAA,IACtB,SAAS,CAAC,YAAY,CAAC,QAAQ,cAAc,EAAE,SAAS,OAAO;AAAA,IAC/D,SAAS;AAAA,MACP,CAAC,aAAa;AACZ,cAAM,mBAAmB,YAAAD,QAAK,SAAS,MAAM,QAAQ;AAErD,eAAO,iBAAiB,gBAAgB;AAAA,MAC1C;AAAA,IACF;AAAA,IACA,iBAAiB;AAAA,EACnB,CAAC,EACA,YAAY;AAGf,QAAM,oBAAoB;AAE1B,QAAM,oBAAoB,kBAAkB;AAAA,IAAI,CAAC,aAC/C,YAAAA,QAAK,SAAS,MAAM,QAAQ;AAAA,EAC9B;AAEA,SAAO;AACT;AAMO,MAAM,wBAAwB,OAAO,oBAA8B;AACxE,QAAM,cAAc,MAAM,QAAQ;AAAA,IAChC,gBAAgB,IAAI,OAAO,mBAAmB;AAC5C,UAAI;AACF,eAAO,MAAM,gBAAAE,QAAG,SAAS,SAAS,gBAAgB,MAAM;AAAA,MAC1D,SAAS,KAAK;AACZ,gBAAI,8BAAgB,KAAK,QAAQ,GAAG;AAClC;AAAA,QACF;AAEA,cAAM;AAAA,MACR;AAAA,IACF,CAAC;AAAA,EACH;AAEA,QAAM,WAAW,YACd,OAAO,CAAC,UAA2B,OAAO,UAAU,QAAQ,EAC5D,IAAI,CAAC,cAAU,cAAAC,SAAO,EAAE,IAAI,KAAK,CAAC;AAErC,aAAO,cAAAA,SAAO,EAAE,IAAI,MAAM,EAAE,IAAI,QAAQ,EAAE,aAAa;AACzD;",
-  "names": ["picomatch", "path", "FDir", "fs", "ignore"]
+  "sourcesContent": ["import path from 'path';\n\nimport fs from 'fs-extra';\nimport ignore from 'ignore';\nimport picomatch from 'picomatch';\n\nimport { isErrorWithCode } from './error';\n\n/**\n * Build a map that associates each glob pattern with its matching filepaths.\n */\nexport const buildPatternToFilepathMap = (\n  patterns: string[],\n  allFilepaths: string[],\n  options?: picomatch.PicomatchOptions,\n) =>\n  Object.fromEntries(\n    patterns.map((pattern) => {\n      const isMatch = picomatch(pattern, options);\n\n      const filepaths = allFilepaths.filter((filepath) => isMatch(filepath));\n\n      return [pattern, filepaths] as const;\n    }),\n  );\n\n/**\n * List relative filepaths contained within a directory root.\n *\n * This excludes:\n *\n * - Patterns in the ignore files specified in `ignoreFilenames`\n * - `.git` subdirectories\n * - `node_modules` subdirectories\n */\nexport const crawlDirectory = async (\n  root: string,\n  ignoreFilenames = ['.gitignore'],\n) => {\n  const ignoreFileFilter = await createInclusionFilter(\n    ignoreFilenames.map((ignoreFilename) => path.join(root, ignoreFilename)),\n  );\n\n  const absoluteFilenames = await crawl(root, {\n    includeDirName: (dirname) => !['.git', 'node_modules'].includes(dirname),\n    includeFilePath: (pathname) =>\n      ignoreFileFilter(path.relative(root, pathname)),\n  });\n\n  const relativeFilepaths = absoluteFilenames.map((filepath) =>\n    path.relative(root, filepath),\n  );\n\n  return relativeFilepaths;\n};\n\n/**\n * Create a filter function that excludes filepaths based on ignore files like\n * `.gitignore` and `.prettierignore`.\n */\nexport const createInclusionFilter = async (ignoreFilepaths: string[]) => {\n  const ignoreFiles = await Promise.all(\n    ignoreFilepaths.map(async (ignoreFilepath) => {\n      try {\n        return await fs.promises.readFile(ignoreFilepath, 'utf8');\n      } catch (err) {\n        if (isErrorWithCode(err, 'ENOENT')) {\n          return;\n        }\n\n        throw err;\n      }\n    }),\n  );\n\n  const managers = ignoreFiles\n    .filter((value): value is string => typeof value === 'string')\n    .map((value) => ignore().add(value));\n\n  return ignore().add('.git').add(managers).createFilter();\n};\n\n/**\n * Recursively crawl a directory and return all file paths that match the\n * filters. `paths` is mutated and returned.\n */\nasync function crawl(\n  directoryPath: string,\n  filters: {\n    includeDirName: (dirName: string) => boolean;\n    includeFilePath: (path: string) => boolean;\n  },\n  paths: string[] = [],\n) {\n  try {\n    const entries = await fs.promises.readdir(directoryPath, {\n      withFileTypes: true,\n    });\n\n    await Promise.all(\n      entries.map(async (entry) => {\n        const fullPath = path.join(directoryPath, entry.name);\n\n        if (\n          (entry.isFile() || entry.isSymbolicLink()) &&\n          filters.includeFilePath(fullPath)\n        ) {\n          paths.push(fullPath);\n        }\n\n        if (entry.isDirectory() && filters.includeDirName(entry.name)) {\n          await crawl(fullPath, filters, paths);\n        }\n      }),\n    );\n  } catch {\n    // Ignore errors, because of e.g. permission issues reading directories\n  }\n\n  return paths;\n}\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AAEjB,sBAAe;AACf,oBAAmB;AACnB,uBAAsB;AAEtB,mBAAgC;AAKzB,MAAM,4BAA4B,CACvC,UACA,cACA,YAEA,OAAO;AAAA,EACL,SAAS,IAAI,CAAC,YAAY;AACxB,UAAM,cAAU,iBAAAA,SAAU,SAAS,OAAO;AAE1C,UAAM,YAAY,aAAa,OAAO,CAAC,aAAa,QAAQ,QAAQ,CAAC;AAErE,WAAO,CAAC,SAAS,SAAS;AAAA,EAC5B,CAAC;AACH;AAWK,MAAM,iBAAiB,OAC5B,MACA,kBAAkB,CAAC,YAAY,MAC5B;AACH,QAAM,mBAAmB,MAAM;AAAA,IAC7B,gBAAgB,IAAI,CAAC,mBAAmB,YAAAC,QAAK,KAAK,MAAM,cAAc,CAAC;AAAA,EACzE;AAEA,QAAM,oBAAoB,MAAM,MAAM,MAAM;AAAA,IAC1C,gBAAgB,CAAC,YAAY,CAAC,CAAC,QAAQ,cAAc,EAAE,SAAS,OAAO;AAAA,IACvE,iBAAiB,CAAC,aAChB,iBAAiB,YAAAA,QAAK,SAAS,MAAM,QAAQ,CAAC;AAAA,EAClD,CAAC;AAED,QAAM,oBAAoB,kBAAkB;AAAA,IAAI,CAAC,aAC/C,YAAAA,QAAK,SAAS,MAAM,QAAQ;AAAA,EAC9B;AAEA,SAAO;AACT;AAMO,MAAM,wBAAwB,OAAO,oBAA8B;AACxE,QAAM,cAAc,MAAM,QAAQ;AAAA,IAChC,gBAAgB,IAAI,OAAO,mBAAmB;AAC5C,UAAI;AACF,eAAO,MAAM,gBAAAC,QAAG,SAAS,SAAS,gBAAgB,MAAM;AAAA,MAC1D,SAAS,KAAK;AACZ,gBAAI,8BAAgB,KAAK,QAAQ,GAAG;AAClC;AAAA,QACF;AAEA,cAAM;AAAA,MACR;AAAA,IACF,CAAC;AAAA,EACH;AAEA,QAAM,WAAW,YACd,OAAO,CAAC,UAA2B,OAAO,UAAU,QAAQ,EAC5D,IAAI,CAAC,cAAU,cAAAC,SAAO,EAAE,IAAI,KAAK,CAAC;AAErC,aAAO,cAAAA,SAAO,EAAE,IAAI,MAAM,EAAE,IAAI,QAAQ,EAAE,aAAa;AACzD;AAMA,eAAe,MACb,eACA,SAIA,QAAkB,CAAC,GACnB;AACA,MAAI;AACF,UAAM,UAAU,MAAM,gBAAAD,QAAG,SAAS,QAAQ,eAAe;AAAA,MACvD,eAAe;AAAA,IACjB,CAAC;AAED,UAAM,QAAQ;AAAA,MACZ,QAAQ,IAAI,OAAO,UAAU;AAC3B,cAAM,WAAW,YAAAD,QAAK,KAAK,eAAe,MAAM,IAAI;AAEpD,aACG,MAAM,OAAO,KAAK,MAAM,eAAe,MACxC,QAAQ,gBAAgB,QAAQ,GAChC;AACA,gBAAM,KAAK,QAAQ;AAAA,QACrB;AAEA,YAAI,MAAM,YAAY,KAAK,QAAQ,eAAe,MAAM,IAAI,GAAG;AAC7D,gBAAM,MAAM,UAAU,SAAS,KAAK;AAAA,QACtC;AAAA,MACF,CAAC;AAAA,IACH;AAAA,EACF,QAAQ;AAAA,EAER;AAEA,SAAO;AACT;",
+  "names": ["picomatch", "path", "fs", "ignore"]
 }

package/lib/why-is-node-running.d.js

@@ -0,0 +1,2 @@
+"use strict";
+//# sourceMappingURL=why-is-node-running.d.js.map

package/lib/why-is-node-running.d.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": [],
+  "sourcesContent": [],
+  "mappings": "",
+  "names": []
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skuba",
-  "version": "7.5.0-timeout-20240210035306",
+  "version": "7.5.1",
   "private": false,
   "description": "SEEK development toolkit for backend applications and packages",
   "homepage": "https://github.com/seek-oss/skuba#readme",
@@ -52,8 +52,8 @@
   "dependencies": {
     "@esbuild-plugins/tsconfig-paths": "^0.1.0",
     "@jest/types": "^29.0.0",
-    "@octokit/graphql": "^7.0.0",
-    "@octokit/graphql-schema": "^14.5.0",
+    "@octokit/graphql": "^8.0.0",
+    "@octokit/graphql-schema": "^15.3.0",
     "@octokit/rest": "^20.0.0",
     "@octokit/types": "^12.0.0",
     "@types/jest": "^29.0.0",
@@ -68,7 +68,7 @@
     "eslint": "^8.11.0",
     "eslint-config-skuba": "3.1.0",
     "execa": "^5.0.0",
-    "fdir": "^6.0.0",
+    "fast-glob": "^3.3.2",
     "fs-extra": "^11.0.0",
     "function-arguments": "^1.0.9",
     "get-port": "^5.1.1",
@@ -84,7 +84,7 @@
     "normalize-package-data": "^6.0.0",
     "npm-run-path": "^4.0.1",
     "npm-which": "^3.0.1",
-    "picomatch": "^3.0.0",
+    "picomatch": "^4.0.0",
     "prettier": "~3.2.5",
     "prettier-plugin-packagejson": "^2.4.10",
     "read-pkg-up": "^7.0.1",
@@ -100,7 +100,6 @@
     "tsconfig-seek": "2.0.0",
     "typescript": "~5.3.0",
     "validate-npm-package-name": "^5.0.0",
-    "why-is-node-running": "^2.2.2",
     "zod": "^3.22.4"
   },
   "devDependencies": {
@@ -121,14 +120,14 @@
     "@types/validate-npm-package-name": "4.0.2",
     "enhanced-resolve": "5.15.0",
     "express": "4.18.2",
-    "fastify": "4.25.2",
+    "fastify": "4.26.1",
     "jest-diff": "29.7.0",
     "jsonfile": "6.1.0",
     "koa": "2.15.0",
     "memfs": "4.6.0",
     "remark-cli": "12.0.0",
     "remark-preset-lint-recommended": "6.1.3",
-    "semver": "7.5.4",
+    "semver": "7.6.0",
     "supertest": "6.3.4",
     "type-fest": "2.19.0"
   },
@@ -140,7 +139,7 @@
       "optional": true
     }
   },
-  "packageManager": "pnpm@8.15.1",
+  "packageManager": "pnpm@8.15.4",
   "engines": {
     "node": ">=18.12"
   },

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

@@ -56,7 +56,7 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - docker-compose#v4.16.0:
+      - docker-compose#v5.2.0:
           run: app
           environment:
             - GITHUB_API_TOKEN
@@ -69,7 +69,7 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - seek-jobs/gantry#v2.0.0:
+      - seek-jobs/gantry#v3.0.0:
           command: build
           file: gantry.build.yml
           region: <%- region %>
@@ -86,7 +86,7 @@ steps:
     concurrency_group: <%- teamName %>/deploy/gantry/<%- devGantryEnvironmentName %>
     key: deploy-dev
     plugins:
-      - seek-jobs/gantry#v2.0.0:
+      - seek-jobs/gantry#v3.0.0:
           command: apply
           environment: <%- devGantryEnvironmentName %>
           file: gantry.apply.yml
@@ -101,7 +101,7 @@ steps:
     concurrency_group: <%- teamName %>/deploy/gantry/<%- prodGantryEnvironmentName %>
     depends_on: deploy-dev
     plugins:
-      - seek-jobs/gantry#v2.0.0:
+      - seek-jobs/gantry#v3.0.0:
           command: apply
           environment: <%- prodGantryEnvironmentName %>
           file: gantry.apply.yml

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

@@ -1,20 +1,15 @@
+owner: '<%- teamName %>'
 prodAccountId: '<%- prodAwsAccountId %>'
+service: '<%- serviceName %>'
 
 image: '{{values "prodAccountId"}}.dkr.ecr.<%- region %>.amazonaws.com/{{values "service"}}:{{.BuildID}}'
-service: '<%- serviceName %>'
 
 # TODO: enable Datadog agent
 # https://backstage.myseek.xyz/docs/default/component/gantry/v1/reference/resources/service/#datadogSecretId
 # datadogSecretId: arn:aws:secretsmanager:<%- region %>:<aws-account-id>:secret:<secret-name>
 
 tags:
-  # TODO: add data classification tags
-  # https://rfc.skinfra.xyz/RFC019-AWS-Tagging-Standard.html#seekdataconsumers
-  # seek:data:consumers: internal
-  # https://rfc.skinfra.xyz/RFC019-AWS-Tagging-Standard.html#seekdatatypes
-  # seek:data:types:restricted: job-ads
-  seek:env:label: '{{values "environment"}}'
-  seek:env:production: '{{values "isProduction"}}'
-  seek:owner:team: '<%- teamName %>'
+  seek:env:prod: '{{values "isProduction"}}'
   seek:source:sha: '{{.CommitSHA}}'
   seek:source:url: 'https://github.com/SEEK-Jobs/<%- repoName %>'
+  # seek:system:name: 'TODO: https://rfc.skinfra.xyz/RFC019-AWS-Tagging-Standard.html#required-tags'

package/template/express-rest-api/Dockerfile.dev-deps

@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.6
+# syntax=docker/dockerfile:1.7
 
 FROM --platform=${BUILDPLATFORM:-<%- platformName %>} node:20-alpine AS dev-deps
 

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

@@ -4,6 +4,8 @@ schemaVersion: v0.0
 
 name: '{{values "service"}}'
 
+owner: '{{values "owner"}}'
+
 image: '{{values "image"}}'
 
 env:

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

@@ -24,7 +24,7 @@
     "skuba": "*",
     "supertest": "^6.1.6"
   },
-  "packageManager": "pnpm@8.15.1",
+  "packageManager": "pnpm@8.15.4",
   "engines": {
     "node": ">=20"
   }

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

@@ -35,7 +35,7 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - docker-compose#v4.16.0:
+      - docker-compose#v5.2.0:
           run: app
           environment:
             - GITHUB_API_TOKEN

package/template/greeter/Dockerfile

@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.6
+# syntax=docker/dockerfile:1.7
 
 FROM --platform=${BUILDPLATFORM:-<%- platformName %>} node:20-alpine AS dev-deps
 

package/template/greeter/package.json

@@ -18,7 +18,7 @@
     "@types/node": "^20.9.0",
     "skuba": "*"
   },
-  "packageManager": "pnpm@8.15.1",
+  "packageManager": "pnpm@8.15.4",
   "engines": {
     "node": ">=20"
   }

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

@@ -56,7 +56,7 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - docker-compose#v4.16.0:
+      - docker-compose#v5.2.0:
           run: app
           environment:
             - GITHUB_API_TOKEN
@@ -69,7 +69,7 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - seek-jobs/gantry#v2.0.0:
+      - seek-jobs/gantry#v3.0.0:
           command: build
           file: gantry.build.yml
           region: <%- region %>
@@ -86,7 +86,7 @@ steps:
     concurrency_group: <%- teamName %>/deploy/gantry/<%- devGantryEnvironmentName %>
     key: deploy-dev
     plugins:
-      - seek-jobs/gantry#v2.0.0:
+      - seek-jobs/gantry#v3.0.0:
           command: apply
           environment: <%- devGantryEnvironmentName %>
           file: gantry.apply.yml
@@ -101,7 +101,7 @@ steps:
     concurrency_group: <%- teamName %>/deploy/gantry/<%- prodGantryEnvironmentName %>
     depends_on: deploy-dev
     plugins:
-      - seek-jobs/gantry#v2.0.0:
+      - seek-jobs/gantry#v3.0.0:
           command: apply
           environment: <%- prodGantryEnvironmentName %>
           file: gantry.apply.yml

package/template/koa-rest-api/.gantry/common.yml

@@ -1,20 +1,15 @@
+owner: '<%- teamName %>'
 prodAccountId: '<%- prodAwsAccountId %>'
+service: '<%- serviceName %>'
 
 image: '{{values "prodAccountId"}}.dkr.ecr.<%- region %>.amazonaws.com/{{values "service"}}:{{.BuildID}}'
-service: '<%- serviceName %>'
 
 # TODO: enable Datadog agent
 # https://backstage.myseek.xyz/docs/default/component/gantry/v1/reference/resources/service/#datadogSecretId
 # datadogSecretId: arn:aws:secretsmanager:<%- region %>:<aws-account-id>:secret:<secret-name>
 
 tags:
-  # TODO: add data classification tags
-  # https://rfc.skinfra.xyz/RFC019-AWS-Tagging-Standard.html#seekdataconsumers
-  # seek:data:consumers: internal
-  # https://rfc.skinfra.xyz/RFC019-AWS-Tagging-Standard.html#seekdatatypes
-  # seek:data:types:restricted: job-ads
-  seek:env:label: '{{values "environment"}}'
-  seek:env:production: '{{values "isProduction"}}'
-  seek:owner:team: '<%- teamName %>'
+  seek:env:prod: '{{values "isProduction"}}'
   seek:source:sha: '{{.CommitSHA}}'
   seek:source:url: 'https://github.com/SEEK-Jobs/<%- repoName %>'
+  # seek:system:name: 'TODO: https://rfc.skinfra.xyz/RFC019-AWS-Tagging-Standard.html#required-tags'

package/template/koa-rest-api/Dockerfile.dev-deps

@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.6
+# syntax=docker/dockerfile:1.7
 
 FROM --platform=${BUILDPLATFORM:-<%- platformName %>} node:20-alpine AS dev-deps