fix: Allow overriding an object field with null

Closes #144.
survivejs · Aug 18, 2020 · 4eb811c · 4eb811c
1 parent 2e8780e
commit 4eb811c
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 5.1.2 / 2020-08-18
+
+- Fix - Allow overriding an object field with `null` #144
+
 ## 5.1.1 / 2020-08-04
 
 - Fix - Drop `<reference types="webpack-dev-server" />` from **index.d.ts** #143

diff --git a/src/join-arrays.ts b/src/join-arrays.ts
@@ -61,5 +61,9 @@ function isFunction(functionToCheck) {
 }
 
 function isPlainObject(a) {
+  if (a === null) {
+    return false;
+  }
+
   return typeof a === "object";
 }
diff --git a/test/merge.test.ts b/test/merge.test.ts
@@ -27,6 +27,20 @@ function normalMergeTest(merge, loadersKey) {
     assert.deepEqual(merge([]), {});
   });
 
+  it.only("should override with null (#144)", function () {
+    const result = { devServer: null };
+
+    assert.deepEqual(
+      merge(
+        {
+          devServer: { base: true },
+        },
+        result
+      ),
+      result
+    );
+  });
+
   it("should error on promise", function () {
     const a = {
       module: {},