Skip to content

Commit 262cf42

Browse files
authored
Merge branch 'next' into a11y-popover-content
2 parents 4252d57 + 15f7ac4 commit 262cf42

File tree

124 files changed

+734
-29422
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

124 files changed

+734
-29422
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ executors:
6464
default: "small"
6565
working_directory: /tmp/storybook
6666
docker:
67-
- image: mcr.microsoft.com/playwright:v1.48.1-jammy
67+
- image: mcr.microsoft.com/playwright:v1.52.0-noble
6868
environment:
6969
NODE_OPTIONS: --max_old_space_size=6144
7070
resource_class: <<parameters.class>>

.github/workflows/tests-unit.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,15 @@ on:
77
pull_request:
88
types: [opened, synchronize, reopened]
99

10+
env:
11+
NODE_OPTIONS: "--max_old_space_size=4096"
12+
1013
jobs:
1114
build:
12-
name: Core Unit Tests, ${{ matrix.os }}
15+
name: Core Unit Tests, windows-latest
1316
strategy:
1417
fail-fast: false
15-
matrix:
16-
os: [windows-latest]
17-
runs-on: ${{ matrix.os }}
18+
runs-on: windows-11-arm
1819
steps:
1920
- uses: actions/checkout@v4
2021
with:
@@ -25,11 +26,11 @@ jobs:
2526
node-version-file: ".nvmrc"
2627

2728
- name: install scripts
28-
run: |
29+
run: |
2930
cd scripts && yarn install
3031
3132
- name: install code
32-
run: |
33+
run: |
3334
cd code && yarn install
3435
3536
- name: compile

code/addons/a11y/template/stories/parameters.stories.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { global as globalThis } from '@storybook/global';
22

33
export default {
4-
component: globalThis.Components.Html,
4+
component: globalThis.__TEMPLATE_COMPONENTS__.Html,
55
args: {
66
content: '<button>Click Me!</button>',
77
},

code/addons/a11y/template/stories/tests.stories.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { global as globalThis } from '@storybook/global';
22

33
export default {
4-
component: globalThis.Components.Html,
4+
component: globalThis.__TEMPLATE_COMPONENTS__.Html,
55
args: {
66
content: '',
77
},

code/addons/docs/template/stories/codePanel/index.stories.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
export default {
2-
component: globalThis.Components.Button,
2+
component: globalThis.__TEMPLATE_COMPONENTS__.Button,
33
tags: ['autodocs'],
44
parameters: {
55
chromatic: { disable: true },

code/addons/docs/template/stories/docs2/button.stories.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
export default {
2-
component: globalThis.Components.Button,
2+
component: globalThis.__TEMPLATE_COMPONENTS__.Button,
33
tags: ['autodocs'],
44
args: { onClick: () => console.log('clicked!') },
55
parameters: {

code/addons/docs/template/stories/docs2/multiple-csf-files-a.stories.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
export default {
22
title: 'Multiple CSF Files Same Title',
3-
component: globalThis.Components.Html,
3+
component: globalThis.__TEMPLATE_COMPONENTS__.Html,
44
tags: ['autodocs'],
55
args: {
66
content: '<p>paragraph</p>',

code/addons/docs/template/stories/docs2/multiple-csf-files-b.stories.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
export default {
22
title: 'Multiple CSF Files Same Title',
3-
component: globalThis.Components.Html,
3+
component: globalThis.__TEMPLATE_COMPONENTS__.Html,
44
tags: ['autodocs'],
55
args: {
66
content: '<p>paragraph</p>',

code/addons/docs/template/stories/docs2/resolved-react.stories.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import { expect, within } from 'storybook/test';
2020
*/
2121
export default {
2222
title: 'Docs2/ResolvedReact',
23-
component: globalThis.Components.Html,
23+
component: globalThis.__TEMPLATE_COMPONENTS__.Html,
2424
tags: ['autodocs'],
2525
argTypes: {
2626
content: { table: { disable: true } },

code/addons/docs/template/stories/docspage/autoplay.stories.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { expect, within } from 'storybook/test';
22

33
export default {
4-
component: globalThis.Components.Pre,
4+
component: globalThis.__TEMPLATE_COMPONENTS__.Pre,
55
tags: ['autodocs'],
66
args: { text: 'Play has not run' },
77
parameters: { chromatic: { disable: true } },

code/addons/docs/template/stories/docspage/basic.stories.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { fn } from 'storybook/test';
22

33
export default {
4-
component: globalThis.Components.Button,
4+
component: globalThis.__TEMPLATE_COMPONENTS__.Button,
55
tags: ['autodocs'],
66
args: { label: 'Click Me!', onClick: fn() },
77
parameters: { chromatic: { disable: true } },

code/addons/docs/template/stories/docspage/description.stories.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
export default {
2-
component: globalThis.Components.Button,
2+
component: globalThis.__TEMPLATE_COMPONENTS__.Button,
33
subcomponents: {
4-
Pre: globalThis.Components.Pre,
4+
Pre: globalThis.__TEMPLATE_COMPONENTS__.Pre,
55
},
66
tags: ['autodocs'],
77
args: { label: 'Click Me!' },

code/addons/docs/template/stories/docspage/error.stories.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
export default {
2-
component: globalThis.Components.Button,
2+
component: globalThis.__TEMPLATE_COMPONENTS__.Button,
33
tags: ['autodocs', '!test', '!vitest'],
44
args: { label: 'Click Me!' },
55
parameters: { chromatic: { disable: true } },

code/addons/docs/template/stories/docspage/extract-description.stories.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
export default {
2-
component: globalThis.Components.Button,
2+
component: globalThis.__TEMPLATE_COMPONENTS__.Button,
33
tags: ['autodocs'],
44
args: { label: 'Click Me!' },
55
parameters: {

code/addons/docs/template/stories/docspage/iframe.stories.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
export default {
2-
component: globalThis.Components.Button,
2+
component: globalThis.__TEMPLATE_COMPONENTS__.Button,
33
tags: ['autodocs'],
44
args: { label: 'Rendered in iframe' },
55
parameters: {

code/addons/docs/template/stories/docspage/overflow.stories.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
export default {
2-
component: globalThis.Components.Pre,
2+
component: globalThis.__TEMPLATE_COMPONENTS__.Pre,
33
tags: ['autodocs'],
44
args: {
55
text: 'Demonstrates overflow',

code/addons/docs/template/stories/docspage/override.stories.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
const Override = () => 'overridden';
1313

1414
export default {
15-
component: globalThis.Components.Button,
15+
component: globalThis.__TEMPLATE_COMPONENTS__.Button,
1616
tags: ['autodocs'],
1717
args: { label: 'Click Me!' },
1818
parameters: {

code/addons/docs/template/stories/docspage/source.stories.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import type { StoryContext } from 'storybook/internal/types';
33
import { dedent } from 'ts-dedent';
44

55
export default {
6-
component: globalThis.Components.Button,
6+
component: globalThis.__TEMPLATE_COMPONENTS__.Button,
77
tags: ['autodocs'],
88
args: { label: 'Click Me!' },
99
parameters: { chromatic: { disable: true } },

code/addons/docs/template/stories/toc/basic.stories.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
export default {
2-
component: globalThis.Components.Button,
2+
component: globalThis.__TEMPLATE_COMPONENTS__.Button,
33
tags: ['autodocs'],
44
parameters: {
55
chromatic: { disable: true },

code/addons/docs/template/stories/toc/custom-selector.stories.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
export default {
2-
component: globalThis.Components.Button,
2+
component: globalThis.__TEMPLATE_COMPONENTS__.Button,
33
tags: ['autodocs'],
44
parameters: {
55
chromatic: { disable: true },

code/addons/docs/template/stories/toc/custom-title.stories.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
export default {
2-
component: globalThis.Components.Button,
2+
component: globalThis.__TEMPLATE_COMPONENTS__.Button,
33
tags: ['autodocs'],
44
parameters: {
55
chromatic: { disable: true },

code/addons/docs/template/stories/toc/ignore-selector.stories.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
export default {
2-
component: globalThis.Components.Button,
2+
component: globalThis.__TEMPLATE_COMPONENTS__.Button,
33
tags: ['autodocs'],
44
parameters: {
55
chromatic: { disable: true },

code/addons/links/template/stories/decorator.stories.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { global as globalThis } from '@storybook/global';
33
import { withLinks } from '@storybook/addon-links';
44

55
export default {
6-
component: globalThis.Components.Html,
6+
component: globalThis.__TEMPLATE_COMPONENTS__.Html,
77
parameters: {
88
chromatic: { disable: true },
99
},

code/addons/links/template/stories/hrefto.stories.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { hrefTo } from '@storybook/addon-links';
22

33
export default {
4-
component: globalThis.Components.Html,
4+
component: globalThis.__TEMPLATE_COMPONENTS__.Html,
55
title: 'hrefTo',
66
parameters: {
77
chromatic: { disable: true },

code/addons/links/template/stories/linkto.stories.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { global as globalThis } from '@storybook/global';
33
import { linkTo } from '@storybook/addon-links';
44

55
export default {
6-
component: globalThis.Components.Button,
6+
component: globalThis.__TEMPLATE_COMPONENTS__.Button,
77
title: 'linkTo',
88
args: {
99
label: 'Click Me!',

code/addons/themes/template/stories/decorators.stories.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ const addStyleSheetDecorator = (storyFn: any) => {
4141
};
4242

4343
export default {
44-
component: globalThis.Components.Pre,
44+
component: globalThis.__TEMPLATE_COMPONENTS__.Pre,
4545
args: {
4646
text: 'Testing the themes',
4747
},

code/addons/themes/template/stories/globals.stories.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ const addStyleSheetDecorator = (storyFn: any) => {
3737
};
3838

3939
export default {
40-
component: globalThis.Components.Pre,
40+
component: globalThis.__TEMPLATE_COMPONENTS__.Pre,
4141
args: {
4242
text: 'Testing the themes',
4343
},

code/addons/themes/template/stories/parameters.stories.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ const addStyleSheetDecorator = (storyFn: any) => {
3737
};
3838

3939
export default {
40-
component: globalThis.Components.Pre,
40+
component: globalThis.__TEMPLATE_COMPONENTS__.Pre,
4141
args: {
4242
text: 'Testing the themes',
4343
},

code/addons/vitest/template/stories/basics.stories.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {
1111
} from 'storybook/test';
1212

1313
export default {
14-
component: globalThis.Components.Form,
14+
component: globalThis.__TEMPLATE_COMPONENTS__.Form,
1515
args: {
1616
onSuccess: fn(),
1717
},

code/addons/vitest/template/stories/unhandled-errors.stories.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { global as globalThis } from '@storybook/global';
33
import { userEvent, within } from 'storybook/test';
44

55
export default {
6-
component: globalThis.Components.Button,
6+
component: globalThis.__TEMPLATE_COMPONENTS__.Button,
77
args: {
88
label: 'Button',
99
// onClick: fn(), <-- this is intentionally missing to trigger an unhandled error

code/core/template/stories/argMapping.stories.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ const labels = {
1919
};
2020

2121
export default {
22-
component: globalThis.Components.Pre,
22+
component: globalThis.__TEMPLATE_COMPONENTS__.Pre,
2323
decorators: [
2424
(storyFn: PartialStoryFn, context: StoryContext) => {
2525
return storyFn({

code/core/template/stories/argTypes.stories.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { global as globalThis } from '@storybook/global';
55
import { expect, within } from 'storybook/test';
66

77
export default {
8-
component: globalThis.Components.Pre,
8+
component: globalThis.__TEMPLATE_COMPONENTS__.Pre,
99
// Compose all the argTypes into `object`, so the pre component only needs a single prop
1010
decorators: [
1111
(storyFn: PartialStoryFn, context: StoryContext) =>

code/core/template/stories/args.stories.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ function pick(obj, keys) {
1818
}
1919

2020
export default {
21-
component: globalThis.Components.Pre,
21+
component: globalThis.__TEMPLATE_COMPONENTS__.Pre,
2222
args: {
2323
componentArg: 'componentArg',
2424
storyArg: 'componentStoryArg',

code/core/template/stories/argtype.stories.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { global as globalThis } from '@storybook/global';
22

33
export default {
4-
component: globalThis.Components.Button,
4+
component: globalThis.__TEMPLATE_COMPONENTS__.Button,
55
args: {
66
label: 'Click Me!',
77
},

code/core/template/stories/autotitle.stories.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { global as globalThis } from '@storybook/global';
55
import { expect } from 'storybook/test';
66

77
export default {
8-
component: globalThis.Components.Pre,
8+
component: globalThis.__TEMPLATE_COMPONENTS__.Pre,
99
args: { text: 'No content' },
1010
};
1111

code/core/template/stories/backgrounds/globals.stories.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { global as globalThis } from '@storybook/global';
22

33
export default {
4-
component: globalThis.Components.Pre,
4+
component: globalThis.__TEMPLATE_COMPONENTS__.Pre,
55
args: {
66
text: 'Testing the background',
77
},

code/core/template/stories/basics.stories.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { global as globalThis } from '@storybook/global';
33
import { action } from 'storybook/actions';
44

55
export default {
6-
component: globalThis.Components.Button,
6+
component: globalThis.__TEMPLATE_COMPONENTS__.Button,
77
args: {
88
label: 'Click Me!',
99
},

code/core/template/stories/before-each.stories.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import { expect } from 'storybook/test';
33

44
const meta = {
5-
component: globalThis.Components.Button,
5+
component: globalThis.__TEMPLATE_COMPONENTS__.Button,
66
args: { label: 'Button' },
77
};
88

code/core/template/stories/component-play.stories.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { global as globalThis } from '@storybook/global';
55
import { expect, within } from 'storybook/test';
66

77
export default {
8-
component: globalThis.Components.Pre,
8+
component: globalThis.__TEMPLATE_COMPONENTS__.Pre,
99
play: async ({ canvasElement, name }: PlayFunctionContext) => {
1010
await expect(
1111
JSON.parse(within(canvasElement as HTMLPreElement).getByTestId('pre').innerText)

code/core/template/stories/component-test.basics.stories.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {
1111
} from 'storybook/test';
1212

1313
export default {
14-
component: globalThis.Components.Form,
14+
component: globalThis.__TEMPLATE_COMPONENTS__.Form,
1515
args: {
1616
onSuccess: fn(),
1717
},

code/core/template/stories/component-test.unhandled-errors.stories.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { global as globalThis } from '@storybook/global';
33
import { userEvent, within } from 'storybook/test';
44

55
export default {
6-
component: globalThis.Components.Button,
6+
component: globalThis.__TEMPLATE_COMPONENTS__.Button,
77
args: {
88
label: 'Button',
99
// onClick: fn(), <-- this is intentionally missing to trigger an unhandled error

code/core/template/stories/configs.stories.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { actions, configureActions } from 'storybook/actions';
55
const configs = actions('actionA', 'actionB', 'actionC');
66

77
export default {
8-
component: globalThis.Components.Button,
8+
component: globalThis.__TEMPLATE_COMPONENTS__.Button,
99
args: {
1010
label: 'Click Me!',
1111
},

code/core/template/stories/controls/basics.stories.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import type { PartialStoryFn, StoryContext } from 'storybook/internal/types';
33
import { global as globalThis } from '@storybook/global';
44

55
export default {
6-
component: globalThis.Components.Pre,
6+
component: globalThis.__TEMPLATE_COMPONENTS__.Pre,
77
decorators: [
88
(storyFn: PartialStoryFn, context: StoryContext) =>
99
storyFn({ args: { object: { ...context.args } } }),

code/core/template/stories/controls/conditional.stories.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import type { PartialStoryFn, StoryContext } from 'storybook/internal/types';
33
import { global as globalThis } from '@storybook/global';
44

55
export default {
6-
component: globalThis.Components.Pre,
6+
component: globalThis.__TEMPLATE_COMPONENTS__.Pre,
77
decorators: [
88
(storyFn: PartialStoryFn, context: StoryContext) =>
99
storyFn({ args: { object: { ...context.args } } }),

0 commit comments

Comments
 (0)