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

Merge pull request #4024 from storybooks/core/allow-jsx-out-of-the-box

Browse Source 
Bring .jsx back
This commit is contained in:
Pavan Kumar Sunkara 2018-08-16 16:29:31 +02:00 committed by GitHub
commit 312d7ca2a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/core/src/server/config/webpack.config.js
View File

@ -76,7 +76,7 @@ export default ({ configDir, quiet, babelOptions }) => {
module: { module: {
rules: [ rules: [
{ {
test: /\.js$/, test: /\.jsx?$/,
use: [ use: [
{ {
loader: require.resolve('babel-loader'), loader: require.resolve('babel-loader'),
@ -99,7 +99,7 @@ export default ({ configDir, quiet, babelOptions }) => {
resolve: { resolve: {
// Since we ship with json-loader always, it's better to move extensions to here // Since we ship with json-loader always, it's better to move extensions to here
// from the default config. // from the default config.
extensions: ['.js', '.json'], extensions: ['.js', '.jsx', '.json'],
// Add support to NODE_PATH. With this we could avoid relative path imports. // Add support to NODE_PATH. With this we could avoid relative path imports.
// Based on this CRA feature: https://github.com/facebookincubator/create-react-app/issues/253 // Based on this CRA feature: https://github.com/facebookincubator/create-react-app/issues/253
modules: ['node_modules'].concat(nodePaths), modules: ['node_modules'].concat(nodePaths),

4
lib/core/src/server/config/webpack.config.prod.js
View File

@ -58,7 +58,7 @@ export default ({ configDir, babelOptions }) => {
module: { module: {
rules: [ rules: [
{ {
test: /\.js$/, test: /\.jsx?$/,
use: [ use: [
{ {
loader: require.resolve('babel-loader'), loader: require.resolve('babel-loader'),
@ -81,7 +81,7 @@ export default ({ configDir, babelOptions }) => {
resolve: { resolve: {
// Since we ship with json-loader always, it's better to move extensions to here // Since we ship with json-loader always, it's better to move extensions to here
// from the default config. // from the default config.
extensions: ['.js', '.json'], extensions: ['.js', '.jsx', '.json'],
// Add support to NODE_PATH. With this we could avoid relative path imports. // Add support to NODE_PATH. With this we could avoid relative path imports.
// Based on this CRA feature: https://github.com/facebookincubator/create-react-app/issues/253 // Based on this CRA feature: https://github.com/facebookincubator/create-react-app/issues/253
modules: ['node_modules'].concat(nodePaths), modules: ['node_modules'].concat(nodePaths),