chore: Import planx-core as ESM (#4105)

theopensystemslab · Jan 6, 2025 · 8c864f7 · 8c864f7
1 parent 6db8501
commit 8c864f7
Show file tree

Hide file tree

Showing 63 changed files with 745 additions and 442 deletions.
diff --git a/api.planx.uk/modules/send/bops/bops.test.ts b/api.planx.uk/modules/send/bops/bops.test.ts
@@ -1,6 +1,6 @@
 import nock from "nock";
 import supertest from "supertest";
-import type planxCore from "@opensystemslab/planx-core";
+import type * as planxCore from "@opensystemslab/planx-core";
 import { queryMock } from "../../../tests/graphqlQueryMock.js";
 import app from "../../../server.js";
 import { expectedPlanningPermissionPayload } from "../../../tests/mocks/digitalPlanningDataMocks.js";

diff --git a/api.planx.uk/modules/send/email/index.test.ts b/api.planx.uk/modules/send/email/index.test.ts
@@ -1,5 +1,5 @@
 import supertest from "supertest";
-import type planxCore from "@opensystemslab/planx-core";
+import type * as planxCore from "@opensystemslab/planx-core";
 import { queryMock } from "../../../tests/graphqlQueryMock.js";
 import app from "../../../server.js";
 

diff --git a/api.planx.uk/modules/webhooks/service/analyzeSessions/operations.test.ts b/api.planx.uk/modules/webhooks/service/analyzeSessions/operations.test.ts
@@ -1,4 +1,4 @@
-import type planxCore from "@opensystemslab/planx-core";
+import type * as planxCore from "@opensystemslab/planx-core";
 import { queryMock } from "../../../../tests/graphqlQueryMock.js";
 import {
   getSubmittedUnAnalyzedSessionIds,

diff --git a/api.planx.uk/modules/webhooks/service/sanitiseApplicationData/operations.test.ts b/api.planx.uk/modules/webhooks/service/sanitiseApplicationData/operations.test.ts
@@ -1,4 +1,4 @@
-import type planxCore from "@opensystemslab/planx-core";
+import type * as planxCore from "@opensystemslab/planx-core";
 import { runSQL } from "../../../../lib/hasura/schema/index.js";
 import { queryMock } from "../../../../tests/graphqlQueryMock.js";
 import {

diff --git a/api.planx.uk/package.json b/api.planx.uk/package.json
@@ -13,7 +13,7 @@
     "@airbrake/node": "^2.1.8",
     "@aws-sdk/client-s3": "^3.696.0",
     "@aws-sdk/s3-request-presigner": "^3.701.0",
-    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#a9848d4",
+    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#d004278",
     "@types/isomorphic-fetch": "^0.0.36",
     "adm-zip": "^0.5.10",
     "axios": "^1.7.4",

diff --git a/api.planx.uk/pnpm-lock.yaml b/api.planx.uk/pnpm-lock.yaml
diff --git a/api.planx.uk/tests/mockJWT.ts b/api.planx.uk/tests/mockJWT.ts
@@ -1,5 +1,5 @@
 import type { Role } from "@opensystemslab/planx-core/types";
-import { sign } from "jsonwebtoken";
+import jwt from "jsonwebtoken";
 
 function getJWT({ role }: { role: Role }) {
   const data = {
@@ -12,7 +12,7 @@ function getJWT({ role }: { role: Role }) {
     },
   };
 
-  return sign(data, process.env.JWT_SECRET!);
+  return jwt.sign(data, process.env.JWT_SECRET!);
 }
 
 function authHeader({ role }: { role: Role }) {

diff --git a/e2e/package.json b/e2e/package.json
@@ -22,6 +22,7 @@
   },
   "packageManager": "[email protected]",
   "devDependencies": {
+    "@types/jsonwebtoken": "^9.0.7",
     "@types/node": "22.10.5",
     "@typescript-eslint/eslint-plugin": "^5.62.0",
     "@typescript-eslint/parser": "^5.62.0",

diff --git a/e2e/pnpm-lock.yaml b/e2e/pnpm-lock.yaml
diff --git a/e2e/tests/api-driven/cucumber.json b/e2e/tests/api-driven/cucumber.json
@@ -1,10 +1,9 @@
 {
   "default": {
-    "requireModule": ["ts-node/register"],
-    "require": ["src/env.ts", "src/**/*.ts"],
+    "loader": ["ts-node/esm"],
+    "import": ["src/env.ts", "src/**/*.ts"],
     "paths": ["src/**/*.feature"],
     "format": ["summary"],
-    "publishQuiet": true,
     "formatOptions": {
       "snippetInterface": "async-await"
     }

diff --git a/e2e/tests/api-driven/package.json b/e2e/tests/api-driven/package.json
@@ -4,10 +4,11 @@
     "test": "cucumber-js --tags 'not @regression'",
     "test:regression": "cucumber-js"
   },
+  "type": "module",
   "packageManager": "[email protected]",
   "dependencies": {
-    "@cucumber/cucumber": "^9.3.0",
-    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#a9848d4",
+    "@cucumber/cucumber": "^11.1.1",
+    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#d004278",
     "axios": "^1.7.4",
     "dotenv": "^16.3.1",
     "dotenv-expand": "^10.0.0",
@@ -17,6 +18,7 @@
     "nock": "^13.3.1"
   },
   "devDependencies": {
+    "@types/jsonwebtoken": "^9.0.7",
     "@types/lodash.zipobject": "^4.1.7",
     "@types/node": "22.10.5",
     "ts-node": "^10.9.1",