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.

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

Release: Prerelease 7.6.0-beta.3 #25007

Closed
wants to merge 644 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
644 commits
Select commit Hold shift + click to select a range
7a10141
Updates most of the easy icons
cdedreuille Oct 18, 2023
9901392
Update Panel.stories.tsx
cdedreuille Oct 18, 2023
3c4ee1d
Merge branch 'next' into release-8-0
ndelangen Oct 18, 2023
4eacfc2
Merge branch 'release-8-0' into norbert/remove-storyshots
ndelangen Oct 18, 2023
3431d8e
Merge branch 'norbert/remove-storyshots' into norbert/ts5
ndelangen Oct 18, 2023
ab28071
Merge branch 'norbert/remove-storyshots' into pr/agriffis/21673-2
ndelangen Oct 18, 2023
ad1e0b9
skip test, over commenting it out
ndelangen Oct 18, 2023
be6af4b
globalize new icons
ndelangen Oct 18, 2023
0b3d271
fix addons being registered too late
ndelangen Oct 18, 2023
48fa779
Merge branch 'release-8-0' into norbert/remove-storyshots
ndelangen Oct 18, 2023
fd76b20
remove docs and dependencies of storyshots
ndelangen Oct 18, 2023
49249b3
Merge branch 'release-8-0' into norbert/ts5
ndelangen Oct 18, 2023
5c758b6
Merge branch 'release-8-0' into new-icon-library
cdedreuille Oct 18, 2023
d82fab9
Merge pull request #24438 from storybookjs/norbert/remove-storyshots
ndelangen Oct 18, 2023
8e3b336
Merge branch 'release-8-0' into pr/ndelangen/24511
ndelangen Oct 18, 2023
048b06e
Merge pull request #24440 from storybookjs/norbert/ts5
ndelangen Oct 18, 2023
8bb1a43
add missing typings
ndelangen Oct 18, 2023
bd7e891
Merge branch 'new-icon-library' of github.com:storybookjs/storybook i…
ndelangen Oct 18, 2023
c1f20bf
Merge branch 'release-8-0' into norbert/react18
ndelangen Oct 19, 2023
14d094a
fix check
ndelangen Oct 19, 2023
1d4118b
Update icon library
cdedreuille Oct 19, 2023
f03ed59
Merge branch 'next' into release-8-0
cdedreuille Oct 19, 2023
117bfbd
Merge branch 'release-8-0' into new-icon-library
cdedreuille Oct 19, 2023
ff50f69
ensure the preview is done loading after navigation
ndelangen Oct 19, 2023
f25cc82
remove ssv6 sandbox templates
JReinhold Oct 19, 2023
b332f40
Fix linting for now
cdedreuille Oct 19, 2023
a994219
Merge pull request #24433 from storybookjs/new-icon-library
cdedreuille Oct 19, 2023
09be27a
Merge branch 'next' into release-8-0
cdedreuille Oct 19, 2023
445de35
Merge pull request #24516 from storybookjs/remove-ssv6-sandboxes
JReinhold Oct 19, 2023
78bcb62
fix state & e2e tests
ndelangen Oct 19, 2023
b2c6a49
simplify
ndelangen Oct 19, 2023
829fba6
fix tests
ndelangen Oct 19, 2023
856d535
delete redundant typings file
ndelangen Oct 19, 2023
ae3ee2e
Merge branch 'release-8-0' into norbert/react18
ndelangen Oct 19, 2023
74cc852
fix bench script
ndelangen Oct 19, 2023
4792ba1
Merge branch 'norbert/react18' of github.com:storybookjs/storybook in…
ndelangen Oct 19, 2023
3d978f5
Merge pull request #24514 from storybookjs/norbert/react18
ndelangen Oct 19, 2023
84edfcd
refactor for less duplicated code
ndelangen Oct 20, 2023
fd0e908
remove deprecated packages for 8.0
ndelangen Oct 20, 2023
f78038b
remove references to storybook/addons
ndelangen Oct 20, 2023
f4b0977
remove usage of @storybook/client-api
ndelangen Oct 20, 2023
b0a9d0b
remove usage of @storybook/preview-web
ndelangen Oct 20, 2023
b861dee
remove usage of @storybook/store
ndelangen Oct 20, 2023
e5bcabe
remove usage of @storybook/api
ndelangen Oct 20, 2023
84428aa
remove usage of @storybook/channel-*
ndelangen Oct 20, 2023
9e3d019
remove deprecated entrypoints of preview-api
ndelangen Oct 20, 2023
ca5376b
update lockfile
ndelangen Oct 20, 2023
f35f073
remove extra exports from channels package
ndelangen Oct 20, 2023
f11b035
Update Toolbar.tsx
cdedreuille Oct 20, 2023
4250ddd
Merge branch 'next' into release-8-0
ndelangen Oct 20, 2023
3eaad3c
Fix listItem story + icon color
cdedreuille Oct 20, 2023
d9e82e7
Fix story on Tooltip Link List
cdedreuille Oct 20, 2023
ae331e9
Fix old links name in stories
cdedreuille Oct 20, 2023
8e37338
Update Toolbar.tsx
cdedreuille Oct 20, 2023
55cb7ae
Merge branch 'release-8-0' into charles-fix-icon-button-docs
cdedreuille Oct 20, 2023
7759cb8
Improved empty state
cdedreuille Oct 20, 2023
e39c617
Update Toolbar.tsx
cdedreuille Oct 20, 2023
38580c5
Merge branch 'release-8-0' into norbert/remove-shims
ndelangen Oct 20, 2023
ce42ba9
Merge pull request #24528 from storybookjs/norbert/remove-shims
ndelangen Oct 20, 2023
233a73a
Merge pull request #24529 from storybookjs/charles-fix-icon-button-docs
cdedreuille Oct 20, 2023
99911f4
Merge branch 'next' into release-8-0
ndelangen Oct 23, 2023
c34f711
Merge branch 'release-8-0' into fix-notifications-in-new-layout
JReinhold Oct 26, 2023
3651bbc
Merge branch 'release-8-0' into yann/storybook-test-docs
kasperpeulen Oct 26, 2023
f82976f
Merge branch 'next' into release-8-0
ndelangen Oct 30, 2023
d41d657
fix parallelism
ndelangen Oct 30, 2023
188d106
fix parallelism
ndelangen Oct 30, 2023
6d83428
fixes
ndelangen Oct 30, 2023
86dedf2
Merge branch 'release-8-0' into fix-notifications-in-new-layout
cdedreuille Oct 30, 2023
cec1b83
Improved Notifications to have a fixed placement in CSS
cdedreuille Oct 30, 2023
46bfc2a
Update NotificationList.tsx
cdedreuille Oct 31, 2023
1ecac7e
Fix maxHeight on scroll + improve stories
cdedreuille Oct 31, 2023
b744fe8
Update NotificationList.stories.tsx
cdedreuille Oct 31, 2023
9598dc3
Improved stories
cdedreuille Oct 31, 2023
fa26143
Merge pull request #24281 from storybookjs/fix-notifications-in-new-l…
JReinhold Oct 31, 2023
ce06824
Merge branch 'next' into release-8-0
ndelangen Nov 1, 2023
abd3446
regen lockfiles
ndelangen Nov 1, 2023
6a11004
fix
ndelangen Nov 1, 2023
1a63f05
only log "done" locally, the CI has no use for it
ndelangen Nov 1, 2023
4d66527
Remove await of getBy method
kasperpeulen Nov 1, 2023
e5be410
Merge branch 'next' into release-8-0
ndelangen Nov 1, 2023
bfe7a0e
Merge pull request #24647 from storybookjs/norbert/less-noise-tasks
ndelangen Nov 1, 2023
6db1a34
remove extract
ndelangen Nov 1, 2023
64a9a8c
correction of code-comment
ndelangen Nov 1, 2023
1ada451
fix lockfile
ndelangen Nov 1, 2023
3f15a08
cleanup
ndelangen Nov 1, 2023
129693d
Merge pull request #24653 from storybookjs/norbert/remove-puppeteer
ndelangen Nov 1, 2023
acdec9c
remove storiesOf api
ndelangen Nov 1, 2023
1d02f10
cleanup
ndelangen Nov 1, 2023
3d529ec
cleanup
ndelangen Nov 1, 2023
a493438
cleanup
ndelangen Nov 1, 2023
cfc08ba
remove empty files
ndelangen Nov 1, 2023
d9ddddf
add migration notes for react 18 and storyshots
ndelangen Nov 2, 2023
2534f3b
Merge branch 'release-8-0' into norbert/remove-storiesof
ndelangen Nov 2, 2023
cc08ac4
Merge branch 'next' into release-8-0
ndelangen Nov 2, 2023
3c2dda4
Merge branch 'release-8-0' into norbert/remove-storiesof
ndelangen Nov 2, 2023
c92f92a
Migration note for: "Implicit actions can not be used during rendering"
kasperpeulen Nov 2, 2023
ee8d7b8
Merge branch 'next' into release-8-0
ndelangen Nov 2, 2023
7029ede
Merge branch 'release-8-0' of github.com:storybookjs/storybook into r…
ndelangen Nov 2, 2023
9556c80
shut it eslint
ndelangen Nov 2, 2023
63762dc
Merge pull request #24263 from storybookjs/yann/storybook-test-docs
kasperpeulen Nov 3, 2023
c711543
Merge branch 'next' into release-8-0
cdedreuille Nov 3, 2023
1a01730
Merge branch 'release-8-0' into charles-sidebar-ui-updates
cdedreuille Nov 3, 2023
f105fbb
Merge branch 'next' into release-8-0
ndelangen Nov 3, 2023
12eccfe
Update Tree.tsx
cdedreuille Nov 3, 2023
6c65d2d
Update TreeNode.tsx
cdedreuille Nov 3, 2023
ffd31c0
Fix the collapsedIcon
cdedreuille Nov 3, 2023
a993b07
Merge branch 'release-8-0' into charles-sidebar-ui-updates
cdedreuille Nov 3, 2023
81a11b4
Fix scroll and search
cdedreuille Nov 3, 2023
37164c8
Merge branch 'next' into release-8-0
ndelangen Nov 4, 2023
bcfb781
make it easy/automatic to update the versions.ts
ndelangen Nov 4, 2023
bec0ced
Merge branch 'release-8-0' into charles-sidebar-ui-updates
cdedreuille Nov 6, 2023
803c1ce
Improve Sidebar + search
cdedreuille Nov 6, 2023
9f9b059
Remove clear and close from search results
cdedreuille Nov 6, 2023
442533e
Fix search results
cdedreuille Nov 6, 2023
de17130
Merge branch 'next' into release-8-0
cdedreuille Nov 6, 2023
df9a029
Bring back clear lastViewed
cdedreuille Nov 6, 2023
1e4c875
Merge branch 'release-8-0' into charles-sidebar-ui-updates
cdedreuille Nov 6, 2023
7f89223
Update SearchResults.tsx
cdedreuille Nov 6, 2023
2670872
Fix color mobile + improve hot key design
cdedreuille Nov 6, 2023
8e64317
Update Text.tsx
cdedreuille Nov 6, 2023
ce4142b
Merge pull request #24737 from storybookjs/charles-fix-btn-size
cdedreuille Nov 7, 2023
5c99dc2
Fix scrollbar + search overflow bug
cdedreuille Nov 7, 2023
3acdb11
Fix highlighted on search results when scrolling down
cdedreuille Nov 7, 2023
dc276af
Merge branch 'release-8-0' into charles-sidebar-ui-updates
cdedreuille Nov 7, 2023
4a56edd
Merge branch 'next' into release-8-0
cdedreuille Nov 7, 2023
dd7b484
remove unused import
ndelangen Nov 7, 2023
abbf50b
Merge branch 'release-8-0' into charles-sidebar-ui-updates
cdedreuille Nov 9, 2023
b868b88
Update SearchResults.tsx
cdedreuille Nov 13, 2023
2ea7d7b
Merge branch 'next' into release-8-0
ndelangen Nov 15, 2023
81d67a8
Merge branch 'next' into release-8-0
ndelangen Nov 15, 2023
61a22c0
make the bench script work
ndelangen Nov 15, 2023
9181355
Merge branch 'next' into release-8-0
ndelangen Nov 16, 2023
bb25d5a
regen lockfiles
ndelangen Nov 16, 2023
5b464aa
fix
ndelangen Nov 16, 2023
2eec54d
fix
ndelangen Nov 16, 2023
580101c
Merge pull request #24707 from storybookjs/charles-sidebar-ui-updates
ndelangen Nov 17, 2023
450fa5e
Merge branch 'next' into release-8-0
ndelangen Nov 17, 2023
8da8617
cleanup
ndelangen Nov 17, 2023
adc2dee
fix
ndelangen Nov 17, 2023
a81d102
fix(AddonViewport): expose types for user parameter validation
piratetaco Nov 17, 2023
aa93eb4
Merge branch 'next' into release-8-0
cdedreuille Nov 19, 2023
5ae02be
Merge branch 'next' into release-8-0
ndelangen Nov 21, 2023
e9c5bc8
First iteration
jonniebigodes Nov 21, 2023
f85e85c
Merge branch 'next' into patch-1
jonniebigodes Nov 21, 2023
297b99e
Initial changes for Storyshots
jonniebigodes Nov 22, 2023
53aeed4
Ran pretty-docs
jonniebigodes Nov 22, 2023
1236bdd
Merge branch 'next' into docs_visual_snaphot_test_changes
jonniebigodes Nov 23, 2023
18d4e86
this file was automatically changed, when I reloaded extensions in vs…
ndelangen Nov 23, 2023
278f4fb
Merge branch 'next' into norbert/filterable-refs
ndelangen Nov 23, 2023
a6b9c4f
Merge branch 'release-8-0' into norbert/remove-storiesof
ndelangen Nov 23, 2023
9b35dd1
Merge branch 'next' into release-8-0
ndelangen Nov 23, 2023
6b5cc6b
regen lockfile
ndelangen Nov 23, 2023
ad641b2
Merge branch 'release-8-0' into norbert/remove-storiesof
ndelangen Nov 23, 2023
c735aa2
Merge branch 'norbert/remove-storiesof' of github.com:storybookjs/sto…
ndelangen Nov 23, 2023
cb2e6e9
fix
ndelangen Nov 23, 2023
a6d8718
Merge branch 'release-8-0' into norbert/remove-storiesof
ndelangen Nov 23, 2023
08e3dcb
remove unused ts-expect-error
ndelangen Nov 23, 2023
9c0e06c
Merge branch 'release-8-0' into norbert/remove-storiesof
ndelangen Nov 23, 2023
6ce6ab1
disable failing tests for now
ndelangen Nov 23, 2023
9c6e186
Merge branch 'release-8-0' into norbert/remove-storiesof
ndelangen Nov 23, 2023
b591a08
Merge branch 'next' into patch-1
jonniebigodes Nov 23, 2023
600daef
Feedback addressed
jonniebigodes Nov 23, 2023
7cba07a
Merge branch 'docs_visual_snaphot_test_changes' of https://github.com…
jonniebigodes Nov 23, 2023
f4300a3
Added divider for readability
jonniebigodes Nov 23, 2023
e948e8b
Merge branch 'next' into docs_visual_snaphot_test_changes
jonniebigodes Nov 23, 2023
a0a8d43
Revert "disable failing tests for now"
valentinpalkovic Nov 24, 2023
9a1d218
Dependencies: Update Typescript
valentinpalkovic Nov 24, 2023
26fdc2a
Merge pull request #24970 from storybookjs/valentin/update-typescript
valentinpalkovic Nov 24, 2023
669979c
Merge branch 'release-8-0' into norbert/filterable-refs
ndelangen Nov 24, 2023
856b10d
Merge pull request #24655 from storybookjs/norbert/remove-storiesof
ndelangen Nov 24, 2023
5fed890
globalize the core-event sub paths
ndelangen Nov 24, 2023
8a61650
fixes
ndelangen Nov 24, 2023
89daec6
rename things
ndelangen Nov 24, 2023
ab4f44d
Merge branch 'next' into release-8-0
ndelangen Nov 24, 2023
c641567
fix lockfile
ndelangen Nov 24, 2023
2f6899a
regen lockfile
ndelangen Nov 24, 2023
1ddf19a
fix lockfile
ndelangen Nov 24, 2023
f8a2b33
Merge pull request #24211 from storybookjs/norbert/filterable-refs
ndelangen Nov 24, 2023
8e97d70
Merge pull request #24976 from storybookjs/norbert/fix-globalization-…
ndelangen Nov 24, 2023
3cb33e5
Feedback round 2
jonniebigodes Nov 24, 2023
db8a182
Adds type information
jonniebigodes Nov 24, 2023
1ec7f2e
Merge branch 'docs_visual_snaphot_test_changes' of https://github.com…
jonniebigodes Nov 24, 2023
9bc18ff
Merge branch 'next' into pr/dobesv/20791
ndelangen Nov 24, 2023
c1b7477
Discard changes to .vscode/settings.json
ndelangen Nov 24, 2023
3d339e1
remove duplicate code
ndelangen Nov 24, 2023
e85727e
Merge branch 'get-project-root-fixup' of github.com:dobesv/storybook …
ndelangen Nov 24, 2023
7b599d1
Merge branch 'release-8-0' into get-project-root-fixup
ndelangen Nov 24, 2023
b790b45
fix
ndelangen Nov 24, 2023
aec454d
Merge branch 'get-project-root-fixup' of github.com:dobesv/storybook …
ndelangen Nov 24, 2023
234fb3e
Merge branch 'release-8-0' into fix_stories_type
ndelangen Nov 24, 2023
7cdb504
Merge branch 'next' into chore/strict-ts-cra
ndelangen Nov 24, 2023
961825c
Merge branch 'next' into docs_visual_snaphot_test_changes
jonniebigodes Nov 24, 2023
716bbac
Merge pull request #24954 from storybookjs/docs_visual_snaphot_test_c…
jonniebigodes Nov 24, 2023
3350bf9
fix typecheck
kuriacka Nov 24, 2023
a068e5e
another types fix
kuriacka Nov 24, 2023
7e24994
add ts-ignore
kuriacka Nov 24, 2023
3ea45c6
Merge branch 'next' into patch-1
jonniebigodes Nov 24, 2023
443f1b6
Merge pull request #23485 from DiamondeX/patch-1
jonniebigodes Nov 24, 2023
d227dea
Fix screen reader not announcing changes for expand/collapse button
wjdtjdgns Nov 26, 2023
e4a818a
Minor additional updates to the docs
jonniebigodes Nov 26, 2023
19841e0
Merge branch 'next' into docs_swc_flag
jonniebigodes Nov 26, 2023
69c3c86
Merge branch 'next' into release-8-0
ndelangen Nov 27, 2023
20600b3
Merge pull request #20791 from dobesv/get-project-root-fixup
ndelangen Nov 27, 2023
8fec73b
Merge branch 'release-8-0' into fix/theme-fontCode-mdx
ndelangen Nov 27, 2023
5c40141
Merge branch 'next' into pr/kuriacka/22395
ndelangen Nov 27, 2023
b854892
fixes
ndelangen Nov 27, 2023
f3a5960
fixes
ndelangen Nov 27, 2023
ed656b8
Merge pull request #23110 from storybookjs/fix/theme-fontCode-mdx
ndelangen Nov 27, 2023
87f7063
Merge branch 'release-8-0' into patch-1
ndelangen Nov 27, 2023
b534c7e
add required flags to create-svelte-with-args cli
JReinhold Nov 27, 2023
3bcdc4e
Merge pull request #24896 from piratetaco/patch-1
ndelangen Nov 27, 2023
faf185b
Merge pull request #24984 from wjdtjdgns/fix/screenreader-expand-coll…
ndelangen Nov 27, 2023
56d16b0
Feedback addressed
jonniebigodes Nov 27, 2023
20afeef
Merge branch 'docs_swc_flag' of https://github.com/storybookjs/storyb…
jonniebigodes Nov 27, 2023
904b9ee
Merge pull request #22395 from kuriacka/chore/strict-ts-cra
ndelangen Nov 27, 2023
095a23d
Merge branch 'release-8-0' into pr/imccausl/21555
ndelangen Nov 27, 2023
6b22f0e
Next.js: Fix Fast Refresh config for SWC mode
valentinpalkovic Nov 27, 2023
f883290
Merge pull request #24991 from storybookjs/valentin/fix-fast-refresh-…
valentinpalkovic Nov 27, 2023
c1c520d
Merge branch 'next' into docs_swc_flag
jonniebigodes Nov 27, 2023
b073641
make some improvements in the typings of config
ndelangen Nov 27, 2023
cc288d0
Filter out docs from essentials as well
kasperpeulen Nov 27, 2023
935369f
fixes
ndelangen Nov 27, 2023
b0a239f
Merge pull request #24964 from storybookjs/norbert/apply-auto-changed…
ndelangen Nov 27, 2023
1b576f9
fix
ndelangen Nov 27, 2023
78ce946
Merge pull request #24986 from storybookjs/docs_swc_flag
jonniebigodes Nov 27, 2023
41a80df
Merge pull request #21555 from imccausl/fix_stories_type
ndelangen Nov 27, 2023
3b3ac24
Merge pull request #24994 from storybookjs/kasper/filter-out-docs-fro…
kasperpeulen Nov 27, 2023
66cf39b
Merge pull request #24990 from storybookjs/fix-sveltekit-template
JReinhold Nov 27, 2023
31247ba
Docs TOC updates
kylegach Nov 20, 2023
1fb8d01
Remove `/<renderer>` from URLs in CLI templates
kylegach Nov 20, 2023
a076f4f
Remove `/<renderer>` from URLs in docs
kylegach Nov 20, 2023
975ad76
Update TOC to use `heading` type
kylegach Nov 20, 2023
8409ac7
Content updates
kylegach Nov 27, 2023
4933c17
Next.js: Fix react-docgen usage with preset-env settings
valentinpalkovic Nov 27, 2023
c4d5f05
Merge pull request #24925 from storybookjs/changes-from-docs-updates
JReinhold Nov 28, 2023
0adaf29
Webpack5: Load babel-options only when necessary
valentinpalkovic Nov 28, 2023
99dab60
Fix CRA
valentinpalkovic Nov 28, 2023
a60f3dd
Merge pull request #24993 from storybookjs/valentin/fix-react-docgen-…
valentinpalkovic Nov 28, 2023
c5268c9
Downgrade testing library to 14.3.0 to prevent firefox issues https:/…
kasperpeulen Nov 28, 2023
ca56066
Merge pull request #25002 from storybookjs/valentin/do-not-load-babel…
valentinpalkovic Nov 28, 2023
f75ef81
Merge branch 'next' into release-8-0
ndelangen Nov 28, 2023
464cd8d
Merge branch 'next' into release-8-0
ndelangen Nov 28, 2023
462dd71
regen lockfile
ndelangen Nov 28, 2023
f2d43e3
regen lockfile
ndelangen Nov 28, 2023
f304715
Merge pull request #25004 from storybookjs/kasper/downgrade-testing-lib
kasperpeulen Nov 28, 2023
e038dc2
Merge remote-tracking branch 'origin/next' into release-8-0
valentinpalkovic Nov 28, 2023
712a2a3
Update CHANGELOG.md for v7.6.0 [skip ci]
JReinhold Nov 28, 2023
1f190c7
Merge branch 'next' into release-8-0
valentinpalkovic Nov 28, 2023
d2a7bd6
Merge pull request #24271 from storybookjs/release-8-0
valentinpalkovic Nov 28, 2023
0a86333
Write changelog for 7.6.0-beta.3 [skip ci]
storybook-bot Nov 28, 2023
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
Prev Previous commit
Next Next commit
fixes
  • Loading branch information
ndelangen committed Nov 27, 2023

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit f3a596092a45f874702f47ea57ab8ca51b7088e2
6 changes: 3 additions & 3 deletions code/presets/create-react-app/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* eslint-disable import/no-extraneous-dependencies */
import { join, relative, dirname } from 'path';
import type { Configuration, RuleSetRule } from 'webpack';
import type { Configuration, RuleSetRule, WebpackPluginInstance } from 'webpack';
import semver from 'semver';
import { logger } from '@storybook/node-logger';
import PnpWebpackPlugin from 'pnp-webpack-plugin';
@@ -134,8 +134,8 @@ const webpack = async (
// NOTE: this prioritizes the storybook version of a plugin
// when there are duplicates between SB and CRA
plugins: mergePlugins(
...(webpackConfig.plugins ?? []),
...(craWebpackConfig.plugins ?? []),
...((webpackConfig.plugins ?? []) as WebpackPluginInstance[]),
...((craWebpackConfig.plugins ?? []) as WebpackPluginInstance[]),
...tsDocgenPlugin
),
resolve: {