skuba 12.1.0-hoist-less-20250722131939 → 12.1.0-main-20250812041011

package/lib/cli/start/index.js

@@ -37,11 +37,16 @@ var import_args = require("../../utils/args.js");
 var import_exec = require("../../utils/exec.js");
 var import_manifest = require("../../utils/manifest.js");
 var import_validation = require("../../utils/validation.js");
+var import_tsc = require("../build/tsc.js");
 const start = async () => {
+  const customConditions = (0, import_tsc.getCustomConditions)();
   const [args, availablePort] = await Promise.all([
     (0, import_args.parseRunArgs)(process.argv.slice(2)),
     (0, import_get_port.default)()
   ]);
+  const uniqueConditions = [
+    .../* @__PURE__ */ new Set([...args.conditions ?? [], ...customConditions])
+  ];
   args.entryPoint ??= await (0, import_manifest.getEntryPointFromManifest)();
   const execProcess = (0, import_exec.createExec)({
     env: {
@@ -54,8 +59,9 @@ const start = async () => {
     "watch",
     "--clear-screen=false",
     ...args.node,
-    "--require",
-    "dotenv/config",
+    ...uniqueConditions.map((condition) => `--conditions=${condition}`),
+    "--env-file-if-exists",
+    ".env",
     "--require",
     "tsconfig-paths/register",
     import_path.default.join(__dirname, "..", "..", "wrapper", "index.js"),

package/lib/cli/start/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/cli/start/index.ts"],
-  "sourcesContent": ["import path from 'path';\n\nimport getPort from 'get-port';\n\nimport { parseRunArgs } from '../../utils/args.js';\nimport { createExec } from '../../utils/exec.js';\nimport { getEntryPointFromManifest } from '../../utils/manifest.js';\nimport { isIpPort } from '../../utils/validation.js';\n\nexport const start = async () => {\n  const [args, availablePort] = await Promise.all([\n    parseRunArgs(process.argv.slice(2)),\n    getPort(),\n  ]);\n\n  args.entryPoint ??= await getEntryPointFromManifest();\n\n  const execProcess = createExec({\n    env: {\n      __SKUBA_ENTRY_POINT: args.entryPoint,\n      __SKUBA_PORT: String(isIpPort(args.port) ? args.port : availablePort),\n    },\n  });\n\n  return execProcess(\n    'tsx',\n    'watch',\n    '--clear-screen=false',\n    ...args.node,\n    '--require',\n    'dotenv/config',\n    '--require',\n    'tsconfig-paths/register',\n    path.join(__dirname, '..', '..', 'wrapper', 'index.js'),\n    ...args.script,\n  );\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AAEjB,sBAAoB;AAEpB,kBAA6B;AAC7B,kBAA2B;AAC3B,sBAA0C;AAC1C,wBAAyB;AAElB,MAAM,QAAQ,YAAY;AAC/B,QAAM,CAAC,MAAM,aAAa,IAAI,MAAM,QAAQ,IAAI;AAAA,QAC9C,0BAAa,QAAQ,KAAK,MAAM,CAAC,CAAC;AAAA,QAClC,gBAAAA,SAAQ;AAAA,EACV,CAAC;AAED,OAAK,eAAe,UAAM,2CAA0B;AAEpD,QAAM,kBAAc,wBAAW;AAAA,IAC7B,KAAK;AAAA,MACH,qBAAqB,KAAK;AAAA,MAC1B,cAAc,WAAO,4BAAS,KAAK,IAAI,IAAI,KAAK,OAAO,aAAa;AAAA,IACtE;AAAA,EACF,CAAC;AAED,SAAO;AAAA,IACL;AAAA,IACA;AAAA,IACA;AAAA,IACA,GAAG,KAAK;AAAA,IACR;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA,YAAAC,QAAK,KAAK,WAAW,MAAM,MAAM,WAAW,UAAU;AAAA,IACtD,GAAG,KAAK;AAAA,EACV;AACF;",
+  "sourcesContent": ["import path from 'path';\n\nimport getPort from 'get-port';\n\nimport { parseRunArgs } from '../../utils/args.js';\nimport { createExec } from '../../utils/exec.js';\nimport { getEntryPointFromManifest } from '../../utils/manifest.js';\nimport { isIpPort } from '../../utils/validation.js';\nimport { getCustomConditions } from '../build/tsc.js';\n\nexport const start = async () => {\n  const customConditions = getCustomConditions();\n  const [args, availablePort] = await Promise.all([\n    parseRunArgs(process.argv.slice(2)),\n    getPort(),\n  ]);\n\n  const uniqueConditions = [\n    ...new Set([...(args.conditions ?? []), ...customConditions]),\n  ];\n\n  args.entryPoint ??= await getEntryPointFromManifest();\n\n  const execProcess = createExec({\n    env: {\n      __SKUBA_ENTRY_POINT: args.entryPoint,\n      __SKUBA_PORT: String(isIpPort(args.port) ? args.port : availablePort),\n    },\n  });\n\n  return execProcess(\n    'tsx',\n    'watch',\n    '--clear-screen=false',\n    ...args.node,\n    ...uniqueConditions.map((condition) => `--conditions=${condition}`),\n    '--env-file-if-exists',\n    '.env',\n    '--require',\n    'tsconfig-paths/register',\n    path.join(__dirname, '..', '..', 'wrapper', 'index.js'),\n    ...args.script,\n  );\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AAEjB,sBAAoB;AAEpB,kBAA6B;AAC7B,kBAA2B;AAC3B,sBAA0C;AAC1C,wBAAyB;AACzB,iBAAoC;AAE7B,MAAM,QAAQ,YAAY;AAC/B,QAAM,uBAAmB,gCAAoB;AAC7C,QAAM,CAAC,MAAM,aAAa,IAAI,MAAM,QAAQ,IAAI;AAAA,QAC9C,0BAAa,QAAQ,KAAK,MAAM,CAAC,CAAC;AAAA,QAClC,gBAAAA,SAAQ;AAAA,EACV,CAAC;AAED,QAAM,mBAAmB;AAAA,IACvB,GAAG,oBAAI,IAAI,CAAC,GAAI,KAAK,cAAc,CAAC,GAAI,GAAG,gBAAgB,CAAC;AAAA,EAC9D;AAEA,OAAK,eAAe,UAAM,2CAA0B;AAEpD,QAAM,kBAAc,wBAAW;AAAA,IAC7B,KAAK;AAAA,MACH,qBAAqB,KAAK;AAAA,MAC1B,cAAc,WAAO,4BAAS,KAAK,IAAI,IAAI,KAAK,OAAO,aAAa;AAAA,IACtE;AAAA,EACF,CAAC;AAED,SAAO;AAAA,IACL;AAAA,IACA;AAAA,IACA;AAAA,IACA,GAAG,KAAK;AAAA,IACR,GAAG,iBAAiB,IAAI,CAAC,cAAc,gBAAgB,SAAS,EAAE;AAAA,IAClE;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA,YAAAC,QAAK,KAAK,WAAW,MAAM,MAAM,WAAW,UAAU;AAAA,IACtD,GAAG,KAAK;AAAA,EACV;AACF;",
   "names": ["getPort", "path"]
 }

package/lib/cli/test/index.d.ts

@@ -1 +1 @@
-export declare const test: () => Promise<void>;
+export declare const test: () => Promise<import("execa").ExecaReturnValue<string>>;

package/lib/cli/test/index.js

@@ -1,7 +1,9 @@
 "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)
@@ -15,18 +17,30 @@ var __copyProps = (to, from, except, desc) => {
   }
   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 test_exports = {};
 __export(test_exports, {
   test: () => test
 });
 module.exports = __toCommonJS(test_exports);
-var import_jest = require("jest");
+var import_exec = require("../../utils/exec.js");
 const test = async () => {
-  process.env.NODE_ENV ??= "test";
-  process.env.TS_JEST_LOG ??= "stdout:error";
   const argv = process.argv.slice(2);
-  return (0, import_jest.run)(argv);
+  const nodeOptions = process.env.NODE_OPTIONS ?? "";
+  const execWithEnv = (0, import_exec.createExec)({
+    env: {
+      NODE_OPTIONS: !nodeOptions.includes("--experimental-vm-modules") ? `${nodeOptions} --experimental-vm-modules --no-warnings=ExperimentalWarning` : nodeOptions
+    }
+  });
+  return execWithEnv(require.resolve("jest/bin/jest"), ...argv);
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/lib/cli/test/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/cli/test/index.ts"],
-  "sourcesContent": ["import { run } from 'jest';\n\nexport const test = async () => {\n  // This is usually set in `jest-cli`'s binary wrapper\n  process.env.NODE_ENV ??= 'test';\n\n  // ts-jest is logging a warning about `isolatedModules`.\n  // This is a workaround until we can remove the `isolatedModules` option.\n  // https://github.com/seek-oss/skuba/issues/1841\n  process.env.TS_JEST_LOG ??= 'stdout:error';\n\n  const argv = process.argv.slice(2);\n\n  return run(argv);\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAoB;AAEb,MAAM,OAAO,YAAY;AAE9B,UAAQ,IAAI,aAAa;AAKzB,UAAQ,IAAI,gBAAgB;AAE5B,QAAM,OAAO,QAAQ,KAAK,MAAM,CAAC;AAEjC,aAAO,iBAAI,IAAI;AACjB;",
+  "sourcesContent": ["import { createExec } from '../../utils/exec.js';\n\nexport const test = async () => {\n  const argv = process.argv.slice(2);\n\n  const nodeOptions = process.env.NODE_OPTIONS ?? '';\n\n  const execWithEnv = createExec({\n    env: {\n      NODE_OPTIONS: !nodeOptions.includes('--experimental-vm-modules')\n        ? `${nodeOptions} --experimental-vm-modules --no-warnings=ExperimentalWarning`\n        : nodeOptions,\n    },\n  });\n\n  // Run Jest in a child process with proper environment\n  return execWithEnv(require.resolve('jest/bin/jest'), ...argv);\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAA2B;AAEpB,MAAM,OAAO,YAAY;AAC9B,QAAM,OAAO,QAAQ,KAAK,MAAM,CAAC;AAEjC,QAAM,cAAc,QAAQ,IAAI,gBAAgB;AAEhD,QAAM,kBAAc,wBAAW;AAAA,IAC7B,KAAK;AAAA,MACH,cAAc,CAAC,YAAY,SAAS,2BAA2B,IAC3D,GAAG,WAAW,iEACd;AAAA,IACN;AAAA,EACF,CAAC;AAGD,SAAO,YAAY,gBAAgB,eAAe,GAAG,GAAG,IAAI;AAC9D;",
   "names": []
 }

package/lib/utils/args.d.ts

@@ -18,6 +18,8 @@ export declare const parseProcessArgs: (args?: string[]) => {
     args: string[];
 };
 interface RunArgs {
+    /** The conditions to pass to the entry point script. */
+    conditions?: string[];
     /** The path to the entry point script. */
     entryPoint?: string;
     /** The port to start an HTTP server on. */

package/lib/utils/args.js

@@ -100,6 +100,11 @@ const parseRunArgsIteration = (state, args) => {
     }
     return args.slice(1);
   }
+  if (arg1.startsWith("--conditions=")) {
+    state.conditions ??= [];
+    state.conditions.push(arg1.slice(13));
+    return args.slice(1);
+  }
   state.entryPoint = arg1;
   state.script.push(...args.slice(1));
   return [];

package/lib/utils/args.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/utils/args.ts"],
-  "sourcesContent": ["import assert from 'assert';\n\nimport { COMMAND_ALIASES } from './command.js';\n\nexport const hasDebugFlag = (args = process.argv) =>\n  args.some((arg) => arg.toLocaleLowerCase() === '--debug');\n\nexport const hasSerialFlag = (args = process.argv, env = process.env) =>\n  args.some((arg) => arg.toLocaleLowerCase() === '--serial') ||\n  Boolean(\n    // Run serially on SEEK's central npm publishing pipeline.\n    // Exhausting agents here can cause grief.\n    env.BUILDKITE_AGENT_META_DATA_QUEUE?.split(',').some((queueName) =>\n      queueName.startsWith('artefacts:npm'),\n    ),\n  );\n\n/**\n * Parse process arguments.\n *\n * This function mutates the input list by removing the command name element.\n * Downstream commands can access their args with an ordinary\n * `process.argv.slice(2)`.\n *\n * Example input:\n *\n * ```typescript\n * ['/bin/node', 'node_modules/.bin/skuba', 'test', '--foo', '--bar']\n * ```\n */\nexport const parseProcessArgs = (args = process.argv) => {\n  const skubaIdx = args.findIndex((chunk) => /skuba(\\.[jt]s)?$/.test(chunk));\n\n  assert(skubaIdx >= 0, 'Cannot parse args for `skuba`');\n\n  const rawCommand = (args[skubaIdx + 1] ?? 'help').toLocaleLowerCase();\n\n  const commandName = COMMAND_ALIASES[rawCommand] ?? rawCommand;\n\n  const payload = {\n    commandName,\n    args: args.slice(skubaIdx + 2),\n  };\n\n  args.splice(skubaIdx + 1, 1);\n\n  return payload;\n};\n\ninterface RunArgs {\n  /** The path to the entry point script. */\n  entryPoint?: string;\n\n  /** The port to start an HTTP server on. */\n  port?: number;\n\n  /** Arguments passed through to the Node.js executable. */\n  node: string[];\n\n  /** Arguments passed through to the entry point script. */\n  script: string[];\n}\n\n/**\n * Make a best effort to parse \"run\" args.\n *\n * These are arguments that would be passed to `skuba node` or `skuba start`.\n * Parsing is handrolled because we support some weird and wonderful behaviour:\n *\n * - The `--port` option may be intended for skuba itself\n * - The `--inspect` options may be intended for the Node.js inspector\n * - The entry point may be omitted in favour of `package.json` inference\n * - Other args may be intended for propagation to the entry point\n */\nexport const parseRunArgs = (argv: string[]): RunArgs => {\n  const state: RunArgs = {\n    node: [],\n    script: [],\n  };\n\n  let args = argv.filter((element) => element.length);\n\n  while (args.length) {\n    args = parseRunArgsIteration(state, args);\n  }\n\n  return state;\n};\n\nconst isDigits = (arg: unknown): arg is string =>\n  typeof arg === 'string' && /^\\d+$/.test(arg);\n\nconst parseRunArgsIteration = (state: RunArgs, args: string[]): string[] => {\n  const [arg1, arg2] = args;\n\n  if (!arg1) {\n    return [];\n  }\n\n  if (/^--inspect(-brk)?=\\d+$/.test(arg1)) {\n    state.node.push(arg1);\n    return args.slice(1);\n  }\n\n  // Node.js inspector options that are optionally followed by a numeric port.\n  if (['--inspect', '--inspect-brk'].includes(arg1)) {\n    if (isDigits(arg2)) {\n      state.node.push(`${arg1}=${arg2}`);\n      return args.slice(2);\n    }\n\n    state.node.push(arg1);\n\n    if (arg2) {\n      // Some other string that doesn't relate to the Node.js inspector option.\n      // This is presumably the entry point script to run.\n      state.entryPoint = arg2;\n      state.script.push(...args.slice(2));\n    }\n\n    return [];\n  }\n\n  if (/^--port=\\d+$/.test(arg1)) {\n    state.port = Number(arg1.slice(7));\n    return args.slice(1);\n  }\n\n  if (arg1 === '--port') {\n    if (isDigits(arg2)) {\n      state.port = Number(arg2);\n      return args.slice(2);\n    }\n\n    // Invalid port argument; eat it.\n    return args.slice(1);\n  }\n\n  state.entryPoint = arg1;\n  state.script.push(...args.slice(1));\n  return [];\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,oBAAmB;AAEnB,qBAAgC;AAEzB,MAAM,eAAe,CAAC,OAAO,QAAQ,SAC1C,KAAK,KAAK,CAAC,QAAQ,IAAI,kBAAkB,MAAM,SAAS;AAEnD,MAAM,gBAAgB,CAAC,OAAO,QAAQ,MAAM,MAAM,QAAQ,QAC/D,KAAK,KAAK,CAAC,QAAQ,IAAI,kBAAkB,MAAM,UAAU,KACzD;AAAA;AAAA;AAAA,EAGE,IAAI,iCAAiC,MAAM,GAAG,EAAE;AAAA,IAAK,CAAC,cACpD,UAAU,WAAW,eAAe;AAAA,EACtC;AACF;AAeK,MAAM,mBAAmB,CAAC,OAAO,QAAQ,SAAS;AACvD,QAAM,WAAW,KAAK,UAAU,CAAC,UAAU,mBAAmB,KAAK,KAAK,CAAC;AAEzE,oBAAAA,SAAO,YAAY,GAAG,+BAA+B;AAErD,QAAM,cAAc,KAAK,WAAW,CAAC,KAAK,QAAQ,kBAAkB;AAEpE,QAAM,cAAc,+BAAgB,UAAU,KAAK;AAEnD,QAAM,UAAU;AAAA,IACd;AAAA,IACA,MAAM,KAAK,MAAM,WAAW,CAAC;AAAA,EAC/B;AAEA,OAAK,OAAO,WAAW,GAAG,CAAC;AAE3B,SAAO;AACT;AA2BO,MAAM,eAAe,CAAC,SAA4B;AACvD,QAAM,QAAiB;AAAA,IACrB,MAAM,CAAC;AAAA,IACP,QAAQ,CAAC;AAAA,EACX;AAEA,MAAI,OAAO,KAAK,OAAO,CAAC,YAAY,QAAQ,MAAM;AAElD,SAAO,KAAK,QAAQ;AAClB,WAAO,sBAAsB,OAAO,IAAI;AAAA,EAC1C;AAEA,SAAO;AACT;AAEA,MAAM,WAAW,CAAC,QAChB,OAAO,QAAQ,YAAY,QAAQ,KAAK,GAAG;AAE7C,MAAM,wBAAwB,CAAC,OAAgB,SAA6B;AAC1E,QAAM,CAAC,MAAM,IAAI,IAAI;AAErB,MAAI,CAAC,MAAM;AACT,WAAO,CAAC;AAAA,EACV;AAEA,MAAI,yBAAyB,KAAK,IAAI,GAAG;AACvC,UAAM,KAAK,KAAK,IAAI;AACpB,WAAO,KAAK,MAAM,CAAC;AAAA,EACrB;AAGA,MAAI,CAAC,aAAa,eAAe,EAAE,SAAS,IAAI,GAAG;AACjD,QAAI,SAAS,IAAI,GAAG;AAClB,YAAM,KAAK,KAAK,GAAG,IAAI,IAAI,IAAI,EAAE;AACjC,aAAO,KAAK,MAAM,CAAC;AAAA,IACrB;AAEA,UAAM,KAAK,KAAK,IAAI;AAEpB,QAAI,MAAM;AAGR,YAAM,aAAa;AACnB,YAAM,OAAO,KAAK,GAAG,KAAK,MAAM,CAAC,CAAC;AAAA,IACpC;AAEA,WAAO,CAAC;AAAA,EACV;AAEA,MAAI,eAAe,KAAK,IAAI,GAAG;AAC7B,UAAM,OAAO,OAAO,KAAK,MAAM,CAAC,CAAC;AACjC,WAAO,KAAK,MAAM,CAAC;AAAA,EACrB;AAEA,MAAI,SAAS,UAAU;AACrB,QAAI,SAAS,IAAI,GAAG;AAClB,YAAM,OAAO,OAAO,IAAI;AACxB,aAAO,KAAK,MAAM,CAAC;AAAA,IACrB;AAGA,WAAO,KAAK,MAAM,CAAC;AAAA,EACrB;AAEA,QAAM,aAAa;AACnB,QAAM,OAAO,KAAK,GAAG,KAAK,MAAM,CAAC,CAAC;AAClC,SAAO,CAAC;AACV;",
+  "sourcesContent": ["import assert from 'assert';\n\nimport { COMMAND_ALIASES } from './command.js';\n\nexport const hasDebugFlag = (args = process.argv) =>\n  args.some((arg) => arg.toLocaleLowerCase() === '--debug');\n\nexport const hasSerialFlag = (args = process.argv, env = process.env) =>\n  args.some((arg) => arg.toLocaleLowerCase() === '--serial') ||\n  Boolean(\n    // Run serially on SEEK's central npm publishing pipeline.\n    // Exhausting agents here can cause grief.\n    env.BUILDKITE_AGENT_META_DATA_QUEUE?.split(',').some((queueName) =>\n      queueName.startsWith('artefacts:npm'),\n    ),\n  );\n\n/**\n * Parse process arguments.\n *\n * This function mutates the input list by removing the command name element.\n * Downstream commands can access their args with an ordinary\n * `process.argv.slice(2)`.\n *\n * Example input:\n *\n * ```typescript\n * ['/bin/node', 'node_modules/.bin/skuba', 'test', '--foo', '--bar']\n * ```\n */\nexport const parseProcessArgs = (args = process.argv) => {\n  const skubaIdx = args.findIndex((chunk) => /skuba(\\.[jt]s)?$/.test(chunk));\n\n  assert(skubaIdx >= 0, 'Cannot parse args for `skuba`');\n\n  const rawCommand = (args[skubaIdx + 1] ?? 'help').toLocaleLowerCase();\n\n  const commandName = COMMAND_ALIASES[rawCommand] ?? rawCommand;\n\n  const payload = {\n    commandName,\n    args: args.slice(skubaIdx + 2),\n  };\n\n  args.splice(skubaIdx + 1, 1);\n\n  return payload;\n};\n\ninterface RunArgs {\n  /** The conditions to pass to the entry point script. */\n  conditions?: string[];\n\n  /** The path to the entry point script. */\n  entryPoint?: string;\n\n  /** The port to start an HTTP server on. */\n  port?: number;\n\n  /** Arguments passed through to the Node.js executable. */\n  node: string[];\n\n  /** Arguments passed through to the entry point script. */\n  script: string[];\n}\n\n/**\n * Make a best effort to parse \"run\" args.\n *\n * These are arguments that would be passed to `skuba node` or `skuba start`.\n * Parsing is handrolled because we support some weird and wonderful behaviour:\n *\n * - The `--port` option may be intended for skuba itself\n * - The `--inspect` options may be intended for the Node.js inspector\n * - The entry point may be omitted in favour of `package.json` inference\n * - Other args may be intended for propagation to the entry point\n */\nexport const parseRunArgs = (argv: string[]): RunArgs => {\n  const state: RunArgs = {\n    node: [],\n    script: [],\n  };\n\n  let args = argv.filter((element) => element.length);\n\n  while (args.length) {\n    args = parseRunArgsIteration(state, args);\n  }\n\n  return state;\n};\n\nconst isDigits = (arg: unknown): arg is string =>\n  typeof arg === 'string' && /^\\d+$/.test(arg);\n\nconst parseRunArgsIteration = (state: RunArgs, args: string[]): string[] => {\n  const [arg1, arg2] = args;\n\n  if (!arg1) {\n    return [];\n  }\n\n  if (/^--inspect(-brk)?=\\d+$/.test(arg1)) {\n    state.node.push(arg1);\n    return args.slice(1);\n  }\n\n  // Node.js inspector options that are optionally followed by a numeric port.\n  if (['--inspect', '--inspect-brk'].includes(arg1)) {\n    if (isDigits(arg2)) {\n      state.node.push(`${arg1}=${arg2}`);\n      return args.slice(2);\n    }\n\n    state.node.push(arg1);\n\n    if (arg2) {\n      // Some other string that doesn't relate to the Node.js inspector option.\n      // This is presumably the entry point script to run.\n      state.entryPoint = arg2;\n      state.script.push(...args.slice(2));\n    }\n\n    return [];\n  }\n\n  if (/^--port=\\d+$/.test(arg1)) {\n    state.port = Number(arg1.slice(7));\n    return args.slice(1);\n  }\n\n  if (arg1 === '--port') {\n    if (isDigits(arg2)) {\n      state.port = Number(arg2);\n      return args.slice(2);\n    }\n\n    // Invalid port argument; eat it.\n    return args.slice(1);\n  }\n\n  if (arg1.startsWith('--conditions=')) {\n    state.conditions ??= [];\n    state.conditions.push(arg1.slice(13));\n    return args.slice(1);\n  }\n\n  state.entryPoint = arg1;\n  state.script.push(...args.slice(1));\n  return [];\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,oBAAmB;AAEnB,qBAAgC;AAEzB,MAAM,eAAe,CAAC,OAAO,QAAQ,SAC1C,KAAK,KAAK,CAAC,QAAQ,IAAI,kBAAkB,MAAM,SAAS;AAEnD,MAAM,gBAAgB,CAAC,OAAO,QAAQ,MAAM,MAAM,QAAQ,QAC/D,KAAK,KAAK,CAAC,QAAQ,IAAI,kBAAkB,MAAM,UAAU,KACzD;AAAA;AAAA;AAAA,EAGE,IAAI,iCAAiC,MAAM,GAAG,EAAE;AAAA,IAAK,CAAC,cACpD,UAAU,WAAW,eAAe;AAAA,EACtC;AACF;AAeK,MAAM,mBAAmB,CAAC,OAAO,QAAQ,SAAS;AACvD,QAAM,WAAW,KAAK,UAAU,CAAC,UAAU,mBAAmB,KAAK,KAAK,CAAC;AAEzE,oBAAAA,SAAO,YAAY,GAAG,+BAA+B;AAErD,QAAM,cAAc,KAAK,WAAW,CAAC,KAAK,QAAQ,kBAAkB;AAEpE,QAAM,cAAc,+BAAgB,UAAU,KAAK;AAEnD,QAAM,UAAU;AAAA,IACd;AAAA,IACA,MAAM,KAAK,MAAM,WAAW,CAAC;AAAA,EAC/B;AAEA,OAAK,OAAO,WAAW,GAAG,CAAC;AAE3B,SAAO;AACT;AA8BO,MAAM,eAAe,CAAC,SAA4B;AACvD,QAAM,QAAiB;AAAA,IACrB,MAAM,CAAC;AAAA,IACP,QAAQ,CAAC;AAAA,EACX;AAEA,MAAI,OAAO,KAAK,OAAO,CAAC,YAAY,QAAQ,MAAM;AAElD,SAAO,KAAK,QAAQ;AAClB,WAAO,sBAAsB,OAAO,IAAI;AAAA,EAC1C;AAEA,SAAO;AACT;AAEA,MAAM,WAAW,CAAC,QAChB,OAAO,QAAQ,YAAY,QAAQ,KAAK,GAAG;AAE7C,MAAM,wBAAwB,CAAC,OAAgB,SAA6B;AAC1E,QAAM,CAAC,MAAM,IAAI,IAAI;AAErB,MAAI,CAAC,MAAM;AACT,WAAO,CAAC;AAAA,EACV;AAEA,MAAI,yBAAyB,KAAK,IAAI,GAAG;AACvC,UAAM,KAAK,KAAK,IAAI;AACpB,WAAO,KAAK,MAAM,CAAC;AAAA,EACrB;AAGA,MAAI,CAAC,aAAa,eAAe,EAAE,SAAS,IAAI,GAAG;AACjD,QAAI,SAAS,IAAI,GAAG;AAClB,YAAM,KAAK,KAAK,GAAG,IAAI,IAAI,IAAI,EAAE;AACjC,aAAO,KAAK,MAAM,CAAC;AAAA,IACrB;AAEA,UAAM,KAAK,KAAK,IAAI;AAEpB,QAAI,MAAM;AAGR,YAAM,aAAa;AACnB,YAAM,OAAO,KAAK,GAAG,KAAK,MAAM,CAAC,CAAC;AAAA,IACpC;AAEA,WAAO,CAAC;AAAA,EACV;AAEA,MAAI,eAAe,KAAK,IAAI,GAAG;AAC7B,UAAM,OAAO,OAAO,KAAK,MAAM,CAAC,CAAC;AACjC,WAAO,KAAK,MAAM,CAAC;AAAA,EACrB;AAEA,MAAI,SAAS,UAAU;AACrB,QAAI,SAAS,IAAI,GAAG;AAClB,YAAM,OAAO,OAAO,IAAI;AACxB,aAAO,KAAK,MAAM,CAAC;AAAA,IACrB;AAGA,WAAO,KAAK,MAAM,CAAC;AAAA,EACrB;AAEA,MAAI,KAAK,WAAW,eAAe,GAAG;AACpC,UAAM,eAAe,CAAC;AACtB,UAAM,WAAW,KAAK,KAAK,MAAM,EAAE,CAAC;AACpC,WAAO,KAAK,MAAM,CAAC;AAAA,EACrB;AAEA,QAAM,aAAa;AACnB,QAAM,OAAO,KAAK,GAAG,KAAK,MAAM,CAAC,CAAC;AAClC,SAAO,CAAC;AACV;",
   "names": ["assert"]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skuba",
-  "version": "12.1.0-hoist-less-20250722131939",
+  "version": "12.1.0-main-20250812041011",
   "private": false,
   "description": "SEEK development toolkit for backend applications and packages",
   "homepage": "https://github.com/seek-oss/skuba#readme",
@@ -61,7 +61,6 @@
     "@types/node": "^22.0.0",
     "chalk": "^4.1.0",
     "concurrently": "^9.0.0",
-    "dotenv": "^16.0.0",
     "ejs": "^3.1.6",
     "enquirer": "^2.3.6",
     "esbuild": "~0.25.0",
@@ -96,38 +95,38 @@
     "tsconfig-paths": "^4.0.0",
     "tsconfig-seek": "2.0.0",
     "tsx": "^4.16.2",
-    "typescript": "~5.8.0",
-    "zod": "^3.25.67",
-    "eslint-config-skuba": "7.0.2"
+    "typescript": "~5.9.0",
+    "zod": "^4.0.0",
+    "eslint-config-skuba": "7.1.0-main-20250812041011"
   },
   "devDependencies": {
     "@changesets/cli": "2.29.5",
     "@changesets/get-github-info": "0.6.0",
-    "@jest/reporters": "30.0.4",
-    "@jest/test-result": "30.0.4",
+    "@jest/reporters": "30.0.5",
+    "@jest/test-result": "30.0.5",
     "@types/ejs": "3.1.5",
     "@types/express": "5.0.3",
     "@types/fs-extra": "11.0.4",
-    "@types/koa": "2.15.0",
+    "@types/koa": "3.0.0",
     "@types/lodash.mergewith": "4.6.9",
     "@types/minimist": "1.2.5",
     "@types/module-alias": "2.0.4",
     "@types/npm-registry-fetch": "8.0.8",
     "@types/npm-which": "3.0.4",
-    "@types/picomatch": "4.0.0",
+    "@types/picomatch": "4.0.2",
     "@types/semver": "7.7.0",
     "@types/supertest": "6.0.3",
-    "enhanced-resolve": "5.18.2",
+    "enhanced-resolve": "5.18.3",
     "express": "5.1.0",
-    "fastify": "5.4.0",
-    "jest-diff": "30.0.4",
+    "fastify": "5.5.0",
+    "jest-diff": "30.0.5",
     "jsonfile": "6.1.0",
-    "koa": "3.0.0",
-    "memfs": "4.17.2",
+    "koa": "3.0.1",
+    "memfs": "4.36.0",
     "remark-cli": "12.0.1",
     "remark-preset-lint-recommended": "7.0.1",
     "semver": "7.7.2",
-    "supertest": "7.1.3",
+    "supertest": "7.1.4",
     "type-fest": "2.19.0"
   },
   "peerDependencies": {
@@ -149,7 +148,7 @@
     "entryPoint": "src/index.ts",
     "template": null,
     "type": "package",
-    "version": "11.1.0"
+    "version": "12.0.2"
   },
   "scripts": {
     "build": "scripts/build.sh",
@@ -163,7 +162,7 @@
     "lint:packages": "pnpm --filter '!./template/**' lint",
     "release": "pnpm --silent build && changeset publish",
     "skuba": "pnpm --silent build && pnpm --silent skuba:exec",
-    "skuba:exec": "node --experimental-vm-modules --no-warnings=ExperimentalWarning lib/skuba",
+    "skuba:exec": "node lib/skuba",
     "stage": "changeset version && node ./.changeset/inject.js && pnpm format",
     "test": "pnpm --silent skuba test --selectProjects unit",
     "test:ci": "pnpm --silent skuba test --runInBand",

package/template/base/_pnpm-workspace.yaml

@@ -8,4 +8,5 @@ publicHoistPattern:
   - esbuild
   - jest
   - tsconfig-seek
+  - typescript
   # end managed by skuba

package/template/base/jest.setup.ts

@@ -1,3 +1,3 @@
-process.env.ENVIRONMENT = 'test';
+process.env.DEPLOYMENT = 'test';
 
 export {};

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

@@ -77,6 +77,9 @@ steps:
       queue: <%- devBuildkiteQueueName %>
     label: 🤞 Deploy Dev
     concurrency_group: <%- teamName %>/deploy/gantry/<%- devGantryEnvironmentName %>
+    env:
+      DD_DEPLOYMENT_ENVIRONMENT: development
+      DD_DEPLOYMENT_SERVICE: <%- serviceName %>
     key: deploy-dev
     plugins:
       - seek-jobs/gantry#v4.0.0:
@@ -93,6 +96,9 @@ steps:
     branches: ${BUILDKITE_PIPELINE_DEFAULT_BRANCH}
     concurrency_group: <%- teamName %>/deploy/gantry/<%- prodGantryEnvironmentName %>
     depends_on: deploy-dev
+    env:
+      DD_DEPLOYMENT_ENVIRONMENT: production
+      DD_DEPLOYMENT_SERVICE: <%- serviceName %>
     plugins:
       - seek-jobs/gantry#v4.0.0:
           command: apply

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

@@ -1 +1 @@
-ENVIRONMENT=local
+DEPLOYMENT=local

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

@@ -1,7 +1,11 @@
-environment: dev
+deployment: dev
+env: development
 
 maxInstanceCount: 1
 minInstanceCount: 1
 
 # Disable dashboard for cost savings
 cloudwatchDashboardDisabled: true
+
+openTelemetry:
+  enabled: true

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

@@ -1,4 +1,8 @@
-environment: prod
+deployment: prod
+env: production
 
 maxInstanceCount: 10
 minInstanceCount: 3
+
+openTelemetry:
+  enabled: true

package/template/express-rest-api/Dockerfile

@@ -28,4 +28,4 @@ ARG PORT=8001
 ENV PORT=${PORT}
 EXPOSE ${PORT}
 
-CMD ["lib/listen.js"]
+CMD ["--require", "./lib/tracing.js", "./lib/listen.js"]

package/template/express-rest-api/README.md

@@ -70,19 +70,19 @@ pnpm start:debug
 
 This project is deployed through a [Buildkite pipeline](.buildkite/pipeline.yml).
 
-- Commits to a feature branch can be deployed to the dev environment by unblocking a step in the Buildkite UI
-- Commits to the default branch are automatically deployed to the dev and prod environments in sequence
+- Commits to a feature branch can be deployed to the development environment by unblocking a step in the Buildkite UI
+- Commits to the default branch are automatically deployed to the development and production environments in sequence
 
 To rapidly roll back a change,
 retry an individual deployment step from the previous build in Buildkite.
-Note that this will introduce drift between the head of the default Git branch and the live environment;
+Note that this will introduce drift between the head of the default Git branch and the live deployments;
 use with caution and always follow up with a proper revert or fix in Git history.
 
 ## Support
 
 ### Dev
 
-TODO: add support links for the dev environment.
+TODO: add support links for the dev deployment.
 
 <!--
 - CloudWatch dashboard
@@ -92,7 +92,7 @@ TODO: add support links for the dev environment.
 
 ### Prod
 
-TODO: add support links for the prod environment.
+TODO: add support links for the prod deployment.
 
 <!--
 - CloudWatch dashboard

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

@@ -9,9 +9,14 @@ owner: '{{values "owner"}}'
 image: '{{values "image"}}'
 
 env:
-  ENVIRONMENT: '{{values "environment"}}'
+  DEPLOYMENT: '{{values "deployment"}}'
   SERVICE: '{{values "service"}}'
 
+  DD_ENV: '{{values "env"}}'
+  DD_SERVICE: '{{values "service"}}'
+
+  OPENTELEMETRY_ENABLED: '{{values "openTelemetry.enabled"}}'
+
 {{if .Values.cloudwatchDashboardDisabled}}
 cloudwatchDashboardDisabled: {{values "cloudwatchDashboardDisabled"}}
 {{end}}
@@ -20,6 +25,17 @@ cloudwatchDashboardDisabled: {{values "cloudwatchDashboardDisabled"}}
 datadogSecretId: '{{values "datadogSecretId"}}'
 {{end}}
 
+# Uncomment if the `tin` tier is acceptable for your SEEK Auth Sidecar logs
+# The eeeoh log forwarder bypasses Amazon CloudWatch for cost savings
+# logSink:
+#   forwarder: eeeoh
+#   splunkIndex: '{{values "logSink.splunkIndex"}}'
+
+openTelemetry:
+  datadogEnvironmentName: '{{values "env"}}'
+  enabled: {{values "openTelemetry.enabled"}}
+  useGantryServiceName: true
+
 {{if .Values.pagerDutyEndpoint}}
 pagerDutyEndpoint: '{{values "pagerDutyEndpoint"}}'
 {{end}}

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

@@ -13,22 +13,28 @@
     "test:watch": "skuba test --watch"
   },
   "dependencies": {
-    "@seek/logger": "^10.0.0",
+    "@opentelemetry/api": "^1.9.0",
+    "@opentelemetry/core": "^2.0.0",
+    "@opentelemetry/exporter-trace-otlp-grpc": "^0.203.0",
+    "@opentelemetry/instrumentation-aws-sdk": "^0.56.0",
+    "@opentelemetry/instrumentation-http": "^0.203.0",
+    "@opentelemetry/propagator-b3": "^2.0.0",
+    "@opentelemetry/sdk-node": "^0.203.0",
+    "@seek/logger": "11.0.0",
     "express": "^5.0.0",
-    "hot-shots": "^10.0.0",
-    "seek-datadog-custom-metrics": "^4.6.3",
+    "hot-shots": "^11.0.0",
+    "seek-datadog-custom-metrics": "^6.0.0",
     "skuba-dive": "^2.0.0"
   },
   "devDependencies": {
     "@types/express": "^5.0.0",
     "@types/node": "^22.13.10",
     "@types/supertest": "^6.0.0",
-    "mime": "^4.0.1",
     "pino-pretty": "^13.0.0",
     "skuba": "*",
     "supertest": "^7.0.0"
   },
-  "packageManager": "pnpm@10.12.4",
+  "packageManager": "pnpm@10.14.0",
   "engines": {
     "node": ">=22"
   }

package/template/express-rest-api/src/api/healthCheck.ts

@@ -3,8 +3,8 @@ import type { Handler } from 'express';
 /**
  * Signifies that the API is available to serve requests.
  *
- * The deployment environment calls this endpoint to see if the container is
- * unhealthy and needs to be recycled.
+ * The workload hosting environment calls this endpoint to see if the container
+ * is unhealthy and needs to be recycled.
  */
 export const healthCheckHandler: Handler = (_req, res) => {
   res.send('');

package/template/express-rest-api/src/config.ts

@@ -1,7 +1,7 @@
 import { Env } from 'skuba-dive';
 
 interface Config {
-  environment: Environment;
+  deployment: Deployment;
 
   logLevel: string;
   name: string;
@@ -11,17 +11,17 @@ interface Config {
   port: number | null;
 }
 
-type Environment = (typeof environments)[number];
+type Deployment = (typeof deployments)[number];
 
 const dev = '<%- devGantryEnvironmentName %>';
 const prod = '<%- prodGantryEnvironmentName %>';
 
-const environments = ['local', 'test', dev, prod] as const;
+const deployments = ['local', 'test', dev, prod] as const;
 
-const environment = Env.oneOf(environments)('ENVIRONMENT');
+const deployment = Env.oneOf(deployments)('DEPLOYMENT');
 
 /* istanbul ignore next: config verification makes more sense in a smoke test */
-const configs: Record<Environment, () => Omit<Config, 'environment'>> = {
+const configs: Record<Deployment, () => Omit<Config, 'deployment'>> = {
   local: () => ({
     logLevel: 'debug',
     name: '<%- serviceName %>',
@@ -60,6 +60,6 @@ const configs: Record<Environment, () => Omit<Config, 'environment'>> = {
 };
 
 export const config: Config = {
-  ...configs[environment](),
-  environment,
+  ...configs[deployment](),
+  deployment,
 };

package/template/express-rest-api/src/framework/logging.ts

@@ -1,17 +1,21 @@
-import createLogger from '@seek/logger';
+import { createLogger } from '@seek/logger';
 
 import { config } from 'src/config.js';
 
 export const logger = createLogger({
-  base: {
-    environment: config.environment,
-    version: config.version,
+  eeeoh: {
+    /**
+     * TODO: choose an appropriate Datadog log tier.
+     *
+     * https://github.com/seek-oss/logger/blob/master/docs/eeeoh.md#datadog-log-tiers
+     */
+    datadog: 'tin',
+    team: '<%- teamName %>',
+    use: 'environment',
   },
 
   level: config.logLevel,
 
-  name: config.name,
-
   transport:
-    config.environment === 'local' ? { target: 'pino-pretty' } : undefined,
+    config.deployment === 'local' ? { target: 'pino-pretty' } : undefined,
 });

package/template/express-rest-api/src/framework/metrics.ts

@@ -7,5 +7,5 @@ import { logger } from './logging.js';
 
 /* istanbul ignore next: StatsD client is not our responsibility */
 export const metricsClient = createStatsDClient(StatsD, config, (err) =>
-  logger.error({ err }, 'StatsD error'),
+  logger.error(err, 'StatsD error'),
 );

package/template/express-rest-api/src/listen.ts

@@ -21,3 +21,9 @@ const listener = app.listen(config.port, () => {
 // https://docs.aws.amazon.com/elasticloadbalancing/latest/application/application-load-balancers.html#connection-idle-timeout
 // AWS recommends setting an application timeout larger than the load balancer
 listener.keepAliveTimeout = 31000;
+
+// Report unhandled rejections instead of crashing the process
+// Make sure to monitor these reports and alert as appropriate
+process.on('unhandledRejection', (err) =>
+  logger.error(err, 'Unhandled promise rejection'),
+);

package/template/express-rest-api/src/tracing.ts

@@ -0,0 +1,56 @@
+/**
+ * OpenTelemetry tracing initialisation. This is a standalone TS/JS module that is not
+ * referenced by application source code directly. It is required at runtime using the
+ * node command's `--require` argument, see Dockerfile for details.
+ */
+
+import { propagation } from '@opentelemetry/api';
+import { CompositePropagator } from '@opentelemetry/core';
+import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-grpc';
+import { AwsInstrumentation } from '@opentelemetry/instrumentation-aws-sdk';
+import { HttpInstrumentation } from '@opentelemetry/instrumentation-http';
+import { B3InjectEncoding, B3Propagator } from '@opentelemetry/propagator-b3';
+import { NodeSDK } from '@opentelemetry/sdk-node';
+
+const app = 'opentelemetry';
+const log = (level: string, msg: string, extra = {}) => {
+  const toLog = { msg, level, app, time: new Date().toISOString(), ...extra };
+  console.log(JSON.stringify(toLog)); // eslint-disable-line no-console
+};
+
+const main = () => {
+  // Use B3 propagation to ensure proper propagation between systems that use
+  // OpenTelemetry and native Datadog APM, such as Istio/Envoy.
+  propagation.setGlobalPropagator(
+    new CompositePropagator({
+      propagators: [
+        new B3Propagator(),
+        new B3Propagator({ injectEncoding: B3InjectEncoding.MULTI_HEADER }),
+      ],
+    }),
+  );
+
+  const sdk = new NodeSDK({
+    traceExporter: new OTLPTraceExporter(),
+    autoDetectResources: false,
+    instrumentations: [new HttpInstrumentation(), new AwsInstrumentation()],
+  });
+
+  sdk.start();
+
+  process.on('SIGTERM', () => {
+    sdk
+      .shutdown()
+      .then(() => log('info', 'OpenTelemetry successfully terminated'))
+      .catch((err: Error) =>
+        log('error', 'OpenTelemetry failed to terminate', { err }),
+      )
+      .finally(() => process.exit(0)); // eslint-disable-line no-process-exit
+  });
+};
+
+if (process.env.OPENTELEMETRY_ENABLED === 'true') {
+  main();
+} else {
+  log('info', 'OpenTelemetry not enabled');
+}

package/template/greeter/README.md

@@ -75,7 +75,7 @@ For inspiration in this space, check out:
 
 ### Dev
 
-TODO: add support links for the dev environment.
+TODO: add support links for the dev deployment.
 
 <!--
 - CloudWatch dashboard
@@ -85,7 +85,7 @@ TODO: add support links for the dev environment.
 
 ### Prod
 
-TODO: add support links for the prod environment.
+TODO: add support links for the prod deployment.
 
 <!--
 - CloudWatch dashboard

package/template/greeter/package.json

@@ -17,9 +17,9 @@
   },
   "devDependencies": {
     "@types/node": "^22.13.10",
-    "skuba": "12.1.0-hoist-less-20250722131939"
+    "skuba": "12.1.0-main-20250812041011"
   },
-  "packageManager": "pnpm@10.12.4",
+  "packageManager": "pnpm@10.14.0",
   "engines": {
     "node": ">=22"
   }

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

@@ -77,6 +77,9 @@ steps:
       queue: <%- devBuildkiteQueueName %>
     label: 🤞 Deploy Dev
     concurrency_group: <%- teamName %>/deploy/gantry/<%- devGantryEnvironmentName %>
+    env:
+      DD_DEPLOYMENT_ENVIRONMENT: development
+      DD_DEPLOYMENT_SERVICE: <%- serviceName %>
     key: deploy-dev
     plugins:
       - seek-jobs/gantry#v4.0.0:
@@ -93,6 +96,9 @@ steps:
     branches: ${BUILDKITE_PIPELINE_DEFAULT_BRANCH}
     concurrency_group: <%- teamName %>/deploy/gantry/<%- prodGantryEnvironmentName %>
     depends_on: deploy-dev
+    env:
+      DD_DEPLOYMENT_ENVIRONMENT: production
+      DD_DEPLOYMENT_SERVICE: <%- serviceName %>
     plugins:
       - seek-jobs/gantry#v4.0.0:
           command: apply