chore: Update deps and swap lodash for native methods and @sindresorhus/is

Signed-off-by: Richie Bendall <[email protected]>

Author: Richienb

package.json

@@ -25,26 +25,25 @@
         "test": "yarn lint && ava"
     },
     "dependencies": {
+        "@sindresorhus/is": "^1.2.0",
         "cheerio": "^1.0.0-rc.3",
         "content-type": "^1.0.4",
         "iconv-lite": "^0.5.0",
-        "lodash": "^4.17.15",
         "nice-try": "^2.0.0"
     },
     "devDependencies": {
         "@types/cheerio": "^0.22.13",
         "@types/content-type": "^1.1.3",
-        "@types/lodash": "^4.14.146",
         "ava": "^2.4.0",
-        "eslint-config-richienb": "^0.2.2",
+        "eslint-config-richienb": "^0.2.3",
         "node-fetch": "^2.6.0",
-        "ts-node": "^8.4.1",
-        "typedoc": "^0.15.0",
-        "typescript": "^3.7.2",
+        "ts-node": "^8.5.4",
+        "typedoc": "^0.15.6",
+        "typescript": "^3.7.4",
         "xo": "^0.25.3"
     },
     "resolutions": {
-        "eslint": "^6.6.0"
+        "eslint": "^6.8.0"
     },
     "xo": {
         "extends": "richienb/ts",

src/index.ts

@@ -27,7 +27,7 @@
 import getCharset from "./utils/get-charset"
 import { decode } from "iconv-lite"
 import { load as $ } from "cheerio"
-import _ from "lodash"
+import is from "@sindresorhus/is"
 
 /**
 * Detect buffer encoding and convert to target encoding
@@ -38,32 +38,32 @@ import _ from "lodash"
 */
 export default function convertBody(content: Buffer | string, headers?: Headers): string {
     // Try to extract content-type header
-    const contentType = !_.isNil(headers) ? headers.get("content-type") : null
+    const contentType = !is.nullOrUndefined(headers) ? headers.get("content-type") : null
 
     // Resulting charset
     let charset: string
 
     // Convert to buffer
-    if (_.isString(content)) content = Buffer.from(content)
+    if (is.string(content)) content = Buffer.from(content)
 
     // Header
     if (contentType) charset = getCharset(contentType)
 
     // No charset in content type, peek at response body for at most 1024 bytes
-    const res = _.toString(content.slice(0, 1024))
+    const res = content.slice(0, 1024).toString()
 
     // HTML5, HTML4 and XML
     if (!charset && res) {
         charset = getCharset(
             $(res)("meta[charset]").attr("charset") || // HTML5
             $(res)("meta[http-equiv][content]").attr("content") || // HTML4
-            $(_.replace(res, /<\?(.*)\?>/im, "<$1>"), { xmlMode: true }).root().find("xml").attr("encoding"), // XML
+            $(res.replace(/<\?(.*)\?>/im, "<$1>"), { xmlMode: true }).root().find("xml").attr("encoding"), // XML
         )
     }
 
     // Prevent decode issues when sites use incorrect encoding
     // ref: https://hsivonen.fi/encoding-menu/
-    if (charset && _.includes(["gb2312", "gbk"], _.lowerCase(charset))) charset = "gb18030"
+    if (charset && ["gb2312", "gbk"].includes(charset.toLowerCase())) charset = "gb18030"
 
     // Turn raw buffers into a single utf-8 buffer
     return decode(

src/utils/get-charset.ts

@@ -1,5 +1,5 @@
 import { parse as parseContentType } from "content-type"
-import _ from "lodash"
+import is from "@sindresorhus/is"
 import niceTry from "nice-try"
 
 /**
@@ -8,9 +8,9 @@ import niceTry from "nice-try"
  * @private
  */
 export default function getCharset(contentType: string): string | null {
-    if (_.isNil(contentType)) return null
+    if (is.nullOrUndefined(contentType)) return null
 
     const parsed = niceTry(() => parseContentType(contentType))
-    if (!_.isNil(parsed)) return parsed.parameters.charset
+    if (!is.nullOrUndefined(parsed)) return parsed.parameters.charset
     else return contentType
 }