mirror of
https://github.com/storybookjs/storybook.git
synced 2025-04-06 15:31:16 +08:00
efd1cf219f
# Conflicts: # examples/cra-react15/.storybook/main.js # examples/cra-react15/package.json # examples/web-components-kitchen-sink/yarn.lock # jest.config.js # lib/builder-webpack4/package.json # lib/builder-webpack4/src/index.ts # lib/builder-webpack4/src/presets/custom-webpack-preset.ts # lib/builder-webpack4/src/preview/base-webpack.config.ts # lib/builder-webpack5/package.json # lib/core-common/package.json # lib/core-common/src/types.ts # lib/manager-webpack4/package.json # lib/manager-webpack4/src/index.ts # presets/html-webpack/package.json # presets/preact-webpack/package.json # presets/react-webpack/package.json # presets/svelte-webpack/package.json # presets/svelte-webpack/src/framework-preset-svelte-docs.ts # presets/vue-webpack/src/framework-preset-vue-docs.ts # yarn.lock