skuba 9.0.0-renovate-eslint-9.x-20240811060718 → 9.0.0-renovate-eslint-9.x-20240923103202

package/lib/cli/lint/internalLints/upgrade/patches/8.2.1/upgradeESLint.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../../src/cli/lint/internalLints/upgrade/patches/8.2.1/upgradeESLint.ts"],
-  "sourcesContent": ["// eslint-disable-next-line no-restricted-imports -- fs-extra is mocked\nimport * as fsp from 'fs/promises';\nimport path from 'path';\nimport { inspect } from 'util';\n\nimport { promises as fsExtra } from 'fs-extra';\n\nimport type { PatchFunction, PatchReturnType } from '../..';\nimport { createExec } from '../../../../../../utils/exec';\nimport { log } from '../../../../../../utils/logging';\nimport { createDestinationFileReader } from '../../../../../configure/analysis/project';\nimport { mergeWithConfigFile } from '../../../../../configure/processing/configFile';\nimport { formatPrettier } from '../../../../../configure/processing/prettier';\n\nconst upgradeESLint: PatchFunction = async ({\n  mode,\n  dir: cwd = process.cwd(),\n}): Promise<PatchReturnType> => {\n  const readFile = createDestinationFileReader(cwd);\n  const [originalIgnoreContents, eslintConfig] = await Promise.all([\n    readFile('.eslintignore'),\n    readFile('.eslintrc.js'),\n  ]);\n\n  if (eslintConfig === undefined) {\n    return {\n      result: 'skip',\n      reason: 'no .eslintrc.js - have you already migrated?',\n    };\n  }\n\n  if (mode === 'lint') {\n    return { result: 'apply' };\n  }\n\n  const mergedIgnoreContent = mergeWithConfigFile(\n    '',\n    'ignore',\n  )(originalIgnoreContents);\n\n  const exec = createExec({\n    cwd: process.cwd(),\n    stdio: 'ignore',\n  });\n\n  // eslint-migrate-config require()s the file, so for testability, put it in a temporary location\n  const dir = await writeTemporaryFiles({\n    '.eslintrc.js': eslintConfig,\n    ...(mergedIgnoreContent.trim().length > 0\n      ? { '.eslintignore': mergedIgnoreContent }\n      : {}),\n  });\n  try {\n    await exec(\n      'eslint-migrate-config',\n      path.join(dir, '.eslintrc.js'),\n      '--commonjs',\n    );\n\n    const output = fiddleWithOutput(\n      await fsp.readFile(path.join(dir, 'eslint.config.cjs'), 'utf-8'),\n    );\n    await fsExtra.writeFile(\n      'eslint.config.js',\n      await formatPrettier(output, { filepath: 'eslint.config.js' }),\n    );\n\n    await Promise.all([\n      originalIgnoreContents === undefined\n        ? Promise.resolve()\n        : fsExtra.rm('.eslintignore'),\n      fsExtra.rm('.eslintrc.js'),\n    ]);\n\n    return { result: 'apply' };\n  } finally {\n    await fsp.rm(dir, { recursive: true });\n  }\n};\n\nconst writeTemporaryFiles = async (contents: Record<string, string>) => {\n  const dir = await fsp.mkdtemp('eslint-migrate-config');\n\n  for (const [file, content] of Object.entries(contents)) {\n    await fsp.writeFile(path.join(dir, file), content);\n  }\n\n  return dir;\n};\n\nconst fiddleWithOutput = (input: string) => {\n  let output = input.replace(/compat.extends\\([\"']skuba[\"']\\)/, 'skuba');\n\n  if (!output.includes('eslint-config-skuba')) {\n    output = `const skuba = require('eslint-config-skuba');\\n\\n${output}`;\n  }\n\n  if (!output.includes('compat.')) {\n    output = output.replace(/const compat = new FlatCompat\\(\\{[^}]+\\}\\);/m, '');\n    output = output.replace(\n      /const \\{\\s*FlatCompat,?\\s*\\}\\s*=\\s*require\\([\"']@eslint\\/eslintrc[\"']\\);/m,\n      '',\n    );\n  }\n\n  if (!output.includes('js.')) {\n    output = output.replace(/const js = require\\(['\"]@eslint\\/js['\"]\\);/, '');\n  }\n\n  output = output.replace(\n    /^const skuba = require\\('eslint-config-skuba'\\);\\s*module.exports = \\[...skuba\\];$/m,\n    \"module.exports = require('eslint-config-skuba');\",\n  );\n\n  return output;\n};\n\nexport const tryUpgradeESLint: PatchFunction = async (config) => {\n  try {\n    return await upgradeESLint(config);\n  } catch (err) {\n    log.warn('Failed to upgrade ESLint to flat config.');\n    log.subtle(inspect(err));\n    return { result: 'skip', reason: 'due to an error' };\n  }\n};\n"],
-  "mappings": "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",
+  "sourcesContent": ["// eslint-disable-next-line no-restricted-imports -- fs-extra is mocked\nimport * as fsp from 'fs/promises';\nimport path from 'path';\nimport { inspect } from 'util';\n\nimport { promises as fsExtra } from 'fs-extra';\n\nimport type { PatchFunction, PatchReturnType } from '../..';\nimport { createExec } from '../../../../../../utils/exec';\nimport { log } from '../../../../../../utils/logging';\nimport { createDestinationFileReader } from '../../../../../configure/analysis/project';\nimport { mergeWithConfigFile } from '../../../../../configure/processing/configFile';\nimport { formatPrettier } from '../../../../../configure/processing/prettier';\n\nconst IGNORE_FILE = '.eslintignore';\nconst OLD_CONFIG_FILE = '.eslintrc.js';\nconst NEW_CONFIG_FILE_CJS = 'eslint.config.cjs';\nconst NEW_CONFIG_FILE_JS = 'eslint.config.js';\n\nconst upgradeESLint: PatchFunction = async ({\n  mode,\n  dir: cwd = process.cwd(),\n}): Promise<PatchReturnType> => {\n  const readFile = createDestinationFileReader(cwd);\n  const [ignoreFileContents, oldConfig] = await Promise.all([\n    readFile(IGNORE_FILE),\n    readFile(OLD_CONFIG_FILE),\n  ]);\n\n  if (oldConfig === undefined) {\n    return {\n      result: 'skip',\n      reason: `no ${OLD_CONFIG_FILE} - have you already migrated?`,\n    };\n  }\n\n  if (mode === 'lint') {\n    return { result: 'apply' };\n  }\n\n  const ignoreContentsWithoutSkubaManaged = mergeWithConfigFile(\n    '',\n    'ignore',\n  )(ignoreFileContents);\n\n  const exec = createExec({\n    cwd: process.cwd(),\n    stdio: 'ignore',\n  });\n\n  // eslint-migrate-config require()s the file, so for testability, put it in a temporary location\n  const dir = await writeTemporaryFiles({\n    [OLD_CONFIG_FILE]: oldConfig,\n    ...(ignoreContentsWithoutSkubaManaged.trim().length > 0\n      ? { [IGNORE_FILE]: ignoreContentsWithoutSkubaManaged }\n      : {}),\n  });\n  try {\n    await exec(\n      'eslint-migrate-config',\n      path.join(dir, OLD_CONFIG_FILE),\n      '--commonjs',\n    );\n\n    const output = fiddleWithOutput(\n      await fsp.readFile(path.join(dir, NEW_CONFIG_FILE_CJS), 'utf-8'),\n    );\n    await fsExtra.writeFile(\n      NEW_CONFIG_FILE_JS,\n      await formatPrettier(output, { filepath: NEW_CONFIG_FILE_JS }),\n    );\n\n    await Promise.all([\n      ignoreFileContents === undefined\n        ? Promise.resolve()\n        : fsExtra.rm(IGNORE_FILE),\n      fsExtra.rm(OLD_CONFIG_FILE),\n    ]);\n\n    return { result: 'apply' };\n  } finally {\n    await fsp.rm(dir, { recursive: true });\n  }\n};\n\nconst writeTemporaryFiles = async (contents: Record<string, string>) => {\n  const dir = await fsp.mkdtemp('eslint-migrate-config');\n\n  for (const [file, content] of Object.entries(contents)) {\n    await fsp.writeFile(path.join(dir, file), content);\n  }\n\n  return dir;\n};\n\nconst fiddleWithOutput = (input: string) => {\n  let output = input.replace(/compat.extends\\([\"']skuba[\"']\\)/, 'skuba');\n\n  if (!output.includes('eslint-config-skuba')) {\n    output = `const skuba = require('eslint-config-skuba');\\n\\n${output}`;\n  }\n\n  if (!output.includes('compat.')) {\n    output = output.replace(/const compat = new FlatCompat\\(\\{[^}]+\\}\\);/m, '');\n    output = output.replace(\n      /const \\{\\s*FlatCompat,?\\s*\\}\\s*=\\s*require\\([\"']@eslint\\/eslintrc[\"']\\);/m,\n      '',\n    );\n  }\n\n  if (!output.includes('js.')) {\n    output = output.replace(/const js = require\\(['\"]@eslint\\/js['\"]\\);/, '');\n  }\n\n  output = output.replace(\n    /^const skuba = require\\('eslint-config-skuba'\\);\\s*module.exports = \\[...skuba\\];$/m,\n    \"module.exports = require('eslint-config-skuba');\",\n  );\n\n  return output;\n};\n\nexport const tryUpgradeESLint: PatchFunction = async (config) => {\n  try {\n    return await upgradeESLint(config);\n  } catch (err) {\n    log.warn('Failed to upgrade ESLint to flat config.');\n    log.subtle(inspect(err));\n    return { result: 'skip', reason: 'due to an error' };\n  }\n};\n"],
+  "mappings": "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",
   "names": ["path", "fsExtra"]
 }

package/lib/cli/node.d.ts

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

package/lib/cli/node.js

@@ -33,8 +33,8 @@ __export(node_exports, {
 });
 module.exports = __toCommonJS(node_exports);
 var import_path = __toESM(require("path"));
+var import_execa = __toESM(require("execa"));
 var import_get_port = __toESM(require("get-port"));
-var tsNode = __toESM(require("ts-node"));
 var import_args = require("../utils/args");
 var import_exec = require("../utils/exec");
 var import_validation = require("../utils/validation");
@@ -42,6 +42,13 @@ const longRunning = true;
 const node = async () => {
   const args = (0, import_args.parseRunArgs)(process.argv.slice(2));
   const availablePort = await (0, import_get_port.default)();
+  const commonArgs = [
+    ...args.node,
+    "--require",
+    require.resolve("dotenv/config"),
+    "--require",
+    require.resolve("tsconfig-paths/register")
+  ];
   if (args.entryPoint) {
     const exec = (0, import_exec.createExec)({
       env: {
@@ -50,27 +57,25 @@ const node = async () => {
       }
     });
     return exec(
-      "node",
-      ...args.node,
-      "--require",
-      "dotenv/config",
-      "--require",
-      "tsconfig-paths/register",
-      "--require",
-      "ts-node/register/transpile-only",
-      // Override dangerously warn-only default on Node.js <15 so that we
-      // predictably return a non-zero exit code on an unhandled rejection.
-      "--unhandled-rejections=throw",
+      "tsx",
+      ...commonArgs,
       import_path.default.join(__dirname, "..", "wrapper"),
       ...args.script
     );
   }
-  return tsNode.createRepl({
-    service: tsNode.register({
-      require: ["dotenv/config", "tsconfig-paths/register"],
-      transpileOnly: true
-    })
-  }).start();
+  return (0, import_execa.default)(
+    require.resolve("tsx/cli"),
+    [
+      ...commonArgs,
+      "--require",
+      // Unsure if bug or feature that this is needed, but tsx appears to not do anything typescript in the REPL without this!
+      // Doesn't occur when just running the tsx binary directly 🧐
+      require.resolve("tsx/patch-repl")
+    ],
+    {
+      stdio: "inherit"
+    }
+  );
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

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 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"]
+  "sourcesContent": ["import path from 'path';\n\nimport execa from 'execa';\nimport getPort from 'get-port';\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  const commonArgs = [\n    ...args.node,\n    '--require',\n    require.resolve('dotenv/config'),\n    '--require',\n    require.resolve('tsconfig-paths/register'),\n  ];\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    return exec(\n      'tsx',\n      ...commonArgs,\n      path.join(__dirname, '..', 'wrapper'),\n      ...args.script,\n    );\n  }\n\n  return execa(\n    require.resolve('tsx/cli'),\n    [\n      ...commonArgs,\n      '--require',\n      // Unsure if bug or feature that this is needed, but tsx appears to not do anything typescript in the REPL without this!\n      // Doesn't occur when just running the tsx binary directly \uD83E\uDDD0\n      require.resolve('tsx/patch-repl'),\n    ],\n    {\n      stdio: 'inherit',\n    },\n  );\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AAEjB,mBAAkB;AAClB,sBAAoB;AAEpB,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,QAAM,aAAa;AAAA,IACjB,GAAG,KAAK;AAAA,IACR;AAAA,IACA,gBAAgB,eAAe;AAAA,IAC/B;AAAA,IACA,gBAAgB,yBAAyB;AAAA,EAC3C;AAEA,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;AAED,WAAO;AAAA,MACL;AAAA,MACA,GAAG;AAAA,MACH,YAAAC,QAAK,KAAK,WAAW,MAAM,SAAS;AAAA,MACpC,GAAG,KAAK;AAAA,IACV;AAAA,EACF;AAEA,aAAO,aAAAC;AAAA,IACL,gBAAgB,SAAS;AAAA,IACzB;AAAA,MACE,GAAG;AAAA,MACH;AAAA;AAAA;AAAA,MAGA,gBAAgB,gBAAgB;AAAA,IAClC;AAAA,IACA;AAAA,MACE,OAAO;AAAA,IACT;AAAA,EACF;AACF;",
+  "names": ["getPort", "path", "execa"]
 }

package/lib/cli/start.js

@@ -50,14 +50,14 @@ const start = async () => {
     }
   });
   return execProcess(
-    "ts-node-dev",
+    "tsx",
+    "watch",
+    "--clear-screen=false",
     ...args.node,
     "--require",
     "dotenv/config",
     "--require",
     "tsconfig-paths/register",
-    "--respawn",
-    "--transpile-only",
     import_path.default.join(__dirname, "..", "wrapper"),
     ...args.script
   );

package/lib/cli/start.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/cli/start.ts"],
-  "sourcesContent": ["import path from 'path';\n\nimport getPort from 'get-port';\n\nimport { parseRunArgs } from '../utils/args';\nimport { createExec } from '../utils/exec';\nimport { getEntryPointFromManifest } from '../utils/manifest';\nimport { isIpPort } from '../utils/validation';\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    'ts-node-dev',\n    ...args.node,\n    '--require',\n    'dotenv/config',\n    '--require',\n    'tsconfig-paths/register',\n    '--respawn',\n    '--transpile-only',\n    path.join(__dirname, '..', 'wrapper'),\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,GAAG,KAAK;AAAA,IACR;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA,YAAAC,QAAK,KAAK,WAAW,MAAM,SAAS;AAAA,IACpC,GAAG,KAAK;AAAA,EACV;AACF;",
+  "sourcesContent": ["import path from 'path';\n\nimport getPort from 'get-port';\n\nimport { parseRunArgs } from '../utils/args';\nimport { createExec } from '../utils/exec';\nimport { getEntryPointFromManifest } from '../utils/manifest';\nimport { isIpPort } from '../utils/validation';\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'),\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,SAAS;AAAA,IACpC,GAAG,KAAK;AAAA,EACV;AACF;",
   "names": ["getPort", "path"]
 }

package/lib/utils/template.d.ts

@@ -28,12 +28,12 @@ export declare const templateConfigSchema: z.ZodObject<{
         message: string;
         name: string;
         initial: string;
-        validate?: ((args_0: string, ...args_1: unknown[]) => string | boolean) | undefined;
+        validate?: ((args_0: string, ...args: unknown[]) => string | boolean) | undefined;
     }, {
         message: string;
         name: string;
         initial: string;
-        validate?: ((args_0: string, ...args_1: unknown[]) => string | boolean) | undefined;
+        validate?: ((args_0: string, ...args: unknown[]) => string | boolean) | undefined;
     }>, "many">;
     entryPoint: z.ZodOptional<z.ZodString>;
     noSkip: z.ZodOptional<z.ZodBoolean>;
@@ -44,7 +44,7 @@ export declare const templateConfigSchema: z.ZodObject<{
         message: string;
         name: string;
         initial: string;
-        validate?: ((args_0: string, ...args_1: unknown[]) => string | boolean) | undefined;
+        validate?: ((args_0: string, ...args: unknown[]) => string | boolean) | undefined;
     }[];
     packageManager: "yarn" | "pnpm";
     type?: "package" | "application" | undefined;
@@ -55,7 +55,7 @@ export declare const templateConfigSchema: z.ZodObject<{
         message: string;
         name: string;
         initial: string;
-        validate?: ((args_0: string, ...args_1: unknown[]) => string | boolean) | undefined;
+        validate?: ((args_0: string, ...args: unknown[]) => string | boolean) | undefined;
     }[];
     type?: "package" | "application" | undefined;
     entryPoint?: string | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skuba",
-  "version": "9.0.0-renovate-eslint-9.x-20240811060718",
+  "version": "9.0.0-renovate-eslint-9.x-20240923103202",
   "private": false,
   "description": "SEEK development toolkit for backend applications and packages",
   "homepage": "https://github.com/seek-oss/skuba#readme",
@@ -58,13 +58,13 @@
     "@octokit/rest": "^21.0.0",
     "@octokit/types": "^13.0.0",
     "@types/jest": "^29.0.0",
-    "@types/node": ">=18.12",
+    "@types/node": "^20.16.5",
     "chalk": "^4.1.0",
-    "concurrently": "^8.0.0",
+    "concurrently": "^9.0.0",
     "dotenv": "^16.0.0",
     "ejs": "^3.1.6",
     "enquirer": "^2.3.6",
-    "esbuild": "~0.23.0",
+    "esbuild": "~0.24.0",
     "eslint": "^9.0.0",
     "execa": "^5.0.0",
     "fast-glob": "^3.3.2",
@@ -95,16 +95,16 @@
     "ts-dedent": "^2.2.0",
     "ts-jest": "^29.1.0",
     "ts-node": "^10.9.2",
-    "ts-node-dev": "^2.0.0",
     "tsconfig-paths": "^4.0.0",
     "tsconfig-seek": "2.0.0",
-    "typescript": "~5.5.4",
+    "tsx": "^4.16.2",
+    "typescript": "~5.6.0",
     "validate-npm-package-name": "^5.0.0",
     "zod": "^3.22.4",
-    "eslint-config-skuba": "5.0.0-renovate-eslint-9.x-20240811060718"
+    "eslint-config-skuba": "5.0.0-renovate-eslint-9.x-20240923103202"
   },
   "devDependencies": {
-    "@changesets/cli": "2.27.7",
+    "@changesets/cli": "2.27.8",
     "@changesets/get-github-info": "0.6.0",
     "@jest/reporters": "29.7.0",
     "@jest/test-result": "29.7.0",
@@ -117,11 +117,11 @@
     "@types/minimist": "1.2.5",
     "@types/module-alias": "2.0.4",
     "@types/npm-which": "3.0.3",
-    "@types/picomatch": "2.3.4",
+    "@types/picomatch": "3.0.1",
     "@types/supertest": "6.0.2",
     "@types/validate-npm-package-name": "4.0.2",
     "enhanced-resolve": "5.17.1",
-    "express": "4.19.2",
+    "express": "4.20.0",
     "fastify": "4.28.1",
     "jest-diff": "29.7.0",
     "jsonfile": "6.1.0",
@@ -169,6 +169,7 @@
     "test:ci": "pnpm --silent skuba test --runInBand",
     "test:int": "pnpm --silent skuba test --selectProjects integration --runInBand",
     "test:template": "scripts/test-template.sh",
+    "test:template:updateSnapshot": "scripts/test-template.sh -u",
     "test:watch": "pnpm --silent skuba test --runInBand --watch"
   }
 }

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

@@ -57,7 +57,7 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - docker-compose#v5.3.0:
+      - docker-compose#v5.4.0:
           run: app
           environment:
             - GITHUB_API_TOKEN

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

@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.9
+# syntax=docker/dockerfile:1.10
 
 FROM --platform=<%- platformName %> node:20-alpine AS dev-deps
 

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

@@ -21,14 +21,14 @@
   },
   "devDependencies": {
     "@types/express": "^4.17.13",
-    "@types/node": "^20.9.0",
+    "@types/node": "^20.16.5",
     "@types/supertest": "^6.0.0",
     "mime": "^4.0.1",
     "pino-pretty": "^11.0.0",
     "skuba": "*",
     "supertest": "^7.0.0"
   },
-  "packageManager": "pnpm@9.6.0",
+  "packageManager": "pnpm@9.11.0",
   "engines": {
     "node": ">=20"
   }

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

@@ -38,7 +38,7 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - docker-compose#v5.3.0:
+      - docker-compose#v5.4.0:
           run: app
           environment:
             - GITHUB_API_TOKEN

package/template/greeter/Dockerfile

@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.9
+# syntax=docker/dockerfile:1.10
 
 FROM --platform=<%- platformName %> node:20-alpine AS dev-deps
 

package/template/greeter/package.json

@@ -17,9 +17,9 @@
   },
   "devDependencies": {
     "@types/node": "^20.9.0",
-    "skuba": "9.0.0-renovate-eslint-9.x-20240811060718"
+    "skuba": "9.0.0-renovate-eslint-9.x-20240923103202"
   },
-  "packageManager": "pnpm@9.6.0",
+  "packageManager": "pnpm@9.11.0",
   "engines": {
     "node": ">=20"
   }

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

@@ -57,7 +57,7 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - docker-compose#v5.3.0:
+      - docker-compose#v5.4.0:
           run: app
           environment:
             - GITHUB_API_TOKEN

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

@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.9
+# syntax=docker/dockerfile:1.10
 
 FROM --platform=<%- platformName %> node:20-alpine AS dev-deps
 

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

@@ -16,11 +16,11 @@
     "@koa/router": "^12.0.0",
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/core": "^1.25.0",
-    "@opentelemetry/exporter-trace-otlp-grpc": "^0.52.0",
-    "@opentelemetry/instrumentation-aws-sdk": "^0.43.0",
-    "@opentelemetry/instrumentation-http": "^0.52.0",
+    "@opentelemetry/exporter-trace-otlp-grpc": "^0.53.0",
+    "@opentelemetry/instrumentation-aws-sdk": "^0.44.0",
+    "@opentelemetry/instrumentation-http": "^0.53.0",
     "@opentelemetry/propagator-b3": "^1.25.0",
-    "@opentelemetry/sdk-node": "^0.52.0",
+    "@opentelemetry/sdk-node": "^0.53.0",
     "@seek/logger": "^6.0.0",
     "hot-shots": "^10.0.0",
     "koa": "^2.13.4",
@@ -36,7 +36,7 @@
     "@types/koa": "^2.13.4",
     "@types/koa-bodyparser": "^5.0.2",
     "@types/koa__router": "^12.0.0",
-    "@types/node": "^20.9.0",
+    "@types/node": "^20.16.5",
     "@types/supertest": "^6.0.0",
     "chance": "^1.1.8",
     "mime": "^4.0.1",
@@ -44,7 +44,7 @@
     "skuba": "*",
     "supertest": "^7.0.0"
   },
-  "packageManager": "pnpm@9.6.0",
+  "packageManager": "pnpm@9.11.0",
   "engines": {
     "node": ">=20"
   }

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

@@ -4,7 +4,7 @@ import {
   ErrorMiddleware,
   MetricsMiddleware,
   RequestLogging,
-  // SecureHeaders,
+  SecureHeaders,
   VersionMiddleware,
 } from 'seek-koala';
 
@@ -39,10 +39,8 @@ export const createApp = <State, Context>(
   ...middleware: Array<Koa.Middleware<State, Context>>
 ) =>
   new Koa()
-    // TODO: consider using a middleware that adds secure HTTP headers.
-    // https://github.com/seek-oss/koala/tree/master/src/secureHeaders
-    // https://github.com/venables/koa-helmet
-    // .use(SecureHeaders.middleware)
+    // Read: https://github.com/seek-oss/koala/tree/master/src/secureHeaders
+    .use(SecureHeaders.middleware)
     .use(contextMiddleware)
     .use(requestLogging)
     .use(metrics)

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

@@ -36,7 +36,7 @@ configs:
         - *aws-sm
         - *private-npm
         - *docker-ecr-cache
-        - docker-compose#v5.3.0:
+        - docker-compose#v5.4.0:
             dependencies: false
             run: app
             propagate-environment: true
@@ -67,7 +67,7 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - docker-compose#v5.3.0:
+      - docker-compose#v5.4.0:
           run: app
           environment:
             - GITHUB_API_TOKEN

package/template/lambda-sqs-worker/Dockerfile

@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.9
+# syntax=docker/dockerfile:1.10
 
 FROM --platform=<%- platformName %> node:20-alpine AS dev-deps
 

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

@@ -27,7 +27,7 @@
   "devDependencies": {
     "@types/aws-lambda": "^8.10.84",
     "@types/chance": "^1.1.3",
-    "@types/node": "^20.9.0",
+    "@types/node": "^20.16.5",
     "aws-sdk-client-mock": "^4.0.0",
     "aws-sdk-client-mock-jest": "^4.0.0",
     "chance": "^1.1.8",
@@ -38,7 +38,7 @@
     "serverless-prune-plugin": "^2.0.0",
     "skuba": "*"
   },
-  "packageManager": "pnpm@9.6.0",
+  "packageManager": "pnpm@9.11.0",
   "engines": {
     "node": ">=20"
   }

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

@@ -33,7 +33,7 @@ configs:
         - *aws-sm
         - *private-npm
         - *docker-ecr-cache
-        - docker-compose#v5.3.0:
+        - docker-compose#v5.4.0:
             dependencies: false
             run: app
             environment:
@@ -63,7 +63,7 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - docker-compose#v5.3.0:
+      - docker-compose#v5.4.0:
           run: app
           environment:
             - GITHUB_API_TOKEN

package/template/lambda-sqs-worker-cdk/Dockerfile

@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.9
+# syntax=docker/dockerfile:1.10
 
 FROM --platform=<%- platformName %> node:20-alpine AS dev-deps