fix: update dependencies accross the board

Author: ClaudiuCeia

.bin/createLangIds.ts

@@ -75,15 +75,13 @@ export const getLangsFromYaml = (): Map<string, StringSet> => {
     )
   );
 
-  const langsOrderedByNumSpeakers: Map<
-    string,
-    StringSet
-  > = allLangsByNumSpeakers.reduce((newLs, l) => {
-    if (langs.has(l)) {
-      newLs.set(l, langs.get(l) as StringSet);
-    }
-    return newLs;
-  }, new Map<string, StringSet>());
+  const langsOrderedByNumSpeakers: Map<string, StringSet> =
+    allLangsByNumSpeakers.reduce((newLs, l) => {
+      if (langs.has(l)) {
+        newLs.set(l, langs.get(l) as StringSet);
+      }
+      return newLs;
+    }, new Map<string, StringSet>());
   const langsWithUnknownSpeakers = [...langs].filter(
     ([l]) => !langsOrderedByNumSpeakers.has(l)
   );
@@ -165,18 +163,19 @@ export const getLangIdSubstrings = (
   };
 
   const mostPromisingSubstrings = new Map<string, Map<string, StringSet>>(
-    [...substringsMap].sort((
-      [ss1, lTm1],
-      [ss2, lTm2] // ss == substring, lTm == languageTranslationMap
-    ) =>
-      ss1.length !== ss2.length || lTm1.size !== lTm2.size
-        ? // sort short substrings and substrings with few language matches before others
-          ss1.length +
-          [...lTm1].reduce(ignoreDuplicateTranslations, []).length -
-          (ss2.length +
-            [...lTm2].reduce(ignoreDuplicateTranslations, []).length)
-        : // if we can’t distinguish that way, sort substrings that match many translations first
-          [...lTm2][0][1].size - [...lTm1][0][1].size
+    [...substringsMap].sort(
+      (
+        [ss1, lTm1],
+        [ss2, lTm2] // ss == substring, lTm == languageTranslationMap
+      ) =>
+        ss1.length !== ss2.length || lTm1.size !== lTm2.size
+          ? // sort short substrings and substrings with few language matches before others
+            ss1.length +
+            [...lTm1].reduce(ignoreDuplicateTranslations, []).length -
+            (ss2.length +
+              [...lTm2].reduce(ignoreDuplicateTranslations, []).length)
+          : // if we can’t distinguish that way, sort substrings that match many translations first
+            [...lTm2][0][1].size - [...lTm1][0][1].size
     )
   );
 

.bin/test/createLangIds.test.ts

@@ -32,9 +32,9 @@ describe("createLangIds", () => {
 
       const result = getLangIdSubstrings(langs);
 
-      expect(result.size).toEqual(2);
-      expect(result.get("gl")?.has("d")).toEqual(true);
-      expect(result.get("fr")?.has("u")).toEqual(true);
+      expect(result.size).toBe(2);
+      expect(result.get("gl")?.has("d")).toBe(true);
+      expect(result.get("fr")?.has("u")).toBe(true);
     });
   });
 

.eslintrc.js

@@ -16,6 +16,5 @@ module.exports = {
     "plugin:jest/recommended",
     "plugin:jest/style",
     "prettier",
-    "prettier/@typescript-eslint",
   ],
 };

.github/workflows/codeql.yml

@@ -2,9 +2,9 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ "master" ]
+    branches: ["master"]
   pull_request:
-    branches: [ "master" ]
+    branches: ["master"]
   schedule:
     - cron: "56 0 * * 5"
 
@@ -20,7 +20,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        language: [ javascript ]
+        language: [javascript]
 
     steps:
       - name: Checkout

package.json

@@ -91,36 +91,38 @@
     "type": "git",
     "url": "git@github.com:ClaudiuCeia/detect-translation.git"
   },
-  "dependencies": {},
+  "dependencies": {
+    "text-encoding": "^0.7.0"
+  },
   "devDependencies": {
     "@pika/pack": "^0.5.0",
     "@pika/plugin-build-web": "^0.9.2",
     "@pika/plugin-bundle-web": "^0.9.2",
     "@pika/plugin-ts-standard-pkg": "^0.9.2",
     "@skypack/package-check": "^0.2.2",
-    "@types/jest": "^26.0.20",
-    "@typescript-eslint/eslint-plugin": "^4.15.1",
-    "@typescript-eslint/parser": "^4.15.1",
-    "cldr": "^6.0.0",
-    "eslint": "^7.20.0",
-    "eslint-config-prettier": "^7.2.0",
-    "eslint-plugin-jest": "^24.1.5",
-    "husky": "^5.0.9",
-    "jest": "^26.6.3",
-    "jest-environment-jsdom": "^26.6.2",
-    "jest-environment-jsdom-global": "^2.0.4",
-    "js-yaml": "^4.0.0",
-    "lint-staged": "^10.5.4",
+    "@types/jest": "^29.2.2",
+    "@typescript-eslint/eslint-plugin": "^5.42.1",
+    "@typescript-eslint/parser": "^5.42.1",
+    "cldr": "^7.2.0",
+    "eslint": "^8.27.0",
+    "eslint-config-prettier": "^8.5.0",
+    "eslint-plugin-jest": "^27.1.5",
+    "husky": "^8.0.2",
+    "jest": "^29.3.1",
+    "jest-environment-jsdom": "^29.3.1",
+    "jest-environment-jsdom-global": "^4.0.0",
+    "js-yaml": "^4.1.0",
+    "lint-staged": "^13.0.3",
     "mutationobserver-shim": "^0.3.7",
     "pika-plugin-legacy-browser": "^2.0.0",
     "pika-plugin-package.json": "^1.0.2",
-    "pinst": "^2.1.4",
-    "prettier": "^2.2.1",
+    "pinst": "^3.0.0",
+    "prettier": "^2.7.1",
     "rimraf": "^3.0.2",
-    "sanitize-html": "^2.3.2",
-    "source-map-explorer": "^2.5.2",
-    "ts-jest": "^26.5.1",
-    "ts-node": "^9.1.1",
-    "typescript": "^4.1.5"
+    "sanitize-html": "^2.7.3",
+    "source-map-explorer": "^2.5.3",
+    "ts-jest": "^29.0.3",
+    "ts-node": "^10.9.1",
+    "typescript": "^4.8.4"
   }
 }

setup-jest.ts

@@ -1,6 +1,7 @@
 // setup-jest.js
 import sanitizeHtml from "sanitize-html";
 import "mutationobserver-shim";
+import { TextDecoder, TextEncoder } from "text-encoding";
 
 // Monkey-patch jsdom to make it support innerText
 // see https://github.com/jsdom/jsdom/issues/1245#issuecomment-470192636
@@ -16,3 +17,7 @@ Object.defineProperty(global.Element.prototype, "innerText", {
   },
   configurable: true, // make it so that it doesn't blow chunks on re-running tests with things like --watch
 });
+
+// Monkey-patch jsdom to support TextEncoder/TextDecoder
+global.TextEncoder = TextEncoder;
+global.TextDecoder = TextDecoder;

src/test/client.test.ts

@@ -4,7 +4,7 @@ import JSDOMEnvironment from "jest-environment-jsdom";
 declare const jsdom: JSDOMEnvironment["dom"];
 
 describe("Test client translations", () => {
-  let el: HTMLElement = (null as unknown) as HTMLElement;
+  let el: HTMLElement = null as unknown as HTMLElement;
   let observer: MutationObserver | undefined;
 
   beforeEach(() => {
@@ -25,14 +25,14 @@ describe("Test client translations", () => {
         try {
           expect(service).toEqual(Services.GOOGLE);
           expect(lang).toEqual(targetLang);
-          expect(type).toEqual("client");
+          expect(type).toBe("client");
           resolve();
         } catch (err) {
           reject(err);
         }
       });
 
-      jsdom.reconfigure({ url: "https://www.example.com/" }); // eslint-disable-line
+      jsdom!.reconfigure({ url: "https://www.example.com/" }); // eslint-disable-line
 
       document.documentElement.setAttribute("class", "");
       document.documentElement.lang = sourceLang;

src/test/getDocumentLang.test.ts

@@ -2,7 +2,7 @@ import getDocumentLang from "../getDocumentLang";
 import skipToMainContentLangIds from "../translations/Skip-to-main-content";
 
 describe("getDocumentLang", () => {
-  let el: HTMLElement = (null as unknown) as HTMLElement;
+  let el: HTMLElement = null as unknown as HTMLElement;
 
   beforeEach(() => {
     document.documentElement.lang = "en";
@@ -20,7 +20,7 @@ describe("getDocumentLang", () => {
 
     const { lang: result } = getDocumentLang({ lang: "en" });
 
-    expect(result).toEqual("pl");
+    expect(result).toBe("pl");
   });
 
   it("should identify the language from the text element", () => {
@@ -33,7 +33,7 @@ describe("getDocumentLang", () => {
       },
     });
 
-    expect(result).toEqual("ru");
+    expect(result).toBe("ru");
   });
 
   it("should identify the language from the text content", () => {
@@ -48,14 +48,14 @@ describe("getDocumentLang", () => {
       },
     });
 
-    expect(result).toEqual("fr");
+    expect(result).toBe("fr");
   });
 
   it("should normalise the language tag", () => {
     document.documentElement.lang = "iw";
 
     const { lang: result } = getDocumentLang({ lang: "en" });
 
-    expect(result).toEqual("he");
+    expect(result).toBe("he");
   });
 });

src/test/proxy.test.ts

@@ -26,7 +26,7 @@ describe("Test proxy translations", () => {
         try {
           expect(service).toEqual(Services.GOOGLE);
           expect(lang).toEqual(targetLang);
-          expect(type).toEqual("proxy");
+          expect(type).toBe("proxy");
           resolve();
         } catch (err) {
           reject(err);
@@ -52,7 +52,7 @@ describe("Test proxy translations", () => {
         try {
           expect(service).toEqual(Services.BAIDU);
           expect(lang).toEqual(targetLang);
-          expect(type).toEqual("proxy");
+          expect(type).toBe("proxy");
           resolve();
         } catch (err) {
           reject(err);

src/test/services.test.ts

@@ -22,7 +22,7 @@ const whichClientTranslation = (
 ): LangTranslatorInfo => {
   const [service] =
     (Object.entries(SERVICES_SELECTORS).find(([, selector]) =>
-      document.querySelector(selector as string)
+      document.querySelector(selector)
     ) as [Services, string] | undefined) || [];
 
   return {

src/whichClientTranslation.ts

@@ -31,7 +31,7 @@ const whichProxyTranslation = (
   const { hostname } = location;
 
   const [service] = (Object.entries(PROXIES_HOSTNAMES).find(([, hostnames]) =>
-    (hostnames as Array<HostnamePattern>).find((match) =>
+    hostnames.find((match) =>
       match instanceof RegExp ? match.test(hostname) : match === hostname
     )
   ) || []) as [Services, Array<HostnamePattern>];