Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Build: strengthen conditions under which Webpack stats are written in file #13231

Closed
wants to merge 2 commits into from
Closed

Build: strengthen conditions under which Webpack stats are written in file #13231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
215e47b
fix: ensure `public` cache directory exist before writing files in it
gaetanmaisse Nov 23, 2020
676bda6
fix: handle cases where there is no stats to write for the manager
gaetanmaisse Nov 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 9 additions & 9 deletions lib/core/src/server/build-dev.ts
View file
Open in desktop
Expand Up @@ -25,11 +25,9 @@ const cache = Cache({
});

const writeStats = async (name: string, stats: Stats) => {
await fs.writeFile(
resolvePathInStorybookCache(`public/${name}-stats.json`),
JSON.stringify(stats.toJson(), null, 2),
'utf8'
);
const statsFilePath = resolvePathInStorybookCache(`public/${name}-stats.json`);
await fs.ensureFile(statsFilePath);
await fs.writeFile(statsFilePath, JSON.stringify(stats.toJson(), null, 2), 'utf8');
};

const getFreePort = (port: number) =>
Expand Down Expand Up @@ -220,11 +218,13 @@ function outputStartupInformation(options: {
);
}

async function outputStats(previewStats: Stats, managerStats: Stats) {
async function outputStats(previewStats: Stats | undefined, managerStats: Stats | undefined) {
if (previewStats) {
await writeStats('preview', previewStats);
}
await writeStats('manager', managerStats);
if (managerStats) {
await writeStats('manager', managerStats);
}
logger.info(
`stats written to => ${chalk.cyan(resolvePathInStorybookCache('public/[name].json'))}`
);
Expand Down Expand Up @@ -284,9 +284,9 @@ export async function buildDevStandalone(

if (options.smokeTest) {
await outputStats(previewStats, managerStats);
const managerWarnings = (managerStats as any).toJson().warnings.length > 0;
const managerWarnings = !!managerStats && managerStats.toJson().warnings.length > 0;
const previewWarnings =
!options.ignorePreview && (previewStats as any).toJson().warnings.length > 0;
!options.ignorePreview && !!previewStats && previewStats.toJson().warnings.length > 0;
process.exit(managerWarnings || previewWarnings ? 1 : 0);
return;
}
Expand Down
4 changes: 2 additions & 2 deletions lib/core/src/server/dev-server.ts
View file
Open in desktop
Expand Up @@ -258,7 +258,7 @@ const startManager = async ({
}

if (!managerConfig) {
return { managerStats: {}, managerTotalTime: [0, 0] } as ManagerResult;
return { managerTotalTime: [0, 0] };
}

const compiler = webpack(managerConfig);
Expand Down Expand Up @@ -311,7 +311,7 @@ const startPreview = async ({
outputDir,
}: any): Promise<PreviewResult> => {
if (options.ignorePreview) {
return { previewStats: {}, previewTotalTime: [0, 0] } as PreviewResult;
return { previewTotalTime: [0, 0] };
}

const previewConfig = await loadConfig({
Expand Down
4 changes: 2 additions & 2 deletions lib/core/src/server/types.ts
View file
Open in desktop
Expand Up @@ -94,12 +94,12 @@ export interface ReleaseNotesData {
}

export interface PreviewResult {
previewStats: Stats;
previewStats?: Stats;
previewTotalTime: [number, number];
}

export interface ManagerResult {
managerStats: Stats;
managerStats?: Stats;
managerTotalTime: [number, number];
}

Expand Down