Skip to content
Snippets Groups Projects
Unverified Commit c5852e7e authored by Martin Herndl's avatar Martin Herndl Committed by GitHub
Browse files

feat(composer): support minor version on best-effort composer constraint extraction (#13187)

parent 67eb76d4
No related branches found
No related tags found
No related merge requests found
...@@ -42,12 +42,12 @@ describe('manager/composer/utils', () => { ...@@ -42,12 +42,12 @@ describe('manager/composer/utils', () => {
it('returns from composer-runtime-api', () => { it('returns from composer-runtime-api', () => {
expect( expect(
extractContraints({ require: { 'composer-runtime-api': '^1.1.0' } }, {}) extractContraints({ require: { 'composer-runtime-api': '^1.1.0' } }, {})
).toEqual({ composer: '1.*' }); ).toEqual({ composer: '^1.1' });
}); });
it('returns from plugin-api-version', () => { it('returns from plugin-api-version', () => {
expect(extractContraints({}, { 'plugin-api-version': '1.1.0' })).toEqual({ expect(extractContraints({}, { 'plugin-api-version': '1.1.0' })).toEqual({
composer: '1.*', composer: '^1.1',
}); });
}); });
......
...@@ -80,12 +80,14 @@ export function extractContraints( ...@@ -80,12 +80,14 @@ export function extractContraints(
// check last used composer version // check last used composer version
else if (lockParsed?.['plugin-api-version']) { else if (lockParsed?.['plugin-api-version']) {
const major = api.getMajor(lockParsed?.['plugin-api-version']); const major = api.getMajor(lockParsed?.['plugin-api-version']);
res.composer = `${major}.*`; const minor = api.getMinor(lockParsed?.['plugin-api-version']);
res.composer = `^${major}.${minor}`;
} }
// check composer api dependency // check composer api dependency
else if (composerJson.require?.['composer-runtime-api']) { else if (composerJson.require?.['composer-runtime-api']) {
const major = api.getMajor(composerJson.require?.['composer-runtime-api']); const major = api.getMajor(composerJson.require?.['composer-runtime-api']);
res.composer = `${major}.*`; const minor = api.getMinor(composerJson.require?.['composer-runtime-api']);
res.composer = `^${major}.${minor}`;
} }
return res; return res;
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment