diff --git a/lib/modules/manager/npm/extract/__snapshots__/index.spec.ts.snap b/lib/modules/manager/npm/extract/__snapshots__/index.spec.ts.snap
index 70ba4beac143d61d0207d37c6b923a674bc8cf02..96a7667e98f53db2fa82c781e2e9a133e62c65a7 100644
--- a/lib/modules/manager/npm/extract/__snapshots__/index.spec.ts.snap
+++ b/lib/modules/manager/npm/extract/__snapshots__/index.spec.ts.snap
@@ -2,7 +2,6 @@
exports[`modules/manager/npm/extract/index .extractPackageFile() catches invalid names 1`] = `
{
- "constraints": {},
"deps": [
{
"depName": "kgabis/parson",
@@ -11,6 +10,7 @@ exports[`modules/manager/npm/extract/index .extractPackageFile() catches invalid
"skipReason": "invalid-name",
},
],
+ "extractedConstraints": {},
"lernaClient": undefined,
"lernaPackages": undefined,
"managerData": {
@@ -31,12 +31,6 @@ exports[`modules/manager/npm/extract/index .extractPackageFile() catches invalid
exports[`modules/manager/npm/extract/index .extractPackageFile() extracts engines 1`] = `
{
- "constraints": {
- "node": ">= 8.9.2",
- "npm": "^8.0.0",
- "vscode": ">=1.49.3",
- "yarn": "disabled",
- },
"deps": [
{
"currentValue": "1.6.0",
@@ -132,6 +126,12 @@ exports[`modules/manager/npm/extract/index .extractPackageFile() extracts engine
"prettyDepType": "engine",
},
],
+ "extractedConstraints": {
+ "node": ">= 8.9.2",
+ "npm": "^8.0.0",
+ "vscode": ">=1.49.3",
+ "yarn": "disabled",
+ },
"lernaClient": undefined,
"lernaPackages": undefined,
"managerData": {
@@ -152,7 +152,6 @@ exports[`modules/manager/npm/extract/index .extractPackageFile() extracts engine
exports[`modules/manager/npm/extract/index .extractPackageFile() extracts non-npmjs 1`] = `
{
- "constraints": {},
"deps": [
{
"currentValue": "github:owner/a",
@@ -312,6 +311,7 @@ exports[`modules/manager/npm/extract/index .extractPackageFile() extracts non-np
"sourceUrl": "https://github.com/Owner/P",
},
],
+ "extractedConstraints": {},
"lernaClient": undefined,
"lernaPackages": undefined,
"managerData": {
@@ -332,7 +332,6 @@ exports[`modules/manager/npm/extract/index .extractPackageFile() extracts non-np
exports[`modules/manager/npm/extract/index .extractPackageFile() extracts npm package alias 1`] = `
{
- "constraints": {},
"deps": [
{
"currentValue": "1",
@@ -361,6 +360,7 @@ exports[`modules/manager/npm/extract/index .extractPackageFile() extracts npm pa
"skipReason": "unknown-version",
},
],
+ "extractedConstraints": {},
"lernaClient": undefined,
"lernaPackages": undefined,
"managerData": {
@@ -381,9 +381,6 @@ exports[`modules/manager/npm/extract/index .extractPackageFile() extracts npm pa
exports[`modules/manager/npm/extract/index .extractPackageFile() extracts packageManager 1`] = `
{
- "constraints": {
- "yarn": "3.0.0",
- },
"deps": [
{
"commitMessageTopic": "Yarn",
@@ -395,6 +392,9 @@ exports[`modules/manager/npm/extract/index .extractPackageFile() extracts packag
"prettyDepType": "packageManager",
},
],
+ "extractedConstraints": {
+ "yarn": "3.0.0",
+ },
"lernaClient": undefined,
"lernaPackages": undefined,
"managerData": {
@@ -415,9 +415,6 @@ exports[`modules/manager/npm/extract/index .extractPackageFile() extracts packag
exports[`modules/manager/npm/extract/index .extractPackageFile() extracts volta 1`] = `
{
- "constraints": {
- "node": "8.9.2",
- },
"deps": [
{
"commitMessageTopic": "Node.js",
@@ -462,6 +459,9 @@ exports[`modules/manager/npm/extract/index .extractPackageFile() extracts volta
"skipReason": "unknown-volta",
},
],
+ "extractedConstraints": {
+ "node": "8.9.2",
+ },
"lernaClient": undefined,
"lernaPackages": undefined,
"managerData": {
@@ -482,9 +482,6 @@ exports[`modules/manager/npm/extract/index .extractPackageFile() extracts volta
exports[`modules/manager/npm/extract/index .extractPackageFile() extracts volta yarn unknown-version 1`] = `
{
- "constraints": {
- "node": "8.9.2",
- },
"deps": [
{
"commitMessageTopic": "Node.js",
@@ -516,6 +513,9 @@ exports[`modules/manager/npm/extract/index .extractPackageFile() extracts volta
"skipReason": "unknown-version",
},
],
+ "extractedConstraints": {
+ "node": "8.9.2",
+ },
"lernaClient": undefined,
"lernaPackages": undefined,
"managerData": {
@@ -536,7 +536,6 @@ exports[`modules/manager/npm/extract/index .extractPackageFile() extracts volta
exports[`modules/manager/npm/extract/index .extractPackageFile() finds "npmClient":"npm" in lerna.json 1`] = `
{
- "constraints": {},
"deps": [
{
"currentValue": "6.5.0",
@@ -652,6 +651,7 @@ exports[`modules/manager/npm/extract/index .extractPackageFile() finds "npmClien
"prettyDepType": "resolutions",
},
],
+ "extractedConstraints": {},
"lernaClient": "npm",
"lernaPackages": undefined,
"managerData": {
@@ -672,7 +672,6 @@ exports[`modules/manager/npm/extract/index .extractPackageFile() finds "npmClien
exports[`modules/manager/npm/extract/index .extractPackageFile() finds "npmClient":"yarn" in lerna.json 1`] = `
{
- "constraints": {},
"deps": [
{
"currentValue": "6.5.0",
@@ -788,6 +787,7 @@ exports[`modules/manager/npm/extract/index .extractPackageFile() finds "npmClien
"prettyDepType": "resolutions",
},
],
+ "extractedConstraints": {},
"lernaClient": "yarn",
"lernaPackages": undefined,
"managerData": {
@@ -808,7 +808,6 @@ exports[`modules/manager/npm/extract/index .extractPackageFile() finds "npmClien
exports[`modules/manager/npm/extract/index .extractPackageFile() finds a lock file 1`] = `
{
- "constraints": {},
"deps": [
{
"currentValue": "6.5.0",
@@ -924,6 +923,7 @@ exports[`modules/manager/npm/extract/index .extractPackageFile() finds a lock fi
"prettyDepType": "resolutions",
},
],
+ "extractedConstraints": {},
"lernaClient": undefined,
"lernaPackages": undefined,
"managerData": {
@@ -944,8 +944,8 @@ exports[`modules/manager/npm/extract/index .extractPackageFile() finds a lock fi
exports[`modules/manager/npm/extract/index .extractPackageFile() finds complex yarn workspaces 1`] = `
{
- "constraints": {},
"deps": [],
+ "extractedConstraints": {},
"lernaClient": "npm",
"lernaPackages": undefined,
"managerData": {
@@ -968,7 +968,6 @@ exports[`modules/manager/npm/extract/index .extractPackageFile() finds complex y
exports[`modules/manager/npm/extract/index .extractPackageFile() finds lerna 1`] = `
{
- "constraints": {},
"deps": [
{
"currentValue": "6.5.0",
@@ -1084,6 +1083,7 @@ exports[`modules/manager/npm/extract/index .extractPackageFile() finds lerna 1`]
"prettyDepType": "resolutions",
},
],
+ "extractedConstraints": {},
"lernaClient": "npm",
"lernaPackages": undefined,
"managerData": {
@@ -1104,8 +1104,8 @@ exports[`modules/manager/npm/extract/index .extractPackageFile() finds lerna 1`]
exports[`modules/manager/npm/extract/index .extractPackageFile() finds simple yarn workspaces 1`] = `
{
- "constraints": {},
"deps": [],
+ "extractedConstraints": {},
"lernaClient": "npm",
"lernaPackages": undefined,
"managerData": {
@@ -1128,8 +1128,8 @@ exports[`modules/manager/npm/extract/index .extractPackageFile() finds simple ya
exports[`modules/manager/npm/extract/index .extractPackageFile() finds simple yarn workspaces with lerna.json and useWorkspaces: true 1`] = `
{
- "constraints": {},
"deps": [],
+ "extractedConstraints": {},
"lernaClient": undefined,
"lernaPackages": undefined,
"managerData": {
@@ -1152,7 +1152,6 @@ exports[`modules/manager/npm/extract/index .extractPackageFile() finds simple ya
exports[`modules/manager/npm/extract/index .extractPackageFile() returns an array of dependencies 1`] = `
{
- "constraints": {},
"deps": [
{
"currentValue": "6.5.0",
@@ -1268,6 +1267,7 @@ exports[`modules/manager/npm/extract/index .extractPackageFile() returns an arra
"prettyDepType": "resolutions",
},
],
+ "extractedConstraints": {},
"lernaClient": undefined,
"lernaPackages": undefined,
"managerData": {
@@ -1288,7 +1288,6 @@ exports[`modules/manager/npm/extract/index .extractPackageFile() returns an arra
exports[`modules/manager/npm/extract/index .extractPackageFile() returns an array of dependencies with resolution comments 1`] = `
{
- "constraints": {},
"deps": [
{
"currentValue": "6.5.0",
@@ -1386,6 +1385,7 @@ exports[`modules/manager/npm/extract/index .extractPackageFile() returns an arra
"prettyDepType": "resolutions",
},
],
+ "extractedConstraints": {},
"lernaClient": undefined,
"lernaPackages": undefined,
"managerData": {
@@ -1406,7 +1406,6 @@ exports[`modules/manager/npm/extract/index .extractPackageFile() returns an arra
exports[`modules/manager/npm/extract/index .extractPackageFile() sets skipInstalls false if Yarn zero-install is used 1`] = `
{
- "constraints": {},
"deps": [
{
"currentValue": "6.5.0",
@@ -1522,6 +1521,7 @@ exports[`modules/manager/npm/extract/index .extractPackageFile() sets skipInstal
"prettyDepType": "resolutions",
},
],
+ "extractedConstraints": {},
"lernaClient": undefined,
"lernaPackages": undefined,
"managerData": {
diff --git a/lib/modules/manager/npm/extract/index.spec.ts b/lib/modules/manager/npm/extract/index.spec.ts
index 3d80d01b3f457a950e88dfccbbe37edf61caa95d..2c468d0c61a935188abb4f3e9f3fce7b5bf72246 100644
--- a/lib/modules/manager/npm/extract/index.spec.ts
+++ b/lib/modules/manager/npm/extract/index.spec.ts
@@ -123,7 +123,7 @@ describe('modules/manager/npm/extract/index', () => {
);
expect(res?.deps).toHaveLength(13);
expect(res).toMatchSnapshot({
- constraints: {},
+ extractedConstraints: {},
deps: [
...[{}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}],
{
@@ -398,7 +398,7 @@ describe('modules/manager/npm/extract/index', () => {
defaultConfig
);
expect(res).toMatchSnapshot({
- constraints: {
+ extractedConstraints: {
node: '>= 8.9.2',
npm: '^8.0.0',
vscode: '>=1.49.3',
@@ -760,7 +760,7 @@ describe('modules/manager/npm/extract/index', () => {
defaultConfig
);
expect(res).toMatchSnapshot({
- constraints: { yarn: '3.0.0' },
+ extractedConstraints: { yarn: '3.0.0' },
deps: [
{
commitMessageTopic: 'Yarn',
diff --git a/lib/modules/manager/npm/extract/index.ts b/lib/modules/manager/npm/extract/index.ts
index 8e86ff3ca2155e5709cae7bc830be703b06a909b..d84f3eeee12ea4f1deaf10376730e62662adc656 100644
--- a/lib/modules/manager/npm/extract/index.ts
+++ b/lib/modules/manager/npm/extract/index.ts
@@ -194,7 +194,7 @@ export async function extractPackageFile(
overrides: 'overrides',
};
- const constraints: Record<string, any> = {};
+ const extractedConstraints: Record<string, any> = {};
function extractDependency(
depType: string,
@@ -216,11 +216,11 @@ export async function extractPackageFile(
dep.datasource = GithubTagsDatasource.id;
dep.packageName = 'nodejs/node';
dep.versioning = nodeVersioning.id;
- constraints.node = dep.currentValue;
+ extractedConstraints.node = dep.currentValue;
} else if (depName === 'yarn') {
dep.datasource = NpmDatasource.id;
dep.commitMessageTopic = 'Yarn';
- constraints.yarn = dep.currentValue;
+ extractedConstraints.yarn = dep.currentValue;
const major =
isVersion(dep.currentValue) && api.getMajor(dep.currentValue);
if (major && major > 1) {
@@ -229,14 +229,14 @@ export async function extractPackageFile(
} else if (depName === 'npm') {
dep.datasource = NpmDatasource.id;
dep.commitMessageTopic = 'npm';
- constraints.npm = dep.currentValue;
+ extractedConstraints.npm = dep.currentValue;
} else if (depName === 'pnpm') {
dep.datasource = NpmDatasource.id;
dep.commitMessageTopic = 'pnpm';
} else if (depName === 'vscode') {
dep.datasource = GithubTagsDatasource.id;
dep.packageName = 'microsoft/vscode';
- constraints.vscode = dep.currentValue;
+ extractedConstraints.vscode = dep.currentValue;
} else {
dep.skipReason = 'unknown-engines';
}
@@ -498,7 +498,7 @@ export async function extractPackageFile(
lernaPackages,
skipInstalls,
workspacesPackages,
- constraints,
+ extractedConstraints,
};
}
diff --git a/lib/modules/manager/npm/extract/locked-versions.spec.ts b/lib/modules/manager/npm/extract/locked-versions.spec.ts
index fec0bd9a0eb2ef9ff7daab3e0c8d4b6b096b195f..08e7e13e56a205391f821df08d657b948cc5f73b 100644
--- a/lib/modules/manager/npm/extract/locked-versions.spec.ts
+++ b/lib/modules/manager/npm/extract/locked-versions.spec.ts
@@ -16,7 +16,7 @@ describe('modules/manager/npm/extract/locked-versions', () => {
{
npmLock: 'package-lock.json',
yarnLock: 'yarn.lock',
- constraints: {},
+ extractedConstraints: {},
deps: [
{ depName: 'a', currentValue: '1.0.0' },
{ depName: 'b', currentValue: '2.0.0' },
@@ -54,7 +54,7 @@ describe('modules/manager/npm/extract/locked-versions', () => {
await getLockedVersions(packageFiles);
expect(packageFiles).toEqual([
{
- constraints: {},
+ extractedConstraints: {},
deps: [
{ currentValue: '1.0.0', depName: 'a', lockedVersion: '1.0.0' },
{ currentValue: '2.0.0', depName: 'b', lockedVersion: '2.0.0' },
@@ -91,7 +91,7 @@ describe('modules/manager/npm/extract/locked-versions', () => {
await getLockedVersions(packageFiles);
expect(packageFiles).toEqual([
{
- constraints: { yarn: '^2.0.0' },
+ extractedConstraints: { yarn: '^2.0.0' },
deps: [
{
currentValue: '1.0.0',
@@ -138,7 +138,7 @@ describe('modules/manager/npm/extract/locked-versions', () => {
await getLockedVersions(packageFiles);
expect(packageFiles).toEqual([
{
- constraints: { yarn: '^2.2.0' },
+ extractedConstraints: { yarn: '^2.2.0' },
deps: [
{
currentValue: '1.0.0',
@@ -185,7 +185,7 @@ describe('modules/manager/npm/extract/locked-versions', () => {
await getLockedVersions(packageFiles);
expect(packageFiles).toEqual([
{
- constraints: { yarn: '^3.0.0' },
+ extractedConstraints: { yarn: '^3.0.0' },
deps: [
{ currentValue: '1.0.0', depName: 'a', lockedVersion: '1.0.0' },
{ currentValue: '2.0.0', depName: 'b', lockedVersion: '2.0.0' },
@@ -211,7 +211,7 @@ describe('modules/manager/npm/extract/locked-versions', () => {
]);
});
- it("uses yarn.lock but doesn't override constraints", async () => {
+ it("uses yarn.lock but doesn't override extractedConstraints", async () => {
const yarnVersion = '3.2.0';
const lockfileVersion = 8;
const isYarn1 = false;
@@ -221,11 +221,11 @@ describe('modules/manager/npm/extract/locked-versions', () => {
lockedVersions,
});
const packageFiles = getPackageFiles(yarnVersion);
- packageFiles[0].constraints = { yarn: '3.2.0' };
+ packageFiles[0].extractedConstraints = { yarn: '3.2.0' };
await getLockedVersions(packageFiles);
expect(packageFiles).toEqual([
{
- constraints: { yarn: '3.2.0' },
+ extractedConstraints: { yarn: '3.2.0' },
deps: [
{ currentValue: '1.0.0', depName: 'a', lockedVersion: '1.0.0' },
{ currentValue: '2.0.0', depName: 'b', lockedVersion: '2.0.0' },
@@ -259,7 +259,7 @@ describe('modules/manager/npm/extract/locked-versions', () => {
const packageFiles = [
{
npmLock: 'package-lock.json',
- constraints: {},
+ extractedConstraints: {},
deps: [
{ depName: 'a', currentValue: '1.0.0' },
{ depName: 'b', currentValue: '2.0.0' },
@@ -269,7 +269,7 @@ describe('modules/manager/npm/extract/locked-versions', () => {
await getLockedVersions(packageFiles);
expect(packageFiles).toEqual([
{
- constraints: { npm: '<7' },
+ extractedConstraints: { npm: '<7' },
deps: [
{ currentValue: '1.0.0', depName: 'a', lockedVersion: '1.0.0' },
{ currentValue: '2.0.0', depName: 'b', lockedVersion: '2.0.0' },
@@ -288,7 +288,7 @@ describe('modules/manager/npm/extract/locked-versions', () => {
const packageFiles = [
{
npmLock: 'package-lock.json',
- constraints: {},
+ extractedConstraints: {},
deps: [
{ depName: 'a', currentValue: '1.0.0' },
{ depName: 'b', currentValue: '2.0.0' },
@@ -298,7 +298,7 @@ describe('modules/manager/npm/extract/locked-versions', () => {
await getLockedVersions(packageFiles);
expect(packageFiles).toEqual([
{
- constraints: {
+ extractedConstraints: {
npm: '<9',
},
deps: [
@@ -319,7 +319,7 @@ describe('modules/manager/npm/extract/locked-versions', () => {
const packageFiles = [
{
npmLock: 'package-lock.json',
- constraints: {
+ extractedConstraints: {
npm: '>=7.0.0',
},
deps: [
@@ -331,7 +331,7 @@ describe('modules/manager/npm/extract/locked-versions', () => {
await getLockedVersions(packageFiles);
expect(packageFiles).toEqual([
{
- constraints: {
+ extractedConstraints: {
npm: '>=7.0.0 <9',
},
deps: [
@@ -352,7 +352,7 @@ describe('modules/manager/npm/extract/locked-versions', () => {
const packageFiles = [
{
npmLock: 'package-lock.json',
- constraints: {
+ extractedConstraints: {
npm: '>=9.0.0',
},
deps: [
@@ -364,7 +364,7 @@ describe('modules/manager/npm/extract/locked-versions', () => {
await getLockedVersions(packageFiles);
expect(packageFiles).toEqual([
{
- constraints: {
+ extractedConstraints: {
npm: '>=9.0.0',
},
deps: [
@@ -377,7 +377,7 @@ describe('modules/manager/npm/extract/locked-versions', () => {
]);
});
- it('appends <7 to npm constraints', async () => {
+ it('appends <7 to npm extractedConstraints', async () => {
npm.getNpmLock.mockReturnValue({
lockedVersions: {
a: '1.0.0',
@@ -389,7 +389,7 @@ describe('modules/manager/npm/extract/locked-versions', () => {
const packageFiles = [
{
npmLock: 'package-lock.json',
- constraints: {
+ extractedConstraints: {
npm: '>=6.0.0',
},
deps: [
@@ -407,7 +407,7 @@ describe('modules/manager/npm/extract/locked-versions', () => {
await getLockedVersions(packageFiles);
expect(packageFiles).toEqual([
{
- constraints: { npm: '>=6.0.0 <7' },
+ extractedConstraints: { npm: '>=6.0.0 <7' },
deps: [
{ currentValue: '1.0.0', depName: 'a', lockedVersion: '1.0.0' },
{ currentValue: '2.0.0', depName: 'b', lockedVersion: '2.0.0' },
@@ -418,7 +418,7 @@ describe('modules/manager/npm/extract/locked-versions', () => {
]);
});
- it('skips appending <7 to npm constraints', async () => {
+ it('skips appending <7 to npm extractedConstraints', async () => {
npm.getNpmLock.mockReturnValue({
lockedVersions: {
a: '1.0.0',
@@ -430,7 +430,7 @@ describe('modules/manager/npm/extract/locked-versions', () => {
const packageFiles = [
{
npmLock: 'package-lock.json',
- constraints: {
+ extractedConstraints: {
npm: '^8.0.0',
},
deps: [
@@ -448,7 +448,7 @@ describe('modules/manager/npm/extract/locked-versions', () => {
await getLockedVersions(packageFiles);
expect(packageFiles).toEqual([
{
- constraints: { npm: '^8.0.0' },
+ extractedConstraints: { npm: '^8.0.0' },
deps: [
{ currentValue: '1.0.0', depName: 'a', lockedVersion: '1.0.0' },
{ currentValue: '2.0.0', depName: 'b', lockedVersion: '2.0.0' },
diff --git a/lib/modules/manager/npm/extract/locked-versions.ts b/lib/modules/manager/npm/extract/locked-versions.ts
index 770177fff57fcc0b6717f8b54eea01d386036919..fc5bf391d49a9d3b7a8dd46a9b76951d6ec2d66e 100644
--- a/lib/modules/manager/npm/extract/locked-versions.ts
+++ b/lib/modules/manager/npm/extract/locked-versions.ts
@@ -21,15 +21,15 @@ export async function getLockedVersions(
lockFileCache[yarnLock] = await getYarnLock(yarnLock);
}
const { lockfileVersion, isYarn1 } = lockFileCache[yarnLock];
- if (!isYarn1 && !packageFile.constraints?.yarn) {
+ if (!isYarn1 && !packageFile.extractedConstraints?.yarn) {
if (lockfileVersion && lockfileVersion >= 8) {
// https://github.com/yarnpkg/berry/commit/9bcd27ae34aee77a567dd104947407532fa179b3
- packageFile.constraints!.yarn = '^3.0.0';
+ packageFile.extractedConstraints!.yarn = '^3.0.0';
} else if (lockfileVersion && lockfileVersion >= 6) {
// https://github.com/yarnpkg/berry/commit/f753790380cbda5b55d028ea84b199445129f9ba
- packageFile.constraints!.yarn = '^2.2.0';
+ packageFile.extractedConstraints!.yarn = '^2.2.0';
} else {
- packageFile.constraints!.yarn = '^2.0.0';
+ packageFile.extractedConstraints!.yarn = '^2.0.0';
}
}
for (const dep of packageFile.deps) {
@@ -58,22 +58,26 @@ export async function getLockedVersions(
}
const { lockfileVersion } = lockFileCache[npmLock];
if (lockfileVersion === 1) {
- if (packageFile.constraints?.npm) {
+ if (packageFile.extractedConstraints?.npm) {
// Add a <7 constraint if it's not already a fixed version
- if (semver.satisfies('6.14.18', packageFile.constraints.npm)) {
- packageFile.constraints.npm += ' <7';
+ if (
+ semver.satisfies('6.14.18', packageFile.extractedConstraints.npm)
+ ) {
+ packageFile.extractedConstraints.npm += ' <7';
}
} else {
- packageFile.constraints!.npm = '<7';
+ packageFile.extractedConstraints!.npm = '<7';
}
} else if (lockfileVersion === 2) {
- if (packageFile.constraints?.npm) {
+ if (packageFile.extractedConstraints?.npm) {
// Add a <9 constraint if the latest 8.x is compatible
- if (semver.satisfies('8.19.3', packageFile.constraints.npm)) {
- packageFile.constraints.npm += ' <9';
+ if (
+ semver.satisfies('8.19.3', packageFile.extractedConstraints.npm)
+ ) {
+ packageFile.extractedConstraints.npm += ' <9';
}
} else {
- packageFile.constraints!.npm = '<9';
+ packageFile.extractedConstraints!.npm = '<9';
}
}
for (const dep of packageFile.deps) {
diff --git a/lib/modules/manager/npm/extract/monorepo.spec.ts b/lib/modules/manager/npm/extract/monorepo.spec.ts
index 5a590aa7216261ed4738509365f26fc58c17e924..37bdf48711aebeb8ee02a5caff3b4136e80e93a3 100644
--- a/lib/modules/manager/npm/extract/monorepo.spec.ts
+++ b/lib/modules/manager/npm/extract/monorepo.spec.ts
@@ -161,13 +161,13 @@ describe('modules/manager/npm/extract/monorepo', () => {
]);
});
- it('uses yarn workspaces package settings with constraints', async () => {
+ it('uses yarn workspaces package settings with extractedConstraints', async () => {
const packageFiles: Partial<PackageFile>[] = [
{
packageFile: 'package.json',
workspacesPackages: ['docs'],
skipInstalls: true, // coverage
- constraints: {
+ extractedConstraints: {
node: '^14.15.0 || >=16.13.0',
yarn: '3.2.1',
},
@@ -180,13 +180,13 @@ describe('modules/manager/npm/extract/monorepo', () => {
packageFile: 'docs/package.json',
packageJsonName: 'docs',
yarnLock: 'yarn.lock',
- constraints: { yarn: '^3.2.0' },
+ extractedConstraints: { yarn: '^3.2.0' },
},
];
await detectMonorepos(packageFiles);
expect(packageFiles).toMatchObject([
{
- constraints: {
+ extractedConstraints: {
node: '^14.15.0 || >=16.13.0',
yarn: '3.2.1',
},
@@ -195,7 +195,7 @@ describe('modules/manager/npm/extract/monorepo', () => {
},
},
{
- constraints: {
+ extractedConstraints: {
node: '^14.15.0 || >=16.13.0',
yarn: '^3.2.0',
},
diff --git a/lib/modules/manager/npm/extract/monorepo.ts b/lib/modules/manager/npm/extract/monorepo.ts
index 6609250eb5cc1f8ba7a22cf832025e17cb96aec5..5a914336408aae7f24d3b578b1d22c19b503f4a8 100644
--- a/lib/modules/manager/npm/extract/monorepo.ts
+++ b/lib/modules/manager/npm/extract/monorepo.ts
@@ -57,10 +57,10 @@ export async function detectMonorepos(
subPackage.hasWorkspaces = !!workspacesPackages;
subPackage.npmrc ??= npmrc;
- if (p.constraints) {
- subPackage.constraints = {
- ...p.constraints,
- ...subPackage.constraints,
+ if (p.extractedConstraints) {
+ subPackage.extractedConstraints = {
+ ...p.extractedConstraints,
+ ...subPackage.extractedConstraints,
};
}
diff --git a/lib/modules/manager/pipenv/__snapshots__/extract.spec.ts.snap b/lib/modules/manager/pipenv/__snapshots__/extract.spec.ts.snap
index 8b6de9a34653a03d06f676e91967efe42fe128db..dfdb126d1cec8250e29756d58598ef3e7bc7706b 100644
--- a/lib/modules/manager/pipenv/__snapshots__/extract.spec.ts.snap
+++ b/lib/modules/manager/pipenv/__snapshots__/extract.spec.ts.snap
@@ -2,9 +2,6 @@
exports[`modules/manager/pipenv/extract extractPackageFile() extracts dependencies 1`] = `
{
- "constraints": {
- "python": "== 3.6.*",
- },
"deps": [
{
"currentValue": "==0.3.1",
@@ -51,6 +48,9 @@ exports[`modules/manager/pipenv/extract extractPackageFile() extracts dependenci
"managerData": {},
},
],
+ "extractedConstraints": {
+ "python": "== 3.6.*",
+ },
"lockFiles": [
"Pipfile.lock",
],
@@ -63,9 +63,6 @@ exports[`modules/manager/pipenv/extract extractPackageFile() extracts dependenci
exports[`modules/manager/pipenv/extract extractPackageFile() extracts example pipfile 1`] = `
{
- "constraints": {
- "python": "== 2.7.*",
- },
"deps": [
{
"depName": "requests",
@@ -127,6 +124,9 @@ exports[`modules/manager/pipenv/extract extractPackageFile() extracts example pi
},
},
],
+ "extractedConstraints": {
+ "python": "== 2.7.*",
+ },
"lockFiles": [
"Pipfile.lock",
],
@@ -138,9 +138,6 @@ exports[`modules/manager/pipenv/extract extractPackageFile() extracts example pi
exports[`modules/manager/pipenv/extract extractPackageFile() extracts multiple dependencies 1`] = `
{
- "constraints": {
- "python": "== 3.6.*",
- },
"deps": [
{
"currentValue": "==1",
@@ -178,6 +175,9 @@ exports[`modules/manager/pipenv/extract extractPackageFile() extracts multiple d
"managerData": {},
},
],
+ "extractedConstraints": {
+ "python": "== 3.6.*",
+ },
"lockFiles": [
"Pipfile.lock",
],
@@ -189,7 +189,6 @@ exports[`modules/manager/pipenv/extract extractPackageFile() extracts multiple d
exports[`modules/manager/pipenv/extract extractPackageFile() supports custom index 1`] = `
{
- "constraints": {},
"deps": [
{
"currentValue": "==0.21.0",
@@ -204,6 +203,7 @@ exports[`modules/manager/pipenv/extract extractPackageFile() supports custom ind
],
},
],
+ "extractedConstraints": {},
"lockFiles": [
"Pipfile.lock",
],
diff --git a/lib/modules/manager/pipenv/extract.spec.ts b/lib/modules/manager/pipenv/extract.spec.ts
index b9d6bdd568726695183bbfa8508981600dba9d8e..7c7d2318a6a0bad15104588294f771f35d100e32 100644
--- a/lib/modules/manager/pipenv/extract.spec.ts
+++ b/lib/modules/manager/pipenv/extract.spec.ts
@@ -81,7 +81,7 @@ describe('modules/manager/pipenv/extract', () => {
fsutil.localPathExists.mockResolvedValueOnce(true);
const res = await extractPackageFile(pipfile4, 'Pipfile');
expect(res).toMatchSnapshot({
- constraints: { python: '== 2.7.*' },
+ extractedConstraints: { python: '== 2.7.*' },
deps: [
{ depName: 'requests', skipReason: 'any-version' },
{
@@ -123,7 +123,7 @@ describe('modules/manager/pipenv/extract', () => {
'[packages]\r\nfoo = "==1.0.0"\r\n' +
'[requires]\r\npython_version = "3.8"';
const res = await extractPackageFile(content, 'Pipfile');
- expect(res?.constraints?.python).toBe('== 3.8.*');
+ expect(res?.extractedConstraints?.python).toBe('== 3.8.*');
});
it('gets python constraint from python_full_version', async () => {
@@ -131,19 +131,19 @@ describe('modules/manager/pipenv/extract', () => {
'[packages]\r\nfoo = "==1.0.0"\r\n' +
'[requires]\r\npython_full_version = "3.8.6"';
const res = await extractPackageFile(content, 'Pipfile');
- expect(res?.constraints?.python).toBe('== 3.8.6');
+ expect(res?.extractedConstraints?.python).toBe('== 3.8.6');
});
it('gets pipenv constraint from packages', async () => {
const content = '[packages]\r\npipenv = "==2020.8.13"';
const res = await extractPackageFile(content, 'Pipfile');
- expect(res?.constraints?.pipenv).toBe('==2020.8.13');
+ expect(res?.extractedConstraints?.pipenv).toBe('==2020.8.13');
});
it('gets pipenv constraint from dev-packages', async () => {
const content = '[dev-packages]\r\npipenv = "==2020.8.13"';
const res = await extractPackageFile(content, 'Pipfile');
- expect(res?.constraints?.pipenv).toBe('==2020.8.13');
+ expect(res?.extractedConstraints?.pipenv).toBe('==2020.8.13');
});
});
});
diff --git a/lib/modules/manager/pipenv/extract.ts b/lib/modules/manager/pipenv/extract.ts
index 58bd2fff50b2f791b21fd8ace95602a5e5ed6de7..3a1664228aedac28b755f3ef61048ed384c9f3a9 100644
--- a/lib/modules/manager/pipenv/extract.ts
+++ b/lib/modules/manager/pipenv/extract.ts
@@ -147,6 +147,6 @@ export async function extractPackageFile(
res.lockFiles = [lockFileName];
}
- res.constraints = constraints;
+ res.extractedConstraints = constraints;
return res;
}
diff --git a/lib/modules/manager/types.ts b/lib/modules/manager/types.ts
index 574664106e555d967616536e59d268bc92b3d00f..e89fcfa9e2776f234cce1728656695971cd889da 100644
--- a/lib/modules/manager/types.ts
+++ b/lib/modules/manager/types.ts
@@ -65,7 +65,6 @@ export interface PackageFile<T = Record<string, any>>
ManagerData<T> {
autoReplaceStringTemplate?: string;
hasWorkspaces?: boolean;
- constraints?: Record<string, string>;
extractedConstraints?: Record<string, string>;
datasource?: string;
registryUrls?: string[];