skuba 11.0.0-feat-npmrc-to-workspace-20250511014436 → 11.0.0-main-20250511022834

package/lib/cli/configure/processing/configFile.d.ts

@@ -5,5 +5,5 @@
  * than `lib/`) but they generally represent the same _intent_.
  */
 export declare const generateIgnoreFileSimpleVariants: (patterns: string[]) => Set<string>;
-export declare const replaceManagedSection: (input: string, template: string) => string;
-export declare const mergeWithConfigFile: (rawTemplateFile: string, fileType?: "ignore" | "pnpm-workspace") => (rawInputFile?: string) => string;
+export declare const generateNpmrcSimpleVariants: (patterns: string[]) => Set<string>;
+export declare const mergeWithConfigFile: (rawTemplateFile: string, fileType?: "ignore" | "npmrc") => (rawInputFile?: string) => string;

package/lib/cli/configure/processing/configFile.js

@@ -19,8 +19,8 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var configFile_exports = {};
 __export(configFile_exports, {
   generateIgnoreFileSimpleVariants: () => generateIgnoreFileSimpleVariants,
-  mergeWithConfigFile: () => mergeWithConfigFile,
-  replaceManagedSection: () => replaceManagedSection
+  generateNpmrcSimpleVariants: () => generateNpmrcSimpleVariants,
+  mergeWithConfigFile: () => mergeWithConfigFile
 });
 module.exports = __toCommonJS(configFile_exports);
 const OUTDATED_PATTERNS = ["node_modules_bak/", "tmp-*/"];
@@ -46,18 +46,24 @@ const generateIgnoreFileSimpleVariants = (patterns) => {
   set.delete("");
   return set;
 };
-const replaceManagedSection = (input, template) => input.replace(/# managed by skuba[\s\S]*# end managed by skuba/, template);
+const generateNpmrcSimpleVariants = (patterns) => {
+  const set = /* @__PURE__ */ new Set();
+  for (const pattern of patterns) {
+    set.add(pattern);
+    const match = /^(?<key>[^"=]+)="?(?<value>[^"=]+)"?$/.exec(pattern);
+    if (!match?.groups) {
+      continue;
+    }
+    const { key, value } = match.groups;
+    set.add(`${key}=${value}`);
+    set.add(`${key}="${value}"`);
+  }
+  set.delete("");
+  return set;
+};
 const mergeWithConfigFile = (rawTemplateFile, fileType = "ignore") => {
   const templateFile = rawTemplateFile.trim();
-  let generator;
-  switch (fileType) {
-    case "ignore":
-      generator = generateIgnoreFileSimpleVariants;
-      break;
-    case "pnpm-workspace":
-      generator = () => /* @__PURE__ */ new Set();
-      break;
-  }
+  const generator = fileType === "ignore" ? generateIgnoreFileSimpleVariants : generateNpmrcSimpleVariants;
   const templatePatterns = generator([
     ...OUTDATED_PATTERNS,
     ...templateFile.split("\n").map((line) => line.trim())
@@ -67,10 +73,7 @@ const mergeWithConfigFile = (rawTemplateFile, fileType = "ignore") => {
       return `${templateFile}
 `;
     }
-    const replacedFile = replaceManagedSection(
-      rawInputFile.replace(/\r?\n/g, "\n"),
-      templateFile
-    );
+    const replacedFile = rawInputFile.replace(/\r?\n/g, "\n").replace(/# managed by skuba[\s\S]*# end managed by skuba/, templateFile);
     if (replacedFile.includes(templateFile)) {
       return replacedFile;
     }
@@ -83,7 +86,7 @@ const mergeWithConfigFile = (rawTemplateFile, fileType = "ignore") => {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   generateIgnoreFileSimpleVariants,
-  mergeWithConfigFile,
-  replaceManagedSection
+  generateNpmrcSimpleVariants,
+  mergeWithConfigFile
 });
 //# sourceMappingURL=configFile.js.map

package/lib/cli/configure/processing/configFile.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/cli/configure/processing/configFile.ts"],
-  "sourcesContent": ["/**\n * Patterns that are superseded by skuba's bundled ignore file patterns and are\n * non-trivial to derive using e.g. `generateSimpleVariants`.\n */\nconst OUTDATED_PATTERNS = ['node_modules_bak/', 'tmp-*/'];\n\nconst ASTERISKS = /\\*/g;\nconst LEADING_SLASH = /^\\//;\nconst TRAILING_SLASH = /\\/$/;\n\n/**\n * Generate simple variants of an ignore pattern for exact matching purposes.\n *\n * Note that these patterns are not actually equivalent (e.g. `lib` matches more\n * than `lib/`) but they generally represent the same _intent_.\n */\nexport const generateIgnoreFileSimpleVariants = (patterns: string[]) => {\n  const set = new Set<string>();\n\n  for (const pattern of patterns) {\n    const deAsterisked = pattern.replace(ASTERISKS, '');\n    const stripped = deAsterisked\n      .replace(LEADING_SLASH, '')\n      .replace(TRAILING_SLASH, '');\n\n    set.add(pattern);\n    set.add(deAsterisked);\n    set.add(deAsterisked.replace(LEADING_SLASH, ''));\n    set.add(deAsterisked.replace(TRAILING_SLASH, ''));\n    set.add(stripped);\n\n    if (stripped !== '') {\n      set.add(`/${stripped}`);\n      set.add(`${stripped}/`);\n      set.add(`/${stripped}/`);\n    }\n  }\n\n  set.delete('');\n\n  return set;\n};\n\nexport const replaceManagedSection = (input: string, template: string) =>\n  input.replace(/# managed by skuba[\\s\\S]*# end managed by skuba/, template);\n\nexport const mergeWithConfigFile = (\n  rawTemplateFile: string,\n  fileType: 'ignore' | 'pnpm-workspace' = 'ignore',\n) => {\n  const templateFile = rawTemplateFile.trim();\n\n  let generator: (s: string[]) => Set<string>;\n\n  switch (fileType) {\n    case 'ignore':\n      generator = generateIgnoreFileSimpleVariants;\n      break;\n    case 'pnpm-workspace':\n      generator = () => new Set<string>();\n      break;\n  }\n\n  const templatePatterns = generator([\n    ...OUTDATED_PATTERNS,\n    ...templateFile.split('\\n').map((line) => line.trim()),\n  ]);\n\n  return (rawInputFile?: string) => {\n    if (rawInputFile === undefined) {\n      return `${templateFile}\\n`;\n    }\n\n    const replacedFile = replaceManagedSection(\n      rawInputFile.replace(/\\r?\\n/g, '\\n'),\n      templateFile,\n    );\n\n    if (replacedFile.includes(templateFile)) {\n      return replacedFile;\n    }\n\n    // Crunch the existing lines of a non-skuba config.\n    const migratedFile = replacedFile\n      .split('\\n')\n      .filter((line) => !templatePatterns.has(line))\n      .join('\\n')\n      .replace(/\\n{3,}/g, '\\n\\n')\n      .trim();\n\n    const outputFile = [templateFile, migratedFile].join('\\n\\n').trim();\n\n    return `${outputFile}\\n`;\n  };\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAIA,MAAM,oBAAoB,CAAC,qBAAqB,QAAQ;AAExD,MAAM,YAAY;AAClB,MAAM,gBAAgB;AACtB,MAAM,iBAAiB;AAQhB,MAAM,mCAAmC,CAAC,aAAuB;AACtE,QAAM,MAAM,oBAAI,IAAY;AAE5B,aAAW,WAAW,UAAU;AAC9B,UAAM,eAAe,QAAQ,QAAQ,WAAW,EAAE;AAClD,UAAM,WAAW,aACd,QAAQ,eAAe,EAAE,EACzB,QAAQ,gBAAgB,EAAE;AAE7B,QAAI,IAAI,OAAO;AACf,QAAI,IAAI,YAAY;AACpB,QAAI,IAAI,aAAa,QAAQ,eAAe,EAAE,CAAC;AAC/C,QAAI,IAAI,aAAa,QAAQ,gBAAgB,EAAE,CAAC;AAChD,QAAI,IAAI,QAAQ;AAEhB,QAAI,aAAa,IAAI;AACnB,UAAI,IAAI,IAAI,QAAQ,EAAE;AACtB,UAAI,IAAI,GAAG,QAAQ,GAAG;AACtB,UAAI,IAAI,IAAI,QAAQ,GAAG;AAAA,IACzB;AAAA,EACF;AAEA,MAAI,OAAO,EAAE;AAEb,SAAO;AACT;AAEO,MAAM,wBAAwB,CAAC,OAAe,aACnD,MAAM,QAAQ,mDAAmD,QAAQ;AAEpE,MAAM,sBAAsB,CACjC,iBACA,WAAwC,aACrC;AACH,QAAM,eAAe,gBAAgB,KAAK;AAE1C,MAAI;AAEJ,UAAQ,UAAU;AAAA,IAChB,KAAK;AACH,kBAAY;AACZ;AAAA,IACF,KAAK;AACH,kBAAY,MAAM,oBAAI,IAAY;AAClC;AAAA,EACJ;AAEA,QAAM,mBAAmB,UAAU;AAAA,IACjC,GAAG;AAAA,IACH,GAAG,aAAa,MAAM,IAAI,EAAE,IAAI,CAAC,SAAS,KAAK,KAAK,CAAC;AAAA,EACvD,CAAC;AAED,SAAO,CAAC,iBAA0B;AAChC,QAAI,iBAAiB,QAAW;AAC9B,aAAO,GAAG,YAAY;AAAA;AAAA,IACxB;AAEA,UAAM,eAAe;AAAA,MACnB,aAAa,QAAQ,UAAU,IAAI;AAAA,MACnC;AAAA,IACF;AAEA,QAAI,aAAa,SAAS,YAAY,GAAG;AACvC,aAAO;AAAA,IACT;AAGA,UAAM,eAAe,aAClB,MAAM,IAAI,EACV,OAAO,CAAC,SAAS,CAAC,iBAAiB,IAAI,IAAI,CAAC,EAC5C,KAAK,IAAI,EACT,QAAQ,WAAW,MAAM,EACzB,KAAK;AAER,UAAM,aAAa,CAAC,cAAc,YAAY,EAAE,KAAK,MAAM,EAAE,KAAK;AAElE,WAAO,GAAG,UAAU;AAAA;AAAA,EACtB;AACF;",
+  "sourcesContent": ["/**\n * Patterns that are superseded by skuba's bundled ignore file patterns and are\n * non-trivial to derive using e.g. `generateSimpleVariants`.\n */\nconst OUTDATED_PATTERNS = ['node_modules_bak/', 'tmp-*/'];\n\nconst ASTERISKS = /\\*/g;\nconst LEADING_SLASH = /^\\//;\nconst TRAILING_SLASH = /\\/$/;\n\n/**\n * Generate simple variants of an ignore pattern for exact matching purposes.\n *\n * Note that these patterns are not actually equivalent (e.g. `lib` matches more\n * than `lib/`) but they generally represent the same _intent_.\n */\nexport const generateIgnoreFileSimpleVariants = (patterns: string[]) => {\n  const set = new Set<string>();\n\n  for (const pattern of patterns) {\n    const deAsterisked = pattern.replace(ASTERISKS, '');\n    const stripped = deAsterisked\n      .replace(LEADING_SLASH, '')\n      .replace(TRAILING_SLASH, '');\n\n    set.add(pattern);\n    set.add(deAsterisked);\n    set.add(deAsterisked.replace(LEADING_SLASH, ''));\n    set.add(deAsterisked.replace(TRAILING_SLASH, ''));\n    set.add(stripped);\n\n    if (stripped !== '') {\n      set.add(`/${stripped}`);\n      set.add(`${stripped}/`);\n      set.add(`/${stripped}/`);\n    }\n  }\n\n  set.delete('');\n\n  return set;\n};\n\nexport const generateNpmrcSimpleVariants = (patterns: string[]) => {\n  const set = new Set<string>();\n\n  for (const pattern of patterns) {\n    set.add(pattern);\n\n    const match = /^(?<key>[^\"=]+)=\"?(?<value>[^\"=]+)\"?$/.exec(pattern);\n    if (!match?.groups) {\n      continue;\n    }\n\n    const { key, value } = match.groups;\n\n    set.add(`${key}=${value}`);\n    set.add(`${key}=\"${value}\"`);\n  }\n\n  set.delete('');\n\n  return set;\n};\n\nexport const mergeWithConfigFile = (\n  rawTemplateFile: string,\n  fileType: 'ignore' | 'npmrc' = 'ignore',\n) => {\n  const templateFile = rawTemplateFile.trim();\n\n  const generator =\n    fileType === 'ignore'\n      ? generateIgnoreFileSimpleVariants\n      : generateNpmrcSimpleVariants;\n\n  const templatePatterns = generator([\n    ...OUTDATED_PATTERNS,\n    ...templateFile.split('\\n').map((line) => line.trim()),\n  ]);\n\n  return (rawInputFile?: string) => {\n    if (rawInputFile === undefined) {\n      return `${templateFile}\\n`;\n    }\n\n    const replacedFile = rawInputFile\n      .replace(/\\r?\\n/g, '\\n')\n      .replace(/# managed by skuba[\\s\\S]*# end managed by skuba/, templateFile);\n\n    if (replacedFile.includes(templateFile)) {\n      return replacedFile;\n    }\n\n    // Crunch the existing lines of a non-skuba config.\n    const migratedFile = replacedFile\n      .split('\\n')\n      .filter((line) => !templatePatterns.has(line))\n      .join('\\n')\n      .replace(/\\n{3,}/g, '\\n\\n')\n      .trim();\n\n    const outputFile = [templateFile, migratedFile].join('\\n\\n').trim();\n\n    return `${outputFile}\\n`;\n  };\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAIA,MAAM,oBAAoB,CAAC,qBAAqB,QAAQ;AAExD,MAAM,YAAY;AAClB,MAAM,gBAAgB;AACtB,MAAM,iBAAiB;AAQhB,MAAM,mCAAmC,CAAC,aAAuB;AACtE,QAAM,MAAM,oBAAI,IAAY;AAE5B,aAAW,WAAW,UAAU;AAC9B,UAAM,eAAe,QAAQ,QAAQ,WAAW,EAAE;AAClD,UAAM,WAAW,aACd,QAAQ,eAAe,EAAE,EACzB,QAAQ,gBAAgB,EAAE;AAE7B,QAAI,IAAI,OAAO;AACf,QAAI,IAAI,YAAY;AACpB,QAAI,IAAI,aAAa,QAAQ,eAAe,EAAE,CAAC;AAC/C,QAAI,IAAI,aAAa,QAAQ,gBAAgB,EAAE,CAAC;AAChD,QAAI,IAAI,QAAQ;AAEhB,QAAI,aAAa,IAAI;AACnB,UAAI,IAAI,IAAI,QAAQ,EAAE;AACtB,UAAI,IAAI,GAAG,QAAQ,GAAG;AACtB,UAAI,IAAI,IAAI,QAAQ,GAAG;AAAA,IACzB;AAAA,EACF;AAEA,MAAI,OAAO,EAAE;AAEb,SAAO;AACT;AAEO,MAAM,8BAA8B,CAAC,aAAuB;AACjE,QAAM,MAAM,oBAAI,IAAY;AAE5B,aAAW,WAAW,UAAU;AAC9B,QAAI,IAAI,OAAO;AAEf,UAAM,QAAQ,wCAAwC,KAAK,OAAO;AAClE,QAAI,CAAC,OAAO,QAAQ;AAClB;AAAA,IACF;AAEA,UAAM,EAAE,KAAK,MAAM,IAAI,MAAM;AAE7B,QAAI,IAAI,GAAG,GAAG,IAAI,KAAK,EAAE;AACzB,QAAI,IAAI,GAAG,GAAG,KAAK,KAAK,GAAG;AAAA,EAC7B;AAEA,MAAI,OAAO,EAAE;AAEb,SAAO;AACT;AAEO,MAAM,sBAAsB,CACjC,iBACA,WAA+B,aAC5B;AACH,QAAM,eAAe,gBAAgB,KAAK;AAE1C,QAAM,YACJ,aAAa,WACT,mCACA;AAEN,QAAM,mBAAmB,UAAU;AAAA,IACjC,GAAG;AAAA,IACH,GAAG,aAAa,MAAM,IAAI,EAAE,IAAI,CAAC,SAAS,KAAK,KAAK,CAAC;AAAA,EACvD,CAAC;AAED,SAAO,CAAC,iBAA0B;AAChC,QAAI,iBAAiB,QAAW;AAC9B,aAAO,GAAG,YAAY;AAAA;AAAA,IACxB;AAEA,UAAM,eAAe,aAClB,QAAQ,UAAU,IAAI,EACtB,QAAQ,mDAAmD,YAAY;AAE1E,QAAI,aAAa,SAAS,YAAY,GAAG;AACvC,aAAO;AAAA,IACT;AAGA,UAAM,eAAe,aAClB,MAAM,IAAI,EACV,OAAO,CAAC,SAAS,CAAC,iBAAiB,IAAI,IAAI,CAAC,EAC5C,KAAK,IAAI,EACT,QAAQ,WAAW,MAAM,EACzB,KAAK;AAER,UAAM,aAAa,CAAC,cAAc,YAAY,EAAE,KAAK,MAAM,EAAE,KAAK;AAElE,WAAO,GAAG,UAAU;AAAA;AAAA,EACtB;AACF;",
   "names": []
 }

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

@@ -1,15 +1,11 @@
 import type { Logger } from '../../../utils/logging';
 import { type PackageManagerConfig } from '../../../utils/packageManager';
 import type { InternalLintResult } from '../internal';
-type ConditionOptions = {
-    packageManager: PackageManagerConfig;
-    isInWorkspaceRoot: boolean;
-};
 type RefreshableConfigFile = {
     name: string;
-    type: 'ignore' | 'pnpm-workspace';
+    type: 'ignore' | 'npmrc';
     additionalMapping?: (s: string, packageManager: PackageManagerConfig) => string;
-    if?: (options: ConditionOptions) => boolean;
+    if?: (packageManager: PackageManagerConfig) => boolean;
 };
 export declare const REFRESHABLE_CONFIG_FILES: RefreshableConfigFile[];
 export declare const refreshConfigFiles: (mode: "format" | "lint", logger: Logger) => Promise<{

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

@@ -37,44 +37,43 @@ var import_path = __toESM(require("path"));
 var import_util = require("util");
 var import_fs_extra = require("fs-extra");
 var import__ = require("../../..");
-var import_dir = require("../../../utils/dir");
+var import_npmrc = require("../../../utils/npmrc");
 var import_packageManager = require("../../../utils/packageManager");
 var import_template = require("../../../utils/template");
 var import_package = require("../../configure/analysis/package");
 var import_project = require("../../configure/analysis/project");
 var import_configFile = require("../../configure/processing/configFile");
-const OLD_IGNORE_WARNING = `# Ignore .npmrc. This is no longer managed by skuba as pnpm projects use a managed .npmrc.
-# IMPORTANT: if migrating to pnpm, remove this line and add an .npmrc IN THE SAME COMMIT.
-# You can use \`skuba format\` to generate the file or otherwise commit an empty file.
-# Doing so will conflict with a local .npmrc and make it more difficult to unintentionally commit auth secrets.
-.npmrc
-`;
-const removeOldWarning = (contents) => contents.includes(OLD_IGNORE_WARNING) ? `${contents.replace(OLD_IGNORE_WARNING, "").trim()}
-` : contents;
+const ensureNoAuthToken = (fileContents) => fileContents.split("\n").filter((line) => !(0, import_npmrc.hasNpmrcSecret)(line)).join("\n");
+const removeRedundantNpmrc = (contents) => {
+  const npmrcLines = contents.split("\n").filter((line) => import_npmrc.NPMRC_LINES.includes(line.trim()));
+  if (npmrcLines.length > 0 && npmrcLines.every((line) => line.includes("!"))) {
+    return contents.split("\n").filter((line) => !import_npmrc.NPMRC_LINES.includes(line.trim())).join("\n");
+  }
+  return contents;
+};
 const REFRESHABLE_CONFIG_FILES = [
   {
     name: ".gitignore",
     type: "ignore",
-    additionalMapping: removeOldWarning
+    additionalMapping: removeRedundantNpmrc
   },
   { name: ".prettierignore", type: "ignore" },
   {
-    name: "pnpm-workspace.yaml",
-    type: "pnpm-workspace",
-    if: ({ packageManager, isInWorkspaceRoot }) => isInWorkspaceRoot && packageManager.command === "pnpm"
+    name: ".npmrc",
+    type: "npmrc",
+    additionalMapping: ensureNoAuthToken,
+    if: (packageManager) => packageManager.command === "pnpm"
   },
   {
     name: ".dockerignore",
     type: "ignore",
-    additionalMapping: removeOldWarning
+    additionalMapping: removeRedundantNpmrc
   }
 ];
 const refreshConfigFiles = async (mode, logger) => {
-  const [manifest, gitRoot, workspaceRoot, currentWorkspaceProjectRoot] = await Promise.all([
+  const [manifest, gitRoot] = await Promise.all([
     (0, import_package.getDestinationManifest)(),
-    import__.Git.findRoot({ dir: process.cwd() }),
-    (0, import_dir.findWorkspaceRoot)(),
-    (0, import_dir.findCurrentWorkspaceProjectRoot)()
+    import__.Git.findRoot({ dir: process.cwd() })
   ]);
   const destinationRoot = import_path.default.dirname(manifest.path);
   const readDestinationFile = (0, import_project.createDestinationFileReader)(destinationRoot);
@@ -83,8 +82,8 @@ const refreshConfigFiles = async (mode, logger) => {
     type: fileType,
     additionalMapping = (s) => s,
     if: condition = () => true
-  }, conditionOptions) => {
-    if (!condition(conditionOptions)) {
+  }, packageManager2) => {
+    if (!condition(packageManager2)) {
       return { needsChange: false };
     }
     const [inputFile, templateFile, isGitIgnored] = await Promise.all([
@@ -100,7 +99,7 @@ const refreshConfigFiles = async (mode, logger) => {
     }
     const data = additionalMapping(
       inputFile ? (0, import_configFile.mergeWithConfigFile)(templateFile, fileType)(inputFile) : templateFile,
-      packageManager
+      packageManager2
     );
     const filepath = import_path.default.join(destinationRoot, filename);
     if (mode === "format") {
@@ -120,7 +119,7 @@ const refreshConfigFiles = async (mode, logger) => {
         msg: `The ${logger.bold(
           filename
         )} file is out of date. Run \`${logger.bold(
-          packageManager.print.exec,
+          packageManager2.print.exec,
           "skuba",
           "format"
         )}\` to update it.`,
@@ -132,10 +131,7 @@ const refreshConfigFiles = async (mode, logger) => {
   const packageManager = await (0, import_packageManager.detectPackageManager)(destinationRoot);
   const results = await Promise.all(
     REFRESHABLE_CONFIG_FILES.map(
-      (conf) => refreshConfigFile(conf, {
-        packageManager,
-        isInWorkspaceRoot: workspaceRoot === currentWorkspaceProjectRoot
-      })
+      (conf) => refreshConfigFile(conf, packageManager)
     )
   );
   results.forEach((result) => {

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/cli/lint/internalLints/refreshConfigFiles.ts"],
-  "sourcesContent": ["import path from 'path';\nimport { inspect, stripVTControlCharacters as stripAnsi } from 'util';\n\nimport { writeFile } from 'fs-extra';\n\nimport { Git } from '../../..';\nimport {\n  findCurrentWorkspaceProjectRoot,\n  findWorkspaceRoot,\n} from '../../../utils/dir';\nimport type { Logger } from '../../../utils/logging';\nimport {\n  type PackageManagerConfig,\n  detectPackageManager,\n} from '../../../utils/packageManager';\nimport { readBaseTemplateFile } from '../../../utils/template';\nimport { getDestinationManifest } from '../../configure/analysis/package';\nimport { createDestinationFileReader } from '../../configure/analysis/project';\nimport { mergeWithConfigFile } from '../../configure/processing/configFile';\nimport type { InternalLintResult } from '../internal';\n\ntype ConditionOptions = {\n  packageManager: PackageManagerConfig;\n  isInWorkspaceRoot: boolean;\n};\n\ntype RefreshableConfigFile = {\n  name: string;\n  type: 'ignore' | 'pnpm-workspace';\n  additionalMapping?: (\n    s: string,\n    packageManager: PackageManagerConfig,\n  ) => string;\n  if?: (options: ConditionOptions) => boolean;\n};\n\nconst OLD_IGNORE_WARNING = `# 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 removeOldWarning = (contents: string) =>\n  contents.includes(OLD_IGNORE_WARNING)\n    ? `${contents.replace(OLD_IGNORE_WARNING, '').trim()}\\n`\n    : contents;\n\nexport const REFRESHABLE_CONFIG_FILES: RefreshableConfigFile[] = [\n  {\n    name: '.gitignore',\n    type: 'ignore',\n    additionalMapping: removeOldWarning,\n  },\n  { name: '.prettierignore', type: 'ignore' },\n  {\n    name: 'pnpm-workspace.yaml',\n    type: 'pnpm-workspace',\n    if: ({ packageManager, isInWorkspaceRoot }) =>\n      isInWorkspaceRoot && packageManager.command === 'pnpm',\n  },\n  {\n    name: '.dockerignore',\n    type: 'ignore',\n    additionalMapping: removeOldWarning,\n  },\n];\n\nexport const refreshConfigFiles = async (\n  mode: 'format' | 'lint',\n  logger: Logger,\n) => {\n  const [manifest, gitRoot, workspaceRoot, currentWorkspaceProjectRoot] =\n    await Promise.all([\n      getDestinationManifest(),\n      Git.findRoot({ dir: process.cwd() }),\n      findWorkspaceRoot(),\n      findCurrentWorkspaceProjectRoot(),\n    ]);\n\n  const destinationRoot = path.dirname(manifest.path);\n\n  const readDestinationFile = createDestinationFileReader(destinationRoot);\n\n  const refreshConfigFile = async (\n    {\n      name: filename,\n      type: fileType,\n      additionalMapping = (s) => s,\n      if: condition = () => true,\n    }: RefreshableConfigFile,\n    conditionOptions: ConditionOptions,\n  ) => {\n    if (!condition(conditionOptions)) {\n      return { needsChange: false };\n    }\n\n    const [inputFile, templateFile, isGitIgnored] = await Promise.all([\n      readDestinationFile(filename),\n      readBaseTemplateFile(`_${filename}`),\n      gitRoot\n        ? Git.isFileGitIgnored({\n            gitRoot,\n            absolutePath: path.join(destinationRoot, filename),\n          })\n        : false,\n    ]);\n\n    // If the file is gitignored and doesn't exist, don't make it\n    if (inputFile === undefined && isGitIgnored) {\n      return { needsChange: false };\n    }\n\n    const data = additionalMapping(\n      inputFile\n        ? mergeWithConfigFile(templateFile, fileType)(inputFile)\n        : templateFile,\n      packageManager,\n    );\n\n    const filepath = path.join(destinationRoot, filename);\n\n    if (mode === 'format') {\n      if (data === inputFile) {\n        return { needsChange: false };\n      }\n\n      await writeFile(filepath, data);\n      return {\n        needsChange: false,\n        msg: `Refreshed ${logger.bold(filename)}.`,\n        filename,\n      };\n    }\n\n    if (data !== inputFile) {\n      return {\n        needsChange: true,\n        msg: `The ${logger.bold(\n          filename,\n        )} file is out of date. Run \\`${logger.bold(\n          packageManager.print.exec,\n          'skuba',\n          'format',\n        )}\\` to update it.`,\n        filename,\n      };\n    }\n\n    return { needsChange: false };\n  };\n\n  const packageManager = await detectPackageManager(destinationRoot);\n\n  const results = await Promise.all(\n    REFRESHABLE_CONFIG_FILES.map((conf) =>\n      refreshConfigFile(conf, {\n        packageManager,\n        isInWorkspaceRoot: workspaceRoot === currentWorkspaceProjectRoot,\n      }),\n    ),\n  );\n\n  // Log after for reproducible test output ordering\n  results.forEach((result) => {\n    if (result.msg) {\n      logger.warn(result.msg);\n    }\n  });\n\n  const anyNeedChanging = results.some(({ needsChange }) => needsChange);\n\n  return {\n    ok: !anyNeedChanging,\n    fixable: anyNeedChanging,\n    annotations: results.flatMap(({ needsChange, filename, msg }) =>\n      needsChange && msg\n        ? [\n            {\n              path: filename,\n              message: stripAnsi(msg),\n            },\n          ]\n        : [],\n    ),\n  };\n};\n\nexport const tryRefreshConfigFiles = async (\n  mode: 'format' | 'lint',\n  logger: Logger,\n): Promise<InternalLintResult> => {\n  try {\n    return await refreshConfigFiles(mode, logger);\n  } catch (err) {\n    logger.warn('Failed to refresh config files.');\n    logger.subtle(inspect(err));\n\n    return {\n      ok: false,\n      fixable: false,\n      annotations: [],\n    };\n  }\n};\n"],
-  "mappings": "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",
-  "names": ["path", "stripAnsi"]
+  "sourcesContent": ["import path from 'path';\nimport { inspect, stripVTControlCharacters as stripAnsi } from 'util';\n\nimport { writeFile } from 'fs-extra';\n\nimport { Git } from '../../..';\nimport type { Logger } from '../../../utils/logging';\nimport { NPMRC_LINES, hasNpmrcSecret } from '../../../utils/npmrc';\nimport {\n  type PackageManagerConfig,\n  detectPackageManager,\n} from '../../../utils/packageManager';\nimport { readBaseTemplateFile } from '../../../utils/template';\nimport { getDestinationManifest } from '../../configure/analysis/package';\nimport { createDestinationFileReader } from '../../configure/analysis/project';\nimport { mergeWithConfigFile } from '../../configure/processing/configFile';\nimport type { InternalLintResult } from '../internal';\n\nconst ensureNoAuthToken = (fileContents: string) =>\n  fileContents\n    .split('\\n')\n    .filter((line) => !hasNpmrcSecret(line))\n    .join('\\n');\n\ntype RefreshableConfigFile = {\n  name: string;\n  type: 'ignore' | 'npmrc';\n  additionalMapping?: (\n    s: string,\n    packageManager: PackageManagerConfig,\n  ) => string;\n  if?: (packageManager: PackageManagerConfig) => boolean;\n};\n\nconst removeRedundantNpmrc = (contents: string) => {\n  const npmrcLines = contents\n    .split('\\n')\n    .filter((line) => NPMRC_LINES.includes(line.trim()));\n\n  // If we're only left with !.npmrc line we can remove it\n  // TODO: Consider if we should generalise this\n  if (npmrcLines.length > 0 && npmrcLines.every((line) => line.includes('!'))) {\n    return contents\n      .split('\\n')\n      .filter((line) => !NPMRC_LINES.includes(line.trim()))\n      .join('\\n');\n  }\n  return contents;\n};\n\nexport const REFRESHABLE_CONFIG_FILES: RefreshableConfigFile[] = [\n  {\n    name: '.gitignore',\n    type: 'ignore',\n    additionalMapping: removeRedundantNpmrc,\n  },\n  { name: '.prettierignore', type: 'ignore' },\n  {\n    name: '.npmrc',\n    type: 'npmrc',\n    additionalMapping: ensureNoAuthToken,\n    if: (packageManager: PackageManagerConfig) =>\n      packageManager.command === 'pnpm',\n  },\n  {\n    name: '.dockerignore',\n    type: 'ignore',\n    additionalMapping: removeRedundantNpmrc,\n  },\n];\n\nexport const refreshConfigFiles = async (\n  mode: 'format' | 'lint',\n  logger: Logger,\n) => {\n  const [manifest, gitRoot] = await Promise.all([\n    getDestinationManifest(),\n    Git.findRoot({ dir: process.cwd() }),\n  ]);\n\n  const destinationRoot = path.dirname(manifest.path);\n\n  const readDestinationFile = createDestinationFileReader(destinationRoot);\n\n  const refreshConfigFile = async (\n    {\n      name: filename,\n      type: fileType,\n      additionalMapping = (s) => s,\n      if: condition = () => true,\n    }: RefreshableConfigFile,\n    packageManager: PackageManagerConfig,\n  ) => {\n    if (!condition(packageManager)) {\n      return { needsChange: false };\n    }\n\n    const [inputFile, templateFile, isGitIgnored] = await Promise.all([\n      readDestinationFile(filename),\n      readBaseTemplateFile(`_${filename}`),\n      gitRoot\n        ? Git.isFileGitIgnored({\n            gitRoot,\n            absolutePath: path.join(destinationRoot, filename),\n          })\n        : false,\n    ]);\n\n    // If the file is gitignored and doesn't exist, don't make it\n    if (inputFile === undefined && isGitIgnored) {\n      return { needsChange: false };\n    }\n\n    const data = additionalMapping(\n      inputFile\n        ? mergeWithConfigFile(templateFile, fileType)(inputFile)\n        : templateFile,\n      packageManager,\n    );\n\n    const filepath = path.join(destinationRoot, filename);\n\n    if (mode === 'format') {\n      if (data === inputFile) {\n        return { needsChange: false };\n      }\n\n      await writeFile(filepath, data);\n      return {\n        needsChange: false,\n        msg: `Refreshed ${logger.bold(filename)}.`,\n        filename,\n      };\n    }\n\n    if (data !== inputFile) {\n      return {\n        needsChange: true,\n        msg: `The ${logger.bold(\n          filename,\n        )} file is out of date. Run \\`${logger.bold(\n          packageManager.print.exec,\n          'skuba',\n          'format',\n        )}\\` to update it.`,\n        filename,\n      };\n    }\n\n    return { needsChange: false };\n  };\n\n  const packageManager = await detectPackageManager(destinationRoot);\n\n  const results = await Promise.all(\n    REFRESHABLE_CONFIG_FILES.map((conf) =>\n      refreshConfigFile(conf, packageManager),\n    ),\n  );\n\n  // Log after for reproducible test output ordering\n  results.forEach((result) => {\n    if (result.msg) {\n      logger.warn(result.msg);\n    }\n  });\n\n  const anyNeedChanging = results.some(({ needsChange }) => needsChange);\n\n  return {\n    ok: !anyNeedChanging,\n    fixable: anyNeedChanging,\n    annotations: results.flatMap(({ needsChange, filename, msg }) =>\n      needsChange && msg\n        ? [\n            {\n              path: filename,\n              message: stripAnsi(msg),\n            },\n          ]\n        : [],\n    ),\n  };\n};\n\nexport const tryRefreshConfigFiles = async (\n  mode: 'format' | 'lint',\n  logger: Logger,\n): Promise<InternalLintResult> => {\n  try {\n    return await refreshConfigFiles(mode, logger);\n  } catch (err) {\n    logger.warn('Failed to refresh config files.');\n    logger.subtle(inspect(err));\n\n    return {\n      ok: false,\n      fixable: false,\n      annotations: [],\n    };\n  }\n};\n"],
+  "mappings": "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",
+  "names": ["path", "packageManager", "stripAnsi"]
 }

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

@@ -21,16 +21,11 @@ __export(__exports, {
   patches: () => patches
 });
 module.exports = __toCommonJS(__exports);
-var import_migrateNpmrcToPnpmWorkspace = require("./migrateNpmrcToPnpmWorkspace");
 var import_stopBundlingInCDKTests = require("./stopBundlingInCDKTests");
 const patches = [
   {
     apply: import_stopBundlingInCDKTests.tryStopBundlingInCDKTests,
     description: "Stop bundling inside CDK unit tests"
-  },
-  {
-    apply: import_migrateNpmrcToPnpmWorkspace.tryMigrateNpmrcToPnpmWorkspace,
-    description: "Move .npmrc config to pnpm-workspace.yaml"
   }
 ];
 // Annotate the CommonJS export names for ESM import in node:

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../../src/cli/lint/internalLints/upgrade/patches/10.1.0/index.ts"],
-  "sourcesContent": ["import type { Patches } from '../..';\n\nimport { tryMigrateNpmrcToPnpmWorkspace } from './migrateNpmrcToPnpmWorkspace';\nimport { tryStopBundlingInCDKTests } from './stopBundlingInCDKTests';\n\nexport const patches: Patches = [\n  {\n    apply: tryStopBundlingInCDKTests,\n    description: 'Stop bundling inside CDK unit tests',\n  },\n  {\n    apply: tryMigrateNpmrcToPnpmWorkspace,\n    description: 'Move .npmrc config to pnpm-workspace.yaml',\n  },\n];\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA,yCAA+C;AAC/C,oCAA0C;AAEnC,MAAM,UAAmB;AAAA,EAC9B;AAAA,IACE,OAAO;AAAA,IACP,aAAa;AAAA,EACf;AAAA,EACA;AAAA,IACE,OAAO;AAAA,IACP,aAAa;AAAA,EACf;AACF;",
+  "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/7.3.1/index.js

@@ -23,6 +23,7 @@ __export(__exports, {
 module.exports = __toCommonJS(__exports);
 var import_patchRenovateConfig = require("../../../patchRenovateConfig");
 var import_addEmptyExports = require("./addEmptyExports");
+var import_moveNpmrcOutOfIgnoreManagedSection = require("./moveNpmrcOutOfIgnoreManagedSection");
 var import_patchDockerfile = require("./patchDockerfile");
 var import_patchServerListener = require("./patchServerListener");
 const patches = [
@@ -41,6 +42,14 @@ const patches = [
   {
     apply: import_patchServerListener.tryPatchServerListener,
     description: "Add keepAliveTimeout to server listener"
+  },
+  {
+    apply: (0, import_moveNpmrcOutOfIgnoreManagedSection.tryMoveNpmrcOutOfIgnoreManagedSection)(".gitignore"),
+    description: "Move .npmrc out of the .gitignore managed section"
+  },
+  {
+    apply: (0, import_moveNpmrcOutOfIgnoreManagedSection.tryMoveNpmrcOutOfIgnoreManagedSection)(".dockerignore"),
+    description: "Move .npmrc out of the .dockerignore managed section"
   }
 ];
 // Annotate the CommonJS export names for ESM import in node:

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../../src/cli/lint/internalLints/upgrade/patches/7.3.1/index.ts"],
-  "sourcesContent": ["import type { Patches } from '../..';\nimport { tryPatchRenovateConfig } from '../../../patchRenovateConfig';\n\nimport { tryAddEmptyExports } from './addEmptyExports';\nimport { tryPatchDockerfile } from './patchDockerfile';\nimport { tryPatchServerListener } from './patchServerListener';\n\nexport const patches: Patches = [\n  {\n    apply: tryAddEmptyExports,\n    description:\n      'Add empty exports to Jest files for compliance with TypeScript isolated modules',\n  },\n  {\n    apply: tryPatchRenovateConfig,\n    description: 'Update Renovate config to support private SEEK packages',\n  },\n  {\n    apply: tryPatchDockerfile,\n    description: 'Upgrade Node.js Distroless Docker image to -debian12 variant',\n  },\n  {\n    apply: tryPatchServerListener,\n    description: 'Add keepAliveTimeout to server listener',\n  },\n];\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,iCAAuC;AAEvC,6BAAmC;AACnC,6BAAmC;AACnC,iCAAuC;AAEhC,MAAM,UAAmB;AAAA,EAC9B;AAAA,IACE,OAAO;AAAA,IACP,aACE;AAAA,EACJ;AAAA,EACA;AAAA,IACE,OAAO;AAAA,IACP,aAAa;AAAA,EACf;AAAA,EACA;AAAA,IACE,OAAO;AAAA,IACP,aAAa;AAAA,EACf;AAAA,EACA;AAAA,IACE,OAAO;AAAA,IACP,aAAa;AAAA,EACf;AACF;",
+  "sourcesContent": ["import type { Patches } from '../..';\nimport { tryPatchRenovateConfig } from '../../../patchRenovateConfig';\n\nimport { tryAddEmptyExports } from './addEmptyExports';\nimport { tryMoveNpmrcOutOfIgnoreManagedSection } from './moveNpmrcOutOfIgnoreManagedSection';\nimport { tryPatchDockerfile } from './patchDockerfile';\nimport { tryPatchServerListener } from './patchServerListener';\n\nexport const patches: Patches = [\n  {\n    apply: tryAddEmptyExports,\n    description:\n      'Add empty exports to Jest files for compliance with TypeScript isolated modules',\n  },\n  {\n    apply: tryPatchRenovateConfig,\n    description: 'Update Renovate config to support private SEEK packages',\n  },\n  {\n    apply: tryPatchDockerfile,\n    description: 'Upgrade Node.js Distroless Docker image to -debian12 variant',\n  },\n  {\n    apply: tryPatchServerListener,\n    description: 'Add keepAliveTimeout to server listener',\n  },\n  {\n    apply: tryMoveNpmrcOutOfIgnoreManagedSection('.gitignore'),\n    description: 'Move .npmrc out of the .gitignore managed section',\n  },\n  {\n    apply: tryMoveNpmrcOutOfIgnoreManagedSection('.dockerignore'),\n    description: 'Move .npmrc out of the .dockerignore managed section',\n  },\n];\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,iCAAuC;AAEvC,6BAAmC;AACnC,gDAAsD;AACtD,6BAAmC;AACnC,iCAAuC;AAEhC,MAAM,UAAmB;AAAA,EAC9B;AAAA,IACE,OAAO;AAAA,IACP,aACE;AAAA,EACJ;AAAA,EACA;AAAA,IACE,OAAO;AAAA,IACP,aAAa;AAAA,EACf;AAAA,EACA;AAAA,IACE,OAAO;AAAA,IACP,aAAa;AAAA,EACf;AAAA,EACA;AAAA,IACE,OAAO;AAAA,IACP,aAAa;AAAA,EACf;AAAA,EACA;AAAA,IACE,WAAO,iFAAsC,YAAY;AAAA,IACzD,aAAa;AAAA,EACf;AAAA,EACA;AAAA,IACE,WAAO,iFAAsC,eAAe;AAAA,IAC5D,aAAa;AAAA,EACf;AACF;",
   "names": []
 }

package/lib/cli/lint/internalLints/upgrade/patches/7.3.1/moveNpmrcOutOfIgnoreManagedSection.d.ts

@@ -0,0 +1,2 @@
+import type { PatchReturnType } from '../..';
+export declare const tryMoveNpmrcOutOfIgnoreManagedSection: (type: ".gitignore" | ".dockerignore") => ({ mode, dir }: import("../..").PatchConfig) => Promise<PatchReturnType>;

package/lib/cli/lint/internalLints/upgrade/patches/7.3.1/moveNpmrcOutOfIgnoreManagedSection.js

@@ -0,0 +1,95 @@
+"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 moveNpmrcOutOfIgnoreManagedSection_exports = {};
+__export(moveNpmrcOutOfIgnoreManagedSection_exports, {
+  tryMoveNpmrcOutOfIgnoreManagedSection: () => tryMoveNpmrcOutOfIgnoreManagedSection
+});
+module.exports = __toCommonJS(moveNpmrcOutOfIgnoreManagedSection_exports);
+var import_path = __toESM(require("path"));
+var import_util = require("util");
+var import_fs_extra = __toESM(require("fs-extra"));
+var import_logging = require("../../../../../../utils/logging");
+var import_npmrc = require("../../../../../../utils/npmrc");
+var import_project = require("../../../../../configure/analysis/project");
+const NPMRC_IGNORE_SECTION = `
+
+# Ignore .npmrc. This is no longer managed by skuba as pnpm projects use a managed .npmrc.
+# IMPORTANT: if migrating to pnpm, remove this line and add an .npmrc IN THE SAME COMMIT.
+# You can use \`skuba format\` to generate the file or otherwise commit an empty file.
+# Doing so will conflict with a local .npmrc and make it more difficult to unintentionally commit auth secrets.
+.npmrc
+`;
+const moveNpmrcOutOfIgnoreManagedSection = async (mode, dir, fileName) => {
+  const readFile = (0, import_project.createDestinationFileReader)(dir);
+  const ignoreFile = await readFile(fileName);
+  if (!ignoreFile) {
+    return { result: "skip", reason: `no ${fileName} file found` };
+  }
+  let isIgnored;
+  let currentlyInManagedSection = false;
+  for (const line of ignoreFile.split("\n")) {
+    if (line.trim() === "# managed by skuba") {
+      currentlyInManagedSection = true;
+    } else if (line.trim() === "# end managed by skuba") {
+      currentlyInManagedSection = false;
+    }
+    if (line.trim() === ".npmrc" || line.trim() === "/.npmrc") {
+      isIgnored = { inManaged: currentlyInManagedSection };
+    }
+    if (line.trim() === "!.npmrc" || line.trim() === "!/.npmrc") {
+      isIgnored = void 0;
+    }
+  }
+  if (isIgnored && !isIgnored.inManaged) {
+    return { result: "skip", reason: "already ignored in unmanaged section" };
+  }
+  if (!isIgnored) {
+    return { result: "skip", reason: "not ignored" };
+  }
+  if (mode === "lint") {
+    return { result: "apply" };
+  }
+  const newIgnoreFile = ignoreFile.split("\n").filter((line) => !import_npmrc.NPMRC_LINES.includes(line.trim())).join("\n").trim() + NPMRC_IGNORE_SECTION;
+  await import_fs_extra.default.promises.writeFile(import_path.default.join(dir, fileName), newIgnoreFile);
+  return { result: "apply" };
+};
+const tryMoveNpmrcOutOfIgnoreManagedSection = (type) => async ({ mode, dir = process.cwd() }) => {
+  try {
+    return await moveNpmrcOutOfIgnoreManagedSection(mode, dir, type);
+  } catch (err) {
+    import_logging.log.warn(`Failed to move .npmrc out of ${type} managed sections.`);
+    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 = {
+  tryMoveNpmrcOutOfIgnoreManagedSection
+});
+//# sourceMappingURL=moveNpmrcOutOfIgnoreManagedSection.js.map

package/lib/cli/lint/internalLints/upgrade/patches/7.3.1/moveNpmrcOutOfIgnoreManagedSection.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../../../../../src/cli/lint/internalLints/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 '../../../../../configure/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, 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,EAAE,MAAM,MAAM,QAAQ,IAAI,EAAE,MAAM;AACxC,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/utils/copy.js

@@ -79,7 +79,7 @@ const copyFiles = async (opts, currentSourceDir = opts.sourceRoot, currentDestin
   const filenames = await import_fs_extra.default.promises.readdir(currentSourceDir);
   const toDestinationPath = (filename) => import_path.default.join(
     currentDestinationDir,
-    opts.stripUnderscorePrefix ? filename.replace(/^_\./, ".").replace(/^_package\.json/, "package.json").replace(/^_eslint\.config\.js/, "eslint.config.js").replace(/^_pnpm-workspace\.yaml/, "pnpm-workspace.yaml") : filename
+    opts.stripUnderscorePrefix ? filename.replace(/^_\./, ".").replace(/^_package\.json/, "package.json").replace(/^_eslint\.config\.js/, "eslint.config.js") : filename
   );
   const filteredFilenames = filenames.filter(
     (filename) => opts.include(

package/lib/utils/copy.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/utils/copy.ts"],
-  "sourcesContent": ["import path from 'path';\n\nimport ejs from 'ejs';\nimport fs from 'fs-extra';\n\nimport { isErrorWithCode } from './error';\nimport { log } from './logging';\n\nexport type TextProcessor = (sourcePath: string, contents: string) => string;\n\nexport const copyFile = async (\n  sourcePath: string,\n  destinationPath: string,\n  {\n    overwrite = true,\n    processors,\n  }: Pick<CopyFilesOptions, 'overwrite' | 'processors'>,\n) => {\n  const oldContents = await fs.promises.readFile(sourcePath, 'utf8');\n\n  const newContents = processors.reduce(\n    (contents, process) => process(sourcePath, contents),\n    oldContents,\n  );\n\n  if (oldContents === newContents && sourcePath === destinationPath) {\n    return;\n  }\n\n  try {\n    await fs.promises.writeFile(destinationPath, newContents, {\n      flag: overwrite ? 'w' : 'wx',\n    });\n  } catch (err) {\n    if (isErrorWithCode(err, 'EEXIST')) {\n      return;\n    }\n\n    throw err;\n  }\n};\n\ninterface CopyFilesOptions {\n  sourceRoot: string;\n  destinationRoot: string;\n\n  include: (pathname: string) => boolean;\n  overwrite?: boolean;\n  processors: TextProcessor[];\n  stripUnderscorePrefix?: boolean;\n}\n\nexport const createEjsRenderer =\n  (templateData: Record<string, unknown>): TextProcessor =>\n  (sourcePath: string, contents) => {\n    try {\n      return ejs.render(contents, templateData, { strict: false });\n    } catch (err) {\n      log.err('Failed to render', log.bold(sourcePath));\n      log.subtle(err);\n      return contents;\n    }\n  };\n\nexport const createStringReplacer =\n  (\n    replacements: Array<{\n      input: RegExp;\n      output: string;\n    }>,\n  ): TextProcessor =>\n  (_sourcePath: string, contents) =>\n    replacements.reduce(\n      (newContents, { input, output }) => newContents.replace(input, output),\n      contents,\n    );\n\nexport const copyFiles = async (\n  opts: CopyFilesOptions,\n  currentSourceDir: string = opts.sourceRoot,\n  currentDestinationDir: string = opts.destinationRoot,\n) => {\n  const filenames = await fs.promises.readdir(currentSourceDir);\n\n  const toDestinationPath = (filename: string) =>\n    path.join(\n      currentDestinationDir,\n      opts.stripUnderscorePrefix\n        ? filename\n            .replace(/^_\\./, '.')\n            .replace(/^_package\\.json/, 'package.json')\n            .replace(/^_eslint\\.config\\.js/, 'eslint.config.js')\n            .replace(/^_pnpm-workspace\\.yaml/, 'pnpm-workspace.yaml')\n        : filename,\n    );\n\n  const filteredFilenames = filenames.filter((filename) =>\n    opts.include(\n      path.relative(opts.destinationRoot, toDestinationPath(filename)),\n    ),\n  );\n\n  await Promise.all(\n    filteredFilenames.map(async (filename) => {\n      const sourcePath = path.join(currentSourceDir, filename);\n      const destinationPath = toDestinationPath(filename);\n\n      try {\n        await copyFile(sourcePath, destinationPath, opts);\n      } catch (err) {\n        if (isErrorWithCode(err, 'EISDIR')) {\n          await fs.promises.mkdir(destinationPath, { recursive: true });\n          return copyFiles(opts, sourcePath, destinationPath);\n        }\n\n        log.err('Failed to render', log.bold(sourcePath));\n\n        throw err;\n      }\n    }),\n  );\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AAEjB,iBAAgB;AAChB,sBAAe;AAEf,mBAAgC;AAChC,qBAAoB;AAIb,MAAM,WAAW,OACtB,YACA,iBACA;AAAA,EACE,YAAY;AAAA,EACZ;AACF,MACG;AACH,QAAM,cAAc,MAAM,gBAAAA,QAAG,SAAS,SAAS,YAAY,MAAM;AAEjE,QAAM,cAAc,WAAW;AAAA,IAC7B,CAAC,UAAU,YAAY,QAAQ,YAAY,QAAQ;AAAA,IACnD;AAAA,EACF;AAEA,MAAI,gBAAgB,eAAe,eAAe,iBAAiB;AACjE;AAAA,EACF;AAEA,MAAI;AACF,UAAM,gBAAAA,QAAG,SAAS,UAAU,iBAAiB,aAAa;AAAA,MACxD,MAAM,YAAY,MAAM;AAAA,IAC1B,CAAC;AAAA,EACH,SAAS,KAAK;AACZ,YAAI,8BAAgB,KAAK,QAAQ,GAAG;AAClC;AAAA,IACF;AAEA,UAAM;AAAA,EACR;AACF;AAYO,MAAM,oBACX,CAAC,iBACD,CAAC,YAAoB,aAAa;AAChC,MAAI;AACF,WAAO,WAAAC,QAAI,OAAO,UAAU,cAAc,EAAE,QAAQ,MAAM,CAAC;AAAA,EAC7D,SAAS,KAAK;AACZ,uBAAI,IAAI,oBAAoB,mBAAI,KAAK,UAAU,CAAC;AAChD,uBAAI,OAAO,GAAG;AACd,WAAO;AAAA,EACT;AACF;AAEK,MAAM,uBACX,CACE,iBAKF,CAAC,aAAqB,aACpB,aAAa;AAAA,EACX,CAAC,aAAa,EAAE,OAAO,OAAO,MAAM,YAAY,QAAQ,OAAO,MAAM;AAAA,EACrE;AACF;AAEG,MAAM,YAAY,OACvB,MACA,mBAA2B,KAAK,YAChC,wBAAgC,KAAK,oBAClC;AACH,QAAM,YAAY,MAAM,gBAAAD,QAAG,SAAS,QAAQ,gBAAgB;AAE5D,QAAM,oBAAoB,CAAC,aACzB,YAAAE,QAAK;AAAA,IACH;AAAA,IACA,KAAK,wBACD,SACG,QAAQ,QAAQ,GAAG,EACnB,QAAQ,mBAAmB,cAAc,EACzC,QAAQ,wBAAwB,kBAAkB,EAClD,QAAQ,0BAA0B,qBAAqB,IAC1D;AAAA,EACN;AAEF,QAAM,oBAAoB,UAAU;AAAA,IAAO,CAAC,aAC1C,KAAK;AAAA,MACH,YAAAA,QAAK,SAAS,KAAK,iBAAiB,kBAAkB,QAAQ,CAAC;AAAA,IACjE;AAAA,EACF;AAEA,QAAM,QAAQ;AAAA,IACZ,kBAAkB,IAAI,OAAO,aAAa;AACxC,YAAM,aAAa,YAAAA,QAAK,KAAK,kBAAkB,QAAQ;AACvD,YAAM,kBAAkB,kBAAkB,QAAQ;AAElD,UAAI;AACF,cAAM,SAAS,YAAY,iBAAiB,IAAI;AAAA,MAClD,SAAS,KAAK;AACZ,gBAAI,8BAAgB,KAAK,QAAQ,GAAG;AAClC,gBAAM,gBAAAF,QAAG,SAAS,MAAM,iBAAiB,EAAE,WAAW,KAAK,CAAC;AAC5D,iBAAO,UAAU,MAAM,YAAY,eAAe;AAAA,QACpD;AAEA,2BAAI,IAAI,oBAAoB,mBAAI,KAAK,UAAU,CAAC;AAEhD,cAAM;AAAA,MACR;AAAA,IACF,CAAC;AAAA,EACH;AACF;",
+  "sourcesContent": ["import path from 'path';\n\nimport ejs from 'ejs';\nimport fs from 'fs-extra';\n\nimport { isErrorWithCode } from './error';\nimport { log } from './logging';\n\nexport type TextProcessor = (sourcePath: string, contents: string) => string;\n\nexport const copyFile = async (\n  sourcePath: string,\n  destinationPath: string,\n  {\n    overwrite = true,\n    processors,\n  }: Pick<CopyFilesOptions, 'overwrite' | 'processors'>,\n) => {\n  const oldContents = await fs.promises.readFile(sourcePath, 'utf8');\n\n  const newContents = processors.reduce(\n    (contents, process) => process(sourcePath, contents),\n    oldContents,\n  );\n\n  if (oldContents === newContents && sourcePath === destinationPath) {\n    return;\n  }\n\n  try {\n    await fs.promises.writeFile(destinationPath, newContents, {\n      flag: overwrite ? 'w' : 'wx',\n    });\n  } catch (err) {\n    if (isErrorWithCode(err, 'EEXIST')) {\n      return;\n    }\n\n    throw err;\n  }\n};\n\ninterface CopyFilesOptions {\n  sourceRoot: string;\n  destinationRoot: string;\n\n  include: (pathname: string) => boolean;\n  overwrite?: boolean;\n  processors: TextProcessor[];\n  stripUnderscorePrefix?: boolean;\n}\n\nexport const createEjsRenderer =\n  (templateData: Record<string, unknown>): TextProcessor =>\n  (sourcePath: string, contents) => {\n    try {\n      return ejs.render(contents, templateData, { strict: false });\n    } catch (err) {\n      log.err('Failed to render', log.bold(sourcePath));\n      log.subtle(err);\n      return contents;\n    }\n  };\n\nexport const createStringReplacer =\n  (\n    replacements: Array<{\n      input: RegExp;\n      output: string;\n    }>,\n  ): TextProcessor =>\n  (_sourcePath: string, contents) =>\n    replacements.reduce(\n      (newContents, { input, output }) => newContents.replace(input, output),\n      contents,\n    );\n\nexport const copyFiles = async (\n  opts: CopyFilesOptions,\n  currentSourceDir: string = opts.sourceRoot,\n  currentDestinationDir: string = opts.destinationRoot,\n) => {\n  const filenames = await fs.promises.readdir(currentSourceDir);\n\n  const toDestinationPath = (filename: string) =>\n    path.join(\n      currentDestinationDir,\n      opts.stripUnderscorePrefix\n        ? filename\n            .replace(/^_\\./, '.')\n            .replace(/^_package\\.json/, 'package.json')\n            .replace(/^_eslint\\.config\\.js/, 'eslint.config.js')\n        : filename,\n    );\n\n  const filteredFilenames = filenames.filter((filename) =>\n    opts.include(\n      path.relative(opts.destinationRoot, toDestinationPath(filename)),\n    ),\n  );\n\n  await Promise.all(\n    filteredFilenames.map(async (filename) => {\n      const sourcePath = path.join(currentSourceDir, filename);\n      const destinationPath = toDestinationPath(filename);\n\n      try {\n        await copyFile(sourcePath, destinationPath, opts);\n      } catch (err) {\n        if (isErrorWithCode(err, 'EISDIR')) {\n          await fs.promises.mkdir(destinationPath, { recursive: true });\n          return copyFiles(opts, sourcePath, destinationPath);\n        }\n\n        log.err('Failed to render', log.bold(sourcePath));\n\n        throw err;\n      }\n    }),\n  );\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AAEjB,iBAAgB;AAChB,sBAAe;AAEf,mBAAgC;AAChC,qBAAoB;AAIb,MAAM,WAAW,OACtB,YACA,iBACA;AAAA,EACE,YAAY;AAAA,EACZ;AACF,MACG;AACH,QAAM,cAAc,MAAM,gBAAAA,QAAG,SAAS,SAAS,YAAY,MAAM;AAEjE,QAAM,cAAc,WAAW;AAAA,IAC7B,CAAC,UAAU,YAAY,QAAQ,YAAY,QAAQ;AAAA,IACnD;AAAA,EACF;AAEA,MAAI,gBAAgB,eAAe,eAAe,iBAAiB;AACjE;AAAA,EACF;AAEA,MAAI;AACF,UAAM,gBAAAA,QAAG,SAAS,UAAU,iBAAiB,aAAa;AAAA,MACxD,MAAM,YAAY,MAAM;AAAA,IAC1B,CAAC;AAAA,EACH,SAAS,KAAK;AACZ,YAAI,8BAAgB,KAAK,QAAQ,GAAG;AAClC;AAAA,IACF;AAEA,UAAM;AAAA,EACR;AACF;AAYO,MAAM,oBACX,CAAC,iBACD,CAAC,YAAoB,aAAa;AAChC,MAAI;AACF,WAAO,WAAAC,QAAI,OAAO,UAAU,cAAc,EAAE,QAAQ,MAAM,CAAC;AAAA,EAC7D,SAAS,KAAK;AACZ,uBAAI,IAAI,oBAAoB,mBAAI,KAAK,UAAU,CAAC;AAChD,uBAAI,OAAO,GAAG;AACd,WAAO;AAAA,EACT;AACF;AAEK,MAAM,uBACX,CACE,iBAKF,CAAC,aAAqB,aACpB,aAAa;AAAA,EACX,CAAC,aAAa,EAAE,OAAO,OAAO,MAAM,YAAY,QAAQ,OAAO,MAAM;AAAA,EACrE;AACF;AAEG,MAAM,YAAY,OACvB,MACA,mBAA2B,KAAK,YAChC,wBAAgC,KAAK,oBAClC;AACH,QAAM,YAAY,MAAM,gBAAAD,QAAG,SAAS,QAAQ,gBAAgB;AAE5D,QAAM,oBAAoB,CAAC,aACzB,YAAAE,QAAK;AAAA,IACH;AAAA,IACA,KAAK,wBACD,SACG,QAAQ,QAAQ,GAAG,EACnB,QAAQ,mBAAmB,cAAc,EACzC,QAAQ,wBAAwB,kBAAkB,IACrD;AAAA,EACN;AAEF,QAAM,oBAAoB,UAAU;AAAA,IAAO,CAAC,aAC1C,KAAK;AAAA,MACH,YAAAA,QAAK,SAAS,KAAK,iBAAiB,kBAAkB,QAAQ,CAAC;AAAA,IACjE;AAAA,EACF;AAEA,QAAM,QAAQ;AAAA,IACZ,kBAAkB,IAAI,OAAO,aAAa;AACxC,YAAM,aAAa,YAAAA,QAAK,KAAK,kBAAkB,QAAQ;AACvD,YAAM,kBAAkB,kBAAkB,QAAQ;AAElD,UAAI;AACF,cAAM,SAAS,YAAY,iBAAiB,IAAI;AAAA,MAClD,SAAS,KAAK;AACZ,gBAAI,8BAAgB,KAAK,QAAQ,GAAG;AAClC,gBAAM,gBAAAF,QAAG,SAAS,MAAM,iBAAiB,EAAE,WAAW,KAAK,CAAC;AAC5D,iBAAO,UAAU,MAAM,YAAY,eAAe;AAAA,QACpD;AAEA,2BAAI,IAAI,oBAAoB,mBAAI,KAAK,UAAU,CAAC;AAEhD,cAAM;AAAA,MACR;AAAA,IACF,CAAC;AAAA,EACH;AACF;",
   "names": ["fs", "ejs", "path"]
 }

package/lib/utils/dir.d.ts

@@ -20,13 +20,3 @@ export declare const crawlDirectory: (root: string, ignoreFilenames?: string[])
  * `.gitignore` and `.prettierignore`.
  */
 export declare const createInclusionFilter: (ignoreFilepaths: string[]) => Promise<(pathname: string) => boolean>;
-export declare const locateNearestFile: ({ cwd, filename, }: {
-    cwd: string;
-    filename: string;
-}) => Promise<string | null>;
-export declare const locateFurthestFile: ({ cwd, filename, }: {
-    cwd: string;
-    filename: string;
-}) => Promise<string | null>;
-export declare const findWorkspaceRoot: (cwd?: string) => Promise<string | null>;
-export declare const findCurrentWorkspaceProjectRoot: (cwd?: string) => Promise<string | null>;

package/lib/utils/dir.js

@@ -30,18 +30,13 @@ var dir_exports = {};
 __export(dir_exports, {
   buildPatternToFilepathMap: () => buildPatternToFilepathMap,
   crawlDirectory: () => crawlDirectory,
-  createInclusionFilter: () => createInclusionFilter,
-  findCurrentWorkspaceProjectRoot: () => findCurrentWorkspaceProjectRoot,
-  findWorkspaceRoot: () => findWorkspaceRoot,
-  locateFurthestFile: () => locateFurthestFile,
-  locateNearestFile: () => locateNearestFile
+  createInclusionFilter: () => createInclusionFilter
 });
 module.exports = __toCommonJS(dir_exports);
 var import_path = __toESM(require("path"));
 var import_fs_extra = __toESM(require("fs-extra"));
 var import_ignore = __toESM(require("ignore"));
 var import_picomatch = __toESM(require("picomatch"));
-var import_findRoot = require("../api/git/findRoot");
 var import_error = require("./error");
 const buildPatternToFilepathMap = (patterns, allFilepaths, options) => Object.fromEntries(
   patterns.map((pattern) => {
@@ -99,77 +94,10 @@ async function crawl(directoryPath, filters, paths = []) {
   }
   return paths;
 }
-const locateNearestFile = async ({
-  cwd,
-  filename
-}) => {
-  let currentDir = cwd;
-  while (currentDir !== import_path.default.dirname(currentDir)) {
-    const filePath = import_path.default.join(currentDir, filename);
-    if (await import_fs_extra.default.pathExists(filePath)) {
-      return filePath;
-    }
-    currentDir = import_path.default.dirname(currentDir);
-  }
-  return null;
-};
-const locateFurthestFile = async ({
-  cwd,
-  filename
-}) => {
-  let currentDir = cwd;
-  let furthestFilePath = null;
-  while (currentDir !== import_path.default.dirname(currentDir)) {
-    const filePath = import_path.default.join(currentDir, filename);
-    if (await import_fs_extra.default.pathExists(filePath)) {
-      furthestFilePath = filePath;
-    }
-    currentDir = import_path.default.dirname(currentDir);
-  }
-  return furthestFilePath;
-};
-const workspaceRootCache = {};
-const findWorkspaceRoot = async (cwd = process.cwd()) => {
-  const find = async () => {
-    const [pnpmLock, yarnLock, packageJson, gitRoot] = await Promise.all([
-      locateNearestFile({ cwd, filename: "pnpm-lock.yaml" }),
-      locateNearestFile({ cwd, filename: "yarn.lock" }),
-      locateFurthestFile({ cwd, filename: "package.json" }),
-      (0, import_findRoot.findRoot)({ dir: cwd })
-    ]);
-    const candidates = [
-      pnpmLock ? import_path.default.dirname(pnpmLock) : null,
-      yarnLock ? import_path.default.dirname(yarnLock) : null,
-      packageJson ? import_path.default.dirname(packageJson) : null,
-      gitRoot
-    ].filter((dir) => dir !== null);
-    if (candidates[0]) {
-      return candidates.reduce((longest, current) => {
-        if (current.split(import_path.default.sep).length > longest.split(import_path.default.sep).length) {
-          return current;
-        }
-        return longest;
-      }, candidates[0]);
-    }
-    return null;
-  };
-  return workspaceRootCache[cwd] ??= await find();
-};
-const findCurrentWorkspaceProjectRoot = async (cwd = process.cwd()) => {
-  const packageJson = await locateNearestFile({
-    cwd,
-    filename: "package.json"
-  });
-  return packageJson ? import_path.default.dirname(packageJson) : null;
-};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   buildPatternToFilepathMap,
   crawlDirectory,
-  createInclusionFilter,
-  findCurrentWorkspaceProjectRoot,
-  findWorkspaceRoot,
-  locateFurthestFile,
-  locateNearestFile
+  createInclusionFilter
 });
 //# sourceMappingURL=dir.js.map

package/lib/utils/dir.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/utils/dir.ts"],
-  "sourcesContent": ["import path from 'path';\n\nimport fs from 'fs-extra';\nimport ignore from 'ignore';\nimport picomatch from 'picomatch';\n\nimport { findRoot as findGitRoot } from '../api/git/findRoot';\n\nimport { isErrorWithCode } from './error';\n\n/**\n * Build a map that associates each glob pattern with its matching filepaths.\n */\nexport const buildPatternToFilepathMap = (\n  patterns: string[],\n  allFilepaths: string[],\n  options?: picomatch.PicomatchOptions,\n) =>\n  Object.fromEntries(\n    patterns.map((pattern) => {\n      const isMatch = picomatch(pattern, options);\n\n      const filepaths = allFilepaths.filter((filepath) => isMatch(filepath));\n\n      return [pattern, filepaths] as const;\n    }),\n  );\n\n/**\n * List relative filepaths contained within a directory root.\n *\n * This excludes:\n *\n * - Patterns in the ignore files specified in `ignoreFilenames`\n * - `.git` subdirectories\n * - `node_modules` subdirectories\n */\nexport const crawlDirectory = async (\n  root: string,\n  ignoreFilenames = ['.gitignore'],\n) => {\n  const ignoreFileFilter = await createInclusionFilter(\n    ignoreFilenames.map((ignoreFilename) => path.join(root, ignoreFilename)),\n  );\n\n  const absoluteFilenames = await crawl(root, {\n    includeDirName: (dirname) => !['.git', 'node_modules'].includes(dirname),\n    includeFilePath: (pathname) =>\n      ignoreFileFilter(path.relative(root, pathname)),\n  });\n\n  const relativeFilepaths = absoluteFilenames.map((filepath) =>\n    path.relative(root, filepath),\n  );\n\n  return relativeFilepaths;\n};\n\n/**\n * Create a filter function that excludes filepaths based on ignore files like\n * `.gitignore` and `.prettierignore`.\n */\nexport const createInclusionFilter = async (ignoreFilepaths: string[]) => {\n  const ignoreFiles = await Promise.all(\n    ignoreFilepaths.map(async (ignoreFilepath) => {\n      try {\n        return await fs.promises.readFile(ignoreFilepath, 'utf8');\n      } catch (err) {\n        if (isErrorWithCode(err, 'ENOENT')) {\n          return;\n        }\n\n        throw err;\n      }\n    }),\n  );\n\n  const managers = ignoreFiles\n    .filter((value): value is string => typeof value === 'string')\n    .map((value) => ignore().add(value));\n\n  return ignore().add('.git').add(managers).createFilter();\n};\n\n/**\n * Recursively crawl a directory and return all file paths that match the\n * filters. `paths` is mutated and returned.\n */\nasync function crawl(\n  directoryPath: string,\n  filters: {\n    includeDirName: (dirName: string) => boolean;\n    includeFilePath: (path: string) => boolean;\n  },\n  paths: string[] = [],\n) {\n  try {\n    const entries = await fs.promises.readdir(directoryPath, {\n      withFileTypes: true,\n    });\n\n    await Promise.all(\n      entries.map(async (entry) => {\n        const fullPath = path.join(directoryPath, entry.name);\n\n        if (\n          (entry.isFile() || entry.isSymbolicLink()) &&\n          filters.includeFilePath(fullPath)\n        ) {\n          paths.push(fullPath);\n        }\n\n        if (entry.isDirectory() && filters.includeDirName(entry.name)) {\n          await crawl(fullPath, filters, paths);\n        }\n      }),\n    );\n  } catch {\n    // Ignore errors, because of e.g. permission issues reading directories\n  }\n\n  return paths;\n}\n\nexport const locateNearestFile = async ({\n  cwd,\n  filename,\n}: {\n  cwd: string;\n  filename: string;\n}) => {\n  let currentDir = cwd;\n  while (currentDir !== path.dirname(currentDir)) {\n    const filePath = path.join(currentDir, filename);\n    if (await fs.pathExists(filePath)) {\n      return filePath;\n    }\n    currentDir = path.dirname(currentDir);\n  }\n\n  return null;\n};\n\nexport const locateFurthestFile = async ({\n  cwd,\n  filename,\n}: {\n  cwd: string;\n  filename: string;\n}) => {\n  let currentDir = cwd;\n  let furthestFilePath: string | null = null;\n\n  while (currentDir !== path.dirname(currentDir)) {\n    const filePath = path.join(currentDir, filename);\n    if (await fs.pathExists(filePath)) {\n      furthestFilePath = filePath;\n    }\n    currentDir = path.dirname(currentDir);\n  }\n\n  return furthestFilePath;\n};\n\nconst workspaceRootCache: Record<string, string | null> = {};\n\nexport const findWorkspaceRoot = async (\n  cwd = process.cwd(),\n): Promise<string | null> => {\n  const find = async (): Promise<string | null> => {\n    const [pnpmLock, yarnLock, packageJson, gitRoot] = await Promise.all([\n      locateNearestFile({ cwd, filename: 'pnpm-lock.yaml' }),\n      locateNearestFile({ cwd, filename: 'yarn.lock' }),\n      locateFurthestFile({ cwd, filename: 'package.json' }),\n      findGitRoot({ dir: cwd }),\n    ]);\n\n    const candidates = [\n      pnpmLock ? path.dirname(pnpmLock) : null,\n      yarnLock ? path.dirname(yarnLock) : null,\n      packageJson ? path.dirname(packageJson) : null,\n      gitRoot,\n    ].filter((dir): dir is string => dir !== null);\n\n    if (candidates[0]) {\n      // Pick the longest path. This will be the most specific, which helps guard against someone\n      // having an accidental lockfile in a parent directory by mistake.\n\n      return candidates.reduce((longest, current) => {\n        if (current.split(path.sep).length > longest.split(path.sep).length) {\n          return current;\n        }\n        return longest;\n      }, candidates[0]);\n    }\n\n    return null;\n  };\n\n  return (workspaceRootCache[cwd] ??= await find());\n};\n\nexport const findCurrentWorkspaceProjectRoot = async (\n  cwd = process.cwd(),\n): Promise<string | null> => {\n  const packageJson = await locateNearestFile({\n    cwd,\n    filename: 'package.json',\n  });\n  return packageJson ? path.dirname(packageJson) : null;\n};\n"],
-  "mappings": "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",
-  "names": ["picomatch", "path", "fs", "ignore", "findGitRoot"]
+  "sourcesContent": ["import path from 'path';\n\nimport fs from 'fs-extra';\nimport ignore from 'ignore';\nimport picomatch from 'picomatch';\n\nimport { isErrorWithCode } from './error';\n\n/**\n * Build a map that associates each glob pattern with its matching filepaths.\n */\nexport const buildPatternToFilepathMap = (\n  patterns: string[],\n  allFilepaths: string[],\n  options?: picomatch.PicomatchOptions,\n) =>\n  Object.fromEntries(\n    patterns.map((pattern) => {\n      const isMatch = picomatch(pattern, options);\n\n      const filepaths = allFilepaths.filter((filepath) => isMatch(filepath));\n\n      return [pattern, filepaths] as const;\n    }),\n  );\n\n/**\n * List relative filepaths contained within a directory root.\n *\n * This excludes:\n *\n * - Patterns in the ignore files specified in `ignoreFilenames`\n * - `.git` subdirectories\n * - `node_modules` subdirectories\n */\nexport const crawlDirectory = async (\n  root: string,\n  ignoreFilenames = ['.gitignore'],\n) => {\n  const ignoreFileFilter = await createInclusionFilter(\n    ignoreFilenames.map((ignoreFilename) => path.join(root, ignoreFilename)),\n  );\n\n  const absoluteFilenames = await crawl(root, {\n    includeDirName: (dirname) => !['.git', 'node_modules'].includes(dirname),\n    includeFilePath: (pathname) =>\n      ignoreFileFilter(path.relative(root, pathname)),\n  });\n\n  const relativeFilepaths = absoluteFilenames.map((filepath) =>\n    path.relative(root, filepath),\n  );\n\n  return relativeFilepaths;\n};\n\n/**\n * Create a filter function that excludes filepaths based on ignore files like\n * `.gitignore` and `.prettierignore`.\n */\nexport const createInclusionFilter = async (ignoreFilepaths: string[]) => {\n  const ignoreFiles = await Promise.all(\n    ignoreFilepaths.map(async (ignoreFilepath) => {\n      try {\n        return await fs.promises.readFile(ignoreFilepath, 'utf8');\n      } catch (err) {\n        if (isErrorWithCode(err, 'ENOENT')) {\n          return;\n        }\n\n        throw err;\n      }\n    }),\n  );\n\n  const managers = ignoreFiles\n    .filter((value): value is string => typeof value === 'string')\n    .map((value) => ignore().add(value));\n\n  return ignore().add('.git').add(managers).createFilter();\n};\n\n/**\n * Recursively crawl a directory and return all file paths that match the\n * filters. `paths` is mutated and returned.\n */\nasync function crawl(\n  directoryPath: string,\n  filters: {\n    includeDirName: (dirName: string) => boolean;\n    includeFilePath: (path: string) => boolean;\n  },\n  paths: string[] = [],\n) {\n  try {\n    const entries = await fs.promises.readdir(directoryPath, {\n      withFileTypes: true,\n    });\n\n    await Promise.all(\n      entries.map(async (entry) => {\n        const fullPath = path.join(directoryPath, entry.name);\n\n        if (\n          (entry.isFile() || entry.isSymbolicLink()) &&\n          filters.includeFilePath(fullPath)\n        ) {\n          paths.push(fullPath);\n        }\n\n        if (entry.isDirectory() && filters.includeDirName(entry.name)) {\n          await crawl(fullPath, filters, paths);\n        }\n      }),\n    );\n  } catch {\n    // Ignore errors, because of e.g. permission issues reading directories\n  }\n\n  return paths;\n}\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AAEjB,sBAAe;AACf,oBAAmB;AACnB,uBAAsB;AAEtB,mBAAgC;AAKzB,MAAM,4BAA4B,CACvC,UACA,cACA,YAEA,OAAO;AAAA,EACL,SAAS,IAAI,CAAC,YAAY;AACxB,UAAM,cAAU,iBAAAA,SAAU,SAAS,OAAO;AAE1C,UAAM,YAAY,aAAa,OAAO,CAAC,aAAa,QAAQ,QAAQ,CAAC;AAErE,WAAO,CAAC,SAAS,SAAS;AAAA,EAC5B,CAAC;AACH;AAWK,MAAM,iBAAiB,OAC5B,MACA,kBAAkB,CAAC,YAAY,MAC5B;AACH,QAAM,mBAAmB,MAAM;AAAA,IAC7B,gBAAgB,IAAI,CAAC,mBAAmB,YAAAC,QAAK,KAAK,MAAM,cAAc,CAAC;AAAA,EACzE;AAEA,QAAM,oBAAoB,MAAM,MAAM,MAAM;AAAA,IAC1C,gBAAgB,CAAC,YAAY,CAAC,CAAC,QAAQ,cAAc,EAAE,SAAS,OAAO;AAAA,IACvE,iBAAiB,CAAC,aAChB,iBAAiB,YAAAA,QAAK,SAAS,MAAM,QAAQ,CAAC;AAAA,EAClD,CAAC;AAED,QAAM,oBAAoB,kBAAkB;AAAA,IAAI,CAAC,aAC/C,YAAAA,QAAK,SAAS,MAAM,QAAQ;AAAA,EAC9B;AAEA,SAAO;AACT;AAMO,MAAM,wBAAwB,OAAO,oBAA8B;AACxE,QAAM,cAAc,MAAM,QAAQ;AAAA,IAChC,gBAAgB,IAAI,OAAO,mBAAmB;AAC5C,UAAI;AACF,eAAO,MAAM,gBAAAC,QAAG,SAAS,SAAS,gBAAgB,MAAM;AAAA,MAC1D,SAAS,KAAK;AACZ,gBAAI,8BAAgB,KAAK,QAAQ,GAAG;AAClC;AAAA,QACF;AAEA,cAAM;AAAA,MACR;AAAA,IACF,CAAC;AAAA,EACH;AAEA,QAAM,WAAW,YACd,OAAO,CAAC,UAA2B,OAAO,UAAU,QAAQ,EAC5D,IAAI,CAAC,cAAU,cAAAC,SAAO,EAAE,IAAI,KAAK,CAAC;AAErC,aAAO,cAAAA,SAAO,EAAE,IAAI,MAAM,EAAE,IAAI,QAAQ,EAAE,aAAa;AACzD;AAMA,eAAe,MACb,eACA,SAIA,QAAkB,CAAC,GACnB;AACA,MAAI;AACF,UAAM,UAAU,MAAM,gBAAAD,QAAG,SAAS,QAAQ,eAAe;AAAA,MACvD,eAAe;AAAA,IACjB,CAAC;AAED,UAAM,QAAQ;AAAA,MACZ,QAAQ,IAAI,OAAO,UAAU;AAC3B,cAAM,WAAW,YAAAD,QAAK,KAAK,eAAe,MAAM,IAAI;AAEpD,aACG,MAAM,OAAO,KAAK,MAAM,eAAe,MACxC,QAAQ,gBAAgB,QAAQ,GAChC;AACA,gBAAM,KAAK,QAAQ;AAAA,QACrB;AAEA,YAAI,MAAM,YAAY,KAAK,QAAQ,eAAe,MAAM,IAAI,GAAG;AAC7D,gBAAM,MAAM,UAAU,SAAS,KAAK;AAAA,QACtC;AAAA,MACF,CAAC;AAAA,IACH;AAAA,EACF,QAAQ;AAAA,EAER;AAEA,SAAO;AACT;",
+  "names": ["picomatch", "path", "fs", "ignore"]
 }

package/lib/utils/npmrc.d.ts

@@ -1 +1,2 @@
+export declare const NPMRC_LINES: string[];
 export declare const hasNpmrcSecret: (lineOrFullFileContents: string) => boolean;

package/lib/utils/npmrc.js

@@ -18,12 +18,15 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var npmrc_exports = {};
 __export(npmrc_exports, {
+  NPMRC_LINES: () => NPMRC_LINES,
   hasNpmrcSecret: () => hasNpmrcSecret
 });
 module.exports = __toCommonJS(npmrc_exports);
+const NPMRC_LINES = [".npmrc", "!.npmrc", "/.npmrc", "!/.npmrc"];
 const hasNpmrcSecret = (lineOrFullFileContents) => lineOrFullFileContents.includes("_auth") || lineOrFullFileContents.includes("_password");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  NPMRC_LINES,
   hasNpmrcSecret
 });
 //# sourceMappingURL=npmrc.js.map

package/lib/utils/npmrc.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/utils/npmrc.ts"],
-  "sourcesContent": ["// Preventing against _auth, _authToken, _password\n// https://docs.npmjs.com/cli/v10/configuring-npm/npmrc#auth-related-configuration\nexport const hasNpmrcSecret = (lineOrFullFileContents: string): boolean =>\n  lineOrFullFileContents.includes('_auth') ||\n  lineOrFullFileContents.includes('_password');\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAEO,MAAM,iBAAiB,CAAC,2BAC7B,uBAAuB,SAAS,OAAO,KACvC,uBAAuB,SAAS,WAAW;",
+  "sourcesContent": ["export const NPMRC_LINES = ['.npmrc', '!.npmrc', '/.npmrc', '!/.npmrc'];\n\n// Preventing against _auth, _authToken, _password\n// https://docs.npmjs.com/cli/v10/configuring-npm/npmrc#auth-related-configuration\nexport const hasNpmrcSecret = (lineOrFullFileContents: string): boolean =>\n  lineOrFullFileContents.includes('_auth') ||\n  lineOrFullFileContents.includes('_password');\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAO,MAAM,cAAc,CAAC,UAAU,WAAW,WAAW,UAAU;AAI/D,MAAM,iBAAiB,CAAC,2BAC7B,uBAAuB,SAAS,OAAO,KACvC,uBAAuB,SAAS,WAAW;",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skuba",
-  "version": "11.0.0-feat-npmrc-to-workspace-20250511014436",
+  "version": "11.0.0-main-20250511022834",
   "private": false,
   "description": "SEEK development toolkit for backend applications and packages",
   "homepage": "https://github.com/seek-oss/skuba#readme",
@@ -98,7 +98,7 @@
     "tsx": "^4.16.2",
     "typescript": "~5.8.0",
     "zod": "^3.22.4",
-    "eslint-config-skuba": "6.0.0-feat-npmrc-to-workspace-20250511014436"
+    "eslint-config-skuba": "6.0.0-main-20250511022834"
   },
   "devDependencies": {
     "@changesets/cli": "2.29.3",

package/template/base/_.gitignore

@@ -1,6 +1,4 @@
 # managed by skuba
-.npmrc
-
 .idea/*
 .vscode/*
 !.vscode/extensions.json

package/template/base/_.npmrc

@@ -0,0 +1,9 @@
+# managed by skuba
+package-manager-strict-version=true
+public-hoist-pattern[]="@types*"
+public-hoist-pattern[]="*eslint*"
+public-hoist-pattern[]="*prettier*"
+public-hoist-pattern[]="esbuild"
+public-hoist-pattern[]="jest"
+public-hoist-pattern[]="tsconfig-seek"
+# end managed by skuba

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

@@ -6,9 +6,9 @@ configs:
     - &docker-ecr-cache
       seek-oss/docker-ecr-cache#v2.2.1: &docker-ecr-cache-defaults
         cache-on:
+          - .npmrc
           - package.json#.packageManager
           - pnpm-lock.yaml
-          - pnpm-workspace.yaml
         dockerfile: Dockerfile.dev-deps
         secrets:
           - id=npm,src=/var/lib/buildkite-agent/.npmrc

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

@@ -10,9 +10,9 @@ RUN --mount=type=bind,source=package.json,target=package.json \
 
 WORKDIR /workdir
 
-RUN --mount=type=bind,source=package.json,target=package.json \
+RUN --mount=type=bind,source=.npmrc,target=.npmrc \
+    --mount=type=bind,source=package.json,target=package.json \
     --mount=type=bind,source=pnpm-lock.yaml,target=pnpm-lock.yaml \
-    --mount=type=bind,source=pnpm-workspace.yaml,target=pnpm-workspace.yaml \
     --mount=type=secret,id=npm,dst=/root/.npmrc,required=true \
     --mount=type=secret,id=NPM_TOKEN,env=NPM_TOKEN,required=true \
     pnpm fetch

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

@@ -8,9 +8,9 @@ configs:
     - &docker-ecr-cache
       seek-oss/docker-ecr-cache#v2.2.1:
         cache-on:
+          - .npmrc
           - package.json#.packageManager
           - pnpm-lock.yaml
-          - pnpm-workspace.yaml
         secrets:
           - id=npm,src=/var/lib/buildkite-agent/.npmrc
           - NPM_TOKEN

package/template/greeter/Dockerfile

@@ -10,9 +10,9 @@ RUN --mount=type=bind,source=package.json,target=package.json \
 
 WORKDIR /workdir
 
-RUN --mount=type=bind,source=package.json,target=package.json \
+RUN --mount=type=bind,source=.npmrc,target=.npmrc \
+    --mount=type=bind,source=package.json,target=package.json \
     --mount=type=bind,source=pnpm-lock.yaml,target=pnpm-lock.yaml \
-    --mount=type=bind,source=pnpm-workspace.yaml,target=pnpm-workspace.yaml \
     --mount=type=secret,id=npm,dst=/root/.npmrc,required=true \
     --mount=type=secret,id=NPM_TOKEN,env=NPM_TOKEN,required=true \
     pnpm fetch

package/template/greeter/package.json

@@ -17,7 +17,7 @@
   },
   "devDependencies": {
     "@types/node": "^22.13.10",
-    "skuba": "11.0.0-feat-npmrc-to-workspace-20250511014436"
+    "skuba": "11.0.0-main-20250511022834"
   },
   "packageManager": "pnpm@10.10.0",
   "engines": {

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

@@ -6,9 +6,9 @@ configs:
     - &docker-ecr-cache
       seek-oss/docker-ecr-cache#v2.2.1: &docker-ecr-cache-defaults
         cache-on:
+          - .npmrc
           - package.json#.packageManager
           - pnpm-lock.yaml
-          - pnpm-workspace.yaml
         dockerfile: Dockerfile.dev-deps
         secrets:
           - id=npm,src=/var/lib/buildkite-agent/.npmrc

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

@@ -10,9 +10,9 @@ RUN --mount=type=bind,source=package.json,target=package.json \
 
 WORKDIR /workdir
 
-RUN --mount=type=bind,source=package.json,target=package.json \
+RUN --mount=type=bind,source=.npmrc,target=.npmrc \
+    --mount=type=bind,source=package.json,target=package.json \
     --mount=type=bind,source=pnpm-lock.yaml,target=pnpm-lock.yaml \
-    --mount=type=bind,source=pnpm-workspace.yaml,target=pnpm-workspace.yaml \
     --mount=type=secret,id=npm,dst=/root/.npmrc,required=true \
     --mount=type=secret,id=NPM_TOKEN,env=NPM_TOKEN,required=true \
     pnpm fetch

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

@@ -6,9 +6,9 @@ configs:
     - &docker-ecr-cache
       seek-oss/docker-ecr-cache#v2.2.1: &docker-ecr-cache-defaults
         cache-on:
+          - .npmrc
           - package.json#.packageManager
           - pnpm-lock.yaml
-          - pnpm-workspace.yaml
         secrets:
           - id=npm,src=/var/lib/buildkite-agent/.npmrc
           - NPM_TOKEN

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

@@ -13,9 +13,9 @@ RUN --mount=type=bind,source=package.json,target=package.json \
 
 WORKDIR /workdir
 
-RUN --mount=type=bind,source=package.json,target=package.json \
+RUN --mount=type=bind,source=.npmrc,target=.npmrc \
+    --mount=type=bind,source=package.json,target=package.json \
     --mount=type=bind,source=pnpm-lock.yaml,target=pnpm-lock.yaml \
-    --mount=type=bind,source=pnpm-workspace.yaml,target=pnpm-workspace.yaml \
     --mount=type=secret,id=npm,dst=/root/.npmrc,required=true \
     --mount=type=secret,id=NPM_TOKEN,env=NPM_TOKEN,required=true \
     pnpm fetch

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

@@ -37,7 +37,7 @@
     "constructs": "^10.0.17",
     "datadog-cdk-constructs-v2": "^2.0.0",
     "pino-pretty": "^13.0.0",
-    "skuba": "11.0.0-feat-npmrc-to-workspace-20250511014436"
+    "skuba": "11.0.0-main-20250511022834"
   },
   "packageManager": "pnpm@10.10.0",
   "engines": {

package/template/oss-npm-package/_package.json

@@ -38,7 +38,7 @@
     "commitizen": "^4.2.4",
     "skuba": "*"
   },
-  "packageManager": "pnpm@10.7.0",
+  "packageManager": "pnpm@8.9.0",
   "engines": {
     "node": ">=20.9.0"
   },

package/template/private-npm-package/_package.json

@@ -38,7 +38,7 @@
     "commitizen": "^4.2.4",
     "skuba": "*"
   },
-  "packageManager": "pnpm@10.7.0",
+  "packageManager": "pnpm@8.15.1",
   "engines": {
     "node": ">=22"
   }

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

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

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

@@ -1,167 +0,0 @@
-"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 migrateNpmrcToPnpmWorkspace_exports = {};
-__export(migrateNpmrcToPnpmWorkspace_exports, {
-  tryMigrateNpmrcToPnpmWorkspace: () => tryMigrateNpmrcToPnpmWorkspace
-});
-module.exports = __toCommonJS(migrateNpmrcToPnpmWorkspace_exports);
-var import_util = require("util");
-var import_fast_glob = require("fast-glob");
-var import_fs_extra = require("fs-extra");
-var import_dir = require("../../../../../../utils/dir");
-var import_logging = require("../../../../../../utils/logging");
-var import_npmrc = require("../../../../../../utils/npmrc");
-var import_configFile = require("../../../../../configure/processing/configFile");
-const NPMRC = ".npmrc";
-const checkFileExists = async (filePath) => {
-  try {
-    await import_fs_extra.promises.access(filePath);
-    return true;
-  } catch {
-    return false;
-  }
-};
-const migrateCustomNpmrcSettings = async () => {
-  const contents = await import_fs_extra.promises.readFile(NPMRC, "utf-8");
-  const remainderLines = (0, import_configFile.replaceManagedSection)(contents, "").split("\n").map((line) => line.trim()).filter((line) => line.length > 0).filter((line) => !line.startsWith("#")).filter((line) => !(0, import_npmrc.hasNpmrcSecret)(line));
-  if (remainderLines.length === 0) {
-    return;
-  }
-  const pnpmWorkspaceFile = "pnpm-workspace.yaml";
-  const pnpmWorkspaceExists = await checkFileExists(pnpmWorkspaceFile);
-  if (!pnpmWorkspaceExists) {
-    await import_fs_extra.promises.writeFile(pnpmWorkspaceFile, "");
-  }
-  const pnpmWorkspaceContents = await import_fs_extra.promises.readFile(pnpmWorkspaceFile, "utf-8");
-  const commentedLines = remainderLines.map((line) => `# ${line}`).join("\n");
-  const newContents = `# TODO: Translate these settings to the required format for pnpm-workspace.yaml.
-# skuba moved these from .npmrc, but doesn't know what they mean.
-# See: https://pnpm.io/settings
-#
-${commentedLines}
-
-${pnpmWorkspaceContents}`;
-  await import_fs_extra.promises.writeFile(pnpmWorkspaceFile, newContents);
-};
-const fixDockerfiles = async () => {
-  const fileNames = await (0, import_fast_glob.glob)(["**/Dockerfile*"]);
-  await Promise.all(
-    fileNames.map(async (fileName) => {
-      const contents = await import_fs_extra.promises.readFile(fileName, "utf8");
-      const patched = contents.replaceAll(
-        "--mount=type=bind,source=.npmrc,target=.npmrc",
-        "--mount=type=bind,source=pnpm-workspace.yaml,target=pnpm-workspace.yaml"
-      );
-      if (patched !== contents) {
-        await import_fs_extra.promises.writeFile(fileName, patched);
-      }
-    })
-  );
-};
-const fixBuildkitePipelines = async () => {
-  const fileNames = await (0, import_fast_glob.glob)(["**/.buildkite/**.{yml,yaml}"]);
-  await Promise.all(
-    fileNames.map(async (fileName) => {
-      const contents = await import_fs_extra.promises.readFile(fileName, "utf8");
-      const patched = contents.replace(
-        /(cache-on:[\s\S]*?)([ \t]+-[ \t]+\.npmrc)([\s\S]*?)(?=\n[ \t]*\S|$)/g,
-        (_, before, npmrcLine, after) => before + npmrcLine.replace(".npmrc", "pnpm-workspace.yaml") + after
-      );
-      if (patched !== contents) {
-        await import_fs_extra.promises.writeFile(fileName, patched);
-      }
-    })
-  );
-};
-const forceUpgradeToPnpm10 = async () => {
-  const fileNames = await (0, import_fast_glob.glob)(["**/package.json"]);
-  await Promise.all(
-    fileNames.map(async (fileName) => {
-      const contents = await import_fs_extra.promises.readFile(fileName, "utf8");
-      const packageManagerMatch = /"packageManager"\s*:\s*"pnpm@([^"]+)"/.exec(
-        contents
-      );
-      if (!packageManagerMatch) return;
-      const currentVersion = packageManagerMatch[1] ?? "";
-      const majorVersion = parseInt(currentVersion.split(".")?.[0] ?? "0", 10);
-      if (!isNaN(majorVersion) && majorVersion < 10) {
-        const patched = contents.replace(
-          /"packageManager"(\s*):(\s*)"pnpm@[^"]+"/,
-          '"packageManager"$1:$2"pnpm@10.8.1"'
-        );
-        await import_fs_extra.promises.writeFile(fileName, patched);
-      }
-    })
-  );
-};
-const migrateNpmrcToPnpmWorkspace = async ({
-  mode,
-  packageManager
-}) => {
-  if (packageManager.command !== "pnpm") {
-    return {
-      result: "skip",
-      reason: "not using pnpm"
-    };
-  }
-  const [workspaceRoot, currentWorkspaceProjectRoot] = await Promise.all([
-    (0, import_dir.findWorkspaceRoot)(),
-    (0, import_dir.findCurrentWorkspaceProjectRoot)()
-  ]);
-  if (workspaceRoot !== currentWorkspaceProjectRoot) {
-    return {
-      result: "skip",
-      reason: "not running in the workspace root"
-    };
-  }
-  const npmrcExists = await checkFileExists(NPMRC);
-  if (!npmrcExists) {
-    return {
-      result: "skip",
-      reason: "no .npmrc found"
-    };
-  }
-  if (mode === "lint") {
-    return {
-      result: "apply"
-    };
-  }
-  await Promise.all([
-    migrateCustomNpmrcSettings(),
-    fixDockerfiles(),
-    fixBuildkitePipelines(),
-    forceUpgradeToPnpm10()
-  ]);
-  await import_fs_extra.promises.rm(NPMRC);
-  return { result: "apply" };
-};
-const tryMigrateNpmrcToPnpmWorkspace = async (config) => {
-  try {
-    return await migrateNpmrcToPnpmWorkspace(config);
-  } catch (err) {
-    import_logging.log.warn("Failed to migrate .npmrc to pnpm-workspace.yaml");
-    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 = {
-  tryMigrateNpmrcToPnpmWorkspace
-});
-//# sourceMappingURL=migrateNpmrcToPnpmWorkspace.js.map

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

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../../../../../src/cli/lint/internalLints/upgrade/patches/10.1.0/migrateNpmrcToPnpmWorkspace.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 {\n  findCurrentWorkspaceProjectRoot,\n  findWorkspaceRoot,\n} from '../../../../../../utils/dir';\nimport { log } from '../../../../../../utils/logging';\nimport { hasNpmrcSecret } from '../../../../../../utils/npmrc';\nimport { replaceManagedSection } from '../../../../../configure/processing/configFile';\n\nconst NPMRC = '.npmrc';\n\nconst checkFileExists = async (filePath: string) => {\n  try {\n    await fs.access(filePath);\n    return true;\n  } catch {\n    return false;\n  }\n};\n\nconst migrateCustomNpmrcSettings = async () => {\n  const contents = await fs.readFile(NPMRC, 'utf-8');\n\n  const remainderLines = replaceManagedSection(contents, '')\n    .split('\\n')\n    .map((line) => line.trim())\n    .filter((line) => line.length > 0)\n    .filter((line) => !line.startsWith('#'))\n    .filter((line) => !hasNpmrcSecret(line));\n\n  if (remainderLines.length === 0) {\n    return;\n  }\n\n  const pnpmWorkspaceFile = 'pnpm-workspace.yaml';\n  const pnpmWorkspaceExists = await checkFileExists(pnpmWorkspaceFile);\n  if (!pnpmWorkspaceExists) {\n    await fs.writeFile(pnpmWorkspaceFile, '');\n  }\n\n  // prepend the lines to the pnpm-workspace.yaml file, but commented out\n  const pnpmWorkspaceContents = await fs.readFile(pnpmWorkspaceFile, 'utf-8');\n  const commentedLines = remainderLines.map((line) => `# ${line}`).join('\\n');\n  const newContents = `# TODO: Translate these settings to the required format for pnpm-workspace.yaml.\n# skuba moved these from .npmrc, but doesn't know what they mean.\n# See: https://pnpm.io/settings\n#\n${commentedLines}\n\n${pnpmWorkspaceContents}`;\n\n  await fs.writeFile(pnpmWorkspaceFile, newContents);\n};\n\nconst fixDockerfiles = async () => {\n  const fileNames = await glob(['**/Dockerfile*']);\n\n  await Promise.all(\n    fileNames.map(async (fileName) => {\n      const contents = await fs.readFile(fileName, 'utf8');\n      const patched = contents.replaceAll(\n        '--mount=type=bind,source=.npmrc,target=.npmrc',\n        '--mount=type=bind,source=pnpm-workspace.yaml,target=pnpm-workspace.yaml',\n      );\n\n      if (patched !== contents) {\n        await fs.writeFile(fileName, patched);\n      }\n    }),\n  );\n};\n\nconst fixBuildkitePipelines = async () => {\n  const fileNames = await glob(['**/.buildkite/**.{yml,yaml}']);\n\n  await Promise.all(\n    fileNames.map(async (fileName) => {\n      const contents = await fs.readFile(fileName, 'utf8');\n      const patched = contents.replace(\n        /(cache-on:[\\s\\S]*?)([ \\t]+-[ \\t]+\\.npmrc)([\\s\\S]*?)(?=\\n[ \\t]*\\S|$)/g,\n        (_, before: string, npmrcLine: string, after: string) =>\n          before + npmrcLine.replace('.npmrc', 'pnpm-workspace.yaml') + after,\n      );\n\n      if (patched !== contents) {\n        await fs.writeFile(fileName, patched);\n      }\n    }),\n  );\n};\n\nconst forceUpgradeToPnpm10 = async () => {\n  const fileNames = await glob(['**/package.json']);\n\n  await Promise.all(\n    fileNames.map(async (fileName) => {\n      const contents = await fs.readFile(fileName, 'utf8');\n\n      const packageManagerMatch = /\"packageManager\"\\s*:\\s*\"pnpm@([^\"]+)\"/.exec(\n        contents,\n      );\n\n      if (!packageManagerMatch) return;\n\n      const currentVersion = packageManagerMatch[1] ?? '';\n      const majorVersion = parseInt(currentVersion.split('.')?.[0] ?? '0', 10);\n\n      if (!isNaN(majorVersion) && majorVersion < 10) {\n        const patched = contents.replace(\n          /\"packageManager\"(\\s*):(\\s*)\"pnpm@[^\"]+\"/,\n          '\"packageManager\"$1:$2\"pnpm@10.8.1\"',\n        );\n\n        await fs.writeFile(fileName, patched);\n      }\n    }),\n  );\n};\n\nconst migrateNpmrcToPnpmWorkspace: PatchFunction = async ({\n  mode,\n  packageManager,\n}): Promise<PatchReturnType> => {\n  if (packageManager.command !== 'pnpm') {\n    return {\n      result: 'skip',\n      reason: 'not using pnpm',\n    };\n  }\n\n  const [workspaceRoot, currentWorkspaceProjectRoot] = await Promise.all([\n    findWorkspaceRoot(),\n    findCurrentWorkspaceProjectRoot(),\n  ]);\n\n  if (workspaceRoot !== currentWorkspaceProjectRoot) {\n    return {\n      result: 'skip',\n      reason: 'not running in the workspace root',\n    };\n  }\n\n  const npmrcExists = await checkFileExists(NPMRC);\n  if (!npmrcExists) {\n    return {\n      result: 'skip',\n      reason: 'no .npmrc found',\n    };\n  }\n\n  if (mode === 'lint') {\n    return {\n      result: 'apply',\n    };\n  }\n\n  await Promise.all([\n    migrateCustomNpmrcSettings(),\n    fixDockerfiles(),\n    fixBuildkitePipelines(),\n    forceUpgradeToPnpm10(),\n  ]);\n\n  await fs.rm(NPMRC);\n\n  return { result: 'apply' };\n};\n\nexport const tryMigrateNpmrcToPnpmWorkspace: PatchFunction = async (config) => {\n  try {\n    return await migrateNpmrcToPnpmWorkspace(config);\n  } catch (err) {\n    log.warn('Failed to migrate .npmrc to pnpm-workspace.yaml');\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/template/base/_pnpm-workspace.yaml

@@ -1,10 +0,0 @@
-# managed by skuba
-packageManagerStrictVersion: true
-publicHoistPattern:
-  - '@types*'
-  - '*eslint*'
-  - '*prettier*'
-  - esbuild
-  - jest
-  - tsconfig-seek
-  # end managed by skuba