Merge pull request #120 from solid-contrib/migrate-to-utils

Migrate to utils

Author: angelo-v

contacts/jest.config.ts

@@ -14,13 +14,14 @@ const config: Config = {
   transform: {
     // '^.+\\.[tj]sx?$' to process js/ts with `ts-jest`
     // '^.+\\.m?[tj]sx?$' to process js/ts/mjs/mts with `ts-jest`
-    "^.+\\.ts$": [
+    "^.+\\.[tj]s$": [
       "ts-jest",
       {
         useESM: true,
       },
     ],
   },
+  transformIgnorePatterns: ["node_modules/(?!(@solid-data-modules)/)"],
 };
 
 export default config;

contacts/jest.e2e.config.ts

@@ -6,8 +6,8 @@ const config: Config = {
   rootDir: "src/e2e-tests",
   testTimeout: 60000,
   detectOpenHandles: true,
-  globalSetup: "<rootDir>/globalSetup.ts",
-  globalTeardown: "<rootDir>/globalTeardown.ts",
+  globalSetup: "<rootDir>/globalSetup.js",
+  globalTeardown: "<rootDir>/globalTeardown.js",
   forceExit: true,
   extensionsToTreatAsEsm: [".ts"],
   moduleNameMapper: {
@@ -16,13 +16,14 @@ const config: Config = {
   transform: {
     // '^.+\\.[tj]sx?$' to process js/ts with `ts-jest`
     // '^.+\\.m?[tj]sx?$' to process js/ts/mjs/mts with `ts-jest`
-    "^.+\\.ts$": [
+    "^.+\\.[tj]s$": [
       "ts-jest",
       {
         useESM: true,
       },
     ],
   },
+  transformIgnorePatterns: ["node_modules/(?!(@solid-data-modules)/)"],
 };
 
 export default config;

contacts/package-lock.json

@@ -39,31 +39,30 @@
     "dist"
   ],
   "peerDependencies": {
-    "rdflib": "2.x"
+    "rdflib": "^2.2.35"
   },
   "devDependencies": {
     "@faker-js/faker": "^8.4.1",
-    "@solid/community-server": "^7.0.5",
+    "@solid/community-server": "^7.1.0",
     "@types/jest": "^29.5.12",
     "@types/jest-when": "^3.5.5",
-    "@types/uuid": "^9.0.8",
-    "@typescript-eslint/eslint-plugin": "^7.8.0",
-    "@typescript-eslint/parser": "^7.8.0",
+    "@typescript-eslint/eslint-plugin": "^7.16.0",
+    "@typescript-eslint/parser": "^7.16.0",
     "eslint": "^8.57.0",
     "eslint-import-resolver-typescript": "^3.6.1",
     "eslint-plugin-import": "^2.29.1",
     "eslint-plugin-require-extensions": "^0.1.3",
     "jest": "^29.7.0",
     "jest-when": "^3.6.0",
     "mashlib": "^1.8.11",
-    "prettier": "^3.2.5",
+    "prettier": "^3.3.2",
     "serve": "^14.2.3",
-    "ts-jest": "^29.1.2",
+    "ts-jest": "^29.2.1",
     "ts-node": "^10.9.2",
-    "typedoc": "^0.25.13",
-    "typescript": "^5.4.5"
+    "typedoc": "^0.26.4",
+    "typescript": "^5.5.3"
   },
   "dependencies": {
-    "short-unique-id": "^5.2.0"
+    "@solid-data-modules/rdflib-utils": "^0.2.0"
   }
 }

contacts/package.json

@@ -0,0 +1,10 @@
+import { startServer } from "./start-server.js";
+import { generateId } from "@solid-data-modules/rdflib-utils/identifier";
+
+export let server;
+
+export default async function () {
+  const testId = generateId();
+  console.log("starting test server. Test ID is", testId);
+  server = await startServer(testId);
+}

contacts/src/e2e-tests/globalSetup.js

@@ -1,4 +1,4 @@
-import { server } from "./globalSetup";
+import { server } from "./globalSetup.js";
 
 export default async function () {
   console.log("stopping test server...");

contacts/src/e2e-tests/globalSetup.ts

@@ -2,7 +2,13 @@ import { AppRunner, joinFilePath } from "@solid/community-server";
 
 import { cp } from "fs/promises";
 
-export async function startServer(id: string) {
+import { fileURLToPath } from "url";
+import { dirname } from "path";
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+
+export async function startServer(id) {
   const testDataPath = joinFilePath(__dirname, "test-data");
   const rootFilePath = joinFilePath(__dirname, ".test-data", id);
   const app = await new AppRunner().create({