skuba 7.5.0-timeout-20240210035306 → 7.5.1

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

@@ -4,6 +4,8 @@ schemaVersion: v0.0
 
 name: '{{values "service"}}'
 
+owner: '{{values "owner"}}'
+
 image: '{{values "image"}}'
 
 env:

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

@@ -15,11 +15,11 @@
     "@koa/router": "^12.0.0",
     "@opentelemetry/api": "^1.1.0",
     "@opentelemetry/core": "^1.18.1",
-    "@opentelemetry/exporter-trace-otlp-grpc": "^0.48.0",
-    "@opentelemetry/instrumentation-aws-sdk": "^0.38.0",
-    "@opentelemetry/instrumentation-http": "^0.48.0",
+    "@opentelemetry/exporter-trace-otlp-grpc": "^0.49.0",
+    "@opentelemetry/instrumentation-aws-sdk": "^0.39.0",
+    "@opentelemetry/instrumentation-http": "^0.49.0",
     "@opentelemetry/propagator-b3": "^1.18.1",
-    "@opentelemetry/sdk-node": "^0.48.0",
+    "@opentelemetry/sdk-node": "^0.49.0",
     "@seek/logger": "^6.0.0",
     "aws-sdk": "^2.1039.0",
     "hot-shots": "^10.0.0",
@@ -43,7 +43,7 @@
     "skuba": "*",
     "supertest": "^6.1.6"
   },
-  "packageManager": "pnpm@8.15.1",
+  "packageManager": "pnpm@8.15.4",
   "engines": {
     "node": ">=20"
   }

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

@@ -35,7 +35,7 @@ configs:
         - *aws-sm
         - *private-npm
         - *docker-ecr-cache
-        - docker-compose#v4.16.0:
+        - docker-compose#v5.2.0:
             dependencies: false
             run: app
             propagate-environment: true
@@ -66,7 +66,7 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - docker-compose#v4.16.0:
+      - docker-compose#v5.2.0:
           run: app
           environment:
             - GITHUB_API_TOKEN

package/template/lambda-sqs-worker/Dockerfile

@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.6
+# syntax=docker/dockerfile:1.7
 
 FROM --platform=${BUILDPLATFORM:-<%- platformName %>} node:20-alpine AS dev-deps
 

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

@@ -18,7 +18,7 @@
     "@aws-sdk/client-lambda": "^3.363.0",
     "@aws-sdk/client-sns": "^3.363.0",
     "@seek/logger": "^6.0.0",
-    "datadog-lambda-js": "^7.102.0",
+    "datadog-lambda-js": "^8.0.0",
     "dd-trace": "^5.0.0",
     "skuba-dive": "^2.0.0",
     "zod": "^3.19.1"
@@ -37,7 +37,7 @@
     "serverless-prune-plugin": "^2.0.0",
     "skuba": "*"
   },
-  "packageManager": "pnpm@8.15.1",
+  "packageManager": "pnpm@8.15.4",
   "engines": {
     "node": ">=20"
   }

package/template/lambda-sqs-worker/serverless.yml

@@ -5,6 +5,18 @@ configValidationMode: error
 params:
   default:
     datadogApiKeySecretArn: 'TODO: arn:aws:secretsmanager:${aws:region}:${aws:accountId}:secret:SECRET-NAME'
+    dataStoreTags:
+      - Key: seek:auto:backup:frequency
+        Value: none
+      # TODO: https://rfc.skinfra.xyz/RFC019-AWS-Tagging-Standard.html#data-services
+      # - Key: seek:data:derived
+      #   Value: copy
+      # - Key: seek:data:domain
+      #   Value: unassigned
+      # - Key: seek:data:jurisdiction-source
+      #   Value: australia hong-kong indonesia malaysia new-zealand philippines singapore thailand
+      # - Key: seek:data:types:restricted
+      #   Value: job-ads
     description: <%- description %>
   dev:
     deploymentBucket: 'TODO: deployment-bucket-name'
@@ -70,16 +82,15 @@ provider:
           Effect: Allow
           Resource: !Ref DestinationTopic
   stackTags:
-    # TODO: add data classification tags
-    # https://rfc.skinfra.xyz/RFC019-AWS-Tagging-Standard.html#seekdataconsumers
-    # seek:data:consumers: internal
-    # https://rfc.skinfra.xyz/RFC019-AWS-Tagging-Standard.html#seekdatatypes
-    # seek:data:types:restricted: job-ads
     seek:env:label: ${env:ENVIRONMENT}
-    seek:env:production: ${param:isProduction}
-    seek:owner:team: '<%- teamName %>'
+    seek:env:prod: ${param:isProduction}
+    # seek:owner:cost-centre: 'TODO: https://rfc.skinfra.xyz/RFC019-AWS-Tagging-Standard.html#required-tags'
+    seek:owner:technical: '<%- teamName %>'
     seek:source:sha: ${env:BUILDKITE_COMMIT, 'na'}
     seek:source:url: 'https://github.com/SEEK-Jobs/<%- repoName %>'
+    seek:system:deployed-by: CFN
+    # seek:system:name: 'TODO: https://rfc.skinfra.xyz/RFC019-AWS-Tagging-Standard.html#required-tags'
+    # seek:system:org: 'TODO: https://rfc.skinfra.xyz/RFC019-AWS-Tagging-Standard.html#required-tags'
 
 package:
   patterns:
@@ -131,6 +142,7 @@ resources:
         KmsDataKeyReusePeriodSeconds: 300
         KmsMasterKeyId: !Ref EncryptionKey
         QueueName: ${self:service}-dead-letters
+        Tags: ${param:dataStoreTags}
 
     MessageQueue:
       Type: AWS::SQS::Queue
@@ -142,6 +154,7 @@ resources:
         RedrivePolicy:
           deadLetterTargetArn: !GetAtt DeadLetterQueue.Arn
           maxReceiveCount: 3
+        Tags: ${param:dataStoreTags}
         VisibilityTimeout: 180
 
     # MessageQueuePolicy:
@@ -173,6 +186,7 @@ resources:
       Type: AWS::SNS::Topic
       Properties:
         KmsMasterKeyId: alias/aws/sns
+        Tags: ${param:dataStoreTags}
         TopicName: ${self:service}
 
     EncryptionKey:

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

@@ -32,7 +32,7 @@ configs:
         - *aws-sm
         - *private-npm
         - *docker-ecr-cache
-        - docker-compose#v4.16.0:
+        - docker-compose#v5.2.0:
             dependencies: false
             run: app
             environment:
@@ -62,7 +62,7 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - docker-compose#v4.16.0:
+      - docker-compose#v5.2.0:
           run: app
           environment:
             - GITHUB_API_TOKEN

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

@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.6
+# syntax=docker/dockerfile:1.7
 
 FROM --platform=${BUILDPLATFORM:-<%- platformName %>} node:20-alpine AS dev-deps
 

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

@@ -8,7 +8,7 @@
       "workerLambda": {
         "reservedConcurrency": 2,
         "environment": {
-          "SOMETHING": "dev"
+          "ENVIRONMENT": "dev"
         }
       },
       "sourceSnsTopicArn": "TODO: sourceSnsTopicArn"
@@ -17,7 +17,7 @@
       "workerLambda": {
         "reservedConcurrency": 20,
         "environment": {
-          "SOMETHING": "prod"
+          "ENVIRONMENT": "prod"
         }
       },
       "sourceSnsTopicArn": "TODO: sourceSnsTopicArn"

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

@@ -448,9 +448,9 @@ exports[`returns expected CloudFormation stack for dev 1`] = `
         "Description": "Updated at 1212-12-12T12:12:12.121Z",
         "Environment": {
           "Variables": {
+            "ENVIRONMENT": "dev",
             "NODE_ENV": "production",
             "NODE_OPTIONS": "--enable-source-maps",
-            "SOMETHING": "dev",
           },
         },
         "FunctionName": "serviceName",
@@ -481,7 +481,7 @@ exports[`returns expected CloudFormation stack for dev 1`] = `
         },
         "FunctionVersion": {
           "Fn::GetAtt": [
-            "workerCurrentVersionFA5B4BF4c6e1b764a3a99fdb70911ac06ee9afd5",
+            "workerCurrentVersionxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx",
             "Version",
           ],
         },
@@ -540,7 +540,7 @@ exports[`returns expected CloudFormation stack for dev 1`] = `
       },
       "Type": "AWS::Lambda::EventSourceMapping",
     },
-    "workerCurrentVersionFA5B4BF4c6e1b764a3a99fdb70911ac06ee9afd5": {
+    "workerCurrentVersionxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx": {
       "Properties": {
         "FunctionName": {
           "Ref": "worker28EA3E30",
@@ -638,12 +638,12 @@ exports[`returns expected CloudFormation stack for dev 1`] = `
         },
         "Environment": {
           "Variables": {
+            "ENVIRONMENT": "dev",
             "FUNCTION_NAME_TO_PRUNE": {
               "Ref": "worker28EA3E30",
             },
             "NODE_ENV": "production",
             "NODE_OPTIONS": "--enable-source-maps",
-            "SOMETHING": "dev",
           },
         },
         "FunctionName": "serviceName-post-hook",
@@ -790,12 +790,12 @@ exports[`returns expected CloudFormation stack for dev 1`] = `
         },
         "Environment": {
           "Variables": {
+            "ENVIRONMENT": "dev",
             "FUNCTION_NAME_TO_INVOKE": {
               "Ref": "worker28EA3E30",
             },
             "NODE_ENV": "production",
             "NODE_OPTIONS": "--enable-source-maps",
-            "SOMETHING": "dev",
           },
         },
         "FunctionName": "serviceName-pre-hook",
@@ -1490,9 +1490,9 @@ exports[`returns expected CloudFormation stack for prod 1`] = `
         "Description": "Updated at 1212-12-12T12:12:12.121Z",
         "Environment": {
           "Variables": {
+            "ENVIRONMENT": "prod",
             "NODE_ENV": "production",
             "NODE_OPTIONS": "--enable-source-maps",
-            "SOMETHING": "prod",
           },
         },
         "FunctionName": "serviceName",
@@ -1523,7 +1523,7 @@ exports[`returns expected CloudFormation stack for prod 1`] = `
         },
         "FunctionVersion": {
           "Fn::GetAtt": [
-            "workerCurrentVersionFA5B4BF40f2ad063ab6223cdd6c6489f9188cf94",
+            "workerCurrentVersionxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx",
             "Version",
           ],
         },
@@ -1582,7 +1582,7 @@ exports[`returns expected CloudFormation stack for prod 1`] = `
       },
       "Type": "AWS::Lambda::EventSourceMapping",
     },
-    "workerCurrentVersionFA5B4BF40f2ad063ab6223cdd6c6489f9188cf94": {
+    "workerCurrentVersionxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx": {
       "Properties": {
         "FunctionName": {
           "Ref": "worker28EA3E30",
@@ -1680,12 +1680,12 @@ exports[`returns expected CloudFormation stack for prod 1`] = `
         },
         "Environment": {
           "Variables": {
+            "ENVIRONMENT": "prod",
             "FUNCTION_NAME_TO_PRUNE": {
               "Ref": "worker28EA3E30",
             },
             "NODE_ENV": "production",
             "NODE_OPTIONS": "--enable-source-maps",
-            "SOMETHING": "prod",
           },
         },
         "FunctionName": "serviceName-post-hook",
@@ -1832,12 +1832,12 @@ exports[`returns expected CloudFormation stack for prod 1`] = `
         },
         "Environment": {
           "Variables": {
+            "ENVIRONMENT": "prod",
             "FUNCTION_NAME_TO_INVOKE": {
               "Ref": "worker28EA3E30",
             },
             "NODE_ENV": "production",
             "NODE_OPTIONS": "--enable-source-maps",
-            "SOMETHING": "prod",
           },
         },
         "FunctionName": "serviceName-pre-hook",

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

@@ -44,10 +44,15 @@ it.each(contexts)(
 
     const template = Template.fromStack(stack);
 
-    const json = JSON.stringify(template.toJSON()).replace(
-      /"S3Key":"([0-9a-f]+)\.zip"/g,
-      (_, hash) => `"S3Key":"${'x'.repeat(hash.length)}.zip"`,
-    );
+    const json = JSON.stringify(template.toJSON())
+      .replace(
+        /"S3Key":"([0-9a-f]+)\.zip"/g,
+        (_, hash) => `"S3Key":"${'x'.repeat(hash.length)}.zip"`,
+      )
+      .replaceAll(
+        /workerCurrentVersion([0-9a-zA-Z]+)"/g,
+        (_, hash) => `workerCurrentVersion${'x'.repeat(hash.length)}"`,
+      );
 
     expect(JSON.parse(json)).toMatchSnapshot();
   },

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

@@ -26,7 +26,7 @@
     "constructs": "^10.0.17",
     "skuba": "*"
   },
-  "packageManager": "pnpm@8.15.1",
+  "packageManager": "pnpm@8.15.4",
   "engines": {
     "node": ">=20"
   }

package/template/lambda-sqs-worker-cdk/shared/context-types.ts

@@ -7,7 +7,7 @@ export const EnvContextSchema = z.object({
   workerLambda: z.object({
     reservedConcurrency: z.number(),
     environment: z.object({
-      SOMETHING: z.string(),
+      ENVIRONMENT: z.string(),
     }),
   }),
   sourceSnsTopicArn: z.string(),

package/lib/cli/configure/patchRenovateConfig.js.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../src/cli/configure/patchRenovateConfig.ts"],
-  "sourcesContent": ["import path from 'path';\nimport { inspect } from 'util';\n\nimport fs from 'fs-extra';\nimport * as fleece from 'golden-fleece';\nimport { z } from 'zod';\n\nimport * as Git from '../../api/git';\nimport { log } from '../../utils/logging';\n\nimport { createDestinationFileReader } from './analysis/project';\nimport { RENOVATE_CONFIG_FILENAMES } from './modules/renovate';\nimport { formatPrettier } from './processing/prettier';\nimport type { PatchFunction, PatchReturnType } from './upgrade';\n\nconst RENOVATE_PRESETS = [\n  'local>seekasia/renovate-config',\n  'local>seek-jobs/renovate-config',\n] as const;\n\nconst EXISTING_REPO_PRESET_REGEX = /(github|local)>(seek-jobs|seekasia)\\//;\n\ntype RenovateFiletype = 'json' | 'json5';\n\ntype RenovatePreset = (typeof RENOVATE_PRESETS)[number];\n\nconst renovateConfigSchema = z.object({\n  extends: z.array(z.string()),\n});\n\nconst ownerToRenovatePreset = (owner: string): RenovatePreset | undefined => {\n  const lowercaseOwner = owner.toLowerCase();\n\n  switch (lowercaseOwner) {\n    case 'seekasia':\n      return 'local>seekasia/renovate-config';\n\n    case 'seek-jobs':\n      return 'local>seek-jobs/renovate-config';\n\n    default:\n      return;\n  }\n};\n\ntype PatchFile = (props: {\n  filepath: string;\n  input: string;\n  presetToAdd: RenovatePreset;\n}) => Promise<void>;\n\nconst patchJson: PatchFile = async ({ filepath, input, presetToAdd }) => {\n  const json: unknown = JSON.parse(input);\n\n  const config = renovateConfigSchema.safeParse(json);\n\n  if (!config.success) {\n    return;\n  }\n\n  config.data.extends.unshift(presetToAdd);\n\n  await fs.promises.writeFile(\n    filepath,\n    await formatPrettier(JSON.stringify(config.data), { parser: 'json' }),\n  );\n\n  return;\n};\n\nconst patchJson5: PatchFile = async ({ filepath, input, presetToAdd }) => {\n  const json: unknown = fleece.evaluate(input);\n\n  const config = renovateConfigSchema.safeParse(json);\n\n  if (!config.success) {\n    return;\n  }\n\n  config.data.extends.unshift(presetToAdd);\n\n  await fs.promises.writeFile(\n    filepath,\n    await formatPrettier(fleece.patch(input, config.data), { parser: 'json5' }),\n  );\n\n  return;\n};\n\nconst patchByFiletype: Record<RenovateFiletype, PatchFile> = {\n  json: patchJson,\n  json5: patchJson5,\n};\n\nconst patchRenovateConfig = async (\n  mode: 'format' | 'lint',\n  dir: string,\n): Promise<PatchReturnType> => {\n  const readFile = createDestinationFileReader(dir);\n\n  const { owner } = await Git.getOwnerAndRepo({ dir });\n\n  const presetToAdd = ownerToRenovatePreset(owner);\n\n  if (!presetToAdd) {\n    return {\n      result: 'skip',\n      reason: 'owner does not map to a SEEK preset',\n    };\n  }\n\n  const maybeConfigs = await Promise.all(\n    RENOVATE_CONFIG_FILENAMES.map(async (filepath) => ({\n      input: await readFile(filepath),\n      filepath,\n    })),\n  );\n\n  const config = maybeConfigs.find((maybeConfig) => Boolean(maybeConfig.input));\n  if (!config?.input) {\n    return { result: 'skip', reason: 'no config found' };\n  }\n\n  if (\n    // The file appears to mention the baseline preset for the configured Git\n    // owner. This is a naive check for simplicity.\n    config.input.includes(presetToAdd) ||\n    // Ignore any renovate configuration which already extends a SEEK-Jobs or seekasia config\n    EXISTING_REPO_PRESET_REGEX.exec(config.input)\n  ) {\n    return {\n      result: 'skip',\n      reason: 'config already has a SEEK preset',\n    };\n  }\n\n  if (mode === 'lint') {\n    return { result: 'apply' };\n  }\n\n  const filetype: RenovateFiletype = config.filepath\n    .toLowerCase()\n    .endsWith('.json5')\n    ? 'json5'\n    : 'json';\n\n  const patchFile = patchByFiletype[filetype];\n\n  await patchFile({\n    filepath: path.resolve(dir, config.filepath),\n    input: config.input,\n    presetToAdd,\n  });\n\n  return { result: 'apply' };\n};\n\nexport const tryPatchRenovateConfig = (async (\n  mode: 'format' | 'lint',\n  dir = process.cwd(),\n) => {\n  try {\n    // In a monorepo we may be invoked within a subdirectory, but we are working\n    // with Renovate config that should be relative to the repository root.\n    const gitRoot = await Git.findRoot({ dir });\n    if (!gitRoot) {\n      return { result: 'skip', reason: 'no Git root found' };\n    }\n\n    return await patchRenovateConfig(mode, gitRoot);\n  } catch (err) {\n    log.warn('Failed to patch Renovate config.');\n    log.subtle(inspect(err));\n    return { result: 'skip', reason: 'due to an error' };\n  }\n}) satisfies PatchFunction;\n"],
-  "mappings": "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",
-  "names": ["fs", "path"]
-}

package/lib/cli/configure/upgrade/index.js.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../../src/cli/configure/upgrade/index.ts"],
-  "sourcesContent": ["import path from 'path';\n\nimport { readdir, writeFile } from 'fs-extra';\nimport { gte, sort } from 'semver';\n\nimport type { Logger } from '../../../utils/logging';\nimport { getConsumerManifest } from '../../../utils/manifest';\nimport { detectPackageManager } from '../../../utils/packageManager';\nimport { getSkubaVersion } from '../../../utils/version';\nimport type { SkubaPackageJson } from '../../init/writePackageJson';\nimport type { InternalLintResult } from '../../lint/internal';\nimport { formatPackage } from '../processing/package';\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 };\nexport type PatchFunction = (\n  mode: 'format' | 'lint',\n) => 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] = await Promise.all([\n    getSkubaVersion(),\n    getConsumerManifest(),\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(async ({ apply }) => await apply(mode)),\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    const packageManager = await detectPackageManager();\n\n    logger.warn(\n      `skuba has patches to apply. Run ${logger.bold(\n        packageManager.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.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(mode);\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/configure/upgrade/patches/7.3.1/addEmptyExports.js.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../../../../src/cli/configure/upgrade/patches/7.3.1/addEmptyExports.ts"],
-  "sourcesContent": ["import path from 'path';\nimport { inspect } from 'util';\n\nimport fs from 'fs-extra';\n\nimport type { PatchFunction } from '../..';\nimport { log } from '../../../../../utils/logging';\nimport { getDestinationManifest } from '../../../analysis/package';\nimport { createDestinationFileReader } from '../../../analysis/project';\nimport { formatPrettier } from '../../../processing/prettier';\n\nconst JEST_SETUP_FILES = ['jest.setup.ts', 'jest.setup.int.ts'];\n\nconst addEmptyExports = async (mode: 'format' | 'lint') => {\n  const manifest = await getDestinationManifest();\n\n  const destinationRoot = path.dirname(manifest.path);\n\n  const readDestinationFile = createDestinationFileReader(destinationRoot);\n\n  const addEmptyExport = async (filename: string) => {\n    const inputFile = await readDestinationFile(filename);\n\n    if (\n      !inputFile ||\n      // The file appears to have an import or export so it should be compatible\n      // with isolated modules. This is a very naive check that we don't want to\n      // overcomplicate because it is invoked before many skuba commands.\n      inputFile.includes('import ') ||\n      inputFile.includes('export ')\n    ) {\n      return 'skip';\n    }\n\n    if (mode === 'lint') {\n      return 'apply';\n    }\n\n    const data = await formatPrettier([inputFile, 'export {}'].join('\\n\\n'), {\n      parser: 'typescript',\n    });\n\n    const filepath = path.join(destinationRoot, filename);\n\n    await fs.promises.writeFile(filepath, data);\n\n    return 'apply';\n  };\n\n  const results = await Promise.all(JEST_SETUP_FILES.map(addEmptyExport));\n  return results.every((result) => result === 'skip') ? 'skip' : 'apply';\n};\n\n/**\n * Tries to add an empty `export {}` statement to the bottom of Jest setup files\n * for compliance with TypeScript isolated modules.\n */\nexport const tryAddEmptyExports: PatchFunction = async (\n  mode: 'format' | 'lint',\n) => {\n  try {\n    return { result: await addEmptyExports(mode) };\n  } catch (err) {\n    log.warn('Failed to convert Jest setup files to isolated modules.');\n    log.subtle(inspect(err));\n    return { result: 'skip', reason: 'due to an error' };\n  }\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AACjB,kBAAwB;AAExB,sBAAe;AAGf,qBAAoB;AACpB,qBAAuC;AACvC,qBAA4C;AAC5C,sBAA+B;AAE/B,MAAM,mBAAmB,CAAC,iBAAiB,mBAAmB;AAE9D,MAAM,kBAAkB,OAAO,SAA4B;AACzD,QAAM,WAAW,UAAM,uCAAuB;AAE9C,QAAM,kBAAkB,YAAAA,QAAK,QAAQ,SAAS,IAAI;AAElD,QAAM,0BAAsB,4CAA4B,eAAe;AAEvE,QAAM,iBAAiB,OAAO,aAAqB;AACjD,UAAM,YAAY,MAAM,oBAAoB,QAAQ;AAEpD,QACE,CAAC;AAAA;AAAA;AAAA,IAID,UAAU,SAAS,SAAS,KAC5B,UAAU,SAAS,SAAS,GAC5B;AACA,aAAO;AAAA,IACT;AAEA,QAAI,SAAS,QAAQ;AACnB,aAAO;AAAA,IACT;AAEA,UAAM,OAAO,UAAM,gCAAe,CAAC,WAAW,WAAW,EAAE,KAAK,MAAM,GAAG;AAAA,MACvE,QAAQ;AAAA,IACV,CAAC;AAED,UAAM,WAAW,YAAAA,QAAK,KAAK,iBAAiB,QAAQ;AAEpD,UAAM,gBAAAC,QAAG,SAAS,UAAU,UAAU,IAAI;AAE1C,WAAO;AAAA,EACT;AAEA,QAAM,UAAU,MAAM,QAAQ,IAAI,iBAAiB,IAAI,cAAc,CAAC;AACtE,SAAO,QAAQ,MAAM,CAAC,WAAW,WAAW,MAAM,IAAI,SAAS;AACjE;AAMO,MAAM,qBAAoC,OAC/C,SACG;AACH,MAAI;AACF,WAAO,EAAE,QAAQ,MAAM,gBAAgB,IAAI,EAAE;AAAA,EAC/C,SAAS,KAAK;AACZ,uBAAI,KAAK,yDAAyD;AAClE,uBAAI,WAAO,qBAAQ,GAAG,CAAC;AACvB,WAAO,EAAE,QAAQ,QAAQ,QAAQ,kBAAkB;AAAA,EACrD;AACF;",
-  "names": ["path", "fs"]
-}

package/lib/cli/configure/upgrade/patches/7.3.1/moveNpmrcOutOfIgnoreManagedSection.js.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../../../../src/cli/configure/upgrade/patches/7.3.1/moveNpmrcOutOfIgnoreManagedSection.ts"],
-  "sourcesContent": ["import path from 'path';\nimport { inspect } from 'util';\n\nimport fs from 'fs-extra';\n\nimport type { PatchFunction, PatchReturnType } from '../..';\nimport { log } from '../../../../../utils/logging';\nimport { NPMRC_LINES } from '../../../../../utils/npmrc';\nimport { createDestinationFileReader } from '../../../analysis/project';\n\nconst NPMRC_IGNORE_SECTION = `\n\n# Ignore .npmrc. This is no longer managed by skuba as pnpm projects use a managed .npmrc.\n# IMPORTANT: if migrating to pnpm, remove this line and add an .npmrc IN THE SAME COMMIT.\n# You can use \\`skuba format\\` to generate the file or otherwise commit an empty file.\n# Doing so will conflict with a local .npmrc and make it more difficult to unintentionally commit auth secrets.\n.npmrc\n`;\n\nconst moveNpmrcOutOfIgnoreManagedSection = async (\n  mode: 'format' | 'lint',\n  dir: string,\n  fileName: '.gitignore' | '.dockerignore',\n): Promise<PatchReturnType> => {\n  const readFile = createDestinationFileReader(dir);\n\n  const ignoreFile = await readFile(fileName);\n\n  if (!ignoreFile) {\n    return { result: 'skip', reason: `no ${fileName} file found` };\n  }\n\n  let isIgnored: { inManaged: boolean } | undefined;\n  let currentlyInManagedSection = false;\n\n  for (const line of ignoreFile.split('\\n')) {\n    if (line.trim() === '# managed by skuba') {\n      currentlyInManagedSection = true;\n    } else if (line.trim() === '# end managed by skuba') {\n      currentlyInManagedSection = false;\n    }\n\n    if (line.trim() === '.npmrc' || line.trim() === '/.npmrc') {\n      isIgnored = { inManaged: currentlyInManagedSection };\n    }\n\n    if (line.trim() === '!.npmrc' || line.trim() === '!/.npmrc') {\n      isIgnored = undefined;\n    }\n  }\n\n  if (isIgnored && !isIgnored.inManaged) {\n    return { result: 'skip', reason: 'already ignored in unmanaged section' };\n  }\n\n  if (!isIgnored) {\n    return { result: 'skip', reason: 'not ignored' };\n  }\n\n  if (mode === 'lint') {\n    return { result: 'apply' };\n  }\n\n  const newIgnoreFile =\n    ignoreFile\n      .split('\\n')\n      .filter((line) => !NPMRC_LINES.includes(line.trim()))\n      .join('\\n')\n      .trim() + NPMRC_IGNORE_SECTION;\n\n  await fs.promises.writeFile(path.join(dir, fileName), newIgnoreFile);\n\n  return { result: 'apply' };\n};\n\nexport const tryMoveNpmrcOutOfIgnoreManagedSection = (\n  type: '.gitignore' | '.dockerignore',\n) =>\n  (async (mode: 'format' | 'lint', dir = process.cwd()) => {\n    try {\n      return await moveNpmrcOutOfIgnoreManagedSection(mode, dir, type);\n    } catch (err) {\n      log.warn(`Failed to move .npmrc out of ${type} managed sections.`);\n      log.subtle(inspect(err));\n      return { result: 'skip', reason: 'due to an error' };\n    }\n  }) satisfies PatchFunction;\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AACjB,kBAAwB;AAExB,sBAAe;AAGf,qBAAoB;AACpB,mBAA4B;AAC5B,qBAA4C;AAE5C,MAAM,uBAAuB;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAS7B,MAAM,qCAAqC,OACzC,MACA,KACA,aAC6B;AAC7B,QAAM,eAAW,4CAA4B,GAAG;AAEhD,QAAM,aAAa,MAAM,SAAS,QAAQ;AAE1C,MAAI,CAAC,YAAY;AACf,WAAO,EAAE,QAAQ,QAAQ,QAAQ,MAAM,QAAQ,cAAc;AAAA,EAC/D;AAEA,MAAI;AACJ,MAAI,4BAA4B;AAEhC,aAAW,QAAQ,WAAW,MAAM,IAAI,GAAG;AACzC,QAAI,KAAK,KAAK,MAAM,sBAAsB;AACxC,kCAA4B;AAAA,IAC9B,WAAW,KAAK,KAAK,MAAM,0BAA0B;AACnD,kCAA4B;AAAA,IAC9B;AAEA,QAAI,KAAK,KAAK,MAAM,YAAY,KAAK,KAAK,MAAM,WAAW;AACzD,kBAAY,EAAE,WAAW,0BAA0B;AAAA,IACrD;AAEA,QAAI,KAAK,KAAK,MAAM,aAAa,KAAK,KAAK,MAAM,YAAY;AAC3D,kBAAY;AAAA,IACd;AAAA,EACF;AAEA,MAAI,aAAa,CAAC,UAAU,WAAW;AACrC,WAAO,EAAE,QAAQ,QAAQ,QAAQ,uCAAuC;AAAA,EAC1E;AAEA,MAAI,CAAC,WAAW;AACd,WAAO,EAAE,QAAQ,QAAQ,QAAQ,cAAc;AAAA,EACjD;AAEA,MAAI,SAAS,QAAQ;AACnB,WAAO,EAAE,QAAQ,QAAQ;AAAA,EAC3B;AAEA,QAAM,gBACJ,WACG,MAAM,IAAI,EACV,OAAO,CAAC,SAAS,CAAC,yBAAY,SAAS,KAAK,KAAK,CAAC,CAAC,EACnD,KAAK,IAAI,EACT,KAAK,IAAI;AAEd,QAAM,gBAAAA,QAAG,SAAS,UAAU,YAAAC,QAAK,KAAK,KAAK,QAAQ,GAAG,aAAa;AAEnE,SAAO,EAAE,QAAQ,QAAQ;AAC3B;AAEO,MAAM,wCAAwC,CACnD,SAEC,OAAO,MAAyB,MAAM,QAAQ,IAAI,MAAM;AACvD,MAAI;AACF,WAAO,MAAM,mCAAmC,MAAM,KAAK,IAAI;AAAA,EACjE,SAAS,KAAK;AACZ,uBAAI,KAAK,gCAAgC,IAAI,oBAAoB;AACjE,uBAAI,WAAO,qBAAQ,GAAG,CAAC;AACvB,WAAO,EAAE,QAAQ,QAAQ,QAAQ,kBAAkB;AAAA,EACrD;AACF;",
-  "names": ["fs", "path"]
-}

package/lib/cli/configure/upgrade/patches/7.3.1/patchDockerfile.js.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../../../../src/cli/configure/upgrade/patches/7.3.1/patchDockerfile.ts"],
-  "sourcesContent": ["import { inspect } from 'util';\n\nimport fs from 'fs-extra';\n\nimport type { PatchFunction, PatchReturnType } from '../..';\nimport { log } from '../../../../../utils/logging';\nimport { createDestinationFileReader } from '../../../analysis/project';\n\nconst DOCKERFILE_FILENAME = 'Dockerfile';\n\nconst NON_DEBIAN_REGEX = /gcr.io\\/distroless\\/nodejs:(18|20)/g;\nconst DEBIAN_REGEX = /gcr.io\\/distroless\\/nodejs(18|20)-debian11/g;\nconst VERSION_DEBIAN_REPLACE = 'gcr.io/distroless/nodejs$1-debian12';\n\nconst patchDockerfile = async (\n  mode: 'format' | 'lint',\n  dir: string,\n): Promise<PatchReturnType> => {\n  const readFile = createDestinationFileReader(dir);\n\n  const maybeDockerfile = await readFile(DOCKERFILE_FILENAME);\n\n  if (!maybeDockerfile) {\n    return { result: 'skip', reason: 'no Dockerfile found' };\n  }\n\n  const patched = maybeDockerfile\n    .replaceAll(NON_DEBIAN_REGEX, VERSION_DEBIAN_REPLACE)\n    .replaceAll(DEBIAN_REGEX, VERSION_DEBIAN_REPLACE);\n\n  if (patched === maybeDockerfile) {\n    return { result: 'skip' };\n  }\n\n  if (mode === 'lint') {\n    return { result: 'apply' };\n  }\n\n  await fs.promises.writeFile(DOCKERFILE_FILENAME, patched);\n\n  return { result: 'apply' };\n};\n\nexport const tryPatchDockerfile: PatchFunction = async (\n  mode: 'format' | 'lint',\n  dir = process.cwd(),\n) => {\n  try {\n    return await patchDockerfile(mode, dir);\n  } catch (err) {\n    log.warn('Failed to patch Dockerfile.');\n    log.subtle(inspect(err));\n    return { result: 'skip', reason: 'due to an error' };\n  }\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAwB;AAExB,sBAAe;AAGf,qBAAoB;AACpB,qBAA4C;AAE5C,MAAM,sBAAsB;AAE5B,MAAM,mBAAmB;AACzB,MAAM,eAAe;AACrB,MAAM,yBAAyB;AAE/B,MAAM,kBAAkB,OACtB,MACA,QAC6B;AAC7B,QAAM,eAAW,4CAA4B,GAAG;AAEhD,QAAM,kBAAkB,MAAM,SAAS,mBAAmB;AAE1D,MAAI,CAAC,iBAAiB;AACpB,WAAO,EAAE,QAAQ,QAAQ,QAAQ,sBAAsB;AAAA,EACzD;AAEA,QAAM,UAAU,gBACb,WAAW,kBAAkB,sBAAsB,EACnD,WAAW,cAAc,sBAAsB;AAElD,MAAI,YAAY,iBAAiB;AAC/B,WAAO,EAAE,QAAQ,OAAO;AAAA,EAC1B;AAEA,MAAI,SAAS,QAAQ;AACnB,WAAO,EAAE,QAAQ,QAAQ;AAAA,EAC3B;AAEA,QAAM,gBAAAA,QAAG,SAAS,UAAU,qBAAqB,OAAO;AAExD,SAAO,EAAE,QAAQ,QAAQ;AAC3B;AAEO,MAAM,qBAAoC,OAC/C,MACA,MAAM,QAAQ,IAAI,MACf;AACH,MAAI;AACF,WAAO,MAAM,gBAAgB,MAAM,GAAG;AAAA,EACxC,SAAS,KAAK;AACZ,uBAAI,KAAK,6BAA6B;AACtC,uBAAI,WAAO,qBAAQ,GAAG,CAAC;AACvB,WAAO,EAAE,QAAQ,QAAQ,QAAQ,kBAAkB;AAAA,EACrD;AACF;",
-  "names": ["fs"]
-}

package/lib/cli/configure/upgrade/patches/7.3.1/patchServerListener.js.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../../../../src/cli/configure/upgrade/patches/7.3.1/patchServerListener.ts"],
-  "sourcesContent": ["import { inspect } from 'util';\n\nimport fs from 'fs-extra';\n\nimport type { PatchFunction, PatchReturnType } from '../..';\nimport { log } from '../../../../../utils/logging';\nimport { createDestinationFileReader } from '../../../analysis/project';\nimport { formatPrettier } from '../../../processing/prettier';\n\nconst SERVER_LISTENER_FILENAME = 'src/listen.ts';\n\nconst KEEP_ALIVE_CODE = `\n// Gantry ALB default idle timeout is 30 seconds\n// https://nodejs.org/docs/latest-v18.x/api/http.html#serverkeepalivetimeout\n// Node default is 5 seconds\n// https://docs.aws.amazon.com/elasticloadbalancing/latest/application/application-load-balancers.html#connection-idle-timeout\n// AWS recommends setting an application timeout larger than the load balancer\nlistener.keepAliveTimeout = 31000;\n`;\n\nconst patchServerListener = async (\n  mode: 'format' | 'lint',\n  dir: string,\n): Promise<PatchReturnType> => {\n  const readFile = createDestinationFileReader(dir);\n\n  let listener = await readFile(SERVER_LISTENER_FILENAME);\n  if (!listener) {\n    return { result: 'skip', reason: 'no listener file found' };\n  }\n\n  if (listener.includes('keepAliveTimeout')) {\n    return { result: 'skip', reason: 'keepAliveTimeout already configured' };\n  }\n\n  if (listener.includes('\\napp.listen(')) {\n    listener = listener.replace(\n      '\\napp.listen(',\n      '\\nconst listener = app.listen(',\n    );\n  }\n\n  if (!listener.includes('\\nconst listener = app.listen(')) {\n    return { result: 'skip', reason: 'no server listener found' };\n  }\n\n  if (mode === 'lint') {\n    return { result: 'apply' };\n  }\n\n  listener = `${listener}${KEEP_ALIVE_CODE}`;\n\n  await fs.promises.writeFile(\n    SERVER_LISTENER_FILENAME,\n    await formatPrettier(listener, {\n      parser: 'typescript',\n    }),\n  );\n\n  return { result: 'apply' };\n};\n\nexport const tryPatchServerListener: PatchFunction = async (\n  mode: 'format' | 'lint',\n  dir = process.cwd(),\n) => {\n  try {\n    return await patchServerListener(mode, dir);\n  } catch (err) {\n    log.warn('Failed to patch server listener.');\n    log.subtle(inspect(err));\n    return { result: 'skip', reason: 'due to an error' };\n  }\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAwB;AAExB,sBAAe;AAGf,qBAAoB;AACpB,qBAA4C;AAC5C,sBAA+B;AAE/B,MAAM,2BAA2B;AAEjC,MAAM,kBAAkB;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AASxB,MAAM,sBAAsB,OAC1B,MACA,QAC6B;AAC7B,QAAM,eAAW,4CAA4B,GAAG;AAEhD,MAAI,WAAW,MAAM,SAAS,wBAAwB;AACtD,MAAI,CAAC,UAAU;AACb,WAAO,EAAE,QAAQ,QAAQ,QAAQ,yBAAyB;AAAA,EAC5D;AAEA,MAAI,SAAS,SAAS,kBAAkB,GAAG;AACzC,WAAO,EAAE,QAAQ,QAAQ,QAAQ,sCAAsC;AAAA,EACzE;AAEA,MAAI,SAAS,SAAS,eAAe,GAAG;AACtC,eAAW,SAAS;AAAA,MAClB;AAAA,MACA;AAAA,IACF;AAAA,EACF;AAEA,MAAI,CAAC,SAAS,SAAS,gCAAgC,GAAG;AACxD,WAAO,EAAE,QAAQ,QAAQ,QAAQ,2BAA2B;AAAA,EAC9D;AAEA,MAAI,SAAS,QAAQ;AACnB,WAAO,EAAE,QAAQ,QAAQ;AAAA,EAC3B;AAEA,aAAW,GAAG,QAAQ,GAAG,eAAe;AAExC,QAAM,gBAAAA,QAAG,SAAS;AAAA,IAChB;AAAA,IACA,UAAM,gCAAe,UAAU;AAAA,MAC7B,QAAQ;AAAA,IACV,CAAC;AAAA,EACH;AAEA,SAAO,EAAE,QAAQ,QAAQ;AAC3B;AAEO,MAAM,yBAAwC,OACnD,MACA,MAAM,QAAQ,IAAI,MACf;AACH,MAAI;AACF,WAAO,MAAM,oBAAoB,MAAM,GAAG;AAAA,EAC5C,SAAS,KAAK;AACZ,uBAAI,KAAK,kCAAkC;AAC3C,uBAAI,WAAO,qBAAQ,GAAG,CAAC;AACvB,WAAO,EAAE,QAAQ,QAAQ,QAAQ,kBAAkB;AAAA,EACrD;AACF;",
-  "names": ["fs"]
-}

package/lib/cli/lint/internalLints/deleteFiles.d.ts

@@ -1,3 +0,0 @@
-import type { Logger } from '../../../utils/logging';
-import type { InternalLintResult } from '../internal';
-export declare const deleteFilesLint: (mode: 'format' | 'lint', logger: Logger) => Promise<InternalLintResult>;

package/lib/cli/lint/internalLints/deleteFiles.js

@@ -1,108 +0,0 @@
-"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 deleteFiles_exports = {};
-__export(deleteFiles_exports, {
-  deleteFilesLint: () => deleteFilesLint
-});
-module.exports = __toCommonJS(deleteFiles_exports);
-var import_path = __toESM(require("path"));
-var import_util = require("util");
-var import_fs_extra = require("fs-extra");
-var import_packageManager = require("../../../utils/packageManager");
-const AUTOFIX_DELETE_FILES = [
-  // Try to delete this SEEK-Jobs/gutenberg automation file that may have been
-  // accidentally committed in old versions of skuba.
-  "Dockerfile-incunabulum"
-];
-const deleteFilesLint = async (mode, logger) => {
-  if (mode === "lint") {
-    return {
-      ok: true,
-      fixable: false
-    };
-  }
-  const dir = process.cwd();
-  const toDelete = (await Promise.all(
-    AUTOFIX_DELETE_FILES.map(
-      async (filename) => [filename, await (0, import_fs_extra.pathExists)(import_path.default.join(dir, filename))]
-    )
-  )).filter(([, exists]) => exists).map(([filename]) => filename);
-  if (mode === "format") {
-    if (toDelete.length === 0) {
-      return { ok: true, fixable: false };
-    }
-    try {
-      await Promise.all(
-        toDelete.map((filename) => {
-          logger.warn(`Deleting ${logger.bold(filename)}.`);
-          return (0, import_fs_extra.rm)(import_path.default.join(dir, filename), { force: true });
-        })
-      );
-      return {
-        ok: true,
-        fixable: false
-      };
-    } catch (err) {
-      logger.warn(logger.bold("Failed to delete files."));
-      logger.subtle((0, import_util.inspect)(err));
-      return {
-        ok: true,
-        // It's not really a huge deal if we can't delete these files
-        fixable: false
-      };
-    }
-  }
-  if (toDelete.length) {
-    const packageManager = await (0, import_packageManager.detectPackageManager)();
-    logger.warn(
-      `Some files should be deleted. Run ${logger.bold(
-        packageManager.exec,
-        "skuba",
-        "format"
-      )} to delete them. ${logger.dim("delete-files")}`
-    );
-    return {
-      ok: false,
-      fixable: true,
-      annotations: toDelete.map((filename) => ({
-        path: filename,
-        message: "This file should be deleted."
-      }))
-    };
-  }
-  return {
-    ok: true,
-    fixable: false
-  };
-};
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  deleteFilesLint
-});
-//# sourceMappingURL=deleteFiles.js.map

package/lib/cli/lint/internalLints/deleteFiles.js.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../../src/cli/lint/internalLints/deleteFiles.ts"],
-  "sourcesContent": ["import path from 'path';\nimport { inspect } from 'util';\n\nimport { pathExists, rm } from 'fs-extra';\n\nimport type { Logger } from '../../../utils/logging';\nimport { detectPackageManager } from '../../../utils/packageManager';\nimport type { InternalLintResult } from '../internal';\n\nconst AUTOFIX_DELETE_FILES = [\n  // Try to delete this SEEK-Jobs/gutenberg automation file that may have been\n  // accidentally committed in old versions of skuba.\n  'Dockerfile-incunabulum',\n];\n\nexport const deleteFilesLint = async (\n  mode: 'format' | 'lint',\n  logger: Logger,\n): Promise<InternalLintResult> => {\n  if (mode === 'lint') {\n    // Flagging Dockerfile-incunabulum for deletion is breaking gutenberg installs of skuba as it's (typically) not in source control\n    // TODO: Handle this better (only flag for deletion / delete if in source control)\n\n    return {\n      ok: true,\n      fixable: false,\n    };\n  }\n\n  const dir = process.cwd();\n\n  const toDelete = (\n    await Promise.all(\n      AUTOFIX_DELETE_FILES.map(\n        async (filename) =>\n          [filename, await pathExists(path.join(dir, filename))] as const,\n      ),\n    )\n  )\n    .filter(([, exists]) => exists)\n    .map(([filename]) => filename);\n\n  if (mode === 'format') {\n    if (toDelete.length === 0) {\n      return { ok: true, fixable: false };\n    }\n\n    try {\n      await Promise.all(\n        toDelete.map((filename) => {\n          logger.warn(`Deleting ${logger.bold(filename)}.`);\n          return rm(path.join(dir, filename), { force: true });\n        }),\n      );\n\n      return {\n        ok: true,\n        fixable: false,\n      };\n    } catch (err) {\n      logger.warn(logger.bold('Failed to delete files.'));\n      logger.subtle(inspect(err));\n\n      return {\n        ok: true, // It's not really a huge deal if we can't delete these files\n        fixable: false,\n      };\n    }\n  }\n\n  if (toDelete.length) {\n    const packageManager = await detectPackageManager();\n\n    logger.warn(\n      `Some files should be deleted. Run ${logger.bold(\n        packageManager.exec,\n        'skuba',\n        'format',\n      )} to delete them. ${logger.dim('delete-files')}`,\n    );\n\n    return {\n      ok: false,\n      fixable: true,\n      annotations: toDelete.map((filename) => ({\n        path: filename,\n        message: 'This file should be deleted.',\n      })),\n    };\n  }\n\n  return {\n    ok: true,\n    fixable: false,\n  };\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AACjB,kBAAwB;AAExB,sBAA+B;AAG/B,4BAAqC;AAGrC,MAAM,uBAAuB;AAAA;AAAA;AAAA,EAG3B;AACF;AAEO,MAAM,kBAAkB,OAC7B,MACA,WACgC;AAChC,MAAI,SAAS,QAAQ;AAInB,WAAO;AAAA,MACL,IAAI;AAAA,MACJ,SAAS;AAAA,IACX;AAAA,EACF;AAEA,QAAM,MAAM,QAAQ,IAAI;AAExB,QAAM,YACJ,MAAM,QAAQ;AAAA,IACZ,qBAAqB;AAAA,MACnB,OAAO,aACL,CAAC,UAAU,UAAM,4BAAW,YAAAA,QAAK,KAAK,KAAK,QAAQ,CAAC,CAAC;AAAA,IACzD;AAAA,EACF,GAEC,OAAO,CAAC,CAAC,EAAE,MAAM,MAAM,MAAM,EAC7B,IAAI,CAAC,CAAC,QAAQ,MAAM,QAAQ;AAE/B,MAAI,SAAS,UAAU;AACrB,QAAI,SAAS,WAAW,GAAG;AACzB,aAAO,EAAE,IAAI,MAAM,SAAS,MAAM;AAAA,IACpC;AAEA,QAAI;AACF,YAAM,QAAQ;AAAA,QACZ,SAAS,IAAI,CAAC,aAAa;AACzB,iBAAO,KAAK,YAAY,OAAO,KAAK,QAAQ,CAAC,GAAG;AAChD,qBAAO,oBAAG,YAAAA,QAAK,KAAK,KAAK,QAAQ,GAAG,EAAE,OAAO,KAAK,CAAC;AAAA,QACrD,CAAC;AAAA,MACH;AAEA,aAAO;AAAA,QACL,IAAI;AAAA,QACJ,SAAS;AAAA,MACX;AAAA,IACF,SAAS,KAAK;AACZ,aAAO,KAAK,OAAO,KAAK,yBAAyB,CAAC;AAClD,aAAO,WAAO,qBAAQ,GAAG,CAAC;AAE1B,aAAO;AAAA,QACL,IAAI;AAAA;AAAA,QACJ,SAAS;AAAA,MACX;AAAA,IACF;AAAA,EACF;AAEA,MAAI,SAAS,QAAQ;AACnB,UAAM,iBAAiB,UAAM,4CAAqB;AAElD,WAAO;AAAA,MACL,qCAAqC,OAAO;AAAA,QAC1C,eAAe;AAAA,QACf;AAAA,QACA;AAAA,MACF,CAAC,oBAAoB,OAAO,IAAI,cAAc,CAAC;AAAA,IACjD;AAEA,WAAO;AAAA,MACL,IAAI;AAAA,MACJ,SAAS;AAAA,MACT,aAAa,SAAS,IAAI,CAAC,cAAc;AAAA,QACvC,MAAM;AAAA,QACN,SAAS;AAAA,MACX,EAAE;AAAA,IACJ;AAAA,EACF;AAEA,SAAO;AAAA,IACL,IAAI;AAAA,IACJ,SAAS;AAAA,EACX;AACF;",
-  "names": ["path"]
-}