From b17bcb683808616976906683ddf792604966e28d Mon Sep 17 00:00:00 2001 From: Alf Eaton Date: Mon, 10 Oct 2022 11:14:28 +0100 Subject: [PATCH] Merge pull request #9893 from overleaf/ae-upgrade-cypress-2 Upgrade Cypress to 10.9.0 GitOrigin-RevId: 00134da2915c3a35743da3e6eacfeda6f3be6a6a --- package-lock.json | 61 +++++++++---------- services/web/docker-compose.yml | 2 +- .../new-project-button-modal.tsx | 1 + .../components/emails/add-email/input.tsx | 1 + services/web/package.json | 4 +- 5 files changed, 33 insertions(+), 36 deletions(-) diff --git a/package-lock.json b/package-lock.json index 214c7da659..dec00c66cb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2782,13 +2782,10 @@ } }, "node_modules/@cypress/react": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/@cypress/react/-/react-6.0.0.tgz", - "integrity": "sha512-XHAtsu3LA3YWVwdFbr3d3ZgvORVZgIvAwwk9BEWJK7Wcveu/+F9lO5DeKgUa66H21tZXKonF+NsErojKZPvR+g==", + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/@cypress/react/-/react-6.2.0.tgz", + "integrity": "sha512-arBO5/ed5MM56ypgmMugCOZoAIHH9e+7NH98oF2LCEffr8qkAV4WG5o4S+fqDjFPFP5WNZoKtPC7DEkxOm6kFA==", "dev": true, - "dependencies": { - "debug": "^4.3.2" - }, "peerDependencies": { "@types/react": "^16.9.16 || ^17.0.0", "cypress": "*", @@ -10547,9 +10544,9 @@ "dev": true }, "node_modules/cypress": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/cypress/-/cypress-10.2.0.tgz", - "integrity": "sha512-+i9lY5ENlfi2mJwsggzR+XASOIgMd7S/Gd3/13NCpv596n3YSplMAueBTIxNLcxDpTcIksp+9pM3UaDrJDpFqA==", + "version": "10.9.0", + "resolved": "https://registry.npmjs.org/cypress/-/cypress-10.9.0.tgz", + "integrity": "sha512-MjIWrRpc+bQM9U4kSSdATZWZ2hUqHGFEQTF7dfeZRa4MnalMtc88FIE49USWP2ZVtfy5WPBcgfBX+YorFqGElA==", "dev": true, "hasInstallScript": true, "dependencies": { @@ -10572,7 +10569,7 @@ "dayjs": "^1.10.4", "debug": "^4.3.2", "enquirer": "^2.3.6", - "eventemitter2": "^6.4.3", + "eventemitter2": "6.4.7", "execa": "4.1.0", "executable": "^4.1.1", "extract-zip": "2.0.1", @@ -13054,9 +13051,9 @@ } }, "node_modules/eventemitter2": { - "version": "6.4.5", - "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-6.4.5.tgz", - "integrity": "sha512-bXE7Dyc1i6oQElDG0jMRZJrRAn9QR2xyyFGmBdZleNmyQX0FqGYmhZIrIrpPfm/w//LTo4tVQGOGQcGCb5q9uw==", + "version": "6.4.7", + "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-6.4.7.tgz", + "integrity": "sha512-tYUSVOGeQPKt/eC1ABfhHy5Xd96N3oIijJvN3O9+TsC28T5V9yX9oEfEK5faP0EFSNVOG97qtAS68GBrQB2hDg==", "dev": true }, "node_modules/eventemitter3": { @@ -34003,7 +34000,7 @@ "express-session": "^1.17.1", "proxy-addr": "^2.0.7", "request": "^2.88.2", - "socket.io": "git+ssh://git@github.com/overleaf/socket.io.git#af96d1b68d9918ee0f9cb82c62990395b0a601fb", + "socket.io": "overleaf/socket.io#0.9.19-overleaf-6", "socket.io-client": "overleaf/socket.io-client#0.9.17-overleaf-3", "underscore": "1.13.1" }, @@ -35091,7 +35088,7 @@ }, "devDependencies": { "@babel/register": "^7.14.5", - "@cypress/react": "^6.0.0", + "@cypress/react": "^6.2.0", "@juggle/resize-observer": "^3.3.1", "@lezer/generator": "^1.1.1", "@testing-library/cypress": "^8.0.3", @@ -35128,7 +35125,7 @@ "copy-webpack-plugin": "^10.2.4", "css-loader": "^6.7.1", "css-minimizer-webpack-plugin": "^3.4.1", - "cypress": "^10.2.0", + "cypress": "^10.9.0", "es6-promise": "^4.2.8", "escodegen": "^2.0.0", "eslint-config-standard-jsx": "^11.0.0-0", @@ -38517,13 +38514,11 @@ } }, "@cypress/react": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/@cypress/react/-/react-6.0.0.tgz", - "integrity": "sha512-XHAtsu3LA3YWVwdFbr3d3ZgvORVZgIvAwwk9BEWJK7Wcveu/+F9lO5DeKgUa66H21tZXKonF+NsErojKZPvR+g==", + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/@cypress/react/-/react-6.2.0.tgz", + "integrity": "sha512-arBO5/ed5MM56ypgmMugCOZoAIHH9e+7NH98oF2LCEffr8qkAV4WG5o4S+fqDjFPFP5WNZoKtPC7DEkxOm6kFA==", "dev": true, - "requires": { - "debug": "^4.3.2" - } + "requires": {} }, "@cypress/request": { "version": "2.88.10", @@ -41734,7 +41729,7 @@ "@overleaf/ranges-tracker": { "version": "file:libraries/ranges-tracker", "requires": { - "mocha": "*" + "mocha": "^10.0.0" }, "dependencies": { "brace-expansion": { @@ -41856,7 +41851,7 @@ "request": "^2.88.2", "sandboxed-module": "~0.3.0", "sinon": "^9.2.4", - "socket.io": "git+ssh://git@github.com/overleaf/socket.io.git#af96d1b68d9918ee0f9cb82c62990395b0a601fb", + "socket.io": "overleaf/socket.io#0.9.19-overleaf-6", "socket.io-client": "overleaf/socket.io-client#0.9.17-overleaf-3", "timekeeper": "0.0.4", "uid-safe": "^2.1.5", @@ -42658,7 +42653,7 @@ "@codemirror/search": "^6.2.1", "@codemirror/state": "^6.1.2", "@codemirror/view": "^6.3.0", - "@cypress/react": "^6.0.0", + "@cypress/react": "^6.2.0", "@juggle/resize-observer": "^3.3.1", "@lezer/common": "^1.0.1", "@lezer/generator": "^1.1.1", @@ -42746,7 +42741,7 @@ "css-loader": "^6.7.1", "css-minimizer-webpack-plugin": "^3.4.1", "csurf": "^1.11.0", - "cypress": "^10.2.0", + "cypress": "^10.9.0", "d3": "^3.5.16", "dateformat": "1.0.4-1.2.3", "daterangepicker": "https://github.com/overleaf/daterangepicker/archive/e496d2d44ca53e208c930e4cb4bcf29bcefa4550.tar.gz", @@ -49192,9 +49187,9 @@ "dev": true }, "cypress": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/cypress/-/cypress-10.2.0.tgz", - "integrity": "sha512-+i9lY5ENlfi2mJwsggzR+XASOIgMd7S/Gd3/13NCpv596n3YSplMAueBTIxNLcxDpTcIksp+9pM3UaDrJDpFqA==", + "version": "10.9.0", + "resolved": "https://registry.npmjs.org/cypress/-/cypress-10.9.0.tgz", + "integrity": "sha512-MjIWrRpc+bQM9U4kSSdATZWZ2hUqHGFEQTF7dfeZRa4MnalMtc88FIE49USWP2ZVtfy5WPBcgfBX+YorFqGElA==", "dev": true, "requires": { "@cypress/request": "^2.88.10", @@ -49216,7 +49211,7 @@ "dayjs": "^1.10.4", "debug": "^4.3.2", "enquirer": "^2.3.6", - "eventemitter2": "^6.4.3", + "eventemitter2": "6.4.7", "execa": "4.1.0", "executable": "^4.1.1", "extract-zip": "2.0.1", @@ -51111,9 +51106,9 @@ "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==" }, "eventemitter2": { - "version": "6.4.5", - "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-6.4.5.tgz", - "integrity": "sha512-bXE7Dyc1i6oQElDG0jMRZJrRAn9QR2xyyFGmBdZleNmyQX0FqGYmhZIrIrpPfm/w//LTo4tVQGOGQcGCb5q9uw==", + "version": "6.4.7", + "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-6.4.7.tgz", + "integrity": "sha512-tYUSVOGeQPKt/eC1ABfhHy5Xd96N3oIijJvN3O9+TsC28T5V9yX9oEfEK5faP0EFSNVOG97qtAS68GBrQB2hDg==", "dev": true }, "eventemitter3": { diff --git a/services/web/docker-compose.yml b/services/web/docker-compose.yml index be9b0295ad..146ad213ac 100644 --- a/services/web/docker-compose.yml +++ b/services/web/docker-compose.yml @@ -76,7 +76,7 @@ services: user: node test_frontend_ct: - image: cypress/included:9.5.2 + image: cypress/included:10.9.0 volumes: - ../../:/overleaf working_dir: /overleaf/services/web diff --git a/services/web/frontend/js/features/project-list/components/new-project-button/new-project-button-modal.tsx b/services/web/frontend/js/features/project-list/components/new-project-button/new-project-button-modal.tsx index 314119ee6b..13089ce15f 100644 --- a/services/web/frontend/js/features/project-list/components/new-project-button/new-project-button-modal.tsx +++ b/services/web/frontend/js/features/project-list/components/new-project-button/new-project-button-modal.tsx @@ -3,6 +3,7 @@ import ExampleProjectModal from './example-project-modal' import UploadProjectModal from './upload-project-modal' import importOverleafModules from '../../../../../macros/import-overleaf-module.macro' import { JSXElementConstructor } from 'react' +import { Nullable } from '../../../../../../types/utils' export type NewProjectButtonModalVariant = | 'blank_project' diff --git a/services/web/frontend/js/features/settings/components/emails/add-email/input.tsx b/services/web/frontend/js/features/settings/components/emails/add-email/input.tsx index e4b145b262..d1852c4cec 100644 --- a/services/web/frontend/js/features/settings/components/emails/add-email/input.tsx +++ b/services/web/frontend/js/features/settings/components/emails/add-email/input.tsx @@ -6,6 +6,7 @@ import { useState, useRef, } from 'react' +import { Nullable } from '../../../../../../../types/utils' import { getJSON } from '../../../../../infrastructure/fetch-json' import useAbortController from '../../../../../shared/hooks/use-abort-controller' import domainBlocklist from '../../../domain-blocklist' diff --git a/services/web/package.json b/services/web/package.json index b233c46825..631b378ee4 100644 --- a/services/web/package.json +++ b/services/web/package.json @@ -227,7 +227,7 @@ }, "devDependencies": { "@babel/register": "^7.14.5", - "@cypress/react": "^6.0.0", + "@cypress/react": "^6.2.0", "@juggle/resize-observer": "^3.3.1", "@lezer/generator": "^1.1.1", "@testing-library/cypress": "^8.0.3", @@ -264,7 +264,7 @@ "copy-webpack-plugin": "^10.2.4", "css-loader": "^6.7.1", "css-minimizer-webpack-plugin": "^3.4.1", - "cypress": "^10.2.0", + "cypress": "^10.9.0", "es6-promise": "^4.2.8", "escodegen": "^2.0.0", "eslint-config-standard-jsx": "^11.0.0-0",