GitHub/storybook
1
0
Fork 0
mirror of https://github.com/storybookjs/storybook.git synced 2025-04-06 00:41:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #20380 from storybookjs/tom/sb-1079-fix-devbuild-event-firing-too-early-and

Browse Source 
Move 'dev'/'build' events to the end of the process
This commit is contained in:
Tom Coleman 2023-01-06 13:12:28 +11:00 committed by GitHub
commit c9a08fde2a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
code/lib/core-server/src/build-static.ts
View File

@ -172,23 +172,6 @@ export async function buildStaticStandalone(
);
}
if (!core?.disableTelemetry) {
effects.push(
initializedStoryIndexGenerator.then(async (generator) => {
const storyIndex = await generator?.getIndex();
const payload = {
precedingUpgrade: await getPrecedingUpgrade(),
};
if (storyIndex) {
Object.assign(payload, {
storyIndex: summarizeIndex(storyIndex),
});
}
await telemetry('build', payload, { configDir: options.configDir });
})
);
}
if (!core?.disableProjectJson) {
effects.push(
extractStorybookMetadata(join(options.outputDir, 'project.json'), options.configDir)
@ -223,5 +206,23 @@ export async function buildStaticStandalone(
...effects,
]);
// Now the code has successfully built, we can count this as a 'dev' event.
if (!core?.disableTelemetry) {
effects.push(
initializedStoryIndexGenerator.then(async (generator) => {
const storyIndex = await generator?.getIndex();
const payload = {
precedingUpgrade: await getPrecedingUpgrade(),
};
if (storyIndex) {
Object.assign(payload, {
storyIndex: summarizeIndex(storyIndex),
});
}
await telemetry('build', payload, { configDir: options.configDir });
})
);
}
logger.info(`=> Output directory: ${options.outputDir}`);
}

9
code/lib/core-server/src/dev-server.ts
View File

@ -37,8 +37,6 @@ export async function storybookDevServer(options: Options) {
serverChannel
);
doTelemetry(core, initializedStoryIndexGenerator, options);
app.use(compression({ level: 1 }));
if (typeof options.extendServer === 'function') {
@ -120,5 +118,10 @@ export async function storybookDevServer(options: Options) {
}
});
return { previewResult: await previewStarted, managerResult, address, networkAddress };
const previewResult = await previewStarted;
// Now the preview has successfully started, we can count this as a 'dev' event.
doTelemetry(core, initializedStoryIndexGenerator, options);
return { previewResult, managerResult, address, networkAddress };
}