Merge pull request #4466 from storybooks/support-mjs

Support "mjs" extensions
storybookjs · Oct 18, 2018 · a9e8e42 · a9e8e42
2 parents a041e81 + e831afd
commit a9e8e42
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/lib/core/src/server/config/webpack.config.dev.js b/lib/core/src/server/config/webpack.config.dev.js
@@ -71,7 +71,7 @@ export default ({ configDir, quiet, babelOptions, entries }) => {
     module: {
       rules: [
         {
-          test: /\.jsx?$/,
+          test: /\.(mjs|jsx?)$/,
           use: [
             {
               loader: 'babel-loader',
@@ -94,7 +94,7 @@ export default ({ configDir, quiet, babelOptions, entries }) => {
     resolve: {
       // Since we ship with json-loader always, it's better to move extensions to here
       // from the default config.
-      extensions: ['.js', '.jsx', '.json'],
+      extensions: ['.js', '.jsx', '.json', '.mjs'],
       // 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
       modules: ['node_modules'].concat(nodePaths),

diff --git a/lib/core/src/server/config/webpack.config.prod.js b/lib/core/src/server/config/webpack.config.prod.js
@@ -57,7 +57,7 @@ export default ({ configDir, babelOptions, entries }) => {
     module: {
       rules: [
         {
-          test: /\.jsx?$/,
+          test: /\.(mjs|jsx?)$/,
           use: [
             {
               loader: 'babel-loader',
@@ -80,7 +80,7 @@ export default ({ configDir, babelOptions, entries }) => {
     resolve: {
       // Since we ship with json-loader always, it's better to move extensions to here
       // from the default config.
-      extensions: ['.js', '.jsx', '.json'],
+      extensions: ['.js', '.jsx', '.json', '.mjs'],
       // 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
       modules: ['node_modules'].concat(nodePaths),