Merge branch 'next' into copilot/update-agent-detection-for-telemetry

Author: valentinpalkovic

.github/copilot-instructions.md

@@ -303,7 +303,7 @@ cd code && yarn test
 
 ### End-to-End Testing
 
-- Playwright tests available (version 1.52.0 configured)
+- Playwright tests available (version 1.58.2 configured)
 - E2E test tasks: `yarn task e2e-tests-build --start-from auto` or `yarn task e2e-tests-dev --start-from auto`
 - Test runner scenarios: `yarn task test-runner-build --start-from auto` or `yarn task test-runner-dev --start-from auto`
 - Smoke tests: `yarn task smoke-test --start-from auto`

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 10.2.18
+
+- Core: Correctly fallback to first detected vitest config file - [#33865](https://github.com/storybookjs/storybook/pull/33865), thanks @yannbf!
+- Core: Fix error reporting in ManagerErrorBoundary - [#33915](https://github.com/storybookjs/storybook/pull/33915), thanks @ghengeveld!
+
 ## 10.2.17
 
 - Next.js: Add support for v16.2 - [#34046](https://github.com/storybookjs/storybook/pull/34046), thanks @valentinpalkovic!

CHANGELOG.prerelease.md

@@ -1,3 +1,10 @@
+## 10.3.0-alpha.17
+
+- Core: Correctly fallback to first detected vitest config file - [#33865](https://github.com/storybookjs/storybook/pull/33865), thanks @yannbf!
+- ESLint-plugin: Disallow extra properties in eslint plugin rule options - [#32056](https://github.com/storybookjs/storybook/pull/32056), thanks @andreww2012!
+- ESLint: bail out config setup if eslint-plugin-storybook is already imported - [#34089](https://github.com/storybookjs/storybook/pull/34089), thanks @copilot-swe-agent!
+- Revert "Toolbar: Remove extra toolbar divider when zoom controls not shown" - [#34099](https://github.com/storybookjs/storybook/pull/34099), thanks @valentinpalkovic!
+
 ## 10.3.0-alpha.16
 
 - A11y: Underline MDX links for WCAG SC 1.4.1 compliance - [#33139](https://github.com/storybookjs/storybook/pull/33139), thanks @NikhilChowdhury27!

code/.storybook/main.ts

@@ -55,10 +55,6 @@ const config = defineMain({
       directory: '../core/src/highlight',
       titlePrefix: 'highlight',
     },
-    {
-      directory: '../addons/docs/src/blocks',
-      titlePrefix: 'addons/docs/blocks',
-    },
     {
       directory: '../addons/a11y/src',
       titlePrefix: 'addons/accessibility',
@@ -71,6 +67,10 @@ const config = defineMain({
       directory: '../addons/docs/template/stories',
       titlePrefix: 'addons/docs',
     },
+    {
+      directory: '../addons/docs/src',
+      titlePrefix: 'addons/docs',
+    },
     {
       directory: '../addons/links/template/stories',
       titlePrefix: 'addons/links',

code/addons/a11y/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-a11y",
-  "version": "10.3.0-alpha.16",
+  "version": "10.3.0-alpha.17",
   "description": "Storybook Addon A11y: Test UI component compliance with WCAG web accessibility standards",
   "keywords": [
     "a11y",

code/addons/docs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-docs",
-  "version": "10.3.0-alpha.16",
+  "version": "10.3.0-alpha.17",
   "description": "Storybook Docs: Document UI components automatically with stories and MDX",
   "keywords": [
     "docs",

code/addons/docs/src/blocks/blocks/ArgTypes.tsx

@@ -13,6 +13,7 @@ import type { SortType } from '../components';
 import { ArgsTableError, ArgsTable as PureArgsTable, TabbedArgsTable } from '../components';
 import { useOf } from './useOf';
 import { getComponentName } from './utils';
+import { withMdxComponentOverride } from './with-mdx-component-override';
 
 type ArgTypesParameters = {
   include?: PropDescriptor;
@@ -62,7 +63,7 @@ function getArgTypesFromResolved(resolved: ReturnType<typeof useOf>) {
   return { argTypes, parameters, component, subcomponents };
 }
 
-export const ArgTypes: FC<ArgTypesProps> = (props) => {
+const ArgTypesImpl: FC<ArgTypesProps> = (props) => {
   const { of } = props;
   if ('of' in props && of === undefined) {
     throw new Error('Unexpected `of={undefined}`, did you mistype a CSF file reference?');
@@ -103,3 +104,5 @@ export const ArgTypes: FC<ArgTypesProps> = (props) => {
   };
   return <TabbedArgsTable tabs={tabs as any} sort={sort} />;
 };
+
+export const ArgTypes = withMdxComponentOverride('ArgTypes', ArgTypesImpl);

code/addons/docs/src/blocks/blocks/Canvas.tsx

@@ -13,6 +13,7 @@ import { SourceContext } from './SourceContainer';
 import type { StoryProps } from './Story';
 import { Story } from './Story';
 import { useOf } from './useOf';
+import { withMdxComponentOverride } from './with-mdx-component-override';
 
 type CanvasProps = Pick<PurePreviewProps, 'withToolbar' | 'additionalActions' | 'className'> & {
   /**
@@ -60,7 +61,7 @@ type CanvasProps = Pick<PurePreviewProps, 'withToolbar' | 'additionalActions' |
   story?: Pick<StoryProps, 'inline' | 'height' | 'autoplay' | '__forceInitialArgs' | '__primary'>;
 };
 
-export const Canvas: FC<CanvasProps> = (props) => {
+const CanvasImpl: FC<CanvasProps> = (props) => {
   const docsContext = useContext(DocsContext);
   const sourceContext = useContext(SourceContext);
   const { of, source } = props;
@@ -95,3 +96,5 @@ export const Canvas: FC<CanvasProps> = (props) => {
     </PurePreview>
   );
 };
+
+export const Canvas = withMdxComponentOverride('Canvas', CanvasImpl);

code/addons/docs/src/blocks/blocks/Controls.tsx

@@ -16,6 +16,7 @@ import { useArgs } from './useArgs';
 import { useGlobals } from './useGlobals';
 import { usePrimaryStory } from './usePrimaryStory';
 import { getComponentName } from './utils';
+import { withMdxComponentOverride } from './with-mdx-component-override';
 
 type ControlsParameters = {
   include?: PropDescriptor;
@@ -38,7 +39,7 @@ function extractComponentArgTypes(
   return extractArgTypes(component) as StrictArgTypes;
 }
 
-export const Controls: FC<ControlsProps> = (props) => {
+const ControlsImpl: FC<ControlsProps> = (props) => {
   const { of } = props;
   const context = useContext(DocsContext);
   const primaryStory = usePrimaryStory();
@@ -104,3 +105,5 @@ export const Controls: FC<ControlsProps> = (props) => {
     />
   );
 };
+
+export const Controls = withMdxComponentOverride('Controls', ControlsImpl);

code/addons/docs/src/blocks/blocks/Description.tsx

@@ -4,6 +4,7 @@ import React from 'react';
 import { Markdown } from './Markdown';
 import type { Of } from './useOf';
 import { useOf } from './useOf';
+import { withMdxComponentOverride } from './with-mdx-component-override';
 
 export enum DescriptionType {
   INFO = 'info',
@@ -58,7 +59,7 @@ const getDescriptionFromResolvedOf = (resolvedOf: ReturnType<typeof useOf>): str
   }
 };
 
-const DescriptionContainer: FC<DescriptionProps> = (props) => {
+const DescriptionImpl: FC<DescriptionProps> = (props) => {
   const { of } = props;
 
   if ('of' in props && of === undefined) {
@@ -70,4 +71,4 @@ const DescriptionContainer: FC<DescriptionProps> = (props) => {
   return markdown ? <Markdown>{markdown}</Markdown> : null;
 };
 
-export { DescriptionContainer as Description };
+export const Description = withMdxComponentOverride('Description', DescriptionImpl);