skuba 10.0.4 → 10.2.0-config-20250421023131

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../src/cli/lint/internalLints/upgrade/index.ts"],
-  "sourcesContent": ["import path from 'path';\n\nimport { readdir, writeFile } from 'fs-extra';\nimport type readPkgUp from 'read-pkg-up';\nimport { gte, sort } from 'semver';\n\nimport type { Logger } from '../../../../utils/logging';\nimport { getConsumerManifest } from '../../../../utils/manifest';\nimport {\n  type PackageManagerConfig,\n  detectPackageManager,\n} from '../../../../utils/packageManager';\nimport { getSkubaVersion } from '../../../../utils/version';\nimport { formatPackage } from '../../../configure/processing/package';\nimport type { SkubaPackageJson } from '../../../init/writePackageJson';\nimport type { InternalLintResult } from '../../internal';\n\nexport type Patches = Patch[];\nexport type Patch = {\n  apply: PatchFunction;\n  description: string;\n};\nexport type PatchReturnType =\n  | { result: 'apply' }\n  | { result: 'skip'; reason?: string };\n\nexport type PatchConfig = {\n  mode: 'format' | 'lint';\n  manifest: readPkgUp.NormalizedReadResult;\n  packageManager: PackageManagerConfig;\n  dir?: string;\n};\n\nexport type PatchFunction = (config: PatchConfig) => Promise<PatchReturnType>;\n\nconst getPatches = async (manifestVersion: string): Promise<Patches> => {\n  const patches = await readdir(path.join(__dirname, 'patches'), {\n    withFileTypes: true,\n  });\n\n  // The patches are sorted by the version they were added from.\n  // Only return patches that are newer or equal to the current version.\n  const patchesForVersion = sort(\n    patches.flatMap((patch) =>\n      // Is a directory rather than a JavaScript source file\n      patch.isDirectory() &&\n      // Has been added since the last patch run on the project\n      gte(patch.name, manifestVersion)\n        ? patch.name\n        : [],\n    ),\n  );\n\n  return (await Promise.all(patchesForVersion.map(resolvePatches))).flat();\n};\n\nconst fileExtensions = ['js', 'ts'];\n\n// Hack to allow our Jest environment/transform to resolve the patches\n// In normal scenarios this will resolve immediately after the .js import\nconst resolvePatches = async (version: string): Promise<Patches> => {\n  for (const extension of fileExtensions) {\n    try {\n      // eslint-disable-next-line @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-member-access\n      return (await import(`./patches/${version}/index.${extension}`)).patches;\n    } catch {\n      // Ignore\n    }\n  }\n  throw new Error(`Could not resolve patches for ${version}`);\n};\n\nexport const upgradeSkuba = async (\n  mode: 'lint' | 'format',\n  logger: Logger,\n): Promise<InternalLintResult> => {\n  const [currentVersion, manifest, packageManager] = await Promise.all([\n    getSkubaVersion(),\n    getConsumerManifest(),\n    detectPackageManager(),\n  ]);\n\n  if (!manifest) {\n    throw new Error('Could not find a package json for this project');\n  }\n\n  manifest.packageJson.skuba ??= { version: '1.0.0' };\n\n  const manifestVersion = (manifest.packageJson.skuba as SkubaPackageJson)\n    .version;\n\n  // We are up to date, skip patches\n  if (gte(manifestVersion, currentVersion)) {\n    return { ok: true, fixable: false };\n  }\n\n  const patches = await getPatches(manifestVersion);\n  // No patches to apply even if version out of date. Early exit to avoid unnecessary commits.\n  if (patches.length === 0) {\n    return { ok: true, fixable: false };\n  }\n\n  if (mode === 'lint') {\n    const results = await Promise.all(\n      patches.map(\n        async ({ apply }) =>\n          await apply({\n            mode,\n            manifest,\n            packageManager,\n          }),\n      ),\n    );\n\n    // No patches are applicable. Early exit to avoid unnecessary commits.\n    if (results.every(({ result }) => result === 'skip')) {\n      return { ok: true, fixable: false };\n    }\n\n    logger.warn(\n      `skuba has patches to apply. Run ${logger.bold(\n        packageManager.print.exec,\n        'skuba',\n        'format',\n      )} to run them. ${logger.dim('skuba-patches')}`,\n    );\n\n    return {\n      ok: false,\n      fixable: true,\n      annotations: [\n        {\n          // package.json as likely skuba version has changed\n          // TODO: locate the \"skuba\": {} config in the package.json and annotate on the version property\n          path: manifest.path,\n          message: `skuba has patches to apply. Run ${packageManager.print.exec} skuba format to run them.`,\n        },\n      ],\n    };\n  }\n\n  logger.plain('Updating skuba...');\n\n  // Run these in series in case a subsequent patch relies on a previous patch\n  for (const { apply, description } of patches) {\n    const result = await apply({\n      mode,\n      manifest,\n      packageManager,\n    });\n    logger.newline();\n    if (result.result === 'skip') {\n      logger.plain(\n        `Patch skipped: ${description}${\n          result.reason ? ` - ${result.reason}` : ''\n        }`,\n      );\n    } else {\n      logger.plain(`Patch applied: ${description}`);\n    }\n  }\n\n  (manifest.packageJson.skuba as SkubaPackageJson).version = currentVersion;\n\n  const updatedPackageJson = await formatPackage(manifest.packageJson);\n\n  await writeFile(manifest.path, updatedPackageJson);\n  logger.newline();\n  logger.plain('skuba update complete.');\n  logger.newline();\n\n  return {\n    ok: true,\n    fixable: false,\n  };\n};\n"],
-  "mappings": "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",
+  "sourcesContent": ["import path from 'path';\n\nimport { readdir, writeFile } from 'fs-extra';\nimport type readPkgUp from 'read-pkg-up';\nimport { gte, sort } from 'semver';\n\nimport type { Logger } from '../../../../utils/logging';\nimport { getConsumerManifest } from '../../../../utils/manifest';\nimport {\n  type PackageManagerConfig,\n  detectPackageManager,\n} from '../../../../utils/packageManager';\nimport { getSkubaVersion } from '../../../../utils/version';\nimport { formatPackage } from '../../../configure/processing/package';\nimport type { SkubaPackageJson } from '../../../init/writePackageJson';\nimport type { InternalLintResult } from '../../internal';\n\nexport type Patches = Patch[];\nexport type Patch = {\n  apply: PatchFunction;\n  description: string;\n};\nexport type PatchReturnType =\n  | { result: 'apply' }\n  | { result: 'skip'; reason?: string };\n\nexport type PatchConfig = {\n  mode: 'format' | 'lint';\n  manifest: readPkgUp.NormalizedReadResult;\n  packageManager: PackageManagerConfig;\n  dir?: string;\n};\n\nexport type PatchFunction = (config: PatchConfig) => Promise<PatchReturnType>;\n\nconst getPatches = async (manifestVersion: string): Promise<Patches> => {\n  const patches = await readdir(path.join(__dirname, 'patches'), {\n    withFileTypes: true,\n  });\n\n  // The patches are sorted by the version they were added from.\n  // Only return patches that are newer or equal to the current version.\n  const patchesForVersion = sort(\n    patches.flatMap((patch) =>\n      // Is a directory rather than a JavaScript source file\n      patch.isDirectory() &&\n      // Has been added since the last patch run on the project\n      gte(patch.name, manifestVersion)\n        ? patch.name\n        : [],\n    ),\n  );\n\n  return (await Promise.all(patchesForVersion.map(resolvePatches))).flat();\n};\n\nconst fileExtensions = ['js', 'ts'];\n\n// Hack to allow our Jest environment/transform to resolve the patches\n// In normal scenarios this will resolve immediately after the .js import\nconst resolvePatches = async (version: string): Promise<Patches> => {\n  for (const extension of fileExtensions) {\n    try {\n      // eslint-disable-next-line @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-member-access\n      return (await import(`./patches/${version}/index.${extension}`)).patches;\n    } catch {\n      // Ignore\n    }\n  }\n  throw new Error(`Could not resolve patches for ${version}`);\n};\n\nexport const upgradeSkuba = async (\n  mode: 'lint' | 'format',\n  logger: Logger,\n  additionalFlags: string[] = [],\n): Promise<InternalLintResult> => {\n  const [currentVersion, manifest, packageManager] = await Promise.all([\n    getSkubaVersion(),\n    getConsumerManifest(),\n    detectPackageManager(),\n  ]);\n\n  if (!manifest) {\n    throw new Error('Could not find a package json for this project');\n  }\n\n  manifest.packageJson.skuba ??= { version: '1.0.0' };\n\n  const manifestVersion = additionalFlags.includes('--force-apply-all-patches')\n    ? '1.0.0'\n    : (manifest.packageJson.skuba as SkubaPackageJson).version;\n\n  // We are up to date, skip patches\n  if (gte(manifestVersion, currentVersion)) {\n    return { ok: true, fixable: false };\n  }\n\n  const patches = await getPatches(manifestVersion);\n  // No patches to apply even if version out of date. Early exit to avoid unnecessary commits.\n  if (patches.length === 0) {\n    return { ok: true, fixable: false };\n  }\n\n  if (mode === 'lint') {\n    const results = await Promise.all(\n      patches.map(\n        async ({ apply }) =>\n          await apply({\n            mode,\n            manifest,\n            packageManager,\n          }),\n      ),\n    );\n\n    // No patches are applicable. Early exit to avoid unnecessary commits.\n    if (results.every(({ result }) => result === 'skip')) {\n      return { ok: true, fixable: false };\n    }\n\n    logger.warn(\n      `skuba has patches to apply. Run ${logger.bold(\n        packageManager.print.exec,\n        'skuba',\n        'format',\n      )} to run them.`,\n    );\n\n    return {\n      ok: false,\n      fixable: true,\n      annotations: [\n        {\n          // package.json as likely skuba version has changed\n          // TODO: locate the \"skuba\": {} config in the package.json and annotate on the version property\n          path: manifest.path,\n          message: `skuba has patches to apply. Run ${packageManager.print.exec} skuba format to run them.`,\n        },\n      ],\n    };\n  }\n\n  logger.plain('Updating skuba...');\n\n  // Run these in series in case a subsequent patch relies on a previous patch\n  for (const { apply, description } of patches) {\n    const result = await apply({\n      mode,\n      manifest,\n      packageManager,\n    });\n    logger.newline();\n    if (result.result === 'skip') {\n      logger.plain(\n        `Patch skipped: ${description}${\n          result.reason ? ` - ${result.reason}` : ''\n        }`,\n      );\n    } else {\n      logger.plain(`Patch applied: ${description}`);\n    }\n  }\n\n  (manifest.packageJson.skuba as SkubaPackageJson).version = currentVersion;\n\n  const updatedPackageJson = await formatPackage(manifest.packageJson);\n\n  await writeFile(manifest.path, updatedPackageJson);\n  logger.newline();\n  logger.plain('skuba update complete.');\n  logger.newline();\n\n  return {\n    ok: true,\n    fixable: false,\n  };\n};\n"],
+  "mappings": "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",
   "names": ["path"]
 }

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/lint/internalLints/upgrade/patches/10.1.0/index.d.ts

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

package/lib/cli/lint/internalLints/upgrade/patches/10.1.0/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_stopBundlingInCDKTests = require("./stopBundlingInCDKTests");
+const patches = [
+  {
+    apply: import_stopBundlingInCDKTests.tryStopBundlingInCDKTests,
+    description: "Stop bundling inside CDK unit tests"
+  }
+];
+// 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.1.0/index.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../../../../../src/cli/lint/internalLints/upgrade/patches/10.1.0/index.ts"],
+  "sourcesContent": ["import type { Patches } from '../..';\n\nimport { tryStopBundlingInCDKTests } from './stopBundlingInCDKTests';\n\nexport const patches: Patches = [\n  {\n    apply: tryStopBundlingInCDKTests,\n    description: 'Stop bundling inside CDK unit tests',\n  },\n];\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA,oCAA0C;AAEnC,MAAM,UAAmB;AAAA,EAC9B;AAAA,IACE,OAAO;AAAA,IACP,aAAa;AAAA,EACf;AACF;",
+  "names": []
+}

package/lib/cli/lint/internalLints/upgrade/patches/10.1.0/stopBundlingInCDKTests.d.ts

@@ -0,0 +1,3 @@
+import type { PatchFunction } from '../..';
+export declare const hasAppImportRegex: RegExp;
+export declare const tryStopBundlingInCDKTests: PatchFunction;

package/lib/cli/lint/internalLints/upgrade/patches/10.1.0/stopBundlingInCDKTests.js

@@ -0,0 +1,96 @@
+"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 stopBundlingInCDKTests_exports = {};
+__export(stopBundlingInCDKTests_exports, {
+  hasAppImportRegex: () => hasAppImportRegex,
+  tryStopBundlingInCDKTests: () => tryStopBundlingInCDKTests
+});
+module.exports = __toCommonJS(stopBundlingInCDKTests_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 hasAppImportRegex = /import\s*\{\s*(?:[^}]*,\s*)?App\s*(?:,\s*[^}]*)?\s*\}\s*from\s*['"]aws-cdk-lib['"]/gm;
+const addBundlingContext = (contents) => {
+  if (contents.includes("new App()") && hasAppImportRegex.test(contents)) {
+    return contents.replaceAll(
+      "new App()",
+      "new App({ context: { 'aws:cdk:bundling-stacks': [] } })"
+    );
+  }
+  return contents;
+};
+const stopBundlingInCDKTests = async ({
+  mode
+}) => {
+  const infraTestFileNames = await (0, import_fast_glob.glob)(["**/infra/**/*.test.ts"]);
+  if (!infraTestFileNames.length) {
+    return {
+      result: "skip",
+      reason: "no CDK test files found"
+    };
+  }
+  const infraTestFiles = await fetchFiles(infraTestFileNames);
+  const mapped = infraTestFiles.map(({ file, contents }) => ({
+    file,
+    before: contents,
+    after: addBundlingContext(contents)
+  }));
+  if (!mapped.some(({ before, after }) => before !== after)) {
+    return {
+      result: "skip",
+      reason: "no CDK test files need patching"
+    };
+  }
+  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 tryStopBundlingInCDKTests = async (config) => {
+  try {
+    return await stopBundlingInCDKTests(config);
+  } catch (err) {
+    import_logging.log.warn("Failed to remove bundling in CDK tests");
+    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 = {
+  hasAppImportRegex,
+  tryStopBundlingInCDKTests
+});
+//# sourceMappingURL=stopBundlingInCDKTests.js.map

package/lib/cli/lint/internalLints/upgrade/patches/10.1.0/stopBundlingInCDKTests.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../../../../../src/cli/lint/internalLints/upgrade/patches/10.1.0/stopBundlingInCDKTests.ts"],
+  "sourcesContent": ["import { 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\nexport const hasAppImportRegex =\n  /import\\s*\\{\\s*(?:[^}]*,\\s*)?App\\s*(?:,\\s*[^}]*)?\\s*\\}\\s*from\\s*['\"]aws-cdk-lib['\"]/gm;\n\nconst addBundlingContext = (contents: string) => {\n  if (contents.includes('new App()') && hasAppImportRegex.test(contents)) {\n    return contents.replaceAll(\n      'new App()',\n      \"new App({ context: { 'aws:cdk:bundling-stacks': [] } })\",\n    );\n  }\n\n  return contents;\n};\n\nconst stopBundlingInCDKTests: PatchFunction = async ({\n  mode,\n}): Promise<PatchReturnType> => {\n  const infraTestFileNames = await glob(['**/infra/**/*.test.ts']);\n\n  if (!infraTestFileNames.length) {\n    return {\n      result: 'skip',\n      reason: 'no CDK test files found',\n    };\n  }\n\n  const infraTestFiles = await fetchFiles(infraTestFileNames);\n\n  const mapped = infraTestFiles.map(({ file, contents }) => ({\n    file,\n    before: contents,\n    after: addBundlingContext(contents),\n  }));\n\n  if (!mapped.some(({ before, after }) => before !== after)) {\n    return {\n      result: 'skip',\n      reason: 'no CDK test files need patching',\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 tryStopBundlingInCDKTests: PatchFunction = async (config) => {\n  try {\n    return await stopBundlingInCDKTests(config);\n  } catch (err) {\n    log.warn('Failed to remove bundling in CDK tests');\n    log.subtle(inspect(err));\n    return { result: 'skip', reason: 'due to an error' };\n  }\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,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;AAEK,MAAM,oBACX;AAEF,MAAM,qBAAqB,CAAC,aAAqB;AAC/C,MAAI,SAAS,SAAS,WAAW,KAAK,kBAAkB,KAAK,QAAQ,GAAG;AACtE,WAAO,SAAS;AAAA,MACd;AAAA,MACA;AAAA,IACF;AAAA,EACF;AAEA,SAAO;AACT;AAEA,MAAM,yBAAwC,OAAO;AAAA,EACnD;AACF,MAAgC;AAC9B,QAAM,qBAAqB,UAAM,uBAAK,CAAC,uBAAuB,CAAC;AAE/D,MAAI,CAAC,mBAAmB,QAAQ;AAC9B,WAAO;AAAA,MACL,QAAQ;AAAA,MACR,QAAQ;AAAA,IACV;AAAA,EACF;AAEA,QAAM,iBAAiB,MAAM,WAAW,kBAAkB;AAE1D,QAAM,SAAS,eAAe,IAAI,CAAC,EAAE,MAAM,SAAS,OAAO;AAAA,IACzD;AAAA,IACA,QAAQ;AAAA,IACR,OAAO,mBAAmB,QAAQ;AAAA,EACpC,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,4BAA2C,OAAO,WAAW;AACxE,MAAI;AACF,WAAO,MAAM,uBAAuB,MAAM;AAAA,EAC5C,SAAS,KAAK;AACZ,uBAAI,KAAK,wCAAwC;AACjD,uBAAI,WAAO,qBAAQ,GAAG,CAAC;AACvB,WAAO,EAAE,QAAQ,QAAQ,QAAQ,kBAAkB;AAAA,EACrD;AACF;",
+  "names": ["fs"]
+}

package/lib/cli/lint/prettier.js

@@ -39,13 +39,16 @@ var import_logging = require("../../utils/logging");
 var import_worker = require("../../utils/worker");
 var import_prettier = require("../adapter/prettier");
 const LOG_PREFIX = import_chalk.default.cyan("Prettier \u2502");
-const runPrettierInCurrentThread = ({ debug }) => (0, import_prettier.runPrettier)("lint", (0, import_logging.createLogger)(debug, LOG_PREFIX));
+const runPrettierInCurrentThread = ({ debug }) => (0, import_prettier.runPrettier)("lint", (0, import_logging.createLogger)({ debug, prefixes: [LOG_PREFIX] }));
 const runPrettierInWorkerThread = (input) => (0, import_worker.execWorkerThread)(
   import_path.default.posix.join(__dirname, "prettier.js"),
   input
 );
 if (!import_worker_threads.isMainThread) {
-  (0, import_worker.postWorkerOutput)(runPrettierInCurrentThread, (0, import_logging.createLogger)(false, LOG_PREFIX));
+  (0, import_worker.postWorkerOutput)(
+    runPrettierInCurrentThread,
+    (0, import_logging.createLogger)({ debug: false, prefixes: [LOG_PREFIX] })
+  );
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/lib/cli/lint/prettier.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/cli/lint/prettier.ts"],
-  "sourcesContent": ["import path from 'path';\nimport { isMainThread } from 'worker_threads';\n\nimport chalk from 'chalk';\n\nimport { createLogger } from '../../utils/logging';\nimport { execWorkerThread, postWorkerOutput } from '../../utils/worker';\nimport { type PrettierOutput, runPrettier } from '../adapter/prettier';\n\nimport type { Input } from './types';\n\nconst LOG_PREFIX = chalk.cyan('Prettier \u2502');\n\nexport const runPrettierInCurrentThread = ({ debug }: Input) =>\n  runPrettier('lint', createLogger(debug, LOG_PREFIX));\n\nexport const runPrettierInWorkerThread = (input: Input) =>\n  execWorkerThread<Input, PrettierOutput>(\n    path.posix.join(__dirname, 'prettier.js'),\n    input,\n  );\n\nif (!isMainThread) {\n  postWorkerOutput(runPrettierInCurrentThread, createLogger(false, LOG_PREFIX));\n}\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AACjB,4BAA6B;AAE7B,mBAAkB;AAElB,qBAA6B;AAC7B,oBAAmD;AACnD,sBAAiD;AAIjD,MAAM,aAAa,aAAAA,QAAM,KAAK,iBAAY;AAEnC,MAAM,6BAA6B,CAAC,EAAE,MAAM,UACjD,6BAAY,YAAQ,6BAAa,OAAO,UAAU,CAAC;AAE9C,MAAM,4BAA4B,CAAC,cACxC;AAAA,EACE,YAAAC,QAAK,MAAM,KAAK,WAAW,aAAa;AAAA,EACxC;AACF;AAEF,IAAI,CAAC,oCAAc;AACjB,sCAAiB,gCAA4B,6BAAa,OAAO,UAAU,CAAC;AAC9E;",
+  "sourcesContent": ["import path from 'path';\nimport { isMainThread } from 'worker_threads';\n\nimport chalk from 'chalk';\n\nimport { createLogger } from '../../utils/logging';\nimport { execWorkerThread, postWorkerOutput } from '../../utils/worker';\nimport { type PrettierOutput, runPrettier } from '../adapter/prettier';\n\nimport type { Input } from './types';\n\nconst LOG_PREFIX = chalk.cyan('Prettier \u2502');\n\nexport const runPrettierInCurrentThread = ({ debug }: Input) =>\n  runPrettier('lint', createLogger({ debug, prefixes: [LOG_PREFIX] }));\n\nexport const runPrettierInWorkerThread = (input: Input) =>\n  execWorkerThread<Input, PrettierOutput>(\n    path.posix.join(__dirname, 'prettier.js'),\n    input,\n  );\n\nif (!isMainThread) {\n  postWorkerOutput(\n    runPrettierInCurrentThread,\n    createLogger({ debug: false, prefixes: [LOG_PREFIX] }),\n  );\n}\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AACjB,4BAA6B;AAE7B,mBAAkB;AAElB,qBAA6B;AAC7B,oBAAmD;AACnD,sBAAiD;AAIjD,MAAM,aAAa,aAAAA,QAAM,KAAK,iBAAY;AAEnC,MAAM,6BAA6B,CAAC,EAAE,MAAM,UACjD,6BAAY,YAAQ,6BAAa,EAAE,OAAO,UAAU,CAAC,UAAU,EAAE,CAAC,CAAC;AAE9D,MAAM,4BAA4B,CAAC,cACxC;AAAA,EACE,YAAAC,QAAK,MAAM,KAAK,WAAW,aAAa;AAAA,EACxC;AACF;AAEF,IAAI,CAAC,oCAAc;AACjB;AAAA,IACE;AAAA,QACA,6BAAa,EAAE,OAAO,OAAO,UAAU,CAAC,UAAU,EAAE,CAAC;AAAA,EACvD;AACF;",
   "names": ["chalk", "path"]
 }

package/lib/cli/lint/types.d.ts

@@ -34,4 +34,8 @@ export interface Input {
      * An override to point to a specific ESLint config file.
      */
     eslintConfigFile?: string;
+    /**
+     * Additional CLI flags that are used for skuba's internal lints.
+     */
+    additionalFlags?: string[];
 }

package/lib/cli/lint/types.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/cli/lint/types.ts"],
-  "sourcesContent": ["import type { Writable } from 'stream';\n\nexport interface Input {\n  /**\n   * Whether to enable verbose debug logging.\n   *\n   * Defaults to `false`.\n   */\n  debug: boolean;\n\n  /**\n   * Whether to disable parallelism to run linting operations serially.\n   *\n   * This can be useful for executing in resource-constrained environments and\n   * snapshotting deterministic output in tests.\n   *\n   * Defaults to `false`.\n   */\n  serial: boolean;\n\n  /**\n   * An override output stream that can be supplied to test `tsc` logging.\n   *\n   * Defaults to `process.stdout`.\n   */\n  tscOutputStream?: Writable;\n\n  /**\n   * Whether to allow usage of Node.js worker threads.\n   *\n   * This may be set to `false` when there is a worker thread incompatibility,\n   * such as calling in from a TypeScript context in our Jest tests.\n   *\n   * Defaults to `true`.\n   */\n  workerThreads?: boolean;\n\n  /**\n   * An override to point to a specific ESLint config file.\n   */\n  eslintConfigFile?: string;\n}\n"],
+  "sourcesContent": ["import type { Writable } from 'stream';\n\nexport interface Input {\n  /**\n   * Whether to enable verbose debug logging.\n   *\n   * Defaults to `false`.\n   */\n  debug: boolean;\n\n  /**\n   * Whether to disable parallelism to run linting operations serially.\n   *\n   * This can be useful for executing in resource-constrained environments and\n   * snapshotting deterministic output in tests.\n   *\n   * Defaults to `false`.\n   */\n  serial: boolean;\n\n  /**\n   * An override output stream that can be supplied to test `tsc` logging.\n   *\n   * Defaults to `process.stdout`.\n   */\n  tscOutputStream?: Writable;\n\n  /**\n   * Whether to allow usage of Node.js worker threads.\n   *\n   * This may be set to `false` when there is a worker thread incompatibility,\n   * such as calling in from a TypeScript context in our Jest tests.\n   *\n   * Defaults to `true`.\n   */\n  workerThreads?: boolean;\n\n  /**\n   * An override to point to a specific ESLint config file.\n   */\n  eslintConfigFile?: string;\n\n  /**\n   * Additional CLI flags that are used for skuba's internal lints.\n   */\n  additionalFlags?: string[];\n}\n"],
   "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;",
   "names": []
 }

package/lib/config/load.d.ts

@@ -0,0 +1,2 @@
+import { type SkubaConfig } from './types';
+export declare const loadSkubaConfig: (cwd?: string) => Promise<SkubaConfig>;

package/lib/config/load.js

@@ -0,0 +1,75 @@
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var load_exports = {};
+__export(load_exports, {
+  loadSkubaConfig: () => loadSkubaConfig
+});
+module.exports = __toCommonJS(load_exports);
+var import_path = __toESM(require("path"));
+var import_fs_extra = __toESM(require("fs-extra"));
+var import_jiti = require("jiti");
+var import_logging = require("../utils/logging");
+var import_types = require("./types");
+const CONFIG_FILENAME = "skuba.config.ts";
+const jiti = (0, import_jiti.createJiti)(__filename);
+const skubaConfigCacheForPath = {};
+const findSkubaConfig = async (cwd) => {
+  let currentDir = cwd;
+  while (currentDir !== import_path.default.dirname(currentDir)) {
+    const filePath = import_path.default.join(currentDir, CONFIG_FILENAME);
+    const pathExists = await import_fs_extra.default.pathExists(filePath);
+    if (pathExists) {
+      return filePath;
+    }
+    currentDir = import_path.default.dirname(currentDir);
+  }
+  return null;
+};
+const loadSkubaConfig = (cwd = process.cwd()) => {
+  const load = async () => {
+    const configPath = await findSkubaConfig(cwd);
+    if (!configPath) {
+      return {};
+    }
+    try {
+      const rawConfig = await jiti.import(configPath);
+      return import_types.skubaConfigSchema.parse(rawConfig);
+    } catch (err) {
+      import_logging.log.warn(`Failed to load ${import_logging.log.bold(configPath)}.`);
+      import_logging.log.subtle(err);
+      return {};
+    }
+  };
+  return skubaConfigCacheForPath[cwd] ??= load();
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  loadSkubaConfig
+});
+//# sourceMappingURL=load.js.map

package/lib/config/load.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../src/config/load.ts"],
+  "sourcesContent": ["import path from 'path';\n\nimport fs from 'fs-extra';\nimport { createJiti } from 'jiti';\n\nimport { log } from '../utils/logging';\n\nimport { type SkubaConfig, skubaConfigSchema } from './types';\n\nconst CONFIG_FILENAME = 'skuba.config.ts';\n\nconst jiti = createJiti(__filename);\n\nconst skubaConfigCacheForPath: Record<string, Promise<SkubaConfig>> = {};\n\nconst findSkubaConfig = async (cwd: string): Promise<string | null> => {\n  let currentDir = cwd;\n\n  while (currentDir !== path.dirname(currentDir)) {\n    const filePath = path.join(currentDir, CONFIG_FILENAME);\n    const pathExists = await fs.pathExists(filePath);\n\n    if (pathExists) {\n      return filePath;\n    }\n\n    currentDir = path.dirname(currentDir);\n  }\n\n  return null;\n};\n\nexport const loadSkubaConfig = (\n  cwd: string = process.cwd(),\n): Promise<SkubaConfig> => {\n  const load = async (): Promise<SkubaConfig> => {\n    const configPath = await findSkubaConfig(cwd);\n    if (!configPath) {\n      return {};\n    }\n\n    try {\n      const rawConfig = await jiti.import(configPath);\n      return skubaConfigSchema.parse(rawConfig);\n    } catch (err) {\n      log.warn(`Failed to load ${log.bold(configPath)}.`);\n      log.subtle(err);\n\n      return {};\n    }\n  };\n\n  return (skubaConfigCacheForPath[cwd] ??= load());\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AAEjB,sBAAe;AACf,kBAA2B;AAE3B,qBAAoB;AAEpB,mBAAoD;AAEpD,MAAM,kBAAkB;AAExB,MAAM,WAAO,wBAAW,UAAU;AAElC,MAAM,0BAAgE,CAAC;AAEvE,MAAM,kBAAkB,OAAO,QAAwC;AACrE,MAAI,aAAa;AAEjB,SAAO,eAAe,YAAAA,QAAK,QAAQ,UAAU,GAAG;AAC9C,UAAM,WAAW,YAAAA,QAAK,KAAK,YAAY,eAAe;AACtD,UAAM,aAAa,MAAM,gBAAAC,QAAG,WAAW,QAAQ;AAE/C,QAAI,YAAY;AACd,aAAO;AAAA,IACT;AAEA,iBAAa,YAAAD,QAAK,QAAQ,UAAU;AAAA,EACtC;AAEA,SAAO;AACT;AAEO,MAAM,kBAAkB,CAC7B,MAAc,QAAQ,IAAI,MACD;AACzB,QAAM,OAAO,YAAkC;AAC7C,UAAM,aAAa,MAAM,gBAAgB,GAAG;AAC5C,QAAI,CAAC,YAAY;AACf,aAAO,CAAC;AAAA,IACV;AAEA,QAAI;AACF,YAAM,YAAY,MAAM,KAAK,OAAO,UAAU;AAC9C,aAAO,+BAAkB,MAAM,SAAS;AAAA,IAC1C,SAAS,KAAK;AACZ,yBAAI,KAAK,kBAAkB,mBAAI,KAAK,UAAU,CAAC,GAAG;AAClD,yBAAI,OAAO,GAAG;AAEd,aAAO,CAAC;AAAA,IACV;AAAA,EACF;AAEA,SAAQ,wBAAwB,GAAG,MAAM,KAAK;AAChD;",
+  "names": ["path", "fs"]
+}

package/lib/config/types.d.ts

@@ -0,0 +1,51 @@
+import { z } from 'zod';
+export declare const skubaConfigSchema: z.ZodObject<{
+    /**
+     * Files to copy from the working directory to the output directory after
+     * compilation. This feature is useful to bundle non-JavaScript assets in an
+     * npm package, back-end deployment package or container image.
+     *
+     * Supports `picomatch` glob patterns with dotfile matching.
+     *
+     * - https://github.com/micromatch/picomatch#globbing-features
+     * - https://github.com/micromatch/picomatch#picomatch-options
+     *
+     * Commands:
+     *
+     * - `skuba build`
+     * - `skuba build-package`
+     */
+    assets: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
+    /**
+     * The entry point to the package or application. For packages, this is the
+     * main file that will be imported when the package is required. For applications,
+     * this is the main file that will be executed when the application is run.
+     *
+     * Commands:
+     *
+     * - `skuba build`
+     * - `skuba build-package`
+     * - `skuba start`
+     */
+    entryPoint: z.ZodOptional<z.ZodString>;
+}, "strip", z.ZodTypeAny, {
+    assets?: string[] | undefined;
+    entryPoint?: string | undefined;
+}, {
+    assets?: string[] | undefined;
+    entryPoint?: string | undefined;
+}>;
+export declare const SkubaConfig: {
+    assets: {
+        /**
+         * The default list of `assets` that are applied if your project does not
+         * specify the configuration property.
+         *
+         * Currently includes:
+         *
+         * - JSON translation files for https://github.com/seek-oss/vocab
+         */
+        default: string[];
+    };
+};
+export type SkubaConfig = z.infer<typeof skubaConfigSchema>;