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

Fix polyfills loading order

Browse Source
This commit is contained in:
hypnos 2017-09-28 03:20:55 +03:00
parent 8267159851
commit 603c1bfac7
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/react/src/server/config.js
View File

@ -33,13 +33,14 @@ export default function(configType, baseConfig, configDir) {
// Check whether addons.js file exists inside the storybook. // Check whether addons.js file exists inside the storybook.
// Load the default addons.js file if it's missing. // Load the default addons.js file if it's missing.
// Insert it after polyfills.js, but before client/manager.
const storybookDefaultAddonsPath = path.resolve(__dirname, 'addons.js'); const storybookDefaultAddonsPath = path.resolve(__dirname, 'addons.js');
const storybookCustomAddonsPath = path.resolve(configDir, 'addons.js'); const storybookCustomAddonsPath = path.resolve(configDir, 'addons.js');
if (fs.existsSync(storybookCustomAddonsPath)) { if (fs.existsSync(storybookCustomAddonsPath)) {
logger.info('=> Loading custom addons config.'); logger.info('=> Loading custom addons config.');
config.entry.manager.unshift(storybookCustomAddonsPath); config.entry.manager.splice(1, 0, storybookCustomAddonsPath);
} else { } else {
config.entry.manager.unshift(storybookDefaultAddonsPath); config.entry.manager.splice(1, 0, storybookDefaultAddonsPath);
} }
// Check whether user has a custom webpack config file and // Check whether user has a custom webpack config file and

5
app/vue/src/server/config.js
View File

@ -33,13 +33,14 @@ export default function(configType, baseConfig, configDir) {
// Check whether addons.js file exists inside the storybook. // Check whether addons.js file exists inside the storybook.
// Load the default addons.js file if it's missing. // Load the default addons.js file if it's missing.
// Insert it after polyfills.js, but before client/manager.
const storybookDefaultAddonsPath = path.resolve(__dirname, 'addons.js'); const storybookDefaultAddonsPath = path.resolve(__dirname, 'addons.js');
const storybookCustomAddonsPath = path.resolve(configDir, 'addons.js'); const storybookCustomAddonsPath = path.resolve(configDir, 'addons.js');
if (fs.existsSync(storybookCustomAddonsPath)) { if (fs.existsSync(storybookCustomAddonsPath)) {
logger.info('=> Loading custom addons config.'); logger.info('=> Loading custom addons config.');
config.entry.manager.unshift(storybookCustomAddonsPath); config.entry.manager.splice(1, 0, storybookCustomAddonsPath);
} else { } else {
config.entry.manager.unshift(storybookDefaultAddonsPath); config.entry.manager.splice(1, 0, storybookDefaultAddonsPath);
} }
// Check whether user has a custom webpack config file and // Check whether user has a custom webpack config file and