fix(lint): Bump lint deps, fix errors

fb55 · fb55 · commit 5ee8a30b03da · 2020-10-13T18:53:38.000-07:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -23,14 +23,14 @@
     ],
     "devDependencies": {
         "@types/jest": "^26.0.0",
-        "@types/node": "^14.0.6",
-        "@typescript-eslint/eslint-plugin": "^2.31.0",
-        "@typescript-eslint/parser": "^2.31.0",
+        "@types/node": "^14.11.8",
+        "@typescript-eslint/eslint-plugin": "^4.4.1",
+        "@typescript-eslint/parser": "^4.4.1",
         "coveralls": "*",
-        "eslint": "^7.0.0",
+        "eslint": "^7.11.0",
         "eslint-config-prettier": "^6.0.0",
         "eslint-plugin-node": "^11.1.0",
-        "jest": "^26.0.1",
+        "jest": "^26.5.3",
         "prettier": "^2.0.5",
         "ts-jest": "^26.1.0",
         "typescript": "^4.0.2"
diff --git a/scripts/benchmark.ts b/scripts/benchmark.ts
@@ -1,7 +1,6 @@
+/* eslint-disable node/no-missing-import */
 import * as entities from "../";
 import he from "he";
-// @ts-ignore
-import htmlEscaper from "html-escaper";
 import parseEntities from "parse-entities";
 import * as htmlEntities from "html-entities";
 
@@ -10,8 +9,6 @@ const RUNS = 1e7;
 const encoders: [string, (str: string) => string][] = [
     ["entities", (str: string) => entities.encodeHTML(str)],
     ["he", (str: string) => he.encode(str)],
-    // Only escapes the source.
-    // ["html-escaper", (str: string) => htmlEscaper.escape(str)],
     [
         "html-entities",
         (str: string) => htmlEntities.AllHtmlEntities.encode(str),
@@ -21,22 +18,21 @@ const encoders: [string, (str: string) => string][] = [
 const decoders: [string, (str: string) => string][] = [
     ["entities", (str: string) => entities.decodeHTML(str)],
     ["he", (str: string) => he.decode(str)],
-    // html-escaper does not produce correct output
-    // ["html-escaper", (str: string) => htmlEscaper.unescape(str)],
     ["parse-entities", (str: string) => parseEntities(str)],
     [
         "html-entities",
         (str: string) => htmlEntities.AllHtmlEntities.decode(str),
     ],
 ];
 
-// Note: Not shown on the README, as `entities` differs in behavior from other libraries.
-// `entities` produces ASCII output, while other libraries only escape characters.
+/*
+ * Note: Not shown on the README, as `entities` differs in behavior from other libraries.
+ * `entities` produces ASCII output, while other libraries only escape characters.
+ */
 const escapers: [string, (str: string) => string][] = [
     ["entities", (str: string) => entities.encodeXML(str)],
     ["he", (str: string) => he.escape(str)],
-    ["html-escaper", (str: string) => htmlEscaper.escape(str)],
-    // html-entities cannot escape, so we use its simplest mode.
+    // Html-entities cannot escape, so we use its simplest mode.
     ["html-entities", (str: string) => htmlEntities.XmlEntities.encode(str)],
 ];
 
diff --git a/src/decode_codepoint.ts b/src/decode_codepoint.ts
@@ -1,7 +1,7 @@
 import decodeMap from "./maps/decode.json";
 
 // Modified version of https://github.com/mathiasbynens/he/blob/master/src/he.js#L94-L119
-export default function decodeCodePoint(codePoint: number) {
+export default function decodeCodePoint(codePoint: number): string {
     if ((codePoint >= 0xd800 && codePoint <= 0xdfff) || codePoint > 0x10ffff) {
         return "\uFFFD";
     }
diff --git a/src/encode.ts b/src/encode.ts
@@ -78,7 +78,7 @@ function getInverse(inverse: MapType, re: RegExp) {
 
 const reXmlChars = getInverseReplacer(inverseXML);
 
-export function escape(data: string) {
+export function escape(data: string): string {
     return data
         .replace(reXmlChars, singleCharReplacer)
         .replace(reNonASCII, singleCharReplacer);
diff --git a/tsconfig.eslint.json b/tsconfig.eslint.json
@@ -1,5 +1,5 @@
 {
     "extends": "./tsconfig.json",
-    "include": ["src"],
+    "include": ["src", "scripts"],
     "exclude": []
 }

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`import decodeMap from "./maps/decode.json";`
`2`	`2`
`3`	`3`	`// Modified version of https://github.com/mathiasbynens/he/blob/master/src/he.js#L94-L119`
`4`		`-export default function decodeCodePoint(codePoint: number) {`
	`4`	`+export default function decodeCodePoint(codePoint: number): string {`
`5`	`5`	`if ((codePoint >= 0xd800 && codePoint <= 0xdfff) \|\| codePoint > 0x10ffff) {`
`6`	`6`	`return "\uFFFD";`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"extends": "./tsconfig.json",`
`3`		`- "include": ["src"],`
	`3`	`+ "include": ["src", "scripts"],`
`4`	`4`	`"exclude": []`
`5`	`5`	`}`