Fix babel extends issue by replacing with absolute paths

storybookjs · May 10, 2016 · a365743 · a365743
1 parent 45b41bf
commit a365743
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 20 deletions.
diff --git a/dist/manager.js b/dist/manager.js
diff --git a/dist/manager.js.map b/dist/manager.js.map
diff --git a/dist/server/config.js b/dist/server/config.js
@@ -15,10 +15,22 @@ var _extends3 = _interopRequireDefault(_extends2);
 exports.default = function (configType, baseConfig, configDir) {
   var config = baseConfig;
 
-  // search for a .babelrc in the config directory, then the module root directory
-  // if found, use that to extend webpack configurations
-  var babelConfig = loadBabelConfig(_path2.default.resolve(configDir, '.babelrc')) || loadBabelConfig('.babelrc');
+  // Search for a .babelrc in the config directory, then the module root
+  // directory. If found, use that to extend webpack configurations.
+  var babelConfig = loadBabelConfig(_path2.default.resolve(configDir, '.babelrc'));
+  var inConfigDir = true;
+
+  if (!babelConfig) {
+    babelConfig = loadBabelConfig('.babelrc');
+    inConfigDir = false;
+  }
+
   if (babelConfig) {
+    // If the custom config uses babel's `extends` clause, then replace it with
+    // an absolute path. `extends` will not work unless we do this.
+    if (babelConfig.extends) {
+      babelConfig.extends = inConfigDir ? _path2.default.resolve(configDir, babelConfig.extends) : _path2.default.resolve(babelConfig.extends);
+    }
     config.module.loaders[0].query = babelConfig;
   }
 

diff --git a/src/server/config.js b/src/server/config.js
@@ -49,12 +49,24 @@ function loadBabelConfig(babelConfigPath) {
 export default function (configType, baseConfig, configDir) {
   const config = baseConfig;
 
-  // search for a .babelrc in the config directory, then the module root directory
-  // if found, use that to extend webpack configurations
-  const babelConfig =
-    loadBabelConfig(path.resolve(configDir, '.babelrc')) ||
-    loadBabelConfig('.babelrc');
+  // Search for a .babelrc in the config directory, then the module root
+  // directory. If found, use that to extend webpack configurations.
+  let babelConfig = loadBabelConfig(path.resolve(configDir, '.babelrc'));
+  let inConfigDir = true;
+
+  if (!babelConfig) {
+    babelConfig = loadBabelConfig('.babelrc');
+    inConfigDir = false;
+  }
+
   if (babelConfig) {
+    // If the custom config uses babel's `extends` clause, then replace it with
+    // an absolute path. `extends` will not work unless we do this.
+    if (babelConfig.extends) {
+      babelConfig.extends = inConfigDir ?
+        path.resolve(configDir, babelConfig.extends) :
+        path.resolve(babelConfig.extends);
+    }
     config.module.loaders[0].query = babelConfig;
   }