Skip to content

Commit

Permalink
CLI: Fix skip-install for stable latest releases
Browse files Browse the repository at this point in the history
  • Loading branch information
valentinpalkovic committed Sep 16, 2024
1 parent 1d27f37 commit 2f4658b
Show file tree
Hide file tree
Showing 2 changed files with 61 additions and 6 deletions.
55 changes: 55 additions & 0 deletions code/core/src/common/js-package-manager/JsPackageManager.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
import { beforeEach, describe, expect, it, vi } from 'vitest';

import { JsPackageManager } from './JsPackageManager';

vi.mock('../versions', () => ({
default: {
'@storybook/react': '8.3.0',
},
}));

describe('JsPackageManager', () => {
let jsPackageManager: JsPackageManager;
let mockLatestVersion: ReturnType<typeof vi.fn>;
let mockStorybookPackagesVersions: Record<string, string>;

beforeEach(() => {
mockLatestVersion = vi.fn();
mockStorybookPackagesVersions = {
'@storybook/react': '8.3.0',
};

// @ts-expect-error Ignore abstract class error
jsPackageManager = new JsPackageManager();
jsPackageManager.latestVersion = mockLatestVersion;
(global as any).storybookPackagesVersions = mockStorybookPackagesVersions;

vi.clearAllMocks();
});

describe('getVersionedPackages method', () => {
it('should return the latest stable release version when current version is the latest stable release', async () => {
mockLatestVersion.mockResolvedValue('8.3.0');

const result = await jsPackageManager.getVersionedPackages(['@storybook/react']);

expect(result).toEqual(['@storybook/react@^8.3.0']);
});

it('should return the current version when it is not the latest stable release', async () => {
mockLatestVersion.mockResolvedValue('8.3.1');

const result = await jsPackageManager.getVersionedPackages(['@storybook/react']);

expect(result).toEqual(['@storybook/[email protected]']);
});

it('should return the latest stable release version when there is no current version', async () => {
mockLatestVersion.mockResolvedValue('2.0.0');

const result = await jsPackageManager.getVersionedPackages(['@storybook/new-addon@^8.3.0']);

expect(result).toEqual(['@storybook/new-addon@^2.0.0']);
});
});
});
12 changes: 6 additions & 6 deletions code/core/src/common/js-package-manager/JsPackageManager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -337,13 +337,13 @@ export abstract class JsPackageManager {
const k = packageName as keyof typeof storybookPackagesVersions;
const currentVersion = storybookPackagesVersions[k];

if (currentVersion === latestInRange) {
return `${packageName}`;
}
if (currentVersion) {
return `${packageName}@${currentVersion}`;
const isLatestStableRelease = currentVersion === latestInRange;

if (isLatestStableRelease || !currentVersion) {
return `${packageName}@^${latestInRange}`;
}
return `${packageName}@^${latestInRange}`;

return `${packageName}@${currentVersion}`;
})
);
}
Expand Down

0 comments on commit 2f4658b

Please sign in to comment.