FIX babel_config plugin reading and creation.

storybookjs · May 30, 2017 · e28bf25 · e28bf25
1 parent a0f0d04
commit e28bf25
Showing 1 changed file with 13 additions and 5 deletions.
diff --git a/app/react/src/server/babel_config.js b/app/react/src/server/babel_config.js
@@ -66,11 +66,19 @@ export default function(configDir) {
   }
 
   const finalConfig = babelConfig || defaultConfig;
-  finalConfig.plugins = finalConfig.plugins || [];
-  finalConfig.plugins.push([
-    require.resolve('babel-plugin-react-docgen'),
-    { DOC_GEN_COLLECTION_NAME: 'STORYBOOK_REACT_CLASSES' },
-  ]);
+  // Ensure plugins are defined or fallback to an array to avoid empty values.
+  const babelConfigPlugins = finalConfig.plugins || [];
+  const extraPlugins = [
+    [
+      require.resolve('babel-plugin-react-docgen'),
+      {
+        DOC_GEN_COLLECTION_NAME: 'STORYBOOK_REACT_CLASSES',
+      },
+    ],
+  ];
+  // If `babelConfigPlugins` is not an `Array`, calling `concat` will inject it
+  // as a single value, if it is an `Array` it will be spreaded.
+  finalConfig.plugins = [].concat(babelConfigPlugins, extraPlugins);
 
   return finalConfig;
 }