Bump dependencies

.github/workflows/test.yml

@@ -18,7 +18,7 @@ jobs:
           ${{ runner.os }}-
     - uses: actions/setup-node@v1
       with:
-        node-version: '12'
+        node-version: '21'
     - run: npm install
     - run: echo "::add-matcher::.github/problem_matcher.json"
     - run: npm test

CONTRIBUTORS.toml

@@ -14,9 +14,9 @@ role = "founder"
 
 [doamatto]
 name = "Matt Ronchetto"
-website = "https://www.doamatto.xyz"
+website = "https://maatt.fr"
 github = "doamatto"
-email = "[email protected]"
+email = "[email protected]"
 
 [kulchynska]
 

package.json

@@ -7,62 +7,49 @@
     "test": "tests"
   },
   "dependencies": {
-    "@babel/core": "^7.12.10",
-    "@babel/helper-validator-option": "^7.12.17",
-    "@babel/preset-env": "^7.12.10",
-    "@babel/preset-typescript": "^7.12.7",
+    "@babel/core": "^7.25.2",
+    "@babel/helper-validator-option": "^7.24.8",
+    "@babel/preset-env": "^7.25.3",
+    "@babel/preset-typescript": "^7.24.7",
     "@fortawesome/fontawesome-free": "^5.15.1",
+    "@fullhuman/postcss-purgecss": "^5.0.0",
     "@iarna/toml": "^2.2.5",
-    "@types/gulp": "^4.0.7",
-    "@types/jest": "^26",
-    "@types/node": "^14.14.14",
-    "@typescript-eslint/eslint-plugin": "^3.10.1",
-    "@typescript-eslint/parser": "^3.10.1",
-    "a17t": "^0.2.9",
+    "@types/gulp": "^4.0.17",
+    "@types/jest": "^29.5.12",
+    "@types/node": "^22.5.0",
+    "a17t": "^0.10.1",
     "autoprefixer": "^10.2.6",
-    "axios": "^0.21.2",
-    "babel-jest": "^27",
-    "babel-plugin-polyfill-corejs2": "^0.2.0",
-    "babel-plugin-polyfill-corejs3": "^0.2.0",
-    "babel-plugin-polyfill-regenerator": "^0.2.0",
-    "cssnano": "^5.0.2",
+    "babel-jest": "^29.7.0",
     "del": "^5.1.0",
     "dotenv": "^8.2.0",
-    "eslint": "^7.15.0",
-    "eslint-config-prettier": "^6.15.0",
-    "eslint-plugin-prettier": "^3.3.0",
     "gulp": "^4.0.2",
-    "gulp-cli": "^2.3.0",
-    "gulp-compile-handlebars": "^0.6.1",
     "gulp-hb": "^8.0.0",
     "gulp-jest": "^4.0.3",
-    "gulp-postcss": "^9.0.0",
-    "gulp-purgecss": "^4.0.3",
+    "gulp-postcss": "^9.0.1",
     "gulp-rename": "^2.0.0",
-    "handlebars-helpers": "^0.10.0",
+    "hbl-arrays": "^0.1.0",
+    "hbl-cmark": "^0.1.0",
+    "hbl-comparison": "^0.1.0",
+    "hbl-maths": "^0.1.0",
+    "hbl-object": "^0.1.0",
+    "hbl-strings": "^0.1.0",
+    "hbl-urls": "^0.1.0",
     "image-size": "^0.8.3",
-    "is-core-module": "^2.4.0",
-    "jest": "^27",
-    "jest-cli": "^27",
-    "jest-junit": "^11.1.0",
-    "jssoup": "0.0.11",
     "lunr": "^2.3.9",
     "postcss": "^8.2.10",
     "postcss-import": "^14.0.2",
     "postcss-scss": "^3.0.5",
-    "queue-microtask": "^1.2.3",
-    "run-sequence": "^2.2.1",
     "simple-git": "^3.16.0",
     "tailwindcss": "^2.1.2",
-    "toml": "^3.0.0",
     "ts-node": "^8.10.2",
     "typescript": "^3.9.7"
   },
   "scripts": {
     "test": "jest",
     "lint": "eslint '*/**/*.{js,ts,tsx}' --quiet --fix",
     "legacy-convert": "node src/legacy/convert",
-    "icons": "ts-node src/build/icons"
+    "icons": "ts-node src/build/icons",
+    "build": "gulp"
   },
   "repository": {
     "type": "git",
@@ -75,6 +62,16 @@
   },
   "homepage": "https://github.com/Politiwatch/privacyspy#readme",
   "devDependencies": {
+    "@typescript-eslint/eslint-plugin": "^3.10.1",
+    "@typescript-eslint/parser": "^3.10.1",
+    "axios": "^1.6.8",
+    "eslint": "^7.15.0",
+    "eslint-config-prettier": "^6.15.0",
+    "eslint-plugin-prettier": "^3.3.0",
+    "handlebars": "^4.7.8",
+    "jest": "^29.7.0",
+    "jest-cli": "^29.7.0",
+    "jssoup": "^0.0.15",
     "prettier": "^2.2.1"
   }
 }

src/build/icons.ts

@@ -43,7 +43,7 @@ async function getIcon(product: Product) {
   for (const hostname of product.hostnames) {
     try {
       const homeUrl = "http://" + hostname;
-      const response = await axios.get(homeUrl, { timeout: 10 });
+      const response = await axios.get(homeUrl, { timeout: 10000 });
       const soup = new JSSoup(response.data);
       for (const link of soup.findAll("link")) {
         if (
@@ -89,7 +89,7 @@ async function getIcon(product: Product) {
       const icon = await axios
         .get(iconUrl, {
           responseType: "arraybuffer",
-          timeout: 10,
+          timeout: 10000,
         })
         .then((response) => Buffer.from(response.data, "binary"));
       const dimensions = sizeOf(icon);

src/build/utils.ts

@@ -9,7 +9,13 @@ import { loadRubric } from "../parsing/index";
 const gulp = require("gulp");
 const rename = require("gulp-rename");
 const hb = require("gulp-hb");
-const hbHelpers = require("handlebars-helpers");
+const hbArrayHelpers = require("hbl-arrays");
+const hbCMarkHelpers = require("hbl-cmark");
+const hbCompareHelpers = require("hbl-comparison");
+const hbMathsHelpers = require("hbl-maths");
+const hbObjectHelpers = require("hbl-object");
+const hbStringHelpers = require("hbl-strings");
+const hbUrlHelpers = require("hbl-urls");
 
 const PAGE_NUMBER_PADDING = 3; // i.e.: *1* 2 3 ... 8
 
@@ -29,7 +35,13 @@ export function hbsFactory(data: object = {}) {
       }),
       ...data,
     })
-    .helpers(hbHelpers())
+    .helpers(hbArrayHelpers())
+    .helpers(hbCMarkHelpers())
+    .helpers(hbCompareHelpers())
+    .helpers(hbMathsHelpers())
+    .helpers(hbObjectHelpers())
+    .helpers(hbStringHelpers())
+    .helpers(hbUrlHelpers())
     .helpers({
       ratioColorClass,
       getMonth,

src/static/css/base.scss

@@ -7,6 +7,5 @@
 @import "@fortawesome/fontawesome-free/css/regular.css";
 @import "@fortawesome/fontawesome-free/css/solid.css";
 @import "@fortawesome/fontawesome-free/css/v4-shims.css";
-@import "a17t";
 @import "./custom.scss";
 @import "./info.scss";

tailwind.config.js

@@ -64,4 +64,7 @@ module.exports = {
     purgeLayersByDefault: true,
     removeDeprecatedGapUtilities: true,
   },
+  plugins: [
+    require("a17t")
+  ]
 };