fix: Do not overwrite the null value, skip it for deepMerge case.

typescript-eslint · Mar 21, 2023 · 0d36ce5 · 0d36ce5
1 parent 39e70f6
commit 0d36ce5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/packages/utils/src/eslint-utils/applyDefault.ts b/packages/utils/src/eslint-utils/applyDefault.ts
@@ -26,7 +26,7 @@ function applyDefault<TUser extends readonly unknown[], TDefault extends TUser>(
     if (userOptions[i] !== undefined) {
       const userOpt = userOptions[i];
       if (isObjectNotArray(userOpt) && isObjectNotArray(opt)) {
-        options[i] = deepMerge(opt || {}, userOpt);
+        options[i] = deepMerge(opt, userOpt);
       } else {
         options[i] = userOpt;
       }

diff --git a/packages/utils/src/eslint-utils/deepMerge.ts b/packages/utils/src/eslint-utils/deepMerge.ts
@@ -8,7 +8,7 @@ type ObjectLike<T = unknown> = Record<string, T>;
 function isObjectNotArray<T extends ObjectLike>(
   obj: unknown | unknown[],
 ): obj is T {
-  return typeof obj === 'object' && !Array.isArray(obj);
+  return typeof obj === 'object' && obj != null && !Array.isArray(obj);
 }
 
 /**