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

DEBUG

Browse Source
This commit is contained in:
Norbert de Langen 2020-03-19 12:27:10 +01:00
parent 0731e87751
commit 3de6b660c7
No known key found for this signature in database
GPG Key ID: 976651DA156C2825
3 changed files with 64 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
lib/core/src/server/preview/entries.js
View File

@ -1,6 +1,32 @@
import path from 'path';
import { logger } from '@storybook/node-logger';
export const sortEntries = entries => {
const isGenerated = /generated-config-entry/;
const isGeneratedConfig = /(?:preview|config)\..+-generated-config-entry/;
const result = entries.sort((a, b) => {
// we want this order to order generated entries so the ones that call configure appear LAST
// whilst keeping the order of non-generated entries in the order they appear
switch (true) {
case !!a.match(isGeneratedConfig) && !!b.match(isGenerated): {
return 1;
}
case !!b.match(isGeneratedConfig) && !!a.match(isGenerated): {
return -1;
}
default: {
return 0;
}
}
});
console.log({ input: entries, output: result });
return result;
};
export async function createPreviewEntry(options) {
const { configDir, presets } = options;
const entries = [
@ -22,25 +48,5 @@ export async function createPreviewEntry(options) {
entries.push(path.resolve(path.join(configDir, `generated-stories-entry.js`)));
}
const isGenerated = /generated-config-entry/;
const isGeneratedConfig = /(?:preview|config)\..+-generated-config-entry/;
console.log({ entries });
return entries.sort((a, b) => {
// we want this order to order generated entries so the ones that call configure appear LAST
// whilst keeping the order of non-generated entries in the order they appear
switch (true) {
case !!a.match(isGeneratedConfig) && !!b.match(isGenerated): {
return 1;
}
case !!b.match(isGeneratedConfig) && !!a.match(isGenerated): {
return -1;
}
default: {
return 0;
}
}
});
return sortEntries(entries);
}

35
lib/core/src/server/preview/entries.test.js Normal file
View File

@ -0,0 +1,35 @@
import { sortEntries } from './entries';
describe('sortEntries', () => {
it('should move preview-type generated-config entries after all other generated-config entries', () => {
const input = [
'/tmp/storybook/lib/core/dist/server/common/polyfills.js',
'/tmp/storybook/lib/core/dist/server/preview/globals.js',
'/tmp/storybook/examples/official-storybook/storybook-init-framework-entry.js',
'/tmp/storybook/addons/docs/dist/frameworks/common/config.js-generated-config-entry.js',
'/tmp/storybook/addons/docs/dist/frameworks/react/config.js-generated-config-entry.js',
'/tmp/storybook/examples/official-storybook/preview.js-generated-config-entry.js',
'/tmp/storybook/addons/actions/dist/preset/addArgs.js-generated-config-entry.js',
'/tmp/storybook/addons/links/dist/preset/addDecorator.js-generated-config-entry.js',
'/tmp/storybook/addons/knobs/dist/preset/addDecorator.js-generated-config-entry.js',
'/tmp/storybook/addons/a11y/dist/preset/addDecorator.js-generated-config-entry.js',
'/tmp/storybook/addons/queryparams/dist/preset/addDecorator.js-generated-config-entry.js',
'/tmp/storybook/examples/official-storybook/generated-stories-entry.js',
];
const output = sortEntries(input);
expect(output).toEqual([
'/tmp/storybook/lib/core/dist/server/common/polyfills.js',
'/tmp/storybook/lib/core/dist/server/preview/globals.js',
'/tmp/storybook/examples/official-storybook/storybook-init-framework-entry.js',
'/tmp/storybook/addons/actions/dist/preset/addArgs.js-generated-config-entry.js',
'/tmp/storybook/addons/links/dist/preset/addDecorator.js-generated-config-entry.js',
'/tmp/storybook/addons/knobs/dist/preset/addDecorator.js-generated-config-entry.js',
'/tmp/storybook/addons/a11y/dist/preset/addDecorator.js-generated-config-entry.js',
'/tmp/storybook/addons/queryparams/dist/preset/addDecorator.js-generated-config-entry.js',
'/tmp/storybook/addons/docs/dist/frameworks/common/config.js-generated-config-entry.js',
'/tmp/storybook/addons/docs/dist/frameworks/react/config.js-generated-config-entry.js',
'/tmp/storybook/examples/official-storybook/preview.js-generated-config-entry.js',
'/tmp/storybook/examples/official-storybook/generated-stories-entry.js',
]);
});
});

2
lib/core/src/server/preview/iframe-webpack.config.js
View File

@ -40,6 +40,8 @@ export default ({
const babelLoader = createBabelLoader(babelOptions);
const isProd = configType === 'PRODUCTION';
console.log({ entries });
const frameworkInitEntry = path.resolve(
path.join(configDir, 'storybook-init-framework-entry.js')
);