Merge pull request #35 from act-rules/update-yarn

Remove `request`, update `yarn` and dedupe dependencies

Author: Jym77

.gitignore

@@ -7,3 +7,16 @@ logs/
 .npmrc/
 .tmp/
 coverage/
+**/*.tsbuildinfo
+
+# yarn ignores
+# https://next.yarnpkg.com/getting-started/qa#which-files-should-be-gitignored
+
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+# Prevent yarn releases to be ignored by earlier filter
+!.yarn/releases/*.cjs
+!.yarn/sdks
+!.yarn/versions

.yarn/releases/yarn-4.12.0.cjs

@@ -0,0 +1,3 @@
+nodeLinker: node-modules
+
+yarnPath: .yarn/releases/yarn-4.12.0.cjs

.yarnrc.yml

@@ -21,15 +21,7 @@
     "prepare": "husky install"
   },
   "dependencies": {
-    "@types/debug": "^4.1.7",
-    "@types/fs-extra": "^9.0.13",
-    "@types/jest": "^29.5.1",
-    "@types/js-yaml": "^4.0.2",
-    "@types/jsonld": "^1.5.8",
-    "@types/markdown-table": "2.0.0",
-    "@types/node": "^16.3.1",
-    "@types/request-promise": "^4.1.48",
-    "@types/unist": "^2.0.6",
+    "axios": "^1.13.4",
     "commander": "^8.0.0",
     "debug": "^4.3.2",
     "fastmatter": "^2.1.1",
@@ -44,14 +36,20 @@
     "remark-frontmatter": "^3.0.0",
     "remark-parse": "^9.0.0",
     "remark-rehype": "8.1.0",
-    "request": "^2.88.2",
-    "request-promise": "^4.2.6",
     "rimraf": "^3.0.2",
     "ts-node": "^10.1.0",
     "typescript": "^4.3.5",
     "unified": "^9.2.1"
   },
   "devDependencies": {
+    "@types/debug": "^4.1.7",
+    "@types/fs-extra": "^9.0.13",
+    "@types/jest": "^29.5.1",
+    "@types/js-yaml": "^4.0.2",
+    "@types/jsonld": "^1.5.8",
+    "@types/markdown-table": "2.0.0",
+    "@types/node": "^16.3.1",
+    "@types/unist": "^2.0.6",
     "@typescript-eslint/eslint-plugin": "^4.28.3",
     "@typescript-eslint/parser": "^4.28.3",
     "eslint": "^7.30.0",
@@ -80,5 +78,6 @@
       "prettier --write",
       "git add"
     ]
-  }
+  },
+  "packageManager": "yarn@4.12.0"
 }

package.json

@@ -28,6 +28,7 @@ export async function cliProgram({
   const meta = { vendor, name, version };
 
   const earlReportFile = await loadJson(jsonReport);
+
   const testCaseFile = await loadJson<TestCaseJson>(testCaseJson);
 
   console.log("Loading files");

src/map-implementation.ts

@@ -1,18 +1,21 @@
-import request from "request-promise";
+import axios from "axios";
 import debug from "debug";
-import { promisify } from "util";
-import fs from "fs";
-
-const readFile = promisify(fs.readFile);
+import fs from "node:fs";
 
 // eslint-disable @typescript-eslint/ban-types
 export async function loadJson<T = Object>(filePath: string): Promise<T> {
   if (/^https?:\/\//.test(filePath)) {
     debug("load:request")(`fetching ${filePath}`);
-    return await request({ uri: filePath, json: true });
+
+    const response = await axios.get(filePath, {
+      headers: { "Accept-Encoding": "application/json" },
+      responseType: "json",
+    });
+
+    return response.data;
   } else {
     debug("load:readFile")(`Loading ${filePath}`);
-    const str = await readFile(filePath, "utf8");
+    const str = fs.readFileSync(filePath, "utf8");
     return JSON.parse(str);
   }
 }