skuba 10.0.3 → 10.1.0

package/lib/cli/lint/internalLints/upgrade/patches/10.0.4/index.d.ts

@@ -0,0 +1,2 @@
+import type { Patches } from '../..';
+export declare const patches: Patches;

package/lib/cli/lint/internalLints/upgrade/patches/10.0.4/index.js

@@ -0,0 +1,35 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var __exports = {};
+__export(__exports, {
+  patches: () => patches
+});
+module.exports = __toCommonJS(__exports);
+var import_removeYarnIgnoreOptionalFlags = require("./removeYarnIgnoreOptionalFlags");
+const patches = [
+  {
+    apply: import_removeYarnIgnoreOptionalFlags.tryRemoveYarnIgnoreOptionalFlags,
+    description: "Remove yarn --ignore-optional flags in Dockerfiles"
+  }
+];
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  patches
+});
+//# sourceMappingURL=index.js.map

package/lib/cli/lint/internalLints/upgrade/patches/10.0.4/index.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../../../../../src/cli/lint/internalLints/upgrade/patches/10.0.4/index.ts"],
+  "sourcesContent": ["import type { Patches } from '../..';\n\nimport { tryRemoveYarnIgnoreOptionalFlags } from './removeYarnIgnoreOptionalFlags';\n\nexport const patches: Patches = [\n  {\n    apply: tryRemoveYarnIgnoreOptionalFlags,\n    description: 'Remove yarn --ignore-optional flags in Dockerfiles',\n  },\n];\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA,2CAAiD;AAE1C,MAAM,UAAmB;AAAA,EAC9B;AAAA,IACE,OAAO;AAAA,IACP,aAAa;AAAA,EACf;AACF;",
+  "names": []
+}

package/lib/cli/lint/internalLints/upgrade/patches/10.0.4/removeYarnIgnoreOptionalFlags.d.ts

@@ -0,0 +1,2 @@
+import type { PatchFunction } from '../..';
+export declare const tryRemoveYarnIgnoreOptionalFlags: PatchFunction;

package/lib/cli/lint/internalLints/upgrade/patches/10.0.4/removeYarnIgnoreOptionalFlags.js

@@ -0,0 +1,109 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var removeYarnIgnoreOptionalFlags_exports = {};
+__export(removeYarnIgnoreOptionalFlags_exports, {
+  tryRemoveYarnIgnoreOptionalFlags: () => tryRemoveYarnIgnoreOptionalFlags
+});
+module.exports = __toCommonJS(removeYarnIgnoreOptionalFlags_exports);
+var import_util = require("util");
+var import_fast_glob = require("fast-glob");
+var import_fs_extra = require("fs-extra");
+var import_logging = require("../../../../../../utils/logging");
+const fetchFiles = async (files) => Promise.all(
+  files.map(async (file) => {
+    const contents = await import_fs_extra.promises.readFile(file, "utf8");
+    return {
+      file,
+      contents
+    };
+  })
+);
+const regex = /\s*--ignore-optional/;
+const removeYarnIgnoreFlag = (contents) => {
+  let isInYarn = false;
+  const lines = contents.split("\n");
+  for (let i = 0; i < lines.length; i++) {
+    const line = lines[i];
+    if (line.includes("yarn")) isInYarn = true;
+    if (isInYarn && regex.test(line)) {
+      lines[i] = line.replace(regex, "");
+      if (!lines[i].trim()) {
+        lines.splice(i, 1);
+        if (i > 0) {
+          lines[i - 1] = lines[i - 1].replace(/\s*\\$/, "");
+        }
+        i--;
+      } else if (lines[i] === "\\") {
+        lines.splice(i, 1);
+        i--;
+      }
+      isInYarn = false;
+    }
+    if (!line.endsWith("\\")) isInYarn = false;
+  }
+  return lines.join("\n");
+};
+const removeYarnIgnoreOptionalFlags = async ({
+  mode
+}) => {
+  const maybeDockerFilesPaths = await (0, import_fast_glob.glob)(["Dockerfile*"]);
+  if (!maybeDockerFilesPaths.length) {
+    return {
+      result: "skip",
+      reason: "no Dockerfiles found"
+    };
+  }
+  const dockerFiles = await fetchFiles(maybeDockerFilesPaths);
+  const mapped = dockerFiles.map(({ file, contents }) => ({
+    file,
+    before: contents,
+    after: removeYarnIgnoreFlag(contents)
+  }));
+  if (!mapped.some(({ before, after }) => before !== after)) {
+    return {
+      result: "skip",
+      reason: "no Dockerfiles to patch"
+    };
+  }
+  if (mode === "lint") {
+    return {
+      result: "apply"
+    };
+  }
+  await Promise.all(
+    mapped.map(async ({ file, after }) => {
+      await import_fs_extra.promises.writeFile(file, after);
+    })
+  );
+  return { result: "apply" };
+};
+const tryRemoveYarnIgnoreOptionalFlags = async (config) => {
+  try {
+    return await removeYarnIgnoreOptionalFlags(config);
+  } catch (err) {
+    import_logging.log.warn("Failed to remove yarn --ignore-optional flags");
+    import_logging.log.subtle((0, import_util.inspect)(err));
+    return { result: "skip", reason: "due to an error" };
+  }
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  tryRemoveYarnIgnoreOptionalFlags
+});
+//# sourceMappingURL=removeYarnIgnoreOptionalFlags.js.map

package/lib/cli/lint/internalLints/upgrade/patches/10.0.4/removeYarnIgnoreOptionalFlags.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../../../../../src/cli/lint/internalLints/upgrade/patches/10.0.4/removeYarnIgnoreOptionalFlags.ts"],
+  "sourcesContent": ["/* eslint-disable @typescript-eslint/no-non-null-assertion */\nimport { inspect } from 'util';\n\nimport { glob } from 'fast-glob';\nimport { promises as fs } from 'fs-extra';\n\nimport type { PatchFunction, PatchReturnType } from '../..';\nimport { log } from '../../../../../../utils/logging';\n\nconst fetchFiles = async (files: string[]) =>\n  Promise.all(\n    files.map(async (file) => {\n      const contents = await fs.readFile(file, 'utf8');\n\n      return {\n        file,\n        contents,\n      };\n    }),\n  );\n\nconst regex = /\\s*--ignore-optional/;\n\nconst removeYarnIgnoreFlag = (contents: string) => {\n  let isInYarn = false;\n\n  const lines = contents.split('\\n');\n\n  for (let i = 0; i < lines.length; i++) {\n    const line = lines[i]!;\n\n    if (line.includes('yarn')) isInYarn = true;\n\n    if (isInYarn && regex.test(line)) {\n      lines[i] = line.replace(regex, '');\n\n      // If we're now an empty line, remove it and get rid of the \\ at the end of the previous line\n      if (!lines[i]!.trim()) {\n        lines.splice(i, 1);\n        if (i > 0) {\n          lines[i - 1] = lines[i - 1]!.replace(/\\s*\\\\$/, '');\n        }\n        i--;\n      } else if (lines[i] === '\\\\') {\n        lines.splice(i, 1);\n        i--;\n      }\n\n      isInYarn = false;\n    }\n\n    if (!line.endsWith('\\\\')) isInYarn = false;\n  }\n\n  return lines.join('\\n');\n};\n\nconst removeYarnIgnoreOptionalFlags: PatchFunction = async ({\n  mode,\n}): Promise<PatchReturnType> => {\n  const maybeDockerFilesPaths = await glob(['Dockerfile*']);\n\n  if (!maybeDockerFilesPaths.length) {\n    return {\n      result: 'skip',\n      reason: 'no Dockerfiles found',\n    };\n  }\n\n  const dockerFiles = await fetchFiles(maybeDockerFilesPaths);\n\n  const mapped = dockerFiles.map(({ file, contents }) => ({\n    file,\n    before: contents,\n    after: removeYarnIgnoreFlag(contents),\n  }));\n\n  if (!mapped.some(({ before, after }) => before !== after)) {\n    return {\n      result: 'skip',\n      reason: 'no Dockerfiles to patch',\n    };\n  }\n\n  if (mode === 'lint') {\n    return {\n      result: 'apply',\n    };\n  }\n\n  await Promise.all(\n    mapped.map(async ({ file, after }) => {\n      await fs.writeFile(file, after);\n    }),\n  );\n\n  return { result: 'apply' };\n};\n\nexport const tryRemoveYarnIgnoreOptionalFlags: PatchFunction = async (\n  config,\n) => {\n  try {\n    return await removeYarnIgnoreOptionalFlags(config);\n  } catch (err) {\n    log.warn('Failed to remove yarn --ignore-optional flags');\n    log.subtle(inspect(err));\n    return { result: 'skip', reason: 'due to an error' };\n  }\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,kBAAwB;AAExB,uBAAqB;AACrB,sBAA+B;AAG/B,qBAAoB;AAEpB,MAAM,aAAa,OAAO,UACxB,QAAQ;AAAA,EACN,MAAM,IAAI,OAAO,SAAS;AACxB,UAAM,WAAW,MAAM,gBAAAA,SAAG,SAAS,MAAM,MAAM;AAE/C,WAAO;AAAA,MACL;AAAA,MACA;AAAA,IACF;AAAA,EACF,CAAC;AACH;AAEF,MAAM,QAAQ;AAEd,MAAM,uBAAuB,CAAC,aAAqB;AACjD,MAAI,WAAW;AAEf,QAAM,QAAQ,SAAS,MAAM,IAAI;AAEjC,WAAS,IAAI,GAAG,IAAI,MAAM,QAAQ,KAAK;AACrC,UAAM,OAAO,MAAM,CAAC;AAEpB,QAAI,KAAK,SAAS,MAAM,EAAG,YAAW;AAEtC,QAAI,YAAY,MAAM,KAAK,IAAI,GAAG;AAChC,YAAM,CAAC,IAAI,KAAK,QAAQ,OAAO,EAAE;AAGjC,UAAI,CAAC,MAAM,CAAC,EAAG,KAAK,GAAG;AACrB,cAAM,OAAO,GAAG,CAAC;AACjB,YAAI,IAAI,GAAG;AACT,gBAAM,IAAI,CAAC,IAAI,MAAM,IAAI,CAAC,EAAG,QAAQ,UAAU,EAAE;AAAA,QACnD;AACA;AAAA,MACF,WAAW,MAAM,CAAC,MAAM,MAAM;AAC5B,cAAM,OAAO,GAAG,CAAC;AACjB;AAAA,MACF;AAEA,iBAAW;AAAA,IACb;AAEA,QAAI,CAAC,KAAK,SAAS,IAAI,EAAG,YAAW;AAAA,EACvC;AAEA,SAAO,MAAM,KAAK,IAAI;AACxB;AAEA,MAAM,gCAA+C,OAAO;AAAA,EAC1D;AACF,MAAgC;AAC9B,QAAM,wBAAwB,UAAM,uBAAK,CAAC,aAAa,CAAC;AAExD,MAAI,CAAC,sBAAsB,QAAQ;AACjC,WAAO;AAAA,MACL,QAAQ;AAAA,MACR,QAAQ;AAAA,IACV;AAAA,EACF;AAEA,QAAM,cAAc,MAAM,WAAW,qBAAqB;AAE1D,QAAM,SAAS,YAAY,IAAI,CAAC,EAAE,MAAM,SAAS,OAAO;AAAA,IACtD;AAAA,IACA,QAAQ;AAAA,IACR,OAAO,qBAAqB,QAAQ;AAAA,EACtC,EAAE;AAEF,MAAI,CAAC,OAAO,KAAK,CAAC,EAAE,QAAQ,MAAM,MAAM,WAAW,KAAK,GAAG;AACzD,WAAO;AAAA,MACL,QAAQ;AAAA,MACR,QAAQ;AAAA,IACV;AAAA,EACF;AAEA,MAAI,SAAS,QAAQ;AACnB,WAAO;AAAA,MACL,QAAQ;AAAA,IACV;AAAA,EACF;AAEA,QAAM,QAAQ;AAAA,IACZ,OAAO,IAAI,OAAO,EAAE,MAAM,MAAM,MAAM;AACpC,YAAM,gBAAAA,SAAG,UAAU,MAAM,KAAK;AAAA,IAChC,CAAC;AAAA,EACH;AAEA,SAAO,EAAE,QAAQ,QAAQ;AAC3B;AAEO,MAAM,mCAAkD,OAC7D,WACG;AACH,MAAI;AACF,WAAO,MAAM,8BAA8B,MAAM;AAAA,EACnD,SAAS,KAAK;AACZ,uBAAI,KAAK,+CAA+C;AACxD,uBAAI,WAAO,qBAAQ,GAAG,CAAC;AACvB,WAAO,EAAE,QAAQ,QAAQ,QAAQ,kBAAkB;AAAA,EACrD;AACF;",
+  "names": ["fs"]
+}

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

@@ -77,9 +77,8 @@ const isPatchableServerlessVersion = async (currentPath) => {
     currentPath
   );
   if (!packageJson) {
-    throw new Error(
-      "package.json not found, ensure it is in the correct location"
-    );
+    import_logging.log.warn("package.json not found, ensure it is in the correct location");
+    return false;
   }
   const serverlessVersion = packageJson?.devDependencies.serverless;
   if (!serverlessVersion) {
@@ -110,9 +109,8 @@ const isPatchableSkubaType = async (currentPath) => {
     currentPath
   );
   if (!packageJson) {
-    throw new Error(
-      "package.json not found, ensure it is in the correct location"
-    );
+    import_logging.log.warn("package.json not found, ensure it is in the correct location");
+    return false;
   }
   if (packageJson.files) {
     import_logging.log.warn(

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/cli/migrate/nodeVersion/checks.ts"],
-  "sourcesContent": ["import findUp from 'find-up';\nimport fs from 'fs-extra';\nimport { coerce, lte, satisfies } from 'semver';\nimport { type ZodRawShape, z } from 'zod';\n\nimport { log } from '../../../utils/logging';\n\nconst getParentFile = async (file: string, cwd: string = process.cwd()) => {\n  const path = await findUp(file, { cwd });\n  if (!path) {\n    return undefined;\n  }\n  return {\n    fileContent: await fs.readFile(path, 'utf-8'),\n    path,\n  };\n};\n\nexport const extractFromParentPackageJson = async <T extends ZodRawShape>(\n  schema: z.ZodObject<T>,\n  currentPath: string,\n) => {\n  const file = await getParentFile('package.json', currentPath);\n  if (!file) {\n    return { packageJson: undefined, packageJsonRelativePath: undefined };\n  }\n  const { fileContent: packageJson, path } = file;\n  let rawJSON;\n  try {\n    rawJSON = JSON.parse(packageJson) as unknown;\n  } catch {\n    throw new Error(`${path} is not valid JSON`);\n  }\n  const result = schema.safeParse(rawJSON);\n  if (!result.success) {\n    return { packageJson: undefined, packageJsonRelativePath: path };\n  }\n\n  return { packageJson: result.data, packageJsonRelativePath: path };\n};\n\nexport const isPatchableServerlessVersion = async (\n  currentPath: string,\n): Promise<boolean> => {\n  const { packageJson, packageJsonRelativePath } =\n    await extractFromParentPackageJson(\n      z.object({\n        devDependencies: z.object({\n          serverless: z.string().optional(),\n        }),\n      }),\n      currentPath,\n    );\n  if (!packageJson) {\n    throw new Error(\n      'package.json not found, ensure it is in the correct location',\n    );\n  }\n\n  const serverlessVersion = packageJson?.devDependencies.serverless;\n\n  if (!serverlessVersion) {\n    log.subtle(\n      `Serverless version not found in ${packageJsonRelativePath}, assuming it is not a dependency`,\n    );\n    return true;\n  }\n\n  if (!satisfies(serverlessVersion, '4.x.x')) {\n    log.warn(\n      `Serverless version ${serverlessVersion} cannot be migrated; use Serverless 4.x to automatically migrate Serverless files`,\n    );\n    return false;\n  }\n\n  log.ok(\n    `Proceeding with migration of Serverless version ${serverlessVersion}`,\n  );\n  return true;\n};\n\nexport const isPatchableSkubaType = async (\n  currentPath: string,\n): Promise<boolean> => {\n  const { packageJson, packageJsonRelativePath } =\n    await extractFromParentPackageJson(\n      z.object({\n        skuba: z\n          .object({\n            type: z.string().optional(),\n          })\n          .optional(),\n        files: z.string().array().optional(),\n      }),\n      currentPath,\n    );\n\n  if (!packageJson) {\n    throw new Error(\n      'package.json not found, ensure it is in the correct location',\n    );\n  }\n\n  if (packageJson.files) {\n    log.warn(\n      'Migrations are not supported for packages; update manually to ensure major runtime deprecations are intended',\n    );\n    return false;\n  }\n\n  const type = packageJson?.skuba?.type;\n\n  if (!type) {\n    log.warn(\n      `skuba project type not found in ${packageJsonRelativePath}; add a package.json#/skuba/type to ensure the correct migration can be applied`,\n    );\n    return false;\n  }\n  if (type === 'package') {\n    log.warn(\n      'Migrations are not supported for packages; update manually to ensure major runtime deprecations are intended',\n    );\n    return false;\n  }\n\n  log.ok(`Proceeding with migration of skuba project type ${type}`);\n  return true;\n};\n\nexport const isPatchableNodeVersion = async (\n  targetNodeVersion: number,\n  currentPath: string,\n): Promise<boolean> => {\n  const nvmrcFile = await getParentFile('.nvmrc');\n  const nodeVersionFile = await getParentFile('.node-version');\n  const { packageJson } = await extractFromParentPackageJson(\n    z.object({\n      engines: z.object({\n        node: z.string(),\n      }),\n    }),\n    currentPath,\n  );\n\n  const nvmrcNodeVersion = nvmrcFile?.fileContent;\n  const nodeVersion = nodeVersionFile?.fileContent;\n  const engineVersion = packageJson?.engines.node;\n\n  const currentNodeVersion = nvmrcNodeVersion || nodeVersion || engineVersion;\n\n  const coercedTargetVersion = coerce(targetNodeVersion.toString())?.version;\n  const coercedCurrentVersion = coerce(currentNodeVersion)?.version;\n\n  const isNodeVersionValid =\n    coercedTargetVersion &&\n    coercedCurrentVersion &&\n    lte(coercedCurrentVersion, coercedTargetVersion);\n\n  if (!isNodeVersionValid) {\n    log.warn(\n      `Node.js version ${coercedCurrentVersion ?? 'unknown'} cannot be migrated to ${coercedTargetVersion}`,\n    );\n    return false;\n  }\n\n  log.ok(\n    `Proceeding with migration from Node.js ${coercedCurrentVersion} to ${coercedTargetVersion}`,\n  );\n  return true;\n};\n"],
-  "mappings": "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",
+  "sourcesContent": ["import findUp from 'find-up';\nimport fs from 'fs-extra';\nimport { coerce, lte, satisfies } from 'semver';\nimport { type ZodRawShape, z } from 'zod';\n\nimport { log } from '../../../utils/logging';\n\nconst getParentFile = async (file: string, cwd: string = process.cwd()) => {\n  const path = await findUp(file, { cwd });\n  if (!path) {\n    return undefined;\n  }\n  return {\n    fileContent: await fs.readFile(path, 'utf-8'),\n    path,\n  };\n};\n\nexport const extractFromParentPackageJson = async <T extends ZodRawShape>(\n  schema: z.ZodObject<T>,\n  currentPath: string,\n) => {\n  const file = await getParentFile('package.json', currentPath);\n  if (!file) {\n    return { packageJson: undefined, packageJsonRelativePath: undefined };\n  }\n  const { fileContent: packageJson, path } = file;\n  let rawJSON;\n  try {\n    rawJSON = JSON.parse(packageJson) as unknown;\n  } catch {\n    throw new Error(`${path} is not valid JSON`);\n  }\n  const result = schema.safeParse(rawJSON);\n  if (!result.success) {\n    return { packageJson: undefined, packageJsonRelativePath: path };\n  }\n\n  return { packageJson: result.data, packageJsonRelativePath: path };\n};\n\nexport const isPatchableServerlessVersion = async (\n  currentPath: string,\n): Promise<boolean> => {\n  const { packageJson, packageJsonRelativePath } =\n    await extractFromParentPackageJson(\n      z.object({\n        devDependencies: z.object({\n          serverless: z.string().optional(),\n        }),\n      }),\n      currentPath,\n    );\n  if (!packageJson) {\n    log.warn('package.json not found, ensure it is in the correct location');\n    return false;\n  }\n\n  const serverlessVersion = packageJson?.devDependencies.serverless;\n\n  if (!serverlessVersion) {\n    log.subtle(\n      `Serverless version not found in ${packageJsonRelativePath}, assuming it is not a dependency`,\n    );\n    return true;\n  }\n\n  if (!satisfies(serverlessVersion, '4.x.x')) {\n    log.warn(\n      `Serverless version ${serverlessVersion} cannot be migrated; use Serverless 4.x to automatically migrate Serverless files`,\n    );\n    return false;\n  }\n\n  log.ok(\n    `Proceeding with migration of Serverless version ${serverlessVersion}`,\n  );\n  return true;\n};\n\nexport const isPatchableSkubaType = async (\n  currentPath: string,\n): Promise<boolean> => {\n  const { packageJson, packageJsonRelativePath } =\n    await extractFromParentPackageJson(\n      z.object({\n        skuba: z\n          .object({\n            type: z.string().optional(),\n          })\n          .optional(),\n        files: z.string().array().optional(),\n      }),\n      currentPath,\n    );\n\n  if (!packageJson) {\n    log.warn('package.json not found, ensure it is in the correct location');\n    return false;\n  }\n\n  if (packageJson.files) {\n    log.warn(\n      'Migrations are not supported for packages; update manually to ensure major runtime deprecations are intended',\n    );\n    return false;\n  }\n\n  const type = packageJson?.skuba?.type;\n\n  if (!type) {\n    log.warn(\n      `skuba project type not found in ${packageJsonRelativePath}; add a package.json#/skuba/type to ensure the correct migration can be applied`,\n    );\n    return false;\n  }\n  if (type === 'package') {\n    log.warn(\n      'Migrations are not supported for packages; update manually to ensure major runtime deprecations are intended',\n    );\n    return false;\n  }\n\n  log.ok(`Proceeding with migration of skuba project type ${type}`);\n  return true;\n};\n\nexport const isPatchableNodeVersion = async (\n  targetNodeVersion: number,\n  currentPath: string,\n): Promise<boolean> => {\n  const nvmrcFile = await getParentFile('.nvmrc');\n  const nodeVersionFile = await getParentFile('.node-version');\n  const { packageJson } = await extractFromParentPackageJson(\n    z.object({\n      engines: z.object({\n        node: z.string(),\n      }),\n    }),\n    currentPath,\n  );\n\n  const nvmrcNodeVersion = nvmrcFile?.fileContent;\n  const nodeVersion = nodeVersionFile?.fileContent;\n  const engineVersion = packageJson?.engines.node;\n\n  const currentNodeVersion = nvmrcNodeVersion || nodeVersion || engineVersion;\n\n  const coercedTargetVersion = coerce(targetNodeVersion.toString())?.version;\n  const coercedCurrentVersion = coerce(currentNodeVersion)?.version;\n\n  const isNodeVersionValid =\n    coercedTargetVersion &&\n    coercedCurrentVersion &&\n    lte(coercedCurrentVersion, coercedTargetVersion);\n\n  if (!isNodeVersionValid) {\n    log.warn(\n      `Node.js version ${coercedCurrentVersion ?? 'unknown'} cannot be migrated to ${coercedTargetVersion}`,\n    );\n    return false;\n  }\n\n  log.ok(\n    `Proceeding with migration from Node.js ${coercedCurrentVersion} to ${coercedTargetVersion}`,\n  );\n  return true;\n};\n"],
+  "mappings": "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",
   "names": ["findUp", "fs"]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skuba",
-  "version": "10.0.3",
+  "version": "10.1.0",
   "private": false,
   "description": "SEEK development toolkit for backend applications and packages",
   "homepage": "https://github.com/seek-oss/skuba#readme",
@@ -98,7 +98,7 @@
     "tsx": "^4.16.2",
     "typescript": "~5.8.0",
     "zod": "^3.22.4",
-    "eslint-config-skuba": "5.1.2"
+    "eslint-config-skuba": "5.1.3"
   },
   "devDependencies": {
     "@changesets/cli": "2.28.1",
@@ -149,7 +149,7 @@
     "entryPoint": "src/index.ts",
     "template": null,
     "type": "package",
-    "version": "10.0.0"
+    "version": "10.1.0"
   },
   "scripts": {
     "build": "scripts/build.sh",

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

@@ -28,7 +28,7 @@
     "skuba": "*",
     "supertest": "^7.0.0"
   },
-  "packageManager": "pnpm@10.6.3",
+  "packageManager": "pnpm@10.6.4",
   "engines": {
     "node": ">=22"
   }

package/template/greeter/package.json

@@ -19,7 +19,7 @@
     "@types/node": "^22.13.10",
     "skuba": "*"
   },
-  "packageManager": "pnpm@10.6.3",
+  "packageManager": "pnpm@10.6.4",
   "engines": {
     "node": ">=22"
   }

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

@@ -44,7 +44,7 @@
     "skuba": "*",
     "supertest": "^7.0.0"
   },
-  "packageManager": "pnpm@10.6.3",
+  "packageManager": "pnpm@10.6.4",
   "engines": {
     "node": ">=22"
   }

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

@@ -38,7 +38,7 @@
     "pino-pretty": "^13.0.0",
     "skuba": "*"
   },
-  "packageManager": "pnpm@10.6.3",
+  "packageManager": "pnpm@10.6.4",
   "engines": {
     "node": ">=22"
   }