Skip to content

Addon-docs/Vue,Vue3: Fix preset options for vue-docgen-api #14227

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.

Sign up for GitHub

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

Merged
shilman merged 3 commits into from
Mar 17, 2021
+32 −4
Merged

Addon-docs/Vue,Vue3: Fix preset options for vue-docgen-api #14227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f478cac
Applying preset options for vue-docgen-api (extending PR #9699)
Dschungelabenteuer Mar 13, 2021
193cf98
Added type definition to option argument
Dschungelabenteuer Mar 14, 2021
797c605
Reused Storybook's Options core type and applied fix to vue3 framework
Dschungelabenteuer Mar 16, 2021
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
18 changes: 16 additions & 2 deletions addons/docs/src/frameworks/vue/preset.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,26 @@
export function webpackFinal(webpackConfig: any = {}, options: any = {}) {
import type { Options } from '@storybook/core-common';

export function webpackFinal(webpackConfig: any = {}, options: Options) {
let vueDocgenOptions = {};

options.presetsList?.forEach((preset) => {
if (preset.name.includes('addon-docs') && preset.options.vueDocgenOptions) {
const appendableOptions = preset.options.vueDocgenOptions;
vueDocgenOptions = {
...vueDocgenOptions,
...appendableOptions,
};
}
});

webpackConfig.module.rules.push({
test: /\.vue$/,
loader: require.resolve('vue-docgen-loader', { paths: [require.resolve('@storybook/vue')] }),
enforce: 'post',
options: {
docgenOptions: {
alias: webpackConfig.resolve.alias,
...options.vueDocgenOptions,
...vueDocgenOptions,
},
},
});
Expand Down
18 changes: 16 additions & 2 deletions addons/docs/src/frameworks/vue3/preset.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,26 @@
export function webpackFinal(webpackConfig: any = {}, options: any = {}) {
import type { Options } from '@storybook/core-common';

export function webpackFinal(webpackConfig: any = {}, options: Options) {
let vueDocgenOptions = {};

options.presetsList?.forEach((preset) => {
if (preset.name.includes('addon-docs') && preset.options.vueDocgenOptions) {
const appendableOptions = preset.options.vueDocgenOptions;
vueDocgenOptions = {
...vueDocgenOptions,
...appendableOptions,
};
}
});

webpackConfig.module.rules.push({
test: /\.vue$/,
loader: require.resolve('vue-docgen-loader', { paths: [require.resolve('@storybook/vue3')] }),
enforce: 'post',
options: {
docgenOptions: {
alias: webpackConfig.resolve.alias,
...options.vueDocgenOptions,
...vueDocgenOptions,
},
},
});
Expand Down