Skip to content

Commit e9b19b6

Browse files
authored
Merge pull request #30676 from storybookjs/kasper/internal-react-preview
CSF: Only export definePreview from the framework
2 parents 2df3340 + 79dd554 commit e9b19b6

File tree

9 files changed

+19
-16
lines changed

9 files changed

+19
-16
lines changed

code/core/src/csf/csf-factories.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* eslint-disable no-underscore-dangle */
1+
/* eslint-disable no-underscore-dangle,@typescript-eslint/naming-convention */
22
import type {
33
Args,
44
ComponentAnnotations,
@@ -20,7 +20,8 @@ export interface Preview<TRenderer extends Renderer = Renderer> {
2020
meta(input: ComponentAnnotations<TRenderer>): Meta<TRenderer>;
2121
}
2222

23-
export function definePreview<TRenderer extends Renderer>(
23+
/** Do not use, use the definePreview exported from the framework instead. */
24+
export function __definePreview<TRenderer extends Renderer>(
2425
input: Preview<TRenderer>['input']
2526
): Preview<TRenderer> {
2627
let composed: NormalizedProjectAnnotations<TRenderer>;

code/frameworks/experimental-nextjs-vite/src/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import type { ReactPreview } from '@storybook/react';
2-
import { definePreview as definePreviewBase } from '@storybook/react';
2+
import { __definePreview } from '@storybook/react';
33

44
import type vitePluginStorybookNextJs from 'vite-plugin-storybook-nextjs';
55

@@ -15,7 +15,7 @@ declare module '@storybook/experimental-nextjs-vite/vite-plugin' {
1515
}
1616

1717
export function definePreview(preview: NextPreview['input']) {
18-
return definePreviewBase({
18+
return __definePreview({
1919
...preview,
2020
addons: [nextPreview, ...(preview.addons ?? [])],
2121
}) as NextPreview;

code/frameworks/nextjs/src/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import type { ReactPreview } from '@storybook/react';
2-
import { definePreview as definePreviewBase } from '@storybook/react';
2+
import { __definePreview } from '@storybook/react';
33

44
import * as nextPreview from './preview';
55

66
export * from './types';
77
export * from './portable-stories';
88

99
export function definePreview(preview: NextPreview['input']) {
10-
return definePreviewBase({
10+
return __definePreview({
1111
...preview,
1212
addons: [nextPreview, ...(preview.addons ?? [])],
1313
}) as NextPreview;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
export type { FrameworkOptions, StorybookConfig } from './types';
22

3-
export { definePreview } from '@storybook/react';
3+
export { __definePreview as definePreview } from '@storybook/react';
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
export { definePreview } from '@storybook/react';
1+
export { __definePreview as definePreview } from '@storybook/react';
22

33
export * from './types';
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
export * from './types';
2-
export { definePreview } from '@storybook/react';
2+
export { __definePreview as definePreview } from '@storybook/react';

code/renderers/react/src/__test__/Button.csf4.stories.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ import { expect, fn, mocked, userEvent, within } from '@storybook/test';
55

66
import { action } from '@storybook/addon-actions';
77

8-
import { definePreview } from '../preview';
8+
import { __definePreview } from '../preview';
99
import { Button } from './Button';
1010

11-
const preview = definePreview({});
11+
const preview = __definePreview({});
1212

1313
const meta = preview.meta({
1414
id: 'button-component',

code/renderers/react/src/csf-factories.test.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@ import { fn } from '@storybook/test';
1414

1515
import { expectTypeOf } from 'expect-type';
1616

17-
import { definePreview } from './preview';
17+
import { __definePreview } from './preview';
1818
import type { Decorator } from './public-types';
1919

2020
type ButtonProps = { label: string; disabled: boolean };
2121
const Button: (props: ButtonProps) => ReactElement = () => <></>;
2222

23-
const preview = definePreview({});
23+
const preview = __definePreview({});
2424

2525
test('csf factories', () => {
26-
const config = definePreview({
26+
const config = __definePreview({
2727
addons: [
2828
{
2929
decorators: [],

code/renderers/react/src/preview.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1+
/* eslint-disable no-underscore-dangle,@typescript-eslint/naming-convention */
12
import type { ComponentType } from 'react';
23

3-
import { definePreview as definePreviewBase } from 'storybook/internal/csf';
4+
import { __definePreview as definePreviewBase } from 'storybook/internal/csf';
45
import type { Meta, Preview, Story } from 'storybook/internal/csf';
56
import type {
67
Args,
@@ -18,7 +19,8 @@ import * as reactDocsAnnotations from './entry-preview-docs';
1819
import type { AddMocks } from './public-types';
1920
import type { ReactRenderer } from './types';
2021

21-
export function definePreview(preview: ReactPreview['input']) {
22+
/** Do not use, use the definePreview exported from the framework instead */
23+
export function __definePreview(preview: ReactPreview['input']) {
2224
return definePreviewBase({
2325
...preview,
2426
addons: [reactAnnotations, reactDocsAnnotations, ...(preview.addons ?? [])],

0 commit comments

Comments
 (0)