mirrors/astro
1
0
Fork 0
mirror of https://github.com/withastro/astro.git synced 2025-01-22 10:31:53 -05:00
Code Issues Projects Releases Packages Wiki Activity

Version transitions in CLI outputs (#12739)

Browse source 
Co-authored-by: Florian Lefebvre <contact@florian-lefebvre.dev>
This commit is contained in:
enu 2025-01-10 17:03:32 +03:00 committed by GitHub
parent f00c2ddc31
commit 1f9571b2b9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 20 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.changeset/happy-radios-drive.md Normal file
View file

@ -0,0 +1,5 @@
---
'@astrojs/upgrade': patch
---
Updates displayed data to show both source and target versions

2
packages/upgrade/src/actions/install.ts
View file

@ -48,7 +48,7 @@ export async function install(
const majors: PackageInfo[] = [];
for (const packageInfo of toInstall) {
const word = ctx.dryRun ? 'can' : 'will';
await upgrade(packageInfo, `${word} be updated to`);
await upgrade(packageInfo, `${word} be updated`);
if (packageInfo.isMajor) {
majors.push(packageInfo);
}

7
packages/upgrade/src/messages.ts
View file

@ -109,14 +109,17 @@ export const info = async (prefix: string, text: string, version = '') => {
);
}
};
export const upgrade = async (packageInfo: PackageInfo, text: string) => {
const { name, isMajor = false, targetVersion } = packageInfo;
const { name, isMajor = false, targetVersion, currentVersion } = packageInfo;
const bg = isMajor ? (v: string) => color.bgYellow(color.black(` ${v} `)) : color.green;
const style = isMajor ? color.yellow : color.green;
const symbol = isMajor ? '▲' : '●';
const fromVersion = currentVersion.replace(/^\D+/, '');
const toVersion = targetVersion.replace(/^\D+/, '');
const version = `v${toVersion}`;
const version = `from v${fromVersion} to v${toVersion}`;
const length = 12 + name.length + text.length + version.length;
if (length > stdout.columns) {

18
packages/upgrade/test/install.test.js
View file

@ -39,7 +39,7 @@ describe('install', () => {
],
};
await install(context);
assert.equal(fixture.hasMessage('● astro can be updated to v1.0.1'), true);
assert.equal(fixture.hasMessage('● astro can be updated from v1.0.0 to v1.0.1'), true);
});
it('minor', async () => {
@ -54,7 +54,7 @@ describe('install', () => {
],
};
await install(context);
assert.equal(fixture.hasMessage('● astro can be updated to v1.2.0'), true);
assert.equal(fixture.hasMessage('● astro can be updated from v1.0.0 to v1.2.0'), true);
});
it('major (reject)', async () => {
@ -81,7 +81,7 @@ describe('install', () => {
],
};
await install(context);
assert.equal(fixture.hasMessage('▲ astro can be updated to v2.0.0'), true);
assert.equal(fixture.hasMessage('▲ astro can be updated from v1.0.0 to v2.0.0'), true);
assert.equal(prompted, true);
assert.equal(exitCode, 0);
assert.equal(fixture.hasMessage('check Be sure to follow the CHANGELOG.'), false);
@ -111,7 +111,7 @@ describe('install', () => {
],
};
await install(context);
assert.equal(fixture.hasMessage('▲ astro can be updated to v2.0.0'), true);
assert.equal(fixture.hasMessage('▲ astro can be updated from v1.0.0 to v2.0.0'), true);
assert.equal(prompted, true);
assert.equal(exitCode, undefined);
assert.equal(fixture.hasMessage('check Be sure to follow the CHANGELOG.'), true);
@ -149,8 +149,8 @@ describe('install', () => {
],
};
await install(context);
assert.equal(fixture.hasMessage('▲ a can be updated to v2.0.0'), true);
assert.equal(fixture.hasMessage('▲ b can be updated to v7.0.0'), true);
assert.equal(fixture.hasMessage('▲ a can be updated from v1.0.0 to v2.0.0'), true);
assert.equal(fixture.hasMessage('▲ b can be updated from v6.0.0 to v7.0.0'), true);
assert.equal(prompted, true);
assert.equal(exitCode, undefined);
const [changelog, a, b] = fixture.messages().slice(-5);
@ -199,9 +199,9 @@ describe('install', () => {
};
await install(context);
assert.equal(fixture.hasMessage('◼ current is up to date on v1.0.0'), true);
assert.equal(fixture.hasMessage('● patch can be updated to v1.0.1'), true);
assert.equal(fixture.hasMessage('● minor can be updated to v1.2.0'), true);
assert.equal(fixture.hasMessage('▲ major can be updated to v3.0.0'), true);
assert.equal(fixture.hasMessage('● patch can be updated from v1.0.0 to v1.0.1'), true);
assert.equal(fixture.hasMessage('● minor can be updated from v1.0.0 to v1.2.0'), true);
assert.equal(fixture.hasMessage('▲ major can be updated from v1.0.0 to v3.0.0'), true);
assert.equal(prompted, true);
assert.equal(exitCode, undefined);
assert.equal(fixture.hasMessage('check Be sure to follow the CHANGELOG.'), true);