Fix: rewrite overwriting logic of config (fixes eslint#3915)

mysticatea · Sep 28, 2015 · 581d888 · 581d888
1 parent 85c0f2f
commit 581d888
Show file tree

Hide file tree

Showing 8 changed files with 863 additions and 296 deletions.
diff --git a/lib/cascading-config-data.js b/lib/cascading-config-data.js
diff --git a/lib/config.js b/lib/config.js
diff --git a/tests/fixtures/config-hierarchy/overwrite-ecmaFeatures/.eslintrc b/tests/fixtures/config-hierarchy/overwrite-ecmaFeatures/.eslintrc
@@ -1,5 +1,8 @@
 {
     "ecmaFeatures": {
         "globalReturn": false
+    },
+    "globals": {
+        "require": true
     }
 }
diff --git a/tests/fixtures/config-hierarchy/overwrite-ecmaFeatures/child/child/.eslintrc b/tests/fixtures/config-hierarchy/overwrite-ecmaFeatures/child/child/.eslintrc
@@ -0,0 +1,5 @@
+{
+    "env": {
+        "commonjs": false
+    }
+}
diff --git a/tests/fixtures/config-hierarchy/overwrite-ecmaFeatures/child2/.eslintrc b/tests/fixtures/config-hierarchy/overwrite-ecmaFeatures/child2/.eslintrc
@@ -0,0 +1,6 @@
+{
+    "env": {
+        "node": true,
+        "commonjs": true
+    }
+}
diff --git a/tests/fixtures/config-hierarchy/overwrite-ecmaFeatures/child2/both-false/.eslintrc b/tests/fixtures/config-hierarchy/overwrite-ecmaFeatures/child2/both-false/.eslintrc
@@ -0,0 +1,6 @@
+{
+    "env": {
+        "node": false,
+        "commonjs": false
+    }
+}
diff --git a/tests/fixtures/config-hierarchy/overwrite-ecmaFeatures/child2/node-false/.eslintrc b/tests/fixtures/config-hierarchy/overwrite-ecmaFeatures/child2/node-false/.eslintrc
@@ -0,0 +1,5 @@
+{
+    "env": {
+        "node": false
+    }
+}
diff --git a/tests/lib/config.js b/tests/lib/config.js