From 562473a718cad8bb002cd19de9d690791e5d9a40 Mon Sep 17 00:00:00 2001
From: Labhansh Agrawal <labhansh.agrawal@gmail.com>
Date: Sun, 23 Jul 2023 22:35:14 +0530
Subject: [PATCH] cleanup lodash usage

---
 .eslintrc.json                | 14 +++++++-------
 app/config/init.ts            |  4 ++--
 app/config/migrate.ts         |  4 ++--
 lib/components/split-pane.tsx |  4 ++--
 lib/components/term.tsx       |  3 ++-
 package.json                  |  2 ++
 yarn.lock                     |  9 ++++++++-
 7 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index 0f9dec0d..5659f1e4 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -3,7 +3,8 @@
     "react",
     "prettier",
     "@typescript-eslint",
-    "eslint-comments"
+    "eslint-comments",
+    "lodash"
   ],
   "extends": [
     "eslint:recommended",
@@ -93,12 +94,11 @@
         "@typescript-eslint/no-unsafe-assignment": "off",
         "@typescript-eslint/no-unsafe-member-access": "off",
         "@typescript-eslint/restrict-template-expressions": "off",
-        "@typescript-eslint/consistent-type-imports": [
-          "error",
-          {
-            "disallowTypeAnnotations": false
-          }
-        ]
+        "@typescript-eslint/consistent-type-imports": [ "error", { "disallowTypeAnnotations": false } ],
+        "lodash/prop-shorthand": [ "error", "always" ],
+        "lodash/import-scope": [ "error", "method" ],
+        "lodash/collection-return": "error",
+        "lodash/collection-method-value": "error"
       }
     },
     {
diff --git a/app/config/init.ts b/app/config/init.ts
index 00a58bbd..33d4e3e6 100644
--- a/app/config/init.ts
+++ b/app/config/init.ts
@@ -2,7 +2,7 @@ import vm from 'vm';
 import notify from '../notify';
 import mapKeys from '../utils/map-keys';
 import type {parsedConfig, rawConfig, configOptions} from '../../lib/config';
-import _ from 'lodash';
+import merge from 'lodash/merge';
 
 const _extract = (script?: vm.Script): Record<string, any> => {
   const module: Record<string, any> = {};
@@ -44,7 +44,7 @@ const _init = (userCfg: rawConfig, defaultCfg: rawConfig): parsedConfig => {
         if (!conf.profiles.map((p) => p.name).includes(conf.defaultProfile)) {
           conf.defaultProfile = conf.profiles[0].name;
         }
-        return _.merge({}, defaultCfg.config, conf);
+        return merge({}, defaultCfg.config, conf);
       } else {
         notify('Error reading configuration: `config` key is missing');
         return defaultCfg.config || ({} as configOptions);
diff --git a/app/config/migrate.ts b/app/config/migrate.ts
index b74a2603..a56b0796 100644
--- a/app/config/migrate.ts
+++ b/app/config/migrate.ts
@@ -3,7 +3,7 @@ import {builders, namedTypes} from 'ast-types';
 import * as babelParser from 'recast/parsers/babel';
 import {copy, copySync, existsSync, readFileSync, writeFileSync} from 'fs-extra';
 import {dirname, resolve} from 'path';
-import _ from 'lodash';
+import merge from 'lodash/merge';
 
 import notify from '../notify';
 import {_extractDefault} from './init';
@@ -166,7 +166,7 @@ export const migrateHyper3Config = () => {
   try {
     const legacyCfgRaw = readFileSync(legacyCfgPath, 'utf8');
     const legacyCfgData = _extractDefault(legacyCfgRaw);
-    newCfgData = _.merge({}, defaultCfgData, legacyCfgData);
+    newCfgData = merge({}, defaultCfgData, legacyCfgData);
 
     const pluginCode = configToPlugin(legacyCfgRaw);
     if (pluginCode) {
diff --git a/lib/components/split-pane.tsx b/lib/components/split-pane.tsx
index 6efb9bd8..0b979755 100644
--- a/lib/components/split-pane.tsx
+++ b/lib/components/split-pane.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import _ from 'lodash';
+import sum from 'lodash/sum';
 import type {SplitPaneProps} from '../hyper';
 
 export default class SplitPane extends React.PureComponent<SplitPaneProps, {dragging: boolean}> {
@@ -40,7 +40,7 @@ export default class SplitPane extends React.PureComponent<SplitPaneProps, {drag
     sizes_[this.paneIndex] = 0;
     sizes_[this.paneIndex + 1] = 0;
 
-    const availableWidth = 1 - _.sum(sizes_);
+    const availableWidth = 1 - sum(sizes_);
     sizes_[this.paneIndex] = availableWidth / 2;
     sizes_[this.paneIndex + 1] = availableWidth / 2;
 
diff --git a/lib/components/term.tsx b/lib/components/term.tsx
index 6772bc91..5ae7b920 100644
--- a/lib/components/term.tsx
+++ b/lib/components/term.tsx
@@ -15,7 +15,8 @@ import terms from '../terms';
 import processClipboard from '../utils/paste';
 import _SearchBox from './searchBox';
 import type {TermProps} from '../hyper';
-import {pickBy, isEqual} from 'lodash';
+import pickBy from 'lodash/pickBy';
+import isEqual from 'lodash/isEqual';
 import {decorate} from '../utils/plugins';
 import 'xterm/css/xterm.css';
 import {ImageAddon} from 'xterm-addon-image';
diff --git a/package.json b/package.json
index 52189a31..02da3439 100644
--- a/package.json
+++ b/package.json
@@ -38,6 +38,7 @@
     "css-loader": "6.8.1",
     "got": "12.4.1",
     "json-loader": "0.5.7",
+    "lodash": "4.17.21",
     "mousetrap": "chabou/mousetrap#useCapture",
     "ms": "2.1.3",
     "open": "8.4.2",
@@ -117,6 +118,7 @@
     "eslint-plugin-eslint-comments": "^3.2.0",
     "eslint-plugin-json-schema-validator": "^4.5.0",
     "eslint-plugin-jsonc": "^2.9.0",
+    "eslint-plugin-lodash": "^7.4.0",
     "eslint-plugin-prettier": "^5.0.0",
     "eslint-plugin-react": "7.32.2",
     "husky": "8.0.3",
diff --git a/yarn.lock b/yarn.lock
index b055304e..137a177f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3225,6 +3225,13 @@ eslint-plugin-jsonc@^2.9.0:
     jsonc-eslint-parser "^2.0.4"
     natural-compare "^1.4.0"
 
+eslint-plugin-lodash@^7.4.0:
+  version "7.4.0"
+  resolved "https://registry.npmjs.org/eslint-plugin-lodash/-/eslint-plugin-lodash-7.4.0.tgz#14a761547f126c92ff56789662a20a44f8bb6290"
+  integrity sha512-Tl83UwVXqe1OVeBRKUeWcfg6/pCW1GTRObbdnbEJgYwjxp5Q92MEWQaH9+dmzbRt6kvYU1Mp893E79nJiCSM8A==
+  dependencies:
+    lodash "^4.17.21"
+
 eslint-plugin-prettier@^5.0.0:
   version "5.0.0"
   resolved "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.0.0.tgz#6887780ed95f7708340ec79acfdf60c35b9be57a"
@@ -4959,7 +4966,7 @@ lodash.merge@^4.6.2:
   resolved "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
   integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
 
-lodash@^4.17.15, lodash@^4.17.21:
+lodash@4.17.21, lodash@^4.17.15, lodash@^4.17.21:
   version "4.17.21"
   resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==