skuba 11.0.0-main-20250511022834 → 11.0.1-fix-nested-repo-usage-20250522060154

package/README.md

@@ -2,7 +2,8 @@
 
 ---
 
-[![npm package](https://img.shields.io/npm/v/skuba)](https://www.npmjs.com/package/skuba)
+[![npm package](https://img.shields.io/npm/v/skuba?labelColor=cb0000&color=5b5b5b)](https://www.npmjs.com/package/skuba)
+[![Node.js version](https://img.shields.io/node/v/skuba?labelColor=5fa04e&color=5b5b5b)](https://www.npmjs.com/package/skuba)
 
 ---
 

package/jest/transform.js

@@ -38,7 +38,11 @@ const tsconfig = BROKEN_MODULE_RESOLUTIONS.has(
   ? { tsconfig: { moduleResolution: 'Node' } }
   : undefined;
 
-// Rewrite `ts-jest` transformations using our resolved `TS_JEST_PATH`.
+/**
+ * Rewrite `ts-jest` transformations using our resolved `TS_JEST_PATH`.
+ *
+ * @type {import ('@jest/types').Config.InitialOptions['transform']}
+ */
 module.exports.transform = Object.fromEntries(
   Object.entries(defaults.transform).map(([key, value]) => {
     if (typeof value === 'string') {

package/lib/api/github/push.js

@@ -93,10 +93,17 @@ const readFileChanges = async (dir, changedFiles) => {
     const pathDir = import_path.default.relative(gitRoot, dir);
     return import_path.default.join(pathDir, filePath);
   };
+  const toRootPath = (filePath) => {
+    if (!gitRoot) {
+      return filePath;
+    }
+    const pathDir = import_path.default.resolve(gitRoot, dir);
+    return import_path.default.join(pathDir, filePath);
+  };
   const additions = await Promise.all(
     added.map(async (filePath) => ({
       path: toGitHubPath(filePath),
-      contents: await import_fs_extra.default.promises.readFile(filePath, {
+      contents: await import_fs_extra.default.promises.readFile(toRootPath(filePath), {
         encoding: "base64"
       })
     }))

package/lib/api/github/push.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/api/github/push.ts"],
-  "sourcesContent": ["import path from 'path';\n\nimport type { CreateCommitOnBranchInput } from '@octokit/graphql-schema';\nimport fs from 'fs-extra';\n\nimport * as Git from '../git';\n\nimport { apiTokenFromEnvironment } from './environment';\nimport { graphql } from './octokit';\n\ninterface CreateCommitResult {\n  createCommitOnBranch: {\n    commit: {\n      oid: string;\n    };\n  };\n}\n\ninterface UploadAllFileChangesParams {\n  dir: string;\n  /**\n   * The branch name\n   */\n  branch: string;\n  /**\n   * The headline of the commit message\n   */\n  messageHeadline: string;\n\n  /**\n   * File changes to exclude from the upload.\n   *\n   * Defaults to `[]` (no exclusions).\n   */\n  ignore?: Git.ChangedFile[];\n  /**\n   * The body of the commit message\n   */\n  messageBody?: string;\n  /**\n   * Updates the local Git repository to match the new remote branch state\n   */\n  updateLocal?: boolean;\n}\n\n/**\n * Retrieves all file changes from the local Git repository using\n * `getChangedFiles`, then uploads the changes to a specified GitHub branch\n * using `uploadFileChanges`.\n *\n * Returns the commit ID, or `undefined` if there are no changes to commit.\n *\n * The file changes will appear as verified commits on GitHub.\n *\n * This will not update the local Git repository unless `updateLocal` is\n * specified.\n */\nexport const uploadAllFileChanges = async ({\n  branch,\n  dir,\n  messageHeadline,\n\n  ignore,\n  messageBody,\n  updateLocal = false,\n}: UploadAllFileChangesParams): Promise<string | undefined> => {\n  const changedFiles = await Git.getChangedFiles({ dir, ignore });\n\n  if (!changedFiles.length) {\n    return;\n  }\n\n  const fileChanges = await readFileChanges(dir, changedFiles);\n\n  const commitId = await uploadFileChanges({\n    dir,\n    branch,\n    messageHeadline,\n    messageBody,\n    fileChanges,\n  });\n\n  if (updateLocal) {\n    await Promise.all(\n      [...fileChanges.additions, ...fileChanges.deletions].map((file) =>\n        fs.rm(file.path),\n      ),\n    );\n\n    await Git.fastForwardBranch({\n      ref: branch,\n      auth: { type: 'gitHubApp' },\n      dir,\n    });\n  }\n\n  return commitId;\n};\n\ninterface FileAddition {\n  contents: unknown;\n  path: string;\n}\n\ninterface FileDeletion {\n  path: string;\n}\n\nexport interface FileChanges {\n  additions: FileAddition[];\n  deletions: FileDeletion[];\n}\n\n/**\n * Takes a list of `ChangedFiles`, reads them from the file system, and maps\n * them to GitHub GraphQL `FileChanges`.\n *\n * https://docs.github.com/en/graphql/reference/input-objects#filechanges\n */\nexport const readFileChanges = async (\n  dir: string,\n  changedFiles: Git.ChangedFile[],\n): Promise<FileChanges> => {\n  const { added, deleted } = changedFiles.reduce<{\n    added: string[];\n    deleted: string[];\n  }>(\n    (files, changedFile) => {\n      const filePath = changedFile.path;\n      if (changedFile.state === 'deleted') {\n        files.deleted.push(filePath);\n      } else {\n        files.added.push(filePath);\n      }\n\n      return files;\n    },\n    { added: [], deleted: [] },\n  );\n\n  const gitRoot = await Git.findRoot({ dir });\n\n  const toGitHubPath = (filePath: string) => {\n    if (!gitRoot) {\n      return filePath;\n    }\n\n    const pathDir = path.relative(gitRoot, dir);\n\n    return path.join(pathDir, filePath);\n  };\n\n  const additions: FileAddition[] = await Promise.all(\n    added.map(async (filePath) => ({\n      path: toGitHubPath(filePath),\n      contents: await fs.promises.readFile(filePath, {\n        encoding: 'base64',\n      }),\n    })),\n  );\n\n  const deletions: FileDeletion[] = deleted.map((filePath) => ({\n    path: toGitHubPath(filePath),\n  }));\n\n  return {\n    additions,\n    deletions,\n  };\n};\n\ninterface UploadFileChangesParams {\n  dir: string;\n  /**\n   * The branch name\n   */\n  branch: string;\n  /**\n   * The headline of the commit message\n   */\n  messageHeadline: string;\n  /**\n   * The body of the commit message\n   */\n  messageBody?: string;\n  /**\n   * File additions and deletions\n   */\n  fileChanges: FileChanges;\n}\n\n/**\n * Uploads file changes from the local workspace to a specified GitHub branch.\n *\n * The file changes will appear as verified commits on GitHub.\n *\n * This will not update the local Git repository.\n */\nexport const uploadFileChanges = async ({\n  dir,\n  branch,\n  messageHeadline,\n  messageBody,\n  fileChanges,\n}: UploadFileChangesParams): Promise<string> => {\n  const authToken = apiTokenFromEnvironment();\n  if (!authToken) {\n    throw new Error(\n      'Could not read a GitHub API token from the environment. Please set GITHUB_API_TOKEN or GITHUB_TOKEN.',\n    );\n  }\n\n  const [{ owner, repo }, headCommitId] = await Promise.all([\n    Git.getOwnerAndRepo({ dir }),\n    Git.getHeadCommitId({ dir }),\n  ]);\n\n  const input: CreateCommitOnBranchInput = {\n    branch: {\n      repositoryNameWithOwner: `${owner}/${repo}`,\n      branchName: branch,\n    },\n    message: {\n      headline: messageHeadline,\n      body: messageBody,\n    },\n    expectedHeadOid: headCommitId,\n    clientMutationId: 'skuba',\n    fileChanges,\n  };\n\n  const result = await graphql<CreateCommitResult>(\n    `\n      mutation Mutation($input: CreateCommitOnBranchInput!) {\n        createCommitOnBranch(input: $input) {\n          commit {\n            oid\n          }\n        }\n      }\n    `,\n    {\n      input,\n      headers: {\n        authorization: `Bearer ${authToken}`,\n      },\n    },\n  );\n\n  return result.createCommitOnBranch.commit.oid;\n};\n"],
-  "mappings": "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",
+  "sourcesContent": ["import path from 'path';\n\nimport type { CreateCommitOnBranchInput } from '@octokit/graphql-schema';\nimport fs from 'fs-extra';\n\nimport * as Git from '../git';\n\nimport { apiTokenFromEnvironment } from './environment';\nimport { graphql } from './octokit';\n\ninterface CreateCommitResult {\n  createCommitOnBranch: {\n    commit: {\n      oid: string;\n    };\n  };\n}\n\ninterface UploadAllFileChangesParams {\n  dir: string;\n  /**\n   * The branch name\n   */\n  branch: string;\n  /**\n   * The headline of the commit message\n   */\n  messageHeadline: string;\n\n  /**\n   * File changes to exclude from the upload.\n   *\n   * Defaults to `[]` (no exclusions).\n   */\n  ignore?: Git.ChangedFile[];\n  /**\n   * The body of the commit message\n   */\n  messageBody?: string;\n  /**\n   * Updates the local Git repository to match the new remote branch state\n   */\n  updateLocal?: boolean;\n}\n\n/**\n * Retrieves all file changes from the local Git repository using\n * `getChangedFiles`, then uploads the changes to a specified GitHub branch\n * using `uploadFileChanges`.\n *\n * Returns the commit ID, or `undefined` if there are no changes to commit.\n *\n * The file changes will appear as verified commits on GitHub.\n *\n * This will not update the local Git repository unless `updateLocal` is\n * specified.\n */\nexport const uploadAllFileChanges = async ({\n  branch,\n  dir,\n  messageHeadline,\n\n  ignore,\n  messageBody,\n  updateLocal = false,\n}: UploadAllFileChangesParams): Promise<string | undefined> => {\n  const changedFiles = await Git.getChangedFiles({ dir, ignore });\n\n  if (!changedFiles.length) {\n    return;\n  }\n\n  const fileChanges = await readFileChanges(dir, changedFiles);\n\n  const commitId = await uploadFileChanges({\n    dir,\n    branch,\n    messageHeadline,\n    messageBody,\n    fileChanges,\n  });\n\n  if (updateLocal) {\n    await Promise.all(\n      [...fileChanges.additions, ...fileChanges.deletions].map((file) =>\n        fs.rm(file.path),\n      ),\n    );\n\n    await Git.fastForwardBranch({\n      ref: branch,\n      auth: { type: 'gitHubApp' },\n      dir,\n    });\n  }\n\n  return commitId;\n};\n\ninterface FileAddition {\n  contents: unknown;\n  path: string;\n}\n\ninterface FileDeletion {\n  path: string;\n}\n\nexport interface FileChanges {\n  additions: FileAddition[];\n  deletions: FileDeletion[];\n}\n\n/**\n * Takes a list of `ChangedFiles`, reads them from the file system, and maps\n * them to GitHub GraphQL `FileChanges`.\n *\n * https://docs.github.com/en/graphql/reference/input-objects#filechanges\n */\nexport const readFileChanges = async (\n  dir: string,\n  changedFiles: Git.ChangedFile[],\n): Promise<FileChanges> => {\n  const { added, deleted } = changedFiles.reduce<{\n    added: string[];\n    deleted: string[];\n  }>(\n    (files, changedFile) => {\n      const filePath = changedFile.path;\n      if (changedFile.state === 'deleted') {\n        files.deleted.push(filePath);\n      } else {\n        files.added.push(filePath);\n      }\n\n      return files;\n    },\n    { added: [], deleted: [] },\n  );\n\n  const gitRoot = await Git.findRoot({ dir });\n\n  const toGitHubPath = (filePath: string) => {\n    if (!gitRoot) {\n      return filePath;\n    }\n\n    const pathDir = path.relative(gitRoot, dir);\n\n    return path.join(pathDir, filePath);\n  };\n\n  const toRootPath = (filePath: string) => {\n    if (!gitRoot) {\n      return filePath;\n    }\n\n    const pathDir = path.resolve(gitRoot, dir);\n\n    return path.join(pathDir, filePath);\n  };\n\n  const additions: FileAddition[] = await Promise.all(\n    added.map(async (filePath) => ({\n      path: toGitHubPath(filePath),\n      contents: await fs.promises.readFile(toRootPath(filePath), {\n        encoding: 'base64',\n      }),\n    })),\n  );\n\n  const deletions: FileDeletion[] = deleted.map((filePath) => ({\n    path: toGitHubPath(filePath),\n  }));\n\n  return {\n    additions,\n    deletions,\n  };\n};\n\ninterface UploadFileChangesParams {\n  dir: string;\n  /**\n   * The branch name\n   */\n  branch: string;\n  /**\n   * The headline of the commit message\n   */\n  messageHeadline: string;\n  /**\n   * The body of the commit message\n   */\n  messageBody?: string;\n  /**\n   * File additions and deletions\n   */\n  fileChanges: FileChanges;\n}\n\n/**\n * Uploads file changes from the local workspace to a specified GitHub branch.\n *\n * The file changes will appear as verified commits on GitHub.\n *\n * This will not update the local Git repository.\n */\nexport const uploadFileChanges = async ({\n  dir,\n  branch,\n  messageHeadline,\n  messageBody,\n  fileChanges,\n}: UploadFileChangesParams): Promise<string> => {\n  const authToken = apiTokenFromEnvironment();\n  if (!authToken) {\n    throw new Error(\n      'Could not read a GitHub API token from the environment. Please set GITHUB_API_TOKEN or GITHUB_TOKEN.',\n    );\n  }\n\n  const [{ owner, repo }, headCommitId] = await Promise.all([\n    Git.getOwnerAndRepo({ dir }),\n    Git.getHeadCommitId({ dir }),\n  ]);\n\n  const input: CreateCommitOnBranchInput = {\n    branch: {\n      repositoryNameWithOwner: `${owner}/${repo}`,\n      branchName: branch,\n    },\n    message: {\n      headline: messageHeadline,\n      body: messageBody,\n    },\n    expectedHeadOid: headCommitId,\n    clientMutationId: 'skuba',\n    fileChanges,\n  };\n\n  const result = await graphql<CreateCommitResult>(\n    `\n      mutation Mutation($input: CreateCommitOnBranchInput!) {\n        createCommitOnBranch(input: $input) {\n          commit {\n            oid\n          }\n        }\n      }\n    `,\n    {\n      input,\n      headers: {\n        authorization: `Bearer ${authToken}`,\n      },\n    },\n  );\n\n  return result.createCommitOnBranch.commit.oid;\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AAGjB,sBAAe;AAEf,UAAqB;AAErB,yBAAwC;AACxC,qBAAwB;AAiDjB,MAAM,uBAAuB,OAAO;AAAA,EACzC;AAAA,EACA;AAAA,EACA;AAAA,EAEA;AAAA,EACA;AAAA,EACA,cAAc;AAChB,MAA+D;AAC7D,QAAM,eAAe,MAAM,IAAI,gBAAgB,EAAE,KAAK,OAAO,CAAC;AAE9D,MAAI,CAAC,aAAa,QAAQ;AACxB;AAAA,EACF;AAEA,QAAM,cAAc,MAAM,gBAAgB,KAAK,YAAY;AAE3D,QAAM,WAAW,MAAM,kBAAkB;AAAA,IACvC;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF,CAAC;AAED,MAAI,aAAa;AACf,UAAM,QAAQ;AAAA,MACZ,CAAC,GAAG,YAAY,WAAW,GAAG,YAAY,SAAS,EAAE;AAAA,QAAI,CAAC,SACxD,gBAAAA,QAAG,GAAG,KAAK,IAAI;AAAA,MACjB;AAAA,IACF;AAEA,UAAM,IAAI,kBAAkB;AAAA,MAC1B,KAAK;AAAA,MACL,MAAM,EAAE,MAAM,YAAY;AAAA,MAC1B;AAAA,IACF,CAAC;AAAA,EACH;AAEA,SAAO;AACT;AAsBO,MAAM,kBAAkB,OAC7B,KACA,iBACyB;AACzB,QAAM,EAAE,OAAO,QAAQ,IAAI,aAAa;AAAA,IAItC,CAAC,OAAO,gBAAgB;AACtB,YAAM,WAAW,YAAY;AAC7B,UAAI,YAAY,UAAU,WAAW;AACnC,cAAM,QAAQ,KAAK,QAAQ;AAAA,MAC7B,OAAO;AACL,cAAM,MAAM,KAAK,QAAQ;AAAA,MAC3B;AAEA,aAAO;AAAA,IACT;AAAA,IACA,EAAE,OAAO,CAAC,GAAG,SAAS,CAAC,EAAE;AAAA,EAC3B;AAEA,QAAM,UAAU,MAAM,IAAI,SAAS,EAAE,IAAI,CAAC;AAE1C,QAAM,eAAe,CAAC,aAAqB;AACzC,QAAI,CAAC,SAAS;AACZ,aAAO;AAAA,IACT;AAEA,UAAM,UAAU,YAAAC,QAAK,SAAS,SAAS,GAAG;AAE1C,WAAO,YAAAA,QAAK,KAAK,SAAS,QAAQ;AAAA,EACpC;AAEA,QAAM,aAAa,CAAC,aAAqB;AACvC,QAAI,CAAC,SAAS;AACZ,aAAO;AAAA,IACT;AAEA,UAAM,UAAU,YAAAA,QAAK,QAAQ,SAAS,GAAG;AAEzC,WAAO,YAAAA,QAAK,KAAK,SAAS,QAAQ;AAAA,EACpC;AAEA,QAAM,YAA4B,MAAM,QAAQ;AAAA,IAC9C,MAAM,IAAI,OAAO,cAAc;AAAA,MAC7B,MAAM,aAAa,QAAQ;AAAA,MAC3B,UAAU,MAAM,gBAAAD,QAAG,SAAS,SAAS,WAAW,QAAQ,GAAG;AAAA,QACzD,UAAU;AAAA,MACZ,CAAC;AAAA,IACH,EAAE;AAAA,EACJ;AAEA,QAAM,YAA4B,QAAQ,IAAI,CAAC,cAAc;AAAA,IAC3D,MAAM,aAAa,QAAQ;AAAA,EAC7B,EAAE;AAEF,SAAO;AAAA,IACL;AAAA,IACA;AAAA,EACF;AACF;AA6BO,MAAM,oBAAoB,OAAO;AAAA,EACtC;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,MAAgD;AAC9C,QAAM,gBAAY,4CAAwB;AAC1C,MAAI,CAAC,WAAW;AACd,UAAM,IAAI;AAAA,MACR;AAAA,IACF;AAAA,EACF;AAEA,QAAM,CAAC,EAAE,OAAO,KAAK,GAAG,YAAY,IAAI,MAAM,QAAQ,IAAI;AAAA,IACxD,IAAI,gBAAgB,EAAE,IAAI,CAAC;AAAA,IAC3B,IAAI,gBAAgB,EAAE,IAAI,CAAC;AAAA,EAC7B,CAAC;AAED,QAAM,QAAmC;AAAA,IACvC,QAAQ;AAAA,MACN,yBAAyB,GAAG,KAAK,IAAI,IAAI;AAAA,MACzC,YAAY;AAAA,IACd;AAAA,IACA,SAAS;AAAA,MACP,UAAU;AAAA,MACV,MAAM;AAAA,IACR;AAAA,IACA,iBAAiB;AAAA,IACjB,kBAAkB;AAAA,IAClB;AAAA,EACF;AAEA,QAAM,SAAS,UAAM;AAAA,IACnB;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,IASA;AAAA,MACE;AAAA,MACA,SAAS;AAAA,QACP,eAAe,UAAU,SAAS;AAAA,MACpC;AAAA,IACF;AAAA,EACF;AAEA,SAAO,OAAO,qBAAqB,OAAO;AAC5C;",
   "names": ["fs", "path"]
 }

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 generateNpmrcSimpleVariants: (patterns: string[]) => Set<string>;
-export declare const mergeWithConfigFile: (rawTemplateFile: string, fileType?: "ignore" | "npmrc") => (rawInputFile?: string) => string;
+export declare const replaceManagedSection: (input: string, template: string) => string;
+export declare const mergeWithConfigFile: (rawTemplateFile: string, fileType?: "ignore" | "pnpm-workspace") => (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,
-  generateNpmrcSimpleVariants: () => generateNpmrcSimpleVariants,
-  mergeWithConfigFile: () => mergeWithConfigFile
+  mergeWithConfigFile: () => mergeWithConfigFile,
+  replaceManagedSection: () => replaceManagedSection
 });
 module.exports = __toCommonJS(configFile_exports);
 const OUTDATED_PATTERNS = ["node_modules_bak/", "tmp-*/"];
@@ -46,24 +46,18 @@ const generateIgnoreFileSimpleVariants = (patterns) => {
   set.delete("");
   return set;
 };
-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 replaceManagedSection = (input, template) => input.replace(/# managed by skuba[\s\S]*# end managed by skuba/, template);
 const mergeWithConfigFile = (rawTemplateFile, fileType = "ignore") => {
   const templateFile = rawTemplateFile.trim();
-  const generator = fileType === "ignore" ? generateIgnoreFileSimpleVariants : generateNpmrcSimpleVariants;
+  let generator;
+  switch (fileType) {
+    case "ignore":
+      generator = generateIgnoreFileSimpleVariants;
+      break;
+    case "pnpm-workspace":
+      generator = () => /* @__PURE__ */ new Set();
+      break;
+  }
   const templatePatterns = generator([
     ...OUTDATED_PATTERNS,
     ...templateFile.split("\n").map((line) => line.trim())
@@ -73,7 +67,10 @@ const mergeWithConfigFile = (rawTemplateFile, fileType = "ignore") => {
       return `${templateFile}
 `;
     }
-    const replacedFile = rawInputFile.replace(/\r?\n/g, "\n").replace(/# managed by skuba[\s\S]*# end managed by skuba/, templateFile);
+    const replacedFile = replaceManagedSection(
+      rawInputFile.replace(/\r?\n/g, "\n"),
+      templateFile
+    );
     if (replacedFile.includes(templateFile)) {
       return replacedFile;
     }
@@ -86,7 +83,7 @@ const mergeWithConfigFile = (rawTemplateFile, fileType = "ignore") => {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   generateIgnoreFileSimpleVariants,
-  generateNpmrcSimpleVariants,
-  mergeWithConfigFile
+  mergeWithConfigFile,
+  replaceManagedSection
 });
 //# 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 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;",
+  "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;",
   "names": []
 }

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

@@ -54,7 +54,7 @@ export declare const initConfigInputSchema: z.ZodObject<{
     };
 }>;
 export type InitConfig = z.infer<typeof initConfigSchema>;
-declare const initConfigSchema: z.ZodObject<z.objectUtil.extendShape<Omit<{
+declare const initConfigSchema: z.ZodObject<Omit<{
     destinationDir: z.ZodString;
     templateComplete: z.ZodBoolean;
     templateData: z.ZodObject<{
@@ -74,7 +74,7 @@ declare const initConfigSchema: z.ZodObject<z.objectUtil.extendShape<Omit<{
         defaultBranch: z.ZodString;
     }, z.ZodString, "strip">>;
     templateName: z.ZodString;
-}, "templateData">, {
+}, "templateData"> & {
     templateData: z.ZodObject<{
         ownerName: z.ZodString;
         repoName: z.ZodString;
@@ -100,7 +100,7 @@ declare const initConfigSchema: z.ZodObject<z.objectUtil.extendShape<Omit<{
     entryPoint: z.ZodOptional<z.ZodString>;
     packageManager: z.ZodDefault<z.ZodEnum<["pnpm", "yarn"]>>;
     type: z.ZodOptional<z.ZodUnion<[z.ZodLiteral<"application">, z.ZodLiteral<"package">]>>;
-}>, "strip", z.ZodTypeAny, {
+}, "strip", z.ZodTypeAny, {
     packageManager: "yarn" | "pnpm";
     templateName: string;
     destinationDir: string;

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

@@ -1,11 +1,15 @@
 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' | 'npmrc';
+    type: 'ignore' | 'pnpm-workspace';
     additionalMapping?: (s: string, packageManager: PackageManagerConfig) => string;
-    if?: (packageManager: PackageManagerConfig) => boolean;
+    if?: (options: ConditionOptions) => 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,43 +37,44 @@ var import_path = __toESM(require("path"));
 var import_util = require("util");
 var import_fs_extra = require("fs-extra");
 var import__ = require("../../..");
-var import_npmrc = require("../../../utils/npmrc");
+var import_dir = require("../../../utils/dir");
 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 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 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 REFRESHABLE_CONFIG_FILES = [
   {
     name: ".gitignore",
     type: "ignore",
-    additionalMapping: removeRedundantNpmrc
+    additionalMapping: removeOldWarning
   },
   { name: ".prettierignore", type: "ignore" },
   {
-    name: ".npmrc",
-    type: "npmrc",
-    additionalMapping: ensureNoAuthToken,
-    if: (packageManager) => packageManager.command === "pnpm"
+    name: "pnpm-workspace.yaml",
+    type: "pnpm-workspace",
+    if: ({ packageManager, isInWorkspaceRoot }) => isInWorkspaceRoot && packageManager.command === "pnpm"
   },
   {
     name: ".dockerignore",
     type: "ignore",
-    additionalMapping: removeRedundantNpmrc
+    additionalMapping: removeOldWarning
   }
 ];
 const refreshConfigFiles = async (mode, logger) => {
-  const [manifest, gitRoot] = await Promise.all([
+  const [manifest, gitRoot, workspaceRoot, currentWorkspaceProjectRoot] = await Promise.all([
     (0, import_package.getDestinationManifest)(),
-    import__.Git.findRoot({ dir: process.cwd() })
+    import__.Git.findRoot({ dir: process.cwd() }),
+    (0, import_dir.findWorkspaceRoot)(),
+    (0, import_dir.findCurrentWorkspaceProjectRoot)()
   ]);
   const destinationRoot = import_path.default.dirname(manifest.path);
   const readDestinationFile = (0, import_project.createDestinationFileReader)(destinationRoot);
@@ -82,8 +83,8 @@ const refreshConfigFiles = async (mode, logger) => {
     type: fileType,
     additionalMapping = (s) => s,
     if: condition = () => true
-  }, packageManager2) => {
-    if (!condition(packageManager2)) {
+  }, conditionOptions) => {
+    if (!condition(conditionOptions)) {
       return { needsChange: false };
     }
     const [inputFile, templateFile, isGitIgnored] = await Promise.all([
@@ -99,7 +100,7 @@ const refreshConfigFiles = async (mode, logger) => {
     }
     const data = additionalMapping(
       inputFile ? (0, import_configFile.mergeWithConfigFile)(templateFile, fileType)(inputFile) : templateFile,
-      packageManager2
+      packageManager
     );
     const filepath = import_path.default.join(destinationRoot, filename);
     if (mode === "format") {
@@ -119,7 +120,7 @@ const refreshConfigFiles = async (mode, logger) => {
         msg: `The ${logger.bold(
           filename
         )} file is out of date. Run \`${logger.bold(
-          packageManager2.print.exec,
+          packageManager.print.exec,
           "skuba",
           "format"
         )}\` to update it.`,
@@ -131,7 +132,10 @@ 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)
+      (conf) => refreshConfigFile(conf, {
+        packageManager,
+        isInWorkspaceRoot: workspaceRoot === currentWorkspaceProjectRoot
+      })
     )
   );
   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 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"]
+  "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"]
 }

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

@@ -21,11 +21,16 @@ __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 { 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;",
+  "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;",
   "names": []
 }

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

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

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

@@ -0,0 +1,167 @@
+"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