Skip to content

Commit efbf470

Browse files
committed
Merge branch 'next' into tech/overhaul-ui
# Conflicts: # CHANGELOG.md # addons/actions/package.json # addons/backgrounds/package.json # addons/notes/package.json # addons/storyshots/storyshots-core/package.json # addons/storyshots/storyshots-puppeteer/package.json # examples/cra-kitchen-sink/.storybook/config.js # examples/cra-kitchen-sink/src/stories/index.stories.js # lib/addons/package.json # lib/channel-websocket/package.json # lib/components/package.json # lib/components/src/addon_panel/__snapshots__/index.stories.storyshot # lib/components/src/header/__snapshots__/header.stories.storyshot # lib/components/src/layout/__snapshots__/index.stories.storyshot # lib/components/src/theme.js # lib/ui/package.json # lib/ui/src/modules/ui/components/stories_panel/__snapshots__/index.stories.storyshot # lib/ui/src/modules/ui/components/stories_panel/__snapshots__/text_filter.stories.storyshot # lib/ui/src/modules/ui/components/stories_panel/stories_tree/__snapshots__/index.stories.storyshot # lib/ui/src/modules/ui/configs/handle_routing.js # yarn.lock
2 parents bf45f06 + 4dd81aa commit efbf470

File tree

137 files changed

+7814
-1935
lines changed

Some content is hidden

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

137 files changed

+7814
-1935
lines changed

.babelrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ module.exports = {
1717
],
1818
env: {
1919
test: {
20-
plugins: ['babel-plugin-require-context-hook'],
20+
plugins: ['babel-plugin-require-context-hook', 'babel-plugin-dynamic-import-node'],
2121
},
2222
},
2323
overrides: [

ADDONS_SUPPORT.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
|[links](addons/links) |+|+|+|+|+|+|+| |+|+|+|
1616
|[notes](addons/notes) |+|+*|+|+|+|+|+| |+|+|+|
1717
|[options](addons/options) |+|+|+|+|+|+|+| |+|+|+|
18+
|[cssresources](addons/cssresources) |+| |+|+|+|+|+|+|+|+|+|
1819
|[storyshots](addons/storyshots) |+|+|+|+| | |+| |+|+| |
1920
|[storysource](addons/storysource) |+| |+|+|+|+|+|+|+|+|+|
2021
|[viewport](addons/viewport) |+| |+|+|+|+|+|+|+|+|+|

0 commit comments

Comments
 (0)