skuba 14.0.0-rfc-pnpm-config-skuba-20260107033211 → 14.0.0-rfc-pnpm-config-skuba-20260107235318

package/lib/cli/lint/internalLints/upgrade/patches/13.1.1/migrateToPnpmConfig.js

@@ -90,8 +90,8 @@ ${packageJson.packageJson.minimumReleaseAgeExcludeOverload.map((item) => `  - '$
   }
   if (typeof packageJson?.packageJson.packageManager === "string") {
     const version = packageJson.packageJson.packageManager.split("@")?.[1]?.split("+")?.[0];
-    if (typeof version === "string" && (0, import_semver.lt)(new import_semver.SemVer(version), new import_semver.SemVer("10.26.2"))) {
-      packageJson.packageJson.packageManager = "pnpm@10.26.2";
+    if (typeof version === "string" && (0, import_semver.lt)(new import_semver.SemVer(version), new import_semver.SemVer("10.26.1"))) {
+      packageJson.packageJson.packageManager = "pnpm@10.26.1";
     }
   }
   if (modifiedPnpmWorkspace === pnpmWorkSpaceFile) {

package/lib/cli/lint/internalLints/upgrade/patches/13.1.1/migrateToPnpmConfig.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../../src/cli/lint/internalLints/upgrade/patches/13.1.1/migrateToPnpmConfig.ts"],
-  "sourcesContent": ["import { inspect } from 'util';\n\nimport fs from 'fs-extra';\nimport { SemVer, lt } from 'semver';\n\nimport { exec } from '../../../../../../utils/exec.js';\nimport { log } from '../../../../../../utils/logging.js';\nimport {\n  getConsumerManifest,\n  getSkubaManifest,\n} from '../../../../../../utils/manifest.js';\nimport { installPnpmPlugin } from '../../../../../init/installPnpmPlugin.js';\nimport type { PatchFunction, PatchReturnType } from '../../index.js';\n\nexport const migrateToPnpmConfig: PatchFunction = async ({\n  mode,\n}): Promise<PatchReturnType> => {\n  let pnpmWorkSpaceFile: string;\n  try {\n    pnpmWorkSpaceFile = await fs.promises.readFile(\n      'pnpm-workspace.yaml',\n      'utf8',\n    );\n  } catch {\n    return {\n      result: 'skip',\n      reason: 'no pnpm-workspace.yaml found',\n    };\n  }\n\n  // Remove entire # managed by skuba comments block\n\n  const startingIndexText = '# managed by skuba';\n  const endOfSectionIndexText = '# end managed by skuba\\n';\n\n  const startingIndex = pnpmWorkSpaceFile.indexOf(startingIndexText);\n  const endOfSectionIndex = pnpmWorkSpaceFile.indexOf(endOfSectionIndexText);\n\n  if (startingIndex === -1 || endOfSectionIndex === -1) {\n    return {\n      result: 'skip',\n      reason: 'no managed by skuba comment block found',\n    };\n  }\n\n  const endSection = pnpmWorkSpaceFile.slice(\n    endOfSectionIndex + endOfSectionIndexText.length,\n  );\n\n  let modifiedPnpmWorkspace =\n    pnpmWorkSpaceFile.slice(0, startingIndex) + endSection;\n\n  // Check if consumers have extended the publicHoistPattern section\n  // Only match if the first non-empty, non-comment line is a list item without a preceding key\n  const brokenYamlPatternRegex = /^\\s*-\\s+[^#]/;\n  const firstNonEmptyNonCommentLine = endSection\n    .split('\\n')\n    .find((line) => line.trim() && !line.trim().startsWith('#'));\n  if (\n    firstNonEmptyNonCommentLine &&\n    brokenYamlPatternRegex.exec(firstNonEmptyNonCommentLine)\n  ) {\n    modifiedPnpmWorkspace = modifiedPnpmWorkspace.replace(\n      endSection,\n      `publicHoistPattern:\\n${endSection}`,\n    );\n  }\n\n  // Migrate minimumReleaseAgeExcludeOverload\n  const [packageJson, skubaPackageJson] = await Promise.all([\n    getConsumerManifest(),\n    getSkubaManifest(),\n  ]);\n\n  if (\n    packageJson?.packageJson.minimumReleaseAgeExcludeOverload &&\n    Array.isArray(packageJson.packageJson.minimumReleaseAgeExcludeOverload)\n  ) {\n    modifiedPnpmWorkspace += `\\nminimumReleaseAgeExclude:\\n${packageJson.packageJson.minimumReleaseAgeExcludeOverload.map((item) => `  - '${item}'`).join('\\n')}\\n`;\n    delete packageJson.packageJson.minimumReleaseAgeExcludeOverload;\n  }\n\n  if (typeof packageJson?.packageJson.packageManager === 'string') {\n    const version = packageJson.packageJson.packageManager\n      .split('@')?.[1] // strip name\n      ?.split('+')?.[0]; // strip sha\n\n    if (\n      typeof version === 'string' &&\n      lt(new SemVer(version), new SemVer('10.26.2'))\n    ) {\n      packageJson.packageJson.packageManager = 'pnpm@10.26.2';\n    }\n  }\n\n  if (modifiedPnpmWorkspace === pnpmWorkSpaceFile) {\n    return {\n      result: 'skip',\n      reason: 'no changes needed to pnpm-workspace.yaml',\n    };\n  }\n\n  if (mode === 'lint') {\n    return {\n      result: 'apply',\n    };\n  }\n\n  const stringifiedPackageJson =\n    packageJson && `${JSON.stringify(packageJson.packageJson, null, 2)}\\n`;\n\n  await Promise.all([\n    fs.promises.writeFile('pnpm-workspace.yaml', modifiedPnpmWorkspace, 'utf8'),\n    stringifiedPackageJson &&\n      fs.promises.writeFile(packageJson.path, stringifiedPackageJson, 'utf8'),\n  ]);\n\n  await installPnpmPlugin(skubaPackageJson);\n\n  // Run pnpm install to ensure hoisting/build scripts are run\n  await exec('pnpm', 'install', '--offline');\n\n  return {\n    result: 'apply',\n  };\n};\n\nexport const tryMigrateToPnpmConfig: PatchFunction = async (config) => {\n  try {\n    return await migrateToPnpmConfig(config);\n  } catch (err) {\n    log.warn('Failed to migrate to pnpm-plugin-skuba');\n    log.subtle(inspect(err));\n    return { result: 'skip', reason: 'due to an error' };\n  }\n};\n"],
-  "mappings": "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",
+  "sourcesContent": ["import { inspect } from 'util';\n\nimport fs from 'fs-extra';\nimport { SemVer, lt } from 'semver';\n\nimport { exec } from '../../../../../../utils/exec.js';\nimport { log } from '../../../../../../utils/logging.js';\nimport {\n  getConsumerManifest,\n  getSkubaManifest,\n} from '../../../../../../utils/manifest.js';\nimport { installPnpmPlugin } from '../../../../../init/installPnpmPlugin.js';\nimport type { PatchFunction, PatchReturnType } from '../../index.js';\n\nexport const migrateToPnpmConfig: PatchFunction = async ({\n  mode,\n}): Promise<PatchReturnType> => {\n  let pnpmWorkSpaceFile: string;\n  try {\n    pnpmWorkSpaceFile = await fs.promises.readFile(\n      'pnpm-workspace.yaml',\n      'utf8',\n    );\n  } catch {\n    return {\n      result: 'skip',\n      reason: 'no pnpm-workspace.yaml found',\n    };\n  }\n\n  // Remove entire # managed by skuba comments block\n\n  const startingIndexText = '# managed by skuba';\n  const endOfSectionIndexText = '# end managed by skuba\\n';\n\n  const startingIndex = pnpmWorkSpaceFile.indexOf(startingIndexText);\n  const endOfSectionIndex = pnpmWorkSpaceFile.indexOf(endOfSectionIndexText);\n\n  if (startingIndex === -1 || endOfSectionIndex === -1) {\n    return {\n      result: 'skip',\n      reason: 'no managed by skuba comment block found',\n    };\n  }\n\n  const endSection = pnpmWorkSpaceFile.slice(\n    endOfSectionIndex + endOfSectionIndexText.length,\n  );\n\n  let modifiedPnpmWorkspace =\n    pnpmWorkSpaceFile.slice(0, startingIndex) + endSection;\n\n  // Check if consumers have extended the publicHoistPattern section\n  // Only match if the first non-empty, non-comment line is a list item without a preceding key\n  const brokenYamlPatternRegex = /^\\s*-\\s+[^#]/;\n  const firstNonEmptyNonCommentLine = endSection\n    .split('\\n')\n    .find((line) => line.trim() && !line.trim().startsWith('#'));\n  if (\n    firstNonEmptyNonCommentLine &&\n    brokenYamlPatternRegex.exec(firstNonEmptyNonCommentLine)\n  ) {\n    modifiedPnpmWorkspace = modifiedPnpmWorkspace.replace(\n      endSection,\n      `publicHoistPattern:\\n${endSection}`,\n    );\n  }\n\n  // Migrate minimumReleaseAgeExcludeOverload\n  const [packageJson, skubaPackageJson] = await Promise.all([\n    getConsumerManifest(),\n    getSkubaManifest(),\n  ]);\n\n  if (\n    packageJson?.packageJson.minimumReleaseAgeExcludeOverload &&\n    Array.isArray(packageJson.packageJson.minimumReleaseAgeExcludeOverload)\n  ) {\n    modifiedPnpmWorkspace += `\\nminimumReleaseAgeExclude:\\n${packageJson.packageJson.minimumReleaseAgeExcludeOverload.map((item) => `  - '${item}'`).join('\\n')}\\n`;\n    delete packageJson.packageJson.minimumReleaseAgeExcludeOverload;\n  }\n\n  if (typeof packageJson?.packageJson.packageManager === 'string') {\n    const version = packageJson.packageJson.packageManager\n      .split('@')?.[1] // strip name\n      ?.split('+')?.[0]; // strip sha\n\n    if (\n      typeof version === 'string' &&\n      lt(new SemVer(version), new SemVer('10.26.1'))\n    ) {\n      packageJson.packageJson.packageManager = 'pnpm@10.26.1';\n    }\n  }\n\n  if (modifiedPnpmWorkspace === pnpmWorkSpaceFile) {\n    return {\n      result: 'skip',\n      reason: 'no changes needed to pnpm-workspace.yaml',\n    };\n  }\n\n  if (mode === 'lint') {\n    return {\n      result: 'apply',\n    };\n  }\n\n  const stringifiedPackageJson =\n    packageJson && `${JSON.stringify(packageJson.packageJson, null, 2)}\\n`;\n\n  await Promise.all([\n    fs.promises.writeFile('pnpm-workspace.yaml', modifiedPnpmWorkspace, 'utf8'),\n    stringifiedPackageJson &&\n    fs.promises.writeFile(packageJson.path, stringifiedPackageJson, 'utf8'),\n  ]);\n\n  await installPnpmPlugin(skubaPackageJson);\n\n  // Run pnpm install to ensure hoisting/build scripts are run\n  await exec('pnpm', 'install', '--offline');\n\n  return {\n    result: 'apply',\n  };\n};\n\nexport const tryMigrateToPnpmConfig: PatchFunction = async (config) => {\n  try {\n    return await migrateToPnpmConfig(config);\n  } catch (err) {\n    log.warn('Failed to migrate to pnpm-plugin-skuba');\n    log.subtle(inspect(err));\n    return { result: 'skip', reason: 'due to an error' };\n  }\n};\n"],
+  "mappings": "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",
   "names": ["fs"]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skuba",
-  "version": "14.0.0-rfc-pnpm-config-skuba-20260107033211",
+  "version": "14.0.0-rfc-pnpm-config-skuba-20260107235318",
   "private": false,
   "description": "SEEK development toolkit for backend applications and packages",
   "homepage": "https://github.com/seek-oss/skuba#readme",
@@ -102,8 +102,8 @@
     "tsx": "^4.21.0",
     "typescript": "~5.9.0",
     "zod": "^4.0.0",
-    "@skuba-lib/api": "^2.0.0-rfc-pnpm-config-skuba-20260107033211",
-    "eslint-config-skuba": "8.0.0-rfc-pnpm-config-skuba-20260107033211"
+    "@skuba-lib/api": "^2.0.0-rfc-pnpm-config-skuba-20260107235318",
+    "eslint-config-skuba": "8.0.0-rfc-pnpm-config-skuba-20260107235318"
   },
   "devDependencies": {
     "@changesets/cli": "2.29.8",
@@ -134,7 +134,7 @@
     "semver": "7.7.3",
     "supertest": "7.1.4",
     "type-fest": "2.19.0",
-    "pnpm-plugin-skuba": "2.0.0-rfc-pnpm-config-skuba-20260107033211"
+    "pnpm-plugin-skuba": "2.0.0-rfc-pnpm-config-skuba-20260107235318"
   },
   "engines": {
     "node": ">=22.14.0"

package/template/greeter/package.json

@@ -19,11 +19,11 @@
     "test:watch": "skuba test --watch"
   },
   "dependencies": {
-    "skuba-dive": "4.0.0-rfc-pnpm-config-skuba-20260107033211"
+    "skuba-dive": "4.0.0-rfc-pnpm-config-skuba-20260107235318"
   },
   "devDependencies": {
     "@types/node": "^22.13.10",
-    "skuba": "14.0.0-rfc-pnpm-config-skuba-20260107033211"
+    "skuba": "14.0.0-rfc-pnpm-config-skuba-20260107235318"
   },
   "packageManager": "pnpm@10.27.0",
   "engines": {

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

@@ -24,7 +24,7 @@
     "@aws-sdk/client-sns": "^3.363.0",
     "@seek/aws-codedeploy-hooks": "^2.0.0",
     "@seek/logger": "^11.1.0",
-    "skuba-dive": "4.0.0-rfc-pnpm-config-skuba-20260107033211",
+    "skuba-dive": "4.0.0-rfc-pnpm-config-skuba-20260107235318",
     "zod": "^4.0.0"
   },
   "devDependencies": {
@@ -42,7 +42,7 @@
     "datadog-lambda-js": "^12.0.0",
     "dd-trace": "^5.0.0",
     "pino-pretty": "^13.0.0",
-    "skuba": "14.0.0-rfc-pnpm-config-skuba-20260107033211"
+    "skuba": "14.0.0-rfc-pnpm-config-skuba-20260107235318"
   },
   "packageManager": "pnpm@10.27.0",
   "engines": {