bug: fix null check in merge-deep (#655)

* bug: fix null check in merge-deep * regen lockfile * bump test-helpers * bump ember-try
adopted-ember-addons · Sep 5, 2022 · 37fd723 · 37fd723
1 parent c5905be
commit 37fd723
Show file tree

Hide file tree

Showing 4 changed files with 3,165 additions and 1,996 deletions.
diff --git a/addon/utils/merge-deep.js b/addon/utils/merge-deep.js
@@ -5,7 +5,7 @@ function isMergeableObject(value) {
 }
 
 function isNonNullObject(value) {
-  return !!value && typeof value === 'object';
+  return !!value && typeof value === 'object' && value !== null;
 }
 
 function isSpecial(value) {