skuba 0.0.0-master-20230318051429 → 0.0.0-preserve-assets-20230504052952

package/lib/utils/exec.js

@@ -45,10 +45,7 @@ var import_npm_which = __toESM(require("npm-which"));
 var import_error = require("./error");
 var import_logging = require("./logging");
 class YarnSpamFilter extends import_stream.default.Transform {
-  constructor() {
-    super(...arguments);
-    this.silenced = false;
-  }
+  silenced = false;
   _transform(chunk, _encoding, callback) {
     const str = Buffer.from(chunk).toString();
     if (str.startsWith("info Direct dependencies")) {

package/lib/utils/exec.js.map

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../src/utils/exec.ts"],
   "sourcesContent": ["import { cpus } from 'os';\nimport stream from 'stream';\nimport util from 'util';\n\nimport type { Color } from 'chalk';\nimport concurrently from 'concurrently';\nimport type { ExecaChildProcess } from 'execa';\nimport execa from 'execa';\nimport npmRunPath from 'npm-run-path';\nimport npmWhich from 'npm-which';\n\nimport { ConcurrentlyErrors, isErrorWithCode } from './error';\nimport { log } from './logging';\n\nclass YarnSpamFilter extends stream.Transform {\n  silenced = false;\n\n  _transform(\n    chunk: Uint8Array,\n    _encoding: BufferEncoding,\n    callback: stream.TransformCallback,\n  ) {\n    const str = Buffer.from(chunk).toString();\n\n    // Yarn spews the entire installed dependency tree after this message\n    if (str.startsWith('info Direct dependencies')) {\n      this.silenced = true;\n    }\n\n    if (\n      !this.silenced &&\n      // This isn't very useful given the command generates a lockfile\n      !str.startsWith('info No lockfile found')\n    ) {\n      this.push(chunk);\n    }\n\n    callback();\n  }\n}\n\nclass YarnWarningFilter extends stream.Transform {\n  _transform(\n    chunk: Uint8Array,\n    _encoding: BufferEncoding,\n    callback: stream.TransformCallback,\n  ) {\n    const str = Buffer.from(chunk).toString();\n\n    // Filter out annoying deprecation warnings that users can do little about\n    if (!str.startsWith('warning skuba >')) {\n      this.push(chunk);\n    }\n\n    callback();\n  }\n}\n\nexport type Exec = (\n  command: string,\n  ...args: string[]\n) => ExecaChildProcess<string>;\n\ninterface ExecConcurrentlyCommand {\n  command: string;\n  name: string;\n  prefixColor?: typeof Color;\n}\n\ninterface ExecConcurrentlyOptions {\n  /**\n   * The maximum number of processes that can execute concurrently.\n   *\n   * Defaults to the CPU core count.\n   */\n  maxProcesses?: number;\n\n  /**\n   * A set length to pad names to.\n   *\n   * Defaults to the length of the longest command name.\n   */\n  nameLength?: number;\n\n  /**\n   * The stream that logging output will be written to.\n   *\n   * Defaults to `process.stdout`.\n   */\n  outputStream?: stream.Writable;\n}\n\ntype ExecOptions = execa.Options & { streamStdio?: true | 'yarn' };\n\nconst envWithPath = {\n  PATH: npmRunPath({ cwd: __dirname }),\n};\n\nconst runCommand = (command: string, args: string[], opts?: ExecOptions) => {\n  const subprocess = execa(command, args, {\n    localDir: __dirname,\n    preferLocal: true,\n    stdio: 'inherit',\n    ...opts,\n  });\n\n  switch (opts?.streamStdio) {\n    case 'yarn':\n      const stderrFilter = new YarnWarningFilter();\n      const stdoutFilter = new YarnSpamFilter();\n\n      subprocess.stderr?.pipe(stderrFilter).pipe(process.stderr);\n      subprocess.stdout?.pipe(stdoutFilter).pipe(process.stdout);\n\n      break;\n\n    case true:\n      subprocess.stderr?.pipe(process.stderr);\n      subprocess.stdout?.pipe(process.stdout);\n\n      break;\n  }\n\n  return subprocess;\n};\n\nconst whichCallback = npmWhich(__dirname);\n\nconst which = util.promisify<string, string>(whichCallback);\n\nexport const createExec =\n  (opts: ExecOptions): Exec =>\n  (command, ...args) =>\n    runCommand(command, args, opts);\n\nexport const exec: Exec = (command, ...args) => runCommand(command, args);\n\nexport const execConcurrently = async (\n  commands: ExecConcurrentlyCommand[],\n  { maxProcesses, nameLength, outputStream }: ExecConcurrentlyOptions = {},\n) => {\n  const maxNameLength =\n    nameLength ??\n    commands.reduce(\n      (length, command) => Math.max(length, command.name.length),\n      0,\n    );\n\n  try {\n    await concurrently(\n      commands.map(({ command, name, prefixColor }) => ({\n        command,\n        env: envWithPath,\n        name: name.padEnd(maxNameLength),\n        prefixColor,\n      })),\n      {\n        maxProcesses: maxProcesses ?? cpus().length,\n\n        outputStream,\n\n        // Use a minimalist logging prefix.\n        prefix: '{name} \u2502',\n      },\n    ).result;\n  } catch (err) {\n    const result = ConcurrentlyErrors.validate(err);\n\n    if (!result.success) {\n      throw err;\n    }\n\n    const failed = result.value\n      .filter(({ exitCode }) => exitCode !== 0)\n      .sort(({ index: indexA }, { index: indexB }) => indexA - indexB)\n      .map((subprocess) => subprocess.command.name);\n\n    throw Error(\n      `${failed.join(', ')} subprocess${\n        failed.length === 1 ? '' : 'es'\n      } failed.`,\n    );\n  }\n};\n\nexport const ensureCommands = async (...names: string[]) => {\n  let success = true;\n\n  await Promise.all(\n    names.map(async (name) => {\n      const result = await hasCommand(name);\n\n      if (!result) {\n        success = false;\n\n        log.err(log.bold(name), 'needs to be installed.');\n      }\n    }),\n  );\n\n  if (!success) {\n    process.exit(1);\n  }\n};\n\nexport const hasCommand = async (name: string) => {\n  try {\n    await which(name);\n\n    return true;\n  } catch (err) {\n    if (isErrorWithCode(err, 'ENOENT')) {\n      return false;\n    }\n\n    throw err;\n  }\n};\n"],
-  "mappings": "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",
+  "mappings": "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",
   "names": ["stream", "npmRunPath", "execa", "npmWhich", "util", "concurrently"]
 }

package/lib/utils/manifest.d.ts

@@ -6,5 +6,6 @@ export declare const ProjectType: t.Union<[t.Literal<"application">, t.Literal<"
 export declare const PROJECT_TYPES: readonly ["application", "package"];
 export declare const getSkubaManifest: () => Promise<NormalizedPackageJson>;
 export declare const getConsumerManifest: () => Promise<readPkgUp.NormalizedReadResult | undefined>;
+export declare const getPropFromConsumerManifest: <V, T extends string = string>(prop: T) => Promise<V | undefined>;
 export declare const getStringPropFromConsumerManifest: <T extends string>(prop: T) => Promise<string | undefined>;
 export declare const getEntryPointFromManifest: () => Promise<string>;

package/lib/utils/manifest.js

@@ -32,6 +32,7 @@ __export(manifest_exports, {
   ProjectType: () => ProjectType,
   getConsumerManifest: () => getConsumerManifest,
   getEntryPointFromManifest: () => getEntryPointFromManifest,
+  getPropFromConsumerManifest: () => getPropFromConsumerManifest,
   getSkubaManifest: () => getSkubaManifest,
   getStringPropFromConsumerManifest: () => getStringPropFromConsumerManifest
 });
@@ -57,9 +58,13 @@ const getSkubaManifest = async () => {
   return skubaManifest = result.packageJson;
 };
 const getConsumerManifest = () => (0, import_read_pkg_up.default)();
-const getStringPropFromConsumerManifest = async (prop) => {
+const getPropFromConsumerManifest = async (prop) => {
   const result = await getConsumerManifest();
-  return result !== void 0 && (0, import_validation.hasStringProp)(result.packageJson.skuba, prop) ? result.packageJson.skuba[prop] : void 0;
+  return result !== void 0 && (0, import_validation.hasProp)(result.packageJson.skuba, prop) ? result.packageJson.skuba[prop] : void 0;
+};
+const getStringPropFromConsumerManifest = async (prop) => {
+  const result = await getPropFromConsumerManifest(prop);
+  return typeof result === "string" ? result : void 0;
 };
 const getEntryPointFromManifest = async () => {
   const entryPoint = await getStringPropFromConsumerManifest("entryPoint");
@@ -71,6 +76,7 @@ const getEntryPointFromManifest = async () => {
   ProjectType,
   getConsumerManifest,
   getEntryPointFromManifest,
+  getPropFromConsumerManifest,
   getSkubaManifest,
   getStringPropFromConsumerManifest
 });

package/lib/utils/manifest.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/utils/manifest.ts"],
-  "sourcesContent": ["/* eslint-disable new-cap */\n\nimport type { NormalizedPackageJson } from 'read-pkg-up';\nimport readPkgUp from 'read-pkg-up';\nimport * as t from 'runtypes';\n\nimport { hasStringProp } from './validation';\n\nexport type ProjectType = t.Static<typeof ProjectType>;\n\nexport const ProjectType = t.Union(\n  t.Literal('application'),\n  t.Literal('package'),\n);\n\nexport const PROJECT_TYPES = ['application', 'package'] as const;\n\nconst DEFAULT_ENTRY_POINT = 'src/app.ts';\n\nlet skubaManifest: NormalizedPackageJson | undefined;\n\nexport const getSkubaManifest = async (): Promise<NormalizedPackageJson> => {\n  if (skubaManifest !== undefined) {\n    return skubaManifest;\n  }\n\n  const result = await readPkgUp({ cwd: __dirname });\n\n  if (result === undefined) {\n    throw Error('skuba could not find its own manifest');\n  }\n\n  return (skubaManifest = result.packageJson);\n};\n\nexport const getConsumerManifest = () => readPkgUp();\n\nexport const getStringPropFromConsumerManifest = async <T extends string>(\n  prop: T,\n): Promise<string | undefined> => {\n  const result = await getConsumerManifest();\n\n  return result !== undefined && hasStringProp(result.packageJson.skuba, prop)\n    ? result.packageJson.skuba[prop]\n    : undefined;\n};\n\nexport const getEntryPointFromManifest = async (): Promise<string> => {\n  const entryPoint = await getStringPropFromConsumerManifest('entryPoint');\n\n  return entryPoint ?? DEFAULT_ENTRY_POINT;\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAGA,yBAAsB;AACtB,QAAmB;AAEnB,wBAA8B;AAIvB,MAAM,cAAc,EAAE;AAAA,EAC3B,EAAE,QAAQ,aAAa;AAAA,EACvB,EAAE,QAAQ,SAAS;AACrB;AAEO,MAAM,gBAAgB,CAAC,eAAe,SAAS;AAEtD,MAAM,sBAAsB;AAE5B,IAAI;AAEG,MAAM,mBAAmB,YAA4C;AAC1E,MAAI,kBAAkB,QAAW;AAC/B,WAAO;AAAA,EACT;AAEA,QAAM,SAAS,UAAM,mBAAAA,SAAU,EAAE,KAAK,UAAU,CAAC;AAEjD,MAAI,WAAW,QAAW;AACxB,UAAM,MAAM,uCAAuC;AAAA,EACrD;AAEA,SAAQ,gBAAgB,OAAO;AACjC;AAEO,MAAM,sBAAsB,UAAM,mBAAAA,SAAU;AAE5C,MAAM,oCAAoC,OAC/C,SACgC;AAChC,QAAM,SAAS,MAAM,oBAAoB;AAEzC,SAAO,WAAW,cAAa,iCAAc,OAAO,YAAY,OAAO,IAAI,IACvE,OAAO,YAAY,MAAM,IAAI,IAC7B;AACN;AAEO,MAAM,4BAA4B,YAA6B;AACpE,QAAM,aAAa,MAAM,kCAAkC,YAAY;AAEvE,SAAO,cAAc;AACvB;",
+  "sourcesContent": ["/* eslint-disable new-cap */\n\nimport type { NormalizedPackageJson } from 'read-pkg-up';\nimport readPkgUp from 'read-pkg-up';\nimport * as t from 'runtypes';\n\nimport { hasProp } from './validation';\n\nexport type ProjectType = t.Static<typeof ProjectType>;\n\nexport const ProjectType = t.Union(\n  t.Literal('application'),\n  t.Literal('package'),\n);\n\nexport const PROJECT_TYPES = ['application', 'package'] as const;\n\nconst DEFAULT_ENTRY_POINT = 'src/app.ts';\n\nlet skubaManifest: NormalizedPackageJson | undefined;\n\nexport const getSkubaManifest = async (): Promise<NormalizedPackageJson> => {\n  if (skubaManifest !== undefined) {\n    return skubaManifest;\n  }\n\n  const result = await readPkgUp({ cwd: __dirname });\n\n  if (result === undefined) {\n    throw Error('skuba could not find its own manifest');\n  }\n\n  return (skubaManifest = result.packageJson);\n};\n\nexport const getConsumerManifest = () => readPkgUp();\n\nexport const getPropFromConsumerManifest = async <V, T extends string = string>(\n  prop: T,\n): Promise<V | undefined> => {\n  const result = await getConsumerManifest();\n\n  return result !== undefined && hasProp(result.packageJson.skuba, prop)\n    ? (result.packageJson.skuba as Record<T, V>)[prop]\n    : undefined;\n};\n\nexport const getStringPropFromConsumerManifest = async <T extends string>(\n  prop: T,\n): Promise<string | undefined> => {\n  const result = await getPropFromConsumerManifest<unknown, T>(prop);\n\n  return typeof result === 'string' ? result : undefined;\n};\n\nexport const getEntryPointFromManifest = async (): Promise<string> => {\n  const entryPoint = await getStringPropFromConsumerManifest('entryPoint');\n\n  return entryPoint ?? DEFAULT_ENTRY_POINT;\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAGA,yBAAsB;AACtB,QAAmB;AAEnB,wBAAwB;AAIjB,MAAM,cAAc,EAAE;AAAA,EAC3B,EAAE,QAAQ,aAAa;AAAA,EACvB,EAAE,QAAQ,SAAS;AACrB;AAEO,MAAM,gBAAgB,CAAC,eAAe,SAAS;AAEtD,MAAM,sBAAsB;AAE5B,IAAI;AAEG,MAAM,mBAAmB,YAA4C;AAC1E,MAAI,kBAAkB,QAAW;AAC/B,WAAO;AAAA,EACT;AAEA,QAAM,SAAS,UAAM,mBAAAA,SAAU,EAAE,KAAK,UAAU,CAAC;AAEjD,MAAI,WAAW,QAAW;AACxB,UAAM,MAAM,uCAAuC;AAAA,EACrD;AAEA,SAAQ,gBAAgB,OAAO;AACjC;AAEO,MAAM,sBAAsB,UAAM,mBAAAA,SAAU;AAE5C,MAAM,8BAA8B,OACzC,SAC2B;AAC3B,QAAM,SAAS,MAAM,oBAAoB;AAEzC,SAAO,WAAW,cAAa,2BAAQ,OAAO,YAAY,OAAO,IAAI,IAChE,OAAO,YAAY,MAAuB,IAAI,IAC/C;AACN;AAEO,MAAM,oCAAoC,OAC/C,SACgC;AAChC,QAAM,SAAS,MAAM,4BAAwC,IAAI;AAEjE,SAAO,OAAO,WAAW,WAAW,SAAS;AAC/C;AAEO,MAAM,4BAA4B,YAA6B;AACpE,QAAM,aAAa,MAAM,kCAAkC,YAAY;AAEvE,SAAO,cAAc;AACvB;",
   "names": ["readPkgUp"]
 }

package/lib/wrapper/requestListener.js

@@ -50,6 +50,9 @@ const runRequestListener = async ({
     return;
   }
   const port = (0, import_validation.isIpPort)(config.port) ? config.port : availablePort;
+  if (typeof config !== "function" && config instanceof import_http.default.Server) {
+    return (0, import_http2.startServer)(config, port);
+  }
   if (typeof config !== "function" && config.server && config.server instanceof import_http.default.Server) {
     return (0, import_http2.startServer)(config.server, port);
   }

package/lib/wrapper/requestListener.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/wrapper/requestListener.ts"],
-  "sourcesContent": ["import http from 'http';\n\nimport { isFunction, isIpPort, isObject } from '../utils/validation';\n\nimport { serveRequestListener, startServer } from './http';\n\n// Express compatibility\ninterface FunctionConfig extends http.RequestListener {\n  port?: number;\n}\n\ninterface ObjectConfig {\n  // Koa compatibility\n  callback?: () => http.RequestListener;\n\n  requestListener?: http.RequestListener;\n\n  // Fastify compatibility\n  server?: http.Server;\n\n  default?: Promise<unknown>;\n  port?: unknown;\n}\n\nconst isConfig = (\n  data: unknown,\n): data is Promise<FunctionConfig> | Promise<ObjectConfig> =>\n  isFunction(data) || isObject(data);\n\ninterface Args {\n  availablePort?: number;\n  entryPoint: unknown;\n}\n\n/**\n * Create an HTTP server that calls into an exported `http.RequestListener`.\n *\n * This supports Express and Koa applications out of the box.\n */\nexport const runRequestListener = async ({\n  availablePort,\n  entryPoint,\n}: Args): Promise<void> => {\n  if (!isConfig(entryPoint)) {\n    // Assume an executable script with weird exports\n    return;\n  }\n\n  let config: FunctionConfig | ObjectConfig = await entryPoint;\n\n  if (typeof config === 'object' && isConfig(config.default)) {\n    // Prefer `export default` over `export =`\n    config = await config.default;\n  }\n\n  if (Object.keys(config).length === 0) {\n    // Assume an executable script with no exports\n    return;\n  }\n\n  const port = isIpPort(config.port) ? config.port : availablePort;\n\n  // Fastify workaround\n  if (\n    typeof config !== 'function' &&\n    config.server &&\n    config.server instanceof http.Server\n  ) {\n    return startServer(config.server, port);\n  }\n\n  const requestListener =\n    typeof config === 'function'\n      ? config\n      : config.requestListener ?? config.callback?.();\n\n  if (typeof requestListener !== 'function') {\n    // Assume an executable script with non-request listener exports\n    return;\n  }\n\n  return serveRequestListener(requestListener, port);\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AAEjB,wBAA+C;AAE/C,IAAAA,eAAkD;AAoBlD,MAAM,WAAW,CACf,aAEA,8BAAW,IAAI,SAAK,4BAAS,IAAI;AAY5B,MAAM,qBAAqB,OAAO;AAAA,EACvC;AAAA,EACA;AACF,MAA2B;AACzB,MAAI,CAAC,SAAS,UAAU,GAAG;AAEzB;AAAA,EACF;AAEA,MAAI,SAAwC,MAAM;AAElD,MAAI,OAAO,WAAW,YAAY,SAAS,OAAO,OAAO,GAAG;AAE1D,aAAS,MAAM,OAAO;AAAA,EACxB;AAEA,MAAI,OAAO,KAAK,MAAM,EAAE,WAAW,GAAG;AAEpC;AAAA,EACF;AAEA,QAAM,WAAO,4BAAS,OAAO,IAAI,IAAI,OAAO,OAAO;AAGnD,MACE,OAAO,WAAW,cAClB,OAAO,UACP,OAAO,kBAAkB,YAAAC,QAAK,QAC9B;AACA,eAAO,0BAAY,OAAO,QAAQ,IAAI;AAAA,EACxC;AAEA,QAAM,kBACJ,OAAO,WAAW,aACd,SACA,OAAO,mBAAmB,OAAO,WAAW;AAElD,MAAI,OAAO,oBAAoB,YAAY;AAEzC;AAAA,EACF;AAEA,aAAO,mCAAqB,iBAAiB,IAAI;AACnD;",
+  "sourcesContent": ["import http from 'http';\n\nimport { isFunction, isIpPort, isObject } from '../utils/validation';\n\nimport { serveRequestListener, startServer } from './http';\n\n// Express compatibility\ninterface FunctionConfig extends http.RequestListener {\n  port?: number;\n}\n\ninterface ObjectConfig {\n  // Koa compatibility\n  callback?: () => http.RequestListener;\n\n  requestListener?: http.RequestListener;\n\n  // Fastify compatibility\n  server?: http.Server;\n\n  default?: Promise<unknown>;\n  port?: unknown;\n}\n\nconst isConfig = (\n  data: unknown,\n): data is Promise<FunctionConfig> | Promise<ObjectConfig> =>\n  isFunction(data) || isObject(data);\n\ninterface Args {\n  availablePort?: number;\n  entryPoint: unknown;\n}\n\n/**\n * Create an HTTP server that calls into an exported `http.RequestListener`.\n *\n * This supports Express and Koa applications out of the box.\n */\nexport const runRequestListener = async ({\n  availablePort,\n  entryPoint,\n}: Args): Promise<void> => {\n  if (!isConfig(entryPoint)) {\n    // Assume an executable script with weird exports\n    return;\n  }\n\n  let config: FunctionConfig | ObjectConfig = await entryPoint;\n\n  if (typeof config === 'object' && isConfig(config.default)) {\n    // Prefer `export default` over `export =`\n    config = await config.default;\n  }\n\n  if (Object.keys(config).length === 0) {\n    // Assume an executable script with no exports\n    return;\n  }\n\n  const port = isIpPort(config.port) ? config.port : availablePort;\n\n  // http.Server support\n  if (typeof config !== 'function' && config instanceof http.Server) {\n    return startServer(config, port);\n  }\n\n  // Fastify workaround\n  if (\n    typeof config !== 'function' &&\n    config.server &&\n    config.server instanceof http.Server\n  ) {\n    return startServer(config.server, port);\n  }\n\n  const requestListener =\n    typeof config === 'function'\n      ? config\n      : config.requestListener ?? config.callback?.();\n\n  if (typeof requestListener !== 'function') {\n    // Assume an executable script with non-request listener exports\n    return;\n  }\n\n  return serveRequestListener(requestListener, port);\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AAEjB,wBAA+C;AAE/C,IAAAA,eAAkD;AAoBlD,MAAM,WAAW,CACf,aAEA,8BAAW,IAAI,SAAK,4BAAS,IAAI;AAY5B,MAAM,qBAAqB,OAAO;AAAA,EACvC;AAAA,EACA;AACF,MAA2B;AACzB,MAAI,CAAC,SAAS,UAAU,GAAG;AAEzB;AAAA,EACF;AAEA,MAAI,SAAwC,MAAM;AAElD,MAAI,OAAO,WAAW,YAAY,SAAS,OAAO,OAAO,GAAG;AAE1D,aAAS,MAAM,OAAO;AAAA,EACxB;AAEA,MAAI,OAAO,KAAK,MAAM,EAAE,WAAW,GAAG;AAEpC;AAAA,EACF;AAEA,QAAM,WAAO,4BAAS,OAAO,IAAI,IAAI,OAAO,OAAO;AAGnD,MAAI,OAAO,WAAW,cAAc,kBAAkB,YAAAC,QAAK,QAAQ;AACjE,eAAO,0BAAY,QAAQ,IAAI;AAAA,EACjC;AAGA,MACE,OAAO,WAAW,cAClB,OAAO,UACP,OAAO,kBAAkB,YAAAA,QAAK,QAC9B;AACA,eAAO,0BAAY,OAAO,QAAQ,IAAI;AAAA,EACxC;AAEA,QAAM,kBACJ,OAAO,WAAW,aACd,SACA,OAAO,mBAAmB,OAAO,WAAW;AAElD,MAAI,OAAO,oBAAoB,YAAY;AAEzC;AAAA,EACF;AAEA,aAAO,mCAAqB,iBAAiB,IAAI;AACnD;",
   "names": ["import_http", "http"]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skuba",
-  "version": "0.0.0-master-20230318051429",
+  "version": "0.0.0-preserve-assets-20230504052952",
   "private": false,
   "description": "SEEK development toolkit for backend applications and packages",
   "homepage": "https://github.com/seek-oss/skuba#readme",
@@ -65,25 +65,25 @@
     ]
   },
   "resolutions": {
-    "**/@types/node": ">=14.18"
+    "**/@types/node": ">=16.11"
   },
   "dependencies": {
     "@esbuild-plugins/tsconfig-paths": "^0.1.0",
     "@jest/types": "^29.0.0",
     "@octokit/graphql": "^5.0.0",
-    "@octokit/graphql-schema": "^13.0.0",
+    "@octokit/graphql-schema": "^14.0.0",
     "@octokit/rest": "^19.0.0",
     "@octokit/types": "^9.0.0",
     "@types/jest": "^29.0.0",
-    "@types/node": ">=14.18",
+    "@types/node": ">=16.11",
     "chalk": "^4.1.0",
-    "concurrently": "^7.0.0",
+    "concurrently": "^8.0.0",
     "dotenv": "^16.0.0",
     "ejs": "^3.1.6",
     "enquirer": "^2.3.6",
     "esbuild": "~0.17.0",
     "eslint": "^8.11.0",
-    "eslint-config-skuba": "1.3.0",
+    "eslint-config-skuba": "2.0.2",
     "execa": "^5.0.0",
     "fdir": "^6.0.0",
     "fs-extra": "^11.0.0",
@@ -102,7 +102,7 @@
     "npm-run-path": "^4.0.1",
     "npm-which": "^3.0.1",
     "picomatch": "^2.2.2",
-    "prettier": "~2.8.0",
+    "prettier": "~2.8.5",
     "read-pkg-up": "^7.0.1",
     "runtypes": "^6.0.0",
     "semantic-release": "^19.0.0",
@@ -116,17 +116,17 @@
     "ts-node-dev": "^2.0.0",
     "tsconfig-paths": "^4.0.0",
     "tsconfig-seek": "1.0.2",
-    "typescript": "~4.9.0",
+    "typescript": "~5.0.0",
     "validate-npm-package-name": "^5.0.0"
   },
   "devDependencies": {
-    "@changesets/cli": "2.26.0",
+    "@changesets/cli": "2.26.1",
     "@changesets/get-github-info": "0.5.2",
-    "@jest/reporters": "29.4.3",
+    "@jest/reporters": "29.5.0",
     "@types/ejs": "3.1.2",
     "@types/express": "4.17.17",
     "@types/fs-extra": "11.0.1",
-    "@types/koa": "2.13.5",
+    "@types/koa": "2.13.6",
     "@types/libnpmsearch": "2.0.3",
     "@types/lodash.mergewith": "4.6.7",
     "@types/module-alias": "2.0.1",
@@ -136,13 +136,13 @@
     "@types/validate-npm-package-name": "4.0.0",
     "enhanced-resolve": "5.12.0",
     "express": "4.18.2",
-    "fastify": "4.13.0",
+    "fastify": "4.15.0",
     "jsonfile": "6.1.0",
     "koa": "2.14.1",
-    "memfs": "3.4.13",
+    "memfs": "3.5.0",
     "remark-cli": "11.0.0",
     "remark-preset-lint-recommended": "6.1.2",
-    "semver": "7.3.8",
+    "semver": "7.4.0",
     "supertest": "6.3.3",
     "type-fest": "2.19.0"
   },
@@ -155,7 +155,7 @@
     }
   },
   "engines": {
-    "node": ">=14.18"
+    "node": ">=16.11"
   },
   "skuba": {
     "build": "esbuild",

package/template/base/.github/CODEOWNERS

@@ -1,5 +1 @@
 * @<%- ownerName %>
-
-# Configured by Renovate
-package.json
-yarn.lock

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

@@ -51,7 +51,7 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - docker-compose#v4.11.0:
+      - docker-compose#v4.12.0:
           run: app
     timeout_in_minutes: 10
 

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

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

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

@@ -12,7 +12,7 @@
     "test:watch": "skuba test --watch"
   },
   "dependencies": {
-    "@seek/logger": "^5.0.1",
+    "@seek/logger": "^6.0.0",
     "express": "^4.17.1",
     "skuba-dive": "^2.0.0"
   },

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

@@ -1,4 +1,4 @@
-import { Handler } from 'express';
+import type { Handler } from 'express';
 
 /**
  * Signifies that the API is available to serve requests.

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

@@ -1,4 +1,4 @@
-import { Handler } from 'express';
+import type { Handler } from 'express';
 
 /**
  * Tests connectivity to ensure appropriate access and network configuration.

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

@@ -32,6 +32,6 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - docker-compose#v4.11.0:
+      - docker-compose#v4.12.0:
           run: app
     timeout_in_minutes: 10

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

@@ -51,7 +51,7 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - docker-compose#v4.11.0:
+      - docker-compose#v4.12.0:
           run: app
     timeout_in_minutes: 10
 

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

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

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

@@ -14,17 +14,17 @@
   "dependencies": {
     "@koa/router": "^12.0.0",
     "@opentelemetry/api": "^1.1.0",
-    "@opentelemetry/exporter-collector-grpc": "^0.25.0",
+    "@opentelemetry/exporter-trace-otlp-grpc": "^0.38.0",
     "@opentelemetry/instrumentation-aws-sdk": "^0.34.0",
-    "@opentelemetry/instrumentation-http": "^0.36.0",
-    "@opentelemetry/sdk-node": "^0.35.0",
-    "@seek/logger": "^5.0.1",
+    "@opentelemetry/instrumentation-http": "^0.38.0",
+    "@opentelemetry/sdk-node": "^0.38.0",
+    "@seek/logger": "^6.0.0",
     "aws-sdk": "^2.1039.0",
     "hot-shots": "^10.0.0",
     "koa": "^2.13.4",
     "koa-bodyparser": "^4.3.0",
     "koa-compose": "^4.2.0",
-    "seek-datadog-custom-metrics": "^4.0.0",
+    "seek-datadog-custom-metrics": "^4.2.1",
     "seek-koala": "^6.0.0",
     "skuba-dive": "^2.0.0",
     "zod": "^3.19.1"

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

@@ -1,4 +1,4 @@
-import { Middleware } from 'src/types/koa';
+import type { Middleware } from 'src/types/koa';
 
 /**
  * Signifies that the API is available to serve requests.

package/template/koa-rest-api/src/api/jobs/getJobs.ts

@@ -1,7 +1,7 @@
 import { logger } from 'src/framework/logging';
 import { metricsClient } from 'src/framework/metrics';
 import * as storage from 'src/storage/jobs';
-import { Middleware } from 'src/types/koa';
+import type { Middleware } from 'src/types/koa';
 
 export const getJobsHandler: Middleware = async (ctx) => {
   const jobs = await storage.readJobs();

package/template/koa-rest-api/src/api/jobs/postJob.ts

@@ -3,7 +3,7 @@ import { metricsClient } from 'src/framework/metrics';
 import { validateRequestBody } from 'src/framework/validation';
 import * as storage from 'src/storage/jobs';
 import { JobInputSchema } from 'src/types/jobs';
-import { Middleware } from 'src/types/koa';
+import type { Middleware } from 'src/types/koa';
 
 export const postJobHandler: Middleware = async (ctx) => {
   const jobInput = validateRequestBody(ctx, JobInputSchema);

package/template/koa-rest-api/src/api/smokeTest.ts

@@ -1,5 +1,5 @@
 import { smokeTestJobStorage } from 'src/storage/jobs';
-import { Middleware } from 'src/types/koa';
+import type { Middleware } from 'src/types/koa';
 
 /**
  * Tests connectivity to ensure appropriate access and network configuration.

package/template/koa-rest-api/src/framework/server.test.ts

@@ -4,7 +4,7 @@ import { logger } from 'src/testing/logging';
 import { metricsClient } from 'src/testing/metrics';
 import { agentFromRouter } from 'src/testing/server';
 import { chance } from 'src/testing/types';
-import { Middleware } from 'src/types/koa';
+import type { Middleware } from 'src/types/koa';
 
 const middleware = jest.fn<void, Parameters<Middleware>>();
 

package/template/koa-rest-api/src/framework/validation.ts

@@ -1,7 +1,7 @@
 import { ErrorMiddleware } from 'seek-koala';
-import { z } from 'zod';
+import type { z } from 'zod';
 
-import { Context } from 'src/types/koa';
+import type { Context } from 'src/types/koa';
 
 /**
  * Converts a `ZodError` into an `invalidFields` object

package/template/koa-rest-api/src/storage/jobs.ts

@@ -1,6 +1,6 @@
 import { randomUUID } from 'crypto';
 
-import { Job, JobInput } from 'src/types/jobs';
+import type { Job, JobInput } from 'src/types/jobs';
 
 const jobStore: Record<string, Job> = {};
 

package/template/koa-rest-api/src/testing/server.ts

@@ -1,5 +1,5 @@
-import Router from '@koa/router';
-import Koa from 'koa';
+import type Router from '@koa/router';
+import type Koa from 'koa';
 import request from 'supertest';
 
 import { createApp } from 'src/framework/server';

package/template/koa-rest-api/src/testing/types.ts

@@ -1,7 +1,7 @@
 import { Chance } from 'chance';
 import { z } from 'zod';
 
-import { JobInput } from 'src/types/jobs';
+import type { JobInput } from 'src/types/jobs';
 
 export type IdDescription = z.infer<typeof IdDescriptionSchema>;
 

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

@@ -6,7 +6,7 @@
 
 import { propagation } from '@opentelemetry/api';
 import { CompositePropagator } from '@opentelemetry/core';
-import { CollectorTraceExporter } from '@opentelemetry/exporter-collector-grpc';
+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';
@@ -31,17 +31,12 @@ const main = () => {
   );
 
   const sdk = new NodeSDK({
-    traceExporter: new CollectorTraceExporter(),
+    traceExporter: new OTLPTraceExporter(),
     autoDetectResources: false,
     instrumentations: [new HttpInstrumentation(), new AwsInstrumentation()],
   });
 
-  sdk
-    .start()
-    .then(() => log('info', 'OpenTelemetry initialised'))
-    .catch((err: Error) =>
-      log('error', 'OpenTelemetry not initialised', { err }),
-    );
+  sdk.start();
 
   process.on('SIGTERM', () => {
     sdk

package/template/koa-rest-api/tsconfig.json

@@ -0,0 +1,18 @@
+{
+  "compilerOptions": {
+    "baseUrl": ".",
+    "lib": [
+      // open-telemetry/opentelemetry-js#3580
+      "DOM",
+
+      "ES2022"
+    ],
+    "outDir": "lib",
+    "paths": {
+      "src": ["src"]
+    },
+    "target": "ES2022"
+  },
+  "exclude": ["lib*/**/*"],
+  "extends": "skuba/config/tsconfig.json"
+}

package/template/lambda-sqs-worker/.buildkite/pipeline.yml

@@ -32,7 +32,7 @@ configs:
         - *aws-sm
         - *private-npm
         - *docker-ecr-cache
-        - docker-compose#v4.11.0:
+        - docker-compose#v4.12.0:
             dependencies: false
             run: app
       retry:
@@ -60,7 +60,7 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - docker-compose#v4.11.0:
+      - docker-compose#v4.12.0:
           run: app
     timeout_in_minutes: 10
 

package/template/lambda-sqs-worker/package.json

@@ -18,8 +18,8 @@
     "@aws-sdk/client-lambda": "^3.259.0",
     "@aws-sdk/client-sns": "^3.259.0",
     "@aws-sdk/util-utf8-node": "^3.259.0",
-    "@seek/logger": "^5.0.1",
-    "datadog-lambda-js": "^6.83.0",
+    "@seek/logger": "^6.0.0",
+    "datadog-lambda-js": "^7.0.0",
     "dd-trace": "^3.8.0",
     "skuba-dive": "^2.0.0",
     "zod": "^3.19.1"

package/template/lambda-sqs-worker/src/app.ts

@@ -1,6 +1,6 @@
 import 'skuba-dive/register';
 
-import { SQSEvent } from 'aws-lambda';
+import type { SQSEvent } from 'aws-lambda';
 
 import { createHandler } from 'src/framework/handler';
 import { logger } from 'src/framework/logging';

package/template/lambda-sqs-worker/src/framework/validation.ts

@@ -1,4 +1,4 @@
-import { z } from 'zod';
+import type { z } from 'zod';
 
 export const validateJson = <
   Output,

package/template/lambda-sqs-worker/src/mapping/jobScorer.ts

@@ -1,5 +1,8 @@
-import { JobScorerInput, JobScorerOutput } from 'src/types/jobScorer';
-import { JobPublishedEvent, JobScoredEvent } from 'src/types/pipelineEvents';
+import type { JobScorerInput, JobScorerOutput } from 'src/types/jobScorer';
+import type {
+  JobPublishedEvent,
+  JobScoredEvent,
+} from 'src/types/pipelineEvents';
 
 export const jobPublishedEventToScorerInput = (
   record: JobPublishedEvent,

package/template/lambda-sqs-worker/src/services/jobScorer.ts

@@ -2,12 +2,12 @@ import {
   jobPublishedEventToScorerInput,
   jobScorerOutputToScoredEvent,
 } from 'src/mapping/jobScorer';
-import {
-  JobScorerInput,
-  JobScorerOutput,
-  JobScorerOutputSchema,
-} from 'src/types/jobScorer';
-import { JobPublishedEvent, JobScoredEvent } from 'src/types/pipelineEvents';
+import type { JobScorerInput, JobScorerOutput } from 'src/types/jobScorer';
+import { JobScorerOutputSchema } from 'src/types/jobScorer';
+import type {
+  JobPublishedEvent,
+  JobScoredEvent,
+} from 'src/types/pipelineEvents';
 
 /* istanbul ignore next: simulation of an external service */
 export const scoringService = {

package/template/lambda-sqs-worker/src/testing/handler.ts

@@ -1,4 +1,4 @@
-import { Context, SQSEvent } from 'aws-lambda';
+import type { Context, SQSEvent } from 'aws-lambda';
 
 import { chance } from './types';
 

package/template/lambda-sqs-worker/src/testing/types.ts

@@ -1,7 +1,7 @@
 import { Chance } from 'chance';
 import { z } from 'zod';
 
-import { JobPublishedEvent } from 'src/types/pipelineEvents';
+import type { JobPublishedEvent } from 'src/types/pipelineEvents';
 
 export type IdDescription = z.infer<typeof IdDescriptionSchema>;
 

package/template/lambda-sqs-worker-cdk/.buildkite/pipeline.yml

@@ -32,7 +32,7 @@ configs:
         - *aws-sm
         - *private-npm
         - *docker-ecr-cache
-        - docker-compose#v4.11.0:
+        - docker-compose#v4.12.0:
             dependencies: false
             run: app
       retry:
@@ -57,7 +57,7 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - docker-compose#v4.11.0:
+      - docker-compose#v4.12.0:
           run: app
     timeout_in_minutes: 10
 

package/template/lambda-sqs-worker-cdk/infra/appStack.ts

@@ -1,6 +1,6 @@
+import type { StackProps } from 'aws-cdk-lib';
 import {
   Stack,
-  StackProps,
   aws_iam,
   aws_kms,
   aws_lambda,

package/template/lambda-sqs-worker-cdk/package.json

@@ -12,7 +12,7 @@
     "test:watch": "skuba test --watch"
   },
   "dependencies": {
-    "@seek/logger": "^5.0.1",
+    "@seek/logger": "^6.0.0",
     "zod": "^3.19.1"
   },
   "devDependencies": {

package/template/lambda-sqs-worker-cdk/src/app.ts

@@ -1,5 +1,5 @@
 import createLogger from '@seek/logger';
-import { SQSEvent, SQSHandler } from 'aws-lambda';
+import type { SQSEvent, SQSHandler } from 'aws-lambda';
 
 const logger = createLogger({
   name: '<%- serviceName %>',