From 3141c319c285f4bcb99143e6871fdba5cc89bcf6 Mon Sep 17 00:00:00 2001
From: Ved Vadnere <vedvadnere@gmail.com>
Date: Tue, 30 Dec 2025 16:41:30 +0530
Subject: [PATCH] chore: remove unnecessary eslint-disable directive (#7283)

Co-authored-by: Jay <jasonsaayman@gmail.com>
---
 bin/actions/notify_published.js | 6 +++---
 lib/core/mergeConfig.js         | 5 ++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/bin/actions/notify_published.js b/bin/actions/notify_published.js
index ddacdec3..22a50d94 100644
--- a/bin/actions/notify_published.js
+++ b/bin/actions/notify_published.js
@@ -5,11 +5,11 @@ import fs from 'fs/promises';
 const argv = minimist(process.argv.slice(2));
 console.log(argv);
 
-let {tag} = argv;
+let { tag } = argv;
 
-(async() => {
+(async () => {
   if (!tag || tag === true) {
-    const {version} = JSON.parse((await fs.readFile('./package.json')).toString());
+    const { version } = JSON.parse((await fs.readFile('./package.json')).toString());
 
     tag = 'v' + version;
   } else if (typeof tag !== 'string') {
diff --git a/lib/core/mergeConfig.js b/lib/core/mergeConfig.js
index b1b50f0f..b7a43d52 100644
--- a/lib/core/mergeConfig.js
+++ b/lib/core/mergeConfig.js
@@ -21,7 +21,7 @@ export default function mergeConfig(config1, config2) {
 
   function getMergedValue(target, source, prop, caseless) {
     if (utils.isPlainObject(target) && utils.isPlainObject(source)) {
-      return utils.merge.call({caseless}, target, source);
+      return utils.merge.call({ caseless }, target, source);
     } else if (utils.isPlainObject(source)) {
       return utils.merge({}, source);
     } else if (utils.isArray(source)) {
@@ -30,7 +30,6 @@ export default function mergeConfig(config1, config2) {
     return source;
   }
 
-  // eslint-disable-next-line consistent-return
   function mergeDeepProperties(a, b, prop, caseless) {
     if (!utils.isUndefined(b)) {
       return getMergedValue(a, b, prop, caseless);
@@ -96,7 +95,7 @@ export default function mergeConfig(config1, config2) {
     headers: (a, b, prop) => mergeDeepProperties(headersToObject(a), headersToObject(b), prop, true)
   };
 
-  utils.forEach(Object.keys({...config1, ...config2}), function computeConfigValue(prop) {
+  utils.forEach(Object.keys({ ...config1, ...config2 }), function computeConfigValue(prop) {
     const merge = mergeMap[prop] || mergeDeepProperties;
     const configValue = merge(config1[prop], config2[prop], prop);
     (utils.isUndefined(configValue) && merge !== mergeDirectKeys) || (config[prop] = configValue);