Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
14 changes: 10 additions & 4 deletions code/core/src/cli/globalSettings.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -85,16 +85,22 @@ describe('Settings', () => {
);
});

it('throws error if write fails', async () => {
it('logs warning if write fails', async () => {
vi.mocked(fs.writeFile).mockRejectedValue(new Error('Write error'));

await expect(settings.save()).rejects.toThrow('Unable to save global settings');
await expect(settings.save()).resolves.toBeUndefined();
expect(console.warn).toHaveBeenCalledWith(
'Unable to save global settings file to /test/settings.json\nReason: Write error'
);
});

it('throws error if directory creation fails', async () => {
it('logs warning if directory creation fails', async () => {
vi.mocked(fs.mkdir).mockRejectedValue(new Error('Directory creation error'));

await expect(settings.save()).rejects.toThrow('Unable to save global settings');
await expect(settings.save()).resolves.toBeUndefined();
expect(console.warn).toHaveBeenCalledWith(
'Unable to save global settings file to /test/settings.json\nReason: Directory creation error'
);
});
});
});
10 changes: 4 additions & 6 deletions code/core/src/cli/globalSettings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,9 @@ import fs from 'node:fs/promises';
import { homedir } from 'node:os';
import { dirname, join } from 'node:path';

import { dedent } from 'ts-dedent';
import { z } from 'zod';

import { SavingGlobalSettingsFileError } from '../server-errors';

const DEFAULT_SETTINGS_PATH = join(homedir(), '.storybook', 'settings.json');

const VERSION = 1;
Expand Down Expand Up @@ -71,10 +70,9 @@ export class Settings {
await fs.mkdir(dirname(this.filePath), { recursive: true });
await fs.writeFile(this.filePath, JSON.stringify(this.value, null, 2));
} catch (err) {
throw new SavingGlobalSettingsFileError({
filePath: this.filePath,
error: err,
});
console.warn(dedent`
Unable to save global settings file to ${this.filePath}
${err && `Reason: ${(err as Error).message ?? err}`}`);
}
}
}
12 changes: 0 additions & 12 deletions code/core/src/server-errors.ts
Original file line number Diff line number Diff line change
Expand Up @@ -566,15 +566,3 @@ export class IncompatiblePostCssConfigError extends StorybookError {
});
}
}

export class SavingGlobalSettingsFileError extends StorybookError {
constructor(public data: { filePath: string; error: Error | unknown }) {
super({
category: Category.CORE_SERVER,
code: 1,
message: dedent`
Unable to save global settings file to ${data.filePath}
${data.error && `Reason: ${data.error}`}`,
});
}
}
4 changes: 2 additions & 2 deletions code/core/src/telemetry/storybook-metadata.ts
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,10 @@ export const computeStorybookMetadata = async ({
mainConfig?: StorybookConfig & Record<string, any>;
configDir: string;
}): Promise<StorybookMetadata> => {
const settings = await globalSettings();
const settings = process.env.CI === 'true' ? undefined : await globalSettings();
const metadata: Partial<StorybookMetadata> = {
generatedAt: new Date().getTime(),
userSince: settings.value.userSince,
userSince: settings?.value.userSince,
hasCustomBabel: false,
hasCustomWebpack: false,
hasStaticDirs: false,
Expand Down
Loading