renovate 40.0.0-next.4 → 40.0.0-next.41

package/dist/modules/manager/mix/artifacts.js

@@ -14,13 +14,46 @@ const hexRepoUrl = 'https://hex.pm/';
 const hexRepoOrgUrlRegex = (0, regex_1.regEx)(`^https://hex\\.pm/api/repos/(?<organization>[a-z0-9_]+)/$`);
 async function updateArtifacts({ packageFileName, updatedDeps, newPackageFileContent, config, }) {
     logger_1.logger.debug(`mix.getArtifacts(${packageFileName})`);
-    if (updatedDeps.length < 1) {
-        logger_1.logger.debug('No updated mix deps - returning null');
+    const { isLockFileMaintenance } = config;
+    if (is_1.default.emptyArray(updatedDeps) && !isLockFileMaintenance) {
+        logger_1.logger.debug('No updated mix deps');
+        return null;
+    }
+    let lockFileName = (0, fs_1.getSiblingFileName)(packageFileName, 'mix.lock');
+    let isUmbrella = false;
+    let existingLockFileContent = await (0, fs_1.readLocalFile)(lockFileName, 'utf8');
+    if (!existingLockFileContent) {
+        const lockFileError = await checkLockFileReadError(lockFileName);
+        if (lockFileError) {
+            return lockFileError;
+        }
+        const parentLockFileName = await (0, fs_1.findLocalSiblingOrParent)(packageFileName, 'mix.lock');
+        existingLockFileContent =
+            parentLockFileName && (await (0, fs_1.readLocalFile)(parentLockFileName, 'utf8'));
+        if (parentLockFileName && existingLockFileContent) {
+            lockFileName = parentLockFileName;
+            isUmbrella = true;
+        }
+        else if (parentLockFileName) {
+            const lockFileError = await checkLockFileReadError(parentLockFileName);
+            if (lockFileError) {
+                return lockFileError;
+            }
+        }
+    }
+    if (isLockFileMaintenance && isUmbrella) {
+        logger_1.logger.debug('Cannot use lockFileMaintenance in an umbrella project, see https://docs.renovatebot.com/modules/manager/mix/#lockFileMaintenance');
+        return null;
+    }
+    if (isLockFileMaintenance && !existingLockFileContent) {
+        logger_1.logger.debug('Cannot use lockFileMaintenance when no mix.lock file is present');
         return null;
     }
-    const lockFileName = (await (0, fs_1.findLocalSiblingOrParent)(packageFileName, 'mix.lock')) ?? 'mix.lock';
     try {
         await (0, fs_1.writeLocalFile)(packageFileName, newPackageFileContent);
+        if (isLockFileMaintenance) {
+            await (0, fs_1.deleteLocalFile)(lockFileName);
+        }
     }
     catch (err) {
         logger_1.logger.warn({ err }, 'mix.exs could not be written');
@@ -33,7 +66,6 @@ async function updateArtifacts({ packageFileName, updatedDeps, newPackageFileCon
             },
         ];
     }
-    const existingLockFileContent = await (0, fs_1.readLocalFile)(lockFileName, 'utf8');
     if (!existingLockFileContent) {
         logger_1.logger.debug('No mix.lock found');
         return null;
@@ -72,7 +104,6 @@ async function updateArtifacts({ packageFileName, updatedDeps, newPackageFileCon
     const execOptions = {
         cwdFile: packageFileName,
         docker: {},
-        userConfiguredEnv: config.env,
         toolConstraints: [
             {
                 toolName: 'erlang',
@@ -86,19 +117,25 @@ async function updateArtifacts({ packageFileName, updatedDeps, newPackageFileCon
         ],
         preCommands,
     };
-    const command = [
-        'mix',
-        'deps.update',
-        ...updatedDeps
-            .map((dep) => dep.depName)
-            .filter(is_1.default.string)
-            .map((dep) => (0, shlex_1.quote)(dep)),
-    ].join(' ');
+    let command;
+    if (isLockFileMaintenance) {
+        command = 'mix deps.get';
+    }
+    else {
+        command = [
+            'mix',
+            'deps.update',
+            ...updatedDeps
+                .map((dep) => dep.depName)
+                .filter(is_1.default.string)
+                .map((dep) => (0, shlex_1.quote)(dep)),
+        ].join(' ');
+    }
     try {
         await (0, exec_1.exec)(command, execOptions);
     }
     catch (err) {
-        // istanbul ignore if
+        /* v8 ignore next 3 */
         if (err.message === error_messages_1.TEMPORARY_ERROR) {
             throw err;
         }
@@ -128,4 +165,17 @@ async function updateArtifacts({ packageFileName, updatedDeps, newPackageFileCon
         },
     ];
 }
+async function checkLockFileReadError(lockFileName) {
+    if (await (0, fs_1.localPathExists)(lockFileName)) {
+        return [
+            {
+                artifactError: {
+                    lockFile: lockFileName,
+                    stderr: `Error reading ${lockFileName}`,
+                },
+            },
+        ];
+    }
+    return null;
+}
 //# sourceMappingURL=artifacts.js.map

package/dist/modules/manager/mix/artifacts.js.map

@@ -1 +1 @@
-{"version":3,"file":"artifacts.js","sourceRoot":"","sources":["../../../../lib/modules/manager/mix/artifacts.ts"],"names":[],"mappings":"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","sourcesContent":["import is from '@sindresorhus/is';\nimport { quote } from 'shlex';\nimport { TEMPORARY_ERROR } from '../../../constants/error-messages';\nimport { logger } from '../../../logger';\nimport { exec } from '../../../util/exec';\nimport type { ExecOptions } from '../../../util/exec/types';\nimport {\n  findLocalSiblingOrParent,\n  readLocalFile,\n  writeLocalFile,\n} from '../../../util/fs';\nimport * as hostRules from '../../../util/host-rules';\nimport { regEx } from '../../../util/regex';\n\nimport type { UpdateArtifact, UpdateArtifactsResult } from '../types';\n\nconst hexRepoUrl = 'https://hex.pm/';\nconst hexRepoOrgUrlRegex = regEx(\n  `^https://hex\\\\.pm/api/repos/(?<organization>[a-z0-9_]+)/$`,\n);\n\nexport async function updateArtifacts({\n  packageFileName,\n  updatedDeps,\n  newPackageFileContent,\n  config,\n}: UpdateArtifact): Promise<UpdateArtifactsResult[] | null> {\n  logger.debug(`mix.getArtifacts(${packageFileName})`);\n  if (updatedDeps.length < 1) {\n    logger.debug('No updated mix deps - returning null');\n    return null;\n  }\n\n  const lockFileName =\n    (await findLocalSiblingOrParent(packageFileName, 'mix.lock')) ?? 'mix.lock';\n  try {\n    await writeLocalFile(packageFileName, newPackageFileContent);\n  } catch (err) {\n    logger.warn({ err }, 'mix.exs could not be written');\n    return [\n      {\n        artifactError: {\n          lockFile: lockFileName,\n          stderr: err.message,\n        },\n      },\n    ];\n  }\n\n  const existingLockFileContent = await readLocalFile(lockFileName, 'utf8');\n  if (!existingLockFileContent) {\n    logger.debug('No mix.lock found');\n    return null;\n  }\n\n  const organizations = new Set<string>();\n\n  const hexHostRulesWithMatchHost = hostRules\n    .getAll()\n    .filter(\n      (hostRule) =>\n        !!hostRule.matchHost && hexRepoOrgUrlRegex.test(hostRule.matchHost),\n    );\n\n  for (const { matchHost } of hexHostRulesWithMatchHost) {\n    if (matchHost) {\n      const result = hexRepoOrgUrlRegex.exec(matchHost);\n\n      if (result?.groups) {\n        const { organization } = result.groups;\n        organizations.add(organization);\n      }\n    }\n  }\n\n  for (const { packageName } of updatedDeps) {\n    if (packageName) {\n      const [, organization] = packageName.split(':');\n\n      if (organization) {\n        organizations.add(organization);\n      }\n    }\n  }\n\n  const preCommands = Array.from(organizations).reduce((acc, organization) => {\n    const url = `${hexRepoUrl}api/repos/${organization}/`;\n    const { token } = hostRules.find({ url });\n\n    if (token) {\n      logger.debug(`Authenticating to hex organization ${organization}`);\n      const authCommand = `mix hex.organization auth ${organization} --key ${token}`;\n      return [...acc, authCommand];\n    }\n\n    return acc;\n  }, [] as string[]);\n\n  const execOptions: ExecOptions = {\n    cwdFile: packageFileName,\n    docker: {},\n    userConfiguredEnv: config.env,\n    toolConstraints: [\n      {\n        toolName: 'erlang',\n        // https://hexdocs.pm/elixir/1.14.5/compatibility-and-deprecations.html#compatibility-between-elixir-and-erlang-otp\n        constraint: config.constraints?.erlang ?? '^26',\n      },\n      {\n        toolName: 'elixir',\n        constraint: config.constraints?.elixir,\n      },\n    ],\n    preCommands,\n  };\n  const command = [\n    'mix',\n    'deps.update',\n    ...updatedDeps\n      .map((dep) => dep.depName)\n      .filter(is.string)\n      .map((dep) => quote(dep)),\n  ].join(' ');\n\n  try {\n    await exec(command, execOptions);\n  } catch (err) {\n    // istanbul ignore if\n    if (err.message === TEMPORARY_ERROR) {\n      throw err;\n    }\n\n    logger.debug(\n      { err, message: err.message, command },\n      'Failed to update Mix lock file',\n    );\n\n    return [\n      {\n        artifactError: {\n          lockFile: lockFileName,\n          stderr: err.message,\n        },\n      },\n    ];\n  }\n\n  const newMixLockContent = await readLocalFile(lockFileName, 'utf8');\n  if (existingLockFileContent === newMixLockContent) {\n    logger.debug('mix.lock is unchanged');\n    return null;\n  }\n  logger.debug('Returning updated mix.lock');\n  return [\n    {\n      file: {\n        type: 'addition',\n        path: lockFileName,\n        contents: newMixLockContent,\n      },\n    },\n  ];\n}\n"]}
+{"version":3,"file":"artifacts.js","sourceRoot":"","sources":["../../../../lib/modules/manager/mix/artifacts.ts"],"names":[],"mappings":"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","sourcesContent":["import is from '@sindresorhus/is';\nimport { quote } from 'shlex';\nimport { TEMPORARY_ERROR } from '../../../constants/error-messages';\nimport { logger } from '../../../logger';\nimport { exec } from '../../../util/exec';\nimport type { ExecOptions } from '../../../util/exec/types';\nimport {\n  deleteLocalFile,\n  findLocalSiblingOrParent,\n  getSiblingFileName,\n  localPathExists,\n  readLocalFile,\n  writeLocalFile,\n} from '../../../util/fs';\nimport * as hostRules from '../../../util/host-rules';\nimport { regEx } from '../../../util/regex';\n\nimport type { UpdateArtifact, UpdateArtifactsResult } from '../types';\n\nconst hexRepoUrl = 'https://hex.pm/';\nconst hexRepoOrgUrlRegex = regEx(\n  `^https://hex\\\\.pm/api/repos/(?<organization>[a-z0-9_]+)/$`,\n);\n\nexport async function updateArtifacts({\n  packageFileName,\n  updatedDeps,\n  newPackageFileContent,\n  config,\n}: UpdateArtifact): Promise<UpdateArtifactsResult[] | null> {\n  logger.debug(`mix.getArtifacts(${packageFileName})`);\n  const { isLockFileMaintenance } = config;\n\n  if (is.emptyArray(updatedDeps) && !isLockFileMaintenance) {\n    logger.debug('No updated mix deps');\n    return null;\n  }\n\n  let lockFileName = getSiblingFileName(packageFileName, 'mix.lock');\n  let isUmbrella = false;\n\n  let existingLockFileContent = await readLocalFile(lockFileName, 'utf8');\n  if (!existingLockFileContent) {\n    const lockFileError = await checkLockFileReadError(lockFileName);\n    if (lockFileError) {\n      return lockFileError;\n    }\n\n    const parentLockFileName = await findLocalSiblingOrParent(\n      packageFileName,\n      'mix.lock',\n    );\n    existingLockFileContent =\n      parentLockFileName && (await readLocalFile(parentLockFileName, 'utf8'));\n\n    if (parentLockFileName && existingLockFileContent) {\n      lockFileName = parentLockFileName;\n      isUmbrella = true;\n    } else if (parentLockFileName) {\n      const lockFileError = await checkLockFileReadError(parentLockFileName);\n      if (lockFileError) {\n        return lockFileError;\n      }\n    }\n  }\n\n  if (isLockFileMaintenance && isUmbrella) {\n    logger.debug(\n      'Cannot use lockFileMaintenance in an umbrella project, see https://docs.renovatebot.com/modules/manager/mix/#lockFileMaintenance',\n    );\n    return null;\n  }\n\n  if (isLockFileMaintenance && !existingLockFileContent) {\n    logger.debug(\n      'Cannot use lockFileMaintenance when no mix.lock file is present',\n    );\n    return null;\n  }\n\n  try {\n    await writeLocalFile(packageFileName, newPackageFileContent);\n    if (isLockFileMaintenance) {\n      await deleteLocalFile(lockFileName);\n    }\n  } catch (err) {\n    logger.warn({ err }, 'mix.exs could not be written');\n    return [\n      {\n        artifactError: {\n          lockFile: lockFileName,\n          stderr: err.message,\n        },\n      },\n    ];\n  }\n\n  if (!existingLockFileContent) {\n    logger.debug('No mix.lock found');\n    return null;\n  }\n\n  const organizations = new Set<string>();\n\n  const hexHostRulesWithMatchHost = hostRules\n    .getAll()\n    .filter(\n      (hostRule) =>\n        !!hostRule.matchHost && hexRepoOrgUrlRegex.test(hostRule.matchHost),\n    );\n\n  for (const { matchHost } of hexHostRulesWithMatchHost) {\n    if (matchHost) {\n      const result = hexRepoOrgUrlRegex.exec(matchHost);\n\n      if (result?.groups) {\n        const { organization } = result.groups;\n        organizations.add(organization);\n      }\n    }\n  }\n\n  for (const { packageName } of updatedDeps) {\n    if (packageName) {\n      const [, organization] = packageName.split(':');\n\n      if (organization) {\n        organizations.add(organization);\n      }\n    }\n  }\n\n  const preCommands = Array.from(organizations).reduce((acc, organization) => {\n    const url = `${hexRepoUrl}api/repos/${organization}/`;\n    const { token } = hostRules.find({ url });\n\n    if (token) {\n      logger.debug(`Authenticating to hex organization ${organization}`);\n      const authCommand = `mix hex.organization auth ${organization} --key ${token}`;\n      return [...acc, authCommand];\n    }\n\n    return acc;\n  }, [] as string[]);\n\n  const execOptions: ExecOptions = {\n    cwdFile: packageFileName,\n    docker: {},\n    toolConstraints: [\n      {\n        toolName: 'erlang',\n        // https://hexdocs.pm/elixir/1.14.5/compatibility-and-deprecations.html#compatibility-between-elixir-and-erlang-otp\n        constraint: config.constraints?.erlang ?? '^26',\n      },\n      {\n        toolName: 'elixir',\n        constraint: config.constraints?.elixir,\n      },\n    ],\n    preCommands,\n  };\n\n  let command: string;\n  if (isLockFileMaintenance) {\n    command = 'mix deps.get';\n  } else {\n    command = [\n      'mix',\n      'deps.update',\n      ...updatedDeps\n        .map((dep) => dep.depName)\n        .filter(is.string)\n        .map((dep) => quote(dep)),\n    ].join(' ');\n  }\n\n  try {\n    await exec(command, execOptions);\n  } catch (err) {\n    /* v8 ignore next 3 */\n    if (err.message === TEMPORARY_ERROR) {\n      throw err;\n    }\n\n    logger.debug(\n      { err, message: err.message, command },\n      'Failed to update Mix lock file',\n    );\n\n    return [\n      {\n        artifactError: {\n          lockFile: lockFileName,\n          stderr: err.message,\n        },\n      },\n    ];\n  }\n\n  const newMixLockContent = await readLocalFile(lockFileName, 'utf8');\n  if (existingLockFileContent === newMixLockContent) {\n    logger.debug('mix.lock is unchanged');\n    return null;\n  }\n  logger.debug('Returning updated mix.lock');\n  return [\n    {\n      file: {\n        type: 'addition',\n        path: lockFileName,\n        contents: newMixLockContent,\n      },\n    },\n  ];\n}\n\nasync function checkLockFileReadError(\n  lockFileName: string,\n): Promise<UpdateArtifactsResult[] | null> {\n  if (await localPathExists(lockFileName)) {\n    return [\n      {\n        artifactError: {\n          lockFile: lockFileName,\n          stderr: `Error reading ${lockFileName}`,\n        },\n      },\n    ];\n  }\n  return null;\n}\n"]}

package/dist/modules/manager/mix/index.d.ts

@@ -7,4 +7,5 @@ export declare const categories: Category[];
 export declare const defaultConfig: {
     fileMatch: string[];
 };
+export declare const supportsLockFileMaintenance = true;
 export declare const supportedDatasources: string[];

package/dist/modules/manager/mix/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.supportedDatasources = exports.defaultConfig = exports.categories = exports.url = exports.getRangeStrategy = exports.updateArtifacts = exports.extractPackageFile = void 0;
+exports.supportedDatasources = exports.supportsLockFileMaintenance = exports.defaultConfig = exports.categories = exports.url = exports.getRangeStrategy = exports.updateArtifacts = exports.extractPackageFile = void 0;
 const git_tags_1 = require("../../datasource/git-tags");
 const github_tags_1 = require("../../datasource/github-tags");
 const hex_1 = require("../../datasource/hex");
@@ -15,6 +15,7 @@ exports.categories = ['elixir'];
 exports.defaultConfig = {
     fileMatch: ['(^|/)mix\\.exs$'],
 };
+exports.supportsLockFileMaintenance = true;
 exports.supportedDatasources = [
     github_tags_1.GithubTagsDatasource.id,
     git_tags_1.GitTagsDatasource.id,

package/dist/modules/manager/mix/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../lib/modules/manager/mix/index.ts"],"names":[],"mappings":";;;AACA,wDAA8D;AAC9D,8DAAoE;AACpE,8CAAqD;AAErD,qCAA+C;AAAtC,6GAAA,kBAAkB,OAAA;AAC3B,yCAA8C;AAArC,4GAAA,eAAe,OAAA;AACxB,iCAA2C;AAAlC,yGAAA,gBAAgB,OAAA;AAEZ,QAAA,GAAG,GAAG,iCAAiC,CAAC;AACxC,QAAA,UAAU,GAAe,CAAC,QAAQ,CAAC,CAAC;AAEpC,QAAA,aAAa,GAAG;IAC3B,SAAS,EAAE,CAAC,iBAAiB,CAAC;CAC/B,CAAC;AAEW,QAAA,oBAAoB,GAAG;IAClC,kCAAoB,CAAC,EAAE;IACvB,4BAAiB,CAAC,EAAE;IACpB,mBAAa,CAAC,EAAE;CACjB,CAAC","sourcesContent":["import type { Category } from '../../../constants';\nimport { GitTagsDatasource } from '../../datasource/git-tags';\nimport { GithubTagsDatasource } from '../../datasource/github-tags';\nimport { HexDatasource } from '../../datasource/hex';\n\nexport { extractPackageFile } from './extract';\nexport { updateArtifacts } from './artifacts';\nexport { getRangeStrategy } from './range';\n\nexport const url = 'https://hexdocs.pm/mix/Mix.html';\nexport const categories: Category[] = ['elixir'];\n\nexport const defaultConfig = {\n  fileMatch: ['(^|/)mix\\\\.exs$'],\n};\n\nexport const supportedDatasources = [\n  GithubTagsDatasource.id,\n  GitTagsDatasource.id,\n  HexDatasource.id,\n];\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../lib/modules/manager/mix/index.ts"],"names":[],"mappings":";;;AACA,wDAA8D;AAC9D,8DAAoE;AACpE,8CAAqD;AAErD,qCAA+C;AAAtC,6GAAA,kBAAkB,OAAA;AAC3B,yCAA8C;AAArC,4GAAA,eAAe,OAAA;AACxB,iCAA2C;AAAlC,yGAAA,gBAAgB,OAAA;AAEZ,QAAA,GAAG,GAAG,iCAAiC,CAAC;AACxC,QAAA,UAAU,GAAe,CAAC,QAAQ,CAAC,CAAC;AAEpC,QAAA,aAAa,GAAG;IAC3B,SAAS,EAAE,CAAC,iBAAiB,CAAC;CAC/B,CAAC;AAEW,QAAA,2BAA2B,GAAG,IAAI,CAAC;AACnC,QAAA,oBAAoB,GAAG;IAClC,kCAAoB,CAAC,EAAE;IACvB,4BAAiB,CAAC,EAAE;IACpB,mBAAa,CAAC,EAAE;CACjB,CAAC","sourcesContent":["import type { Category } from '../../../constants';\nimport { GitTagsDatasource } from '../../datasource/git-tags';\nimport { GithubTagsDatasource } from '../../datasource/github-tags';\nimport { HexDatasource } from '../../datasource/hex';\n\nexport { extractPackageFile } from './extract';\nexport { updateArtifacts } from './artifacts';\nexport { getRangeStrategy } from './range';\n\nexport const url = 'https://hexdocs.pm/mix/Mix.html';\nexport const categories: Category[] = ['elixir'];\n\nexport const defaultConfig = {\n  fileMatch: ['(^|/)mix\\\\.exs$'],\n};\n\nexport const supportsLockFileMaintenance = true;\nexport const supportedDatasources = [\n  GithubTagsDatasource.id,\n  GitTagsDatasource.id,\n  HexDatasource.id,\n];\n"]}

package/dist/modules/manager/nix/artifacts.js

@@ -46,7 +46,6 @@ async function updateArtifacts({ packageFileName, config, updatedDeps, }) {
             },
         ],
         docker: {},
-        userConfiguredEnv: config.env,
     };
     try {
         await (0, exec_1.exec)(cmd, execOptions);

package/dist/modules/manager/nix/artifacts.js.map

@@ -1 +1 @@
-{"version":3,"file":"artifacts.js","sourceRoot":"","sources":["../../../../lib/modules/manager/nix/artifacts.ts"],"names":[],"mappings":";;AAYA,0CA2EC;;AAvFD,kEAAkC;AAClC,iCAA8B;AAC9B,4CAAyC;AACzC,2DAA4D;AAC5D,6CAA0C;AAE1C,yCAAiD;AACjD,2CAAkD;AAClD,4EAAsD;AACtD,+CAA4C;AAGrC,KAAK,UAAU,eAAe,CAAC,EACpC,eAAe,EACf,MAAM,EACN,WAAW,GACI;IACf,MAAM,YAAY,GAAG,eAAe,CAAC,OAAO,CAAC,IAAA,aAAK,EAAC,QAAQ,CAAC,EAAE,OAAO,CAAC,CAAC;IACvE,MAAM,uBAAuB,GAAG,MAAM,IAAA,kBAAa,EAAC,YAAY,EAAE,MAAM,CAAC,CAAC;IAC1E,IAAI,CAAC,uBAAuB,EAAE,CAAC;QAC7B,eAAM,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC;QACpC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,GAAG,GAAG,yDAAyD,CAAC;IAEpE,MAAM,KAAK,GAAG,IAAA,6BAAe,EAC3B,SAAS,CAAC,IAAI,CAAC;QACb,QAAQ,EAAE,QAAQ;QAClB,GAAG,EAAE,yBAAyB;KAC/B,CAAC,CACH,CAAC;IAEF,IAAI,KAAK,EAAE,CAAC;QACV,GAAG,IAAI,oCAAoC,KAAK,GAAG,CAAC;IACtD,CAAC;IAED,IAAI,MAAM,CAAC,qBAAqB,EAAE,CAAC;QACjC,GAAG,IAAI,cAAc,CAAC;IACxB,CAAC;SAAM,CAAC;QACN,MAAM,MAAM,GAAG,WAAW;aACvB,GAAG,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,OAAO,CAAC;aAC7B,MAAM,CAAC,YAAE,CAAC,8BAA8B,CAAC;aACzC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,kBAAkB,IAAA,aAAK,EAAC,OAAO,CAAC,EAAE,CAAC;aACpD,IAAI,CAAC,GAAG,CAAC,CAAC;QACb,GAAG,IAAI,cAAc,MAAM,EAAE,CAAC;IAChC,CAAC;IACD,MAAM,WAAW,GAAgB;QAC/B,OAAO,EAAE,eAAe;QACxB,eAAe,EAAE;YACf;gBACE,QAAQ,EAAE,KAAK;gBACf,UAAU,EAAE,MAAM,CAAC,WAAW,EAAE,GAAG;aACpC;SACF;QACD,MAAM,EAAE,EAAE;QACV,iBAAiB,EAAE,MAAM,CAAC,GAAG;KAC9B,CAAC;IAEF,IAAI,CAAC;QACH,MAAM,IAAA,WAAI,EAAC,GAAG,EAAE,WAAW,CAAC,CAAC;QAE7B,MAAM,MAAM,GAAG,MAAM,IAAA,mBAAa,GAAE,CAAC;QACrC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;YAC5C,OAAO,IAAI,CAAC;QACd,CAAC;QACD,eAAM,CAAC,KAAK,CAAC,8BAA8B,CAAC,CAAC;QAC7C,OAAO;YACL;gBACE,IAAI,EAAE;oBACJ,IAAI,EAAE,UAAU;oBAChB,IAAI,EAAE,YAAY;oBAClB,QAAQ,EAAE,MAAM,IAAA,kBAAa,EAAC,YAAY,CAAC;iBAC5C;aACF;SACF,CAAC;IACJ,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,eAAM,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,EAAE,2BAA2B,CAAC,CAAC;QAClD,OAAO;YACL;gBACE,aAAa,EAAE;oBACb,QAAQ,EAAE,YAAY;oBACtB,MAAM,EAAE,GAAG,CAAC,OAAO;iBACpB;aACF;SACF,CAAC;IACJ,CAAC;AACH,CAAC","sourcesContent":["import is from '@sindresorhus/is';\nimport { quote } from 'shlex';\nimport { logger } from '../../../logger';\nimport { findGithubToken } from '../../../util/check-token';\nimport { exec } from '../../../util/exec';\nimport type { ExecOptions } from '../../../util/exec/types';\nimport { readLocalFile } from '../../../util/fs';\nimport { getRepoStatus } from '../../../util/git';\nimport * as hostRules from '../../../util/host-rules';\nimport { regEx } from '../../../util/regex';\nimport type { UpdateArtifact, UpdateArtifactsResult } from '../types';\n\nexport async function updateArtifacts({\n  packageFileName,\n  config,\n  updatedDeps,\n}: UpdateArtifact): Promise<UpdateArtifactsResult[] | null> {\n  const lockFileName = packageFileName.replace(regEx(/\\.nix$/), '.lock');\n  const existingLockFileContent = await readLocalFile(lockFileName, 'utf8');\n  if (!existingLockFileContent) {\n    logger.debug('No flake.lock found');\n    return null;\n  }\n\n  let cmd = `nix --extra-experimental-features 'nix-command flakes' `;\n\n  const token = findGithubToken(\n    hostRules.find({\n      hostType: 'github',\n      url: 'https://api.github.com/',\n    }),\n  );\n\n  if (token) {\n    cmd += `--extra-access-tokens github.com=${token} `;\n  }\n\n  if (config.isLockFileMaintenance) {\n    cmd += 'flake update';\n  } else {\n    const inputs = updatedDeps\n      .map(({ depName }) => depName)\n      .filter(is.nonEmptyStringAndNotWhitespace)\n      .map((depName) => `--update-input ${quote(depName)}`)\n      .join(' ');\n    cmd += `flake lock ${inputs}`;\n  }\n  const execOptions: ExecOptions = {\n    cwdFile: packageFileName,\n    toolConstraints: [\n      {\n        toolName: 'nix',\n        constraint: config.constraints?.nix,\n      },\n    ],\n    docker: {},\n    userConfiguredEnv: config.env,\n  };\n\n  try {\n    await exec(cmd, execOptions);\n\n    const status = await getRepoStatus();\n    if (!status.modified.includes(lockFileName)) {\n      return null;\n    }\n    logger.debug('Returning updated flake.lock');\n    return [\n      {\n        file: {\n          type: 'addition',\n          path: lockFileName,\n          contents: await readLocalFile(lockFileName),\n        },\n      },\n    ];\n  } catch (err) {\n    logger.warn({ err }, 'Error updating flake.lock');\n    return [\n      {\n        artifactError: {\n          lockFile: lockFileName,\n          stderr: err.message,\n        },\n      },\n    ];\n  }\n}\n"]}
+{"version":3,"file":"artifacts.js","sourceRoot":"","sources":["../../../../lib/modules/manager/nix/artifacts.ts"],"names":[],"mappings":";;AAYA,0CA0EC;;AAtFD,kEAAkC;AAClC,iCAA8B;AAC9B,4CAAyC;AACzC,2DAA4D;AAC5D,6CAA0C;AAE1C,yCAAiD;AACjD,2CAAkD;AAClD,4EAAsD;AACtD,+CAA4C;AAGrC,KAAK,UAAU,eAAe,CAAC,EACpC,eAAe,EACf,MAAM,EACN,WAAW,GACI;IACf,MAAM,YAAY,GAAG,eAAe,CAAC,OAAO,CAAC,IAAA,aAAK,EAAC,QAAQ,CAAC,EAAE,OAAO,CAAC,CAAC;IACvE,MAAM,uBAAuB,GAAG,MAAM,IAAA,kBAAa,EAAC,YAAY,EAAE,MAAM,CAAC,CAAC;IAC1E,IAAI,CAAC,uBAAuB,EAAE,CAAC;QAC7B,eAAM,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC;QACpC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,GAAG,GAAG,yDAAyD,CAAC;IAEpE,MAAM,KAAK,GAAG,IAAA,6BAAe,EAC3B,SAAS,CAAC,IAAI,CAAC;QACb,QAAQ,EAAE,QAAQ;QAClB,GAAG,EAAE,yBAAyB;KAC/B,CAAC,CACH,CAAC;IAEF,IAAI,KAAK,EAAE,CAAC;QACV,GAAG,IAAI,oCAAoC,KAAK,GAAG,CAAC;IACtD,CAAC;IAED,IAAI,MAAM,CAAC,qBAAqB,EAAE,CAAC;QACjC,GAAG,IAAI,cAAc,CAAC;IACxB,CAAC;SAAM,CAAC;QACN,MAAM,MAAM,GAAG,WAAW;aACvB,GAAG,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,OAAO,CAAC;aAC7B,MAAM,CAAC,YAAE,CAAC,8BAA8B,CAAC;aACzC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,kBAAkB,IAAA,aAAK,EAAC,OAAO,CAAC,EAAE,CAAC;aACpD,IAAI,CAAC,GAAG,CAAC,CAAC;QACb,GAAG,IAAI,cAAc,MAAM,EAAE,CAAC;IAChC,CAAC;IACD,MAAM,WAAW,GAAgB;QAC/B,OAAO,EAAE,eAAe;QACxB,eAAe,EAAE;YACf;gBACE,QAAQ,EAAE,KAAK;gBACf,UAAU,EAAE,MAAM,CAAC,WAAW,EAAE,GAAG;aACpC;SACF;QACD,MAAM,EAAE,EAAE;KACX,CAAC;IAEF,IAAI,CAAC;QACH,MAAM,IAAA,WAAI,EAAC,GAAG,EAAE,WAAW,CAAC,CAAC;QAE7B,MAAM,MAAM,GAAG,MAAM,IAAA,mBAAa,GAAE,CAAC;QACrC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;YAC5C,OAAO,IAAI,CAAC;QACd,CAAC;QACD,eAAM,CAAC,KAAK,CAAC,8BAA8B,CAAC,CAAC;QAC7C,OAAO;YACL;gBACE,IAAI,EAAE;oBACJ,IAAI,EAAE,UAAU;oBAChB,IAAI,EAAE,YAAY;oBAClB,QAAQ,EAAE,MAAM,IAAA,kBAAa,EAAC,YAAY,CAAC;iBAC5C;aACF;SACF,CAAC;IACJ,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,eAAM,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,EAAE,2BAA2B,CAAC,CAAC;QAClD,OAAO;YACL;gBACE,aAAa,EAAE;oBACb,QAAQ,EAAE,YAAY;oBACtB,MAAM,EAAE,GAAG,CAAC,OAAO;iBACpB;aACF;SACF,CAAC;IACJ,CAAC;AACH,CAAC","sourcesContent":["import is from '@sindresorhus/is';\nimport { quote } from 'shlex';\nimport { logger } from '../../../logger';\nimport { findGithubToken } from '../../../util/check-token';\nimport { exec } from '../../../util/exec';\nimport type { ExecOptions } from '../../../util/exec/types';\nimport { readLocalFile } from '../../../util/fs';\nimport { getRepoStatus } from '../../../util/git';\nimport * as hostRules from '../../../util/host-rules';\nimport { regEx } from '../../../util/regex';\nimport type { UpdateArtifact, UpdateArtifactsResult } from '../types';\n\nexport async function updateArtifacts({\n  packageFileName,\n  config,\n  updatedDeps,\n}: UpdateArtifact): Promise<UpdateArtifactsResult[] | null> {\n  const lockFileName = packageFileName.replace(regEx(/\\.nix$/), '.lock');\n  const existingLockFileContent = await readLocalFile(lockFileName, 'utf8');\n  if (!existingLockFileContent) {\n    logger.debug('No flake.lock found');\n    return null;\n  }\n\n  let cmd = `nix --extra-experimental-features 'nix-command flakes' `;\n\n  const token = findGithubToken(\n    hostRules.find({\n      hostType: 'github',\n      url: 'https://api.github.com/',\n    }),\n  );\n\n  if (token) {\n    cmd += `--extra-access-tokens github.com=${token} `;\n  }\n\n  if (config.isLockFileMaintenance) {\n    cmd += 'flake update';\n  } else {\n    const inputs = updatedDeps\n      .map(({ depName }) => depName)\n      .filter(is.nonEmptyStringAndNotWhitespace)\n      .map((depName) => `--update-input ${quote(depName)}`)\n      .join(' ');\n    cmd += `flake lock ${inputs}`;\n  }\n  const execOptions: ExecOptions = {\n    cwdFile: packageFileName,\n    toolConstraints: [\n      {\n        toolName: 'nix',\n        constraint: config.constraints?.nix,\n      },\n    ],\n    docker: {},\n  };\n\n  try {\n    await exec(cmd, execOptions);\n\n    const status = await getRepoStatus();\n    if (!status.modified.includes(lockFileName)) {\n      return null;\n    }\n    logger.debug('Returning updated flake.lock');\n    return [\n      {\n        file: {\n          type: 'addition',\n          path: lockFileName,\n          contents: await readLocalFile(lockFileName),\n        },\n      },\n    ];\n  } catch (err) {\n    logger.warn({ err }, 'Error updating flake.lock');\n    return [\n      {\n        artifactError: {\n          lockFile: lockFileName,\n          stderr: err.message,\n        },\n      },\n    ];\n  }\n}\n"]}

package/dist/modules/manager/nix/extract.js

@@ -77,7 +77,7 @@ async function extractPackageFile(content, packageFile) {
                     currentValue: flakeOriginal.ref,
                     currentDigest: flakeLocked.rev,
                     datasource: git_refs_1.GitRefsDatasource.id,
-                    packageName: `https://${flakeOriginal.host ?? 'gitlab.com'}/${flakeOriginal.owner}/${flakeOriginal.repo}`,
+                    packageName: `https://${flakeOriginal.host ?? 'gitlab.com'}/${decodeURIComponent(flakeOriginal.owner)}/${flakeOriginal.repo}`,
                 });
                 break;
             case 'git':

package/dist/modules/manager/nix/extract.js.map

@@ -1 +1 @@
-{"version":3,"file":"extract.js","sourceRoot":"","sources":["../../../../lib/modules/manager/nix/extract.ts"],"names":[],"mappings":"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","sourcesContent":["import { logger } from '../../../logger';\nimport { getSiblingFileName, readLocalFile } from '../../../util/fs';\nimport { regEx } from '../../../util/regex';\nimport { GitRefsDatasource } from '../../datasource/git-refs';\nimport { id as nixpkgsVersioning } from '../../versioning/nixpkgs';\nimport type { PackageDependency, PackageFileContent } from '../types';\nimport { NixFlakeLock } from './schema';\n\nconst nixpkgsRegex = regEx(/\"github:nixos\\/nixpkgs(\\/(?<ref>[a-z0-9-.]+))?\"/i);\n\n// as documented upstream\n// https://github.com/NixOS/nix/blob/master/doc/manual/source/protocols/tarball-fetcher.md#gitea-and-forgejo-support\nconst lockableHTTPTarballProtocol = regEx(\n  '^https://(?<domain>[^/]+)/(?<owner>[^/]+)/(?<repo>[^/]+)/archive/(?<rev>.+).tar.gz$',\n);\n\nexport async function extractPackageFile(\n  content: string,\n  packageFile: string,\n): Promise<PackageFileContent | null> {\n  const packageLockFile = getSiblingFileName(packageFile, 'flake.lock');\n  const lockContents = await readLocalFile(packageLockFile, 'utf8');\n\n  logger.trace(`nix.extractPackageFile(${packageLockFile})`);\n\n  const deps: PackageDependency[] = [];\n\n  const match = nixpkgsRegex.exec(content);\n  if (match?.groups) {\n    const { ref } = match.groups;\n    deps.push({\n      depName: 'nixpkgs',\n      currentValue: ref,\n      datasource: GitRefsDatasource.id,\n      packageName: 'https://github.com/NixOS/nixpkgs',\n      versioning: nixpkgsVersioning,\n    });\n  }\n\n  const flakeLockParsed = NixFlakeLock.safeParse(lockContents);\n  if (!flakeLockParsed.success) {\n    logger.debug(\n      { packageLockFile, error: flakeLockParsed.error },\n      `invalid flake.lock file`,\n    );\n    return null;\n  }\n\n  const flakeLock = flakeLockParsed.data;\n  const rootInputs = flakeLock.nodes.root.inputs;\n\n  if (!rootInputs) {\n    logger.debug(\n      { packageLockFile, error: flakeLockParsed.error },\n      `flake.lock is missing \"root\" node`,\n    );\n\n    if (deps.length) {\n      return { deps };\n    }\n    return null;\n  }\n\n  for (const [depName, flakeInput] of Object.entries(flakeLock.nodes)) {\n    // the root input is a magic string for the entrypoint and only references other flake inputs\n    if (depName === 'root') {\n      continue;\n    }\n\n    // skip all locked and transitivie nodes as they cannot be updated by regular means\n    if (!(depName in rootInputs)) {\n      continue;\n    }\n\n    const flakeLocked = flakeInput.locked;\n    const flakeOriginal = flakeInput.original;\n\n    // istanbul ignore if: if we are not in a root node then original and locked always exist which cannot be easily expressed in the type\n    if (flakeLocked === undefined || flakeOriginal === undefined) {\n      logger.debug(\n        { packageLockFile, flakeInput },\n        `Found empty flake input, skipping`,\n      );\n      continue;\n    }\n\n    // indirect inputs cannot be reliable updated because they depend on the flake registry\n    if (flakeOriginal.type === 'indirect') {\n      continue;\n    }\n\n    switch (flakeLocked.type) {\n      case 'github':\n        deps.push({\n          depName,\n          currentValue: flakeOriginal.ref,\n          currentDigest: flakeLocked.rev,\n          datasource: GitRefsDatasource.id,\n          packageName: `https://${flakeOriginal.host ?? 'github.com'}/${flakeOriginal.owner}/${flakeOriginal.repo}`,\n        });\n        break;\n      case 'gitlab':\n        deps.push({\n          depName,\n          currentValue: flakeOriginal.ref,\n          currentDigest: flakeLocked.rev,\n          datasource: GitRefsDatasource.id,\n          packageName: `https://${flakeOriginal.host ?? 'gitlab.com'}/${flakeOriginal.owner}/${flakeOriginal.repo}`,\n        });\n        break;\n      case 'git':\n        deps.push({\n          depName,\n          currentValue: flakeOriginal.ref,\n          currentDigest: flakeLocked.rev,\n          datasource: GitRefsDatasource.id,\n          packageName: flakeOriginal.url,\n        });\n        break;\n      case 'sourcehut':\n        deps.push({\n          depName,\n          currentValue: flakeOriginal.ref,\n          currentDigest: flakeLocked.rev,\n          datasource: GitRefsDatasource.id,\n          packageName: `https://${flakeOriginal.host ?? 'git.sr.ht'}/${flakeOriginal.owner}/${flakeOriginal.repo}`,\n        });\n        break;\n      case 'tarball':\n        deps.push({\n          depName,\n          currentValue: flakeLocked.ref,\n          currentDigest: flakeLocked.rev,\n          datasource: GitRefsDatasource.id,\n          // type tarball always contains this link\n          packageName: flakeOriginal.url!.replace(\n            lockableHTTPTarballProtocol,\n            'https://$<domain>/$<owner>/$<repo>',\n          ),\n        });\n        break;\n      // istanbul ignore next: just a safeguard\n      default:\n        logger.debug(\n          { packageLockFile },\n          `Unknown flake.lock type \"${flakeLocked.type}\", skipping`,\n        );\n        break;\n    }\n  }\n\n  if (deps.length) {\n    return { deps };\n  }\n\n  return null;\n}\n"]}
+{"version":3,"file":"extract.js","sourceRoot":"","sources":["../../../../lib/modules/manager/nix/extract.ts"],"names":[],"mappings":"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","sourcesContent":["import { logger } from '../../../logger';\nimport { getSiblingFileName, readLocalFile } from '../../../util/fs';\nimport { regEx } from '../../../util/regex';\nimport { GitRefsDatasource } from '../../datasource/git-refs';\nimport { id as nixpkgsVersioning } from '../../versioning/nixpkgs';\nimport type { PackageDependency, PackageFileContent } from '../types';\nimport { NixFlakeLock } from './schema';\n\nconst nixpkgsRegex = regEx(/\"github:nixos\\/nixpkgs(\\/(?<ref>[a-z0-9-.]+))?\"/i);\n\n// as documented upstream\n// https://github.com/NixOS/nix/blob/master/doc/manual/source/protocols/tarball-fetcher.md#gitea-and-forgejo-support\nconst lockableHTTPTarballProtocol = regEx(\n  '^https://(?<domain>[^/]+)/(?<owner>[^/]+)/(?<repo>[^/]+)/archive/(?<rev>.+).tar.gz$',\n);\n\nexport async function extractPackageFile(\n  content: string,\n  packageFile: string,\n): Promise<PackageFileContent | null> {\n  const packageLockFile = getSiblingFileName(packageFile, 'flake.lock');\n  const lockContents = await readLocalFile(packageLockFile, 'utf8');\n\n  logger.trace(`nix.extractPackageFile(${packageLockFile})`);\n\n  const deps: PackageDependency[] = [];\n\n  const match = nixpkgsRegex.exec(content);\n  if (match?.groups) {\n    const { ref } = match.groups;\n    deps.push({\n      depName: 'nixpkgs',\n      currentValue: ref,\n      datasource: GitRefsDatasource.id,\n      packageName: 'https://github.com/NixOS/nixpkgs',\n      versioning: nixpkgsVersioning,\n    });\n  }\n\n  const flakeLockParsed = NixFlakeLock.safeParse(lockContents);\n  if (!flakeLockParsed.success) {\n    logger.debug(\n      { packageLockFile, error: flakeLockParsed.error },\n      `invalid flake.lock file`,\n    );\n    return null;\n  }\n\n  const flakeLock = flakeLockParsed.data;\n  const rootInputs = flakeLock.nodes.root.inputs;\n\n  if (!rootInputs) {\n    logger.debug(\n      { packageLockFile, error: flakeLockParsed.error },\n      `flake.lock is missing \"root\" node`,\n    );\n\n    if (deps.length) {\n      return { deps };\n    }\n    return null;\n  }\n\n  for (const [depName, flakeInput] of Object.entries(flakeLock.nodes)) {\n    // the root input is a magic string for the entrypoint and only references other flake inputs\n    if (depName === 'root') {\n      continue;\n    }\n\n    // skip all locked and transitivie nodes as they cannot be updated by regular means\n    if (!(depName in rootInputs)) {\n      continue;\n    }\n\n    const flakeLocked = flakeInput.locked;\n    const flakeOriginal = flakeInput.original;\n\n    // istanbul ignore if: if we are not in a root node then original and locked always exist which cannot be easily expressed in the type\n    if (flakeLocked === undefined || flakeOriginal === undefined) {\n      logger.debug(\n        { packageLockFile, flakeInput },\n        `Found empty flake input, skipping`,\n      );\n      continue;\n    }\n\n    // indirect inputs cannot be reliable updated because they depend on the flake registry\n    if (flakeOriginal.type === 'indirect') {\n      continue;\n    }\n\n    switch (flakeLocked.type) {\n      case 'github':\n        deps.push({\n          depName,\n          currentValue: flakeOriginal.ref,\n          currentDigest: flakeLocked.rev,\n          datasource: GitRefsDatasource.id,\n          packageName: `https://${flakeOriginal.host ?? 'github.com'}/${flakeOriginal.owner}/${flakeOriginal.repo}`,\n        });\n        break;\n      case 'gitlab':\n        deps.push({\n          depName,\n          currentValue: flakeOriginal.ref,\n          currentDigest: flakeLocked.rev,\n          datasource: GitRefsDatasource.id,\n          packageName: `https://${flakeOriginal.host ?? 'gitlab.com'}/${decodeURIComponent(flakeOriginal.owner!)}/${flakeOriginal.repo}`,\n        });\n        break;\n      case 'git':\n        deps.push({\n          depName,\n          currentValue: flakeOriginal.ref,\n          currentDigest: flakeLocked.rev,\n          datasource: GitRefsDatasource.id,\n          packageName: flakeOriginal.url,\n        });\n        break;\n      case 'sourcehut':\n        deps.push({\n          depName,\n          currentValue: flakeOriginal.ref,\n          currentDigest: flakeLocked.rev,\n          datasource: GitRefsDatasource.id,\n          packageName: `https://${flakeOriginal.host ?? 'git.sr.ht'}/${flakeOriginal.owner}/${flakeOriginal.repo}`,\n        });\n        break;\n      case 'tarball':\n        deps.push({\n          depName,\n          currentValue: flakeLocked.ref,\n          currentDigest: flakeLocked.rev,\n          datasource: GitRefsDatasource.id,\n          // type tarball always contains this link\n          packageName: flakeOriginal.url!.replace(\n            lockableHTTPTarballProtocol,\n            'https://$<domain>/$<owner>/$<repo>',\n          ),\n        });\n        break;\n      // istanbul ignore next: just a safeguard\n      default:\n        logger.debug(\n          { packageLockFile },\n          `Unknown flake.lock type \"${flakeLocked.type}\", skipping`,\n        );\n        break;\n    }\n  }\n\n  if (deps.length) {\n    return { deps };\n  }\n\n  return null;\n}\n"]}

package/dist/modules/manager/nix/schema.d.ts

@@ -5,13 +5,13 @@ export declare const NixFlakeLock: z.ZodPipeline<z.ZodEffects<z.ZodString, strin
         locked: z.ZodOptional<z.ZodObject<{
             ref: z.ZodOptional<z.ZodString>;
             rev: z.ZodString;
-            type: z.ZodEnum<["git", "github", "gitlab", "indirect", "sourcehut", "tarball"]>;
+            type: z.ZodEnum<["git", "github", "gitlab", "indirect", "path", "sourcehut", "tarball"]>;
         }, "strip", z.ZodTypeAny, {
-            type: "indirect" | "github" | "gitlab" | "git" | "sourcehut" | "tarball";
+            type: "path" | "github" | "gitlab" | "git" | "indirect" | "sourcehut" | "tarball";
             rev: string;
             ref?: string | undefined;
         }, {
-            type: "indirect" | "github" | "gitlab" | "git" | "sourcehut" | "tarball";
+            type: "path" | "github" | "gitlab" | "git" | "indirect" | "sourcehut" | "tarball";
             rev: string;
             ref?: string | undefined;
         }>>;
@@ -20,49 +20,49 @@ export declare const NixFlakeLock: z.ZodPipeline<z.ZodEffects<z.ZodString, strin
             owner: z.ZodOptional<z.ZodString>;
             repo: z.ZodOptional<z.ZodString>;
             ref: z.ZodOptional<z.ZodString>;
-            type: z.ZodEnum<["git", "github", "gitlab", "indirect", "sourcehut", "tarball"]>;
+            type: z.ZodEnum<["git", "github", "gitlab", "indirect", "path", "sourcehut", "tarball"]>;
             url: z.ZodOptional<z.ZodString>;
         }, "strip", z.ZodTypeAny, {
-            type: "indirect" | "github" | "gitlab" | "git" | "sourcehut" | "tarball";
-            url?: string | undefined;
+            type: "path" | "github" | "gitlab" | "git" | "indirect" | "sourcehut" | "tarball";
             host?: string | undefined;
+            url?: string | undefined;
             ref?: string | undefined;
             repo?: string | undefined;
             owner?: string | undefined;
         }, {
-            type: "indirect" | "github" | "gitlab" | "git" | "sourcehut" | "tarball";
-            url?: string | undefined;
+            type: "path" | "github" | "gitlab" | "git" | "indirect" | "sourcehut" | "tarball";
             host?: string | undefined;
+            url?: string | undefined;
             ref?: string | undefined;
             repo?: string | undefined;
             owner?: string | undefined;
         }>>;
     }, "strip", z.ZodTypeAny, {
         locked?: {
-            type: "indirect" | "github" | "gitlab" | "git" | "sourcehut" | "tarball";
+            type: "path" | "github" | "gitlab" | "git" | "indirect" | "sourcehut" | "tarball";
             rev: string;
             ref?: string | undefined;
         } | undefined;
         inputs?: Record<string, string | string[]> | undefined;
         original?: {
-            type: "indirect" | "github" | "gitlab" | "git" | "sourcehut" | "tarball";
-            url?: string | undefined;
+            type: "path" | "github" | "gitlab" | "git" | "indirect" | "sourcehut" | "tarball";
             host?: string | undefined;
+            url?: string | undefined;
             ref?: string | undefined;
             repo?: string | undefined;
             owner?: string | undefined;
         } | undefined;
     }, {
         locked?: {
-            type: "indirect" | "github" | "gitlab" | "git" | "sourcehut" | "tarball";
+            type: "path" | "github" | "gitlab" | "git" | "indirect" | "sourcehut" | "tarball";
             rev: string;
             ref?: string | undefined;
         } | undefined;
         inputs?: Record<string, string | string[]> | undefined;
         original?: {
-            type: "indirect" | "github" | "gitlab" | "git" | "sourcehut" | "tarball";
-            url?: string | undefined;
+            type: "path" | "github" | "gitlab" | "git" | "indirect" | "sourcehut" | "tarball";
             host?: string | undefined;
+            url?: string | undefined;
             ref?: string | undefined;
             repo?: string | undefined;
             owner?: string | undefined;
@@ -73,15 +73,15 @@ export declare const NixFlakeLock: z.ZodPipeline<z.ZodEffects<z.ZodString, strin
     version: 7;
     nodes: Record<string, {
         locked?: {
-            type: "indirect" | "github" | "gitlab" | "git" | "sourcehut" | "tarball";
+            type: "path" | "github" | "gitlab" | "git" | "indirect" | "sourcehut" | "tarball";
             rev: string;
             ref?: string | undefined;
         } | undefined;
         inputs?: Record<string, string | string[]> | undefined;
         original?: {
-            type: "indirect" | "github" | "gitlab" | "git" | "sourcehut" | "tarball";
-            url?: string | undefined;
+            type: "path" | "github" | "gitlab" | "git" | "indirect" | "sourcehut" | "tarball";
             host?: string | undefined;
+            url?: string | undefined;
             ref?: string | undefined;
             repo?: string | undefined;
             owner?: string | undefined;
@@ -91,15 +91,15 @@ export declare const NixFlakeLock: z.ZodPipeline<z.ZodEffects<z.ZodString, strin
     version: 7;
     nodes: Record<string, {
         locked?: {
-            type: "indirect" | "github" | "gitlab" | "git" | "sourcehut" | "tarball";
+            type: "path" | "github" | "gitlab" | "git" | "indirect" | "sourcehut" | "tarball";
             rev: string;
             ref?: string | undefined;
         } | undefined;
         inputs?: Record<string, string | string[]> | undefined;
         original?: {
-            type: "indirect" | "github" | "gitlab" | "git" | "sourcehut" | "tarball";
-            url?: string | undefined;
+            type: "path" | "github" | "gitlab" | "git" | "indirect" | "sourcehut" | "tarball";
             host?: string | undefined;
+            url?: string | undefined;
             ref?: string | undefined;
             repo?: string | undefined;
             owner?: string | undefined;

package/dist/modules/manager/nix/schema.js

@@ -8,6 +8,7 @@ const InputType = zod_1.z.enum([
     'github',
     'gitlab',
     'indirect',
+    'path',
     'sourcehut',
     'tarball',
 ]);

package/dist/modules/manager/nix/schema.js.map

@@ -1 +1 @@
-{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../../lib/modules/manager/nix/schema.ts"],"names":[],"mappings":";;;AAAA,6BAAwB;AACxB,6DAAkD;AAElD,MAAM,SAAS,GAAG,OAAC,CAAC,IAAI,CAAC;IACvB,KAAK;IACL,QAAQ;IACR,QAAQ;IACR,UAAU;IACV,WAAW;IACX,SAAS;CACV,CAAC,CAAC;AAEH,MAAM,WAAW,GAAG,OAAC,CAAC,MAAM,CAAC;IAC3B,GAAG,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC1B,GAAG,EAAE,OAAC,CAAC,MAAM,EAAE;IACf,IAAI,EAAE,SAAS;CAChB,CAAC,CAAC;AAEH,MAAM,aAAa,GAAG,OAAC,CAAC,MAAM,CAAC;IAC7B,IAAI,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC3B,KAAK,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC5B,IAAI,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC3B,GAAG,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC1B,IAAI,EAAE,SAAS;IACf,GAAG,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CAC3B,CAAC,CAAC;AAEH,MAAM,QAAQ,GAAG,OAAC,CAAC,MAAM,CAAC;IACxB,MAAM,EAAE,OAAC,CAAC,MAAM,CAAC,OAAC,CAAC,MAAM,EAAE,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,OAAC,CAAC,KAAK,CAAC,OAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;IAC3E,MAAM,EAAE,WAAW,CAAC,QAAQ,EAAE;IAC9B,QAAQ,EAAE,aAAa,CAAC,QAAQ,EAAE;CACnC,CAAC,CAAC;AAEU,QAAA,YAAY,GAAG,mBAAI,CAAC,IAAI,CACnC,OAAC,CAAC,MAAM,CAAC;IACP,KAAK,EAAE,OAAC,CAAC,MAAM,CAAC,OAAC,CAAC,MAAM,EAAE,EAAE,QAAQ,CAAC;IACrC,OAAO,EAAE,OAAC,CAAC,OAAO,CAAC,CAAC,CAAC;CACtB,CAAC,CACH,CAAC","sourcesContent":["import { z } from 'zod';\nimport { Json } from '../../../util/schema-utils';\n\nconst InputType = z.enum([\n  'git',\n  'github',\n  'gitlab',\n  'indirect',\n  'sourcehut',\n  'tarball',\n]);\n\nconst LockedInput = z.object({\n  ref: z.string().optional(),\n  rev: z.string(),\n  type: InputType,\n});\n\nconst OriginalInput = z.object({\n  host: z.string().optional(),\n  owner: z.string().optional(),\n  repo: z.string().optional(),\n  ref: z.string().optional(),\n  type: InputType,\n  url: z.string().optional(),\n});\n\nconst NixInput = z.object({\n  inputs: z.record(z.string(), z.string().or(z.array(z.string()))).optional(),\n  locked: LockedInput.optional(),\n  original: OriginalInput.optional(),\n});\n\nexport const NixFlakeLock = Json.pipe(\n  z.object({\n    nodes: z.record(z.string(), NixInput),\n    version: z.literal(7),\n  }),\n);\n\nexport type NixFlakeLock = z.infer<typeof NixFlakeLock>;\n"]}
+{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../../lib/modules/manager/nix/schema.ts"],"names":[],"mappings":";;;AAAA,6BAAwB;AACxB,6DAAkD;AAElD,MAAM,SAAS,GAAG,OAAC,CAAC,IAAI,CAAC;IACvB,KAAK;IACL,QAAQ;IACR,QAAQ;IACR,UAAU;IACV,MAAM;IACN,WAAW;IACX,SAAS;CACV,CAAC,CAAC;AAEH,MAAM,WAAW,GAAG,OAAC,CAAC,MAAM,CAAC;IAC3B,GAAG,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC1B,GAAG,EAAE,OAAC,CAAC,MAAM,EAAE;IACf,IAAI,EAAE,SAAS;CAChB,CAAC,CAAC;AAEH,MAAM,aAAa,GAAG,OAAC,CAAC,MAAM,CAAC;IAC7B,IAAI,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC3B,KAAK,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC5B,IAAI,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC3B,GAAG,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC1B,IAAI,EAAE,SAAS;IACf,GAAG,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CAC3B,CAAC,CAAC;AAEH,MAAM,QAAQ,GAAG,OAAC,CAAC,MAAM,CAAC;IACxB,MAAM,EAAE,OAAC,CAAC,MAAM,CAAC,OAAC,CAAC,MAAM,EAAE,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,OAAC,CAAC,KAAK,CAAC,OAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;IAC3E,MAAM,EAAE,WAAW,CAAC,QAAQ,EAAE;IAC9B,QAAQ,EAAE,aAAa,CAAC,QAAQ,EAAE;CACnC,CAAC,CAAC;AAEU,QAAA,YAAY,GAAG,mBAAI,CAAC,IAAI,CACnC,OAAC,CAAC,MAAM,CAAC;IACP,KAAK,EAAE,OAAC,CAAC,MAAM,CAAC,OAAC,CAAC,MAAM,EAAE,EAAE,QAAQ,CAAC;IACrC,OAAO,EAAE,OAAC,CAAC,OAAO,CAAC,CAAC,CAAC;CACtB,CAAC,CACH,CAAC","sourcesContent":["import { z } from 'zod';\nimport { Json } from '../../../util/schema-utils';\n\nconst InputType = z.enum([\n  'git',\n  'github',\n  'gitlab',\n  'indirect',\n  'path',\n  'sourcehut',\n  'tarball',\n]);\n\nconst LockedInput = z.object({\n  ref: z.string().optional(),\n  rev: z.string(),\n  type: InputType,\n});\n\nconst OriginalInput = z.object({\n  host: z.string().optional(),\n  owner: z.string().optional(),\n  repo: z.string().optional(),\n  ref: z.string().optional(),\n  type: InputType,\n  url: z.string().optional(),\n});\n\nconst NixInput = z.object({\n  inputs: z.record(z.string(), z.string().or(z.array(z.string()))).optional(),\n  locked: LockedInput.optional(),\n  original: OriginalInput.optional(),\n});\n\nexport const NixFlakeLock = Json.pipe(\n  z.object({\n    nodes: z.record(z.string(), NixInput),\n    version: z.literal(7),\n  }),\n);\n\nexport type NixFlakeLock = z.infer<typeof NixFlakeLock>;\n"]}

package/dist/modules/manager/npm/artifacts.js

@@ -48,7 +48,6 @@ async function updateArtifacts({ packageFileName, config, updatedDeps, newPackag
             },
         ],
         docker: {},
-        userConfiguredEnv: config.env,
     };
     await (0, utils_2.updateNpmrcContent)(pkgFileDir, npmrcContent, additionalNpmrcContent);
     try {

package/dist/modules/manager/npm/artifacts.js.map

@@ -1 +1 @@
-{"version":3,"file":"artifacts.js","sourceRoot":"","sources":["../../../../lib/modules/manager/npm/artifacts.ts"],"names":[],"mappings":"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","sourcesContent":["import upath from 'upath';\nimport { logger } from '../../../logger';\nimport { exec } from '../../../util/exec';\nimport type { ExecOptions } from '../../../util/exec/types';\nimport { readLocalFile, writeLocalFile } from '../../../util/fs';\nimport { regEx } from '../../../util/regex';\nimport type { UpdateArtifact, UpdateArtifactsResult } from '../types';\nimport { getNodeToolConstraint } from './post-update/node-version';\nimport { processHostRules } from './post-update/rules';\nimport { lazyLoadPackageJson } from './post-update/utils';\nimport {\n  getNpmrcContent,\n  resetNpmrcContent,\n  updateNpmrcContent,\n} from './utils';\n\n// eg. 8.15.5+sha256.4b4efa12490e5055d59b9b9fc9438b7d581a6b7af3b5675eb5c5f447cee1a589\nconst versionWithHashRegString = '^(?<version>.*)\\\\+(?<hash>.*)';\n\n// Execute 'corepack use' command for npm manager updates\n// This step is necessary because Corepack recommends attaching a hash after the version\n// The hash is generated only after running 'corepack use' and cannot be fetched from the npm registry\nexport async function updateArtifacts({\n  packageFileName,\n  config,\n  updatedDeps,\n  newPackageFileContent: existingPackageFileContent,\n}: UpdateArtifact): Promise<UpdateArtifactsResult[] | null> {\n  logger.debug(`npm.updateArtifacts(${packageFileName})`);\n  const packageManagerUpdate = updatedDeps.find(\n    (dep) => dep.depType === 'packageManager',\n  );\n\n  if (!packageManagerUpdate) {\n    logger.debug('No packageManager updates - returning null');\n    return null;\n  }\n\n  const { currentValue, depName, newVersion } = packageManagerUpdate;\n\n  // Execute 'corepack use' command only if the currentValue already has hash in it\n  if (!currentValue || !regEx(versionWithHashRegString).test(currentValue)) {\n    return null;\n  }\n\n  // write old updates before executing corepack update so that they are not removed from package file\n  await writeLocalFile(packageFileName, existingPackageFileContent);\n\n  // Asumming that corepack only needs to modify the package.json file in the root folder\n  // As it should not be regular practice to have different package managers in different workspaces\n  const pkgFileDir = upath.dirname(packageFileName);\n  const { additionalNpmrcContent } = processHostRules();\n  const npmrcContent = await getNpmrcContent(pkgFileDir);\n  const lazyPkgJson = lazyLoadPackageJson(pkgFileDir);\n  const cmd = `corepack use ${depName}@${newVersion}`;\n\n  const nodeConstraints = await getNodeToolConstraint(\n    config,\n    updatedDeps,\n    pkgFileDir,\n    lazyPkgJson,\n  );\n\n  const execOptions: ExecOptions = {\n    cwdFile: packageFileName,\n    toolConstraints: [\n      nodeConstraints,\n      {\n        toolName: 'corepack',\n        constraint: config.constraints?.corepack,\n      },\n    ],\n    docker: {},\n    userConfiguredEnv: config.env,\n  };\n\n  await updateNpmrcContent(pkgFileDir, npmrcContent, additionalNpmrcContent);\n  try {\n    await exec(cmd, execOptions);\n    await resetNpmrcContent(pkgFileDir, npmrcContent);\n    const newPackageFileContent = await readLocalFile(packageFileName, 'utf8');\n    if (\n      !newPackageFileContent ||\n      existingPackageFileContent === newPackageFileContent\n    ) {\n      return null;\n    }\n    logger.debug('Returning updated package.json');\n    return [\n      {\n        file: {\n          type: 'addition',\n          path: packageFileName,\n          contents: newPackageFileContent,\n        },\n      },\n    ];\n  } catch (err) {\n    logger.warn({ err }, 'Error updating package.json');\n    await resetNpmrcContent(pkgFileDir, npmrcContent);\n    return [\n      {\n        artifactError: {\n          fileName: packageFileName,\n          stderr: err.message,\n        },\n      },\n    ];\n  }\n}\n"]}
+{"version":3,"file":"artifacts.js","sourceRoot":"","sources":["../../../../lib/modules/manager/npm/artifacts.ts"],"names":[],"mappings":"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","sourcesContent":["import upath from 'upath';\nimport { logger } from '../../../logger';\nimport { exec } from '../../../util/exec';\nimport type { ExecOptions } from '../../../util/exec/types';\nimport { readLocalFile, writeLocalFile } from '../../../util/fs';\nimport { regEx } from '../../../util/regex';\nimport type { UpdateArtifact, UpdateArtifactsResult } from '../types';\nimport { getNodeToolConstraint } from './post-update/node-version';\nimport { processHostRules } from './post-update/rules';\nimport { lazyLoadPackageJson } from './post-update/utils';\nimport {\n  getNpmrcContent,\n  resetNpmrcContent,\n  updateNpmrcContent,\n} from './utils';\n\n// eg. 8.15.5+sha256.4b4efa12490e5055d59b9b9fc9438b7d581a6b7af3b5675eb5c5f447cee1a589\nconst versionWithHashRegString = '^(?<version>.*)\\\\+(?<hash>.*)';\n\n// Execute 'corepack use' command for npm manager updates\n// This step is necessary because Corepack recommends attaching a hash after the version\n// The hash is generated only after running 'corepack use' and cannot be fetched from the npm registry\nexport async function updateArtifacts({\n  packageFileName,\n  config,\n  updatedDeps,\n  newPackageFileContent: existingPackageFileContent,\n}: UpdateArtifact): Promise<UpdateArtifactsResult[] | null> {\n  logger.debug(`npm.updateArtifacts(${packageFileName})`);\n  const packageManagerUpdate = updatedDeps.find(\n    (dep) => dep.depType === 'packageManager',\n  );\n\n  if (!packageManagerUpdate) {\n    logger.debug('No packageManager updates - returning null');\n    return null;\n  }\n\n  const { currentValue, depName, newVersion } = packageManagerUpdate;\n\n  // Execute 'corepack use' command only if the currentValue already has hash in it\n  if (!currentValue || !regEx(versionWithHashRegString).test(currentValue)) {\n    return null;\n  }\n\n  // write old updates before executing corepack update so that they are not removed from package file\n  await writeLocalFile(packageFileName, existingPackageFileContent);\n\n  // Asumming that corepack only needs to modify the package.json file in the root folder\n  // As it should not be regular practice to have different package managers in different workspaces\n  const pkgFileDir = upath.dirname(packageFileName);\n  const { additionalNpmrcContent } = processHostRules();\n  const npmrcContent = await getNpmrcContent(pkgFileDir);\n  const lazyPkgJson = lazyLoadPackageJson(pkgFileDir);\n  const cmd = `corepack use ${depName}@${newVersion}`;\n\n  const nodeConstraints = await getNodeToolConstraint(\n    config,\n    updatedDeps,\n    pkgFileDir,\n    lazyPkgJson,\n  );\n\n  const execOptions: ExecOptions = {\n    cwdFile: packageFileName,\n    toolConstraints: [\n      nodeConstraints,\n      {\n        toolName: 'corepack',\n        constraint: config.constraints?.corepack,\n      },\n    ],\n    docker: {},\n  };\n\n  await updateNpmrcContent(pkgFileDir, npmrcContent, additionalNpmrcContent);\n  try {\n    await exec(cmd, execOptions);\n    await resetNpmrcContent(pkgFileDir, npmrcContent);\n    const newPackageFileContent = await readLocalFile(packageFileName, 'utf8');\n    if (\n      !newPackageFileContent ||\n      existingPackageFileContent === newPackageFileContent\n    ) {\n      return null;\n    }\n    logger.debug('Returning updated package.json');\n    return [\n      {\n        file: {\n          type: 'addition',\n          path: packageFileName,\n          contents: newPackageFileContent,\n        },\n      },\n    ];\n  } catch (err) {\n    logger.warn({ err }, 'Error updating package.json');\n    await resetNpmrcContent(pkgFileDir, npmrcContent);\n    return [\n      {\n        artifactError: {\n          fileName: packageFileName,\n          stderr: err.message,\n        },\n      },\n    ];\n  }\n}\n"]}

package/dist/modules/manager/npm/extract/common/package-file.js

@@ -111,6 +111,7 @@ function extractPackageJson(packageJson, packageFile) {
         managerData: {
             packageJsonName,
             hasPackageManager: is_1.default.nonEmptyStringAndNotWhitespace(packageJson.packageManager),
+            workspaces: packageJson.workspaces,
         },
     };
 }

package/dist/modules/manager/npm/extract/common/package-file.js.map

@@ -1 +1 @@
-{"version":3,"file":"package-file.js","sourceRoot":"","sources":["../../../../../../lib/modules/manager/npm/extract/common/package-file.ts"],"names":[],"mappings":"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","sourcesContent":["import { parsePkgAndParentSelector } from '@pnpm/parse-overrides';\nimport is from '@sindresorhus/is';\nimport { CONFIG_VALIDATION } from '../../../../../constants/error-messages';\nimport { logger } from '../../../../../logger';\nimport { regEx } from '../../../../../util/regex';\nimport type { PackageDependency, PackageFileContent } from '../../../types';\nimport type { NpmManagerData } from '../../types';\nimport type { NpmPackage, NpmPackageDependency } from '../types';\nimport {\n  extractDependency,\n  getExtractedConstraints,\n  parseDepName,\n} from './dependency';\nimport { setNodeCommitTopic } from './node';\nimport { extractOverrideDepsRec } from './overrides';\n\nexport function extractPackageJson(\n  packageJson: NpmPackage,\n  packageFile: string,\n): PackageFileContent<NpmManagerData> | null {\n  logger.trace(`npm.extractPackageJson(${packageFile})`);\n  const deps: PackageDependency[] = [];\n\n  if (packageJson._id && packageJson._args && packageJson._from) {\n    logger.debug({ packageFile }, 'Ignoring vendorised package.json');\n    return null;\n  }\n  if (packageFile !== 'package.json' && packageJson.renovate) {\n    const error = new Error(CONFIG_VALIDATION);\n    error.validationSource = packageFile;\n    error.validationError =\n      'Nested package.json must not contain Renovate configuration. Please use `packageRules` with `matchFileNames` in your main config instead.';\n    throw error;\n  }\n  const packageJsonName = packageJson.name;\n  logger.debug(\n    `npm file ${packageFile} has name ${JSON.stringify(packageJsonName)}`,\n  );\n  const packageFileVersion = packageJson.version;\n\n  const depTypes = {\n    dependencies: 'dependency',\n    devDependencies: 'devDependency',\n    optionalDependencies: 'optionalDependency',\n    peerDependencies: 'peerDependency',\n    engines: 'engine',\n    volta: 'volta',\n    resolutions: 'resolutions',\n    packageManager: 'packageManager',\n    overrides: 'overrides',\n    pnpm: 'pnpm',\n  };\n\n  for (const depType of Object.keys(depTypes) as (keyof typeof depTypes)[]) {\n    let dependencies = packageJson[depType];\n    if (dependencies) {\n      try {\n        if (depType === 'packageManager') {\n          const match = regEx('^(?<name>.+)@(?<range>.+)$').exec(\n            dependencies as string,\n          );\n          // istanbul ignore next\n          if (!match?.groups) {\n            break;\n          }\n          dependencies = { [match.groups.name]: match.groups.range };\n        }\n        for (const [key, val] of Object.entries(\n          dependencies as NpmPackageDependency,\n        )) {\n          const depName = parseDepName(depType, key);\n          let dep: PackageDependency = {\n            depType,\n            depName,\n          };\n          if (depName !== key) {\n            dep.managerData = { key };\n          }\n          if (depType === 'overrides' && !is.string(val)) {\n            // TODO: fix type #22198\n            deps.push(\n              ...extractOverrideDepsRec(\n                [depName],\n                val as unknown as NpmManagerData,\n              ),\n            );\n          } else if (depType === 'pnpm' && depName === 'overrides') {\n            // pnpm overrides\n            // https://pnpm.io/package_json#pnpmoverrides\n            for (const [overridesKey, overridesVal] of Object.entries(\n              val as unknown as NpmPackageDependency,\n            )) {\n              if (is.string(overridesVal)) {\n                // Newer flat syntax: `parent>parent>child`\n                const packageName =\n                  parsePkgAndParentSelector(overridesKey).targetPkg.name;\n                dep = {\n                  depName: overridesKey,\n                  packageName,\n                  depType: 'pnpm.overrides',\n                  ...extractDependency(depName, packageName, overridesVal),\n                };\n                setNodeCommitTopic(dep);\n                // TODO: Is this expected? It's always 'overrides'.\n                dep.prettyDepType = depTypes[depName];\n                deps.push(dep);\n              } else if (is.object(overridesVal)) {\n                // Older nested object syntax: `parent: { parent: { child: version } }`\n                deps.push(\n                  ...extractOverrideDepsRec(\n                    [overridesKey],\n                    overridesVal as unknown as NpmManagerData,\n                  ),\n                );\n              }\n            }\n          } else {\n            // TODO: fix type #22198\n            dep = { ...dep, ...extractDependency(depType, depName, val!) };\n            setNodeCommitTopic(dep);\n            dep.prettyDepType = depTypes[depType];\n            deps.push(dep);\n          }\n        }\n      } catch (err) /* istanbul ignore next */ {\n        logger.debug(\n          { fileName: packageFile, depType, err },\n          'Error parsing package.json',\n        );\n        return null;\n      }\n    }\n  }\n\n  const extractedConstraints = getExtractedConstraints(deps);\n\n  return {\n    deps,\n    extractedConstraints,\n    packageFileVersion,\n    managerData: {\n      packageJsonName,\n      hasPackageManager: is.nonEmptyStringAndNotWhitespace(\n        packageJson.packageManager,\n      ),\n    },\n  };\n}\n"]}
+{"version":3,"file":"package-file.js","sourceRoot":"","sources":["../../../../../../lib/modules/manager/npm/extract/common/package-file.ts"],"names":[],"mappings":"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","sourcesContent":["import { parsePkgAndParentSelector } from '@pnpm/parse-overrides';\nimport is from '@sindresorhus/is';\nimport { CONFIG_VALIDATION } from '../../../../../constants/error-messages';\nimport { logger } from '../../../../../logger';\nimport { regEx } from '../../../../../util/regex';\nimport type { PackageDependency, PackageFileContent } from '../../../types';\nimport type { NpmManagerData } from '../../types';\nimport type { NpmPackage, NpmPackageDependency } from '../types';\nimport {\n  extractDependency,\n  getExtractedConstraints,\n  parseDepName,\n} from './dependency';\nimport { setNodeCommitTopic } from './node';\nimport { extractOverrideDepsRec } from './overrides';\n\nexport function extractPackageJson(\n  packageJson: NpmPackage,\n  packageFile: string,\n): PackageFileContent<NpmManagerData> | null {\n  logger.trace(`npm.extractPackageJson(${packageFile})`);\n  const deps: PackageDependency[] = [];\n\n  if (packageJson._id && packageJson._args && packageJson._from) {\n    logger.debug({ packageFile }, 'Ignoring vendorised package.json');\n    return null;\n  }\n  if (packageFile !== 'package.json' && packageJson.renovate) {\n    const error = new Error(CONFIG_VALIDATION);\n    error.validationSource = packageFile;\n    error.validationError =\n      'Nested package.json must not contain Renovate configuration. Please use `packageRules` with `matchFileNames` in your main config instead.';\n    throw error;\n  }\n  const packageJsonName = packageJson.name;\n  logger.debug(\n    `npm file ${packageFile} has name ${JSON.stringify(packageJsonName)}`,\n  );\n  const packageFileVersion = packageJson.version;\n\n  const depTypes = {\n    dependencies: 'dependency',\n    devDependencies: 'devDependency',\n    optionalDependencies: 'optionalDependency',\n    peerDependencies: 'peerDependency',\n    engines: 'engine',\n    volta: 'volta',\n    resolutions: 'resolutions',\n    packageManager: 'packageManager',\n    overrides: 'overrides',\n    pnpm: 'pnpm',\n  };\n\n  for (const depType of Object.keys(depTypes) as (keyof typeof depTypes)[]) {\n    let dependencies = packageJson[depType];\n    if (dependencies) {\n      try {\n        if (depType === 'packageManager') {\n          const match = regEx('^(?<name>.+)@(?<range>.+)$').exec(\n            dependencies as string,\n          );\n          // istanbul ignore next\n          if (!match?.groups) {\n            break;\n          }\n          dependencies = { [match.groups.name]: match.groups.range };\n        }\n        for (const [key, val] of Object.entries(\n          dependencies as NpmPackageDependency,\n        )) {\n          const depName = parseDepName(depType, key);\n          let dep: PackageDependency = {\n            depType,\n            depName,\n          };\n          if (depName !== key) {\n            dep.managerData = { key };\n          }\n          if (depType === 'overrides' && !is.string(val)) {\n            // TODO: fix type #22198\n            deps.push(\n              ...extractOverrideDepsRec(\n                [depName],\n                val as unknown as NpmManagerData,\n              ),\n            );\n          } else if (depType === 'pnpm' && depName === 'overrides') {\n            // pnpm overrides\n            // https://pnpm.io/package_json#pnpmoverrides\n            for (const [overridesKey, overridesVal] of Object.entries(\n              val as unknown as NpmPackageDependency,\n            )) {\n              if (is.string(overridesVal)) {\n                // Newer flat syntax: `parent>parent>child`\n                const packageName =\n                  parsePkgAndParentSelector(overridesKey).targetPkg.name;\n                dep = {\n                  depName: overridesKey,\n                  packageName,\n                  depType: 'pnpm.overrides',\n                  ...extractDependency(depName, packageName, overridesVal),\n                };\n                setNodeCommitTopic(dep);\n                // TODO: Is this expected? It's always 'overrides'.\n                dep.prettyDepType = depTypes[depName];\n                deps.push(dep);\n              } else if (is.object(overridesVal)) {\n                // Older nested object syntax: `parent: { parent: { child: version } }`\n                deps.push(\n                  ...extractOverrideDepsRec(\n                    [overridesKey],\n                    overridesVal as unknown as NpmManagerData,\n                  ),\n                );\n              }\n            }\n          } else {\n            // TODO: fix type #22198\n            dep = { ...dep, ...extractDependency(depType, depName, val!) };\n            setNodeCommitTopic(dep);\n            dep.prettyDepType = depTypes[depType];\n            deps.push(dep);\n          }\n        }\n      } catch (err) /* istanbul ignore next */ {\n        logger.debug(\n          { fileName: packageFile, depType, err },\n          'Error parsing package.json',\n        );\n        return null;\n      }\n    }\n  }\n\n  const extractedConstraints = getExtractedConstraints(deps);\n\n  return {\n    deps,\n    extractedConstraints,\n    packageFileVersion,\n    managerData: {\n      packageJsonName,\n      hasPackageManager: is.nonEmptyStringAndNotWhitespace(\n        packageJson.packageManager,\n      ),\n      workspaces: packageJson.workspaces,\n    },\n  };\n}\n"]}

package/dist/modules/manager/npm/extract/yarn.js

@@ -65,14 +65,14 @@ function getZeroInstallPaths(yarnrcYml) {
         logger_1.logger.warn({ err }, 'Error parsing .yarnrc.yml');
     }
     const paths = [
-        conf?.cacheFolder || './.yarn/cache',
+        conf?.cacheFolder ?? './.yarn/cache',
         '.pnp.cjs',
         '.pnp.js',
         '.pnp.loader.mjs',
     ];
     if (conf &&
         core_1.miscUtils.tryParseOptionalBoolean(conf.pnpEnableInlining) === false) {
-        paths.push(conf.pnpDataPath || './.pnp.data.json');
+        paths.push(conf.pnpDataPath ?? './.pnp.data.json');
     }
     return paths;
 }

package/dist/modules/manager/npm/extract/yarn.js.map

@@ -1 +1 @@
-{"version":3,"file":"yarn.js","sourceRoot":"","sources":["../../../../../lib/modules/manager/npm/extract/yarn.ts"],"names":[],"mappings":"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","sourcesContent":["import is from '@sindresorhus/is';\nimport { miscUtils, structUtils } from '@yarnpkg/core';\nimport { parseSyml } from '@yarnpkg/parsers';\nimport { logger } from '../../../../logger';\nimport {\n  getSiblingFileName,\n  localPathExists,\n  readLocalFile,\n} from '../../../../util/fs';\nimport type { LockFile } from './types';\n\nexport async function getYarnLock(filePath: string): Promise<LockFile> {\n  // TODO #22198\n  const yarnLockRaw = (await readLocalFile(filePath, 'utf8'))!;\n  try {\n    const parsed = parseSyml(yarnLockRaw);\n    const lockedVersions: Record<string, string> = {};\n    let lockfileVersion: number | undefined;\n\n    for (const [key, val] of Object.entries(parsed)) {\n      if (key === '__metadata') {\n        // yarn 2\n        lockfileVersion = parseInt(val.cacheKey, 10);\n        logger.once.debug(\n          `yarn.lock ${filePath} has __metadata.cacheKey=${lockfileVersion}`,\n        );\n      } else {\n        for (const entry of key.split(', ')) {\n          try {\n            const { scope, name, range } = structUtils.parseDescriptor(entry);\n            const packageName = scope ? `@${scope}/${name}` : name;\n            const { selector } = structUtils.parseRange(range);\n\n            logger.trace({ entry, version: val.version });\n            lockedVersions[packageName + '@' + selector] = parsed[key].version;\n          } catch (err) {\n            logger.debug(\n              { entry, err },\n              'Invalid descriptor or range found in yarn.lock',\n            );\n          }\n        }\n      }\n    }\n    const isYarn1 = !('__metadata' in parsed);\n    if (isYarn1) {\n      logger.once.debug(\n        `yarn.lock ${filePath} is has no __metadata so is yarn 1`,\n      );\n    } else {\n      logger.once.debug(\n        `yarn.lock ${filePath} is has __metadata so is yarn 2+`,\n      );\n    }\n    return {\n      isYarn1,\n      lockfileVersion,\n      lockedVersions,\n    };\n  } catch (err) {\n    logger.debug({ filePath, err }, 'Warning: Exception parsing yarn.lock');\n    return { isYarn1: true, lockedVersions: {} };\n  }\n}\n\nexport function getZeroInstallPaths(yarnrcYml: string): string[] {\n  let conf: any;\n  try {\n    conf = parseSyml(yarnrcYml);\n  } catch (err) /* istanbul ignore next */ {\n    logger.warn({ err }, 'Error parsing .yarnrc.yml');\n  }\n  const paths = [\n    conf?.cacheFolder || './.yarn/cache',\n    '.pnp.cjs',\n    '.pnp.js',\n    '.pnp.loader.mjs',\n  ];\n  if (\n    conf &&\n    miscUtils.tryParseOptionalBoolean(conf.pnpEnableInlining) === false\n  ) {\n    paths.push(conf.pnpDataPath || './.pnp.data.json');\n  }\n  return paths;\n}\n\nexport async function isZeroInstall(yarnrcYmlPath: string): Promise<boolean> {\n  const yarnrcYml = await readLocalFile(yarnrcYmlPath, 'utf8');\n  if (is.string(yarnrcYml)) {\n    const paths = getZeroInstallPaths(yarnrcYml);\n    for (const p of paths) {\n      if (await localPathExists(getSiblingFileName(yarnrcYmlPath, p))) {\n        logger.debug(`Detected Yarn zero-install in ${p}`);\n        return true;\n      }\n    }\n  }\n  return false;\n}\n\nexport function getYarnVersionFromLock(lockfile: LockFile): string {\n  const { lockfileVersion, isYarn1 } = lockfile;\n  if (isYarn1) {\n    return '^1.22.18';\n  }\n  if (lockfileVersion && lockfileVersion >= 12) {\n    // This will probably be v5\n    return '>=4.0.0';\n  }\n  if (lockfileVersion && lockfileVersion >= 10) {\n    return '^4.0.0';\n  }\n  if (lockfileVersion && lockfileVersion >= 8) {\n    // https://github.com/yarnpkg/berry/commit/9bcd27ae34aee77a567dd104947407532fa179b3\n    return '^3.0.0';\n  } else if (lockfileVersion && lockfileVersion >= 6) {\n    // https://github.com/yarnpkg/berry/commit/f753790380cbda5b55d028ea84b199445129f9ba\n    return '^2.2.0';\n  }\n\n  return '^2.0.0';\n}\n"]}
+{"version":3,"file":"yarn.js","sourceRoot":"","sources":["../../../../../lib/modules/manager/npm/extract/yarn.ts"],"names":[],"mappings":"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","sourcesContent":["import is from '@sindresorhus/is';\nimport { miscUtils, structUtils } from '@yarnpkg/core';\nimport { parseSyml } from '@yarnpkg/parsers';\nimport { logger } from '../../../../logger';\nimport {\n  getSiblingFileName,\n  localPathExists,\n  readLocalFile,\n} from '../../../../util/fs';\nimport type { LockFile } from './types';\n\nexport async function getYarnLock(filePath: string): Promise<LockFile> {\n  // TODO #22198\n  const yarnLockRaw = (await readLocalFile(filePath, 'utf8'))!;\n  try {\n    const parsed = parseSyml(yarnLockRaw);\n    const lockedVersions: Record<string, string> = {};\n    let lockfileVersion: number | undefined;\n\n    for (const [key, val] of Object.entries(parsed)) {\n      if (key === '__metadata') {\n        // yarn 2\n        lockfileVersion = parseInt(val.cacheKey, 10);\n        logger.once.debug(\n          `yarn.lock ${filePath} has __metadata.cacheKey=${lockfileVersion}`,\n        );\n      } else {\n        for (const entry of key.split(', ')) {\n          try {\n            const { scope, name, range } = structUtils.parseDescriptor(entry);\n            const packageName = scope ? `@${scope}/${name}` : name;\n            const { selector } = structUtils.parseRange(range);\n\n            logger.trace({ entry, version: val.version });\n            lockedVersions[packageName + '@' + selector] = parsed[key].version;\n          } catch (err) {\n            logger.debug(\n              { entry, err },\n              'Invalid descriptor or range found in yarn.lock',\n            );\n          }\n        }\n      }\n    }\n    const isYarn1 = !('__metadata' in parsed);\n    if (isYarn1) {\n      logger.once.debug(\n        `yarn.lock ${filePath} is has no __metadata so is yarn 1`,\n      );\n    } else {\n      logger.once.debug(\n        `yarn.lock ${filePath} is has __metadata so is yarn 2+`,\n      );\n    }\n    return {\n      isYarn1,\n      lockfileVersion,\n      lockedVersions,\n    };\n  } catch (err) {\n    logger.debug({ filePath, err }, 'Warning: Exception parsing yarn.lock');\n    return { isYarn1: true, lockedVersions: {} };\n  }\n}\n\nexport function getZeroInstallPaths(yarnrcYml: string): string[] {\n  let conf: any;\n  try {\n    conf = parseSyml(yarnrcYml);\n  } catch (err) /* istanbul ignore next */ {\n    logger.warn({ err }, 'Error parsing .yarnrc.yml');\n  }\n  const paths = [\n    conf?.cacheFolder ?? './.yarn/cache',\n    '.pnp.cjs',\n    '.pnp.js',\n    '.pnp.loader.mjs',\n  ];\n  if (\n    conf &&\n    miscUtils.tryParseOptionalBoolean(conf.pnpEnableInlining) === false\n  ) {\n    paths.push(conf.pnpDataPath ?? './.pnp.data.json');\n  }\n  return paths;\n}\n\nexport async function isZeroInstall(yarnrcYmlPath: string): Promise<boolean> {\n  const yarnrcYml = await readLocalFile(yarnrcYmlPath, 'utf8');\n  if (is.string(yarnrcYml)) {\n    const paths = getZeroInstallPaths(yarnrcYml);\n    for (const p of paths) {\n      if (await localPathExists(getSiblingFileName(yarnrcYmlPath, p))) {\n        logger.debug(`Detected Yarn zero-install in ${p}`);\n        return true;\n      }\n    }\n  }\n  return false;\n}\n\nexport function getYarnVersionFromLock(lockfile: LockFile): string {\n  const { lockfileVersion, isYarn1 } = lockfile;\n  if (isYarn1) {\n    return '^1.22.18';\n  }\n  if (lockfileVersion && lockfileVersion >= 12) {\n    // This will probably be v5\n    return '>=4.0.0';\n  }\n  if (lockfileVersion && lockfileVersion >= 10) {\n    return '^4.0.0';\n  }\n  if (lockfileVersion && lockfileVersion >= 8) {\n    // https://github.com/yarnpkg/berry/commit/9bcd27ae34aee77a567dd104947407532fa179b3\n    return '^3.0.0';\n  } else if (lockfileVersion && lockfileVersion >= 6) {\n    // https://github.com/yarnpkg/berry/commit/f753790380cbda5b55d028ea84b199445129f9ba\n    return '^2.2.0';\n  }\n\n  return '^2.0.0';\n}\n"]}

package/dist/modules/manager/npm/post-update/npm.js

@@ -81,7 +81,6 @@ async function generateLockFile(lockFileDir, env, filename, config = {}, upgrade
         };
         const execOptions = {
             cwdFile: lockFileName,
-            userConfiguredEnv: config.env,
             extraEnv,
             toolConstraints: [
                 await (0, node_version_1.getNodeToolConstraint)(config, upgrades, lockFileDir, lazyPkgJson),