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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Telemetry: Strip out preset from addon name #18442

Merged
merged 1 commit into from Jun 11, 2022
Merged

Telemetry: Strip out preset from addon name #18442

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 11 additions & 2 deletions lib/telemetry/src/storybook-metadata.test.ts
View file
Open in desktop
Expand Up @@ -82,12 +82,17 @@ describe('await computeStorybookMetadata', () => {
devDependencies: {
'@storybook/react': 'x.y.z',
'@storybook/addon-essentials': 'x.x.x',
'storybook-addon-deprecated': 'x.x.x',
'@storybook/addon-knobs': 'x.x.y',
'storybook-addon-deprecated': 'x.x.z',
},
},
mainConfig: {
...mainJsMock,
addons: ['@storybook/addon-essentials', 'storybook-addon-deprecated/register'],
addons: [
'@storybook/addon-essentials',
'storybook-addon-deprecated/register',
'@storybook/addon-knobs/preset',
],
},
});

Expand All @@ -97,6 +102,10 @@ describe('await computeStorybookMetadata', () => {
"options": undefined,
"version": "x.x.x",
},
"@storybook/addon-knobs": Object {
"options": undefined,
"version": "x.x.x",
},
"storybook-addon-deprecated": Object {
"options": undefined,
"version": "x.x.x",
Expand Down
34 changes: 17 additions & 17 deletions lib/telemetry/src/storybook-metadata.ts
View file
Open in desktop
Expand Up @@ -12,22 +12,6 @@ import type { StorybookMetadata, Dependency, StorybookAddon } from './types';
import { getActualPackageVersion, getActualPackageVersions } from './package-versions';
import { getMonorepoType } from './get-monorepo-type';

let cachedMetadata: StorybookMetadata;
export const getStorybookMetadata = async (_configDir: string) => {
if (cachedMetadata) {
return cachedMetadata;
}

const packageJson = readPkgUp.sync({ cwd: process.cwd() }).packageJson as PackageJson;
const configDir =
(_configDir ||
(getStorybookConfiguration(packageJson.scripts.storybook, '-c', '--config-dir') as string)) ??
'.storybook';
const mainConfig = loadMainConfig({ configDir });
cachedMetadata = await computeStorybookMetadata({ mainConfig, packageJson });
return cachedMetadata;
};

export const metaFrameworks = {
next: 'Next',
'react-scripts': 'CRA',
Expand Down Expand Up @@ -147,7 +131,7 @@ export const computeStorybookMetadata = async ({
let result;
let options;
if (typeof addon === 'string') {
result = addon.replace('/register', '');
result = addon.replace('/register', '').replace('/preset', '');
} else {
options = addon.options;
result = addon.name;
Expand Down Expand Up @@ -204,3 +188,19 @@ export const computeStorybookMetadata = async ({
hasStorybookEslint,
};
};

let cachedMetadata: StorybookMetadata;
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no changes here, just moved the code down

export const getStorybookMetadata = async (_configDir: string) => {
if (cachedMetadata) {
return cachedMetadata;
}

const packageJson = readPkgUp.sync({ cwd: process.cwd() }).packageJson as PackageJson;
const configDir =
(_configDir ||
(getStorybookConfiguration(packageJson.scripts.storybook, '-c', '--config-dir') as string)) ??
'.storybook';
const mainConfig = loadMainConfig({ configDir });
cachedMetadata = await computeStorybookMetadata({ mainConfig, packageJson });
return cachedMetadata;
};