Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(volta): make sure volta uses the same yarn package overwrite #18893

Merged
merged 12 commits into from Nov 16, 2022
Merged

fix(volta): make sure volta uses the same yarn package overwrite #18893

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
255ab28
fix(volta): make sure volta uses the same yarn package overwrite
pataar Nov 13, 2022
3403a67
style: reformat
pataar Nov 13, 2022
41d4dff
test: fix tests
pataar Nov 13, 2022
524c0a9
fix linter issues
pataar Nov 13, 2022
4509a4a
Update lib/modules/manager/npm/extract/index.spec.ts
pataar Nov 13, 2022
d355718
use different way of versioning
pataar Nov 13, 2022
bd03352
Merge branch 'main' of https://github.com/pataar/renovate
pataar Nov 13, 2022
4f13c01
test: fix tests
pataar Nov 13, 2022
02072ef
update test
pataar Nov 14, 2022
8c17eb9
Merge branch 'main' into main
pataar Nov 14, 2022
09eaa02
remove console log
pataar Nov 14, 2022
62ebb13
Merge branch 'main' into main
pataar Nov 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
54 changes: 54 additions & 0 deletions lib/modules/manager/npm/extract/__snapshots__/index.spec.ts.snap
View file
Open in desktop
Expand Up @@ -480,6 +480,60 @@ exports[`modules/manager/npm/extract/index .extractPackageFile() extracts volta
}
`;

exports[`modules/manager/npm/extract/index .extractPackageFile() extracts volta yarn higher than 1 1`] = `
{
"constraints": {
"node": "16.0.0",
},
"deps": [
{
"commitMessageTopic": "Node.js",
"currentValue": "16.0.0",
"datasource": "github-tags",
"depName": "node",
"depType": "engines",
"packageName": "nodejs/node",
"prettyDepType": "engine",
"versioning": "node",
},
{
"commitMessageTopic": "Node.js",
"currentValue": "16.0.0",
"datasource": "github-tags",
"depName": "node",
"depType": "volta",
"packageName": "nodejs/node",
"prettyDepType": "volta",
"versioning": "node",
},
{
"commitMessageTopic": "Yarn",
"currentValue": "3.2.4",
"datasource": "npm",
"depName": "yarn",
"depType": "volta",
"packageName": "@yarnpkg/cli",
"prettyDepType": "volta",
},
],
"lernaClient": undefined,
"lernaPackages": undefined,
"managerData": {
"hasPackageManager": false,
"lernaJsonFile": undefined,
"yarnZeroInstall": false,
},
"npmLock": undefined,
"npmrc": undefined,
"packageFileVersion": undefined,
"packageJsonName": undefined,
"pnpmShrinkwrap": undefined,
"skipInstalls": true,
"yarnLock": undefined,
"yarnWorkspacesPackages": undefined,
}
`;

exports[`modules/manager/npm/extract/index .extractPackageFile() extracts volta yarn unknown-version 1`] = `
{
"constraints": {
Expand Down
42 changes: 42 additions & 0 deletions lib/modules/manager/npm/extract/index.spec.ts
View file
Open in desktop
Expand Up @@ -483,6 +483,48 @@ describe('modules/manager/npm/extract/index', () => {
});
});

it('extracts volta yarn higher than 1', async () => {
const pJson = {
main: 'index.js',
engines: {
node: '16.0.0',
},
volta: {
node: '16.0.0',
yarn: '3.2.4',
},
};
const pJsonStr = JSON.stringify(pJson);
const res = await npmExtract.extractPackageFile(
pJsonStr,
'package.json',
defaultConfig
);
expect(res).toMatchSnapshot({
pataar marked this conversation as resolved.
Show resolved Hide resolved
deps: [
{},
{
commitMessageTopic: 'Node.js',
currentValue: '16.0.0',
datasource: 'github-tags',
depName: 'node',
depType: 'volta',
packageName: 'nodejs/node',
prettyDepType: 'volta',
versioning: 'node',
},
{
commitMessageTopic: 'Yarn',
currentValue: '3.2.4',
datasource: 'npm',
depName: 'yarn',
pataar marked this conversation as resolved.
Show resolved Hide resolved
depType: 'volta',
prettyDepType: 'volta',
},
],
});
});

it('extracts non-npmjs', async () => {
const pJson = {
dependencies: {
Expand Down
12 changes: 10 additions & 2 deletions lib/modules/manager/npm/extract/index.ts
View file
Open in desktop
@@ -1,3 +1,4 @@
import { major } from '@renovatebot/ruby-semver';
pataar marked this conversation as resolved.
Show resolved Hide resolved
import is from '@sindresorhus/is';
import validateNpmPackageName from 'validate-npm-package-name';
import { GlobalConfig } from '../../../../config/global';
Expand All @@ -20,6 +21,7 @@ import { getLockedVersions } from './locked-versions';
import { detectMonorepos } from './monorepo';
import type { NpmPackage, NpmPackageDependency } from './types';
import { isZeroInstall } from './yarn';
import semver from 'semver';

function parseDepName(depType: string, key: string): string {
if (depType !== 'resolutions') {
Expand Down Expand Up @@ -201,8 +203,8 @@ export async function extractPackageFile(
dep.commitMessageTopic = 'Yarn';
constraints.yarn = dep.currentValue;
if (
dep.currentValue.startsWith('2') ||
dep.currentValue.startsWith('3')
semver.valid(dep.currentValue) &&
semver.major(dep.currentValue) > 1
pataar marked this conversation as resolved.
Show resolved Hide resolved
) {
dep.packageName = '@yarnpkg/cli';
}
Expand Down Expand Up @@ -235,6 +237,12 @@ export async function extractPackageFile(
} else if (depName === 'yarn') {
dep.datasource = NpmDatasource.id;
dep.commitMessageTopic = 'Yarn';
if (
semver.valid(dep.currentValue) &&
semver.major(dep.currentValue) > 1
) {
dep.packageName = '@yarnpkg/cli';
}
} else if (depName === 'npm') {
dep.datasource = NpmDatasource.id;
} else {
Expand Down