Skip to content
Merged
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
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## 10.2.11

- Addon-Vitest: Fix postinstall a11y installation - [#33888](https://github.com/storybookjs/storybook/pull/33888), thanks @valentinpalkovic!
- Manifests: Use correct story name - [#33709](https://github.com/storybookjs/storybook/pull/33709), thanks @JReinhold!
- Next.js: Handle legacyBehavior prop in Link mock component - [#33862](https://github.com/storybookjs/storybook/pull/33862), thanks @yatishgoel!
- React: Fix manifest stories empty when meta has no explicit title - [#33878](https://github.com/storybookjs/storybook/pull/33878), thanks @kasperpeulen!

## 10.2.10

- Core: Require token for websocket connections - [#33820](https://github.com/storybookjs/storybook/pull/33820), thanks @ghengeveld!
Expand Down
12 changes: 11 additions & 1 deletion code/core/src/common/js-package-manager/Yarn1Proxy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,19 @@ export class Yarn1Proxy extends JsPackageManager {

public runPackageCommand({
args,
useRemotePkg = false,
...options
}: Omit<ExecuteCommandOptions, 'command'> & { args: string[] }): ResultPromise {
}: Omit<ExecuteCommandOptions, 'command'> & {
args: string[];
useRemotePkg?: boolean;
}): ResultPromise {
const [command, ...rest] = args;
if (useRemotePkg) {
return executeCommand({
command: 'npx',
args,
});
}
return executeCommand({
command: `yarn`,
args: ['exec', command, '--', ...rest],
Expand Down
8 changes: 6 additions & 2 deletions code/core/src/common/js-package-manager/Yarn2Proxy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -100,11 +100,15 @@ export class Yarn2Proxy extends JsPackageManager {

public runPackageCommand({
args,
useRemotePkg = false,
...options
}: Omit<ExecuteCommandOptions, 'command'> & { args: string[] }): ResultPromise {
}: Omit<ExecuteCommandOptions, 'command'> & {
args: string[];
useRemotePkg?: boolean;
}): ResultPromise {
return executeCommand({
command: 'yarn',
args: ['exec', ...args],
args: [useRemotePkg ? 'dlx' : 'exec', ...args],
...options,
});
}
Expand Down
21 changes: 21 additions & 0 deletions code/frameworks/nextjs/src/export-mocks/link/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,27 @@ const MockLink = React.forwardRef<HTMLAnchorElement, any>(function MockLink(
linkAction(hrefString, { replace, scroll, shallow, prefetch, locale });
};

if (legacyBehavior) {
const child = React.Children.only(children) as React.ReactElement<any>;
const childProps: Record<string, any> = {
ref,
onClick: (e: React.MouseEvent<HTMLAnchorElement>) => {
e.preventDefault();
if (child.props && typeof child.props.onClick === 'function') {
child.props.onClick(e);
}
linkAction(hrefString, { replace, scroll, shallow, prefetch, locale });
},
...rest,
};

if (passHref || (child.type === 'a' && !('href' in (child.props || {})))) {
childProps.href = hrefString;
}

return React.cloneElement(child, childProps);
}

return (
<a ref={ref} href={hrefString} onClick={handleClick} {...rest}>
{children}
Expand Down
5 changes: 3 additions & 2 deletions code/frameworks/vue3-vite/src/plugins/vue-component-meta.ts
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,9 @@ export async function vueComponentMeta(tsconfigPath = 'tsconfig.json'): Promise<
s.replace('export default ', 'const _sfc_main = ');
s.append('\nexport default _sfc_main;');
}

s.append(`\n;${name}.__docgenInfo = ${JSON.stringify(meta)}`);
s.append(`\n;${name}.__docgenInfo = Object.assign({
displayName: ${name}.name ?? ${name}.__name
}, ${JSON.stringify(meta)})`);
});

return {
Expand Down
4 changes: 3 additions & 1 deletion code/frameworks/vue3-vite/src/plugins/vue-docgen.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@ export async function vueDocgen(): Promise<Plugin> {
const metaData = await parse(id);

const s = new MagicString(src);
s.append(`;_sfc_main.__docgenInfo = ${JSON.stringify(metaData)}`);
s.append(`;_sfc_main.__docgenInfo = Object.assign({
displayName: _sfc_main.name ?? _sfc_main.__name
}, ${JSON.stringify(metaData)});`);

return {
code: s.toString(),
Expand Down
3 changes: 2 additions & 1 deletion code/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -220,5 +220,6 @@
"Dependency Upgrades"
]
]
}
},
"deferredNextVersion": "10.2.11"
}
Loading
Loading