Skip to content

Commit

Permalink
Add jsx as a resolve extension. (#563)
Browse files Browse the repository at this point in the history
Fixes #562
  • Loading branch information
arunoda authored Oct 24, 2016
1 parent 74bb799 commit 26f64e4
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 2 deletions.
Empty file modified dist/server/build.js
100644 → 100755
Empty file.
2 changes: 1 addition & 1 deletion dist/server/config/defaults/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ module.exports = function (storybookBaseConfig) {
})];
};

newConfig.resolve.extensions = ['.js', '.json', ''];
newConfig.resolve.extensions = ['.js', '.json', '.jsx', ''];
newConfig.resolve.alias = (0, _extends3.default)({}, storybookBaseConfig.resolve.alias, {
// This is to support NPM2
'babel-runtime/regenerator': require.resolve('babel-runtime/regenerator')
Expand Down
2 changes: 1 addition & 1 deletion src/server/config/defaults/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ module.exports = (storybookBaseConfig) => {
];
};

newConfig.resolve.extensions = ['.js', '.json', ''];
newConfig.resolve.extensions = ['.js', '.json', '.jsx', ''];
newConfig.resolve.alias = {
...storybookBaseConfig.resolve.alias,
// This is to support NPM2
Expand Down

0 comments on commit 26f64e4

Please sign in to comment.