Skip to content
Closed
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
26 changes: 22 additions & 4 deletions bin-src/trimStatsFile.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,17 @@ import { outputFile } from 'fs-extra';

import { readStatsFile } from '../node-src/tasks/readStatsFile';

type FilePath = string;
type NormalizedName = string;

// Convert a "webpack path" (relative to storybookBaseDir) to a "git path" (relative to repository root)
// e.g. `./src/file.js` => `path/to/storybook/src/file.js`
const normalize = (path: FilePath): NormalizedName => {
const URL_PARAM_REGEX = /(\?.*)/g;
// Trim query params such as `?ngResource` which are sometimes present
return URL_PARAM_REGEX.test(path) ? path.replaceAll(URL_PARAM_REGEX, '') : path;
};

const dedupe = <T>(array: T[]) => [...new Set(array)];
const isUserCode = ({ name, moduleName = name }: { name?: string; moduleName?: string }) =>
moduleName &&
Expand All @@ -25,24 +36,31 @@ const isUserCode = ({ name, moduleName = name }: { name?: string; moduleName?: s
*/
export async function main([statsFile = './storybook-static/preview-stats.json']) {
try {
const uniqueModules = new Set<string>();
const stats = await readStatsFile(statsFile);
const trimmedModules = stats.modules
.filter((module) => isUserCode(module))
.map(({ id, name, modules, reasons }) => {
const trimmedReasons = dedupe(
reasons?.filter((reason) => isUserCode(reason)).map((r) => r.moduleName) || []
reasons?.filter((reason) => isUserCode(reason)).map((r) => normalize(r.moduleName)) || []
)
.filter((n) => n !== name)
.map((moduleName) => ({ moduleName }));
const normalizedName = normalize(name);
const cleanName = normalizedName.replace(/\s\+\s\d+\smodules$/, '');
if (uniqueModules.has(cleanName)) {
return;
} else {
uniqueModules.add(cleanName);
}
return {
id,
name,
modules: modules && modules.map((m) => ({ name: m.name })),
name: normalizedName,
modules: modules && modules.map((m) => ({ name: normalize(m.name) })),
reasons: trimmedReasons,
};
})
.filter(Boolean);

const targetFile = statsFile.replace('.json', '.trimmed.json');
await outputFile(
targetFile,
Expand Down
7 changes: 7 additions & 0 deletions node-src/lib/getDependentStoryFiles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -147,12 +147,19 @@ export async function getDependentStoryFiles(
const isStorybookFile = (name: string) =>
name && name.startsWith(`${storybookDirectory}/`) && !storiesEntryFiles.has(name);

const uniqueModules = new Set<string>();
stats.modules
.filter((module_) => isUserModule(module_))
// TODO: refactor this function
// eslint-disable-next-line complexity
.map((module_) => {
const normalizedName = normalize(module_.name);
const cleanName = normalizedName.replace(/\s\+\s\d+\smodules$/, '');
if (uniqueModules.has(cleanName)) {
return;
} else {
uniqueModules.add(cleanName);
}
modulesByName.set(normalizedName, module_);
namesById.set(module_.id, normalizedName);

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "chromatic",
"version": "11.25.2",
"version": "11.25.4",
"description": "Automate visual testing across browsers. Gather UI feedback. Versioned documentation.",
"keywords": [
"storybook-addon",
Expand Down