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

Core: Fix presets register panel #9486

Merged
merged 2 commits into from Jan 16, 2020
Merged

Core: Fix presets register panel #9486

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
282d605
Core: Fix addon/preset detection for local addons
shilman Jan 16, 2020
d6dbcb4
Core: Fix presets register_panel for addon-notes
shilman Jan 16, 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
15 changes: 12 additions & 3 deletions lib/core/src/server/presets.js
View file
Open in desktop
Expand Up @@ -7,6 +7,8 @@ const isObject = val => val != null && typeof val === 'object' && Array.isArray(
const isFunction = val => typeof val === 'function';

// Copied out of parse-package-name
// '@storybook/addon-actions/register' => ( name: '@storybook/addon-actions', path: '/register )
// './addon-actions/register' => ( name: './addon-actions/register', path: './addon-actions/register' )
const RE_SCOPED = /^(@[^/]+\/[^/@]+)(?:\/([^@]+))?(?:@([\s\S]+))?/;
const RE_NORMAL = /^([^/@]+)(?:\/([^@]+))?(?:@([\s\S]+))?/;
function parsePackageName(input) {
Expand Down Expand Up @@ -38,6 +40,8 @@ const resolvePresetFunction = (input, presetOptions, storybookOptions) => {
return [];
};

const isLocalFileImport = packageName => /^[./]/.test(packageName);

/**
* Parse an addon into either a managerEntry or a preset. Throw on invalid input.
*
Expand All @@ -55,14 +59,19 @@ const resolvePresetFunction = (input, presetOptions, storybookOptions) => {
* => { type: 'presets', item: { name: '@storybook/addon-docs/preset', options } }
*/
export const resolveAddonName = name => {
const { path } = parsePackageName(name);
let path;
if (isLocalFileImport(name)) {
path = name;
} else {
({ path } = parsePackageName(name));
}

// when user provides full path, we don't need to do anything
if (path) {
return {
name,
// Accept `register`, `register.js`, `require.resolve('foo/register') cases
type: path.match(/register(.js)?$/) ? 'managerEntries' : 'presets',
// Accept `register`, `register.js`, `require.resolve('foo/register'), `register_panel`
type: path.match(/register(_panel)?(.js)?$/) ? 'managerEntries' : 'presets',
};
}

Expand Down
3 changes: 3 additions & 0 deletions lib/core/src/server/presets.test.js
View file
Open in desktop
Expand Up @@ -389,6 +389,7 @@ describe('splitAddons', () => {
'@storybook/addon-actions/register',
'storybook-addon-readme/register',
'addon-foo/register.js',
'@storybook/addon-notes/register_panel',
];
expect(splitAddons(addons)).toEqual({
managerEntries: addons,
Expand All @@ -401,6 +402,8 @@ describe('splitAddons', () => {
'@storybook/addon-essentials',
'@storybook/addon-docs/presets',
'addon-bar/presets.js',
'./local-addon-relative/presets',
'/local-addon-absolute/presets',
];
expect(splitAddons(addons)).toEqual({
managerEntries: [],
Expand Down