feat(config): improve config "inheritance"

allow extended configs to extend configs themselves
xing · Jan 25, 2018 · 7ba54ae · 7ba54ae
1 parent b9519cd
commit 7ba54ae
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/packages/config/index.js b/packages/config/index.js
@@ -31,12 +31,13 @@ function getDefaultConfig() {
 
 function applyUserConfig(config) {
   var result = explorer.load(process.cwd());
-  return assign(config, result ? result.config : {});
+  return assign({}, config, result ? result.config : {});
 }
 
-function applyExtensionConfig(config) {
+function applyInheritedConfig(config) {
   var result = Object.assign({}, config);
   if (config.extends) {
+    delete result.extends;
     try {
       require.resolve(config.extends);
       assign(result, require(config.extends));
@@ -48,7 +49,7 @@ function applyExtensionConfig(config) {
       }
     }
   }
-  return result;
+  return result.extends ? applyInheritedConfig(result) : result;
 }
 
 function applyEnvironmentConfig(config) {
@@ -102,7 +103,7 @@ function normalizeURLs(config) {
 module.exports = [
   getDefaultConfig,
   applyUserConfig,
-  applyExtensionConfig,
+  applyInheritedConfig,
   applyEnvironmentConfig,
   resolvePaths,
   normalizeURLs,