npm - skuba - Versions diffs - 7.4.0-horrible-hacks-20240206024353 → 7.4.0-master-20240206223029 - Mend

skuba 7.4.0-horrible-hacks-20240206024353 → 7.4.0-master-20240206223029

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (43) hide show

package/lib/cli/configure/modules/eslint.js CHANGED Viewed

@@ -22,8 +22,8 @@ __export(eslint_exports, {
 });
 module.exports = __toCommonJS(eslint_exports);
 var import_template = require("../../../utils/template");
+var import_configFile = require("../processing/configFile");
 var import_deleteFiles = require("../processing/deleteFiles");
-var import_ignoreFile = require("../processing/ignoreFile");
 var import_package = require("../processing/package");
 var import_prettier = require("../processing/prettier");
 const eslintModule = async () => {
@@ -50,7 +50,7 @@ const eslintModule = async () => {
       }
       return configFile;
     },
-    ".eslintignore": (0, import_ignoreFile.mergeWithIgnoreFile)(ignoreFile),
+    ".eslintignore": (0, import_configFile.mergeWithConfigFile)(ignoreFile),
     "package.json": (0, import_package.withPackage)(({ eslintConfig, ...data }) => data)
   };
 };

package/lib/cli/configure/modules/eslint.js.map CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/cli/configure/modules/eslint.ts"],
-  "sourcesContent": ["import { readBaseTemplateFile } from '../../../utils/template';\nimport { deleteFiles } from '../processing/deleteFiles';\nimport { mergeWithIgnoreFile } from '../processing/ignoreFile';\nimport { withPackage } from '../processing/package';\nimport { formatPrettier } from '../processing/prettier';\nimport type { Module } from '../types';\n\nexport const eslintModule = async (): Promise<Module> => {\n  const [configFile, ignoreFile] = await Promise.all([\n    readBaseTemplateFile('_.eslintrc.js'),\n    readBaseTemplateFile('_.eslintignore'),\n  ]);\n\n  return {\n    ...deleteFiles(\n      '.eslintrc.cjs',\n      '.eslintrc.yaml',\n      '.eslintrc.yml',\n      '.eslintrc.json',\n      '.eslintrc',\n    ),\n\n    // allow customised ESLint configs that extend skuba\n    '.eslintrc.js': (inputFile) => {\n      if (inputFile?.includes('skuba')) {\n        const processedFile = inputFile.replace(\n          /require.resolve\\(['\"](@seek\\/)?skuba\\/config\\/eslint['\"]\\)/,\n          \"'skuba'\",\n        );\n\n        return formatPrettier(processedFile, { parser: 'typescript' });\n      }\n\n      return configFile;\n    },\n\n    '.eslintignore': mergeWithIgnoreFile(ignoreFile),\n\n    'package.json': withPackage(({ eslintConfig, ...data }) => data),\n  };\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,sBAAqC;AACrC,yBAA4B;AAC5B,wBAAoC;AACpC,qBAA4B;AAC5B,sBAA+B;AAGxB,MAAM,eAAe,YAA6B;AACvD,QAAM,CAAC,YAAY,UAAU,IAAI,MAAM,QAAQ,IAAI;AAAA,QACjD,sCAAqB,eAAe;AAAA,QACpC,sCAAqB,gBAAgB;AAAA,EACvC,CAAC;AAED,SAAO;AAAA,IACL,OAAG;AAAA,MACD;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IACF;AAAA;AAAA,IAGA,gBAAgB,CAAC,cAAc;AAC7B,UAAI,WAAW,SAAS,OAAO,GAAG;AAChC,cAAM,gBAAgB,UAAU;AAAA,UAC9B;AAAA,UACA;AAAA,QACF;AAEA,mBAAO,gCAAe,eAAe,EAAE,QAAQ,aAAa,CAAC;AAAA,MAC/D;AAEA,aAAO;AAAA,IACT;AAAA,IAEA,qBAAiB,uCAAoB,UAAU;AAAA,IAE/C,oBAAgB,4BAAY,CAAC,EAAE,cAAc,GAAG,KAAK,MAAM,IAAI;AAAA,EACjE;AACF;",
+  "sourcesContent": ["import { readBaseTemplateFile } from '../../../utils/template';\nimport { mergeWithConfigFile } from '../processing/configFile';\nimport { deleteFiles } from '../processing/deleteFiles';\nimport { withPackage } from '../processing/package';\nimport { formatPrettier } from '../processing/prettier';\nimport type { Module } from '../types';\n\nexport const eslintModule = async (): Promise<Module> => {\n  const [configFile, ignoreFile] = await Promise.all([\n    readBaseTemplateFile('_.eslintrc.js'),\n    readBaseTemplateFile('_.eslintignore'),\n  ]);\n\n  return {\n    ...deleteFiles(\n      '.eslintrc.cjs',\n      '.eslintrc.yaml',\n      '.eslintrc.yml',\n      '.eslintrc.json',\n      '.eslintrc',\n    ),\n\n    // allow customised ESLint configs that extend skuba\n    '.eslintrc.js': (inputFile) => {\n      if (inputFile?.includes('skuba')) {\n        const processedFile = inputFile.replace(\n          /require.resolve\\(['\"](@seek\\/)?skuba\\/config\\/eslint['\"]\\)/,\n          \"'skuba'\",\n        );\n\n        return formatPrettier(processedFile, { parser: 'typescript' });\n      }\n\n      return configFile;\n    },\n\n    '.eslintignore': mergeWithConfigFile(ignoreFile),\n\n    'package.json': withPackage(({ eslintConfig, ...data }) => data),\n  };\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,sBAAqC;AACrC,wBAAoC;AACpC,yBAA4B;AAC5B,qBAA4B;AAC5B,sBAA+B;AAGxB,MAAM,eAAe,YAA6B;AACvD,QAAM,CAAC,YAAY,UAAU,IAAI,MAAM,QAAQ,IAAI;AAAA,QACjD,sCAAqB,eAAe;AAAA,QACpC,sCAAqB,gBAAgB;AAAA,EACvC,CAAC;AAED,SAAO;AAAA,IACL,OAAG;AAAA,MACD;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IACF;AAAA;AAAA,IAGA,gBAAgB,CAAC,cAAc;AAC7B,UAAI,WAAW,SAAS,OAAO,GAAG;AAChC,cAAM,gBAAgB,UAAU;AAAA,UAC9B;AAAA,UACA;AAAA,QACF;AAEA,mBAAO,gCAAe,eAAe,EAAE,QAAQ,aAAa,CAAC;AAAA,MAC/D;AAEA,aAAO;AAAA,IACT;AAAA,IAEA,qBAAiB,uCAAoB,UAAU;AAAA,IAE/C,oBAAgB,4BAAY,CAAC,EAAE,cAAc,GAAG,KAAK,MAAM,IAAI;AAAA,EACjE;AACF;",
   "names": []
 }

package/lib/cli/configure/modules/ignore.js CHANGED Viewed

@@ -22,15 +22,15 @@ __export(ignore_exports, {
 });
 module.exports = __toCommonJS(ignore_exports);
 var import_template = require("../../../utils/template");
-var import_ignoreFile = require("../processing/ignoreFile");
+var import_configFile = require("../processing/configFile");
 const ignoreModule = async () => {
   const [dockerFile, gitFile] = await Promise.all([
     (0, import_template.readBaseTemplateFile)("_.dockerignore"),
     (0, import_template.readBaseTemplateFile)("_.gitignore")
   ]);
   return {
-    ".dockerignore": (0, import_ignoreFile.mergeWithIgnoreFile)(dockerFile),
-    ".gitignore": (0, import_ignoreFile.mergeWithIgnoreFile)(gitFile)
+    ".dockerignore": (0, import_configFile.mergeWithConfigFile)(dockerFile),
+    ".gitignore": (0, import_configFile.mergeWithConfigFile)(gitFile)
   };
 };
 // Annotate the CommonJS export names for ESM import in node:

package/lib/cli/configure/modules/ignore.js.map CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/cli/configure/modules/ignore.ts"],
-  "sourcesContent": ["import { readBaseTemplateFile } from '../../../utils/template';\nimport { mergeWithIgnoreFile } from '../processing/ignoreFile';\nimport type { Module } from '../types';\n\nexport const ignoreModule = async (): Promise<Module> => {\n  const [dockerFile, gitFile] = await Promise.all([\n    readBaseTemplateFile('_.dockerignore'),\n    readBaseTemplateFile('_.gitignore'),\n  ]);\n\n  return {\n    '.dockerignore': mergeWithIgnoreFile(dockerFile),\n\n    '.gitignore': mergeWithIgnoreFile(gitFile),\n  };\n};\n"],
+  "sourcesContent": ["import { readBaseTemplateFile } from '../../../utils/template';\nimport { mergeWithConfigFile } from '../processing/configFile';\nimport type { Module } from '../types';\n\nexport const ignoreModule = async (): Promise<Module> => {\n  const [dockerFile, gitFile] = await Promise.all([\n    readBaseTemplateFile('_.dockerignore'),\n    readBaseTemplateFile('_.gitignore'),\n  ]);\n\n  return {\n    '.dockerignore': mergeWithConfigFile(dockerFile),\n\n    '.gitignore': mergeWithConfigFile(gitFile),\n  };\n};\n"],
   "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,sBAAqC;AACrC,wBAAoC;AAG7B,MAAM,eAAe,YAA6B;AACvD,QAAM,CAAC,YAAY,OAAO,IAAI,MAAM,QAAQ,IAAI;AAAA,QAC9C,sCAAqB,gBAAgB;AAAA,QACrC,sCAAqB,aAAa;AAAA,EACpC,CAAC;AAED,SAAO;AAAA,IACL,qBAAiB,uCAAoB,UAAU;AAAA,IAE/C,kBAAc,uCAAoB,OAAO;AAAA,EAC3C;AACF;",
   "names": []
 }

package/lib/cli/configure/modules/prettier.js CHANGED Viewed

@@ -22,8 +22,8 @@ __export(prettier_exports, {
 });
 module.exports = __toCommonJS(prettier_exports);
 var import_template = require("../../../utils/template");
+var import_configFile = require("../processing/configFile");
 var import_deleteFiles = require("../processing/deleteFiles");
-var import_ignoreFile = require("../processing/ignoreFile");
 var import_package = require("../processing/package");
 const prettierModule = async () => {
   const [configFile, ignoreFile] = await Promise.all([
@@ -39,7 +39,7 @@ const prettierModule = async () => {
       ".prettierrc.yml",
       "prettier.config.js"
     ),
-    ".prettierignore": (0, import_ignoreFile.mergeWithIgnoreFile)(ignoreFile),
+    ".prettierignore": (0, import_configFile.mergeWithConfigFile)(ignoreFile),
     // enforce skuba opinions as there's no value in customising Prettier configs
     ".prettierrc.js": () => configFile,
     "package.json": (0, import_package.withPackage)(({ prettier, ...data }) => data)

package/lib/cli/configure/modules/prettier.js.map CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/cli/configure/modules/prettier.ts"],
-  "sourcesContent": ["import { readBaseTemplateFile } from '../../../utils/template';\nimport { deleteFiles } from '../processing/deleteFiles';\nimport { mergeWithIgnoreFile } from '../processing/ignoreFile';\nimport { withPackage } from '../processing/package';\nimport type { Module } from '../types';\n\nexport const prettierModule = async (): Promise<Module> => {\n  const [configFile, ignoreFile] = await Promise.all([\n    readBaseTemplateFile('_.prettierrc.js'),\n    readBaseTemplateFile('_.prettierignore'),\n  ]);\n\n  return {\n    ...deleteFiles(\n      '.prettierrc',\n      '.prettierrc.json',\n      '.prettierrc.toml',\n      '.prettierrc.yaml',\n      '.prettierrc.yml',\n      'prettier.config.js',\n    ),\n\n    '.prettierignore': mergeWithIgnoreFile(ignoreFile),\n\n    // enforce skuba opinions as there's no value in customising Prettier configs\n    '.prettierrc.js': () => configFile,\n\n    'package.json': withPackage(({ prettier, ...data }) => data),\n  };\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,sBAAqC;AACrC,yBAA4B;AAC5B,wBAAoC;AACpC,qBAA4B;AAGrB,MAAM,iBAAiB,YAA6B;AACzD,QAAM,CAAC,YAAY,UAAU,IAAI,MAAM,QAAQ,IAAI;AAAA,QACjD,sCAAqB,iBAAiB;AAAA,QACtC,sCAAqB,kBAAkB;AAAA,EACzC,CAAC;AAED,SAAO;AAAA,IACL,OAAG;AAAA,MACD;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IACF;AAAA,IAEA,uBAAmB,uCAAoB,UAAU;AAAA;AAAA,IAGjD,kBAAkB,MAAM;AAAA,IAExB,oBAAgB,4BAAY,CAAC,EAAE,UAAU,GAAG,KAAK,MAAM,IAAI;AAAA,EAC7D;AACF;",
+  "sourcesContent": ["import { readBaseTemplateFile } from '../../../utils/template';\nimport { mergeWithConfigFile } from '../processing/configFile';\nimport { deleteFiles } from '../processing/deleteFiles';\nimport { withPackage } from '../processing/package';\nimport type { Module } from '../types';\n\nexport const prettierModule = async (): Promise<Module> => {\n  const [configFile, ignoreFile] = await Promise.all([\n    readBaseTemplateFile('_.prettierrc.js'),\n    readBaseTemplateFile('_.prettierignore'),\n  ]);\n\n  return {\n    ...deleteFiles(\n      '.prettierrc',\n      '.prettierrc.json',\n      '.prettierrc.toml',\n      '.prettierrc.yaml',\n      '.prettierrc.yml',\n      'prettier.config.js',\n    ),\n\n    '.prettierignore': mergeWithConfigFile(ignoreFile),\n\n    // enforce skuba opinions as there's no value in customising Prettier configs\n    '.prettierrc.js': () => configFile,\n\n    'package.json': withPackage(({ prettier, ...data }) => data),\n  };\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,sBAAqC;AACrC,wBAAoC;AACpC,yBAA4B;AAC5B,qBAA4B;AAGrB,MAAM,iBAAiB,YAA6B;AACzD,QAAM,CAAC,YAAY,UAAU,IAAI,MAAM,QAAQ,IAAI;AAAA,QACjD,sCAAqB,iBAAiB;AAAA,QACtC,sCAAqB,kBAAkB;AAAA,EACzC,CAAC;AAED,SAAO;AAAA,IACL,OAAG;AAAA,MACD;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IACF;AAAA,IAEA,uBAAmB,uCAAoB,UAAU;AAAA;AAAA,IAGjD,kBAAkB,MAAM;AAAA,IAExB,oBAAgB,4BAAY,CAAC,EAAE,UAAU,GAAG,KAAK,MAAM,IAAI;AAAA,EAC7D;AACF;",
   "names": []
 }

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

@@ -0,0 +1,9 @@
+/**
+ * Generate simple variants of an ignore pattern for exact matching purposes.
+ *
+ * Note that these patterns are not actually equivalent (e.g. `lib` matches more
+ * 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;

package/lib/cli/configure/processing/{ignoreFile.js → configFile.js} RENAMED Viewed

@@ -16,17 +16,18 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var ignoreFile_exports = {};
-__export(ignoreFile_exports, {
-  generateSimpleVariants: () => generateSimpleVariants,
-  mergeWithIgnoreFile: () => mergeWithIgnoreFile
+var configFile_exports = {};
+__export(configFile_exports, {
+  generateIgnoreFileSimpleVariants: () => generateIgnoreFileSimpleVariants,
+  generateNpmrcSimpleVariants: () => generateNpmrcSimpleVariants,
+  mergeWithConfigFile: () => mergeWithConfigFile
 });
-module.exports = __toCommonJS(ignoreFile_exports);
+module.exports = __toCommonJS(configFile_exports);
 const OUTDATED_PATTERNS = ["node_modules_bak/", "tmp-*/"];
 const ASTERISKS = /\*/g;
 const LEADING_SLASH = /^\//;
 const TRAILING_SLASH = /\/$/;
-const generateSimpleVariants = (patterns) => {
+const generateIgnoreFileSimpleVariants = (patterns) => {
   const set = /* @__PURE__ */ new Set();
   for (const pattern of patterns) {
     const deAsterisked = pattern.replace(ASTERISKS, "");
@@ -45,9 +46,25 @@ const generateSimpleVariants = (patterns) => {
   set.delete("");
   return set;
 };
-const mergeWithIgnoreFile = (rawTemplateFile) => {
+const generateNpmrcSimpleVariants = (patterns) => {
+  const set = /* @__PURE__ */ new Set();
+  for (const pattern of patterns) {
+    set.add(pattern);
+    const match = pattern.match(/^(?<key>[^"=]+)="?(?<value>[^"=]+)"?$/);
+    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();
-  const templatePatterns = generateSimpleVariants([
+  const generator = fileType === "ignore" ? generateIgnoreFileSimpleVariants : generateNpmrcSimpleVariants;
+  const templatePatterns = generator([
     ...OUTDATED_PATTERNS,
     ...templateFile.split("\n").map((line) => line.trim())
   ]);
@@ -68,7 +85,8 @@ const mergeWithIgnoreFile = (rawTemplateFile) => {
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  generateSimpleVariants,
-  mergeWithIgnoreFile
+  generateIgnoreFileSimpleVariants,
+  generateNpmrcSimpleVariants,
+  mergeWithConfigFile
 });
-//# sourceMappingURL=ignoreFile.js.map
+//# sourceMappingURL=configFile.js.map

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

@@ -0,0 +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 = pattern.match(/^(?<key>[^\"=]+)=\"?(?<value>[^\"=]+)\"?$/);\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,QAAQ,MAAM,uCAAuC;AACnE,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/configure/upgrade/index.js CHANGED Viewed

@@ -39,9 +39,17 @@ var import_packageManager = require("../../../utils/packageManager");
 var import_version = require("../../../utils/version");
 var import_package = require("../processing/package");
 const getPatches = async (manifestVersion) => {
-  const patches = await (0, import_fs_extra.readdir)(import_path.default.join(__dirname, "patches"));
+  const patches = await (0, import_fs_extra.readdir)(import_path.default.join(__dirname, "patches"), {
+    withFileTypes: true
+  });
   const patchesForVersion = (0, import_semver.sort)(
-    patches.filter((filename) => (0, import_semver.gte)(filename, manifestVersion))
+    patches.flatMap(
+      (patch) => (
+        // Is a directory rather than a JavaScript source file
+        patch.isDirectory() && // Has been added since the last patch run on the project
+        (0, import_semver.gte)(patch.name, manifestVersion) ? patch.name : []
+      )
+    )
   );
   return (await Promise.all(patchesForVersion.map(resolvePatches))).flat();
 };

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

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

package/lib/cli/configure/upgrade/patches/7.3.1/moveNpmrcOutOfGitignoreManagedSection.js CHANGED Viewed

@@ -35,6 +35,7 @@ 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("../../../analysis/project");
 const NPMRC_IGNORE_SECTION = `
@@ -74,7 +75,7 @@ const moveNpmrcOutOfGitignoreManagedSection = async (mode, dir) => {
   if (mode === "lint") {
     return { result: "apply" };
   }
-  const newGitignore = gitignore.split("\n").filter((line) => line.trim().replace(/^[!/]+/g, "") !== ".npmrc").join("\n").trim() + NPMRC_IGNORE_SECTION;
+  const newGitignore = gitignore.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, ".gitignore"), newGitignore);
   return { result: "apply" };
 };

package/lib/cli/configure/upgrade/patches/7.3.1/moveNpmrcOutOfGitignoreManagedSection.js.map CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../src/cli/configure/upgrade/patches/7.3.1/moveNpmrcOutOfGitignoreManagedSection.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 { createDestinationFileReader } from '../../../analysis/project';\n\nconst NPMRC_IGNORE_SECTION = `\n\n# Ignore .npmrc. This is no longer managed by skuba as pnpm projects use a managed .npmrc.\n# IMPORTANT: if migrating to pnpm, remove this line and add an .npmrc IN THE SAME COMMIT.\n# You can use \\`skuba format\\` to generate the file or otherwise commit an empty file.\n# Doing so will conflict with a local .npmrc and make it more difficult to unintentionally commit auth secrets.\n.npmrc\n`;\n\nconst moveNpmrcOutOfGitignoreManagedSection = async (\n  mode: 'format' | 'lint',\n  dir: string,\n): Promise<PatchReturnType> => {\n  const readFile = createDestinationFileReader(dir);\n\n  const gitignore = await readFile('.gitignore');\n\n  if (!gitignore) {\n    return { result: 'skip', reason: 'no .gitignore file found' };\n  }\n\n  let isIgnored: { inManaged: boolean } | undefined;\n  let currentlyInManagedSection = false;\n\n  for (const line of gitignore.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 newGitignore =\n    gitignore\n      .split('\\n')\n      .filter((line) => line.trim().replace(/^[!/]+/g, '') !== '.npmrc')\n      .join('\\n')\n      .trim() + NPMRC_IGNORE_SECTION;\n\n  await fs.promises.writeFile(path.join(dir, '.gitignore'), newGitignore);\n\n  return { result: 'apply' };\n};\n\nexport const tryMoveNpmrcOutOfGitignoreManagedSection = (async (\n  mode: 'format' | 'lint',\n  dir = process.cwd(),\n) => {\n  try {\n    return await moveNpmrcOutOfGitignoreManagedSection(mode, dir);\n  } catch (err) {\n    log.warn('Failed to move .npmrc out of .gitignore managed section.');\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,qBAA4C;AAE5C,MAAM,uBAAuB;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAS7B,MAAM,wCAAwC,OAC5C,MACA,QAC6B;AAC7B,QAAM,eAAW,4CAA4B,GAAG;AAEhD,QAAM,YAAY,MAAM,SAAS,YAAY;AAE7C,MAAI,CAAC,WAAW;AACd,WAAO,EAAE,QAAQ,QAAQ,QAAQ,2BAA2B;AAAA,EAC9D;AAEA,MAAI;AACJ,MAAI,4BAA4B;AAEhC,aAAW,QAAQ,UAAU,MAAM,IAAI,GAAG;AACxC,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,eACJ,UACG,MAAM,IAAI,EACV,OAAO,CAAC,SAAS,KAAK,KAAK,EAAE,QAAQ,WAAW,EAAE,MAAM,QAAQ,EAChE,KAAK,IAAI,EACT,KAAK,IAAI;AAEd,QAAM,gBAAAA,QAAG,SAAS,UAAU,YAAAC,QAAK,KAAK,KAAK,YAAY,GAAG,YAAY;AAEtE,SAAO,EAAE,QAAQ,QAAQ;AAC3B;AAEO,MAAM,2CAA4C,OACvD,MACA,MAAM,QAAQ,IAAI,MACf;AACH,MAAI;AACF,WAAO,MAAM,sCAAsC,MAAM,GAAG;AAAA,EAC9D,SAAS,KAAK;AACZ,uBAAI,KAAK,0DAA0D;AACnE,uBAAI,WAAO,qBAAQ,GAAG,CAAC;AACvB,WAAO,EAAE,QAAQ,QAAQ,QAAQ,kBAAkB;AAAA,EACrD;AACF;",
+  "sourcesContent": ["import path from 'path';\nimport { inspect } from 'util';\n\nimport fs from 'fs-extra';\n\nimport type { PatchFunction, PatchReturnType } from '../..';\nimport { log } from '../../../../../utils/logging';\nimport { NPMRC_LINES } from '../../../../../utils/npmrc';\nimport { createDestinationFileReader } from '../../../analysis/project';\n\nconst NPMRC_IGNORE_SECTION = `\n\n# Ignore .npmrc. This is no longer managed by skuba as pnpm projects use a managed .npmrc.\n# IMPORTANT: if migrating to pnpm, remove this line and add an .npmrc IN THE SAME COMMIT.\n# You can use \\`skuba format\\` to generate the file or otherwise commit an empty file.\n# Doing so will conflict with a local .npmrc and make it more difficult to unintentionally commit auth secrets.\n.npmrc\n`;\n\nconst moveNpmrcOutOfGitignoreManagedSection = async (\n  mode: 'format' | 'lint',\n  dir: string,\n): Promise<PatchReturnType> => {\n  const readFile = createDestinationFileReader(dir);\n\n  const gitignore = await readFile('.gitignore');\n\n  if (!gitignore) {\n    return { result: 'skip', reason: 'no .gitignore file found' };\n  }\n\n  let isIgnored: { inManaged: boolean } | undefined;\n  let currentlyInManagedSection = false;\n\n  for (const line of gitignore.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 newGitignore =\n    gitignore\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, '.gitignore'), newGitignore);\n\n  return { result: 'apply' };\n};\n\nexport const tryMoveNpmrcOutOfGitignoreManagedSection = (async (\n  mode: 'format' | 'lint',\n  dir = process.cwd(),\n) => {\n  try {\n    return await moveNpmrcOutOfGitignoreManagedSection(mode, dir);\n  } catch (err) {\n    log.warn('Failed to move .npmrc out of .gitignore managed section.');\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,wCAAwC,OAC5C,MACA,QAC6B;AAC7B,QAAM,eAAW,4CAA4B,GAAG;AAEhD,QAAM,YAAY,MAAM,SAAS,YAAY;AAE7C,MAAI,CAAC,WAAW;AACd,WAAO,EAAE,QAAQ,QAAQ,QAAQ,2BAA2B;AAAA,EAC9D;AAEA,MAAI;AACJ,MAAI,4BAA4B;AAEhC,aAAW,QAAQ,UAAU,MAAM,IAAI,GAAG;AACxC,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,eACJ,UACG,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,YAAY,GAAG,YAAY;AAEtE,SAAO,EAAE,QAAQ,QAAQ;AAC3B;AAEO,MAAM,2CAA4C,OACvD,MACA,MAAM,QAAQ,IAAI,MACf;AACH,MAAI;AACF,WAAO,MAAM,sCAAsC,MAAM,GAAG;AAAA,EAC9D,SAAS,KAAK;AACZ,uBAAI,KAAK,0DAA0D;AACnE,uBAAI,WAAO,qBAAQ,GAAG,CAAC;AACvB,WAAO,EAAE,QAAQ,QAAQ,QAAQ,kBAAkB;AAAA,EACrD;AACF;",
   "names": ["fs", "path"]
 }

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

@@ -41,14 +41,25 @@ 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_ignoreFile = require("../../configure/processing/ignoreFile");
+var import_configFile = require("../../configure/processing/configFile");
 const ensureNoAuthToken = (fileContents) => fileContents.split("\n").filter((line) => !(0, import_npmrc.hasNpmrcSecret)(line)).join("\n");
 const REFRESHABLE_CONFIG_FILES = [
-  { name: ".eslintignore" },
-  { name: ".gitignore" },
-  { name: ".prettierignore" },
+  { name: ".eslintignore", type: "ignore" },
+  {
+    name: ".gitignore",
+    type: "ignore",
+    additionalMapping: (gitignore) => {
+      const npmrcLines = gitignore.split("\n").filter((line) => import_npmrc.NPMRC_LINES.includes(line.trim()));
+      if (npmrcLines.length > 0 && npmrcLines.every((line) => line.includes("!"))) {
+        return gitignore.split("\n").filter((line) => !import_npmrc.NPMRC_LINES.includes(line.trim())).join("\n");
+      }
+      return gitignore;
+    }
+  },
+  { name: ".prettierignore", type: "ignore" },
   {
     name: ".npmrc",
+    type: "npmrc",
     additionalMapping: ensureNoAuthToken,
     if: (packageManager) => packageManager.command === "pnpm"
   }
@@ -57,7 +68,12 @@ const refreshConfigFiles = async (mode, logger) => {
   const manifest = await (0, import_package.getDestinationManifest)();
   const destinationRoot = import_path.default.dirname(manifest.path);
   const readDestinationFile = (0, import_project.createDestinationFileReader)(destinationRoot);
-  const refreshConfigFile = async (filename, packageManager2, additionalMapping = (s) => s, condition = () => true) => {
+  const refreshConfigFile = async ({
+    name: filename,
+    type: fileType,
+    additionalMapping = (s) => s,
+    if: condition = () => true
+  }, packageManager2) => {
     if (!condition(packageManager2)) {
       return { needsChange: false };
     }
@@ -66,7 +82,7 @@ const refreshConfigFiles = async (mode, logger) => {
       (0, import_template.readBaseTemplateFile)(`_${filename}`)
     ]);
     const data = additionalMapping(
-      inputFile ? (0, import_ignoreFile.mergeWithIgnoreFile)(templateFile)(inputFile) : templateFile,
+      inputFile ? (0, import_configFile.mergeWithConfigFile)(templateFile, fileType)(inputFile) : templateFile,
       packageManager2
     );
     const filepath = import_path.default.join(destinationRoot, filename);
@@ -99,12 +115,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.name,
-        packageManager,
-        conf.additionalMapping,
-        conf.if
-      )
+      (conf) => refreshConfigFile(conf, packageManager)
     )
   );
   results.forEach((result) => {

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/cli/lint/internalLints/refreshConfigFiles.ts"],
-  "sourcesContent": ["import path from 'path';\nimport { inspect } from 'util';\n\nimport { writeFile } from 'fs-extra';\nimport stripAnsi from 'strip-ansi';\n\nimport type { Logger } from '../../../utils/logging';\nimport { 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 { mergeWithIgnoreFile } from '../../configure/processing/ignoreFile';\nimport type { InternalLintResult } from '../internal';\n\nconst ensureNoAuthToken = (fileContents: string) =>\n  fileContents\n    .split('\\n')\n    .filter((line) => !hasNpmrcSecret(line))\n    .join('\\n');\n\nconst REFRESHABLE_CONFIG_FILES = [\n  { name: '.eslintignore' },\n  { name: '.gitignore' },\n  { name: '.prettierignore' },\n  {\n    name: '.npmrc',\n    additionalMapping: ensureNoAuthToken,\n    if: (packageManager: PackageManagerConfig) =>\n      packageManager.command === 'pnpm',\n  },\n];\n\nexport const refreshConfigFiles = async (\n  mode: 'format' | 'lint',\n  logger: Logger,\n) => {\n  const manifest = await getDestinationManifest();\n\n  const destinationRoot = path.dirname(manifest.path);\n\n  const readDestinationFile = createDestinationFileReader(destinationRoot);\n\n  const refreshConfigFile = async (\n    filename: string,\n    packageManager: PackageManagerConfig,\n    additionalMapping: (\n      s: string,\n      packageManager: PackageManagerConfig,\n    ) => string = (s) => s,\n    condition: (packageManager: PackageManagerConfig) => boolean = () => true,\n  ) => {\n    if (!condition(packageManager)) {\n      return { needsChange: false };\n    }\n\n    const [inputFile, templateFile] = await Promise.all([\n      readDestinationFile(filename),\n      readBaseTemplateFile(`_${filename}`),\n    ]);\n\n    const data = additionalMapping(\n      inputFile ? mergeWithIgnoreFile(templateFile)(inputFile) : 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.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(\n        conf.name,\n        packageManager,\n        conf.additionalMapping,\n        conf.if,\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, logger.dim('refresh-config-files'));\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": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AACjB,kBAAwB;AAExB,sBAA0B;AAC1B,wBAAsB;AAGtB,mBAA+B;AAC/B,4BAGO;AACP,sBAAqC;AACrC,qBAAuC;AACvC,qBAA4C;AAC5C,wBAAoC;AAGpC,MAAM,oBAAoB,CAAC,iBACzB,aACG,MAAM,IAAI,EACV,OAAO,CAAC,SAAS,KAAC,6BAAe,IAAI,CAAC,EACtC,KAAK,IAAI;AAEd,MAAM,2BAA2B;AAAA,EAC/B,EAAE,MAAM,gBAAgB;AAAA,EACxB,EAAE,MAAM,aAAa;AAAA,EACrB,EAAE,MAAM,kBAAkB;AAAA,EAC1B;AAAA,IACE,MAAM;AAAA,IACN,mBAAmB;AAAA,IACnB,IAAI,CAAC,mBACH,eAAe,YAAY;AAAA,EAC/B;AACF;AAEO,MAAM,qBAAqB,OAChC,MACA,WACG;AACH,QAAM,WAAW,UAAM,uCAAuB;AAE9C,QAAM,kBAAkB,YAAAA,QAAK,QAAQ,SAAS,IAAI;AAElD,QAAM,0BAAsB,4CAA4B,eAAe;AAEvE,QAAM,oBAAoB,OACxB,UACAC,iBACA,oBAGc,CAAC,MAAM,GACrB,YAA+D,MAAM,SAClE;AACH,QAAI,CAAC,UAAUA,eAAc,GAAG;AAC9B,aAAO,EAAE,aAAa,MAAM;AAAA,IAC9B;AAEA,UAAM,CAAC,WAAW,YAAY,IAAI,MAAM,QAAQ,IAAI;AAAA,MAClD,oBAAoB,QAAQ;AAAA,UAC5B,sCAAqB,IAAI,QAAQ,EAAE;AAAA,IACrC,CAAC;AAED,UAAM,OAAO;AAAA,MACX,gBAAY,uCAAoB,YAAY,EAAE,SAAS,IAAI;AAAA,MAC3DA;AAAA,IACF;AAEA,UAAM,WAAW,YAAAD,QAAK,KAAK,iBAAiB,QAAQ;AAEpD,QAAI,SAAS,UAAU;AACrB,UAAI,SAAS,WAAW;AACtB,eAAO,EAAE,aAAa,MAAM;AAAA,MAC9B;AAEA,gBAAM,2BAAU,UAAU,IAAI;AAC9B,aAAO;AAAA,QACL,aAAa;AAAA,QACb,KAAK,aAAa,OAAO,KAAK,QAAQ,CAAC;AAAA,QACvC;AAAA,MACF;AAAA,IACF;AAEA,QAAI,SAAS,WAAW;AACtB,aAAO;AAAA,QACL,aAAa;AAAA,QACb,KAAK,OAAO,OAAO;AAAA,UACjB;AAAA,QACF,CAAC,+BAA+B,OAAO;AAAA,UACrCC,gBAAe;AAAA,UACf;AAAA,UACA;AAAA,QACF,CAAC;AAAA,QACD;AAAA,MACF;AAAA,IACF;AAEA,WAAO,EAAE,aAAa,MAAM;AAAA,EAC9B;AAEA,QAAM,iBAAiB,UAAM,4CAAqB,eAAe;AAEjE,QAAM,UAAU,MAAM,QAAQ;AAAA,IAC5B,yBAAyB;AAAA,MAAI,CAAC,SAC5B;AAAA,QACE,KAAK;AAAA,QACL;AAAA,QACA,KAAK;AAAA,QACL,KAAK;AAAA,MACP;AAAA,IACF;AAAA,EACF;AAGA,UAAQ,QAAQ,CAAC,WAAW;AAC1B,QAAI,OAAO,KAAK;AACd,aAAO,KAAK,OAAO,KAAK,OAAO,IAAI,sBAAsB,CAAC;AAAA,IAC5D;AAAA,EACF,CAAC;AAED,QAAM,kBAAkB,QAAQ,KAAK,CAAC,EAAE,YAAY,MAAM,WAAW;AAErE,SAAO;AAAA,IACL,IAAI,CAAC;AAAA,IACL,SAAS;AAAA,IACT,aAAa,QAAQ;AAAA,MAAQ,CAAC,EAAE,aAAa,UAAU,IAAI,MACzD,eAAe,MACX;AAAA,QACE;AAAA,UACE,MAAM;AAAA,UACN,aAAS,kBAAAC,SAAU,GAAG;AAAA,QACxB;AAAA,MACF,IACA,CAAC;AAAA,IACP;AAAA,EACF;AACF;AAEO,MAAM,wBAAwB,OACnC,MACA,WACgC;AAChC,MAAI;AACF,WAAO,MAAM,mBAAmB,MAAM,MAAM;AAAA,EAC9C,SAAS,KAAK;AACZ,WAAO,KAAK,iCAAiC;AAC7C,WAAO,WAAO,qBAAQ,GAAG,CAAC;AAE1B,WAAO;AAAA,MACL,IAAI;AAAA,MACJ,SAAS;AAAA,MACT,aAAa,CAAC;AAAA,IAChB;AAAA,EACF;AACF;",
+  "sourcesContent": ["import path from 'path';\nimport { inspect } from 'util';\n\nimport { writeFile } from 'fs-extra';\nimport stripAnsi from 'strip-ansi';\n\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 REFRESHABLE_CONFIG_FILES: RefreshableConfigFile[] = [\n  { name: '.eslintignore', type: 'ignore' },\n  {\n    name: '.gitignore',\n    type: 'ignore',\n    additionalMapping: (gitignore: string) => {\n      const npmrcLines = gitignore\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 (\n        npmrcLines.length > 0 &&\n        npmrcLines.every((line) => line.includes('!'))\n      ) {\n        return gitignore\n          .split('\\n')\n          .filter((line) => !NPMRC_LINES.includes(line.trim()))\n          .join('\\n');\n      }\n      return gitignore;\n    },\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\nexport const refreshConfigFiles = async (\n  mode: 'format' | 'lint',\n  logger: Logger,\n) => {\n  const manifest = await getDestinationManifest();\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] = await Promise.all([\n      readDestinationFile(filename),\n      readBaseTemplateFile(`_${filename}`),\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.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, logger.dim('refresh-config-files'));\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/utils/npmrc.d.ts CHANGED Viewed

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

package/lib/utils/npmrc.js CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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\n\nexport const hasNpmrcSecret = (lineOrFullFileContents: string): boolean =>\n  lineOrFullFileContents.includes('_auth') ||\n  lineOrFullFileContents.includes('_password');\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAGO,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 CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "skuba",
-  "version": "7.4.0-horrible-hacks-20240206024353",
+  "version": "7.4.0-master-20240206223029",
   "private": false,
   "description": "SEEK development toolkit for backend applications and packages",
   "homepage": "https://github.com/seek-oss/skuba#readme",
@@ -157,17 +157,17 @@
     "build": "scripts/build.sh",
     "changeset": "changeset",
     "deploy": "scripts/deploy.sh",
-    "format": "pnpm run --silent skuba format",
-    "lint": "pnpm run --silent skuba lint && pnpm run --silent lint:md",
+    "format": "pnpm --silent skuba format",
+    "lint": "pnpm --silent skuba lint && pnpm --silent lint:md",
     "lint:md": "remark --frail --quiet .",
-    "release": "pnpm run --silent build && changeset publish",
-    "skuba": "pnpm run --silent build && pnpm run --silent skuba:exec",
+    "release": "pnpm --silent build && changeset publish",
+    "skuba": "pnpm --silent build && pnpm --silent skuba:exec",
     "skuba:exec": "node --env-file=.env lib/skuba",
-    "stage": "changeset version && node ./.changeset/inject.js && pnpm run format",
-    "test": "pnpm run --silent skuba test --selectProjects unit",
-    "test:ci": "pnpm run --silent skuba test --runInBand",
-    "test:int": "pnpm run --silent skuba test --runInBand --selectProjects integration",
+    "stage": "changeset version && node ./.changeset/inject.js && pnpm format",
+    "test": "pnpm --silent skuba test --selectProjects unit",
+    "test:ci": "pnpm --silent skuba test --runInBand",
+    "test:int": "pnpm --silent skuba test --runInBand --selectProjects integration",
     "test:template": "scripts/test-template.sh",
-    "test:watch": "pnpm run --silent skuba test --runInBand --watch"
+    "test:watch": "pnpm --silent skuba test --runInBand --watch"
   }
 }

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

@@ -43,10 +43,10 @@ steps:
     commands:
       - echo '--- pnpm install --offline'
       - pnpm install --offline
-      - echo '+++ pnpm run test:ci'
-      - pnpm run test:ci
-      - echo '--- pnpm run lint'
-      - pnpm run lint
+      - echo '+++ pnpm test:ci'
+      - pnpm test:ci
+      - echo '--- pnpm lint'
+      - pnpm lint
     depends_on: warm-prod
     env:
       GET_GITHUB_TOKEN: please

package/template/express-rest-api/Dockerfile CHANGED Viewed

@@ -7,7 +7,7 @@ FROM ${BASE_IMAGE} AS build
 COPY . .
 RUN pnpm install --offline
-RUN pnpm run build
+RUN pnpm build
 RUN pnpm install --offline --prod
 ###

package/template/express-rest-api/README.md CHANGED Viewed

@@ -43,27 +43,27 @@ This defaults to an HTTP request to the `GET /smoke` endpoint.
 ### Test
 ```shell
-pnpm run test
+pnpm test
 ```
 ### Lint
 ```shell
 # fix
-pnpm run format
+pnpm format
 # check
-pnpm run lint
+pnpm lint
 ```
 ### Start
 ```shell
 # Start a local HTTP server
-pnpm run start
+pnpm start
 # Start with Node.js Inspector enabled
-pnpm run start:debug
+pnpm start:debug
 ```
 ### Deploy

package/template/express-rest-api/package.json CHANGED Viewed

@@ -6,7 +6,7 @@
     "format": "skuba format",
     "lint": "skuba lint",
     "start": "skuba start --port <%- port %>",
-    "start:debug": "pnpm run --silent start --inspect-brk",
+    "start:debug": "pnpm --silent start --inspect-brk",
     "test": "skuba test",
     "test:ci": "skuba test --coverage",
     "test:watch": "skuba test --watch"
@@ -24,6 +24,7 @@
     "skuba": "*",
     "supertest": "^6.1.6"
   },
+  "packageManager": "pnpm@8.15.1",
   "engines": {
     "node": ">=20"
   }

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

@@ -23,10 +23,10 @@ steps:
     commands:
       - echo '--- pnpm install --offline'
       - pnpm install --offline
-      - echo '+++ pnpm run test:ci'
-      - pnpm run test:ci
-      - echo '--- pnpm run lint'
-      - pnpm run lint
+      - echo '+++ pnpm test:ci'
+      - pnpm test:ci
+      - echo '--- pnpm lint'
+      - pnpm lint
     env:
       GET_GITHUB_TOKEN: please
     plugins:

package/template/greeter/README.md CHANGED Viewed

@@ -36,27 +36,27 @@ It's a barebones Node.js application that comprises:
 ### Test
 ```shell
-pnpm run test
+pnpm test
 ```
 ### Lint
 ```shell
 # Fix issues
-pnpm run format
+pnpm format
 # Check for issues
-pnpm run lint
+pnpm lint
 ```
 ### Start
 ```shell
 # Start a live-reloading process
-pnpm run start
+pnpm start
 # Start with Node.js Inspector enabled
-pnpm run start:debug
+pnpm start:debug
 ```
 This runs a live-reloading Node.js process pointing to the [src/app.ts](src/app.ts) entrypoint.

package/template/greeter/package.json CHANGED Viewed

@@ -6,7 +6,7 @@
     "format": "skuba format",
     "lint": "skuba lint",
     "start": "skuba start",
-    "start:debug": "pnpm run --silent start --inspect-brk",
+    "start:debug": "pnpm --silent start --inspect-brk",
     "test": "skuba test",
     "test:ci": "skuba test --coverage",
     "test:watch": "skuba test --watch"
@@ -18,6 +18,7 @@
     "@types/node": "^20.9.0",
     "skuba": "*"
   },
+  "packageManager": "pnpm@8.15.1",
   "engines": {
     "node": ">=20"
   }

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

@@ -43,10 +43,10 @@ steps:
     commands:
       - echo '--- pnpm install --offline'
       - pnpm install --offline
-      - echo '+++ pnpm run test:ci'
-      - pnpm run test:ci
-      - echo '--- pnpm run lint'
-      - pnpm run lint
+      - echo '+++ pnpm test:ci'
+      - pnpm test:ci
+      - echo '--- pnpm lint'
+      - pnpm lint
     depends_on: warm-prod
     env:
       GET_GITHUB_TOKEN: please

package/template/koa-rest-api/Dockerfile CHANGED Viewed

@@ -7,7 +7,7 @@ FROM ${BASE_IMAGE} AS build
 COPY . .
 RUN pnpm install --offline
-RUN pnpm run build
+RUN pnpm build
 RUN pnpm install --offline --prod
 ###

package/template/koa-rest-api/README.md CHANGED Viewed

@@ -48,27 +48,27 @@ This defaults to an HTTP request to the `GET /smoke` endpoint.
 ### Test
 ```shell
-pnpm run test
+pnpm test
 ```
 ### Lint
 ```shell
 # Fix issues
-pnpm run format
+pnpm format
 # Check for issues
-pnpm run lint
+pnpm lint
 ```
 ### Start
 ```shell
 # Start a local HTTP server
-pnpm run start
+pnpm start
 # Start with Node.js Inspector enabled
-pnpm run start:debug
+pnpm start:debug
 ```
 ### Deploy

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

@@ -6,7 +6,7 @@
     "format": "skuba format",
     "lint": "skuba lint",
     "start": "skuba start --port <%- port %>",
-    "start:debug": "pnpm run --silent start --inspect-brk",
+    "start:debug": "pnpm --silent start --inspect-brk",
     "test": "skuba test",
     "test:ci": "skuba test --coverage",
     "test:watch": "skuba test --watch"
@@ -43,6 +43,7 @@
     "skuba": "*",
     "supertest": "^6.1.6"
   },
+  "packageManager": "pnpm@8.15.1",
   "engines": {
     "node": ">=20"
   }

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

@@ -52,12 +52,12 @@ steps:
     commands:
       - echo '--- pnpm install --offline'
       - pnpm install --offline
-      - echo '+++ pnpm run test:ci'
-      - pnpm run test:ci
-      - echo '--- pnpm run lint'
-      - pnpm run lint
-      - echo '--- pnpm run build'
-      - pnpm run build
+      - echo '+++ pnpm test:ci'
+      - pnpm test:ci
+      - echo '--- pnpm lint'
+      - pnpm lint
+      - echo '--- pnpm build'
+      - pnpm build
     env:
       GET_GITHUB_TOKEN: please
     plugins:

package/template/lambda-sqs-worker/README.md CHANGED Viewed

@@ -47,33 +47,33 @@ This defaults to an invocation with an empty object `{}`, per [src/hooks.ts](src
 ```shell
 # Run Jest tests locally
-pnpm run test
+pnpm test
 # Authenticate to dev account
 awsauth
 # Run smoke test against deployed application
-ENVIRONMENT=dev pnpm run smoke
+ENVIRONMENT=dev pnpm smoke
 ```
 ### Lint
 ```shell
 # Fix issues
-pnpm run format
+pnpm format
 # Check for issues
-pnpm run lint
+pnpm lint
 ```
 ### Start
 ```shell
 # Start a local HTTP server
-pnpm run start
+pnpm start
 # Start with Node.js Inspector enabled
-pnpm run start:debug
+pnpm start:debug
 ```
 This serves the Lambda application over HTTP.

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

@@ -8,7 +8,7 @@
     "lint": "skuba lint",
     "smoke": "serverless invoke --data '{}' --function Worker",
     "start": "skuba start --port <%- port %>",
-    "start:debug": "pnpm run --silent start --inspect-brk",
+    "start:debug": "pnpm --silent start --inspect-brk",
     "test": "skuba test",
     "test:ci": "skuba test --coverage",
     "test:watch": "skuba test --watch"
@@ -37,6 +37,7 @@
     "serverless-prune-plugin": "^2.0.0",
     "skuba": "*"
   },
+  "packageManager": "pnpm@8.15.1",
   "engines": {
     "node": ">=20"
   }

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

@@ -50,10 +50,10 @@ steps:
     commands:
       - echo '--- pnpm install --offline'
       - pnpm install --offline
-      - echo '+++ pnpm run test:ci'
-      - pnpm run test
-      - echo '--- pnpm run lint'
-      - pnpm run lint
+      - echo '+++ pnpm test:ci'
+      - pnpm test
+      - echo '--- pnpm lint'
+      - pnpm lint
     env:
       GET_GITHUB_TOKEN: please
     plugins:

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

@@ -3,8 +3,8 @@
   "license": "UNLICENSED",
   "scripts": {
     "deploy": "cdk deploy appStack --require-approval never --context stage=${ENVIRONMENT}",
-    "deploy:hotswap": "pnpm run --silent deploy --hotswap",
-    "deploy:watch": "pnpm run --silent deploy:hotswap --watch",
+    "deploy:hotswap": "pnpm --silent deploy --hotswap",
+    "deploy:watch": "pnpm --silent deploy:hotswap --watch",
     "format": "skuba format",
     "lint": "skuba lint",
     "test": "skuba test",
@@ -26,6 +26,7 @@
     "constructs": "^10.0.17",
     "skuba": "*"
   },
+  "packageManager": "pnpm@8.15.1",
   "engines": {
     "node": ">=20"
   }

package/template/oss-npm-package/.github/workflows/release.yml CHANGED Viewed

@@ -33,7 +33,7 @@ jobs:
         run: pnpm install --frozen-lockfile
       - name: Publish to npm
-        run: pnpm run release
+        run: pnpm release
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           NPM_TOKEN: ${{ secrets.SEEK_OSS_CI_NPM_TOKEN }}

package/template/oss-npm-package/.github/workflows/validate.yml CHANGED Viewed

@@ -28,7 +28,7 @@ jobs:
         run: pnpm install --frozen-lockfile
       - name: Test
-        run: pnpm run test:ci
+        run: pnpm test:ci
       - name: Lint
-        run: pnpm run lint
+        run: pnpm lint

package/template/oss-npm-package/README.md CHANGED Viewed

@@ -48,24 +48,24 @@ pnpm install
 ### Test
 ```shell
-pnpm run test
+pnpm test
 ```
 ### Lint
 ```shell
 # Fix issues
-pnpm run format
+pnpm format
 # Check for issues
-pnpm run lint
+pnpm lint
 ```
 ### Package
 ```shell
 # Compile source
-pnpm run build
+pnpm build
 # Review bundle
 npm pack
@@ -94,7 +94,7 @@ To set up this repo for publishing, follow the instructions in our [OSS npm pack
 ### Commit messages
 This package is published with **[semantic-release]**, which requires a particular commit format to manage semantic versioning.
-You can run the interactive `pnpm run commit` command in place of `git commit` to generate a compliant commit title and message.
+You can run the interactive `pnpm commit` command in place of `git commit` to generate a compliant commit title and message.
 If you use the `Squash and merge` option on pull requests, take extra care to format the squashed commit in the GitHub UI before merging.
 ### Releasing latest

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

@@ -22,7 +22,7 @@
     "commit": "cz",
     "format": "skuba format",
     "lint": "skuba lint",
-    "release": "pnpm run --silent build && skuba release",
+    "release": "pnpm --silent build && skuba release",
     "test": "skuba test",
     "test:ci": "skuba test --coverage",
     "test:watch": "skuba test --watch"

package/template/private-npm-package/README.md CHANGED Viewed

@@ -44,24 +44,24 @@ pnpm install
 ### Test
 ```shell
-pnpm run test
+pnpm test
 ```
 ### Lint
 ```shell
 # Fix issues
-pnpm run format
+pnpm format
 # Check for issues
-pnpm run lint
+pnpm lint
 ```
 ### Package
 ```shell
 # Compile source
-pnpm run build
+pnpm build
 # Review bundle
 npm pack
@@ -76,7 +76,7 @@ It depends on this repo being hosted on [SEEK-Jobs] with appropriate access.
 ### Commit messages
 This package is published with **[semantic-release]**, which requires a particular commit format to manage semantic versioning.
-You can run the interactive `pnpm run commit` command in place of `git commit` to generate a compliant commit title and message.
+You can run the interactive `pnpm commit` command in place of `git commit` to generate a compliant commit title and message.
 If you use the `Squash and merge` option on pull requests, take extra care to format the squashed commit in the GitHub UI before merging.
 ### Releasing latest

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

@@ -22,9 +22,9 @@
     "commit": "cz",
     "format": "skuba format",
     "lint": "skuba lint",
-    "release": "pnpm run --silent build && skuba release",
+    "release": "pnpm --silent build && skuba release",
     "test": "skuba test --coverage",
-    "test:ci": "pnpm run --silent test",
+    "test:ci": "pnpm --silent test",
     "test:watch": "skuba test --watch"
   },
   "config": {
@@ -38,6 +38,7 @@
     "commitizen": "^4.2.4",
     "skuba": "*"
   },
+  "packageManager": "pnpm@8.15.1",
   "engines": {
     "node": ">=18.12"
   }

package/lib/cli/configure/processing/ignoreFile.d.ts DELETED Viewed

@@ -1,8 +0,0 @@
-/**
- * Generate simple variants of an ignore pattern for exact matching purposes.
- *
- * Note that these patterns are not actually equivalent (e.g. `lib` matches more
- * than `lib/`) but they generally represent the same _intent_.
- */
-export declare const generateSimpleVariants: (patterns: string[]) => Set<string>;
-export declare const mergeWithIgnoreFile: (rawTemplateFile: string) => (rawInputFile?: string) => string;

package/lib/cli/configure/processing/ignoreFile.js.map DELETED Viewed

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../../src/cli/configure/processing/ignoreFile.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 generateSimpleVariants = (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 mergeWithIgnoreFile = (rawTemplateFile: string) => {\n  const templateFile = rawTemplateFile.trim();\n\n  const templatePatterns = generateSimpleVariants([\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;AAIA,MAAM,oBAAoB,CAAC,qBAAqB,QAAQ;AAExD,MAAM,YAAY;AAClB,MAAM,gBAAgB;AACtB,MAAM,iBAAiB;AAQhB,MAAM,yBAAyB,CAAC,aAAuB;AAC5D,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,sBAAsB,CAAC,oBAA4B;AAC9D,QAAM,eAAe,gBAAgB,KAAK;AAE1C,QAAM,mBAAmB,uBAAuB;AAAA,IAC9C,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": []
-}