diff --git a/Dockerfile b/Dockerfile index ec66ef15b6..95e7ae04cd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM gcr.io/sre-docker-registry/data-hub-frontend-dependencies:4.3.9 +FROM gcr.io/sre-docker-registry/data-hub-frontend-dependencies:4.3.10 ARG CURRENT_UID ARG CURRENT_GID diff --git a/Dockerfile.dependencies b/Dockerfile.dependencies index c29af65ec3..e3a968da8a 100644 --- a/Dockerfile.dependencies +++ b/Dockerfile.dependencies @@ -53,7 +53,7 @@ COPY --chown=node:node package*.json "$HOME/" WORKDIR $HOME # Install specific version of cypress -RUN npm install -g cypress@13.17.0 \ +RUN npm install -g cypress@14.0.2 \ && npx cypress verify \ && npx cypress cache path \ && npx cypress cache list \ diff --git a/docs/Docker.md b/docs/Docker.md index 2ab0e40fd9..70c85146fe 100644 --- a/docs/Docker.md +++ b/docs/Docker.md @@ -45,7 +45,7 @@ Ensure you have [gcloud CLI installed](https://cloud.google.com/sdk/docs/install > If you have issues when building the dependencies image, especially if you are using a Mac with an Apple chip, this is most likely due to incompatibility with the `arm` architecture; instead you need to build on `amd` architecture. Please refer to [troubleshooting guide](./Troubleshooting.md) and follow the steps under the Building dependency images section, before retrying the build command below. ```bash -export VERSION=4.3.9 # Increment this version each time when you edit Dockerfile. +export VERSION=4.3.10 # Increment this version each time when you edit Dockerfile. docker build -f Dockerfile.dependencies -t data-hub-frontend-dependencies . --platform linux/amd64 diff --git a/package-lock.json b/package-lock.json index 631cfbc9a2..fbf9229a9a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -119,7 +119,7 @@ "babel-plugin-istanbul": "7.0.0", "chai": "^4.5.0", "chai-subset": "^1.6.0", - "cypress": "^13.17.0", + "cypress": "^14.0.2", "cypress-axe": "^1.6.0", "eslint": "^8.57.0", "eslint-config-prettier": "^10.0.1", @@ -144,7 +144,7 @@ "mocha": "^11.1.0", "mocha-junit-reporter": "^2.2.1", "mochapack": "^2.1.4", - "nock": "^13.5.6", + "nock": "^14.0.0", "nodemon": "^3.1.9", "npm-run-all": "^4.1.5", "nyc": "17.1.0", @@ -4849,6 +4849,24 @@ "react": ">=16" } }, + "node_modules/@mswjs/interceptors": { + "version": "0.37.6", + "resolved": "https://registry.npmjs.org/@mswjs/interceptors/-/interceptors-0.37.6.tgz", + "integrity": "sha512-wK+5pLK5XFmgtH3aQ2YVvA3HohS3xqV/OxuVOdNx9Wpnz7VE/fnC+e1A7ln6LFYeck7gOJ/dsZV6OLplOtAJ2w==", + "dev": true, + "license": "MIT", + "dependencies": { + "@open-draft/deferred-promise": "^2.2.0", + "@open-draft/logger": "^0.3.0", + "@open-draft/until": "^2.0.0", + "is-node-process": "^1.2.0", + "outvariant": "^1.4.3", + "strict-event-emitter": "^0.5.1" + }, + "engines": { + "node": ">=18" + } + }, "node_modules/@nicolo-ribaudo/eslint-scope-5-internals": { "version": "5.1.1-v1", "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz", @@ -5000,6 +5018,31 @@ "integrity": "sha512-XuySG1E38YScSJoMlqovLru4KTUNSjgVTIjyh7qMX6aNN5HY5Ct5LhRJdxO79JtTzKfzV/bnWpz+zquYrISsvw==", "dev": true }, + "node_modules/@open-draft/deferred-promise": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@open-draft/deferred-promise/-/deferred-promise-2.2.0.tgz", + "integrity": "sha512-CecwLWx3rhxVQF6V4bAgPS5t+So2sTbPgAzafKkVizyi7tlwpcFpdFqq+wqF2OwNBmqFuu6tOyouTuxgpMfzmA==", + "dev": true, + "license": "MIT" + }, + "node_modules/@open-draft/logger": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/@open-draft/logger/-/logger-0.3.0.tgz", + "integrity": "sha512-X2g45fzhxH238HKO4xbSr7+wBS8Fvw6ixhTDuvLd5mqh6bJJCFAPwU9mPDxbcrRtfxv4u5IHCEH77BmxvXmmxQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-node-process": "^1.2.0", + "outvariant": "^1.4.0" + } + }, + "node_modules/@open-draft/until": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@open-draft/until/-/until-2.1.0.tgz", + "integrity": "sha512-U69T3ItWHvLwGg5eJ0n3I62nWuE6ilHlmz7zM0npLBRvPRd7e6NYmg54vvRtP5mZG7kZqZCFVdsTWo7BPtBujg==", + "dev": true, + "license": "MIT" + }, "node_modules/@opentelemetry/api": { "version": "1.9.0", "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.9.0.tgz", @@ -10876,11 +10919,12 @@ } }, "node_modules/cypress": { - "version": "13.17.0", - "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.17.0.tgz", - "integrity": "sha512-5xWkaPurwkIljojFidhw8lFScyxhtiFHl/i/3zov+1Z5CmY4t9tjIdvSXfu82Y3w7wt0uR9KkucbhkVvJZLQSA==", + "version": "14.0.2", + "resolved": "https://registry.npmjs.org/cypress/-/cypress-14.0.2.tgz", + "integrity": "sha512-3qqTU2JoVY262qkYg9I2nohwxcfsJk0dSVp/LXAjD94Jz2y6411Mf/l5uHEHiaANrOmMcHbzYgOd/ueDsZlS7A==", "dev": true, "hasInstallScript": true, + "license": "MIT", "dependencies": { "@cypress/request": "^3.0.6", "@cypress/xvfb": "^1.2.4", @@ -10930,7 +10974,7 @@ "cypress": "bin/cypress" }, "engines": { - "node": "^16.0.0 || ^18.0.0 || >=20.0.0" + "node": "^18.0.0 || ^20.0.0 || >=22.0.0" } }, "node_modules/cypress-axe": { @@ -15659,6 +15703,13 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/is-node-process": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/is-node-process/-/is-node-process-1.2.0.tgz", + "integrity": "sha512-Vg4o6/fqPxIjtxgUH5QLJhwZ7gW5diGCVlXpuUfELC62CuxM1iHcRe51f2W1FDy04Ai4KJkagKjx3XaqyfRKXw==", + "dev": true, + "license": "MIT" + }, "node_modules/is-number": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", @@ -19240,17 +19291,18 @@ } }, "node_modules/nock": { - "version": "13.5.6", - "resolved": "https://registry.npmjs.org/nock/-/nock-13.5.6.tgz", - "integrity": "sha512-o2zOYiCpzRqSzPj0Zt/dQ/DqZeYoaQ7TUonc/xUPjCGl9WeHpNbxgVvOquXYAaJzI0M9BXV3HTzG0p8IUAbBTQ==", + "version": "14.0.0", + "resolved": "https://registry.npmjs.org/nock/-/nock-14.0.0.tgz", + "integrity": "sha512-3Z2ZoZoYTR/y2I+NI16+6IzfZFKBX7MrADtoBAm7v/QKqxQUhKw+Dh+847PPS1j/FDutjfIXfrh3CJF74yITWg==", "dev": true, + "license": "MIT", "dependencies": { - "debug": "^4.1.0", + "@mswjs/interceptors": "^0.37.3", "json-stringify-safe": "^5.0.1", "propagate": "^2.0.0" }, "engines": { - "node": ">= 10.13" + "node": ">= 18" } }, "node_modules/node-abort-controller": { @@ -20170,6 +20222,13 @@ "integrity": "sha512-o6E5qJV5zkAbIDNhGSIlyOhScKXgQrSRMilfph0clDfM0nEnBOlKlH4sWDmG95BW/CvwNz0vmm7dJVtU2KlMiA==", "dev": true }, + "node_modules/outvariant": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/outvariant/-/outvariant-1.4.3.tgz", + "integrity": "sha512-+Sl2UErvtsoajRDKCE5/dBz4DIvHXQQnAxtQTF04OJxY0+DyZXSo5P5Bb7XYWOh81syohlYL24hbDwxedPUJCA==", + "dev": true, + "license": "MIT" + }, "node_modules/own-keys": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/own-keys/-/own-keys-1.0.1.tgz", @@ -24203,6 +24262,13 @@ "readable-stream": "^3.0.6" } }, + "node_modules/strict-event-emitter": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/strict-event-emitter/-/strict-event-emitter-0.5.1.tgz", + "integrity": "sha512-vMgjE/GGEPEFnhFub6pa4FmJBRBVOLpIII2hvCZ8Kzb7K0hlHo7mQv6xYrBvCL2LtAIBwFUK8wvuJgTVSQ5MFQ==", + "dev": true, + "license": "MIT" + }, "node_modules/string_decoder": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", diff --git a/package.json b/package.json index fc8ffcaf7e..b53aa77d46 100644 --- a/package.json +++ b/package.json @@ -174,7 +174,7 @@ "babel-plugin-istanbul": "7.0.0", "chai": "^4.5.0", "chai-subset": "^1.6.0", - "cypress": "^13.17.0", + "cypress": "^14.0.2", "cypress-axe": "^1.6.0", "eslint": "^8.57.0", "eslint-config-prettier": "^10.0.1", @@ -199,7 +199,7 @@ "mocha": "^11.1.0", "mocha-junit-reporter": "^2.2.1", "mochapack": "^2.1.4", - "nock": "^13.5.6", + "nock": "^14.0.0", "nodemon": "^3.1.9", "npm-run-all": "^4.1.5", "nyc": "17.1.0", diff --git a/test/component/cypress/support/commands.js b/test/component/cypress/support/commands.js index 5b2d5bdcd5..fb11bab4eb 100644 --- a/test/component/cypress/support/commands.js +++ b/test/component/cypress/support/commands.js @@ -1,5 +1,5 @@ import React from 'react' -import { mount } from 'cypress/react18' +import { mount } from 'cypress/react' import { TASK_GET_REMINDER_SUMMARY } from '../../../../src/client/components/NotificationAlert/state' import { INITIAL_STATE } from '../../../../src/client/components/NotificationAlert/reducer'