GitHub/storybook
1
0
Fork 0
mirror of https://github.com/storybookjs/storybook.git synced 2025-04-04 19:01:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

FIX review comments, CHANGE to only support a single preview.*

Browse Source
This commit is contained in:
Norbert de Langen 2019-11-11 11:11:38 +01:00
parent cd3bc6797f
commit eaab26e6e4
2 changed files with 39 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
addons/storyshots/storyshots-core/src/frameworks/configure.ts
View File

@ -84,32 +84,57 @@ const loadStories = (loadable: string, framework: string, clientApi: ClientApi)
}); });
}; };
const getPreviewFile = (configDir: string): string | false => {
const preview = path.join(configDir, 'preview.js');
const previewTS = path.join(configDir, 'preview.ts');
const config = path.join(configDir, 'config.js');
const configTS = path.join(configDir, 'config.ts');
if (isFile(previewTS)) {
return configTS;
}
if (isFile(preview)) {
return config;
}
if (isFile(configTS)) {
return configTS;
}
if (isFile(config)) {
return config;
}
return false;
};
const getMainFile = (configDir: string): string | false => {
const main = path.join(configDir, 'main.js');
if (isFile(main)) {
return main;
}
return false;
};
function getConfigPathParts(input: string): Output { function getConfigPathParts(input: string): Output {
const configDir = path.resolve(input); const configDir = path.resolve(input);
if (fs.lstatSync(configDir).isDirectory()) { if (fs.lstatSync(configDir).isDirectory()) {
const output: Output = { files: [], stories: [] }; const output: Output = { files: [], stories: [] };
const main = path.join(configDir, 'main.js');
const preview = path.join(configDir, 'preview.js');
const config = path.join(configDir, 'config.js');
const configTS = path.join(configDir, 'config.ts');
if (isFile(preview)) { const preview = getPreviewFile(configDir);
const main = getMainFile(configDir);
if (preview) {
output.files.push(preview); output.files.push(preview);
} }
if (isFile(main)) { if (main) {
const { stories = [] } = require.requireActual(main); const { stories = [] } = require.requireActual(main);
const result = stories.reduce((acc: string[], i: string) => [...acc, ...glob.sync(i)], []); const result = stories.reduce((acc: string[], i: string) => [...acc, ...glob.sync(i)], []);
output.stories = result; output.stories = result;
} }
if (isFile(config)) {
output.files.push(config);
}
if (isFile(configTS)) {
output.files.push(configTS);
}
return output; return output;
} }
@ -119,7 +144,7 @@ function getConfigPathParts(input: string): Output {
function configure( function configure(
options: { options: {
storybook: any; storybook: ClientApi;
} & StoryshotsOptions } & StoryshotsOptions
): void { ): void {
const { configPath = '.storybook', config, storybook, framework } = options; const { configPath = '.storybook', config, storybook, framework } = options;

3
addons/storyshots/storyshots-core/src/frameworks/vue/loader.ts
View File

@ -16,10 +16,9 @@ function load(options: StoryshotsOptions) {
global.STORYBOOK_ENV = 'vue'; global.STORYBOOK_ENV = 'vue';
mockVueToIncludeCompiler(); mockVueToIncludeCompiler();
const { configPath, config } = options;
const storybook = require.requireActual('@storybook/vue'); const storybook = require.requireActual('@storybook/vue');
configure({ configPath, ...config, storybook }); configure({ ...options, storybook });
return { return {
framework: 'vue' as const, framework: 'vue' as const,