Skip to content
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

Fix polyfills loading order #1905

Merged
merged 1 commit into from
Sep 28, 2017
Merged

Fix polyfills loading order #1905

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions app/react/src/server/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,14 @@ export default function(configType, baseConfig, configDir) {

// Check whether addons.js file exists inside the storybook.
// 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 storybookCustomAddonsPath = path.resolve(configDir, 'addons.js');
if (fs.existsSync(storybookCustomAddonsPath)) {
logger.info('=> Loading custom addons config.');
config.entry.manager.unshift(storybookCustomAddonsPath);
config.entry.manager.splice(1, 0, storybookCustomAddonsPath);
} else {
config.entry.manager.unshift(storybookDefaultAddonsPath);
config.entry.manager.splice(1, 0, storybookDefaultAddonsPath);
}

// Check whether user has a custom webpack config file and
Expand Down
5 changes: 3 additions & 2 deletions app/vue/src/server/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,14 @@ export default function(configType, baseConfig, configDir) {

// Check whether addons.js file exists inside the storybook.
// 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 storybookCustomAddonsPath = path.resolve(configDir, 'addons.js');
if (fs.existsSync(storybookCustomAddonsPath)) {
logger.info('=> Loading custom addons config.');
config.entry.manager.unshift(storybookCustomAddonsPath);
config.entry.manager.splice(1, 0, storybookCustomAddonsPath);
} else {
config.entry.manager.unshift(storybookDefaultAddonsPath);
config.entry.manager.splice(1, 0, storybookDefaultAddonsPath);
}

// Check whether user has a custom webpack config file and
Expand Down