Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest';
import type { JsPackageManager } from 'storybook/internal/common';

import type { CheckOptions } from '.';
import { nextjsToNextjsVite } from './nextjs-to-nextjs-vite';
import { VITE_DEFAULT_VERSION, nextjsToNextjsVite } from './nextjs-to-nextjs-vite';

// Mock dependencies
vi.mock('node:fs/promises', () => ({
Expand Down Expand Up @@ -40,12 +40,14 @@ describe('nextjs-to-nextjs-vite', () => {
packageJsonPaths: ['/project/package.json'],
removeDependencies: vi.fn().mockResolvedValue(undefined),
addDependencies: vi.fn().mockResolvedValue(undefined),
getDependencyVersion: vi.fn(),
} as unknown as JsPackageManager;

beforeEach(() => {
vi.clearAllMocks();
vi.mocked(mockPackageManager.removeDependencies).mockResolvedValue(undefined);
vi.mocked(mockPackageManager.addDependencies).mockResolvedValue(undefined);
vi.mocked(mockPackageManager.getDependencyVersion).mockReturnValue(undefined);
});

describe('check function', () => {
Expand Down Expand Up @@ -125,7 +127,7 @@ describe('nextjs-to-nextjs-vite', () => {
).resolves.toBeUndefined();
});

it('should transform package.json files', async () => {
it('should transform package.json files and add vite if not installed', async () => {
const result = {
hasNextjsPackage: true,
packageJsonFiles: ['/project/package.json'],
Expand All @@ -150,6 +152,41 @@ describe('nextjs-to-nextjs-vite', () => {
storybookVersion: '9.0.0',
} as any);

expect(mockPackageManager.removeDependencies).toHaveBeenCalledWith(['@storybook/nextjs']);
expect(mockPackageManager.addDependencies).toHaveBeenCalledWith(
{ type: 'devDependencies', skipInstall: true },
[`@storybook/[email protected]`, `vite@${VITE_DEFAULT_VERSION}`]
);
});

it('should transform package.json files without adding vite if already installed', async () => {
const result = {
hasNextjsPackage: true,
packageJsonFiles: ['/project/package.json'],
};

mockReadFile.mockResolvedValue(
JSON.stringify({
dependencies: {
'@storybook/nextjs': '^9.0.0',
'@storybook/react': '^9.0.0',
},
})
);

// Mock getDependencyVersion to return a version (vite is installed)
vi.mocked(mockPackageManager.getDependencyVersion).mockReturnValue('6.0.0');

await nextjsToNextjsVite.run!({
result,
dryRun: false,
packageManager: mockPackageManager,
mainConfigPath: '/project/.storybook/main.js',
storiesPaths: ['**/*.stories.*'],
configDir: '.storybook',
storybookVersion: '9.0.0',
} as any);

expect(mockPackageManager.removeDependencies).toHaveBeenCalledWith(['@storybook/nextjs']);
expect(mockPackageManager.addDependencies).toHaveBeenCalledWith(
{ type: 'devDependencies', skipInstall: true },
Expand All @@ -170,6 +207,9 @@ describe('nextjs-to-nextjs-vite', () => {
};
`);

// Mock getDependencyVersion to return a version (vite is installed)
vi.mocked(mockPackageManager.getDependencyVersion).mockReturnValue('6.0.0');

await nextjsToNextjsVite.run!({
result,
dryRun: false,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ import { logger } from 'storybook/internal/node-logger';

import type { Fix } from '../types';

export const VITE_DEFAULT_VERSION = '^7.0.0';

interface NextjsToNextjsViteOptions {
hasNextjsPackage: boolean;
packageJsonFiles: string[];
Expand Down Expand Up @@ -102,7 +104,7 @@ export const nextjsToNextjsVite: Fix<NextjsToNextjsViteOptions> = {
await packageManager.removeDependencies(['@storybook/nextjs']);
await packageManager.addDependencies({ type: 'devDependencies', skipInstall: true }, [
`@storybook/nextjs-vite@${storybookVersion}`,
...(viteVersion ? [] : ['vite@^7.0.0']), // Add vite if it's not installed yet
...(viteVersion ? [] : [`vite@${VITE_DEFAULT_VERSION}`]), // Add vite if it's not installed yet
]);
}

Expand Down