chore(test): UI tests to ESM

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#a7ec46d",
+    "@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",

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 }) {

e2e/package.json

@@ -10,9 +10,7 @@
     "test:debug": "DEBUG_LOG=true pnpm test",
     "lint": "eslint './tests/**/*.{js,ts}' && prettier -c ./tests",
     "lint:fix": "eslint --fix './tests/**/*.{js,ts}' && prettier -w ./tests",
-    "check": "pnpm check:api && pnpm check:ui && pnpm lint",
-    "check:api": "tsc --project './tests/api-driven/tsconfig.json' && pnpm lint",
-    "check:ui": "tsc --project './tests/ui-driven/tsconfig.json' && pnpm lint",
+    "check": "tsc && pnpm lint",
     "postinstall": "cd tests/ui-driven && pnpm install && cd ../api-driven && pnpm install",
     "prepare": "cd .. && husky install e2e/.husky"
   },
@@ -24,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",

e2e/tests/api-driven/package.json

@@ -8,7 +8,7 @@
   "packageManager": "[email protected]",
   "dependencies": {
     "@cucumber/cucumber": "^11.1.1",
-    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#a7ec46d",
+    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#d004278",
     "axios": "^1.7.4",
     "dotenv": "^16.3.1",
     "dotenv-expand": "^10.0.0",

e2e/tests/api-driven/src/invite-to-pay/mocks/index.ts

@@ -5,8 +5,8 @@ import type {
   Node,
 } from "@opensystemslab/planx-core/types";
 import { ComponentType } from "@opensystemslab/planx-core/types";
-import flow from "./flow.json" assert { type: "json" };
-import session from "./session.json" assert { type: "json" };
+import flow from "./flow.json" with { type: "json" };
+import session from "./session.json" with { type: "json" };
 
 export const mockBreadcrumbs = session.data?.breadcrumbs as Breadcrumbs;
 

e2e/tests/ui-driven/package.json

@@ -7,8 +7,9 @@
     "ui": "serve ../../../editor.planx.uk/build --single --listen 3000",
     "postinstall": "./install-dependencies.sh"
   },
+  "type": "module",
   "dependencies": {
-    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#a7ec46d",
+    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#d004278",
     "axios": "^1.7.4",
     "dotenv": "^16.3.1",
     "eslint": "^8.56.0",
@@ -21,7 +22,7 @@
   },
   "packageManager": "[email protected]",
   "devDependencies": {
-    "@playwright/test": "^1.49.0",
+    "@playwright/test": "^1.49.1",
     "@types/geojson": "^7946.0.14",
     "@types/node": "22.10.5",
     "eslint-plugin-playwright": "^0.20.0"

e2e/tests/ui-driven/src/create-flow-with-geospatial.spec.ts

@@ -3,45 +3,45 @@ import {
   contextDefaults,
   setUpTestContext,
   tearDownTestContext,
-} from "./helpers/context";
-import { getTeamPage } from "./helpers/getPage";
-import { createAuthenticatedSession } from "./helpers/globalHelpers";
-import { answerQuestion, clickContinue } from "./helpers/userActions";
-import { PlaywrightEditor } from "./pages/Editor";
+} from "./helpers/context.js";
+import { getTeamPage } from "./helpers/getPage.js";
+import { createAuthenticatedSession } from "./helpers/globalHelpers.js";
+import { answerQuestion, clickContinue } from "./helpers/userActions.js";
+import { PlaywrightEditor } from "./pages/Editor.js";
 import {
   navigateToService,
   publishService,
   turnServiceOnline,
-} from "./helpers/navigateAndPublish";
-import { TestContext } from "./helpers/types";
-import { serviceProps } from "./helpers/serviceData";
+} from "./helpers/navigateAndPublish.js";
+import { TestContext } from "./helpers/types.js";
+import { serviceProps } from "./helpers/serviceData.js";
 import {
   alterDrawGeoJson,
   checkGeoJsonContent,
   checkUploadFileAltRoute,
   getMapProperties,
   resetMapBoundary,
   waitForMapComponent,
-} from "./helpers/geospatialChecks";
+} from "./helpers/geospatialChecks.js";
 import {
   GeoJsonChangeHandler,
   mockChangedMapGeoJson,
   mockPropertyTypeOptions,
   mockTitleBoundaryGeoJson,
-} from "./mocks/geospatialMocks";
+} from "./mocks/geospatialMocks.js";
 import {
   setupOSMapsStyles,
   setupOSMapsVectorTiles,
-} from "./mocks/osMapsResponse";
+} from "./mocks/osMapsResponse.js";
 import {
   planningConstraintHeadersMock,
   setupGISMockResponse,
   setupRoadsMockResponse,
-} from "./mocks/gisResponse";
+} from "./mocks/gisResponse.js";
 import {
   answerFindProperty,
   userChallengesPlanningConstraint,
-} from "./helpers/geoSpatialUserActions";
+} from "./helpers/geoSpatialUserActions.js";
 
 test.describe("Flow creation, publish and preview", () => {
   let context: TestContext = {

e2e/tests/ui-driven/src/create-flow.spec.ts

@@ -3,13 +3,13 @@ import {
   contextDefaults,
   setUpTestContext,
   tearDownTestContext,
-} from "./helpers/context";
-import { getTeamPage } from "./helpers/getPage";
+} from "./helpers/context.js";
+import { getTeamPage } from "./helpers/getPage.js";
 import {
   createAuthenticatedSession,
   filterFlags,
   selectedFlag,
-} from "./helpers/globalHelpers";
+} from "./helpers/globalHelpers.js";
 import {
   answerAddressInput,
   answerChecklist,
@@ -20,19 +20,19 @@ import {
   answerQuestion,
   answerTextInput,
   clickContinue,
-} from "./helpers/userActions";
-import { PlaywrightEditor } from "./pages/Editor";
-import { createExternalPortal } from "./helpers/addComponent";
+} from "./helpers/userActions.js";
+import { PlaywrightEditor } from "./pages/Editor.js";
+import { createExternalPortal } from "./helpers/addComponent.js";
 import {
   navigateToService,
   publishService,
   turnServiceOnline,
-} from "./helpers/navigateAndPublish";
-import { TestContext } from "./helpers/types";
+} from "./helpers/navigateAndPublish.js";
+import { TestContext } from "./helpers/types.js";
 import {
   externalPortalFlowData,
   externalPortalServiceProps,
-} from "./helpers/serviceData";
+} from "./helpers/serviceData.js";
 
 test.describe("Flow creation, publish and preview", () => {
   let context: TestContext = {

e2e/tests/ui-driven/src/helpers/addComponent.ts

@@ -1,9 +1,9 @@
 import { ComponentType } from "@opensystemslab/planx-core/types";
 import { expect, Locator, Page } from "@playwright/test";
-import { contextDefaults } from "./context";
-import { externalPortalServiceProps } from "./serviceData";
-import { OptionWithDataValues } from "./types";
-import { selectedFlag } from "./globalHelpers";
+import { contextDefaults } from "./context.js";
+import { externalPortalServiceProps } from "./serviceData.js";
+import { OptionWithDataValues } from "./types.js";
+import { selectedFlag } from "./globalHelpers.js";
 
 const createBaseComponent = async (
   page: Page,