renovate 44.238.2 → 44.239.0

package/dist/workers/repository/config-migration/branch/migrated-data.js

@@ -1,3 +1,4 @@
+import { stringifyMigratedConfig } from "../../../../config/migrated-content.js";
 import { migrateConfig } from "../../../../config/migration.js";
 import { prettier } from "../../../../expose.js";
 import { logger } from "../../../../logger/index.js";
@@ -8,10 +9,7 @@ import { EditorConfig } from "../../../../util/json-writer/editor-config.js";
 import "../../../../util/json-writer/index.js";
 import { detectRepoFileConfig } from "../../init/merge.js";
 import { isNumber } from "@sindresorhus/is";
-import JSON5 from "json5";
-import { weave } from "jsonc-weaver";
 import upath from "upath";
-import detectIndent from "detect-indent";
 // lib/workers/repository/config-migration/branch/migrated-data.ts
 const prettierConfigFilenames = /* @__PURE__ */ new Set([
 	".prettierrc",
@@ -77,20 +75,9 @@ var MigratedDataFactory = class {
 			if (!isMigrated) return null;
 			delete migratedConfig.errors;
 			delete migratedConfig.warnings;
-			const raw = await platform.getRawFile(configFileName);
-			const indent = detectIndent(raw ?? "");
-			const indentSpace = indent.indent ?? "  ";
 			const filename = configFileName;
-			let content;
-			if (filename.endsWith(".json5")) content = JSON5.stringify(migratedConfig, void 0, indentSpace);
-			else if (raw) try {
-				content = weave(raw, migratedConfig);
-			} catch (err) {
-				logger.warn({ err }, "Error weaving JSONC to preserve comments, falling back to JSON.stringify");
-				content = JSON.stringify(migratedConfig, void 0, indentSpace);
-			}
-			else content = JSON.stringify(migratedConfig, void 0, indentSpace);
-			if (!content.endsWith("\n")) content += "\n";
+			const raw = await platform.getRawFile(filename);
+			const { content, indent } = stringifyMigratedConfig(filename, raw, migratedConfig);
 			res = {
 				content,
 				filename,

package/dist/workers/repository/config-migration/branch/migrated-data.js.map

@@ -1 +1 @@
-{"version":3,"file":"migrated-data.js","names":[],"sources":["../../../../../lib/workers/repository/config-migration/branch/migrated-data.ts"],"sourcesContent":["import { isNumber } from '@sindresorhus/is';\nimport detectIndent from 'detect-indent';\nimport JSON5 from 'json5';\nimport { weave } from 'jsonc-weaver';\nimport type { BuiltInParserName, Options } from 'prettier';\nimport upath from 'upath';\nimport { migrateConfig } from '../../../../config/migration.ts';\nimport { prettier } from '../../../../expose.ts';\nimport { logger } from '../../../../logger/index.ts';\nimport { platform } from '../../../../modules/platform/index.ts';\nimport { scm } from '../../../../modules/platform/scm.ts';\nimport { readLocalFile } from '../../../../util/fs/index.ts';\nimport { EditorConfig } from '../../../../util/json-writer/index.ts';\nimport { detectRepoFileConfig } from '../../init/merge.ts';\n\nexport interface MigratedData {\n  content: string;\n  filename: string;\n  indent: Indent;\n}\n\ninterface Indent {\n  amount: number;\n  indent: string;\n  type?: string;\n}\n\nconst prettierConfigFilenames = new Set([\n  '.prettierrc',\n  '.prettierrc.json',\n  '.prettierrc.yml',\n  '.prettierrc.yaml',\n  '.prettierrc.json5',\n  '.prettierrc.js',\n  '.prettierrc.cjs',\n  '.prettierrc.mjs',\n  'prettier.config.js',\n  'prettier.config.cjs',\n  'prettier.config.mjs',\n  '.prettierrc.toml',\n]);\n\nexport type PrettierParser = BuiltInParserName;\n\nexport async function applyPrettierFormatting(\n  filename: string,\n  content: string,\n  parser: PrettierParser,\n  indent?: Indent,\n): Promise<string> {\n  try {\n    logger.trace('applyPrettierFormatting - START');\n    const fileList = await scm.getFileList();\n    let prettierExists = fileList.some((file) =>\n      prettierConfigFilenames.has(file),\n    );\n\n    const editorconfigExists = fileList.some(\n      (file) => file === '.editorconfig',\n    );\n\n    if (!prettierExists) {\n      try {\n        const packageJsonContent = await readLocalFile('package.json', 'utf8');\n        prettierExists =\n          packageJsonContent && JSON.parse(packageJsonContent).prettier;\n      } catch {\n        logger.warn(\n          'applyPrettierFormatting - Error processing package.json file',\n        );\n      }\n    }\n\n    if (!prettierExists || !parser) {\n      return content;\n    }\n\n    const options: Options = {\n      parser,\n      tabWidth: indent?.amount === 0 ? 2 : indent?.amount,\n      useTabs: indent?.type === 'tab',\n    };\n\n    if (editorconfigExists) {\n      const editorconf = await EditorConfig.getCodeFormat(filename);\n\n      // https://github.com/prettier/prettier/blob/bab892242a1f9d8fcae50514b9304bf03f2e25ab/src/config/editorconfig/editorconfig-to-prettier.js#L47\n      if (editorconf.maxLineLength) {\n        options.printWidth = isNumber(editorconf.maxLineLength)\n          ? editorconf.maxLineLength\n          : Number.POSITIVE_INFINITY;\n      }\n\n      // TODO: support editor config `indent_style` and `indent_size`\n    }\n\n    return prettier().format(content, options);\n  } finally {\n    logger.trace('applyPrettierFormatting - END');\n  }\n}\n\nexport class MigratedDataFactory {\n  // singleton\n  private static data: MigratedData | null;\n\n  static async getAsync(): Promise<MigratedData | null> {\n    if (this.data) {\n      return this.data;\n    }\n    const migrated = await this.build();\n\n    if (!migrated) {\n      return null;\n    }\n\n    this.data = migrated;\n    return this.data;\n  }\n\n  static reset(): void {\n    this.data = null;\n  }\n\n  static applyPrettierFormatting({\n    content,\n    filename,\n    indent,\n  }: MigratedData): Promise<string> {\n    const parser = upath.extname(filename).replace('.', '') as PrettierParser;\n    return applyPrettierFormatting(filename, content, parser, indent);\n  }\n\n  private static async build(): Promise<MigratedData | null> {\n    let res: MigratedData | null = null;\n    try {\n      const { configFileName, configFileParsed = {} } =\n        await detectRepoFileConfig();\n\n      // get migrated config\n      const { isMigrated, migratedConfig } = migrateConfig(configFileParsed);\n      if (!isMigrated) {\n        return null;\n      }\n\n      delete migratedConfig.errors;\n      delete migratedConfig.warnings;\n\n      // TODO #22198\n      const raw = await platform.getRawFile(configFileName!);\n      const indent = detectIndent(raw ?? '');\n      // indent defaults to 2 spaces\n      const indentSpace = indent.indent ?? '  ';\n      const filename = configFileName!;\n      let content: string;\n\n      if (filename.endsWith('.json5')) {\n        content = JSON5.stringify(migratedConfig, undefined, indentSpace);\n      } else if (raw) {\n        try {\n          content = weave(raw, migratedConfig);\n        } catch (err) {\n          logger.warn(\n            { err },\n            'Error weaving JSONC to preserve comments, falling back to JSON.stringify',\n          );\n          content = JSON.stringify(migratedConfig, undefined, indentSpace);\n        }\n      } else {\n        content = JSON.stringify(migratedConfig, undefined, indentSpace);\n      }\n\n      if (!content.endsWith('\\n')) {\n        content += '\\n';\n      }\n\n      res = { content, filename, indent };\n    } catch (err) {\n      logger.debug(\n        { err },\n        'MigratedDataFactory.getAsync() Error initializing renovate MigratedData',\n      );\n    }\n    return res;\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;AA2BA,MAAM,0CAA0B,IAAI,IAAI;CACtC;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;AACF,CAAC;AAID,eAAsB,wBACpB,UACA,SACA,QACA,QACiB;CACjB,IAAI;EACF,OAAO,MAAM,iCAAiC;EAC9C,MAAM,WAAW,MAAM,IAAI,YAAY;EACvC,IAAI,iBAAiB,SAAS,MAAM,SAClC,wBAAwB,IAAI,IAAI,CAClC;EAEA,MAAM,qBAAqB,SAAS,MACjC,SAAS,SAAS,eACrB;EAEA,IAAI,CAAC,gBACH,IAAI;GACF,MAAM,qBAAqB,MAAM,cAAc,gBAAgB,MAAM;GACrE,iBACE,sBAAsB,KAAK,MAAM,kBAAkB,CAAC,CAAC;EACzD,QAAQ;GACN,OAAO,KACL,8DACF;EACF;EAGF,IAAI,CAAC,kBAAkB,CAAC,QACtB,OAAO;EAGT,MAAM,UAAmB;GACvB;GACA,UAAU,QAAQ,WAAW,IAAI,IAAI,QAAQ;GAC7C,SAAS,QAAQ,SAAS;EAC5B;EAEA,IAAI,oBAAoB;GACtB,MAAM,aAAa,MAAM,aAAa,cAAc,QAAQ;GAG5D,IAAI,WAAW,eACb,QAAQ,aAAa,SAAS,WAAW,aAAa,IAClD,WAAW,gBACX,OAAO;EAIf;EAEA,OAAO,SAAS,CAAC,CAAC,OAAO,SAAS,OAAO;CAC3C,UAAU;EACR,OAAO,MAAM,+BAA+B;CAC9C;AACF;AAEA,IAAa,sBAAb,MAAiC;CAE/B,OAAe;CAEf,aAAa,WAAyC;EACpD,IAAI,KAAK,MACP,OAAO,KAAK;EAEd,MAAM,WAAW,MAAM,KAAK,MAAM;EAElC,IAAI,CAAC,UACH,OAAO;EAGT,KAAK,OAAO;EACZ,OAAO,KAAK;CACd;CAEA,OAAO,QAAc;EACnB,KAAK,OAAO;CACd;CAEA,OAAO,wBAAwB,EAC7B,SACA,UACA,UACgC;EAEhC,OAAO,wBAAwB,UAAU,SAD1B,MAAM,QAAQ,QAAQ,CAAC,CAAC,QAAQ,KAAK,EACG,GAAG,MAAM;CAClE;CAEA,aAAqB,QAAsC;EACzD,IAAI,MAA2B;EAC/B,IAAI;GACF,MAAM,EAAE,gBAAgB,mBAAmB,CAAC,MAC1C,MAAM,qBAAqB;GAG7B,MAAM,EAAE,YAAY,mBAAmB,cAAc,gBAAgB;GACrE,IAAI,CAAC,YACH,OAAO;GAGT,OAAO,eAAe;GACtB,OAAO,eAAe;GAGtB,MAAM,MAAM,MAAM,SAAS,WAAW,cAAe;GACrD,MAAM,SAAS,aAAa,OAAO,EAAE;GAErC,MAAM,cAAc,OAAO,UAAU;GACrC,MAAM,WAAW;GACjB,IAAI;GAEJ,IAAI,SAAS,SAAS,QAAQ,GAC5B,UAAU,MAAM,UAAU,gBAAgB,KAAA,GAAW,WAAW;QAC3D,IAAI,KACT,IAAI;IACF,UAAU,MAAM,KAAK,cAAc;GACrC,SAAS,KAAK;IACZ,OAAO,KACL,EAAE,IAAI,GACN,0EACF;IACA,UAAU,KAAK,UAAU,gBAAgB,KAAA,GAAW,WAAW;GACjE;QAEA,UAAU,KAAK,UAAU,gBAAgB,KAAA,GAAW,WAAW;GAGjE,IAAI,CAAC,QAAQ,SAAS,IAAI,GACxB,WAAW;GAGb,MAAM;IAAE;IAAS;IAAU;GAAO;EACpC,SAAS,KAAK;GACZ,OAAO,MACL,EAAE,IAAI,GACN,yEACF;EACF;EACA,OAAO;CACT;AACF"}
+{"version":3,"file":"migrated-data.js","names":[],"sources":["../../../../../lib/workers/repository/config-migration/branch/migrated-data.ts"],"sourcesContent":["import { isNumber } from '@sindresorhus/is';\nimport type { BuiltInParserName, Options } from 'prettier';\nimport upath from 'upath';\nimport { stringifyMigratedConfig } from '../../../../config/migrated-content.ts';\nimport { migrateConfig } from '../../../../config/migration.ts';\nimport { prettier } from '../../../../expose.ts';\nimport { logger } from '../../../../logger/index.ts';\nimport { platform } from '../../../../modules/platform/index.ts';\nimport { scm } from '../../../../modules/platform/scm.ts';\nimport { readLocalFile } from '../../../../util/fs/index.ts';\nimport { EditorConfig } from '../../../../util/json-writer/index.ts';\nimport { detectRepoFileConfig } from '../../init/merge.ts';\n\nexport interface MigratedData {\n  content: string;\n  filename: string;\n  indent: Indent;\n}\n\ninterface Indent {\n  amount: number;\n  indent: string;\n  type?: string;\n}\n\nconst prettierConfigFilenames = new Set([\n  '.prettierrc',\n  '.prettierrc.json',\n  '.prettierrc.yml',\n  '.prettierrc.yaml',\n  '.prettierrc.json5',\n  '.prettierrc.js',\n  '.prettierrc.cjs',\n  '.prettierrc.mjs',\n  'prettier.config.js',\n  'prettier.config.cjs',\n  'prettier.config.mjs',\n  '.prettierrc.toml',\n]);\n\nexport type PrettierParser = BuiltInParserName;\n\nexport async function applyPrettierFormatting(\n  filename: string,\n  content: string,\n  parser: PrettierParser,\n  indent?: Indent,\n): Promise<string> {\n  try {\n    logger.trace('applyPrettierFormatting - START');\n    const fileList = await scm.getFileList();\n    let prettierExists = fileList.some((file) =>\n      prettierConfigFilenames.has(file),\n    );\n\n    const editorconfigExists = fileList.some(\n      (file) => file === '.editorconfig',\n    );\n\n    if (!prettierExists) {\n      try {\n        const packageJsonContent = await readLocalFile('package.json', 'utf8');\n        prettierExists =\n          packageJsonContent && JSON.parse(packageJsonContent).prettier;\n      } catch {\n        logger.warn(\n          'applyPrettierFormatting - Error processing package.json file',\n        );\n      }\n    }\n\n    if (!prettierExists || !parser) {\n      return content;\n    }\n\n    const options: Options = {\n      parser,\n      tabWidth: indent?.amount === 0 ? 2 : indent?.amount,\n      useTabs: indent?.type === 'tab',\n    };\n\n    if (editorconfigExists) {\n      const editorconf = await EditorConfig.getCodeFormat(filename);\n\n      // https://github.com/prettier/prettier/blob/bab892242a1f9d8fcae50514b9304bf03f2e25ab/src/config/editorconfig/editorconfig-to-prettier.js#L47\n      if (editorconf.maxLineLength) {\n        options.printWidth = isNumber(editorconf.maxLineLength)\n          ? editorconf.maxLineLength\n          : Number.POSITIVE_INFINITY;\n      }\n\n      // TODO: support editor config `indent_style` and `indent_size`\n    }\n\n    return prettier().format(content, options);\n  } finally {\n    logger.trace('applyPrettierFormatting - END');\n  }\n}\n\nexport class MigratedDataFactory {\n  // singleton\n  private static data: MigratedData | null;\n\n  static async getAsync(): Promise<MigratedData | null> {\n    if (this.data) {\n      return this.data;\n    }\n    const migrated = await this.build();\n\n    if (!migrated) {\n      return null;\n    }\n\n    this.data = migrated;\n    return this.data;\n  }\n\n  static reset(): void {\n    this.data = null;\n  }\n\n  static applyPrettierFormatting({\n    content,\n    filename,\n    indent,\n  }: MigratedData): Promise<string> {\n    const parser = upath.extname(filename).replace('.', '') as PrettierParser;\n    return applyPrettierFormatting(filename, content, parser, indent);\n  }\n\n  private static async build(): Promise<MigratedData | null> {\n    let res: MigratedData | null = null;\n    try {\n      const { configFileName, configFileParsed = {} } =\n        await detectRepoFileConfig();\n\n      // get migrated config\n      const { isMigrated, migratedConfig } = migrateConfig(configFileParsed);\n      if (!isMigrated) {\n        return null;\n      }\n\n      delete migratedConfig.errors;\n      delete migratedConfig.warnings;\n\n      // TODO #22198\n      const filename = configFileName!;\n      const raw = await platform.getRawFile(filename);\n      const { content, indent } = stringifyMigratedConfig(\n        filename,\n        raw,\n        migratedConfig,\n      );\n\n      res = { content, filename, indent };\n    } catch (err) {\n      logger.debug(\n        { err },\n        'MigratedDataFactory.getAsync() Error initializing renovate MigratedData',\n      );\n    }\n    return res;\n  }\n}\n"],"mappings":";;;;;;;;;;;;;AAyBA,MAAM,0CAA0B,IAAI,IAAI;CACtC;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;AACF,CAAC;AAID,eAAsB,wBACpB,UACA,SACA,QACA,QACiB;CACjB,IAAI;EACF,OAAO,MAAM,iCAAiC;EAC9C,MAAM,WAAW,MAAM,IAAI,YAAY;EACvC,IAAI,iBAAiB,SAAS,MAAM,SAClC,wBAAwB,IAAI,IAAI,CAClC;EAEA,MAAM,qBAAqB,SAAS,MACjC,SAAS,SAAS,eACrB;EAEA,IAAI,CAAC,gBACH,IAAI;GACF,MAAM,qBAAqB,MAAM,cAAc,gBAAgB,MAAM;GACrE,iBACE,sBAAsB,KAAK,MAAM,kBAAkB,CAAC,CAAC;EACzD,QAAQ;GACN,OAAO,KACL,8DACF;EACF;EAGF,IAAI,CAAC,kBAAkB,CAAC,QACtB,OAAO;EAGT,MAAM,UAAmB;GACvB;GACA,UAAU,QAAQ,WAAW,IAAI,IAAI,QAAQ;GAC7C,SAAS,QAAQ,SAAS;EAC5B;EAEA,IAAI,oBAAoB;GACtB,MAAM,aAAa,MAAM,aAAa,cAAc,QAAQ;GAG5D,IAAI,WAAW,eACb,QAAQ,aAAa,SAAS,WAAW,aAAa,IAClD,WAAW,gBACX,OAAO;EAIf;EAEA,OAAO,SAAS,CAAC,CAAC,OAAO,SAAS,OAAO;CAC3C,UAAU;EACR,OAAO,MAAM,+BAA+B;CAC9C;AACF;AAEA,IAAa,sBAAb,MAAiC;CAE/B,OAAe;CAEf,aAAa,WAAyC;EACpD,IAAI,KAAK,MACP,OAAO,KAAK;EAEd,MAAM,WAAW,MAAM,KAAK,MAAM;EAElC,IAAI,CAAC,UACH,OAAO;EAGT,KAAK,OAAO;EACZ,OAAO,KAAK;CACd;CAEA,OAAO,QAAc;EACnB,KAAK,OAAO;CACd;CAEA,OAAO,wBAAwB,EAC7B,SACA,UACA,UACgC;EAEhC,OAAO,wBAAwB,UAAU,SAD1B,MAAM,QAAQ,QAAQ,CAAC,CAAC,QAAQ,KAAK,EACG,GAAG,MAAM;CAClE;CAEA,aAAqB,QAAsC;EACzD,IAAI,MAA2B;EAC/B,IAAI;GACF,MAAM,EAAE,gBAAgB,mBAAmB,CAAC,MAC1C,MAAM,qBAAqB;GAG7B,MAAM,EAAE,YAAY,mBAAmB,cAAc,gBAAgB;GACrE,IAAI,CAAC,YACH,OAAO;GAGT,OAAO,eAAe;GACtB,OAAO,eAAe;GAGtB,MAAM,WAAW;GACjB,MAAM,MAAM,MAAM,SAAS,WAAW,QAAQ;GAC9C,MAAM,EAAE,SAAS,WAAW,wBAC1B,UACA,KACA,cACF;GAEA,MAAM;IAAE;IAAS;IAAU;GAAO;EACpC,SAAS,KAAK;GACZ,OAAO,MACL,EAAE,IAAI,GACN,yEACF;EACF;EACA,OAAO;CACT;AACF"}

package/dist/workers/repository/process/vulnerabilities.js

@@ -13,8 +13,8 @@ import { titleCase } from "../../../util/string.js";
 import { datasourceToOsvEcosystem } from "../../../util/vulnerability/ecosystem.js";
 import { getFixedVersionConstraint, getLastAffectedVersionConstraint } from "../../../util/vulnerability/utils.js";
 import { isEmptyArray, isNonEmptyString, isNullOrUndefined, isTruthy } from "@sindresorhus/is";
-import { z } from "zod/v4";
 import upath from "upath";
+import { z } from "zod/v4";
 import aeCvss from "ae-cvss-calculator";
 // lib/workers/repository/process/vulnerabilities.ts
 const { fromVector } = aeCvss;

package/dist/workers/repository/update/branch/execute-post-upgrade-commands.js

@@ -12,8 +12,8 @@ import { regEx } from "../../../../util/regex.js";
 import { sanitize } from "../../../../util/sanitize.js";
 import { compile } from "../../../../util/template/index.js";
 import { isNonEmptyArray, isString } from "@sindresorhus/is";
-import crypto from "node:crypto";
 import upath from "upath";
+import crypto from "node:crypto";
 // lib/workers/repository/update/branch/execute-post-upgrade-commands.ts
 const ownerExecutePermission = 64;
 const gitExec = withGitEnvironment();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "renovate",
   "description": "Automated dependency updates. Flexible so you don't need to be.",
-  "version": "44.238.2",
+  "version": "44.239.0",
   "type": "module",
   "bin": {
     "renovate": "dist/renovate.js",
@@ -118,7 +118,7 @@
     "@pnpm/parse-overrides": "1001.0.4",
     "@qnighy/marshal": "0.1.3",
     "@redis/client": "6.3.1",
-    "@renovatebot/base-image": "13.166.3",
+    "@renovatebot/base-image": "13.166.4",
     "@renovatebot/detect-tools": "5.0.0",
     "@renovatebot/good-enough-parser": "4.0.3",
     "@renovatebot/osv-offline": "4.5.10",
@@ -215,14 +215,14 @@
     "re2": "1.27.0"
   },
   "devDependencies": {
-    "@biomejs/biome": "2.6.5",
+    "@biomejs/biome": "2.6.6",
     "@commander-js/extra-typings": "15.0.0",
     "@containerbase/istanbul-reports-html": "2.0.25",
     "@containerbase/semantic-release-pnpm": "1.4.4",
     "@hyrious/marshal": "0.3.4",
     "@ls-lint/ls-lint": "2.3.2",
     "@openpgp/web-stream-tools": "0.3.1",
-    "@oxlint/plugins": "1.91.0",
+    "@oxlint/plugins": "1.92.0",
     "@smithy/util-stream": "4.8.2",
     "@types/aws4": "1.11.6",
     "@types/breejs__later": "4.1.5",
@@ -271,7 +271,7 @@
     "nock": "14.0.17",
     "npm-run-all2": "9.0.4",
     "nyc": "18.0.0",
-    "oxlint": "1.91.0",
+    "oxlint": "1.92.0",
     "oxlint-tsgolint": "7.0.2006",
     "rimraf": "6.1.4",
     "semantic-release": "25.0.9",

package/renovate-schema.json

@@ -1,8 +1,8 @@
 {
   "$id": "https://docs.renovatebot.com/renovate-schema.json",
-  "title": "JSON schema for Renovate 44.238.2 config files (https://renovatebot.com/)",
+  "title": "JSON schema for Renovate 44.239.0 config files (https://renovatebot.com/)",
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "x-renovate-version": "44.238.2",
+  "x-renovate-version": "44.239.0",
   "allowComments": true,
   "type": "object",
   "definitions": {