From 8a6c4abeee4de6205f8dfecd7dbe346212fce3d6 Mon Sep 17 00:00:00 2001 From: Cacie Prins Date: Mon, 11 Dec 2023 09:27:22 -0500 Subject: [PATCH 01/67] dependency: upgrades electron from 25 to 26 --- .circleci/workflows.yml | 6 +++--- .github/ISSUE_TEMPLATE/1-bug-report.yml | 2 +- .github/ISSUE_TEMPLATE/2-memory-issue.yml | 2 +- .github/ISSUE_TEMPLATE/3-install-issue.yml | 2 +- .node-version | 2 +- cli/CHANGELOG.md | 10 ++++++++++ docker-compose.yml | 2 +- package.json | 4 ++-- .../package.json | 2 +- system-tests/test-binary/module_api_spec.ts | 2 +- system-tests/test-binary/node_versions_spec.ts | 4 ++-- yarn.lock | 8 ++++---- 12 files changed, 28 insertions(+), 18 deletions(-) diff --git a/.circleci/workflows.yml b/.circleci/workflows.yml index 00adf40f7230..71cf9a62eb7d 100644 --- a/.circleci/workflows.yml +++ b/.circleci/workflows.yml @@ -94,7 +94,7 @@ executors: # the Docker image with Cypress dependencies and Chrome browser cy-doc: docker: - - image: cypress/browsers-internal:node18.15.0-chrome114-ff115 + - image: cypress/browsers-internal:node18.16.0-chrome114-ff115 # by default, we use "medium" to balance performance + CI costs. bump or reduce on a per-job basis if needed. resource_class: medium environment: @@ -104,7 +104,7 @@ executors: # Docker image with non-root "node" user non-root-docker-user: docker: - - image: cypress/browsers-internal:node18.15.0-chrome114-ff115 + - image: cypress/browsers-internal:node18.16.0-chrome114-ff115 user: node environment: PLATFORM: linux @@ -2349,7 +2349,7 @@ jobs: <<: *defaults resource_class: small docker: - - image: cypress/base-internal:18.15.0 + - image: cypress/base-internal:18.16.0 steps: - maybe_skip_binary_jobs - restore_workspace_binaries diff --git a/.github/ISSUE_TEMPLATE/1-bug-report.yml b/.github/ISSUE_TEMPLATE/1-bug-report.yml index 20a8945f0063..f855fb093946 100644 --- a/.github/ISSUE_TEMPLATE/1-bug-report.yml +++ b/.github/ISSUE_TEMPLATE/1-bug-report.yml @@ -43,7 +43,7 @@ body: attributes: label: Node version description: What version of node.js are you using to run Cypress? - placeholder: ex. v18.15.0 + placeholder: ex. v18.16.0 validations: required: true - type: input diff --git a/.github/ISSUE_TEMPLATE/2-memory-issue.yml b/.github/ISSUE_TEMPLATE/2-memory-issue.yml index b827f20ea293..7cafde055540 100644 --- a/.github/ISSUE_TEMPLATE/2-memory-issue.yml +++ b/.github/ISSUE_TEMPLATE/2-memory-issue.yml @@ -51,7 +51,7 @@ body: attributes: label: Node version description: What version of node.js are you using to run Cypress? - placeholder: ex. v18.15.0 + placeholder: ex. v18.16.0 validations: required: true - type: input diff --git a/.github/ISSUE_TEMPLATE/3-install-issue.yml b/.github/ISSUE_TEMPLATE/3-install-issue.yml index bc373cdfdac2..3e43de39e0d1 100644 --- a/.github/ISSUE_TEMPLATE/3-install-issue.yml +++ b/.github/ISSUE_TEMPLATE/3-install-issue.yml @@ -38,7 +38,7 @@ body: attributes: label: Node version description: What version of node.js are you using to run Cypress? - placeholder: ex. v18.15.0 + placeholder: ex. v18.16.0 validations: required: true - type: dropdown diff --git a/.node-version b/.node-version index 55bffd620b9a..6d80269a4f04 100644 --- a/.node-version +++ b/.node-version @@ -1 +1 @@ -18.15.0 +18.16.0 diff --git a/cli/CHANGELOG.md b/cli/CHANGELOG.md index 177c29e32d74..2ea74c6aaf23 100644 --- a/cli/CHANGELOG.md +++ b/cli/CHANGELOG.md @@ -1,4 +1,14 @@ +## 13.7.1 + +_Released 12/29/2023 (PENDING)_ + +**Misc:** + +- Upgraded `electron` from `25.8.4` to `26.6.2` +- Upgraded bundled Node.js version from `18.15.0` to `18.16.0` +- Upraded bundled Chromium version from `114.0.5735.289` to `116.0.5845.228` + ## 13.6.1 _Released 12/5/2023_ diff --git a/docker-compose.yml b/docker-compose.yml index 5b93acdd1ce0..213e346695db 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -33,7 +33,7 @@ services: - .:/opt/cypress ci: # This should mirror the image used in workflows.yml - image: cypress/browsers-internal:node18.15.0-chrome114-ff115 + image: cypress/browsers-internal:node18.16.0-chrome116-ff115 ports: - 5566:5566 - 5567:5567 diff --git a/package.json b/package.json index b886660e1576..9bcf54e5f1a8 100644 --- a/package.json +++ b/package.json @@ -145,7 +145,7 @@ "dedent": "^0.7.0", "del": "3.0.0", "detect-port": "^1.3.0", - "electron": "25.8.4", + "electron": "26.6.2", "electron-builder": "^23.6.0", "enzyme-adapter-react-16": "1.12.1", "eslint": "7.22.0", @@ -212,7 +212,7 @@ "yarn-deduplicate": "3.1.0" }, "engines": { - "node": ">=18.15.0", + "node": ">=18.16.0", "yarn": ">=1.17.3" }, "productName": "Cypress", diff --git a/system-tests/projects/webpack-preprocessor-awesome-typescript-loader/package.json b/system-tests/projects/webpack-preprocessor-awesome-typescript-loader/package.json index 4157c1e934d5..f43477ed5b44 100644 --- a/system-tests/projects/webpack-preprocessor-awesome-typescript-loader/package.json +++ b/system-tests/projects/webpack-preprocessor-awesome-typescript-loader/package.json @@ -5,7 +5,7 @@ "@babel/core": "7.9.0", "@babel/preset-env": "7.9.0", "@cypress/webpack-preprocessor": "file:../../../npm/webpack-preprocessor", - "@types/node": "^12.11.1", + "@types/node": "^18.16.0", "awesome-typescript-loader": "5.2.1", "babel-loader": "8.3.0", "cypress": "file:../../../cli/build", diff --git a/system-tests/test-binary/module_api_spec.ts b/system-tests/test-binary/module_api_spec.ts index a49709e7048f..4a2360f9a589 100644 --- a/system-tests/test-binary/module_api_spec.ts +++ b/system-tests/test-binary/module_api_spec.ts @@ -3,7 +3,7 @@ import systemTests from '../lib/system-tests' describe('module API', () => { systemTests.it('can run module API Mocha spec', { timeout: 240000, - dockerImage: 'cypress/base-internal:18.15.0', + dockerImage: 'cypress/base-internal:18.16.0', withBinary: true, project: 'module-api', browser: 'electron', diff --git a/system-tests/test-binary/node_versions_spec.ts b/system-tests/test-binary/node_versions_spec.ts index 6d2dc775db8e..3f6674c28ea4 100644 --- a/system-tests/test-binary/node_versions_spec.ts +++ b/system-tests/test-binary/node_versions_spec.ts @@ -26,14 +26,14 @@ function smokeTestDockerImage (dockerImage: string) { describe('binary node versions', () => { [ - 'cypress/base:18.15.0', + 'cypress/base:18.16.0', 'cypress/base:20.5.0', ].forEach(smokeTestDockerImage) }) describe('type: module', () => { [ - 'cypress/base:18.6.0', + 'cypress/base:18.16.0', 'cypress/base:20.5.0', ].forEach((dockerImage) => { systemTests.it(`can run in ${dockerImage}`, { diff --git a/yarn.lock b/yarn.lock index 47dc3fc521cd..cb6402d89e70 100644 --- a/yarn.lock +++ b/yarn.lock @@ -13346,10 +13346,10 @@ electron-to-chromium@^1.4.477: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.480.tgz#40e32849ca50bc23ce29c1516c5adb3fddac919d" integrity sha512-IXTgg+bITkQv/FLP9FjX6f9KFCs5hQWeh5uNSKxB9mqYj/JXhHDbu+ekS43LVvbkL3eW6/oZy4+r9Om6lan1Uw== -electron@25.8.4: - version "25.8.4" - resolved "https://registry.yarnpkg.com/electron/-/electron-25.8.4.tgz#b50877aac7d96323920437baf309ad86382cb455" - integrity sha512-hUYS3RGdaa6E1UWnzeGnsdsBYOggwMMg4WGxNGvAoWtmRrr6J1BsjFW/yRq4WsJHJce2HdzQXtz4OGXV6yUCLg== +electron@26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/electron/-/electron-26.6.2.tgz#92ca61b4a238cf2b254fa75e8ce65af1b5d17050" + integrity sha512-OWxzVtCJwN9en34bnLupw2dTRsDTBzQZyz0Wx0zjeJ2wgUVlpqavtVDpt50aaJpJR/5GcHH/apIa3uvGWz/ABQ== dependencies: "@electron/get" "^2.0.0" "@types/node" "^18.11.18" From a89659cd06787a70b37af4da8e595b1bde99439a Mon Sep 17 00:00:00 2001 From: Cacie Prins Date: Mon, 11 Dec 2023 09:28:09 -0500 Subject: [PATCH 02/67] bump cache run ci --- .circleci/cache-version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/cache-version.txt b/.circleci/cache-version.txt index ebdaf186f482..74e3097e243c 100644 --- a/.circleci/cache-version.txt +++ b/.circleci/cache-version.txt @@ -1,3 +1,3 @@ # Bump this version to force CI to re-create the cache from scratch. -11-20-23 +12-11-23 From 139487bc24477adeba469b85e66dad505f0a6e44 Mon Sep 17 00:00:00 2001 From: Cacie Prins Date: Mon, 11 Dec 2023 09:37:22 -0500 Subject: [PATCH 03/67] fix docker img names --- .circleci/workflows.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/workflows.yml b/.circleci/workflows.yml index 71cf9a62eb7d..9cf9022d9145 100644 --- a/.circleci/workflows.yml +++ b/.circleci/workflows.yml @@ -94,7 +94,7 @@ executors: # the Docker image with Cypress dependencies and Chrome browser cy-doc: docker: - - image: cypress/browsers-internal:node18.16.0-chrome114-ff115 + - image: cypress/browsers-internal:node18.16.0-chrome116-ff115 # by default, we use "medium" to balance performance + CI costs. bump or reduce on a per-job basis if needed. resource_class: medium environment: @@ -104,7 +104,7 @@ executors: # Docker image with non-root "node" user non-root-docker-user: docker: - - image: cypress/browsers-internal:node18.16.0-chrome114-ff115 + - image: cypress/browsers-internal:node18.16.0-chrome116-ff115 user: node environment: PLATFORM: linux From f3229ed77522c5f2fb9805ec4c5c3e39a703f8be Mon Sep 17 00:00:00 2001 From: Cacie Prins Date: Mon, 11 Dec 2023 11:49:23 -0500 Subject: [PATCH 04/67] ref electron upgrade branch --- scripts/binary/trigger-publish-binary-pipeline.js | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/binary/trigger-publish-binary-pipeline.js b/scripts/binary/trigger-publish-binary-pipeline.js index a57cfa801d6b..b7486db9ae07 100644 --- a/scripts/binary/trigger-publish-binary-pipeline.js +++ b/scripts/binary/trigger-publish-binary-pipeline.js @@ -10,6 +10,7 @@ const { getNextVersionForBinary } = require('../get-next-version') const { nextVersion } = await getNextVersionForBinary() const body = JSON.stringify({ + branch: 'cacie/upgrade-electron-26', parameters: { temp_dir: os.tmpdir(), sha: process.env.CIRCLE_SHA1, From 3a453b0817c981fd66793424ebe82838394e49b7 Mon Sep 17 00:00:00 2001 From: "cypress-bot[bot]" <+cypress-bot[bot]@users.noreply.github.com> Date: Mon, 11 Dec 2023 19:35:52 +0000 Subject: [PATCH 05/67] chore: updating v8 snapshot cache --- .../cache/linux/snapshot-meta.json | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/tooling/v8-snapshot/cache/linux/snapshot-meta.json b/tooling/v8-snapshot/cache/linux/snapshot-meta.json index fc5b2e57a7c7..de2b88a9182d 100644 --- a/tooling/v8-snapshot/cache/linux/snapshot-meta.json +++ b/tooling/v8-snapshot/cache/linux/snapshot-meta.json @@ -255,6 +255,7 @@ "./node_modules/cp-file/fs.js", "./node_modules/cp-file/node_modules/semver/semver.js", "./node_modules/cp-file/progress-emitter.js", + "./node_modules/cross-fetch/node_modules/node-fetch/lib/index.js", "./node_modules/cross-spawn-async/lib/parse.js", "./node_modules/cross-spawn-async/lib/resolveCommand.js", "./node_modules/debug/src/browser.js", @@ -417,7 +418,6 @@ "./node_modules/nexus/dist/typegenMetadata.js", "./node_modules/nexus/dist/typegenUtils.js", "./node_modules/nexus/dist/utils.js", - "./node_modules/node-fetch/lib/index.js", "./node_modules/node-forge/lib/aes.js", "./node_modules/node-forge/lib/aesCipherSuites.js", "./node_modules/node-forge/lib/asn1-validator.js", @@ -608,6 +608,13 @@ "./node_modules/uuid/dist/v4.js", "./node_modules/uuid/dist/v5.js", "./node_modules/verror/lib/verror.js", + "./node_modules/ws/index.js", + "./node_modules/ws/lib/buffer-util.js", + "./node_modules/ws/lib/constants.js", + "./node_modules/ws/lib/receiver.js", + "./node_modules/ws/lib/validation.js", + "./node_modules/ws/lib/websocket-server.js", + "./node_modules/ws/lib/websocket.js", "./node_modules/xdg-trashdir/node_modules/xdg-basedir/index.js", "./node_modules/xml2js/lib/xml2js.js", "./packages/config/index.js", @@ -695,13 +702,6 @@ "./packages/graphql/node_modules/debug/src/browser.js", "./packages/graphql/node_modules/debug/src/index.js", "./packages/graphql/node_modules/supports-color/index.js", - "./packages/graphql/node_modules/ws/index.js", - "./packages/graphql/node_modules/ws/lib/buffer-util.js", - "./packages/graphql/node_modules/ws/lib/constants.js", - "./packages/graphql/node_modules/ws/lib/receiver.js", - "./packages/graphql/node_modules/ws/lib/validation.js", - "./packages/graphql/node_modules/ws/lib/websocket-server.js", - "./packages/graphql/node_modules/ws/lib/websocket.js", "./packages/graphql/src/makeGraphQLServer.ts", "./packages/graphql/src/schemaTypes/index.ts", "./packages/graphql/src/schemaTypes/objectTypes/gql-CurrentProject.ts", @@ -2733,7 +2733,6 @@ "./node_modules/prettier/parser-yaml.js", "./node_modules/pretty-bytes/index.js", "./node_modules/proxy-addr/index.js", - "./node_modules/proxy-from-env/index.js", "./node_modules/pseudomap/pseudomap.js", "./node_modules/psl/data/rules.json", "./node_modules/psl/index.js", @@ -3520,6 +3519,13 @@ "./node_modules/win-version-info/index.js", "./node_modules/wonka/dist/wonka.js", "./node_modules/wrappy/wrappy.js", + "./node_modules/ws/lib/event-target.js", + "./node_modules/ws/lib/extension.js", + "./node_modules/ws/lib/limiter.js", + "./node_modules/ws/lib/permessage-deflate.js", + "./node_modules/ws/lib/sender.js", + "./node_modules/ws/lib/stream.js", + "./node_modules/ws/lib/subprotocol.js", "./node_modules/xdg-trashdir/index.js", "./node_modules/xml/lib/escapeForXML.js", "./node_modules/xml/lib/xml.js", @@ -3864,13 +3870,6 @@ "./packages/graphql/node_modules/debug/node_modules/ms/index.js", "./packages/graphql/node_modules/debug/src/common.js", "./packages/graphql/node_modules/has-flag/index.js", - "./packages/graphql/node_modules/ws/lib/event-target.js", - "./packages/graphql/node_modules/ws/lib/extension.js", - "./packages/graphql/node_modules/ws/lib/limiter.js", - "./packages/graphql/node_modules/ws/lib/permessage-deflate.js", - "./packages/graphql/node_modules/ws/lib/sender.js", - "./packages/graphql/node_modules/ws/lib/stream.js", - "./packages/graphql/node_modules/ws/lib/subprotocol.js", "./packages/graphql/src/index.ts", "./packages/graphql/src/plugins/index.ts", "./packages/graphql/src/plugins/nexusDebugFieldPlugin.ts", @@ -3979,6 +3978,7 @@ "./packages/network/lib/index.ts", "./packages/network/lib/uri.ts", "./packages/network/node_modules/brace-expansion/index.js", + "./packages/network/node_modules/proxy-from-env/index.js", "./packages/proxy/lib/http/error-middleware.ts", "./packages/proxy/lib/http/util/ast-rewriter.ts", "./packages/proxy/lib/http/util/buffers.ts", @@ -4314,5 +4314,5 @@ "./tooling/v8-snapshot/cache/linux/snapshot-entry.js" ], "deferredHashFile": "yarn.lock", - "deferredHash": "3f7b87e8ca0a95995d9bed5a009858607b348bdeba192e57816ab93de2d71938" + "deferredHash": "24d3e5395e37a4b8b10571d92d109d0d49ce15a7a445a2507267283ab5153765" } \ No newline at end of file From 032a165e98c3fbb1244b3c490584a53d0777b85a Mon Sep 17 00:00:00 2001 From: "cypress-bot[bot]" <+cypress-bot[bot]@users.noreply.github.com> Date: Mon, 11 Dec 2023 21:28:36 +0000 Subject: [PATCH 06/67] chore: updating v8 snapshot cache --- .../cache/darwin/snapshot-meta.json | 38 +++++++++---------- 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/tooling/v8-snapshot/cache/darwin/snapshot-meta.json b/tooling/v8-snapshot/cache/darwin/snapshot-meta.json index be9fc2e54021..446c8c10c286 100644 --- a/tooling/v8-snapshot/cache/darwin/snapshot-meta.json +++ b/tooling/v8-snapshot/cache/darwin/snapshot-meta.json @@ -255,6 +255,7 @@ "./node_modules/cp-file/fs.js", "./node_modules/cp-file/node_modules/semver/semver.js", "./node_modules/cp-file/progress-emitter.js", + "./node_modules/cross-fetch/node_modules/node-fetch/lib/index.js", "./node_modules/cross-spawn-async/lib/parse.js", "./node_modules/cross-spawn-async/lib/resolveCommand.js", "./node_modules/debug/src/browser.js", @@ -418,7 +419,6 @@ "./node_modules/nexus/dist/typegenMetadata.js", "./node_modules/nexus/dist/typegenUtils.js", "./node_modules/nexus/dist/utils.js", - "./node_modules/node-fetch/lib/index.js", "./node_modules/node-forge/lib/aes.js", "./node_modules/node-forge/lib/aesCipherSuites.js", "./node_modules/node-forge/lib/asn1-validator.js", @@ -609,6 +609,13 @@ "./node_modules/uuid/dist/v4.js", "./node_modules/uuid/dist/v5.js", "./node_modules/verror/lib/verror.js", + "./node_modules/ws/index.js", + "./node_modules/ws/lib/buffer-util.js", + "./node_modules/ws/lib/constants.js", + "./node_modules/ws/lib/receiver.js", + "./node_modules/ws/lib/validation.js", + "./node_modules/ws/lib/websocket-server.js", + "./node_modules/ws/lib/websocket.js", "./node_modules/xdg-trashdir/node_modules/xdg-basedir/index.js", "./node_modules/xml2js/lib/xml2js.js", "./packages/config/index.js", @@ -696,13 +703,6 @@ "./packages/graphql/node_modules/debug/src/browser.js", "./packages/graphql/node_modules/debug/src/index.js", "./packages/graphql/node_modules/supports-color/index.js", - "./packages/graphql/node_modules/ws/index.js", - "./packages/graphql/node_modules/ws/lib/buffer-util.js", - "./packages/graphql/node_modules/ws/lib/constants.js", - "./packages/graphql/node_modules/ws/lib/receiver.js", - "./packages/graphql/node_modules/ws/lib/validation.js", - "./packages/graphql/node_modules/ws/lib/websocket-server.js", - "./packages/graphql/node_modules/ws/lib/websocket.js", "./packages/graphql/src/makeGraphQLServer.ts", "./packages/graphql/src/schemaTypes/index.ts", "./packages/graphql/src/schemaTypes/objectTypes/gql-CurrentProject.ts", @@ -1063,8 +1063,6 @@ "./node_modules/@cypress/commit-info/src/index.js", "./node_modules/@cypress/commit-info/src/utils.js", "./node_modules/@cypress/get-windows-proxy/node_modules/debug/src/common.js", - "./node_modules/@cypress/get-windows-proxy/node_modules/registry-js/dist/lib/index.js", - "./node_modules/@cypress/get-windows-proxy/node_modules/registry-js/dist/lib/registry.js", "./node_modules/@cypress/get-windows-proxy/src/index.js", "./node_modules/@cypress/parse-domain/build/tries/icann.complete.json", "./node_modules/@cypress/parse-domain/build/tries/private.complete.json", @@ -2734,7 +2732,6 @@ "./node_modules/prettier/parser-yaml.js", "./node_modules/pretty-bytes/index.js", "./node_modules/proxy-addr/index.js", - "./node_modules/proxy-from-env/index.js", "./node_modules/pseudomap/pseudomap.js", "./node_modules/psl/data/rules.json", "./node_modules/psl/index.js", @@ -3182,8 +3179,6 @@ "./node_modules/recast/parsers/babel.js", "./node_modules/recast/parsers/esprima.js", "./node_modules/recast/parsers/typescript.js", - "./node_modules/registry-js/dist/lib/index.js", - "./node_modules/registry-js/dist/lib/registry.js", "./node_modules/request-promise-core/configure/request2.js", "./node_modules/request-promise-core/errors.js", "./node_modules/request-promise-core/lib/errors.js", @@ -3521,6 +3516,13 @@ "./node_modules/win-version-info/index.js", "./node_modules/wonka/dist/wonka.js", "./node_modules/wrappy/wrappy.js", + "./node_modules/ws/lib/event-target.js", + "./node_modules/ws/lib/extension.js", + "./node_modules/ws/lib/limiter.js", + "./node_modules/ws/lib/permessage-deflate.js", + "./node_modules/ws/lib/sender.js", + "./node_modules/ws/lib/stream.js", + "./node_modules/ws/lib/subprotocol.js", "./node_modules/xdg-trashdir/index.js", "./node_modules/xml/lib/escapeForXML.js", "./node_modules/xml/lib/xml.js", @@ -3865,13 +3867,6 @@ "./packages/graphql/node_modules/debug/node_modules/ms/index.js", "./packages/graphql/node_modules/debug/src/common.js", "./packages/graphql/node_modules/has-flag/index.js", - "./packages/graphql/node_modules/ws/lib/event-target.js", - "./packages/graphql/node_modules/ws/lib/extension.js", - "./packages/graphql/node_modules/ws/lib/limiter.js", - "./packages/graphql/node_modules/ws/lib/permessage-deflate.js", - "./packages/graphql/node_modules/ws/lib/sender.js", - "./packages/graphql/node_modules/ws/lib/stream.js", - "./packages/graphql/node_modules/ws/lib/subprotocol.js", "./packages/graphql/src/index.ts", "./packages/graphql/src/plugins/index.ts", "./packages/graphql/src/plugins/nexusDebugFieldPlugin.ts", @@ -3980,6 +3975,7 @@ "./packages/network/lib/index.ts", "./packages/network/lib/uri.ts", "./packages/network/node_modules/brace-expansion/index.js", + "./packages/network/node_modules/proxy-from-env/index.js", "./packages/proxy/lib/http/error-middleware.ts", "./packages/proxy/lib/http/util/ast-rewriter.ts", "./packages/proxy/lib/http/util/buffers.ts", @@ -4315,5 +4311,5 @@ "./tooling/v8-snapshot/cache/darwin/snapshot-entry.js" ], "deferredHashFile": "yarn.lock", - "deferredHash": "3f7b87e8ca0a95995d9bed5a009858607b348bdeba192e57816ab93de2d71938" + "deferredHash": "24d3e5395e37a4b8b10571d92d109d0d49ce15a7a445a2507267283ab5153765" } \ No newline at end of file From 185cf8604cbb81a32c840ff5e283088a0bf24339 Mon Sep 17 00:00:00 2001 From: "cypress-bot[bot]" <+cypress-bot[bot]@users.noreply.github.com> Date: Mon, 11 Dec 2023 22:58:24 +0000 Subject: [PATCH 07/67] chore: updating v8 snapshot cache --- .../cache/win32/snapshot-meta.json | 36 +++++++++---------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/tooling/v8-snapshot/cache/win32/snapshot-meta.json b/tooling/v8-snapshot/cache/win32/snapshot-meta.json index 9e4365354a21..9249fb431e15 100644 --- a/tooling/v8-snapshot/cache/win32/snapshot-meta.json +++ b/tooling/v8-snapshot/cache/win32/snapshot-meta.json @@ -178,8 +178,6 @@ "./node_modules/@cypress/commit-info/node_modules/semver/semver.js", "./node_modules/@cypress/get-windows-proxy/node_modules/debug/src/browser.js", "./node_modules/@cypress/get-windows-proxy/node_modules/debug/src/index.js", - "./node_modules/@cypress/get-windows-proxy/node_modules/registry-js/dist/lib/index.js", - "./node_modules/@cypress/get-windows-proxy/node_modules/registry-js/dist/lib/registry.js", "./node_modules/@cypress/request-promise/lib/rp.js", "./node_modules/@cypress/request/index.js", "./node_modules/@cypress/request/lib/helpers.js", @@ -257,6 +255,7 @@ "./node_modules/cp-file/fs.js", "./node_modules/cp-file/node_modules/semver/semver.js", "./node_modules/cp-file/progress-emitter.js", + "./node_modules/cross-fetch/node_modules/node-fetch/lib/index.js", "./node_modules/cross-spawn-async/lib/parse.js", "./node_modules/cross-spawn-async/lib/resolveCommand.js", "./node_modules/debug/src/browser.js", @@ -419,7 +418,6 @@ "./node_modules/nexus/dist/typegenMetadata.js", "./node_modules/nexus/dist/typegenUtils.js", "./node_modules/nexus/dist/utils.js", - "./node_modules/node-fetch/lib/index.js", "./node_modules/node-forge/lib/aes.js", "./node_modules/node-forge/lib/aesCipherSuites.js", "./node_modules/node-forge/lib/asn1-validator.js", @@ -613,6 +611,13 @@ "./node_modules/uuid/dist/v5.js", "./node_modules/verror/lib/verror.js", "./node_modules/win-version-info/index.js", + "./node_modules/ws/index.js", + "./node_modules/ws/lib/buffer-util.js", + "./node_modules/ws/lib/constants.js", + "./node_modules/ws/lib/receiver.js", + "./node_modules/ws/lib/validation.js", + "./node_modules/ws/lib/websocket-server.js", + "./node_modules/ws/lib/websocket.js", "./node_modules/xdg-trashdir/node_modules/xdg-basedir/index.js", "./node_modules/xml2js/lib/xml2js.js", "./packages/config/index.js", @@ -700,13 +705,6 @@ "./packages/graphql/node_modules/debug/src/browser.js", "./packages/graphql/node_modules/debug/src/index.js", "./packages/graphql/node_modules/supports-color/index.js", - "./packages/graphql/node_modules/ws/index.js", - "./packages/graphql/node_modules/ws/lib/buffer-util.js", - "./packages/graphql/node_modules/ws/lib/constants.js", - "./packages/graphql/node_modules/ws/lib/receiver.js", - "./packages/graphql/node_modules/ws/lib/validation.js", - "./packages/graphql/node_modules/ws/lib/websocket-server.js", - "./packages/graphql/node_modules/ws/lib/websocket.js", "./packages/graphql/src/makeGraphQLServer.ts", "./packages/graphql/src/schemaTypes/index.ts", "./packages/graphql/src/schemaTypes/objectTypes/gql-CurrentProject.ts", @@ -2737,7 +2735,6 @@ "./node_modules/prettier/parser-yaml.js", "./node_modules/pretty-bytes/index.js", "./node_modules/proxy-addr/index.js", - "./node_modules/proxy-from-env/index.js", "./node_modules/pseudomap/pseudomap.js", "./node_modules/psl/data/rules.json", "./node_modules/psl/index.js", @@ -3520,6 +3517,13 @@ "./node_modules/widest-line/index.js", "./node_modules/wonka/dist/wonka.js", "./node_modules/wrappy/wrappy.js", + "./node_modules/ws/lib/event-target.js", + "./node_modules/ws/lib/extension.js", + "./node_modules/ws/lib/limiter.js", + "./node_modules/ws/lib/permessage-deflate.js", + "./node_modules/ws/lib/sender.js", + "./node_modules/ws/lib/stream.js", + "./node_modules/ws/lib/subprotocol.js", "./node_modules/xdg-trashdir/index.js", "./node_modules/xml/lib/escapeForXML.js", "./node_modules/xml/lib/xml.js", @@ -3864,13 +3868,6 @@ "./packages/graphql/node_modules/debug/node_modules/ms/index.js", "./packages/graphql/node_modules/debug/src/common.js", "./packages/graphql/node_modules/has-flag/index.js", - "./packages/graphql/node_modules/ws/lib/event-target.js", - "./packages/graphql/node_modules/ws/lib/extension.js", - "./packages/graphql/node_modules/ws/lib/limiter.js", - "./packages/graphql/node_modules/ws/lib/permessage-deflate.js", - "./packages/graphql/node_modules/ws/lib/sender.js", - "./packages/graphql/node_modules/ws/lib/stream.js", - "./packages/graphql/node_modules/ws/lib/subprotocol.js", "./packages/graphql/src/index.ts", "./packages/graphql/src/plugins/index.ts", "./packages/graphql/src/plugins/nexusDebugFieldPlugin.ts", @@ -3979,6 +3976,7 @@ "./packages/network/lib/index.ts", "./packages/network/lib/uri.ts", "./packages/network/node_modules/brace-expansion/index.js", + "./packages/network/node_modules/proxy-from-env/index.js", "./packages/proxy/lib/http/error-middleware.ts", "./packages/proxy/lib/http/util/ast-rewriter.ts", "./packages/proxy/lib/http/util/buffers.ts", @@ -4314,5 +4312,5 @@ "./tooling/v8-snapshot/cache/win32/snapshot-entry.js" ], "deferredHashFile": "yarn.lock", - "deferredHash": "427ddaad1d13eb1411542f629fb751ec0f6beb721c7fc9ce9a88a27d31c52e59" + "deferredHash": "d563023bd4e6824ba28b67c1e331a84c6162d2d6eb454349790ac0eb3c15a0ef" } \ No newline at end of file From 45a220e9cf7320a3f91bd8313b75959c0a8fc15b Mon Sep 17 00:00:00 2001 From: Cacie Prins Date: Tue, 12 Dec 2023 10:19:14 -0500 Subject: [PATCH 08/67] debug --- packages/server/lib/cloud/protocol.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/server/lib/cloud/protocol.ts b/packages/server/lib/cloud/protocol.ts index 79acbbedee92..75321267bc42 100644 --- a/packages/server/lib/cloud/protocol.ts +++ b/packages/server/lib/cloud/protocol.ts @@ -166,7 +166,7 @@ export class ProtocolManager implements ProtocolManagerShape { const dbPath = path.join(cypressProtocolDirectory, `${spec.instanceId}.db`) debug('connecting to database at %s', dbPath) - + debug('loading native binding from', path.join(require.resolve('better-sqlite3/build/Release/better_sqlite3.node'))) const db = Database(dbPath, { nativeBinding: path.join(require.resolve('better-sqlite3/build/Release/better_sqlite3.node')), verbose: debugVerbose, From c1fcdb12c4c8665a86b8d15c07ad1b5ec8fe51f7 Mon Sep 17 00:00:00 2001 From: Cacie Prins Date: Tue, 12 Dec 2023 11:28:02 -0500 Subject: [PATCH 09/67] debug --- packages/server/lib/cloud/protocol.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/server/lib/cloud/protocol.ts b/packages/server/lib/cloud/protocol.ts index 75321267bc42..2e237cf456ea 100644 --- a/packages/server/lib/cloud/protocol.ts +++ b/packages/server/lib/cloud/protocol.ts @@ -166,7 +166,7 @@ export class ProtocolManager implements ProtocolManagerShape { const dbPath = path.join(cypressProtocolDirectory, `${spec.instanceId}.db`) debug('connecting to database at %s', dbPath) - debug('loading native binding from', path.join(require.resolve('better-sqlite3/build/Release/better_sqlite3.node'))) + debug('loading native binding from', require.resolve('better-sqlite3'), path.join(require.resolve('better-sqlite3/build/Release/better_sqlite3.node'))) const db = Database(dbPath, { nativeBinding: path.join(require.resolve('better-sqlite3/build/Release/better_sqlite3.node')), verbose: debugVerbose, From 509e499c0541aa4ac61f94f63817e9ff53ccdaab Mon Sep 17 00:00:00 2001 From: Cacie Prins Date: Tue, 12 Dec 2023 11:33:46 -0500 Subject: [PATCH 10/67] debug --- packages/server/lib/cloud/protocol.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/server/lib/cloud/protocol.ts b/packages/server/lib/cloud/protocol.ts index 2e237cf456ea..1a5e8e95c392 100644 --- a/packages/server/lib/cloud/protocol.ts +++ b/packages/server/lib/cloud/protocol.ts @@ -166,7 +166,8 @@ export class ProtocolManager implements ProtocolManagerShape { const dbPath = path.join(cypressProtocolDirectory, `${spec.instanceId}.db`) debug('connecting to database at %s', dbPath) - debug('loading native binding from', require.resolve('better-sqlite3'), path.join(require.resolve('better-sqlite3/build/Release/better_sqlite3.node'))) + debug('better-sqlite3 location', require.resolve('better-sqlite3')) + debug('loading native binding from', path.join(require.resolve('better-sqlite3/build/Release/better_sqlite3.node'))) const db = Database(dbPath, { nativeBinding: path.join(require.resolve('better-sqlite3/build/Release/better_sqlite3.node')), verbose: debugVerbose, From 7912db25c5e216a506b480dc07ae11b81a902729 Mon Sep 17 00:00:00 2001 From: Cacie Prins Date: Tue, 12 Dec 2023 12:55:20 -0500 Subject: [PATCH 11/67] update search string for resize observer error swallow --- packages/app/cypress/component/support/index.ts | 2 +- packages/frontend-shared/cypress/support/component.ts | 2 +- packages/frontend-shared/cypress/support/e2e.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/app/cypress/component/support/index.ts b/packages/app/cypress/component/support/index.ts index 89c94cc5592a..1ae1f0d8d0cb 100644 --- a/packages/app/cypress/component/support/index.ts +++ b/packages/app/cypress/component/support/index.ts @@ -49,5 +49,5 @@ registerMountFn({ plugins: [() => createRouter(), () => pinia] }) installCustomPercyCommand() -Cypress.on('uncaught:exception', (err) => !err.message.includes('ResizeObserver loop limit exceeded')) +Cypress.on('uncaught:exception', (err) => !err.message.includes('ResizeObserver loop completed with undelivered notifications.')) Cypress.Commands.add('tabUntil', tabUntil) diff --git a/packages/frontend-shared/cypress/support/component.ts b/packages/frontend-shared/cypress/support/component.ts index 425304429c60..0f802fec8231 100644 --- a/packages/frontend-shared/cypress/support/component.ts +++ b/packages/frontend-shared/cypress/support/component.ts @@ -82,7 +82,7 @@ function validateWithinViewport (subject: JQuery): Cypress.Chainabl Cypress.Commands.add('validateWithinViewport', { prevSubject: true }, validateWithinViewport) -Cypress.on('uncaught:exception', (err) => !err.message.includes('ResizeObserver loop limit exceeded')) +Cypress.on('uncaught:exception', (err) => !err.message.includes('ResizeObserver loop completed with undelivered notifications.')) registerMountFn() addVueCommand() diff --git a/packages/frontend-shared/cypress/support/e2e.ts b/packages/frontend-shared/cypress/support/e2e.ts index 5e8a3031ec51..024cc71fd1b5 100644 --- a/packages/frontend-shared/cypress/support/e2e.ts +++ b/packages/frontend-shared/cypress/support/e2e.ts @@ -536,7 +536,7 @@ function getAutIframe () { return cy.get('iframe.aut-iframe').its('0.contentDocument.documentElement').then(cy.wrap) as Cypress.Chainable> } -Cypress.on('uncaught:exception', (err) => !err.message.includes('ResizeObserver loop limit exceeded')) +Cypress.on('uncaught:exception', (err) => !err.message.includes('ResizeObserver loop completed with undelivered notifications.')) Cypress.Commands.add('scaffoldProject', scaffoldProject) From f875b0a0a410e69bf38db1c0609419fb3b2a0776 Mon Sep 17 00:00:00 2001 From: Cacie Prins Date: Tue, 12 Dec 2023 13:27:31 -0500 Subject: [PATCH 12/67] debug --- packages/server/lib/cloud/protocol.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/server/lib/cloud/protocol.ts b/packages/server/lib/cloud/protocol.ts index 1a5e8e95c392..119050e1320b 100644 --- a/packages/server/lib/cloud/protocol.ts +++ b/packages/server/lib/cloud/protocol.ts @@ -167,9 +167,9 @@ export class ProtocolManager implements ProtocolManagerShape { debug('connecting to database at %s', dbPath) debug('better-sqlite3 location', require.resolve('better-sqlite3')) - debug('loading native binding from', path.join(require.resolve('better-sqlite3/build/Release/better_sqlite3.node'))) + debug('loading native binding from', path.resolve(path.join(require.resolve('better-sqlite3/build/Release/better_sqlite3.node')))) const db = Database(dbPath, { - nativeBinding: path.join(require.resolve('better-sqlite3/build/Release/better_sqlite3.node')), + nativeBinding: 'better-sqlite3/build/Release/better_sqlite3.node', verbose: debugVerbose, }) From b1c1d523ef3c2a45f251cb77d9c445d684ffb40e Mon Sep 17 00:00:00 2001 From: Cacie Prins Date: Tue, 12 Dec 2023 14:59:38 -0500 Subject: [PATCH 13/67] update integrity check --- scripts/binary/binary-integrity-check-source.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/binary/binary-integrity-check-source.js b/scripts/binary/binary-integrity-check-source.js index 4f5e47b8bc6a..b634a62d2d21 100644 --- a/scripts/binary/binary-integrity-check-source.js +++ b/scripts/binary/binary-integrity-check-source.js @@ -94,7 +94,7 @@ function validateElectron (electron) { function validateFs (fs) { // Hard coded function as this is electron code and there's not an easy way to get the function string at package time. If this fails on an updated version of electron, we'll need to update this. - if (originalToString.call(fs.readFileSync) !== `function(e,s){const r=splitPath(e);if(!r.isAsar)return F.apply(this,arguments);const{asarPath:n,filePath:a}=r,o=getOrCreateArchive(n);if(!o)throw createError("INVALID_ARCHIVE",{asarPath:n});const c=o.getFileInfo(a);if(!c)throw createError("NOT_FOUND",{asarPath:n,filePath:a});if(0===c.size)return s?"":i.Buffer.alloc(0);if(c.unpacked){const e=o.copyFileOut(a);return t.readFileSync(e,s)}if(s){if("string"==typeof s)s={encoding:s};else if("object"!=typeof s)throw new TypeError("Bad arguments")}else s={encoding:null};const{encoding:f}=s,l=i.Buffer.alloc(c.size),u=o.getFdAndValidateIntegrityLater();if(!(u>=0))throw createError("NOT_FOUND",{asarPath:n,filePath:a});return logASARAccess(n,a,c.offset),t.readSync(u,l,0,c.size,c.offset),validateBufferIntegrity(l,c.integrity),f?l.toString(f):l}`) { + if (originalToString.call(fs.readFileSync) !== `function(e,s){const r=splitPath(e);if(!r.isAsar)return F.apply(this,arguments);const{asarPath:n,filePath:i}=r,o=getOrCreateArchive(n);if(!o)throw createError("INVALID_ARCHIVE",{asarPath:n});const c=o.getFileInfo(i);if(!c)throw createError("NOT_FOUND",{asarPath:n,filePath:i});if(0===c.size)return s?"":a.Buffer.alloc(0);if(c.unpacked){const e=o.copyFileOut(i);return t.readFileSync(e,s)}if(s){if("string"==typeof s)s={encoding:s};else if("object"!=typeof s)throw new TypeError("Bad arguments")}else s={encoding:null};const{encoding:f}=s,l=a.Buffer.alloc(c.size),u=o.getFdAndValidateIntegrityLater();if(!(u>=0))throw createError("NOT_FOUND",{asarPath:n,filePath:i});return logASARAccess(n,i,c.offset),t.readSync(u,l,0,c.size,c.offset),validateBufferIntegrity(l,c.integrity),f?l.toString(f):l}`) { console.error(`Integrity check failed for toString.call(fs.readFileSync)`) throw new Error(integrityErrorMessage) } From 58b1349369f97e897bc43f09d683722fb9556ffb Mon Sep 17 00:00:00 2001 From: Cacie Prins Date: Wed, 13 Dec 2023 10:19:41 -0500 Subject: [PATCH 14/67] update electron readme with upgrade troubleshooting section --- packages/electron/README.md | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/packages/electron/README.md b/packages/electron/README.md index f60086beeaae..f5f23cbaa6df 100644 --- a/packages/electron/README.md +++ b/packages/electron/README.md @@ -59,5 +59,21 @@ Upgrading `electron` involves more than just bumping this package's `package.jso - [ ] Do a global search for the old Node.js version to identify any new areas that may need updating/unification, and update those locations (and this document!) - [ ] **Manually smoke test `cypress open`.** Upgrading Electron can break the `desktop-gui` in unexpected ways. Since testing in this area is weak, double-check that things like launching `cypress open`, signing into Cypress Cloud, and launching Electron tests still work. - [ ] **Fix failing tests.** Usually, these are due to breaking changes in either Node.js or Electron. Check the changelogs of both to find relevant changes. -- [ ] For **binary publishing**, make sure the `electron` version that we updated in [`/package.json`](../../package.json) matches the `electron` version inside the [publish binary project](https://github.com/cypress-io/cypress-publish-binary/blob/main/package.json). This is to make sure add-on tests inside the publish-binary repository work locally, but are not required to install the correct version of `electron` in CI when publishing the binary. -- [ ] If needed, update the **[V8 Snapshot Cache](https://github.com/cypress-io/cypress/actions/workflows/update_v8_snapshot_cache.yml)** by running the workflow. Make sure to use the branch that contains the electron updates to populate the `'workflow from'` and `'branch to update'` arguments. Select `'Generate from scratch'` and `'commit directly to branch'`. This will usually take 6-8 hours to complete and is best to not be actively developing on the branch when this workflow runs. +- [ ] For **binary publishing**, make sure the `electron` version that we updated in [`/package.json`](../../package.json) matches the `electron` version inside the [publish binary project](https://github.com/cypress-io/cypress-publish-binary/blob/main/package.json). This is to make sure add-on tests inside the publish-binary repository work locally, but are not required to install the correct version of `electron` in CI when publishing the binary. Ensure the electron target in this project's .circleci configuration is updated as well. +- [ ] If needed, update the **[V8 Snapshot Cache](https://github.com/cypress-io/cypress/actions/workflows/update_v8_snapshot_cache.yml)** by running the GitHub workflow. Make sure to use the branch that contains the electron updates to populate the `'workflow from'` and `'branch to update'` arguments. Select `'Generate from scratch'` and `'commit directly to branch'`. This will usually take 6-8 hours to complete and is best to not be actively developing on the branch when this workflow runs. + + +### Common Upgrade Issues + +#### Integrity Check Failures + +*Solution*: Update the string representation of `fs.readFileSync` in [scripts/binary/binary-integrity-check-source.js](../../scripts/binary/binary-integrity-check-source.js) to match the string generated by the new version of electron. Create a throw-away script and simply `console.log(fs.readFileSync.toString())`, and execute it with *Electron* rather than *Node*. + +#### ResizeObserver errors in Component Test + +*Solution*: This error is benign. From time to time, the error message we match against in order to swallow the error changes. Update the necessary support files with the new error message. + +#### Electron crashes immediately after initializing the Protocol database + +*Solution*: ??? + From b32a1e219ccd8f219527de6e72dfa16f9811cb65 Mon Sep 17 00:00:00 2001 From: Cacie Prins Date: Wed, 13 Dec 2023 11:57:41 -0500 Subject: [PATCH 15/67] point to new publish binary workflow branch for electron 27 --- packages/electron/README.md | 8 ++++++-- scripts/binary/trigger-publish-binary-pipeline.js | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/packages/electron/README.md b/packages/electron/README.md index f5f23cbaa6df..e8fffe902e3e 100644 --- a/packages/electron/README.md +++ b/packages/electron/README.md @@ -56,10 +56,14 @@ Upgrading `electron` involves more than just bumping this package's `package.jso - [ ] [`/.circleci/config.yml`](../../.circleci/config.yml) - Update the Docker `image`s to the new matching `browsers` image. - Update the `xcode` version to one with the same major Node.js version bundled. There is usually not an exact match, this is ok as long as the major version number as the same. - - [ ] Do a global search for the old Node.js version to identify any new areas that may need updating/unification, and update those locations (and this document!) + - [ ] Do a global search for the old Node.js version to identify any new areas that may need updating/unification, and update those locations (and this document!) + +- [ ] For **binary publishing**, make sure the `electron` version that we updated in [`/package.json`](../../package.json) matches the `electron` version inside the [publish binary project](https://github.com/cypress-io/cypress-publish-binary/blob/main/package.json). This is to make sure add-on tests inside the publish-binary repository work locally, but are not required to install the correct version of `electron` in CI when publishing the binary. Ensure the electron target in this project's .circleci configuration is updated as well. Set the target branch on that project as a `branch` property on the request body in [../../scripts/binary/trigger-publish-binary-pipeline.js](../../scripts/binary/trigger-publish-binary-pipeline.js) script, so that you can test in CI. Remove this before merging, and ensure that branch is merged as well. + + - [ ] **Manually smoke test `cypress open`.** Upgrading Electron can break the `desktop-gui` in unexpected ways. Since testing in this area is weak, double-check that things like launching `cypress open`, signing into Cypress Cloud, and launching Electron tests still work. - [ ] **Fix failing tests.** Usually, these are due to breaking changes in either Node.js or Electron. Check the changelogs of both to find relevant changes. -- [ ] For **binary publishing**, make sure the `electron` version that we updated in [`/package.json`](../../package.json) matches the `electron` version inside the [publish binary project](https://github.com/cypress-io/cypress-publish-binary/blob/main/package.json). This is to make sure add-on tests inside the publish-binary repository work locally, but are not required to install the correct version of `electron` in CI when publishing the binary. Ensure the electron target in this project's .circleci configuration is updated as well. + - [ ] If needed, update the **[V8 Snapshot Cache](https://github.com/cypress-io/cypress/actions/workflows/update_v8_snapshot_cache.yml)** by running the GitHub workflow. Make sure to use the branch that contains the electron updates to populate the `'workflow from'` and `'branch to update'` arguments. Select `'Generate from scratch'` and `'commit directly to branch'`. This will usually take 6-8 hours to complete and is best to not be actively developing on the branch when this workflow runs. diff --git a/scripts/binary/trigger-publish-binary-pipeline.js b/scripts/binary/trigger-publish-binary-pipeline.js index b7486db9ae07..12d1fb5dc547 100644 --- a/scripts/binary/trigger-publish-binary-pipeline.js +++ b/scripts/binary/trigger-publish-binary-pipeline.js @@ -10,7 +10,7 @@ const { getNextVersionForBinary } = require('../get-next-version') const { nextVersion } = await getNextVersionForBinary() const body = JSON.stringify({ - branch: 'cacie/upgrade-electron-26', + branch: 'cacie/upgrade-electron-27', parameters: { temp_dir: os.tmpdir(), sha: process.env.CIRCLE_SHA1, From 3bb82dd9c3a875b92c4c37228157cd2ca4fe4701 Mon Sep 17 00:00:00 2001 From: Cacie Prins Date: Wed, 13 Dec 2023 12:10:56 -0500 Subject: [PATCH 16/67] update electron readme with locations of chromium & node versions for a given electron version --- packages/electron/README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/electron/README.md b/packages/electron/README.md index e8fffe902e3e..4ad32d2d85ae 100644 --- a/packages/electron/README.md +++ b/packages/electron/README.md @@ -36,7 +36,7 @@ Upgrading `electron` involves more than just bumping this package's `package.jso - the major version number of Node.js changes, since users rely on the bundled Node.js to load plugins and `.js` fixtures, or - there are changes to Electron that require new shared libraries to be installed on Linux, breaking existing CI setups, or - there is some other change that would break existing usage of Cypress (for example, a Web API feature being removed/added to the bundled Chromium) -- [ ] **Create and publish Docker `base-internal` and `browsers-internal` family images matching the Node.js and Chromium versions in Electron.** These images live inside the [`cypress-docker-images`](https://github.com/cypress-io/cypress-docker-images/) repository. The `browsers-internal` image will be used inside our CI pipelines. The `base-internal` image will be used by the `browsers-internal` image and possibly other system images (described below). For general use of Cypress in Docker, we encourage the use of the [Cypress Docker Factory](https://github.com/cypress-io/cypress-docker-images#cypressfactory). This works great for using Cypress as an end user, but doesn't fully suit the needs for developing Cypress, as we require: +- [ ] **Create and publish Docker `base-internal` and `browsers-internal` family images matching the Node.js and Chromium versions in Electron.** These images live inside the [`cypress-docker-images`](https://github.com/cypress-io/cypress-docker-images/) repository. The `browsers-internal` image will be used inside our CI pipelines. The `base-internal` image will be used by the `browsers-internal` image and possibly other system images (described below). The Chromium version can be determined from the [DEPS](https://github.com/electron/electron/blob/main/DEPS) file in Electron's repository on the correct tag. The Node version can be determined from the [Electron Releases page](https://www.electronjs.org/docs/latest/tutorial/electron-timelines). For general use of Cypress in Docker, we encourage the use of the [Cypress Docker Factory](https://github.com/cypress-io/cypress-docker-images#cypressfactory). This works great for using Cypress as an end user, but doesn't fully suit the needs for developing Cypress, as we require: - The installation of packages, such as `curl`, `xauth`, and `build-essential`/`make` needed for our [`circleci`](../../.circleci/config.yml) jobs/pipelines. - Specific images targeted to test Cypress on various node versions and distributions of linux, such as different versions of `ubuntu`. @@ -45,13 +45,14 @@ Upgrading `electron` involves more than just bumping this package's `package.jso - The Ubuntu images in [base-internal](https://github.com/cypress-io/cypress-docker-images/tree/master/base-internal) are updated to be used in the [system binary tests](../../system-tests/test-binary) if any of the following are true for the images used inside the system binary tests: - The last two major [Ubuntu LTS Releases](https://ubuntu.com/about/release-cycle) are out-of-date. - The [NodeJS](https://nodejs.org/en) version is not the active LTS. +- [ ] **Update `workflows.yml` to reference new `base-internal` and `browsers-internal` Docker images** - [ ] **Ensure that a matching Node.js version is enforced in the monorepo for local development and CI.** When Electron is upgraded, oftentimes, the bundled Node.js version that comes with Electron is updated as well. Because all unit and integration tests run in normal Node.js (not Electron's Node.js), it's important for this Node.js version to be synced with the monorepo. There are a few places where this needs to be done: - [ ] [`/.node-version`](../../.node-version) - used by `nvm` and other Node version managers - [ ] `@types/node` used throughout the monorepo to determine compatible node types. The major version of this package must reflect the node version set in [`/.node-version`](../../.node-version). - [ ] [github workflows](../../.github) - used for repository templates, vulnerability detection, and V8 snapshots. If the node version for Snyk needs to be updated, then the required pull request check into `develop` must also be updated. A repository administrator will need to accomplish this. - [ ] [`/package.json`](../../package.json) - update `engines` - - [ ] [`/scripts/run-docker-local.sh`](../../scripts/run-docker-local.sh) - update Docker image to the new matching `browsers` image + - [ ] [`docker-compose.yml`](../../docker-compose.yml) - update Docker image to the new matching `browsers` image - [ ] [`/system-tests/test-binary/*`](../../system-tests/test-binary) - update binary system tests to use the newly published Ubuntu and Node images mentioned above, if applicable - [ ] [`/.circleci/config.yml`](../../.circleci/config.yml) - Update the Docker `image`s to the new matching `browsers` image. @@ -62,6 +63,7 @@ Upgrading `electron` involves more than just bumping this package's `package.jso - [ ] **Manually smoke test `cypress open`.** Upgrading Electron can break the `desktop-gui` in unexpected ways. Since testing in this area is weak, double-check that things like launching `cypress open`, signing into Cypress Cloud, and launching Electron tests still work. +- [] **Manually smoke test `cypress run` in record mode** Upgrading Electron can cause `better-sqlite3` to SIGSEGV the Electron process. - [ ] **Fix failing tests.** Usually, these are due to breaking changes in either Node.js or Electron. Check the changelogs of both to find relevant changes. - [ ] If needed, update the **[V8 Snapshot Cache](https://github.com/cypress-io/cypress/actions/workflows/update_v8_snapshot_cache.yml)** by running the GitHub workflow. Make sure to use the branch that contains the electron updates to populate the `'workflow from'` and `'branch to update'` arguments. Select `'Generate from scratch'` and `'commit directly to branch'`. This will usually take 6-8 hours to complete and is best to not be actively developing on the branch when this workflow runs. From a0bd74d84ba78abc0b20d6276010926fad07e0cd Mon Sep 17 00:00:00 2001 From: Cacie Prins Date: Wed, 13 Dec 2023 13:21:29 -0500 Subject: [PATCH 17/67] update node versions and docker image refs --- .circleci/workflows.yml | 6 +++--- .github/ISSUE_TEMPLATE/1-bug-report.yml | 2 +- .github/ISSUE_TEMPLATE/2-memory-issue.yml | 2 +- .github/ISSUE_TEMPLATE/3-install-issue.yml | 2 +- .node-version | 2 +- docker-compose.yml | 2 +- package.json | 2 +- .../package.json | 2 +- system-tests/test-binary/node_versions_spec.ts | 4 ++-- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.circleci/workflows.yml b/.circleci/workflows.yml index 9cf9022d9145..d5d3d7cf7ddd 100644 --- a/.circleci/workflows.yml +++ b/.circleci/workflows.yml @@ -94,7 +94,7 @@ executors: # the Docker image with Cypress dependencies and Chrome browser cy-doc: docker: - - image: cypress/browsers-internal:node18.16.0-chrome116-ff115 + - image: cypress/browsers-internal:node18.17.0-chrome118-ff115 # by default, we use "medium" to balance performance + CI costs. bump or reduce on a per-job basis if needed. resource_class: medium environment: @@ -104,7 +104,7 @@ executors: # Docker image with non-root "node" user non-root-docker-user: docker: - - image: cypress/browsers-internal:node18.16.0-chrome116-ff115 + - image: cypress/browsers-internal:node18.17.0-chrome118-ff115 user: node environment: PLATFORM: linux @@ -2349,7 +2349,7 @@ jobs: <<: *defaults resource_class: small docker: - - image: cypress/base-internal:18.16.0 + - image: cypress/base-internal:18.17.0 steps: - maybe_skip_binary_jobs - restore_workspace_binaries diff --git a/.github/ISSUE_TEMPLATE/1-bug-report.yml b/.github/ISSUE_TEMPLATE/1-bug-report.yml index f855fb093946..2f269318a1d8 100644 --- a/.github/ISSUE_TEMPLATE/1-bug-report.yml +++ b/.github/ISSUE_TEMPLATE/1-bug-report.yml @@ -43,7 +43,7 @@ body: attributes: label: Node version description: What version of node.js are you using to run Cypress? - placeholder: ex. v18.16.0 + placeholder: ex. v18.17.0 validations: required: true - type: input diff --git a/.github/ISSUE_TEMPLATE/2-memory-issue.yml b/.github/ISSUE_TEMPLATE/2-memory-issue.yml index 7cafde055540..28e5bbabb1a2 100644 --- a/.github/ISSUE_TEMPLATE/2-memory-issue.yml +++ b/.github/ISSUE_TEMPLATE/2-memory-issue.yml @@ -51,7 +51,7 @@ body: attributes: label: Node version description: What version of node.js are you using to run Cypress? - placeholder: ex. v18.16.0 + placeholder: ex. v18.17.0 validations: required: true - type: input diff --git a/.github/ISSUE_TEMPLATE/3-install-issue.yml b/.github/ISSUE_TEMPLATE/3-install-issue.yml index 3e43de39e0d1..6e513901e5fc 100644 --- a/.github/ISSUE_TEMPLATE/3-install-issue.yml +++ b/.github/ISSUE_TEMPLATE/3-install-issue.yml @@ -38,7 +38,7 @@ body: attributes: label: Node version description: What version of node.js are you using to run Cypress? - placeholder: ex. v18.16.0 + placeholder: ex. v18.17.0 validations: required: true - type: dropdown diff --git a/.node-version b/.node-version index 6d80269a4f04..603606bc9111 100644 --- a/.node-version +++ b/.node-version @@ -1 +1 @@ -18.16.0 +18.17.0 diff --git a/docker-compose.yml b/docker-compose.yml index 213e346695db..d1b2517853be 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -33,7 +33,7 @@ services: - .:/opt/cypress ci: # This should mirror the image used in workflows.yml - image: cypress/browsers-internal:node18.16.0-chrome116-ff115 + image: cypress/browsers-internal:node18.17.0-chrome118-ff115 ports: - 5566:5566 - 5567:5567 diff --git a/package.json b/package.json index 9bcf54e5f1a8..45f24fdb0445 100644 --- a/package.json +++ b/package.json @@ -212,7 +212,7 @@ "yarn-deduplicate": "3.1.0" }, "engines": { - "node": ">=18.16.0", + "node": ">=18.17.0", "yarn": ">=1.17.3" }, "productName": "Cypress", diff --git a/system-tests/projects/webpack-preprocessor-awesome-typescript-loader/package.json b/system-tests/projects/webpack-preprocessor-awesome-typescript-loader/package.json index f43477ed5b44..64bdf0d5a263 100644 --- a/system-tests/projects/webpack-preprocessor-awesome-typescript-loader/package.json +++ b/system-tests/projects/webpack-preprocessor-awesome-typescript-loader/package.json @@ -5,7 +5,7 @@ "@babel/core": "7.9.0", "@babel/preset-env": "7.9.0", "@cypress/webpack-preprocessor": "file:../../../npm/webpack-preprocessor", - "@types/node": "^18.16.0", + "@types/node": "^18.17.0", "awesome-typescript-loader": "5.2.1", "babel-loader": "8.3.0", "cypress": "file:../../../cli/build", diff --git a/system-tests/test-binary/node_versions_spec.ts b/system-tests/test-binary/node_versions_spec.ts index 3f6674c28ea4..da4c32047c87 100644 --- a/system-tests/test-binary/node_versions_spec.ts +++ b/system-tests/test-binary/node_versions_spec.ts @@ -26,14 +26,14 @@ function smokeTestDockerImage (dockerImage: string) { describe('binary node versions', () => { [ - 'cypress/base:18.16.0', + 'cypress/base:18.17.0', 'cypress/base:20.5.0', ].forEach(smokeTestDockerImage) }) describe('type: module', () => { [ - 'cypress/base:18.16.0', + 'cypress/base:18.17.0', 'cypress/base:20.5.0', ].forEach((dockerImage) => { systemTests.it(`can run in ${dockerImage}`, { From 1066e3787b00e654c947745114f78a60d47509ce Mon Sep 17 00:00:00 2001 From: Cacie Prins Date: Wed, 13 Dec 2023 13:22:09 -0500 Subject: [PATCH 18/67] update electron version to 27.1.3 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 45f24fdb0445..449b4e311127 100644 --- a/package.json +++ b/package.json @@ -145,7 +145,7 @@ "dedent": "^0.7.0", "del": "3.0.0", "detect-port": "^1.3.0", - "electron": "26.6.2", + "electron": "27.1.3", "electron-builder": "^23.6.0", "enzyme-adapter-react-16": "1.12.1", "eslint": "7.22.0", diff --git a/yarn.lock b/yarn.lock index cb6402d89e70..11fa62afbd03 100644 --- a/yarn.lock +++ b/yarn.lock @@ -13346,10 +13346,10 @@ electron-to-chromium@^1.4.477: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.480.tgz#40e32849ca50bc23ce29c1516c5adb3fddac919d" integrity sha512-IXTgg+bITkQv/FLP9FjX6f9KFCs5hQWeh5uNSKxB9mqYj/JXhHDbu+ekS43LVvbkL3eW6/oZy4+r9Om6lan1Uw== -electron@26.6.2: - version "26.6.2" - resolved "https://registry.yarnpkg.com/electron/-/electron-26.6.2.tgz#92ca61b4a238cf2b254fa75e8ce65af1b5d17050" - integrity sha512-OWxzVtCJwN9en34bnLupw2dTRsDTBzQZyz0Wx0zjeJ2wgUVlpqavtVDpt50aaJpJR/5GcHH/apIa3uvGWz/ABQ== +electron@27.1.3: + version "27.1.3" + resolved "https://registry.yarnpkg.com/electron/-/electron-27.1.3.tgz#3fd6decda95c1dd0a7e51a9ac77ee0ba37b7c5c6" + integrity sha512-7eD8VMhhlL5J531OOawn00eMthUkX1e3qN5Nqd7eMK8bg5HxQBrn8bdPlvUEnCano9KhrVwaDnGeuzWoDOGpjQ== dependencies: "@electron/get" "^2.0.0" "@types/node" "^18.11.18" From acaaea6389197d5f1530b63c3c9016fec1bca312 Mon Sep 17 00:00:00 2001 From: Cacie Prins Date: Wed, 13 Dec 2023 13:37:40 -0500 Subject: [PATCH 19/67] fix db nativeBinding arg --- packages/server/lib/cloud/protocol.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/server/lib/cloud/protocol.ts b/packages/server/lib/cloud/protocol.ts index 119050e1320b..05775043c9f6 100644 --- a/packages/server/lib/cloud/protocol.ts +++ b/packages/server/lib/cloud/protocol.ts @@ -169,7 +169,7 @@ export class ProtocolManager implements ProtocolManagerShape { debug('better-sqlite3 location', require.resolve('better-sqlite3')) debug('loading native binding from', path.resolve(path.join(require.resolve('better-sqlite3/build/Release/better_sqlite3.node')))) const db = Database(dbPath, { - nativeBinding: 'better-sqlite3/build/Release/better_sqlite3.node', + nativeBinding: require.resolve('better-sqlite3/build/Release/better_sqlite3.node'), verbose: debugVerbose, }) From b76511d0bdca6fcd406598650666a9202fd5cf70 Mon Sep 17 00:00:00 2001 From: "cypress-bot[bot]" <+cypress-bot[bot]@users.noreply.github.com> Date: Wed, 13 Dec 2023 19:34:59 +0000 Subject: [PATCH 20/67] chore: updating v8 snapshot cache --- tooling/v8-snapshot/cache/linux/snapshot-meta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tooling/v8-snapshot/cache/linux/snapshot-meta.json b/tooling/v8-snapshot/cache/linux/snapshot-meta.json index de2b88a9182d..2085f3005d59 100644 --- a/tooling/v8-snapshot/cache/linux/snapshot-meta.json +++ b/tooling/v8-snapshot/cache/linux/snapshot-meta.json @@ -4314,5 +4314,5 @@ "./tooling/v8-snapshot/cache/linux/snapshot-entry.js" ], "deferredHashFile": "yarn.lock", - "deferredHash": "24d3e5395e37a4b8b10571d92d109d0d49ce15a7a445a2507267283ab5153765" + "deferredHash": "98d971055c5517aa8d0ab3436fe3b6bc0583bf9dd7b46225b79eedb24e6349af" } \ No newline at end of file From eae751393caba33ea0a5244b5540e2758fa2b26a Mon Sep 17 00:00:00 2001 From: Cacie Prins Date: Wed, 13 Dec 2023 15:52:26 -0500 Subject: [PATCH 21/67] install setuptools on mac when updating v8 snapshot cache --- .github/workflows/update_v8_snapshot_cache.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/update_v8_snapshot_cache.yml b/.github/workflows/update_v8_snapshot_cache.yml index f2a9572a2a02..8c9d2b5782ac 100644 --- a/.github/workflows/update_v8_snapshot_cache.yml +++ b/.github/workflows/update_v8_snapshot_cache.yml @@ -48,6 +48,9 @@ jobs: - name: Determine snapshot files - Mac if: ${{ matrix.platform == 'macos-latest' }} run: echo "SNAPSHOT_FILES='tooling/v8-snapshot/cache/darwin/snapshot-meta.json'" >> $GITHUB_ENV + - name: Install setuptools - Mac + if: ${{ matrix.platform == 'macos-latest' }} + run: sudo -H pip install setuptools - name: Checkout uses: actions/checkout@v3 with: From a6ac000cdb03676497233b37c41e862d48260b78 Mon Sep 17 00:00:00 2001 From: "cypress-bot[bot]" <+cypress-bot[bot]@users.noreply.github.com> Date: Thu, 14 Dec 2023 16:39:50 +0000 Subject: [PATCH 22/67] chore: updating v8 snapshot cache --- tooling/v8-snapshot/cache/darwin/snapshot-meta.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tooling/v8-snapshot/cache/darwin/snapshot-meta.json b/tooling/v8-snapshot/cache/darwin/snapshot-meta.json index 446c8c10c286..b5325489361b 100644 --- a/tooling/v8-snapshot/cache/darwin/snapshot-meta.json +++ b/tooling/v8-snapshot/cache/darwin/snapshot-meta.json @@ -1063,6 +1063,8 @@ "./node_modules/@cypress/commit-info/src/index.js", "./node_modules/@cypress/commit-info/src/utils.js", "./node_modules/@cypress/get-windows-proxy/node_modules/debug/src/common.js", + "./node_modules/@cypress/get-windows-proxy/node_modules/registry-js/dist/lib/index.js", + "./node_modules/@cypress/get-windows-proxy/node_modules/registry-js/dist/lib/registry.js", "./node_modules/@cypress/get-windows-proxy/src/index.js", "./node_modules/@cypress/parse-domain/build/tries/icann.complete.json", "./node_modules/@cypress/parse-domain/build/tries/private.complete.json", @@ -3179,6 +3181,8 @@ "./node_modules/recast/parsers/babel.js", "./node_modules/recast/parsers/esprima.js", "./node_modules/recast/parsers/typescript.js", + "./node_modules/registry-js/dist/lib/index.js", + "./node_modules/registry-js/dist/lib/registry.js", "./node_modules/request-promise-core/configure/request2.js", "./node_modules/request-promise-core/errors.js", "./node_modules/request-promise-core/lib/errors.js", @@ -4311,5 +4315,5 @@ "./tooling/v8-snapshot/cache/darwin/snapshot-entry.js" ], "deferredHashFile": "yarn.lock", - "deferredHash": "24d3e5395e37a4b8b10571d92d109d0d49ce15a7a445a2507267283ab5153765" + "deferredHash": "98d971055c5517aa8d0ab3436fe3b6bc0583bf9dd7b46225b79eedb24e6349af" } \ No newline at end of file From e7e48ad551467013e2b73c7a609ee56b8c9b250d Mon Sep 17 00:00:00 2001 From: "cypress-bot[bot]" <+cypress-bot[bot]@users.noreply.github.com> Date: Thu, 14 Dec 2023 18:11:26 +0000 Subject: [PATCH 23/67] chore: updating v8 snapshot cache --- tooling/v8-snapshot/cache/win32/snapshot-meta.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tooling/v8-snapshot/cache/win32/snapshot-meta.json b/tooling/v8-snapshot/cache/win32/snapshot-meta.json index 9249fb431e15..a581329221a8 100644 --- a/tooling/v8-snapshot/cache/win32/snapshot-meta.json +++ b/tooling/v8-snapshot/cache/win32/snapshot-meta.json @@ -178,6 +178,8 @@ "./node_modules/@cypress/commit-info/node_modules/semver/semver.js", "./node_modules/@cypress/get-windows-proxy/node_modules/debug/src/browser.js", "./node_modules/@cypress/get-windows-proxy/node_modules/debug/src/index.js", + "./node_modules/@cypress/get-windows-proxy/node_modules/registry-js/dist/lib/index.js", + "./node_modules/@cypress/get-windows-proxy/node_modules/registry-js/dist/lib/registry.js", "./node_modules/@cypress/request-promise/lib/rp.js", "./node_modules/@cypress/request/index.js", "./node_modules/@cypress/request/lib/helpers.js", @@ -4312,5 +4314,5 @@ "./tooling/v8-snapshot/cache/win32/snapshot-entry.js" ], "deferredHashFile": "yarn.lock", - "deferredHash": "d563023bd4e6824ba28b67c1e331a84c6162d2d6eb454349790ac0eb3c15a0ef" + "deferredHash": "bb665cd9f5c0cb5f6d13727aa7869bb4cc38dc3ffce988a719969267745413ca" } \ No newline at end of file From f843948e2b4a35fb1f1821dfd48b5c23866dea47 Mon Sep 17 00:00:00 2001 From: Cacie Prins Date: Thu, 14 Dec 2023 13:37:13 -0500 Subject: [PATCH 24/67] run workflows on this branch run ci --- .circleci/workflows.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.circleci/workflows.yml b/.circleci/workflows.yml index d5d3d7cf7ddd..d4da42d645b1 100644 --- a/.circleci/workflows.yml +++ b/.circleci/workflows.yml @@ -32,6 +32,7 @@ mainBuildFilters: &mainBuildFilters - 'feature/experimental-retries' - 'publish-binary' - 'em/shallow-checkout' + - 'cacie/chore/upgrade-electron-27' # usually we don't build Mac app - it takes a long time # but sometimes we want to really confirm we are doing the right thing @@ -45,6 +46,7 @@ macWorkflowFilters: &darwin-workflow-filters - equal: [ 'feature/experimental-retries', << pipeline.git.branch >> ] - equal: [ 'chore/update_webpack_deps_to_latest_webpack4_compat', << pipeline.git.branch >> ] - equal: [ 'lerna-optimize-tasks', << pipeline.git.branch >> ] + - equal: [ 'cacie/chore/upgrade-electron-27', << pipeline.git.branch >> ] - matches: pattern: /^release\/\d+\.\d+\.\d+$/ value: << pipeline.git.branch >> @@ -59,6 +61,7 @@ linuxArm64WorkflowFilters: &linux-arm64-workflow-filters - equal: [ 'chore/update_webpack_deps_to_latest_webpack4_compat', << pipeline.git.branch >> ] - equal: [ 'chore/bump_loaders_and_optimize_webpack', << pipeline.git.branch >> ] - equal: [ 'lerna-optimize-tasks', << pipeline.git.branch >> ] + - equal: [ 'cacie/chore/upgrade-electron-27', << pipeline.git.branch >> ] - matches: pattern: /^release\/\d+\.\d+\.\d+$/ value: << pipeline.git.branch >> @@ -86,6 +89,7 @@ windowsWorkflowFilters: &windows-workflow-filters - equal: [ 'lerna-optimize-tasks', << pipeline.git.branch >> ] - equal: [ 'em/shallow-checkout', << pipeline.git.branch >> ] - equal: [ 'mschile/mochaEvents_win_sep', << pipeline.git.branch >> ] + - equal: [ 'cacie/chore/upgrade-electron-27', << pipeline.git.branch >> ] - matches: pattern: /^release\/\d+\.\d+\.\d+$/ value: << pipeline.git.branch >> From 6e64ceb97abf49d7e3484b27892b24e813b01597 Mon Sep 17 00:00:00 2001 From: Cacie Prins Date: Thu, 14 Dec 2023 16:16:39 -0500 Subject: [PATCH 25/67] require addon directly and pass to better-sqlite3 init; debug --- packages/server/lib/cloud/protocol.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/server/lib/cloud/protocol.ts b/packages/server/lib/cloud/protocol.ts index 05775043c9f6..5b6877de7954 100644 --- a/packages/server/lib/cloud/protocol.ts +++ b/packages/server/lib/cloud/protocol.ts @@ -167,9 +167,11 @@ export class ProtocolManager implements ProtocolManagerShape { debug('connecting to database at %s', dbPath) debug('better-sqlite3 location', require.resolve('better-sqlite3')) - debug('loading native binding from', path.resolve(path.join(require.resolve('better-sqlite3/build/Release/better_sqlite3.node')))) + debug('loading native binding from', require.resolve('better-sqlite3/build/Release/better_sqlite3.node')) + //@ts-expect-error + debug('non webpack require? ', __non_webpack_require__) const db = Database(dbPath, { - nativeBinding: require.resolve('better-sqlite3/build/Release/better_sqlite3.node'), + nativeBinding: require('better-sqlite3/build/Release/better_sqlite3.node'), verbose: debugVerbose, }) From 9a3af5873f78beb00ffebd200763ec6862e79031 Mon Sep 17 00:00:00 2001 From: Cacie Prins Date: Thu, 14 Dec 2023 16:45:31 -0500 Subject: [PATCH 26/67] rm debug --- packages/server/lib/cloud/protocol.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/server/lib/cloud/protocol.ts b/packages/server/lib/cloud/protocol.ts index 5b6877de7954..74133cf43945 100644 --- a/packages/server/lib/cloud/protocol.ts +++ b/packages/server/lib/cloud/protocol.ts @@ -168,8 +168,7 @@ export class ProtocolManager implements ProtocolManagerShape { debug('connecting to database at %s', dbPath) debug('better-sqlite3 location', require.resolve('better-sqlite3')) debug('loading native binding from', require.resolve('better-sqlite3/build/Release/better_sqlite3.node')) - //@ts-expect-error - debug('non webpack require? ', __non_webpack_require__) + const db = Database(dbPath, { nativeBinding: require('better-sqlite3/build/Release/better_sqlite3.node'), verbose: debugVerbose, From a63fde1a637bd9b360f98f07477d0ba23bd60450 Mon Sep 17 00:00:00 2001 From: Cacie Prins Date: Thu, 14 Dec 2023 17:24:39 -0500 Subject: [PATCH 27/67] try loading better-sqlite with a more dynamic filename --- packages/server/lib/cloud/protocol.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/server/lib/cloud/protocol.ts b/packages/server/lib/cloud/protocol.ts index 74133cf43945..707cd8e058d4 100644 --- a/packages/server/lib/cloud/protocol.ts +++ b/packages/server/lib/cloud/protocol.ts @@ -167,10 +167,10 @@ export class ProtocolManager implements ProtocolManagerShape { debug('connecting to database at %s', dbPath) debug('better-sqlite3 location', require.resolve('better-sqlite3')) - debug('loading native binding from', require.resolve('better-sqlite3/build/Release/better_sqlite3.node')) + debug('loading native binding from', require.resolve(path.join('better-sqlite3', 'build', 'Release', 'better_sqlite3.node'))) const db = Database(dbPath, { - nativeBinding: require('better-sqlite3/build/Release/better_sqlite3.node'), + nativeBinding: require(require.resolve(path.join('better-sqlite3', 'build', 'Release', 'better_sqlite3.node'))), verbose: debugVerbose, }) From 3961271104a7f59cff4ca17b7b185114946733c1 Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Thu, 14 Dec 2023 17:14:45 -0600 Subject: [PATCH 28/67] bump electron version --- .circleci/workflows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/workflows.yml b/.circleci/workflows.yml index d4da42d645b1..d227e5cac778 100644 --- a/.circleci/workflows.yml +++ b/.circleci/workflows.yml @@ -561,7 +561,7 @@ commands: if [[ ! -f better_sqlite3.node ]]; then docker run -d --name centos7-builder centos7-builder /bin/bash -c "sleep 1000000000" docker cp ~/cypress/node_modules/better-sqlite3 centos7-builder:/better-sqlite3 - docker exec -it centos7-builder /bin/bash -c "cd /better-sqlite3 && source /root/.bashrc && chown -R root:root . && npm install --ignore-scripts && npx --no-install prebuild -r electron -t 25.0.0 --include-regex 'better_sqlite3.node$'" + docker exec -it centos7-builder /bin/bash -c "cd /better-sqlite3 && source /root/.bashrc && chown -R root:root . && npm install --ignore-scripts && npx --no-install prebuild -r electron -t 27.0.0 --include-regex 'better_sqlite3.node$'" docker cp centos7-builder:/better-sqlite3/build/Release/better_sqlite3.node ~/cypress/node_modules/better-sqlite3/build/Release/better_sqlite3.node docker rm -f centos7-builder cp ~/cypress/node_modules/better-sqlite3/build/Release/better_sqlite3.node ~/cypress/better_sqlite3.node From 4e0d91ef2c0c2da5076fd0f555e9b0b7d9fc81b8 Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Thu, 14 Dec 2023 17:46:35 -0600 Subject: [PATCH 29/67] bump electron version --- centos7-builder.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/centos7-builder.Dockerfile b/centos7-builder.Dockerfile index 1a6aa87fadca..b9748ffdbad9 100644 --- a/centos7-builder.Dockerfile +++ b/centos7-builder.Dockerfile @@ -5,5 +5,5 @@ RUN echo >> /etc/profile.d/devtoolset-8.sh 'source scl_source enable devtoolset- RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.5/install.sh | bash RUN echo >> /etc/profile.d/nvm.sh 'source ~/.nvm/nvm.sh' # Node 16 is the most recent version that supports CentOS 7. We only need it to -# re-build better-sqlite, so there should be minimal risk of security issues. +# re-build better-sqlite, so there should be minimal risk of security issues RUN source ~/.nvm/nvm.sh && nvm install 16.20.2 && npm install -g yarn From 7d80f7792388db2885b0beb7cc8b0755dee5284a Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Thu, 14 Dec 2023 18:56:40 -0600 Subject: [PATCH 30/67] bump electron version -- run ci --- centos7-builder.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/centos7-builder.Dockerfile b/centos7-builder.Dockerfile index b9748ffdbad9..1a6aa87fadca 100644 --- a/centos7-builder.Dockerfile +++ b/centos7-builder.Dockerfile @@ -5,5 +5,5 @@ RUN echo >> /etc/profile.d/devtoolset-8.sh 'source scl_source enable devtoolset- RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.5/install.sh | bash RUN echo >> /etc/profile.d/nvm.sh 'source ~/.nvm/nvm.sh' # Node 16 is the most recent version that supports CentOS 7. We only need it to -# re-build better-sqlite, so there should be minimal risk of security issues +# re-build better-sqlite, so there should be minimal risk of security issues. RUN source ~/.nvm/nvm.sh && nvm install 16.20.2 && npm install -g yarn From f4fb6c47bbe186b3c1dc62494b544d477c9ddf9c Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Thu, 14 Dec 2023 19:03:18 -0600 Subject: [PATCH 31/67] bump electron version -- run ci --- .circleci/workflows.yml | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/.circleci/workflows.yml b/.circleci/workflows.yml index d227e5cac778..9a1ce5d36830 100644 --- a/.circleci/workflows.yml +++ b/.circleci/workflows.yml @@ -363,18 +363,18 @@ commands: - run: name: Generate platform key command: node ./scripts/get-platform-key.js > platform_key - - when: - condition: <> - steps: - - restore_cache: - name: Restore cache state, to check for known modules cache existence - key: v{{ checksum ".circleci/cache-version.txt" }}-{{ checksum "platform_key" }}-state-of-node-modules-cache-{{ checksum "circle_cache_key" }}-{{ checksum "centos7-builder.Dockerfile" }} - - unless: - condition: <> - steps: - - restore_cache: - name: Restore cache state, to check for known modules cache existence - key: v{{ checksum ".circleci/cache-version.txt" }}-{{ checksum "platform_key" }}-state-of-node-modules-cache-{{ checksum "circle_cache_key" }} + # - when: + # condition: <> + # steps: + # - restore_cache: + # name: Restore cache state, to check for known modules cache existence + # key: v{{ checksum ".circleci/cache-version.txt" }}-{{ checksum "platform_key" }}-state-of-node-modules-cache-{{ checksum "circle_cache_key" }}-{{ checksum "centos7-builder.Dockerfile" }} + # - unless: + # condition: <> + # steps: + # - restore_cache: + # name: Restore cache state, to check for known modules cache existence + # key: v{{ checksum ".circleci/cache-version.txt" }}-{{ checksum "platform_key" }}-state-of-node-modules-cache-{{ checksum "circle_cache_key" }} - run: name: Bail if cache exists command: | @@ -530,12 +530,12 @@ commands: description: Build better-sqlite3 for CentOS 7 steps: - setup_remote_docker - - restore_cache: - keys: - - cypress-centos7-builder-{{ checksum "centos7-builder.Dockerfile" }} - - restore_cache: - keys: - - better-sqlite3-{{ checksum "node_modules/better-sqlite3/package.json" }}-{{ checksum "node_modules/electron/package.json" }}-{{ checksum "centos7-builder.Dockerfile" }} + # - restore_cache: + # keys: + # - cypress-centos7-builder-{{ checksum "centos7-builder.Dockerfile" }} + # - restore_cache: + # keys: + # - better-sqlite3-{{ checksum "node_modules/better-sqlite3/package.json" }}-{{ checksum "node_modules/electron/package.json" }}-{{ checksum "centos7-builder.Dockerfile" }} - run: name: Build or load centos7-builder image command: | From 8dadce34925ad52da7a6a2df77a08e3ba6e2b783 Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Thu, 14 Dec 2023 19:25:27 -0600 Subject: [PATCH 32/67] bump electron version -- run ci --- .circleci/workflows.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.circleci/workflows.yml b/.circleci/workflows.yml index 9a1ce5d36830..308b7e1f31c7 100644 --- a/.circleci/workflows.yml +++ b/.circleci/workflows.yml @@ -559,11 +559,13 @@ commands: name: Build better-sqlite3 for CentOS 7 command: | if [[ ! -f better_sqlite3.node ]]; then + ls -l ~/cypress/node_modules/better-sqlite3/build/Release/better_sqlite3.node docker run -d --name centos7-builder centos7-builder /bin/bash -c "sleep 1000000000" docker cp ~/cypress/node_modules/better-sqlite3 centos7-builder:/better-sqlite3 docker exec -it centos7-builder /bin/bash -c "cd /better-sqlite3 && source /root/.bashrc && chown -R root:root . && npm install --ignore-scripts && npx --no-install prebuild -r electron -t 27.0.0 --include-regex 'better_sqlite3.node$'" docker cp centos7-builder:/better-sqlite3/build/Release/better_sqlite3.node ~/cypress/node_modules/better-sqlite3/build/Release/better_sqlite3.node docker rm -f centos7-builder + ls -l ~/cypress/node_modules/better-sqlite3/build/Release/better_sqlite3.node cp ~/cypress/node_modules/better-sqlite3/build/Release/better_sqlite3.node ~/cypress/better_sqlite3.node else cp ~/cypress/better_sqlite3.node ~/cypress/node_modules/better-sqlite3/build/Release/better_sqlite3.node From 016923e3eacbf43ca49621353015e573d0c7543b Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Thu, 14 Dec 2023 19:38:47 -0600 Subject: [PATCH 33/67] bump electron version -- run ci --- .circleci/cache-version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/cache-version.txt b/.circleci/cache-version.txt index 74e3097e243c..6f9651078008 100644 --- a/.circleci/cache-version.txt +++ b/.circleci/cache-version.txt @@ -1,3 +1,3 @@ # Bump this version to force CI to re-create the cache from scratch. -12-11-23 +12-14-23 From 0d05c414dc9957d24bb42a644b2def9c1861f2ea Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Thu, 14 Dec 2023 20:09:52 -0600 Subject: [PATCH 34/67] bump electron version -- run ci --- .circleci/cache-version.txt | 2 +- .circleci/workflows.yml | 38 +++++++++++++-------------- centos7-builder.Dockerfile | 2 +- packages/server/lib/cloud/protocol.ts | 4 +-- 4 files changed, 21 insertions(+), 25 deletions(-) diff --git a/.circleci/cache-version.txt b/.circleci/cache-version.txt index 6f9651078008..f1dcbdf0fd9c 100644 --- a/.circleci/cache-version.txt +++ b/.circleci/cache-version.txt @@ -1,3 +1,3 @@ # Bump this version to force CI to re-create the cache from scratch. -12-14-23 +12-15-23 diff --git a/.circleci/workflows.yml b/.circleci/workflows.yml index 308b7e1f31c7..d227e5cac778 100644 --- a/.circleci/workflows.yml +++ b/.circleci/workflows.yml @@ -363,18 +363,18 @@ commands: - run: name: Generate platform key command: node ./scripts/get-platform-key.js > platform_key - # - when: - # condition: <> - # steps: - # - restore_cache: - # name: Restore cache state, to check for known modules cache existence - # key: v{{ checksum ".circleci/cache-version.txt" }}-{{ checksum "platform_key" }}-state-of-node-modules-cache-{{ checksum "circle_cache_key" }}-{{ checksum "centos7-builder.Dockerfile" }} - # - unless: - # condition: <> - # steps: - # - restore_cache: - # name: Restore cache state, to check for known modules cache existence - # key: v{{ checksum ".circleci/cache-version.txt" }}-{{ checksum "platform_key" }}-state-of-node-modules-cache-{{ checksum "circle_cache_key" }} + - when: + condition: <> + steps: + - restore_cache: + name: Restore cache state, to check for known modules cache existence + key: v{{ checksum ".circleci/cache-version.txt" }}-{{ checksum "platform_key" }}-state-of-node-modules-cache-{{ checksum "circle_cache_key" }}-{{ checksum "centos7-builder.Dockerfile" }} + - unless: + condition: <> + steps: + - restore_cache: + name: Restore cache state, to check for known modules cache existence + key: v{{ checksum ".circleci/cache-version.txt" }}-{{ checksum "platform_key" }}-state-of-node-modules-cache-{{ checksum "circle_cache_key" }} - run: name: Bail if cache exists command: | @@ -530,12 +530,12 @@ commands: description: Build better-sqlite3 for CentOS 7 steps: - setup_remote_docker - # - restore_cache: - # keys: - # - cypress-centos7-builder-{{ checksum "centos7-builder.Dockerfile" }} - # - restore_cache: - # keys: - # - better-sqlite3-{{ checksum "node_modules/better-sqlite3/package.json" }}-{{ checksum "node_modules/electron/package.json" }}-{{ checksum "centos7-builder.Dockerfile" }} + - restore_cache: + keys: + - cypress-centos7-builder-{{ checksum "centos7-builder.Dockerfile" }} + - restore_cache: + keys: + - better-sqlite3-{{ checksum "node_modules/better-sqlite3/package.json" }}-{{ checksum "node_modules/electron/package.json" }}-{{ checksum "centos7-builder.Dockerfile" }} - run: name: Build or load centos7-builder image command: | @@ -559,13 +559,11 @@ commands: name: Build better-sqlite3 for CentOS 7 command: | if [[ ! -f better_sqlite3.node ]]; then - ls -l ~/cypress/node_modules/better-sqlite3/build/Release/better_sqlite3.node docker run -d --name centos7-builder centos7-builder /bin/bash -c "sleep 1000000000" docker cp ~/cypress/node_modules/better-sqlite3 centos7-builder:/better-sqlite3 docker exec -it centos7-builder /bin/bash -c "cd /better-sqlite3 && source /root/.bashrc && chown -R root:root . && npm install --ignore-scripts && npx --no-install prebuild -r electron -t 27.0.0 --include-regex 'better_sqlite3.node$'" docker cp centos7-builder:/better-sqlite3/build/Release/better_sqlite3.node ~/cypress/node_modules/better-sqlite3/build/Release/better_sqlite3.node docker rm -f centos7-builder - ls -l ~/cypress/node_modules/better-sqlite3/build/Release/better_sqlite3.node cp ~/cypress/node_modules/better-sqlite3/build/Release/better_sqlite3.node ~/cypress/better_sqlite3.node else cp ~/cypress/better_sqlite3.node ~/cypress/node_modules/better-sqlite3/build/Release/better_sqlite3.node diff --git a/centos7-builder.Dockerfile b/centos7-builder.Dockerfile index 1a6aa87fadca..a939fa4087f8 100644 --- a/centos7-builder.Dockerfile +++ b/centos7-builder.Dockerfile @@ -1,5 +1,5 @@ FROM centos:7 -# Install dependencies for re-building better-sqlite and setting devtoolset-8 as the default compiler +# Install dependencies for re-building better-sqlite and setting devtoolset-8 as the default compiler. RUN yum -y install centos-release-scl curl python3 make atk-devel atk java-atk-wrapper at-spi2-atk gtk3 libXt libdrm mesa-libgbm Xvfb && yum -y install devtoolset-8-gcc devtoolset-8-gcc-c++ RUN echo >> /etc/profile.d/devtoolset-8.sh 'source scl_source enable devtoolset-8' RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.5/install.sh | bash diff --git a/packages/server/lib/cloud/protocol.ts b/packages/server/lib/cloud/protocol.ts index 707cd8e058d4..145d698e6509 100644 --- a/packages/server/lib/cloud/protocol.ts +++ b/packages/server/lib/cloud/protocol.ts @@ -166,11 +166,9 @@ export class ProtocolManager implements ProtocolManagerShape { const dbPath = path.join(cypressProtocolDirectory, `${spec.instanceId}.db`) debug('connecting to database at %s', dbPath) - debug('better-sqlite3 location', require.resolve('better-sqlite3')) - debug('loading native binding from', require.resolve(path.join('better-sqlite3', 'build', 'Release', 'better_sqlite3.node'))) const db = Database(dbPath, { - nativeBinding: require(require.resolve(path.join('better-sqlite3', 'build', 'Release', 'better_sqlite3.node'))), + nativeBinding: require.resolve(path.join('better-sqlite3', 'build', 'Release', 'better_sqlite3.node')), verbose: debugVerbose, }) From 4a4ae23dc880cd5e7803026e35b26fc1e6281f81 Mon Sep 17 00:00:00 2001 From: Cacie Prins Date: Fri, 15 Dec 2023 10:19:28 -0500 Subject: [PATCH 35/67] add a step to update workflows.yml to electron upgrade process --- packages/electron/README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/electron/README.md b/packages/electron/README.md index 4ad32d2d85ae..5e3f47fc06fd 100644 --- a/packages/electron/README.md +++ b/packages/electron/README.md @@ -45,7 +45,10 @@ Upgrading `electron` involves more than just bumping this package's `package.jso - The Ubuntu images in [base-internal](https://github.com/cypress-io/cypress-docker-images/tree/master/base-internal) are updated to be used in the [system binary tests](../../system-tests/test-binary) if any of the following are true for the images used inside the system binary tests: - The last two major [Ubuntu LTS Releases](https://ubuntu.com/about/release-cycle) are out-of-date. - The [NodeJS](https://nodejs.org/en) version is not the active LTS. -- [ ] **Update `workflows.yml` to reference new `base-internal` and `browsers-internal` Docker images** +- [ ] **Update `workflows.yml`** + - [ ] Ensure it references the new `base-internal` and `browsers-internal` Docker images + - [ ] Ensure the new Electron version is used as a build target in the `Build better-sqlite3 for CentOS 7` step + - [ ] - [ ] **Ensure that a matching Node.js version is enforced in the monorepo for local development and CI.** When Electron is upgraded, oftentimes, the bundled Node.js version that comes with Electron is updated as well. Because all unit and integration tests run in normal Node.js (not Electron's Node.js), it's important for this Node.js version to be synced with the monorepo. There are a few places where this needs to be done: - [ ] [`/.node-version`](../../.node-version) - used by `nvm` and other Node version managers From e091dfbda77a32ebfc543d398eed35b4ea5bd301 Mon Sep 17 00:00:00 2001 From: Cacie Prins Date: Fri, 15 Dec 2023 11:58:36 -0500 Subject: [PATCH 36/67] reduce retry limit on issue 1244 test to prevent circle from thinking tests have hanged --- packages/driver/cypress/e2e/issues/1244.cy.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/driver/cypress/e2e/issues/1244.cy.js b/packages/driver/cypress/e2e/issues/1244.cy.js index 6ebeb4341e29..e93f8206448d 100644 --- a/packages/driver/cypress/e2e/issues/1244.cy.js +++ b/packages/driver/cypress/e2e/issues/1244.cy.js @@ -70,7 +70,7 @@ describe('issue 1244', () => { }) // TODO: fix flaky test - it('does not strip link _parent', { retries: 15 }, () => { + it('does not strip link _parent', { retries: 5 }, () => { cy.get('iframe').then(($iframe) => { const $el = $iframe.contents().find('a.inline_parent') From bfee9dd51945b61f7284ba8d02c4d065bb3ab2e4 Mon Sep 17 00:00:00 2001 From: Cacie Prins Date: Fri, 15 Dec 2023 17:05:56 -0500 Subject: [PATCH 37/67] target main branch of binary publish workflow? run ci --- scripts/binary/trigger-publish-binary-pipeline.js | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/binary/trigger-publish-binary-pipeline.js b/scripts/binary/trigger-publish-binary-pipeline.js index 12d1fb5dc547..a57cfa801d6b 100644 --- a/scripts/binary/trigger-publish-binary-pipeline.js +++ b/scripts/binary/trigger-publish-binary-pipeline.js @@ -10,7 +10,6 @@ const { getNextVersionForBinary } = require('../get-next-version') const { nextVersion } = await getNextVersionForBinary() const body = JSON.stringify({ - branch: 'cacie/upgrade-electron-27', parameters: { temp_dir: os.tmpdir(), sha: process.env.CIRCLE_SHA1, From 665e81ccbf0a812db184a0a5a5171bbaac03e2e6 Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Fri, 15 Dec 2023 19:50:53 -0600 Subject: [PATCH 38/67] Update .node-version -- run ci --- .node-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.node-version b/.node-version index 603606bc9111..4a1f488b6c3b 100644 --- a/.node-version +++ b/.node-version @@ -1 +1 @@ -18.17.0 +18.17.1 From 0c0ff5a72d9788c7091d66cb975221abdabe222b Mon Sep 17 00:00:00 2001 From: Cacie Prins Date: Mon, 18 Dec 2023 11:01:08 -0500 Subject: [PATCH 39/67] Update CHANGELOG.md --- cli/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/CHANGELOG.md b/cli/CHANGELOG.md index f669e4a48e41..29381bcdda8e 100644 --- a/cli/CHANGELOG.md +++ b/cli/CHANGELOG.md @@ -16,7 +16,7 @@ _Released 12/19/2023 (PENDING)_ **Misc:** - Upgraded `electron` from `25.8.4` to `26.6.2` -- Upgraded bundled Node.js version from `18.15.0` to `18.16.0` +- Upgraded bundled Node.js version from `18.15.0` to `18.17.0` - Upraded bundled Chromium version from `114.0.5735.289` to `116.0.5845.228` ## 13.6.1 From a882362373c12c449762cd0e13a82a03510f6b92 Mon Sep 17 00:00:00 2001 From: Cacie Prins Date: Mon, 18 Dec 2023 11:01:58 -0500 Subject: [PATCH 40/67] Update module_api_spec.ts --- system-tests/test-binary/module_api_spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system-tests/test-binary/module_api_spec.ts b/system-tests/test-binary/module_api_spec.ts index 4a2360f9a589..2366f599cdd6 100644 --- a/system-tests/test-binary/module_api_spec.ts +++ b/system-tests/test-binary/module_api_spec.ts @@ -3,7 +3,7 @@ import systemTests from '../lib/system-tests' describe('module API', () => { systemTests.it('can run module API Mocha spec', { timeout: 240000, - dockerImage: 'cypress/base-internal:18.16.0', + dockerImage: 'cypress/base-internal:18.17.0', withBinary: true, project: 'module-api', browser: 'electron', From b55e8e07e34d4d17c292dda691e10c4c62c9bebc Mon Sep 17 00:00:00 2001 From: Cacie Prins Date: Mon, 18 Dec 2023 11:13:50 -0500 Subject: [PATCH 41/67] point publish binary back to electron upgrade branch --- scripts/binary/trigger-publish-binary-pipeline.js | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/binary/trigger-publish-binary-pipeline.js b/scripts/binary/trigger-publish-binary-pipeline.js index a57cfa801d6b..12d1fb5dc547 100644 --- a/scripts/binary/trigger-publish-binary-pipeline.js +++ b/scripts/binary/trigger-publish-binary-pipeline.js @@ -10,6 +10,7 @@ const { getNextVersionForBinary } = require('../get-next-version') const { nextVersion } = await getNextVersionForBinary() const body = JSON.stringify({ + branch: 'cacie/upgrade-electron-27', parameters: { temp_dir: os.tmpdir(), sha: process.env.CIRCLE_SHA1, From 6475305507132f42ff301ae05ad532ed4f658577 Mon Sep 17 00:00:00 2001 From: Cacie Prins Date: Mon, 18 Dec 2023 13:51:25 -0500 Subject: [PATCH 42/67] Adds some logging re: cachedDataVersion --- scripts/binary/binary-cleanup.js | 3 +++ scripts/binary/build.ts | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/binary/binary-cleanup.js b/scripts/binary/binary-cleanup.js index 41b845d22584..9dcdcd1d539a 100644 --- a/scripts/binary/binary-cleanup.js +++ b/scripts/binary/binary-cleanup.js @@ -5,6 +5,7 @@ const del = require('del') const esbuild = require('esbuild') const tempDir = require('temp-dir') const workingDir = path.join(tempDir, 'binary-cleanup-workdir') +const v8 = require('v8') fs.ensureDirSync(workingDir) @@ -144,6 +145,8 @@ const createServerEntryPointBundle = async (buildAppDir) => { console.log(`compiling server entry point bundle to ${path.join(buildAppDir, 'packages', 'server', 'index.jsc')}`) + console.log('cachedDataVersionTag: ', v8.cachedDataVersionTag()) + // Use bytenode to compile the entry point bundle. This will save time on the v8 compile step and ensure the integrity of the entry point const bytenode = await import('bytenode') diff --git a/scripts/binary/build.ts b/scripts/binary/build.ts index fdeb460e8794..12caa76791c1 100644 --- a/scripts/binary/build.ts +++ b/scripts/binary/build.ts @@ -8,7 +8,7 @@ import electron from '../../packages/electron' import la from 'lazy-ass' import { promisify } from 'util' import glob from 'glob' - +import v8 from 'v8' import * as packages from './util/packages' import * as meta from './meta' import xvfb from '../../cli/lib/exec/xvfb' @@ -424,6 +424,7 @@ async function testExecutableVersion (buildAppExecutable: string, version: strin console.log('testing built app executable version') console.log(`by calling: ${buildAppExecutable} --version`) + console.log('cachedDataVersionTag: ', v8.cachedDataVersionTag()) const args = ['--version'] if (verify.needsSandbox()) { From 35e10a38d6240352200ca5e0e1db84501be0d02d Mon Sep 17 00:00:00 2001 From: Cacie Prins Date: Tue, 19 Dec 2023 15:58:16 -0500 Subject: [PATCH 43/67] use precise electron version for better-sqlite3 for centos7 --- .circleci/workflows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/workflows.yml b/.circleci/workflows.yml index 00c3ae304b29..226ae6d637ed 100644 --- a/.circleci/workflows.yml +++ b/.circleci/workflows.yml @@ -561,7 +561,7 @@ commands: if [[ ! -f better_sqlite3.node ]]; then docker run -d --name centos7-builder centos7-builder /bin/bash -c "sleep 1000000000" docker cp ~/cypress/node_modules/better-sqlite3 centos7-builder:/better-sqlite3 - docker exec -it centos7-builder /bin/bash -c "cd /better-sqlite3 && source /root/.bashrc && chown -R root:root . && npm install --ignore-scripts && npx --no-install prebuild -r electron -t 27.0.0 --include-regex 'better_sqlite3.node$'" + docker exec -it centos7-builder /bin/bash -c "cd /better-sqlite3 && source /root/.bashrc && chown -R root:root . && npm install --ignore-scripts && npx --no-install prebuild -r electron -t 27.1.3 --include-regex 'better_sqlite3.node$'" docker cp centos7-builder:/better-sqlite3/build/Release/better_sqlite3.node ~/cypress/node_modules/better-sqlite3/build/Release/better_sqlite3.node docker rm -f centos7-builder cp ~/cypress/node_modules/better-sqlite3/build/Release/better_sqlite3.node ~/cypress/better_sqlite3.node From 4dbac8eb5d40026b4aa02198144330ce693a5c32 Mon Sep 17 00:00:00 2001 From: Cacie Prins Date: Tue, 19 Dec 2023 15:58:46 -0500 Subject: [PATCH 44/67] Update CHANGELOG.md --- cli/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/CHANGELOG.md b/cli/CHANGELOG.md index 29381bcdda8e..b5d1119bb89f 100644 --- a/cli/CHANGELOG.md +++ b/cli/CHANGELOG.md @@ -15,7 +15,7 @@ _Released 12/19/2023 (PENDING)_ **Misc:** -- Upgraded `electron` from `25.8.4` to `26.6.2` +- Upgraded `electron` from `25.8.4` to `27.1.3` - Upgraded bundled Node.js version from `18.15.0` to `18.17.0` - Upraded bundled Chromium version from `114.0.5735.289` to `116.0.5845.228` From 2049685053c25cfff1526e3282594dbc93924dcb Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Thu, 21 Dec 2023 09:53:26 -0600 Subject: [PATCH 45/67] chore: fix issue with bytenode (#28568) * fix jsc for 27 -- run ci * Update smoke.js * fix build --- .circleci/workflows.yml | 7 ++-- guides/building-release-artifacts.md | 6 +++ packages/server/lib/cloud/protocol.ts | 2 +- scripts/after-pack-hook.js | 38 ++++++++++++++++++- .../binary-byte-node-entry-point-source.js | 13 +++++++ scripts/binary/binary-cleanup.js | 16 +------- scripts/binary/binary-sources.js | 26 +++++++++++-- scripts/binary/smoke.js | 2 +- .../cache/darwin/snapshot-meta.json | 10 +++-- .../src/generator/snapshot-generator.ts | 29 ++++++++++++++ tooling/v8-snapshot/src/setup/config.ts | 10 ++++- tooling/v8-snapshot/src/setup/index.ts | 4 +- .../v8-snapshot/src/setup/install-snapshot.ts | 21 ++++++++-- 13 files changed, 148 insertions(+), 36 deletions(-) create mode 100644 scripts/binary/binary-byte-node-entry-point-source.js diff --git a/.circleci/workflows.yml b/.circleci/workflows.yml index 226ae6d637ed..144cdc851339 100644 --- a/.circleci/workflows.yml +++ b/.circleci/workflows.yml @@ -33,6 +33,7 @@ mainBuildFilters: &mainBuildFilters - 'publish-binary' - 'em/shallow-checkout' - 'cacie/chore/upgrade-electron-27' + - 'ryanm/chore/add-to-upgrade-electron-27' # usually we don't build Mac app - it takes a long time # but sometimes we want to really confirm we are doing the right thing @@ -44,7 +45,7 @@ macWorkflowFilters: &darwin-workflow-filters # use the following branch as well to ensure that v8 snapshot cache updates are fully tested - equal: [ 'update-v8-snapshot-cache-on-develop', << pipeline.git.branch >> ] - equal: [ 'feature/experimental-retries', << pipeline.git.branch >> ] - - equal: [ 'chore/update_webpack_deps_to_latest_webpack4_compat', << pipeline.git.branch >> ] + - equal: [ 'ryanm/chore/add-to-upgrade-electron-27', << pipeline.git.branch >> ] - equal: [ 'lerna-optimize-tasks', << pipeline.git.branch >> ] - equal: [ 'cacie/chore/upgrade-electron-27', << pipeline.git.branch >> ] - matches: @@ -58,7 +59,7 @@ linuxArm64WorkflowFilters: &linux-arm64-workflow-filters # use the following branch as well to ensure that v8 snapshot cache updates are fully tested - equal: [ 'update-v8-snapshot-cache-on-develop', << pipeline.git.branch >> ] - equal: [ 'feature/experimental-retries', << pipeline.git.branch >> ] - - equal: [ 'chore/update_webpack_deps_to_latest_webpack4_compat', << pipeline.git.branch >> ] + - equal: [ 'ryanm/chore/add-to-upgrade-electron-27', << pipeline.git.branch >> ] - equal: [ 'chore/bump_loaders_and_optimize_webpack', << pipeline.git.branch >> ] - equal: [ 'lerna-optimize-tasks', << pipeline.git.branch >> ] - equal: [ 'cacie/chore/upgrade-electron-27', << pipeline.git.branch >> ] @@ -85,7 +86,7 @@ windowsWorkflowFilters: &windows-workflow-filters # use the following branch as well to ensure that v8 snapshot cache updates are fully tested - equal: [ 'update-v8-snapshot-cache-on-develop', << pipeline.git.branch >> ] - equal: [ 'feature/experimental-retries', << pipeline.git.branch >> ] - - equal: [ 'chore/update_webpack_deps_to_latest_webpack4_compat', << pipeline.git.branch >> ] + - equal: [ 'ryanm/chore/add-to-upgrade-electron-27', << pipeline.git.branch >> ] - equal: [ 'lerna-optimize-tasks', << pipeline.git.branch >> ] - equal: [ 'em/shallow-checkout', << pipeline.git.branch >> ] - equal: [ 'mschile/mochaEvents_win_sep', << pipeline.git.branch >> ] diff --git a/guides/building-release-artifacts.md b/guides/building-release-artifacts.md index 2b4a5d6d53aa..a8b273e0771f 100644 --- a/guides/building-release-artifacts.md +++ b/guides/building-release-artifacts.md @@ -38,3 +38,9 @@ You can build the Cypress binary locally by running `yarn binary-build`, then pa If you're on macOS and building locally, you'll need a code-signing certificate in your keychain, which you can get by following the [instructions on Apple's website](https://developer.apple.com/library/archive/documentation/Security/Conceptual/CodeSigningGuide/Procedures/Procedures.html#//apple_ref/doc/uid/TP40005929-CH4-SW30). Also, you'll also most likely want to skip notarization since it requires an Apple Developer Program account - set `SKIP_NOTARIZATION=1` when building locally to do this. [More info about code signing in CI](./code-signing.md). `yarn binary-zip` can be used to zip the built binary together. + +### Tips + +If you want to speed up the time it takes to package the binary, set `V8_SNAPSHOT_DISABLE_MINIFY=1` + +If you are on an M1, you need to set `RESET_ADHOC_SIGNATURE=1` in order to be able to actually run the binary after packaging it. diff --git a/packages/server/lib/cloud/protocol.ts b/packages/server/lib/cloud/protocol.ts index 145d698e6509..79acbbedee92 100644 --- a/packages/server/lib/cloud/protocol.ts +++ b/packages/server/lib/cloud/protocol.ts @@ -168,7 +168,7 @@ export class ProtocolManager implements ProtocolManagerShape { debug('connecting to database at %s', dbPath) const db = Database(dbPath, { - nativeBinding: require.resolve(path.join('better-sqlite3', 'build', 'Release', 'better_sqlite3.node')), + nativeBinding: path.join(require.resolve('better-sqlite3/build/Release/better_sqlite3.node')), verbose: debugVerbose, }) diff --git a/scripts/after-pack-hook.js b/scripts/after-pack-hook.js index 85c2a7e5ea98..0ea34088976a 100644 --- a/scripts/after-pack-hook.js +++ b/scripts/after-pack-hook.js @@ -6,10 +6,23 @@ const path = require('path') const { setupV8Snapshots } = require('@tooling/v8-snapshot') const { flipFuses, FuseVersion, FuseV1Options } = require('@electron/fuses') const { buildEntryPointAndCleanup, cleanupUnneededDependencies } = require('./binary/binary-cleanup') -const { getIntegrityCheckSource, getBinaryEntryPointSource, getEncryptionFileSource, getCloudEnvironmentFileSource, validateEncryptionFile, getProtocolFileSource, validateCloudEnvironmentFile, validateProtocolFile } = require('./binary/binary-sources') +const { getIntegrityCheckSource, getBinaryEntryPointSource, getBinaryByteNodeEntryPointSource, getEncryptionFileSource, getCloudEnvironmentFileSource, validateEncryptionFile, getProtocolFileSource, validateCloudEnvironmentFile, validateProtocolFile, getIndexJscHash, DUMMY_INDEX_JSC_HASH } = require('./binary/binary-sources') +const verify = require('../cli/lib/tasks/verify') +const execa = require('execa') +const meta = require('./binary/meta') const CY_ROOT_DIR = path.join(__dirname, '..') +const createJscFromCypress = async () => { + const args = [] + + if (verify.needsSandbox()) { + args.push('--no-sandbox') + } + + await execa(`${meta.buildAppExecutable()}`, args) +} + module.exports = async function (params) { try { console.log('****************************') @@ -58,6 +71,7 @@ module.exports = async function (params) { } if (!['1', 'true'].includes(process.env.DISABLE_SNAPSHOT_REQUIRE)) { + const binaryByteNodeEntryPointSource = await getBinaryByteNodeEntryPointSource() const binaryEntryPointSource = await getBinaryEntryPointSource() const encryptionFilePath = path.join(CY_ROOT_DIR, 'packages/server/lib/cloud/encryption.ts') const encryptionFileSource = await getEncryptionFileSource(encryptionFilePath) @@ -76,6 +90,10 @@ module.exports = async function (params) { fs.writeFile(path.join(outputFolder, 'index.js'), binaryEntryPointSource), ]) + const integrityCheckSource = getIntegrityCheckSource(outputFolder) + + await fs.writeFile(path.join(outputFolder, 'index.js'), binaryByteNodeEntryPointSource) + await Promise.all([ validateEncryptionFile(encryptionFilePath), validateCloudEnvironmentFile(cloudEnvironmentFilePath), @@ -87,6 +105,7 @@ module.exports = async function (params) { exePathPerPlatform[os.platform()], { version: FuseVersion.V1, + resetAdHocDarwinSignature: process.env.RESET_ADHOC_SIGNATURE === '1' && os.platform() === 'darwin' && os.arch() === 'arm64', [FuseV1Options.LoadBrowserProcessSpecificV8Snapshot]: true, [FuseV1Options.EnableNodeCliInspectArguments]: false, }, @@ -99,7 +118,22 @@ module.exports = async function (params) { await cleanupUnneededDependencies(outputFolder) await setupV8Snapshots({ cypressAppPath: params.appOutDir, - integrityCheckSource: getIntegrityCheckSource(outputFolder), + integrityCheckSource, + }) + + await createJscFromCypress() + + const indexJscHash = await getIndexJscHash(outputFolder) + + await fs.remove(path.join(outputFolder, 'packages/server/index.js')) + await fs.writeFile(path.join(outputFolder, 'index.js'), binaryEntryPointSource) + + await setupV8Snapshots({ + cypressAppPath: params.appOutDir, + useExistingSnapshotScript: true, + updateSnapshotScriptContents: (contents) => { + return contents.replace(DUMMY_INDEX_JSC_HASH, indexJscHash) + }, }) } else { console.log(`value of DISABLE_SNAPSHOT_REQUIRE was ${process.env.DISABLE_SNAPSHOT_REQUIRE}. Skipping snapshot require...`) diff --git a/scripts/binary/binary-byte-node-entry-point-source.js b/scripts/binary/binary-byte-node-entry-point-source.js new file mode 100644 index 000000000000..3e4f28de834c --- /dev/null +++ b/scripts/binary/binary-byte-node-entry-point-source.js @@ -0,0 +1,13 @@ +const compile = async () => { + const bytenode = await import('bytenode') + const path = require('path') + + await bytenode.compileFile({ + filename: path.join(__dirname, 'packages', 'server', 'index.js'), + output: path.join(__dirname, 'packages', 'server', 'index.jsc'), + }) +} + +compile().then(() => { + process.exit() +}) diff --git a/scripts/binary/binary-cleanup.js b/scripts/binary/binary-cleanup.js index 9dcdcd1d539a..e7874f8f801d 100644 --- a/scripts/binary/binary-cleanup.js +++ b/scripts/binary/binary-cleanup.js @@ -5,7 +5,6 @@ const del = require('del') const esbuild = require('esbuild') const tempDir = require('temp-dir') const workingDir = path.join(tempDir, 'binary-cleanup-workdir') -const v8 = require('v8') fs.ensureDirSync(workingDir) @@ -143,21 +142,8 @@ const createServerEntryPointBundle = async (buildAppDir) => { await fs.copy(path.join(workingDir, 'index.js'), path.join(buildAppDir, 'packages', 'server', 'index.js')) - console.log(`compiling server entry point bundle to ${path.join(buildAppDir, 'packages', 'server', 'index.jsc')}`) - - console.log('cachedDataVersionTag: ', v8.cachedDataVersionTag()) - - // Use bytenode to compile the entry point bundle. This will save time on the v8 compile step and ensure the integrity of the entry point - const bytenode = await import('bytenode') - - await bytenode.compileFile({ - filename: path.join(buildAppDir, 'packages', 'server', 'index.js'), - output: path.join(buildAppDir, 'packages', 'server', 'index.jsc'), - electron: true, - }) - // Convert these inputs to a relative file path. Note that these paths are posix paths. - return [...Object.keys(esbuildResult.metafile.inputs)].map((input) => `./${input}`) + return [...Object.keys(esbuildResult.metafile.inputs)].filter((input) => input !== 'packages/server/index.js').map((input) => `./${input}`) } const buildEntryPointAndCleanup = async (buildAppDir) => { diff --git a/scripts/binary/binary-sources.js b/scripts/binary/binary-sources.js index f334fa0a94cf..56dafc56a6f2 100644 --- a/scripts/binary/binary-sources.js +++ b/scripts/binary/binary-sources.js @@ -4,6 +4,8 @@ const path = require('path') const esbuild = require('esbuild') const escapeString = (string) => string.replaceAll(`\``, `\\\``).replaceAll(`$`, `\\$`) +const secret = require('crypto').randomBytes(48).toString('hex') +const DUMMY_INDEX_JSC_HASH = 'abcddcbaabcddcbaabcddcbaabcddcba' function read (file) { const pathToFile = require.resolve(`./${file}`) @@ -24,22 +26,37 @@ const getBinaryEntryPointSource = async () => { return esbuildResult.outputFiles[0].text } +const getBinaryByteNodeEntryPointSource = async () => { + const esbuildResult = await esbuild.build({ + entryPoints: [require.resolve('./binary-byte-node-entry-point-source.js')], + bundle: true, + platform: 'node', + write: false, + minify: true, + treeShaking: true, + }) + + return esbuildResult.outputFiles[0].text +} + const getIntegrityCheckSource = (baseDirectory) => { const fileSource = read('binary-integrity-check-source.js') - const secret = require('crypto').randomBytes(48).toString('hex') const mainIndexHash = crypto.createHmac('md5', secret).update(fs.readFileSync(path.join(baseDirectory, './index.js'), 'utf8')).digest('hex') - const indexJscHash = crypto.createHmac('md5', secret).update(fs.readFileSync(path.join(baseDirectory, './packages/server/index.jsc'), 'utf8')).digest('hex') return fileSource.split('\n').join(`\n `) .replaceAll('MAIN_INDEX_HASH', mainIndexHash) - .replaceAll('INDEX_JSC_HASH', indexJscHash) + .replaceAll('INDEX_JSC_HASH', DUMMY_INDEX_JSC_HASH) .replaceAll('HMAC_SECRET', secret) .replaceAll('CRYPTO_CREATE_HMAC_TO_STRING', escapeString(crypto.createHmac.toString())) .replaceAll('CRYPTO_HMAC_UPDATE_TO_STRING', escapeString(crypto.Hmac.prototype.update.toString())) .replaceAll('CRYPTO_HMAC_DIGEST_TO_STRING', escapeString(crypto.Hmac.prototype.digest.toString())) } +const getIndexJscHash = (baseDirectory) => { + return crypto.createHmac('md5', secret).update(fs.readFileSync(path.join(baseDirectory, './packages/server/index.jsc'), 'utf8')).digest('hex') +} + const getEncryptionFileSource = async (encryptionFilePath) => { const fileContents = await fs.readFile(encryptionFilePath, 'utf8') @@ -102,6 +119,7 @@ const validateProtocolFile = async (protocolFilePath) => { module.exports = { getBinaryEntryPointSource, + getBinaryByteNodeEntryPointSource, getIntegrityCheckSource, getEncryptionFileSource, validateEncryptionFile, @@ -109,4 +127,6 @@ module.exports = { validateCloudEnvironmentFile, getProtocolFileSource, validateProtocolFile, + getIndexJscHash, + DUMMY_INDEX_JSC_HASH, } diff --git a/scripts/binary/smoke.js b/scripts/binary/smoke.js index 879c5e68e5b9..86c4cf09096f 100644 --- a/scripts/binary/smoke.js +++ b/scripts/binary/smoke.js @@ -299,7 +299,7 @@ const runIntegrityTest = async function (buildAppExecutable, buildAppDir, e2e) { console.error(`extra keys in electron process: ${extraKeys}`) } - const allowList = ['regeneratorRuntime', '__core-js_shared__', 'getSnapshotResult', 'supportTypeScript'] + const allowList = ['regeneratorRuntime', '__core-js_shared__', 'getSnapshotResult', 'supportTypeScript', 'Iterator'] await testAlteringEntryPoint(`(${compareGlobals.toString()})()`, `extra keys in electron process: ${allowList}\nIntegrity check failed with expected stack length 9 but got 10`) diff --git a/tooling/v8-snapshot/cache/darwin/snapshot-meta.json b/tooling/v8-snapshot/cache/darwin/snapshot-meta.json index 01082d775164..bdbd60ce2c70 100644 --- a/tooling/v8-snapshot/cache/darwin/snapshot-meta.json +++ b/tooling/v8-snapshot/cache/darwin/snapshot-meta.json @@ -855,7 +855,7 @@ "./packages/socket/node_modules/socket.io/node_modules/ws/lib/websocket.js", "./packages/ts/register.js", "./packages/types/index.js", - "./tooling/v8-snapshot/dist/setup/v8-snapshot-entry-cy-in-cy.js" + "./tooling/v8-snapshot/dist/setup/v8-snapshot-entry.js" ], "healthy": [ "./node_modules/@babel/compat-data/data/native-modules.json", @@ -1063,6 +1063,8 @@ "./node_modules/@cypress/commit-info/src/index.js", "./node_modules/@cypress/commit-info/src/utils.js", "./node_modules/@cypress/get-windows-proxy/node_modules/debug/src/common.js", + "./node_modules/@cypress/get-windows-proxy/node_modules/registry-js/dist/lib/index.js", + "./node_modules/@cypress/get-windows-proxy/node_modules/registry-js/dist/lib/registry.js", "./node_modules/@cypress/get-windows-proxy/src/index.js", "./node_modules/@cypress/parse-domain/build/tries/icann.complete.json", "./node_modules/@cypress/parse-domain/build/tries/private.complete.json", @@ -3179,6 +3181,8 @@ "./node_modules/recast/parsers/babel.js", "./node_modules/recast/parsers/esprima.js", "./node_modules/recast/parsers/typescript.js", + "./node_modules/registry-js/dist/lib/index.js", + "./node_modules/registry-js/dist/lib/registry.js", "./node_modules/request-promise-core/configure/request2.js", "./node_modules/request-promise-core/errors.js", "./node_modules/request-promise-core/lib/errors.js", @@ -3860,8 +3864,6 @@ "./packages/extension/index.js", "./packages/extension/lib/extension.js", "./packages/extension/lib/util.js", - "./packages/frontend-shared/cypress/e2e/prod-dependencies.ts", - "./packages/frontend-shared/cypress/e2e/v8-snapshot-entry.ts", "./packages/graphql/node_modules/chalk/source/templates.js", "./packages/graphql/node_modules/chalk/source/util.js", "./packages/graphql/node_modules/debug/node_modules/ms/index.js", @@ -4311,5 +4313,5 @@ "./tooling/v8-snapshot/cache/darwin/snapshot-entry.js" ], "deferredHashFile": "yarn.lock", - "deferredHash": "98d971055c5517aa8d0ab3436fe3b6bc0583bf9dd7b46225b79eedb24e6349af" + "deferredHash": "dff3ed2b791e8e60154646d588a01d3702e84250dcc7a40c17cf5d0b8e19cd32" } \ No newline at end of file diff --git a/tooling/v8-snapshot/src/generator/snapshot-generator.ts b/tooling/v8-snapshot/src/generator/snapshot-generator.ts index 4ddb5e6489ff..176ca9908ca9 100644 --- a/tooling/v8-snapshot/src/generator/snapshot-generator.ts +++ b/tooling/v8-snapshot/src/generator/snapshot-generator.ts @@ -86,6 +86,8 @@ export type GenerationOpts = { minify: boolean supportTypeScript: boolean integrityCheckSource: string | undefined + useExistingSnapshotScript?: boolean + updateSnapshotScriptContents?: (contents: string) => string } function getDefaultGenerationOpts (projectBaseDir: string): GenerationOpts { @@ -98,6 +100,8 @@ function getDefaultGenerationOpts (projectBaseDir: string): GenerationOpts { minify: false, supportTypeScript: false, integrityCheckSource: undefined, + useExistingSnapshotScript: false, + updateSnapshotScriptContents: undefined, } } @@ -153,6 +157,14 @@ export class SnapshotGenerator { * Path where v8context bin is stored, derived from {@link GenerationOpts} snapshotBinDir */ private v8ContextFile?: string + /** + * Whether to use an existing snapshot script instead of creating a new one. + */ + useExistingSnapshotScript?: boolean + /** + * Function to update the contents of an existing snapshot script. + */ + updateSnapshotScriptContents?: ((contents: string) => string) /** * Generated snapshot script, needs to be set before calling `makeSnapshot`. @@ -186,6 +198,8 @@ export class SnapshotGenerator { nodeEnv, minify, integrityCheckSource, + useExistingSnapshotScript, + updateSnapshotScriptContents, }: GenerationOpts = Object.assign( getDefaultGenerationOpts(projectBaseDir), opts, @@ -210,6 +224,8 @@ export class SnapshotGenerator { this.bundlerPath = getBundlerPath() this.minify = minify this.integrityCheckSource = integrityCheckSource + this.useExistingSnapshotScript = useExistingSnapshotScript + this.updateSnapshotScriptContents = updateSnapshotScriptContents const auxiliaryDataKeys = Object.keys(this.auxiliaryData || {}) @@ -235,6 +251,19 @@ export class SnapshotGenerator { * Creates the snapshot script for the provided configuration */ async createScript () { + if (this.useExistingSnapshotScript) { + let contents = await fs.promises.readFile(this.snapshotScriptPath, 'utf8') + + if (this.updateSnapshotScriptContents) { + contents = this.updateSnapshotScriptContents(contents) + } + + this.snapshotScript = Buffer.from(contents) + await fs.promises.writeFile(this.snapshotScriptPath, this.snapshotScript) + + return + } + let deferred let norewrite diff --git a/tooling/v8-snapshot/src/setup/config.ts b/tooling/v8-snapshot/src/setup/config.ts index 81ace9cf6a1a..1349d15b24de 100644 --- a/tooling/v8-snapshot/src/setup/config.ts +++ b/tooling/v8-snapshot/src/setup/config.ts @@ -1,6 +1,6 @@ import path from 'path' -type SnapshotConfig = { +export type SnapshotConfig = { appEntryFile: string cypressAppSnapshotDir: string nodeModulesOnly: boolean @@ -11,6 +11,8 @@ type SnapshotConfig = { metaFile: string minify: boolean integrityCheckSource: string | undefined + useExistingSnapshotScript?: boolean + updateSnapshotScriptContents?: (contents: string) => string } const platformString = process.platform @@ -74,11 +76,15 @@ export function createConfig ({ cypressAppPath, integrityCheckSource, supportCypressInCypress, + useExistingSnapshotScript, + updateSnapshotScriptContents, }: { env?: 'dev' | 'prod' cypressAppPath?: string integrityCheckSource: string | undefined supportCypressInCypress?: boolean + useExistingSnapshotScript?: boolean + updateSnapshotScriptContents?: (contents: string) => string }): SnapshotConfig { /** * If true only node_module dependencies are included in the snapshot. Otherwise app files are included as well @@ -105,6 +111,8 @@ export function createConfig ({ snapshotEntryFile, minify, integrityCheckSource, + useExistingSnapshotScript, + updateSnapshotScriptContents, } } diff --git a/tooling/v8-snapshot/src/setup/index.ts b/tooling/v8-snapshot/src/setup/index.ts index 8b3b635e2a0d..2998881b8549 100644 --- a/tooling/v8-snapshot/src/setup/index.ts +++ b/tooling/v8-snapshot/src/setup/index.ts @@ -5,10 +5,10 @@ import minimist from 'minimist' import { generateEntry } from './generate-entry' import { installSnapshot } from './install-snapshot' -const setupV8Snapshots = async ({ cypressAppPath, integrityCheckSource, supportCypressInCypress }: { cypressAppPath?: string, integrityCheckSource?: string, supportCypressInCypress?: boolean} = {}) => { +const setupV8Snapshots = async ({ cypressAppPath, integrityCheckSource, supportCypressInCypress, useExistingSnapshotScript, updateSnapshotScriptContents }: { cypressAppPath?: string, integrityCheckSource?: string, supportCypressInCypress?: boolean, useExistingSnapshotScript?: boolean, updateSnapshotScriptContents?: (contents: string) => string } = {}) => { try { const args = minimist(process.argv.slice(2)) - const config = createConfig({ env: args.env, cypressAppPath, integrityCheckSource, supportCypressInCypress }) + const config = createConfig({ env: args.env, cypressAppPath, integrityCheckSource, supportCypressInCypress, useExistingSnapshotScript, updateSnapshotScriptContents }) await consolidateDeps(config) diff --git a/tooling/v8-snapshot/src/setup/install-snapshot.ts b/tooling/v8-snapshot/src/setup/install-snapshot.ts index 183c77efeaac..83fb78dda104 100644 --- a/tooling/v8-snapshot/src/setup/install-snapshot.ts +++ b/tooling/v8-snapshot/src/setup/install-snapshot.ts @@ -3,6 +3,7 @@ import { SnapshotGenerator } from '../generator/snapshot-generator' import { prettyPrintError } from '../utils' import fs from 'fs-extra' import forceNoRewrite from './force-no-rewrite' +import type { SnapshotConfig } from './config' const debug = require('debug') const logInfo = debug('cypress:snapgen:info') @@ -16,6 +17,8 @@ function getSnapshotGenerator ({ resolverMap, minify, integrityCheckSource, + useExistingSnapshotScript, + updateSnapshotScriptContents, }: { nodeModulesOnly: boolean projectBaseDir: string @@ -24,6 +27,8 @@ function getSnapshotGenerator ({ resolverMap: Record minify: boolean integrityCheckSource: string | undefined + useExistingSnapshotScript?: boolean + updateSnapshotScriptContents?: (contents: string) => string }) { return new SnapshotGenerator(projectBaseDir, snapshotEntryFile, { cacheDir: snapshotCacheDir, @@ -32,6 +37,8 @@ function getSnapshotGenerator ({ forceNoRewrite, minify, integrityCheckSource, + useExistingSnapshotScript, + updateSnapshotScriptContents, }) } @@ -44,7 +51,10 @@ function getSnapshotGenerator ({ * @param {Partial} opts */ export async function installSnapshot ( - { + config: SnapshotConfig, + resolverMap, +) { + const { cypressAppSnapshotDir, nodeModulesOnly, projectBaseDir, @@ -52,9 +62,10 @@ export async function installSnapshot ( snapshotEntryFile, minify, integrityCheckSource, - }, - resolverMap, -) { + useExistingSnapshotScript, + updateSnapshotScriptContents, + } = config + try { logInfo('Generating snapshot %o', { nodeModulesOnly, @@ -68,6 +79,8 @@ export async function installSnapshot ( resolverMap, minify, integrityCheckSource, + useExistingSnapshotScript, + updateSnapshotScriptContents, }) await snapshotGenerator.createScript() From 98bf7b22aed8ca55cc005802e5223a46821fbdaf Mon Sep 17 00:00:00 2001 From: Cacie Prins Date: Tue, 19 Dec 2023 10:12:27 -0500 Subject: [PATCH 46/67] update electron upgrade steps --- packages/electron/README.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/electron/README.md b/packages/electron/README.md index 5e3f47fc06fd..4a69a9583dd0 100644 --- a/packages/electron/README.md +++ b/packages/electron/README.md @@ -62,7 +62,13 @@ Upgrading `electron` involves more than just bumping this package's `package.jso - Update the `xcode` version to one with the same major Node.js version bundled. There is usually not an exact match, this is ok as long as the major version number as the same. - [ ] Do a global search for the old Node.js version to identify any new areas that may need updating/unification, and update those locations (and this document!) -- [ ] For **binary publishing**, make sure the `electron` version that we updated in [`/package.json`](../../package.json) matches the `electron` version inside the [publish binary project](https://github.com/cypress-io/cypress-publish-binary/blob/main/package.json). This is to make sure add-on tests inside the publish-binary repository work locally, but are not required to install the correct version of `electron` in CI when publishing the binary. Ensure the electron target in this project's .circleci configuration is updated as well. Set the target branch on that project as a `branch` property on the request body in [../../scripts/binary/trigger-publish-binary-pipeline.js](../../scripts/binary/trigger-publish-binary-pipeline.js) script, so that you can test in CI. Remove this before merging, and ensure that branch is merged as well. +- [ ] **Update `cypress-publish-binary`** For **binary publishing**, make sure the `electron` version that we updated in [`/package.json`](../../package.json) matches the `electron` version inside the [publish binary project](https://github.com/cypress-io/cypress-publish-binary/blob/main/package.json). This is to make sure add-on tests inside the publish-binary repository work locally, but are not required to install the correct version of `electron` in CI when publishing the binary. Ensure the electron target in this project's .circleci configuration is updated as well. Set the Remove this before merging, and ensure that branch is merged as well. + - [ ] Create a new branch in `cypress-publish-binary` + - [ ] Update `electron` version in `package.json` + - [ ] Update the target `electron` version in the circle configuration + - [ ] Update the docker image to the new browsers-internal image made in the previous step + - [ ] Temporarily update the circle configuration to allow `cypress` to run against the branch + - [ ] Temporarily set target `cypress-publish-binary` branch as a `branch` property on the request body in [../../scripts/binary/trigger-publish-binary-pipeline.js](../../scripts/binary/trigger-publish-binary-pipeline.js) script, so that you can test against this branch from the electron upgrade branch - [ ] **Manually smoke test `cypress open`.** Upgrading Electron can break the `desktop-gui` in unexpected ways. Since testing in this area is weak, double-check that things like launching `cypress open`, signing into Cypress Cloud, and launching Electron tests still work. From 8a9970484fb0163c827e28f8136a254dc647ced8 Mon Sep 17 00:00:00 2001 From: Cacie Prins Date: Tue, 9 Jan 2024 14:46:50 -0500 Subject: [PATCH 47/67] Update packages/electron/README.md Co-authored-by: Mike McCready <66998419+MikeMcC399@users.noreply.github.com> --- packages/electron/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/electron/README.md b/packages/electron/README.md index 4a69a9583dd0..9507eac9c5cb 100644 --- a/packages/electron/README.md +++ b/packages/electron/README.md @@ -72,7 +72,7 @@ Upgrading `electron` involves more than just bumping this package's `package.jso - [ ] **Manually smoke test `cypress open`.** Upgrading Electron can break the `desktop-gui` in unexpected ways. Since testing in this area is weak, double-check that things like launching `cypress open`, signing into Cypress Cloud, and launching Electron tests still work. -- [] **Manually smoke test `cypress run` in record mode** Upgrading Electron can cause `better-sqlite3` to SIGSEGV the Electron process. +- [ ] **Manually smoke test `cypress run` in record mode** Upgrading Electron can cause `better-sqlite3` to SIGSEGV the Electron process. - [ ] **Fix failing tests.** Usually, these are due to breaking changes in either Node.js or Electron. Check the changelogs of both to find relevant changes. - [ ] If needed, update the **[V8 Snapshot Cache](https://github.com/cypress-io/cypress/actions/workflows/update_v8_snapshot_cache.yml)** by running the GitHub workflow. Make sure to use the branch that contains the electron updates to populate the `'workflow from'` and `'branch to update'` arguments. Select `'Generate from scratch'` and `'commit directly to branch'`. This will usually take 6-8 hours to complete and is best to not be actively developing on the branch when this workflow runs. From 3a02fecccfb0f5fd6f5b40288a363aca2d46fdd5 Mon Sep 17 00:00:00 2001 From: Cacie Prins Date: Tue, 9 Jan 2024 14:49:29 -0500 Subject: [PATCH 48/67] Update cli/CHANGELOG.md Co-authored-by: Mike McCready <66998419+MikeMcC399@users.noreply.github.com> --- cli/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/CHANGELOG.md b/cli/CHANGELOG.md index 3a00912e959e..dd06b6139a5c 100644 --- a/cli/CHANGELOG.md +++ b/cli/CHANGELOG.md @@ -22,7 +22,7 @@ _Released 1/16/2024 (PENDING)_ - Updated `@cypress/unique-selector` to include a performance optimization. It's possible this could improve performance of the selector playground. Addressed in [#28571](https://github.com/cypress-io/cypress/pull/28571). - Upgraded `electron` from `25.8.4` to `27.1.3` - Upgraded bundled Node.js version from `18.15.0` to `18.17.0` -- Upraded bundled Chromium version from `114.0.5735.289` to `116.0.5845.228` +- Upgraded bundled Chromium version from `114.0.5735.289` to `116.0.5845.228` **Misc:** From a9ece8a38c770fdff6911f2b17d0056f4b04aac2 Mon Sep 17 00:00:00 2001 From: Cacie Prins Date: Tue, 9 Jan 2024 17:12:09 -0500 Subject: [PATCH 49/67] fix DebugEmptyStates component test --- packages/app/src/components/Slideshow.vue | 4 ++-- packages/app/src/debug/empty/DebugEmptyStates.cy.tsx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/app/src/components/Slideshow.vue b/packages/app/src/components/Slideshow.vue index b6a34bb04008..7a752833c8cd 100644 --- a/packages/app/src/components/Slideshow.vue +++ b/packages/app/src/components/Slideshow.vue @@ -2,7 +2,7 @@
- - +
diff --git a/packages/app/src/debug/empty/DebugEmptyStates.cy.tsx b/packages/app/src/debug/empty/DebugEmptyStates.cy.tsx index 25508bd93095..659d633be74c 100644 --- a/packages/app/src/debug/empty/DebugEmptyStates.cy.tsx +++ b/packages/app/src/debug/empty/DebugEmptyStates.cy.tsx @@ -64,7 +64,7 @@ describe('Debug page empty states', { defaultCommandTimeout: 250 }, () => { cy.percySnapshot(`slideshow step ${step}`) } - cy.findByTestId('promo-action-control').click() + cy.findByTestId('promo-action-control', { timeout: 350 }).click() } } From c1209c69b195415fef55e811dfd6eb3b9845f557 Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Fri, 12 Jan 2024 11:59:30 -0600 Subject: [PATCH 50/67] try to fix downstream build -- run ci (#28649) Co-authored-by: Cacie Prins --- .circleci/workflows.yml | 10 +++ package.json | 1 + scripts/binary/build.ts | 48 -------------- scripts/binary/index.js | 66 +++++++++++++++++++ .../binary/trigger-publish-binary-pipeline.js | 2 +- 5 files changed, 78 insertions(+), 49 deletions(-) diff --git a/.circleci/workflows.yml b/.circleci/workflows.yml index fb34df37fd04..b463b089693c 100644 --- a/.circleci/workflows.yml +++ b/.circleci/workflows.yml @@ -32,6 +32,7 @@ mainBuildFilters: &mainBuildFilters - 'feature/experimental-retries' - 'publish-binary' - 'cacie/chore/upgrade-electron-27' + - 'ryanm/chore/more-27-changes' - 'em/circle2' # usually we don't build Mac app - it takes a long time @@ -44,6 +45,7 @@ macWorkflowFilters: &darwin-workflow-filters # use the following branch as well to ensure that v8 snapshot cache updates are fully tested - equal: [ 'update-v8-snapshot-cache-on-develop', << pipeline.git.branch >> ] - equal: [ 'feature/experimental-retries', << pipeline.git.branch >> ] + - equal: [ 'ryanm/chore/more-27-changes', << pipeline.git.branch >> ] - equal: [ 'cacie/chore/upgrade-electron-27', << pipeline.git.branch >> ] - equal: [ 'ryanm/fix/service-worker-capture', << pipeline.git.branch >> ] - matches: @@ -57,6 +59,7 @@ linuxArm64WorkflowFilters: &linux-arm64-workflow-filters # use the following branch as well to ensure that v8 snapshot cache updates are fully tested - equal: [ 'update-v8-snapshot-cache-on-develop', << pipeline.git.branch >> ] - equal: [ 'feature/experimental-retries', << pipeline.git.branch >> ] + - equal: [ 'ryanm/chore/more-27-changes', << pipeline.git.branch >> ] - equal: [ 'cacie/chore/upgrade-electron-27', << pipeline.git.branch >> ] - equal: [ 'chore/update_webpack_deps_to_latest_webpack4_compat', << pipeline.git.branch >> ] - equal: [ 'em/circle2', << pipeline.git.branch >> ] @@ -83,6 +86,7 @@ windowsWorkflowFilters: &windows-workflow-filters # use the following branch as well to ensure that v8 snapshot cache updates are fully tested - equal: [ 'update-v8-snapshot-cache-on-develop', << pipeline.git.branch >> ] - equal: [ 'feature/experimental-retries', << pipeline.git.branch >> ] + - equal: [ 'ryanm/chore/more-27-changes', << pipeline.git.branch >> ] - equal: [ 'chore/update_windows_signing', << pipeline.git.branch >> ] - equal: [ 'lerna-optimize-tasks', << pipeline.git.branch >> ] - equal: [ 'mschile/mochaEvents_win_sep', << pipeline.git.branch >> ] @@ -1231,6 +1235,12 @@ commands: else yarn binary-package --version $(node ./scripts/get-next-version.js) fi + - run: + name: Smoke Test the Cypress binary + command: | + source ./scripts/ensure-node.sh + node --version + yarn binary-smoke-test --version $(node ./scripts/get-next-version.js) - run: name: Zip the binary command: | diff --git a/package.json b/package.json index c1d332548931..7df618ec2815 100644 --- a/package.json +++ b/package.json @@ -10,6 +10,7 @@ "binary-ensure": "node ./scripts/binary.js ensure", "binary-purge": "node ./scripts/binary.js purge-version", "binary-release": "node ./scripts/binary.js release", + "binary-smoke-test": "node ./scripts/binary.js smoke", "binary-upload": "node ./scripts/binary.js upload", "binary-zip": "node ./scripts/binary.js zip", "binary-package": "cross-env NODE_OPTIONS=--max_old_space_size=8192 node ./scripts/binary.js package", diff --git a/scripts/binary/build.ts b/scripts/binary/build.ts index 12caa76791c1..fcdbc770fd4a 100644 --- a/scripts/binary/build.ts +++ b/scripts/binary/build.ts @@ -8,17 +8,13 @@ import electron from '../../packages/electron' import la from 'lazy-ass' import { promisify } from 'util' import glob from 'glob' -import v8 from 'v8' import * as packages from './util/packages' import * as meta from './meta' -import xvfb from '../../cli/lib/exec/xvfb' -import smoke from './smoke' import { spawn, execSync } from 'child_process' import { transformRequires } from './util/transform-requires' import execa from 'execa' import { testStaticAssets } from './util/testStaticAssets' import performanceTracking from '../../system-tests/lib/performance' -import verify from '../../cli/lib/tasks/verify' import * as electronBuilder from 'electron-builder' const globAsync = promisify(glob) @@ -307,26 +303,6 @@ export async function packageElectronApp (options: BuildCypressAppOpts) { console.log(stdout) - // runSmokeTests - let usingXvfb = xvfb.isNeeded() - - try { - if (usingXvfb) { - await xvfb.start() - } - - log(`#testExecutableVersion ${meta.buildAppExecutable()}`) - await testExecutableVersion(meta.buildAppExecutable(), version) - - const executablePath = meta.buildAppExecutable() - - await smoke.test(executablePath, meta.buildAppDir()) - } finally { - if (usingXvfb) { - await xvfb.stop() - } - } - // verifyAppCanOpen if (platform === 'darwin' && !skipSigning) { const appFolder = meta.zipDir() @@ -417,27 +393,3 @@ async function testDistVersion (distDir: string, version: string) { console.log('✅ using node --version works') } - -async function testExecutableVersion (buildAppExecutable: string, version: string) { - log('#testVersion') - - console.log('testing built app executable version') - console.log(`by calling: ${buildAppExecutable} --version`) - - console.log('cachedDataVersionTag: ', v8.cachedDataVersionTag()) - const args = ['--version'] - - if (verify.needsSandbox()) { - args.push('--no-sandbox') - } - - const result = await execa(buildAppExecutable, args) - - la(result.stdout, 'missing output when getting built version', result) - - console.log('built app version', result.stdout) - la(result.stdout.trim() === version.trim(), 'different version reported', - result.stdout, 'from input version to build', version) - - console.log('✅ using --version on the Cypress binary works') -} diff --git a/scripts/binary/index.js b/scripts/binary/index.js index 7e679d2fc571..80947662990c 100644 --- a/scripts/binary/index.js +++ b/scripts/binary/index.js @@ -23,6 +23,17 @@ const uploadUtils = require('./util/upload') const { uploadArtifactToS3 } = require('./upload-build-artifact') const { moveBinaries } = require('./move-binaries') const { exec } = require('child_process') +const xvfb = require('../../cli/lib/exec/xvfb') +const smoke = require('./smoke') +const verify = require('../../cli/lib/tasks/verify') +const execa = require('execa') + +const log = function (msg) { + const time = new Date() + const timeStamp = time.toLocaleTimeString() + + console.log(timeStamp, chalk.yellow(msg), chalk.blue(meta.PLATFORM)) +} const success = (str) => { return console.log(chalk.bgGreen(` ${chalk.black(str)} `)) @@ -50,6 +61,29 @@ const askMissingOptions = function (properties = []) { return questionsRemain(pickedQuestions) } +async function testExecutableVersion (buildAppExecutable, version) { + log('#testVersion') + + console.log('testing built app executable version') + console.log(`by calling: ${buildAppExecutable} --version`) + + const args = ['--version'] + + if (verify.needsSandbox()) { + args.push('--no-sandbox') + } + + const result = await execa(buildAppExecutable, args) + + la(result.stdout, 'missing output when getting built version', result) + + console.log('built app version', result.stdout) + la(result.stdout.trim() === version.trim(), 'different version reported', + result.stdout, 'from input version to build', version) + + console.log('✅ using --version on the Cypress binary works') +} + // hack for @packages/server modifying cwd process.chdir(cwd) @@ -214,6 +248,38 @@ const deploy = { }) }, + async smoke (options) { + console.log('#smoke') + + if (options == null) { + options = this.parseOptions(process.argv) + } + + debug('parsed build options %o', options) + + await askMissingOptions(['version'])(options) + + // runSmokeTests + let usingXvfb = xvfb.isNeeded() + + try { + if (usingXvfb) { + await xvfb.start() + } + + log(`#testExecutableVersion ${meta.buildAppExecutable()}`) + await testExecutableVersion(meta.buildAppExecutable(), options.version) + + const executablePath = meta.buildAppExecutable() + + await smoke.test(executablePath, meta.buildAppDir()) + } finally { + if (usingXvfb) { + await xvfb.stop() + } + } + }, + zip (options) { console.log('#zip') if (!options) { diff --git a/scripts/binary/trigger-publish-binary-pipeline.js b/scripts/binary/trigger-publish-binary-pipeline.js index 12d1fb5dc547..e54c0573713a 100644 --- a/scripts/binary/trigger-publish-binary-pipeline.js +++ b/scripts/binary/trigger-publish-binary-pipeline.js @@ -10,7 +10,7 @@ const { getNextVersionForBinary } = require('../get-next-version') const { nextVersion } = await getNextVersionForBinary() const body = JSON.stringify({ - branch: 'cacie/upgrade-electron-27', + branch: 'ryanm/chore/more-27-changes', parameters: { temp_dir: os.tmpdir(), sha: process.env.CIRCLE_SHA1, From a7a5a6b422060c3e2e67df5570e1c34ef453929d Mon Sep 17 00:00:00 2001 From: Cacie Prins Date: Fri, 12 Jan 2024 13:02:05 -0500 Subject: [PATCH 51/67] point to consolidated binary publish branch --- scripts/binary/trigger-publish-binary-pipeline.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/binary/trigger-publish-binary-pipeline.js b/scripts/binary/trigger-publish-binary-pipeline.js index e54c0573713a..12d1fb5dc547 100644 --- a/scripts/binary/trigger-publish-binary-pipeline.js +++ b/scripts/binary/trigger-publish-binary-pipeline.js @@ -10,7 +10,7 @@ const { getNextVersionForBinary } = require('../get-next-version') const { nextVersion } = await getNextVersionForBinary() const body = JSON.stringify({ - branch: 'ryanm/chore/more-27-changes', + branch: 'cacie/upgrade-electron-27', parameters: { temp_dir: os.tmpdir(), sha: process.env.CIRCLE_SHA1, From 48491877caef2d6afb6e9a1c0edfd3a6d0be19f7 Mon Sep 17 00:00:00 2001 From: Cacie Prins Date: Fri, 12 Jan 2024 16:38:06 -0500 Subject: [PATCH 52/67] revert webpack-preprocessor-awesome-typescript-loader update --- .../webpack-preprocessor-awesome-typescript-loader/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system-tests/projects/webpack-preprocessor-awesome-typescript-loader/package.json b/system-tests/projects/webpack-preprocessor-awesome-typescript-loader/package.json index 64bdf0d5a263..4157c1e934d5 100644 --- a/system-tests/projects/webpack-preprocessor-awesome-typescript-loader/package.json +++ b/system-tests/projects/webpack-preprocessor-awesome-typescript-loader/package.json @@ -5,7 +5,7 @@ "@babel/core": "7.9.0", "@babel/preset-env": "7.9.0", "@cypress/webpack-preprocessor": "file:../../../npm/webpack-preprocessor", - "@types/node": "^18.17.0", + "@types/node": "^12.11.1", "awesome-typescript-loader": "5.2.1", "babel-loader": "8.3.0", "cypress": "file:../../../cli/build", From 382dbc5e22f77788a530a99e3d938fa76366b3e1 Mon Sep 17 00:00:00 2001 From: Cacie Prins Date: Tue, 16 Jan 2024 09:25:52 -0500 Subject: [PATCH 53/67] revert certain system tests --- system-tests/test-binary/node_versions_spec.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system-tests/test-binary/node_versions_spec.ts b/system-tests/test-binary/node_versions_spec.ts index da4c32047c87..9a23707f4ffe 100644 --- a/system-tests/test-binary/node_versions_spec.ts +++ b/system-tests/test-binary/node_versions_spec.ts @@ -26,14 +26,14 @@ function smokeTestDockerImage (dockerImage: string) { describe('binary node versions', () => { [ - 'cypress/base:18.17.0', + 'cypress/base:18.15.0', 'cypress/base:20.5.0', ].forEach(smokeTestDockerImage) }) describe('type: module', () => { [ - 'cypress/base:18.17.0', + 'cypress/base:18.15.0', 'cypress/base:20.5.0', ].forEach((dockerImage) => { systemTests.it(`can run in ${dockerImage}`, { From fab68980ff6cea752d99a234f589dc8dee5a378b Mon Sep 17 00:00:00 2001 From: Cacie Prins Date: Tue, 16 Jan 2024 13:48:16 -0500 Subject: [PATCH 54/67] increase padding for module api system test duration window --- system-tests/lib/resultsUtils.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system-tests/lib/resultsUtils.ts b/system-tests/lib/resultsUtils.ts index 5d31cf522d80..ed642f197e3d 100644 --- a/system-tests/lib/resultsUtils.ts +++ b/system-tests/lib/resultsUtils.ts @@ -248,7 +248,7 @@ export const expectCorrectModuleApiResult = (json, opts: { run, 'stats.duration', wallClocks, - wallClocks + 600, // add 600ms to account for padding + wallClocks + 1000, // add 600ms to account for padding 1234, ) @@ -256,7 +256,7 @@ export const expectCorrectModuleApiResult = (json, opts: { run, 'reporterStats.duration', wallClocks, - wallClocks + 600, // add 600ms to account for padding + wallClocks + 1000, // add 600ms to account for padding 1234, ) From aa09aa8b697d4e9f80412e257dae37e877ca0abb Mon Sep 17 00:00:00 2001 From: Cacie Prins Date: Tue, 16 Jan 2024 15:26:14 -0500 Subject: [PATCH 55/67] account for differing screenshot sizes --- .../component_testing_spec.ts.js | 4 +- system-tests/__snapshots__/retries_spec.ts.js | 4 +- .../vite_dev_server_fresh_spec.ts.js | 56 +++++++++---------- .../webpack_dev_server_fresh_spec.ts.js | 56 +++++++++---------- .../cypress/e2e/default_size.cy.js | 2 +- 5 files changed, 61 insertions(+), 61 deletions(-) diff --git a/system-tests/__snapshots__/component_testing_spec.ts.js b/system-tests/__snapshots__/component_testing_spec.ts.js index 06341d554ec1..ed305661c765 100644 --- a/system-tests/__snapshots__/component_testing_spec.ts.js +++ b/system-tests/__snapshots__/component_testing_spec.ts.js @@ -786,9 +786,9 @@ exports['experimentalSingleTabRunMode / executes all specs in a single tab'] = ` (Screenshots) - - /XXX/XXX/XXX/cypress/screenshots/1_fails.cy.js/simple failing spec -- fails (fai (1280x603) + - /XXX/XXX/XXX/cypress/screenshots/1_fails.cy.js/simple failing spec -- fails (fai (1280x591) led).png - - /XXX/XXX/XXX/cypress/screenshots/1_fails.cy.js/simple failing spec -- fails agai (1280x603) + - /XXX/XXX/XXX/cypress/screenshots/1_fails.cy.js/simple failing spec -- fails agai (1280x591) n (failed).png diff --git a/system-tests/__snapshots__/retries_spec.ts.js b/system-tests/__snapshots__/retries_spec.ts.js index 5c023ca7c964..8515f2306aad 100644 --- a/system-tests/__snapshots__/retries_spec.ts.js +++ b/system-tests/__snapshots__/retries_spec.ts.js @@ -164,8 +164,8 @@ exports['retries / supports retries (chrome)'] = ` (Screenshots) - - /XXX/XXX/XXX/cypress/screenshots/fail-twice.cy.js/fail twice (failed).png (1280x603) - - /XXX/XXX/XXX/cypress/screenshots/fail-twice.cy.js/fail twice (failed) (attempt 2 (1280x603) + - /XXX/XXX/XXX/cypress/screenshots/fail-twice.cy.js/fail twice (failed).png (1280x591) + - /XXX/XXX/XXX/cypress/screenshots/fail-twice.cy.js/fail twice (failed) (attempt 2 (1280x591) ).png diff --git a/system-tests/__snapshots__/vite_dev_server_fresh_spec.ts.js b/system-tests/__snapshots__/vite_dev_server_fresh_spec.ts.js index 8c00e710ec1f..a9bf1c1b26d6 100644 --- a/system-tests/__snapshots__/vite_dev_server_fresh_spec.ts.js +++ b/system-tests/__snapshots__/vite_dev_server_fresh_spec.ts.js @@ -82,7 +82,7 @@ We dynamically generated a new test to display this failure. (Screenshots) - - /XXX/XXX/XXX/cypress/screenshots/AppCompilationError.cy.jsx/An uncaught error wa (1280x603) + - /XXX/XXX/XXX/cypress/screenshots/AppCompilationError.cy.jsx/An uncaught error wa (1280x591) s detected outside of a test (failed).png @@ -165,12 +165,12 @@ https://on.cypress.io/uncaught-exception-from-application (Screenshots) - - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- error on mount (failed) (1280x603) + - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- error on mount (failed) (1280x591) .png - - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- sync error (failed).png (1280x603) - - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- async error (failed).pn (1280x603) + - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- sync error (failed).png (1280x591) + - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- async error (failed).pn (1280x591) g - - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- command failure (failed (1280x603) + - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- command failure (failed (1280x591) ).png @@ -216,7 +216,7 @@ https://on.cypress.io/uncaught-exception-from-application (Screenshots) - - /XXX/XXX/XXX/cypress/screenshots/MissingReact.cy.jsx/is missing React (failed).p (1280x603) + - /XXX/XXX/XXX/cypress/screenshots/MissingReact.cy.jsx/is missing React (failed).p (1280x591) ng @@ -254,7 +254,7 @@ https://on.cypress.io/uncaught-exception-from-application (Screenshots) - - /XXX/XXX/XXX/cypress/screenshots/MissingReactInSpec.cy.jsx/is missing React in t (1280x603) + - /XXX/XXX/XXX/cypress/screenshots/MissingReactInSpec.cy.jsx/is missing React in t (1280x591) his file (failed).png @@ -485,7 +485,7 @@ We dynamically generated a new test to display this failure. (Screenshots) - - /XXX/XXX/XXX/cypress/screenshots/AppCompilationError.cy.jsx/An uncaught error wa (1280x603) + - /XXX/XXX/XXX/cypress/screenshots/AppCompilationError.cy.jsx/An uncaught error wa (1280x591) s detected outside of a test (failed).png @@ -568,12 +568,12 @@ https://on.cypress.io/uncaught-exception-from-application (Screenshots) - - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- error on mount (failed) (1280x603) + - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- error on mount (failed) (1280x591) .png - - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- sync error (failed).png (1280x603) - - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- async error (failed).pn (1280x603) + - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- sync error (failed).png (1280x591) + - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- async error (failed).pn (1280x591) g - - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- command failure (failed (1280x603) + - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- command failure (failed (1280x591) ).png @@ -619,7 +619,7 @@ https://on.cypress.io/uncaught-exception-from-application (Screenshots) - - /XXX/XXX/XXX/cypress/screenshots/MissingReact.cy.jsx/is missing React (failed).p (1280x603) + - /XXX/XXX/XXX/cypress/screenshots/MissingReact.cy.jsx/is missing React (failed).p (1280x591) ng @@ -657,7 +657,7 @@ https://on.cypress.io/uncaught-exception-from-application (Screenshots) - - /XXX/XXX/XXX/cypress/screenshots/MissingReactInSpec.cy.jsx/is missing React in t (1280x603) + - /XXX/XXX/XXX/cypress/screenshots/MissingReactInSpec.cy.jsx/is missing React in t (1280x591) his file (failed).png @@ -888,7 +888,7 @@ We dynamically generated a new test to display this failure. (Screenshots) - - /XXX/XXX/XXX/cypress/screenshots/AppCompilationError.cy.jsx/An uncaught error wa (1280x603) + - /XXX/XXX/XXX/cypress/screenshots/AppCompilationError.cy.jsx/An uncaught error wa (1280x591) s detected outside of a test (failed).png @@ -971,12 +971,12 @@ https://on.cypress.io/uncaught-exception-from-application (Screenshots) - - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- error on mount (failed) (1280x603) + - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- error on mount (failed) (1280x591) .png - - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- sync error (failed).png (1280x603) - - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- async error (failed).pn (1280x603) + - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- sync error (failed).png (1280x591) + - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- async error (failed).pn (1280x591) g - - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- command failure (failed (1280x603) + - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- command failure (failed (1280x591) ).png @@ -1022,7 +1022,7 @@ https://on.cypress.io/uncaught-exception-from-application (Screenshots) - - /XXX/XXX/XXX/cypress/screenshots/MissingReact.cy.jsx/is missing React (failed).p (1280x603) + - /XXX/XXX/XXX/cypress/screenshots/MissingReact.cy.jsx/is missing React (failed).p (1280x591) ng @@ -1060,7 +1060,7 @@ https://on.cypress.io/uncaught-exception-from-application (Screenshots) - - /XXX/XXX/XXX/cypress/screenshots/MissingReactInSpec.cy.jsx/is missing React in t (1280x603) + - /XXX/XXX/XXX/cypress/screenshots/MissingReactInSpec.cy.jsx/is missing React in t (1280x591) his file (failed).png @@ -1291,7 +1291,7 @@ We dynamically generated a new test to display this failure. (Screenshots) - - /XXX/XXX/XXX/cypress/screenshots/AppCompilationError.cy.jsx/An uncaught error wa (1280x603) + - /XXX/XXX/XXX/cypress/screenshots/AppCompilationError.cy.jsx/An uncaught error wa (1280x591) s detected outside of a test (failed).png @@ -1374,12 +1374,12 @@ https://on.cypress.io/uncaught-exception-from-application (Screenshots) - - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- error on mount (failed) (1280x603) + - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- error on mount (failed) (1280x591) .png - - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- sync error (failed).png (1280x603) - - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- async error (failed).pn (1280x603) + - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- sync error (failed).png (1280x591) + - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- async error (failed).pn (1280x591) g - - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- command failure (failed (1280x603) + - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- command failure (failed (1280x591) ).png @@ -1425,7 +1425,7 @@ https://on.cypress.io/uncaught-exception-from-application (Screenshots) - - /XXX/XXX/XXX/cypress/screenshots/MissingReact.cy.jsx/is missing React (failed).p (1280x603) + - /XXX/XXX/XXX/cypress/screenshots/MissingReact.cy.jsx/is missing React (failed).p (1280x591) ng @@ -1463,7 +1463,7 @@ https://on.cypress.io/uncaught-exception-from-application (Screenshots) - - /XXX/XXX/XXX/cypress/screenshots/MissingReactInSpec.cy.jsx/is missing React in t (1280x603) + - /XXX/XXX/XXX/cypress/screenshots/MissingReactInSpec.cy.jsx/is missing React in t (1280x591) his file (failed).png diff --git a/system-tests/__snapshots__/webpack_dev_server_fresh_spec.ts.js b/system-tests/__snapshots__/webpack_dev_server_fresh_spec.ts.js index 7220f743e101..1e24d3b213bc 100644 --- a/system-tests/__snapshots__/webpack_dev_server_fresh_spec.ts.js +++ b/system-tests/__snapshots__/webpack_dev_server_fresh_spec.ts.js @@ -321,7 +321,7 @@ We dynamically generated a new test to display this failure. (Screenshots) - - /XXX/XXX/XXX/cypress/screenshots/AppCompilationError.cy.jsx/An uncaught error wa (1280x603) + - /XXX/XXX/XXX/cypress/screenshots/AppCompilationError.cy.jsx/An uncaught error wa (1280x591) s detected outside of a test (failed).png @@ -404,12 +404,12 @@ https://on.cypress.io/uncaught-exception-from-application (Screenshots) - - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- error on mount (failed) (1280x603) + - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- error on mount (failed) (1280x591) .png - - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- sync error (failed).png (1280x603) - - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- async error (failed).pn (1280x603) + - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- sync error (failed).png (1280x591) + - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- async error (failed).pn (1280x591) g - - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- command failure (failed (1280x603) + - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- command failure (failed (1280x591) ).png @@ -455,7 +455,7 @@ https://on.cypress.io/uncaught-exception-from-application (Screenshots) - - /XXX/XXX/XXX/cypress/screenshots/MissingReact.cy.jsx/is missing React (failed).p (1280x603) + - /XXX/XXX/XXX/cypress/screenshots/MissingReact.cy.jsx/is missing React (failed).p (1280x591) ng @@ -493,7 +493,7 @@ https://on.cypress.io/uncaught-exception-from-application (Screenshots) - - /XXX/XXX/XXX/cypress/screenshots/MissingReactInSpec.cy.jsx/is missing React in t (1280x603) + - /XXX/XXX/XXX/cypress/screenshots/MissingReactInSpec.cy.jsx/is missing React in t (1280x591) his file (failed).png @@ -744,7 +744,7 @@ We dynamically generated a new test to display this failure. (Screenshots) - - /XXX/XXX/XXX/cypress/screenshots/AppCompilationError.cy.jsx/An uncaught error wa (1280x603) + - /XXX/XXX/XXX/cypress/screenshots/AppCompilationError.cy.jsx/An uncaught error wa (1280x591) s detected outside of a test (failed).png @@ -827,12 +827,12 @@ https://on.cypress.io/uncaught-exception-from-application (Screenshots) - - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- error on mount (failed) (1280x603) + - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- error on mount (failed) (1280x591) .png - - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- sync error (failed).png (1280x603) - - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- async error (failed).pn (1280x603) + - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- sync error (failed).png (1280x591) + - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- async error (failed).pn (1280x591) g - - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- command failure (failed (1280x603) + - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- command failure (failed (1280x591) ).png @@ -878,7 +878,7 @@ https://on.cypress.io/uncaught-exception-from-application (Screenshots) - - /XXX/XXX/XXX/cypress/screenshots/MissingReact.cy.jsx/is missing React (failed).p (1280x603) + - /XXX/XXX/XXX/cypress/screenshots/MissingReact.cy.jsx/is missing React (failed).p (1280x591) ng @@ -916,7 +916,7 @@ https://on.cypress.io/uncaught-exception-from-application (Screenshots) - - /XXX/XXX/XXX/cypress/screenshots/MissingReactInSpec.cy.jsx/is missing React in t (1280x603) + - /XXX/XXX/XXX/cypress/screenshots/MissingReactInSpec.cy.jsx/is missing React in t (1280x591) his file (failed).png @@ -1158,7 +1158,7 @@ We dynamically generated a new test to display this failure. (Screenshots) - - /XXX/XXX/XXX/cypress/screenshots/AppCompilationError.cy.jsx/An uncaught error wa (1280x603) + - /XXX/XXX/XXX/cypress/screenshots/AppCompilationError.cy.jsx/An uncaught error wa (1280x591) s detected outside of a test (failed).png @@ -1241,12 +1241,12 @@ https://on.cypress.io/uncaught-exception-from-application (Screenshots) - - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- error on mount (failed) (1280x603) + - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- error on mount (failed) (1280x591) .png - - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- sync error (failed).png (1280x603) - - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- async error (failed).pn (1280x603) + - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- sync error (failed).png (1280x591) + - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- async error (failed).pn (1280x591) g - - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- command failure (failed (1280x603) + - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- command failure (failed (1280x591) ).png @@ -1292,7 +1292,7 @@ https://on.cypress.io/uncaught-exception-from-application (Screenshots) - - /XXX/XXX/XXX/cypress/screenshots/MissingReact.cy.jsx/is missing React (failed).p (1280x603) + - /XXX/XXX/XXX/cypress/screenshots/MissingReact.cy.jsx/is missing React (failed).p (1280x591) ng @@ -1330,7 +1330,7 @@ https://on.cypress.io/uncaught-exception-from-application (Screenshots) - - /XXX/XXX/XXX/cypress/screenshots/MissingReactInSpec.cy.jsx/is missing React in t (1280x603) + - /XXX/XXX/XXX/cypress/screenshots/MissingReactInSpec.cy.jsx/is missing React in t (1280x591) his file (failed).png @@ -1584,7 +1584,7 @@ We dynamically generated a new test to display this failure. (Screenshots) - - /XXX/XXX/XXX/cypress/screenshots/AppCompilationError.cy.jsx/An uncaught error wa (1280x603) + - /XXX/XXX/XXX/cypress/screenshots/AppCompilationError.cy.jsx/An uncaught error wa (1280x591) s detected outside of a test (failed).png @@ -1667,12 +1667,12 @@ https://on.cypress.io/uncaught-exception-from-application (Screenshots) - - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- error on mount (failed) (1280x603) + - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- error on mount (failed) (1280x591) .png - - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- sync error (failed).png (1280x603) - - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- async error (failed).pn (1280x603) + - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- sync error (failed).png (1280x591) + - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- async error (failed).pn (1280x591) g - - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- command failure (failed (1280x603) + - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- command failure (failed (1280x591) ).png @@ -1718,7 +1718,7 @@ https://on.cypress.io/uncaught-exception-from-application (Screenshots) - - /XXX/XXX/XXX/cypress/screenshots/MissingReact.cy.jsx/is missing React (failed).p (1280x603) + - /XXX/XXX/XXX/cypress/screenshots/MissingReact.cy.jsx/is missing React (failed).p (1280x591) ng @@ -1756,7 +1756,7 @@ https://on.cypress.io/uncaught-exception-from-application (Screenshots) - - /XXX/XXX/XXX/cypress/screenshots/MissingReactInSpec.cy.jsx/is missing React in t (1280x603) + - /XXX/XXX/XXX/cypress/screenshots/MissingReactInSpec.cy.jsx/is missing React in t (1280x591) his file (failed).png diff --git a/system-tests/projects/screen-size/cypress/e2e/default_size.cy.js b/system-tests/projects/screen-size/cypress/e2e/default_size.cy.js index b207691e3f6f..f009576edf2e 100644 --- a/system-tests/projects/screen-size/cypress/e2e/default_size.cy.js +++ b/system-tests/projects/screen-size/cypress/e2e/default_size.cy.js @@ -16,7 +16,7 @@ describe('windowSize', () => { // availHeight: top.screen.availHeight, }).deep.eq({ innerWidth: 1280, - innerHeight: 603, + innerHeight: 599, // chrome 118 reduced the size here from 603 to 599 // screenWidth: 1280, // screenHeight: 603, // availWidth: 1280, From a4673cacaf29e33cdcbc757d223d5b6e306e6f6c Mon Sep 17 00:00:00 2001 From: Cacie Prins Date: Tue, 16 Jan 2024 15:53:06 -0500 Subject: [PATCH 56/67] screenshot size differs locally vs ci --- .../component_testing_spec.ts.js | 4 +- system-tests/__snapshots__/retries_spec.ts.js | 4 +- .../vite_dev_server_fresh_spec.ts.js | 56 +++++++++---------- .../webpack_dev_server_fresh_spec.ts.js | 56 +++++++++---------- 4 files changed, 60 insertions(+), 60 deletions(-) diff --git a/system-tests/__snapshots__/component_testing_spec.ts.js b/system-tests/__snapshots__/component_testing_spec.ts.js index ed305661c765..48e435796b01 100644 --- a/system-tests/__snapshots__/component_testing_spec.ts.js +++ b/system-tests/__snapshots__/component_testing_spec.ts.js @@ -786,9 +786,9 @@ exports['experimentalSingleTabRunMode / executes all specs in a single tab'] = ` (Screenshots) - - /XXX/XXX/XXX/cypress/screenshots/1_fails.cy.js/simple failing spec -- fails (fai (1280x591) + - /XXX/XXX/XXX/cypress/screenshots/1_fails.cy.js/simple failing spec -- fails (fai (1280x599) led).png - - /XXX/XXX/XXX/cypress/screenshots/1_fails.cy.js/simple failing spec -- fails agai (1280x591) + - /XXX/XXX/XXX/cypress/screenshots/1_fails.cy.js/simple failing spec -- fails agai (1280x599) n (failed).png diff --git a/system-tests/__snapshots__/retries_spec.ts.js b/system-tests/__snapshots__/retries_spec.ts.js index 8515f2306aad..bdb6f5e3ba4d 100644 --- a/system-tests/__snapshots__/retries_spec.ts.js +++ b/system-tests/__snapshots__/retries_spec.ts.js @@ -164,8 +164,8 @@ exports['retries / supports retries (chrome)'] = ` (Screenshots) - - /XXX/XXX/XXX/cypress/screenshots/fail-twice.cy.js/fail twice (failed).png (1280x591) - - /XXX/XXX/XXX/cypress/screenshots/fail-twice.cy.js/fail twice (failed) (attempt 2 (1280x591) + - /XXX/XXX/XXX/cypress/screenshots/fail-twice.cy.js/fail twice (failed).png (1280x599) + - /XXX/XXX/XXX/cypress/screenshots/fail-twice.cy.js/fail twice (failed) (attempt 2 (1280x599) ).png diff --git a/system-tests/__snapshots__/vite_dev_server_fresh_spec.ts.js b/system-tests/__snapshots__/vite_dev_server_fresh_spec.ts.js index a9bf1c1b26d6..ed45491574a4 100644 --- a/system-tests/__snapshots__/vite_dev_server_fresh_spec.ts.js +++ b/system-tests/__snapshots__/vite_dev_server_fresh_spec.ts.js @@ -82,7 +82,7 @@ We dynamically generated a new test to display this failure. (Screenshots) - - /XXX/XXX/XXX/cypress/screenshots/AppCompilationError.cy.jsx/An uncaught error wa (1280x591) + - /XXX/XXX/XXX/cypress/screenshots/AppCompilationError.cy.jsx/An uncaught error wa (1280x599) s detected outside of a test (failed).png @@ -165,12 +165,12 @@ https://on.cypress.io/uncaught-exception-from-application (Screenshots) - - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- error on mount (failed) (1280x591) + - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- error on mount (failed) (1280x599) .png - - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- sync error (failed).png (1280x591) - - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- async error (failed).pn (1280x591) + - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- sync error (failed).png (1280x599) + - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- async error (failed).pn (1280x599) g - - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- command failure (failed (1280x591) + - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- command failure (failed (1280x599) ).png @@ -216,7 +216,7 @@ https://on.cypress.io/uncaught-exception-from-application (Screenshots) - - /XXX/XXX/XXX/cypress/screenshots/MissingReact.cy.jsx/is missing React (failed).p (1280x591) + - /XXX/XXX/XXX/cypress/screenshots/MissingReact.cy.jsx/is missing React (failed).p (1280x599) ng @@ -254,7 +254,7 @@ https://on.cypress.io/uncaught-exception-from-application (Screenshots) - - /XXX/XXX/XXX/cypress/screenshots/MissingReactInSpec.cy.jsx/is missing React in t (1280x591) + - /XXX/XXX/XXX/cypress/screenshots/MissingReactInSpec.cy.jsx/is missing React in t (1280x599) his file (failed).png @@ -485,7 +485,7 @@ We dynamically generated a new test to display this failure. (Screenshots) - - /XXX/XXX/XXX/cypress/screenshots/AppCompilationError.cy.jsx/An uncaught error wa (1280x591) + - /XXX/XXX/XXX/cypress/screenshots/AppCompilationError.cy.jsx/An uncaught error wa (1280x599) s detected outside of a test (failed).png @@ -568,12 +568,12 @@ https://on.cypress.io/uncaught-exception-from-application (Screenshots) - - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- error on mount (failed) (1280x591) + - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- error on mount (failed) (1280x599) .png - - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- sync error (failed).png (1280x591) - - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- async error (failed).pn (1280x591) + - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- sync error (failed).png (1280x599) + - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- async error (failed).pn (1280x599) g - - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- command failure (failed (1280x591) + - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- command failure (failed (1280x599) ).png @@ -619,7 +619,7 @@ https://on.cypress.io/uncaught-exception-from-application (Screenshots) - - /XXX/XXX/XXX/cypress/screenshots/MissingReact.cy.jsx/is missing React (failed).p (1280x591) + - /XXX/XXX/XXX/cypress/screenshots/MissingReact.cy.jsx/is missing React (failed).p (1280x599) ng @@ -657,7 +657,7 @@ https://on.cypress.io/uncaught-exception-from-application (Screenshots) - - /XXX/XXX/XXX/cypress/screenshots/MissingReactInSpec.cy.jsx/is missing React in t (1280x591) + - /XXX/XXX/XXX/cypress/screenshots/MissingReactInSpec.cy.jsx/is missing React in t (1280x599) his file (failed).png @@ -888,7 +888,7 @@ We dynamically generated a new test to display this failure. (Screenshots) - - /XXX/XXX/XXX/cypress/screenshots/AppCompilationError.cy.jsx/An uncaught error wa (1280x591) + - /XXX/XXX/XXX/cypress/screenshots/AppCompilationError.cy.jsx/An uncaught error wa (1280x599) s detected outside of a test (failed).png @@ -971,12 +971,12 @@ https://on.cypress.io/uncaught-exception-from-application (Screenshots) - - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- error on mount (failed) (1280x591) + - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- error on mount (failed) (1280x599) .png - - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- sync error (failed).png (1280x591) - - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- async error (failed).pn (1280x591) + - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- sync error (failed).png (1280x599) + - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- async error (failed).pn (1280x599) g - - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- command failure (failed (1280x591) + - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- command failure (failed (1280x599) ).png @@ -1022,7 +1022,7 @@ https://on.cypress.io/uncaught-exception-from-application (Screenshots) - - /XXX/XXX/XXX/cypress/screenshots/MissingReact.cy.jsx/is missing React (failed).p (1280x591) + - /XXX/XXX/XXX/cypress/screenshots/MissingReact.cy.jsx/is missing React (failed).p (1280x599) ng @@ -1060,7 +1060,7 @@ https://on.cypress.io/uncaught-exception-from-application (Screenshots) - - /XXX/XXX/XXX/cypress/screenshots/MissingReactInSpec.cy.jsx/is missing React in t (1280x591) + - /XXX/XXX/XXX/cypress/screenshots/MissingReactInSpec.cy.jsx/is missing React in t (1280x599) his file (failed).png @@ -1291,7 +1291,7 @@ We dynamically generated a new test to display this failure. (Screenshots) - - /XXX/XXX/XXX/cypress/screenshots/AppCompilationError.cy.jsx/An uncaught error wa (1280x591) + - /XXX/XXX/XXX/cypress/screenshots/AppCompilationError.cy.jsx/An uncaught error wa (1280x599) s detected outside of a test (failed).png @@ -1374,12 +1374,12 @@ https://on.cypress.io/uncaught-exception-from-application (Screenshots) - - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- error on mount (failed) (1280x591) + - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- error on mount (failed) (1280x599) .png - - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- sync error (failed).png (1280x591) - - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- async error (failed).pn (1280x591) + - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- sync error (failed).png (1280x599) + - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- async error (failed).pn (1280x599) g - - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- command failure (failed (1280x591) + - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- command failure (failed (1280x599) ).png @@ -1425,7 +1425,7 @@ https://on.cypress.io/uncaught-exception-from-application (Screenshots) - - /XXX/XXX/XXX/cypress/screenshots/MissingReact.cy.jsx/is missing React (failed).p (1280x591) + - /XXX/XXX/XXX/cypress/screenshots/MissingReact.cy.jsx/is missing React (failed).p (1280x599) ng @@ -1463,7 +1463,7 @@ https://on.cypress.io/uncaught-exception-from-application (Screenshots) - - /XXX/XXX/XXX/cypress/screenshots/MissingReactInSpec.cy.jsx/is missing React in t (1280x591) + - /XXX/XXX/XXX/cypress/screenshots/MissingReactInSpec.cy.jsx/is missing React in t (1280x599) his file (failed).png diff --git a/system-tests/__snapshots__/webpack_dev_server_fresh_spec.ts.js b/system-tests/__snapshots__/webpack_dev_server_fresh_spec.ts.js index 1e24d3b213bc..899a2e7e58a3 100644 --- a/system-tests/__snapshots__/webpack_dev_server_fresh_spec.ts.js +++ b/system-tests/__snapshots__/webpack_dev_server_fresh_spec.ts.js @@ -321,7 +321,7 @@ We dynamically generated a new test to display this failure. (Screenshots) - - /XXX/XXX/XXX/cypress/screenshots/AppCompilationError.cy.jsx/An uncaught error wa (1280x591) + - /XXX/XXX/XXX/cypress/screenshots/AppCompilationError.cy.jsx/An uncaught error wa (1280x599) s detected outside of a test (failed).png @@ -404,12 +404,12 @@ https://on.cypress.io/uncaught-exception-from-application (Screenshots) - - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- error on mount (failed) (1280x591) + - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- error on mount (failed) (1280x599) .png - - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- sync error (failed).png (1280x591) - - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- async error (failed).pn (1280x591) + - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- sync error (failed).png (1280x599) + - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- async error (failed).pn (1280x599) g - - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- command failure (failed (1280x591) + - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- command failure (failed (1280x599) ).png @@ -455,7 +455,7 @@ https://on.cypress.io/uncaught-exception-from-application (Screenshots) - - /XXX/XXX/XXX/cypress/screenshots/MissingReact.cy.jsx/is missing React (failed).p (1280x591) + - /XXX/XXX/XXX/cypress/screenshots/MissingReact.cy.jsx/is missing React (failed).p (1280x599) ng @@ -493,7 +493,7 @@ https://on.cypress.io/uncaught-exception-from-application (Screenshots) - - /XXX/XXX/XXX/cypress/screenshots/MissingReactInSpec.cy.jsx/is missing React in t (1280x591) + - /XXX/XXX/XXX/cypress/screenshots/MissingReactInSpec.cy.jsx/is missing React in t (1280x599) his file (failed).png @@ -744,7 +744,7 @@ We dynamically generated a new test to display this failure. (Screenshots) - - /XXX/XXX/XXX/cypress/screenshots/AppCompilationError.cy.jsx/An uncaught error wa (1280x591) + - /XXX/XXX/XXX/cypress/screenshots/AppCompilationError.cy.jsx/An uncaught error wa (1280x599) s detected outside of a test (failed).png @@ -827,12 +827,12 @@ https://on.cypress.io/uncaught-exception-from-application (Screenshots) - - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- error on mount (failed) (1280x591) + - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- error on mount (failed) (1280x599) .png - - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- sync error (failed).png (1280x591) - - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- async error (failed).pn (1280x591) + - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- sync error (failed).png (1280x599) + - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- async error (failed).pn (1280x599) g - - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- command failure (failed (1280x591) + - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- command failure (failed (1280x599) ).png @@ -878,7 +878,7 @@ https://on.cypress.io/uncaught-exception-from-application (Screenshots) - - /XXX/XXX/XXX/cypress/screenshots/MissingReact.cy.jsx/is missing React (failed).p (1280x591) + - /XXX/XXX/XXX/cypress/screenshots/MissingReact.cy.jsx/is missing React (failed).p (1280x599) ng @@ -916,7 +916,7 @@ https://on.cypress.io/uncaught-exception-from-application (Screenshots) - - /XXX/XXX/XXX/cypress/screenshots/MissingReactInSpec.cy.jsx/is missing React in t (1280x591) + - /XXX/XXX/XXX/cypress/screenshots/MissingReactInSpec.cy.jsx/is missing React in t (1280x599) his file (failed).png @@ -1158,7 +1158,7 @@ We dynamically generated a new test to display this failure. (Screenshots) - - /XXX/XXX/XXX/cypress/screenshots/AppCompilationError.cy.jsx/An uncaught error wa (1280x591) + - /XXX/XXX/XXX/cypress/screenshots/AppCompilationError.cy.jsx/An uncaught error wa (1280x599) s detected outside of a test (failed).png @@ -1241,12 +1241,12 @@ https://on.cypress.io/uncaught-exception-from-application (Screenshots) - - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- error on mount (failed) (1280x591) + - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- error on mount (failed) (1280x599) .png - - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- sync error (failed).png (1280x591) - - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- async error (failed).pn (1280x591) + - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- sync error (failed).png (1280x599) + - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- async error (failed).pn (1280x599) g - - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- command failure (failed (1280x591) + - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- command failure (failed (1280x599) ).png @@ -1292,7 +1292,7 @@ https://on.cypress.io/uncaught-exception-from-application (Screenshots) - - /XXX/XXX/XXX/cypress/screenshots/MissingReact.cy.jsx/is missing React (failed).p (1280x591) + - /XXX/XXX/XXX/cypress/screenshots/MissingReact.cy.jsx/is missing React (failed).p (1280x599) ng @@ -1330,7 +1330,7 @@ https://on.cypress.io/uncaught-exception-from-application (Screenshots) - - /XXX/XXX/XXX/cypress/screenshots/MissingReactInSpec.cy.jsx/is missing React in t (1280x591) + - /XXX/XXX/XXX/cypress/screenshots/MissingReactInSpec.cy.jsx/is missing React in t (1280x599) his file (failed).png @@ -1584,7 +1584,7 @@ We dynamically generated a new test to display this failure. (Screenshots) - - /XXX/XXX/XXX/cypress/screenshots/AppCompilationError.cy.jsx/An uncaught error wa (1280x591) + - /XXX/XXX/XXX/cypress/screenshots/AppCompilationError.cy.jsx/An uncaught error wa (1280x599) s detected outside of a test (failed).png @@ -1667,12 +1667,12 @@ https://on.cypress.io/uncaught-exception-from-application (Screenshots) - - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- error on mount (failed) (1280x591) + - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- error on mount (failed) (1280x599) .png - - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- sync error (failed).png (1280x591) - - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- async error (failed).pn (1280x591) + - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- sync error (failed).png (1280x599) + - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- async error (failed).pn (1280x599) g - - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- command failure (failed (1280x591) + - /XXX/XXX/XXX/cypress/screenshots/Errors.cy.jsx/Errors -- command failure (failed (1280x599) ).png @@ -1718,7 +1718,7 @@ https://on.cypress.io/uncaught-exception-from-application (Screenshots) - - /XXX/XXX/XXX/cypress/screenshots/MissingReact.cy.jsx/is missing React (failed).p (1280x591) + - /XXX/XXX/XXX/cypress/screenshots/MissingReact.cy.jsx/is missing React (failed).p (1280x599) ng @@ -1756,7 +1756,7 @@ https://on.cypress.io/uncaught-exception-from-application (Screenshots) - - /XXX/XXX/XXX/cypress/screenshots/MissingReactInSpec.cy.jsx/is missing React in t (1280x591) + - /XXX/XXX/XXX/cypress/screenshots/MissingReactInSpec.cy.jsx/is missing React in t (1280x599) his file (failed).png From ab49bc1a38ae60be7f917f18201aca59208bee1a Mon Sep 17 00:00:00 2001 From: Cacie Prins Date: Fri, 19 Jan 2024 13:58:27 -0500 Subject: [PATCH 57/67] update protocol snapshots --- system-tests/__snapshots__/protocol_spec.js | 44 --------------------- 1 file changed, 44 deletions(-) diff --git a/system-tests/__snapshots__/protocol_spec.js b/system-tests/__snapshots__/protocol_spec.js index 352c6151e6d0..de9ad2ad01ff 100644 --- a/system-tests/__snapshots__/protocol_spec.js +++ b/system-tests/__snapshots__/protocol_spec.js @@ -6784,50 +6784,6 @@ exports['component events - experimentalSingleTabRunMode: true'] = ` "pageLoading": [], "resetTest": [], "responseEndedWithEmptyBody": [ - { - "requestId": "Any.Number", - "isCached": true, - "timings": { - "cdpRequestWillBeSentTimestamp": "Any.Number", - "cdpRequestWillBeSentReceivedTimestamp": "Any.Number", - "proxyRequestReceivedTimestamp": "Any.Number", - "cdpLagDuration": "Any.Number", - "proxyRequestCorrelationDuration": "Any.Number" - } - }, - { - "requestId": "Any.Number", - "isCached": true, - "timings": { - "cdpRequestWillBeSentTimestamp": "Any.Number", - "cdpRequestWillBeSentReceivedTimestamp": "Any.Number", - "proxyRequestReceivedTimestamp": "Any.Number", - "cdpLagDuration": "Any.Number", - "proxyRequestCorrelationDuration": "Any.Number" - } - }, - { - "requestId": "Any.Number", - "isCached": true, - "timings": { - "cdpRequestWillBeSentTimestamp": "Any.Number", - "cdpRequestWillBeSentReceivedTimestamp": "Any.Number", - "proxyRequestReceivedTimestamp": "Any.Number", - "cdpLagDuration": "Any.Number", - "proxyRequestCorrelationDuration": "Any.Number" - } - }, - { - "requestId": "Any.Number", - "isCached": true, - "timings": { - "cdpRequestWillBeSentTimestamp": "Any.Number", - "cdpRequestWillBeSentReceivedTimestamp": "Any.Number", - "proxyRequestReceivedTimestamp": "Any.Number", - "cdpLagDuration": "Any.Number", - "proxyRequestCorrelationDuration": "Any.Number" - } - }, { "requestId": "Any.Number", "isCached": true, From fabb6a18ad6c8214b8fd3f3c3284e5effa6adc3f Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Mon, 22 Jan 2024 08:58:03 -0600 Subject: [PATCH 58/67] Update after-pack-hook.js --- scripts/after-pack-hook.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/scripts/after-pack-hook.js b/scripts/after-pack-hook.js index 0ea34088976a..8e6ba93d5fce 100644 --- a/scripts/after-pack-hook.js +++ b/scripts/after-pack-hook.js @@ -105,7 +105,7 @@ module.exports = async function (params) { exePathPerPlatform[os.platform()], { version: FuseVersion.V1, - resetAdHocDarwinSignature: process.env.RESET_ADHOC_SIGNATURE === '1' && os.platform() === 'darwin' && os.arch() === 'arm64', + resetAdHocDarwinSignature: os.platform() === 'darwin' && os.arch() === 'arm64', [FuseV1Options.LoadBrowserProcessSpecificV8Snapshot]: true, [FuseV1Options.EnableNodeCliInspectArguments]: false, }, @@ -128,6 +128,15 @@ module.exports = async function (params) { await fs.remove(path.join(outputFolder, 'packages/server/index.js')) await fs.writeFile(path.join(outputFolder, 'index.js'), binaryEntryPointSource) + await flipFuses( + exePathPerPlatform[os.platform()], + { + version: FuseVersion.V1, + [FuseV1Options.LoadBrowserProcessSpecificV8Snapshot]: true, + [FuseV1Options.EnableNodeCliInspectArguments]: false, + }, + ) + await setupV8Snapshots({ cypressAppPath: params.appOutDir, useExistingSnapshotScript: true, From 219e4f6dab2dfa9a10ae95fe44c23724838d1bee Mon Sep 17 00:00:00 2001 From: Cacie Prins Date: Mon, 22 Jan 2024 14:18:04 -0500 Subject: [PATCH 59/67] fix flaky slideshow --- packages/app/src/debug/empty/DebugEmptyStates.cy.tsx | 3 +-- packages/app/src/debug/guide/DebugGuide.vue | 3 +++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/app/src/debug/empty/DebugEmptyStates.cy.tsx b/packages/app/src/debug/empty/DebugEmptyStates.cy.tsx index 5db0b6916a59..22ee6e78beeb 100644 --- a/packages/app/src/debug/empty/DebugEmptyStates.cy.tsx +++ b/packages/app/src/debug/empty/DebugEmptyStates.cy.tsx @@ -66,8 +66,7 @@ describe('Debug page empty states', { defaultCommandTimeout: 250 }, () => { // ensure the promos are done transitioning before clicking on the control // since 2 buttons could display if both promos are easing in and out - cy.findByTestId('promo-action') - .should('not.have.class', 'ease-in') + cy.findAllByTestId('guide-card', { timeout: 350 }).should('not.have.class', 'ease-in') .and('not.have.class', 'ease-out') cy.findByTestId('promo-action-control').click() diff --git a/packages/app/src/debug/guide/DebugGuide.vue b/packages/app/src/debug/guide/DebugGuide.vue index 22bc7073743c..cf532fd4d691 100644 --- a/packages/app/src/debug/guide/DebugGuide.vue +++ b/packages/app/src/debug/guide/DebugGuide.vue @@ -20,14 +20,17 @@ From d25780943113cb57677380beb7f30dddf6d2fa3d Mon Sep 17 00:00:00 2001 From: Cacie Prins Date: Wed, 24 Jan 2024 10:42:32 -0500 Subject: [PATCH 60/67] correct the chromium version in changelog --- cli/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/CHANGELOG.md b/cli/CHANGELOG.md index c6fd217e6df5..df16df44e357 100644 --- a/cli/CHANGELOG.md +++ b/cli/CHANGELOG.md @@ -8,7 +8,7 @@ _Released 1/30/2024 (PENDING)_ - Updated `@cypress/unique-selector` to include a performance optimization. It's possible this could improve performance of the selector playground. Addressed in [#28571](https://github.com/cypress-io/cypress/pull/28571). - Upgraded `electron` from `25.8.4` to `27.1.3` - Upgraded bundled Node.js version from `18.15.0` to `18.17.0` -- Upgraded bundled Chromium version from `114.0.5735.289` to `116.0.5845.228` +- Upgraded bundled Chromium version from `114.0.5735.289` to `118.0.5993.117` **Performance:** From 58160275fbcd6dab1dcdff14b8cca954ee35c003 Mon Sep 17 00:00:00 2001 From: Bill Glesias Date: Tue, 23 Jan 2024 10:43:26 -0500 Subject: [PATCH 61/67] =?UTF-8?q?chore:=20update=20release=20process=20gui?= =?UTF-8?q?de=20with=20refactored=20release-automatio=E2=80=A6=20(#28756)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- guides/release-process.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guides/release-process.md b/guides/release-process.md index b5c8871b06d4..4739db960613 100644 --- a/guides/release-process.md +++ b/guides/release-process.md @@ -178,7 +178,7 @@ _Note: It is advisable to notify the team that the `develop` branch is locked do 19. Add a comment to each GH issue that has been resolved with the new published version. Download the `releaseData.json` artifact from the `verify-release-readiness` CircleCI job and run the following command inside of [cypress-io/release-automations][release-automations]: ```shell - cd packages/issues-in-release && npm run do:comment -- --release-data + npm run do:comment -- --release-data ``` 22. Confirm there are no issues from the release with the label [stage: pending release](https://github.com/cypress-io/cypress/issues?q=label%3A%22stage%3A+pending+release%22+is%3Aclosed) left. From e3eb46c1e0bc25f5b042342c55c84b48e1e9dc76 Mon Sep 17 00:00:00 2001 From: Mike McCready <66998419+MikeMcC399@users.noreply.github.com> Date: Tue, 23 Jan 2024 16:50:52 +0100 Subject: [PATCH 62/67] docs: add pnpm to readme (#28781) --- README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 9867193933f2..b5df8a97cf7f 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Cypress Logo - +

@@ -57,6 +57,10 @@ or ```bash yarn add cypress --dev ``` +or +```bash +pnpm add cypress --save-dev +``` ![installing-cli e1693232](https://user-images.githubusercontent.com/1271364/31740846-7bf607f0-b420-11e7-855f-41c996040d31.gif) From 71c1bf312ceaa7cd6bf64421da0ab0a5d3ab7b95 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 23 Jan 2024 11:09:58 -0500 Subject: [PATCH 63/67] chore: Update Chrome (beta) to 121.0.6167.85 (#28778) Co-authored-by: cypress-bot[bot] <41898282+cypress-bot[bot]@users.noreply.github.com> --- browser-versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser-versions.json b/browser-versions.json index 0a7e2dcc9d86..35f1524111c0 100644 --- a/browser-versions.json +++ b/browser-versions.json @@ -1,5 +1,5 @@ { - "chrome:beta": "121.0.6167.57", + "chrome:beta": "121.0.6167.85", "chrome:stable": "120.0.6099.224", "chrome:minimum": "64.0.3282.0" } From 8d8a5473263416c10918f714c722d1b14c44f6d4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 23 Jan 2024 11:25:02 -0500 Subject: [PATCH 64/67] chore(deps): update dependency vite [security] (#28773) * chore(deps): update dependency vite [security] * empty commit to trigger CI --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Jennifer Shehane --- npm/react/package.json | 2 +- npm/vite-dev-server/package.json | 2 +- npm/vite-plugin-cypress-esm/package.json | 2 +- npm/vue/package.json | 2 +- packages/app/package.json | 2 +- packages/driver/package.json | 2 +- packages/frontend-shared/package.json | 2 +- packages/launchpad/package.json | 2 +- .../ct-public-api-solid-js/package-lock.json | 549 ++++++++---------- .../projects/missing-vite-config/yarn.lock | 328 ++++++----- yarn.lock | 440 +++++--------- 11 files changed, 552 insertions(+), 781 deletions(-) diff --git a/npm/react/package.json b/npm/react/package.json index 65404f824f48..f2c5ce4da66b 100644 --- a/npm/react/package.json +++ b/npm/react/package.json @@ -28,7 +28,7 @@ "react-router-dom": "6.0.0-alpha.1", "semver": "^7.5.3", "typescript": "^4.7.4", - "vite": "4.3.2", + "vite": "4.5.2", "vite-plugin-require-transform": "1.0.12" }, "peerDependencies": { diff --git a/npm/vite-dev-server/package.json b/npm/vite-dev-server/package.json index b1c40fb2da10..6ddf0b0a0888 100644 --- a/npm/vite-dev-server/package.json +++ b/npm/vite-dev-server/package.json @@ -26,7 +26,7 @@ "mocha": "^9.2.2", "sinon": "^13.0.1", "ts-node": "^10.9.2", - "vite": "4.3.2", + "vite": "4.5.2", "vite-plugin-inspect": "0.7.24" }, "files": [ diff --git a/npm/vite-plugin-cypress-esm/package.json b/npm/vite-plugin-cypress-esm/package.json index ea69ce3e0ac3..f4122491ba65 100644 --- a/npm/vite-plugin-cypress-esm/package.json +++ b/npm/vite-plugin-cypress-esm/package.json @@ -24,7 +24,7 @@ "react-query": "3.39.3", "react-router": "6.10.0", "react-router-dom": "6.10.0", - "vite": "4.1.4" + "vite": "4.5.2" }, "files": [ "dist", diff --git a/npm/vue/package.json b/npm/vue/package.json index d24c712596da..14ff2f3149d5 100644 --- a/npm/vue/package.json +++ b/npm/vue/package.json @@ -25,7 +25,7 @@ "globby": "^11.0.1", "tailwindcss": "1.1.4", "typescript": "^4.7.4", - "vite": "4.3.2", + "vite": "4.5.2", "vue": "3.2.47", "vue-i18n": "9.0.0-rc.6", "vue-router": "^4.0.0", diff --git a/packages/app/package.json b/packages/app/package.json index b715fafb2b85..8dd9d9eccf6e 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -66,7 +66,7 @@ "rollup-plugin-polyfill-node": "^0.7.0", "unplugin-icons": "0.13.2", "unplugin-vue-components": "^0.24.1", - "vite": "4.3.2", + "vite": "4.5.2", "vite-plugin-pages": "0.29.0", "vite-plugin-vue-layouts": "0.8.0", "vite-svg-loader": "4.0.0", diff --git a/packages/driver/package.json b/packages/driver/package.json index 315bdd6b90c2..a69c34ca67e7 100644 --- a/packages/driver/package.json +++ b/packages/driver/package.json @@ -83,7 +83,7 @@ "unfetch": "4.1.0", "url-parse": "1.5.9", "vanilla-text-mask": "5.1.1", - "vite": "4.3.2", + "vite": "4.5.2", "webpack": "^5.88.2", "zone.js": "0.9.0" }, diff --git a/packages/frontend-shared/package.json b/packages/frontend-shared/package.json index f6a154561835..01e203ea68d0 100644 --- a/packages/frontend-shared/package.json +++ b/packages/frontend-shared/package.json @@ -69,7 +69,7 @@ "tailwindcss": "^3.3.1", "unplugin-icons": "0.13.2", "unplugin-vue-components": "^0.24.1", - "vite": "4.3.2", + "vite": "4.5.2", "vite-plugin-components": "0.11.3", "vite-svg-loader": "4.0.0", "vue": "3.2.47", diff --git a/packages/launchpad/package.json b/packages/launchpad/package.json index 6f010afad768..c29997732b24 100644 --- a/packages/launchpad/package.json +++ b/packages/launchpad/package.json @@ -60,7 +60,7 @@ "rollup-plugin-polyfill-node": "^0.7.0", "type-fest": "^2.3.4", "unplugin-vue-components": "0.24.1", - "vite": "4.3.2", + "vite": "4.5.2", "vite-plugin-optimize-persist": "0.1.2", "vite-plugin-package-config": "0.1.1", "vite-svg-loader": "4.0.0", diff --git a/system-tests/projects/ct-public-api-solid-js/package-lock.json b/system-tests/projects/ct-public-api-solid-js/package-lock.json index f8e29fe1e914..4511c36d49cd 100644 --- a/system-tests/projects/ct-public-api-solid-js/package-lock.json +++ b/system-tests/projects/ct-public-api-solid-js/package-lock.json @@ -11,9 +11,9 @@ } }, "node_modules/@esbuild/android-arm": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.16.17.tgz", - "integrity": "sha512-N9x1CMXVhtWEAMS7pNNONyA14f71VPQN9Cnavj1XQh6T7bskqiLLrSca4O0Vr8Wdcga943eThxnVp3JLnBMYtw==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.20.tgz", + "integrity": "sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw==", "cpu": [ "arm" ], @@ -26,9 +26,9 @@ } }, "node_modules/@esbuild/android-arm64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.16.17.tgz", - "integrity": "sha512-MIGl6p5sc3RDTLLkYL1MyL8BMRN4tLMRCn+yRJJmEDvYZ2M7tmAf80hx1kbNEUX2KJ50RRtxZ4JHLvCfuB6kBg==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.20.tgz", + "integrity": "sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==", "cpu": [ "arm64" ], @@ -41,9 +41,9 @@ } }, "node_modules/@esbuild/android-x64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.16.17.tgz", - "integrity": "sha512-a3kTv3m0Ghh4z1DaFEuEDfz3OLONKuFvI4Xqczqx4BqLyuFaFkuaG4j2MtA6fuWEFeC5x9IvqnX7drmRq/fyAQ==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.20.tgz", + "integrity": "sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg==", "cpu": [ "x64" ], @@ -56,9 +56,9 @@ } }, "node_modules/@esbuild/darwin-arm64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.16.17.tgz", - "integrity": "sha512-/2agbUEfmxWHi9ARTX6OQ/KgXnOWfsNlTeLcoV7HSuSTv63E4DqtAc+2XqGw1KHxKMHGZgbVCZge7HXWX9Vn+w==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.20.tgz", + "integrity": "sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA==", "cpu": [ "arm64" ], @@ -71,9 +71,9 @@ } }, "node_modules/@esbuild/darwin-x64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.16.17.tgz", - "integrity": "sha512-2By45OBHulkd9Svy5IOCZt376Aa2oOkiE9QWUK9fe6Tb+WDr8hXL3dpqi+DeLiMed8tVXspzsTAvd0jUl96wmg==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.20.tgz", + "integrity": "sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ==", "cpu": [ "x64" ], @@ -86,9 +86,9 @@ } }, "node_modules/@esbuild/freebsd-arm64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.16.17.tgz", - "integrity": "sha512-mt+cxZe1tVx489VTb4mBAOo2aKSnJ33L9fr25JXpqQqzbUIw/yzIzi+NHwAXK2qYV1lEFp4OoVeThGjUbmWmdw==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.20.tgz", + "integrity": "sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw==", "cpu": [ "arm64" ], @@ -101,9 +101,9 @@ } }, "node_modules/@esbuild/freebsd-x64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.16.17.tgz", - "integrity": "sha512-8ScTdNJl5idAKjH8zGAsN7RuWcyHG3BAvMNpKOBaqqR7EbUhhVHOqXRdL7oZvz8WNHL2pr5+eIT5c65kA6NHug==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.20.tgz", + "integrity": "sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ==", "cpu": [ "x64" ], @@ -116,9 +116,9 @@ } }, "node_modules/@esbuild/linux-arm": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.16.17.tgz", - "integrity": "sha512-iihzrWbD4gIT7j3caMzKb/RsFFHCwqqbrbH9SqUSRrdXkXaygSZCZg1FybsZz57Ju7N/SHEgPyaR0LZ8Zbe9gQ==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.20.tgz", + "integrity": "sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg==", "cpu": [ "arm" ], @@ -131,9 +131,9 @@ } }, "node_modules/@esbuild/linux-arm64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.16.17.tgz", - "integrity": "sha512-7S8gJnSlqKGVJunnMCrXHU9Q8Q/tQIxk/xL8BqAP64wchPCTzuM6W3Ra8cIa1HIflAvDnNOt2jaL17vaW+1V0g==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.20.tgz", + "integrity": "sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA==", "cpu": [ "arm64" ], @@ -146,9 +146,9 @@ } }, "node_modules/@esbuild/linux-ia32": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.16.17.tgz", - "integrity": "sha512-kiX69+wcPAdgl3Lonh1VI7MBr16nktEvOfViszBSxygRQqSpzv7BffMKRPMFwzeJGPxcio0pdD3kYQGpqQ2SSg==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.20.tgz", + "integrity": "sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==", "cpu": [ "ia32" ], @@ -161,9 +161,9 @@ } }, "node_modules/@esbuild/linux-loong64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.16.17.tgz", - "integrity": "sha512-dTzNnQwembNDhd654cA4QhbS9uDdXC3TKqMJjgOWsC0yNCbpzfWoXdZvp0mY7HU6nzk5E0zpRGGx3qoQg8T2DQ==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.20.tgz", + "integrity": "sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg==", "cpu": [ "loong64" ], @@ -176,9 +176,9 @@ } }, "node_modules/@esbuild/linux-mips64el": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.16.17.tgz", - "integrity": "sha512-ezbDkp2nDl0PfIUn0CsQ30kxfcLTlcx4Foz2kYv8qdC6ia2oX5Q3E/8m6lq84Dj/6b0FrkgD582fJMIfHhJfSw==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.20.tgz", + "integrity": "sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ==", "cpu": [ "mips64el" ], @@ -191,9 +191,9 @@ } }, "node_modules/@esbuild/linux-ppc64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.16.17.tgz", - "integrity": "sha512-dzS678gYD1lJsW73zrFhDApLVdM3cUF2MvAa1D8K8KtcSKdLBPP4zZSLy6LFZ0jYqQdQ29bjAHJDgz0rVbLB3g==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.20.tgz", + "integrity": "sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA==", "cpu": [ "ppc64" ], @@ -206,9 +206,9 @@ } }, "node_modules/@esbuild/linux-riscv64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.16.17.tgz", - "integrity": "sha512-ylNlVsxuFjZK8DQtNUwiMskh6nT0vI7kYl/4fZgV1llP5d6+HIeL/vmmm3jpuoo8+NuXjQVZxmKuhDApK0/cKw==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.20.tgz", + "integrity": "sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A==", "cpu": [ "riscv64" ], @@ -221,9 +221,9 @@ } }, "node_modules/@esbuild/linux-s390x": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.16.17.tgz", - "integrity": "sha512-gzy7nUTO4UA4oZ2wAMXPNBGTzZFP7mss3aKR2hH+/4UUkCOyqmjXiKpzGrY2TlEUhbbejzXVKKGazYcQTZWA/w==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.20.tgz", + "integrity": "sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ==", "cpu": [ "s390x" ], @@ -236,9 +236,9 @@ } }, "node_modules/@esbuild/linux-x64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.16.17.tgz", - "integrity": "sha512-mdPjPxfnmoqhgpiEArqi4egmBAMYvaObgn4poorpUaqmvzzbvqbowRllQ+ZgzGVMGKaPkqUmPDOOFQRUFDmeUw==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.20.tgz", + "integrity": "sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w==", "cpu": [ "x64" ], @@ -251,9 +251,9 @@ } }, "node_modules/@esbuild/netbsd-x64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.16.17.tgz", - "integrity": "sha512-/PzmzD/zyAeTUsduZa32bn0ORug+Jd1EGGAUJvqfeixoEISYpGnAezN6lnJoskauoai0Jrs+XSyvDhppCPoKOA==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.20.tgz", + "integrity": "sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A==", "cpu": [ "x64" ], @@ -266,9 +266,9 @@ } }, "node_modules/@esbuild/openbsd-x64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.16.17.tgz", - "integrity": "sha512-2yaWJhvxGEz2RiftSk0UObqJa/b+rIAjnODJgv2GbGGpRwAfpgzyrg1WLK8rqA24mfZa9GvpjLcBBg8JHkoodg==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.20.tgz", + "integrity": "sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg==", "cpu": [ "x64" ], @@ -281,9 +281,9 @@ } }, "node_modules/@esbuild/sunos-x64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.16.17.tgz", - "integrity": "sha512-xtVUiev38tN0R3g8VhRfN7Zl42YCJvyBhRKw1RJjwE1d2emWTVToPLNEQj/5Qxc6lVFATDiy6LjVHYhIPrLxzw==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.20.tgz", + "integrity": "sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ==", "cpu": [ "x64" ], @@ -296,9 +296,9 @@ } }, "node_modules/@esbuild/win32-arm64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.16.17.tgz", - "integrity": "sha512-ga8+JqBDHY4b6fQAmOgtJJue36scANy4l/rL97W+0wYmijhxKetzZdKOJI7olaBaMhWt8Pac2McJdZLxXWUEQw==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.20.tgz", + "integrity": "sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg==", "cpu": [ "arm64" ], @@ -311,9 +311,9 @@ } }, "node_modules/@esbuild/win32-ia32": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.16.17.tgz", - "integrity": "sha512-WnsKaf46uSSF/sZhwnqE4L/F89AYNMiD4YtEcYekBt9Q7nj0DiId2XH2Ng2PHM54qi5oPrQ8luuzGszqi/veig==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.20.tgz", + "integrity": "sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g==", "cpu": [ "ia32" ], @@ -326,9 +326,9 @@ } }, "node_modules/@esbuild/win32-x64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.16.17.tgz", - "integrity": "sha512-y+EHuSchhL7FjHgvQL/0fnnFmO4T1bhvWANX6gcnqTjtnKWbTvUMCpGnv2+t+31d7RzyEAYAd4u2fnIhHL6N/Q==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.20.tgz", + "integrity": "sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==", "cpu": [ "x64" ], @@ -346,9 +346,9 @@ "integrity": "sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw==" }, "node_modules/esbuild": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.16.17.tgz", - "integrity": "sha512-G8LEkV0XzDMNwXKgM0Jwu3nY3lSTwSGY6XbxM9cr9+s0T/qSV1q1JVPBGzm3dcjhCic9+emZDmMffkwgPeOeLg==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.20.tgz", + "integrity": "sha512-ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA==", "hasInstallScript": true, "bin": { "esbuild": "bin/esbuild" @@ -357,28 +357,28 @@ "node": ">=12" }, "optionalDependencies": { - "@esbuild/android-arm": "0.16.17", - "@esbuild/android-arm64": "0.16.17", - "@esbuild/android-x64": "0.16.17", - "@esbuild/darwin-arm64": "0.16.17", - "@esbuild/darwin-x64": "0.16.17", - "@esbuild/freebsd-arm64": "0.16.17", - "@esbuild/freebsd-x64": "0.16.17", - "@esbuild/linux-arm": "0.16.17", - "@esbuild/linux-arm64": "0.16.17", - "@esbuild/linux-ia32": "0.16.17", - "@esbuild/linux-loong64": "0.16.17", - "@esbuild/linux-mips64el": "0.16.17", - "@esbuild/linux-ppc64": "0.16.17", - "@esbuild/linux-riscv64": "0.16.17", - "@esbuild/linux-s390x": "0.16.17", - "@esbuild/linux-x64": "0.16.17", - "@esbuild/netbsd-x64": "0.16.17", - "@esbuild/openbsd-x64": "0.16.17", - "@esbuild/sunos-x64": "0.16.17", - "@esbuild/win32-arm64": "0.16.17", - "@esbuild/win32-ia32": "0.16.17", - "@esbuild/win32-x64": "0.16.17" + "@esbuild/android-arm": "0.18.20", + "@esbuild/android-arm64": "0.18.20", + "@esbuild/android-x64": "0.18.20", + "@esbuild/darwin-arm64": "0.18.20", + "@esbuild/darwin-x64": "0.18.20", + "@esbuild/freebsd-arm64": "0.18.20", + "@esbuild/freebsd-x64": "0.18.20", + "@esbuild/linux-arm": "0.18.20", + "@esbuild/linux-arm64": "0.18.20", + "@esbuild/linux-ia32": "0.18.20", + "@esbuild/linux-loong64": "0.18.20", + "@esbuild/linux-mips64el": "0.18.20", + "@esbuild/linux-ppc64": "0.18.20", + "@esbuild/linux-riscv64": "0.18.20", + "@esbuild/linux-s390x": "0.18.20", + "@esbuild/linux-x64": "0.18.20", + "@esbuild/netbsd-x64": "0.18.20", + "@esbuild/openbsd-x64": "0.18.20", + "@esbuild/sunos-x64": "0.18.20", + "@esbuild/win32-arm64": "0.18.20", + "@esbuild/win32-ia32": "0.18.20", + "@esbuild/win32-x64": "0.18.20" } }, "node_modules/fsevents": { @@ -394,37 +394,16 @@ "node": "^8.16.0 || ^10.6.0 || >=11.0.0" } }, - "node_modules/function-bind": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" - }, - "node_modules/has": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", - "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", - "dependencies": { - "function-bind": "^1.1.1" - }, - "engines": { - "node": ">= 0.4.0" - } - }, - "node_modules/is-core-module": { - "version": "2.11.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz", - "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==", - "dependencies": { - "has": "^1.0.3" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/nanoid": { - "version": "3.3.4", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz", - "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==", + "version": "3.3.7", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz", + "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], "bin": { "nanoid": "bin/nanoid.cjs" }, @@ -432,20 +411,15 @@ "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" } }, - "node_modules/path-parse": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", - "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==" - }, "node_modules/picocolors": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==" }, "node_modules/postcss": { - "version": "8.4.21", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.21.tgz", - "integrity": "sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg==", + "version": "8.4.33", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.33.tgz", + "integrity": "sha512-Kkpbhhdjw2qQs2O2DGX+8m5OVqEcbB9HRBvuYM9pgrjEFUg30A9LmXNlTAUj4S9kgtGyrMbTzVjH7E+s5Re2yg==", "funding": [ { "type": "opencollective", @@ -454,10 +428,14 @@ { "type": "tidelift", "url": "https://tidelift.com/funding/github/npm/postcss" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" } ], "dependencies": { - "nanoid": "^3.3.4", + "nanoid": "^3.3.7", "picocolors": "^1.0.0", "source-map-js": "^1.0.2" }, @@ -465,26 +443,10 @@ "node": "^10 || ^12 || >=14" } }, - "node_modules/resolve": { - "version": "1.22.1", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz", - "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==", - "dependencies": { - "is-core-module": "^2.9.0", - "path-parse": "^1.0.7", - "supports-preserve-symlinks-flag": "^1.0.0" - }, - "bin": { - "resolve": "bin/resolve" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/rollup": { - "version": "3.17.1", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.17.1.tgz", - "integrity": "sha512-8RnSms6rNqHmZK+wiqgnPCqen+rRnUHXkciGDirh7B00g1rX1vpKbPDhuxCvAG2bburoI+W4Q9/PlUB/zYkiYA==", + "version": "3.29.4", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.4.tgz", + "integrity": "sha512-oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw==", "bin": { "rollup": "dist/bin/rollup" }, @@ -512,26 +474,14 @@ "node": ">=0.10.0" } }, - "node_modules/supports-preserve-symlinks-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", - "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/vite": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/vite/-/vite-4.1.2.tgz", - "integrity": "sha512-MWDb9Rfy3DI8omDQySbMK93nQqStwbsQWejXRY2EBzEWKmLAXWb1mkI9Yw2IJrc+oCvPCI1Os5xSSIBYY6DEAw==", + "version": "4.5.2", + "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.2.tgz", + "integrity": "sha512-tBCZBNSBbHQkaGyhGCDUGqeo2ph8Fstyp6FMSvTtsXeZSPpSMGlviAOav2hxVTqFcx8Hj/twtWKsMJXNY0xI8w==", "dependencies": { - "esbuild": "^0.16.14", - "postcss": "^8.4.21", - "resolve": "^1.22.1", - "rollup": "^3.10.0" + "esbuild": "^0.18.10", + "postcss": "^8.4.27", + "rollup": "^3.27.1" }, "bin": { "vite": "bin/vite.js" @@ -539,12 +489,16 @@ "engines": { "node": "^14.18.0 || >=16.0.0" }, + "funding": { + "url": "https://github.com/vitejs/vite?sponsor=1" + }, "optionalDependencies": { "fsevents": "~2.3.2" }, "peerDependencies": { - "@types/node": ">= 18", + "@types/node": ">= 14", "less": "*", + "lightningcss": "^1.21.0", "sass": "*", "stylus": "*", "sugarss": "*", @@ -557,6 +511,9 @@ "less": { "optional": true }, + "lightningcss": { + "optional": true + }, "sass": { "optional": true }, @@ -574,135 +531,135 @@ }, "dependencies": { "@esbuild/android-arm": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.16.17.tgz", - "integrity": "sha512-N9x1CMXVhtWEAMS7pNNONyA14f71VPQN9Cnavj1XQh6T7bskqiLLrSca4O0Vr8Wdcga943eThxnVp3JLnBMYtw==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.20.tgz", + "integrity": "sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw==", "optional": true }, "@esbuild/android-arm64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.16.17.tgz", - "integrity": "sha512-MIGl6p5sc3RDTLLkYL1MyL8BMRN4tLMRCn+yRJJmEDvYZ2M7tmAf80hx1kbNEUX2KJ50RRtxZ4JHLvCfuB6kBg==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.20.tgz", + "integrity": "sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==", "optional": true }, "@esbuild/android-x64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.16.17.tgz", - "integrity": "sha512-a3kTv3m0Ghh4z1DaFEuEDfz3OLONKuFvI4Xqczqx4BqLyuFaFkuaG4j2MtA6fuWEFeC5x9IvqnX7drmRq/fyAQ==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.20.tgz", + "integrity": "sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg==", "optional": true }, "@esbuild/darwin-arm64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.16.17.tgz", - "integrity": "sha512-/2agbUEfmxWHi9ARTX6OQ/KgXnOWfsNlTeLcoV7HSuSTv63E4DqtAc+2XqGw1KHxKMHGZgbVCZge7HXWX9Vn+w==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.20.tgz", + "integrity": "sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA==", "optional": true }, "@esbuild/darwin-x64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.16.17.tgz", - "integrity": "sha512-2By45OBHulkd9Svy5IOCZt376Aa2oOkiE9QWUK9fe6Tb+WDr8hXL3dpqi+DeLiMed8tVXspzsTAvd0jUl96wmg==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.20.tgz", + "integrity": "sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ==", "optional": true }, "@esbuild/freebsd-arm64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.16.17.tgz", - "integrity": "sha512-mt+cxZe1tVx489VTb4mBAOo2aKSnJ33L9fr25JXpqQqzbUIw/yzIzi+NHwAXK2qYV1lEFp4OoVeThGjUbmWmdw==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.20.tgz", + "integrity": "sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw==", "optional": true }, "@esbuild/freebsd-x64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.16.17.tgz", - "integrity": "sha512-8ScTdNJl5idAKjH8zGAsN7RuWcyHG3BAvMNpKOBaqqR7EbUhhVHOqXRdL7oZvz8WNHL2pr5+eIT5c65kA6NHug==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.20.tgz", + "integrity": "sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ==", "optional": true }, "@esbuild/linux-arm": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.16.17.tgz", - "integrity": "sha512-iihzrWbD4gIT7j3caMzKb/RsFFHCwqqbrbH9SqUSRrdXkXaygSZCZg1FybsZz57Ju7N/SHEgPyaR0LZ8Zbe9gQ==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.20.tgz", + "integrity": "sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg==", "optional": true }, "@esbuild/linux-arm64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.16.17.tgz", - "integrity": "sha512-7S8gJnSlqKGVJunnMCrXHU9Q8Q/tQIxk/xL8BqAP64wchPCTzuM6W3Ra8cIa1HIflAvDnNOt2jaL17vaW+1V0g==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.20.tgz", + "integrity": "sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA==", "optional": true }, "@esbuild/linux-ia32": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.16.17.tgz", - "integrity": "sha512-kiX69+wcPAdgl3Lonh1VI7MBr16nktEvOfViszBSxygRQqSpzv7BffMKRPMFwzeJGPxcio0pdD3kYQGpqQ2SSg==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.20.tgz", + "integrity": "sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==", "optional": true }, "@esbuild/linux-loong64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.16.17.tgz", - "integrity": "sha512-dTzNnQwembNDhd654cA4QhbS9uDdXC3TKqMJjgOWsC0yNCbpzfWoXdZvp0mY7HU6nzk5E0zpRGGx3qoQg8T2DQ==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.20.tgz", + "integrity": "sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg==", "optional": true }, "@esbuild/linux-mips64el": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.16.17.tgz", - "integrity": "sha512-ezbDkp2nDl0PfIUn0CsQ30kxfcLTlcx4Foz2kYv8qdC6ia2oX5Q3E/8m6lq84Dj/6b0FrkgD582fJMIfHhJfSw==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.20.tgz", + "integrity": "sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ==", "optional": true }, "@esbuild/linux-ppc64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.16.17.tgz", - "integrity": "sha512-dzS678gYD1lJsW73zrFhDApLVdM3cUF2MvAa1D8K8KtcSKdLBPP4zZSLy6LFZ0jYqQdQ29bjAHJDgz0rVbLB3g==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.20.tgz", + "integrity": "sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA==", "optional": true }, "@esbuild/linux-riscv64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.16.17.tgz", - "integrity": "sha512-ylNlVsxuFjZK8DQtNUwiMskh6nT0vI7kYl/4fZgV1llP5d6+HIeL/vmmm3jpuoo8+NuXjQVZxmKuhDApK0/cKw==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.20.tgz", + "integrity": "sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A==", "optional": true }, "@esbuild/linux-s390x": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.16.17.tgz", - "integrity": "sha512-gzy7nUTO4UA4oZ2wAMXPNBGTzZFP7mss3aKR2hH+/4UUkCOyqmjXiKpzGrY2TlEUhbbejzXVKKGazYcQTZWA/w==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.20.tgz", + "integrity": "sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ==", "optional": true }, "@esbuild/linux-x64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.16.17.tgz", - "integrity": "sha512-mdPjPxfnmoqhgpiEArqi4egmBAMYvaObgn4poorpUaqmvzzbvqbowRllQ+ZgzGVMGKaPkqUmPDOOFQRUFDmeUw==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.20.tgz", + "integrity": "sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w==", "optional": true }, "@esbuild/netbsd-x64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.16.17.tgz", - "integrity": "sha512-/PzmzD/zyAeTUsduZa32bn0ORug+Jd1EGGAUJvqfeixoEISYpGnAezN6lnJoskauoai0Jrs+XSyvDhppCPoKOA==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.20.tgz", + "integrity": "sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A==", "optional": true }, "@esbuild/openbsd-x64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.16.17.tgz", - "integrity": "sha512-2yaWJhvxGEz2RiftSk0UObqJa/b+rIAjnODJgv2GbGGpRwAfpgzyrg1WLK8rqA24mfZa9GvpjLcBBg8JHkoodg==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.20.tgz", + "integrity": "sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg==", "optional": true }, "@esbuild/sunos-x64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.16.17.tgz", - "integrity": "sha512-xtVUiev38tN0R3g8VhRfN7Zl42YCJvyBhRKw1RJjwE1d2emWTVToPLNEQj/5Qxc6lVFATDiy6LjVHYhIPrLxzw==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.20.tgz", + "integrity": "sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ==", "optional": true }, "@esbuild/win32-arm64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.16.17.tgz", - "integrity": "sha512-ga8+JqBDHY4b6fQAmOgtJJue36scANy4l/rL97W+0wYmijhxKetzZdKOJI7olaBaMhWt8Pac2McJdZLxXWUEQw==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.20.tgz", + "integrity": "sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg==", "optional": true }, "@esbuild/win32-ia32": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.16.17.tgz", - "integrity": "sha512-WnsKaf46uSSF/sZhwnqE4L/F89AYNMiD4YtEcYekBt9Q7nj0DiId2XH2Ng2PHM54qi5oPrQ8luuzGszqi/veig==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.20.tgz", + "integrity": "sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g==", "optional": true }, "@esbuild/win32-x64": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.16.17.tgz", - "integrity": "sha512-y+EHuSchhL7FjHgvQL/0fnnFmO4T1bhvWANX6gcnqTjtnKWbTvUMCpGnv2+t+31d7RzyEAYAd4u2fnIhHL6N/Q==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.20.tgz", + "integrity": "sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==", "optional": true }, "csstype": { @@ -711,32 +668,32 @@ "integrity": "sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw==" }, "esbuild": { - "version": "0.16.17", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.16.17.tgz", - "integrity": "sha512-G8LEkV0XzDMNwXKgM0Jwu3nY3lSTwSGY6XbxM9cr9+s0T/qSV1q1JVPBGzm3dcjhCic9+emZDmMffkwgPeOeLg==", + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.20.tgz", + "integrity": "sha512-ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA==", "requires": { - "@esbuild/android-arm": "0.16.17", - "@esbuild/android-arm64": "0.16.17", - "@esbuild/android-x64": "0.16.17", - "@esbuild/darwin-arm64": "0.16.17", - "@esbuild/darwin-x64": "0.16.17", - "@esbuild/freebsd-arm64": "0.16.17", - "@esbuild/freebsd-x64": "0.16.17", - "@esbuild/linux-arm": "0.16.17", - "@esbuild/linux-arm64": "0.16.17", - "@esbuild/linux-ia32": "0.16.17", - "@esbuild/linux-loong64": "0.16.17", - "@esbuild/linux-mips64el": "0.16.17", - "@esbuild/linux-ppc64": "0.16.17", - "@esbuild/linux-riscv64": "0.16.17", - "@esbuild/linux-s390x": "0.16.17", - "@esbuild/linux-x64": "0.16.17", - "@esbuild/netbsd-x64": "0.16.17", - "@esbuild/openbsd-x64": "0.16.17", - "@esbuild/sunos-x64": "0.16.17", - "@esbuild/win32-arm64": "0.16.17", - "@esbuild/win32-ia32": "0.16.17", - "@esbuild/win32-x64": "0.16.17" + "@esbuild/android-arm": "0.18.20", + "@esbuild/android-arm64": "0.18.20", + "@esbuild/android-x64": "0.18.20", + "@esbuild/darwin-arm64": "0.18.20", + "@esbuild/darwin-x64": "0.18.20", + "@esbuild/freebsd-arm64": "0.18.20", + "@esbuild/freebsd-x64": "0.18.20", + "@esbuild/linux-arm": "0.18.20", + "@esbuild/linux-arm64": "0.18.20", + "@esbuild/linux-ia32": "0.18.20", + "@esbuild/linux-loong64": "0.18.20", + "@esbuild/linux-mips64el": "0.18.20", + "@esbuild/linux-ppc64": "0.18.20", + "@esbuild/linux-riscv64": "0.18.20", + "@esbuild/linux-s390x": "0.18.20", + "@esbuild/linux-x64": "0.18.20", + "@esbuild/netbsd-x64": "0.18.20", + "@esbuild/openbsd-x64": "0.18.20", + "@esbuild/sunos-x64": "0.18.20", + "@esbuild/win32-arm64": "0.18.20", + "@esbuild/win32-ia32": "0.18.20", + "@esbuild/win32-x64": "0.18.20" } }, "fsevents": { @@ -745,36 +702,10 @@ "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", "optional": true }, - "function-bind": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" - }, - "has": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", - "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", - "requires": { - "function-bind": "^1.1.1" - } - }, - "is-core-module": { - "version": "2.11.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz", - "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==", - "requires": { - "has": "^1.0.3" - } - }, "nanoid": { - "version": "3.3.4", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz", - "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==" - }, - "path-parse": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", - "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==" + "version": "3.3.7", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz", + "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==" }, "picocolors": { "version": "1.0.0", @@ -782,29 +713,19 @@ "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==" }, "postcss": { - "version": "8.4.21", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.21.tgz", - "integrity": "sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg==", + "version": "8.4.33", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.33.tgz", + "integrity": "sha512-Kkpbhhdjw2qQs2O2DGX+8m5OVqEcbB9HRBvuYM9pgrjEFUg30A9LmXNlTAUj4S9kgtGyrMbTzVjH7E+s5Re2yg==", "requires": { - "nanoid": "^3.3.4", + "nanoid": "^3.3.7", "picocolors": "^1.0.0", "source-map-js": "^1.0.2" } }, - "resolve": { - "version": "1.22.1", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz", - "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==", - "requires": { - "is-core-module": "^2.9.0", - "path-parse": "^1.0.7", - "supports-preserve-symlinks-flag": "^1.0.0" - } - }, "rollup": { - "version": "3.17.1", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.17.1.tgz", - "integrity": "sha512-8RnSms6rNqHmZK+wiqgnPCqen+rRnUHXkciGDirh7B00g1rX1vpKbPDhuxCvAG2bburoI+W4Q9/PlUB/zYkiYA==", + "version": "3.29.4", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.4.tgz", + "integrity": "sha512-oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw==", "requires": { "fsevents": "~2.3.2" } @@ -822,21 +743,15 @@ "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz", "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==" }, - "supports-preserve-symlinks-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", - "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==" - }, "vite": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/vite/-/vite-4.1.2.tgz", - "integrity": "sha512-MWDb9Rfy3DI8omDQySbMK93nQqStwbsQWejXRY2EBzEWKmLAXWb1mkI9Yw2IJrc+oCvPCI1Os5xSSIBYY6DEAw==", + "version": "4.5.2", + "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.2.tgz", + "integrity": "sha512-tBCZBNSBbHQkaGyhGCDUGqeo2ph8Fstyp6FMSvTtsXeZSPpSMGlviAOav2hxVTqFcx8Hj/twtWKsMJXNY0xI8w==", "requires": { - "esbuild": "^0.16.14", + "esbuild": "^0.18.10", "fsevents": "~2.3.2", - "postcss": "^8.4.21", - "resolve": "^1.22.1", - "rollup": "^3.10.0" + "postcss": "^8.4.27", + "rollup": "^3.27.1" } } } diff --git a/system-tests/projects/missing-vite-config/yarn.lock b/system-tests/projects/missing-vite-config/yarn.lock index 9dedad7ce43c..ce7d0040ec51 100644 --- a/system-tests/projects/missing-vite-config/yarn.lock +++ b/system-tests/projects/missing-vite-config/yarn.lock @@ -2,160 +2,166 @@ # yarn lockfile v1 -esbuild-android-64@0.14.39: - version "0.14.39" - resolved "https://registry.yarnpkg.com/esbuild-android-64/-/esbuild-android-64-0.14.39.tgz#09f12a372eed9743fd77ff6d889ac14f7b340c21" - integrity sha512-EJOu04p9WgZk0UoKTqLId9VnIsotmI/Z98EXrKURGb3LPNunkeffqQIkjS2cAvidh+OK5uVrXaIP229zK6GvhQ== - -esbuild-android-arm64@0.14.39: - version "0.14.39" - resolved "https://registry.yarnpkg.com/esbuild-android-arm64/-/esbuild-android-arm64-0.14.39.tgz#f608d00ea03fe26f3b1ab92a30f99220390f3071" - integrity sha512-+twajJqO7n3MrCz9e+2lVOnFplRsaGRwsq1KL/uOy7xK7QdRSprRQcObGDeDZUZsacD5gUkk6OiHiYp6RzU3CA== - -esbuild-darwin-64@0.14.39: - version "0.14.39" - resolved "https://registry.yarnpkg.com/esbuild-darwin-64/-/esbuild-darwin-64-0.14.39.tgz#31528daa75b4c9317721ede344195163fae3e041" - integrity sha512-ImT6eUw3kcGcHoUxEcdBpi6LfTRWaV6+qf32iYYAfwOeV+XaQ/Xp5XQIBiijLeo+LpGci9M0FVec09nUw41a5g== - -esbuild-darwin-arm64@0.14.39: - version "0.14.39" - resolved "https://registry.yarnpkg.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.39.tgz#247f770d86d90a215fa194f24f90e30a0bd97245" - integrity sha512-/fcQ5UhE05OiT+bW5v7/up1bDsnvaRZPJxXwzXsMRrr7rZqPa85vayrD723oWMT64dhrgWeA3FIneF8yER0XTw== - -esbuild-freebsd-64@0.14.39: - version "0.14.39" - resolved "https://registry.yarnpkg.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.39.tgz#479414d294905055eb396ebe455ed42213284ee0" - integrity sha512-oMNH8lJI4wtgN5oxuFP7BQ22vgB/e3Tl5Woehcd6i2r6F3TszpCnNl8wo2d/KvyQ4zvLvCWAlRciumhQg88+kQ== - -esbuild-freebsd-arm64@0.14.39: - version "0.14.39" - resolved "https://registry.yarnpkg.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.39.tgz#cedeb10357c88533615921ae767a67dc870a474c" - integrity sha512-1GHK7kwk57ukY2yI4ILWKJXaxfr+8HcM/r/JKCGCPziIVlL+Wi7RbJ2OzMcTKZ1HpvEqCTBT/J6cO4ZEwW4Ypg== - -esbuild-linux-32@0.14.39: - version "0.14.39" - resolved "https://registry.yarnpkg.com/esbuild-linux-32/-/esbuild-linux-32-0.14.39.tgz#d9f008c4322d771f3958f59c1eee5a05cdf92485" - integrity sha512-g97Sbb6g4zfRLIxHgW2pc393DjnkTRMeq3N1rmjDUABxpx8SjocK4jLen+/mq55G46eE2TA0MkJ4R3SpKMu7dg== - -esbuild-linux-64@0.14.39: - version "0.14.39" - resolved "https://registry.yarnpkg.com/esbuild-linux-64/-/esbuild-linux-64-0.14.39.tgz#ba58d7f66858913aeb1ab5c6bde1bbd824731795" - integrity sha512-4tcgFDYWdI+UbNMGlua9u1Zhu0N5R6u9tl5WOM8aVnNX143JZoBZLpCuUr5lCKhnD0SCO+5gUyMfupGrHtfggQ== - -esbuild-linux-arm64@0.14.39: - version "0.14.39" - resolved "https://registry.yarnpkg.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.39.tgz#708785a30072702b5b1c16b65cf9c25c51202529" - integrity sha512-23pc8MlD2D6Px1mV8GMglZlKgwgNKAO8gsgsLLcXWSs9lQsCYkIlMo/2Ycfo5JrDIbLdwgP8D2vpfH2KcBqrDQ== - -esbuild-linux-arm@0.14.39: - version "0.14.39" - resolved "https://registry.yarnpkg.com/esbuild-linux-arm/-/esbuild-linux-arm-0.14.39.tgz#4e8b5deaa7ab60d0d28fab131244ef82b40684f4" - integrity sha512-t0Hn1kWVx5UpCzAJkKRfHeYOLyFnXwYynIkK54/h3tbMweGI7dj400D1k0Vvtj2u1P+JTRT9tx3AjtLEMmfVBQ== - -esbuild-linux-mips64le@0.14.39: - version "0.14.39" - resolved "https://registry.yarnpkg.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.39.tgz#6f3bf3023f711084e5a1e8190487d2020f39f0f7" - integrity sha512-epwlYgVdbmkuRr5n4es3B+yDI0I2e/nxhKejT9H0OLxFAlMkeQZxSpxATpDc9m8NqRci6Kwyb/SfmD1koG2Zuw== - -esbuild-linux-ppc64le@0.14.39: - version "0.14.39" - resolved "https://registry.yarnpkg.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.39.tgz#900e718a4ea3f6aedde8424828eeefdd4b48d4b9" - integrity sha512-W/5ezaq+rQiQBThIjLMNjsuhPHg+ApVAdTz2LvcuesZFMsJoQAW2hutoyg47XxpWi7aEjJGrkS26qCJKhRn3QQ== - -esbuild-linux-riscv64@0.14.39: - version "0.14.39" - resolved "https://registry.yarnpkg.com/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.39.tgz#dcbff622fa37047a75d2ff7a1d8d2949d80277e4" - integrity sha512-IS48xeokcCTKeQIOke2O0t9t14HPvwnZcy+5baG13Z1wxs9ZrC5ig5ypEQQh4QMKxURD5TpCLHw2W42CLuVZaA== - -esbuild-linux-s390x@0.14.39: - version "0.14.39" - resolved "https://registry.yarnpkg.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.39.tgz#3f725a7945b419406c99d93744b28552561dcdfd" - integrity sha512-zEfunpqR8sMomqXhNTFEKDs+ik7HC01m3M60MsEjZOqaywHu5e5682fMsqOlZbesEAAaO9aAtRBsU7CHnSZWyA== - -esbuild-netbsd-64@0.14.39: - version "0.14.39" - resolved "https://registry.yarnpkg.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.39.tgz#e10e40b6a765798b90d4eb85901cc85c8b7ff85e" - integrity sha512-Uo2suJBSIlrZCe4E0k75VDIFJWfZy+bOV6ih3T4MVMRJh1lHJ2UyGoaX4bOxomYN3t+IakHPyEoln1+qJ1qYaA== - -esbuild-openbsd-64@0.14.39: - version "0.14.39" - resolved "https://registry.yarnpkg.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.39.tgz#935ec143f75ce10bd9cdb1c87fee00287eb0edbc" - integrity sha512-secQU+EpgUPpYjJe3OecoeGKVvRMLeKUxSMGHnK+aK5uQM3n1FPXNJzyz1LHFOo0WOyw+uoCxBYdM4O10oaCAA== - -esbuild-sunos-64@0.14.39: - version "0.14.39" - resolved "https://registry.yarnpkg.com/esbuild-sunos-64/-/esbuild-sunos-64-0.14.39.tgz#0e7aa82b022a2e6d55b0646738b2582c2d72c3c0" - integrity sha512-qHq0t5gePEDm2nqZLb+35p/qkaXVS7oIe32R0ECh2HOdiXXkj/1uQI9IRogGqKkK+QjDG+DhwiUw7QoHur/Rwg== - -esbuild-windows-32@0.14.39: - version "0.14.39" - resolved "https://registry.yarnpkg.com/esbuild-windows-32/-/esbuild-windows-32-0.14.39.tgz#3f1538241f31b538545f4b5841b248cac260fa35" - integrity sha512-XPjwp2OgtEX0JnOlTgT6E5txbRp6Uw54Isorm3CwOtloJazeIWXuiwK0ONJBVb/CGbiCpS7iP2UahGgd2p1x+Q== - -esbuild-windows-64@0.14.39: - version "0.14.39" - resolved "https://registry.yarnpkg.com/esbuild-windows-64/-/esbuild-windows-64-0.14.39.tgz#b100c59f96d3c2da2e796e42fee4900d755d3e03" - integrity sha512-E2wm+5FwCcLpKsBHRw28bSYQw0Ikxb7zIMxw3OPAkiaQhLVr3dnVO8DofmbWhhf6b97bWzg37iSZ45ZDpLw7Ow== - -esbuild-windows-arm64@0.14.39: - version "0.14.39" - resolved "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.39.tgz#00268517e665b33c89778d61f144e4256b39f631" - integrity sha512-sBZQz5D+Gd0EQ09tZRnz/PpVdLwvp/ufMtJ1iDFYddDaPpZXKqPyaxfYBLs3ueiaksQ26GGa7sci0OqFzNs7KA== +"@esbuild/linux-loong64@0.14.54": + version "0.14.54" + resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.14.54.tgz#de2a4be678bd4d0d1ffbb86e6de779cde5999028" + integrity sha512-bZBrLAIX1kpWelV0XemxBZllyRmM6vgFQQG2GdNb+r3Fkp0FOh1NJSvekXDs7jq70k4euu1cryLMfU+mTXlEpw== + +esbuild-android-64@0.14.54: + version "0.14.54" + resolved "https://registry.yarnpkg.com/esbuild-android-64/-/esbuild-android-64-0.14.54.tgz#505f41832884313bbaffb27704b8bcaa2d8616be" + integrity sha512-Tz2++Aqqz0rJ7kYBfz+iqyE3QMycD4vk7LBRyWaAVFgFtQ/O8EJOnVmTOiDWYZ/uYzB4kvP+bqejYdVKzE5lAQ== + +esbuild-android-arm64@0.14.54: + version "0.14.54" + resolved "https://registry.yarnpkg.com/esbuild-android-arm64/-/esbuild-android-arm64-0.14.54.tgz#8ce69d7caba49646e009968fe5754a21a9871771" + integrity sha512-F9E+/QDi9sSkLaClO8SOV6etqPd+5DgJje1F9lOWoNncDdOBL2YF59IhsWATSt0TLZbYCf3pNlTHvVV5VfHdvg== + +esbuild-darwin-64@0.14.54: + version "0.14.54" + resolved "https://registry.yarnpkg.com/esbuild-darwin-64/-/esbuild-darwin-64-0.14.54.tgz#24ba67b9a8cb890a3c08d9018f887cc221cdda25" + integrity sha512-jtdKWV3nBviOd5v4hOpkVmpxsBy90CGzebpbO9beiqUYVMBtSc0AL9zGftFuBon7PNDcdvNCEuQqw2x0wP9yug== + +esbuild-darwin-arm64@0.14.54: + version "0.14.54" + resolved "https://registry.yarnpkg.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.54.tgz#3f7cdb78888ee05e488d250a2bdaab1fa671bf73" + integrity sha512-OPafJHD2oUPyvJMrsCvDGkRrVCar5aVyHfWGQzY1dWnzErjrDuSETxwA2HSsyg2jORLY8yBfzc1MIpUkXlctmw== + +esbuild-freebsd-64@0.14.54: + version "0.14.54" + resolved "https://registry.yarnpkg.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.54.tgz#09250f997a56ed4650f3e1979c905ffc40bbe94d" + integrity sha512-OKwd4gmwHqOTp4mOGZKe/XUlbDJ4Q9TjX0hMPIDBUWWu/kwhBAudJdBoxnjNf9ocIB6GN6CPowYpR/hRCbSYAg== + +esbuild-freebsd-arm64@0.14.54: + version "0.14.54" + resolved "https://registry.yarnpkg.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.54.tgz#bafb46ed04fc5f97cbdb016d86947a79579f8e48" + integrity sha512-sFwueGr7OvIFiQT6WeG0jRLjkjdqWWSrfbVwZp8iMP+8UHEHRBvlaxL6IuKNDwAozNUmbb8nIMXa7oAOARGs1Q== + +esbuild-linux-32@0.14.54: + version "0.14.54" + resolved "https://registry.yarnpkg.com/esbuild-linux-32/-/esbuild-linux-32-0.14.54.tgz#e2a8c4a8efdc355405325033fcebeb941f781fe5" + integrity sha512-1ZuY+JDI//WmklKlBgJnglpUL1owm2OX+8E1syCD6UAxcMM/XoWd76OHSjl/0MR0LisSAXDqgjT3uJqT67O3qw== + +esbuild-linux-64@0.14.54: + version "0.14.54" + resolved "https://registry.yarnpkg.com/esbuild-linux-64/-/esbuild-linux-64-0.14.54.tgz#de5fdba1c95666cf72369f52b40b03be71226652" + integrity sha512-EgjAgH5HwTbtNsTqQOXWApBaPVdDn7XcK+/PtJwZLT1UmpLoznPd8c5CxqsH2dQK3j05YsB3L17T8vE7cp4cCg== + +esbuild-linux-arm64@0.14.54: + version "0.14.54" + resolved "https://registry.yarnpkg.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.54.tgz#dae4cd42ae9787468b6a5c158da4c84e83b0ce8b" + integrity sha512-WL71L+0Rwv+Gv/HTmxTEmpv0UgmxYa5ftZILVi2QmZBgX3q7+tDeOQNqGtdXSdsL8TQi1vIaVFHUPDe0O0kdig== + +esbuild-linux-arm@0.14.54: + version "0.14.54" + resolved "https://registry.yarnpkg.com/esbuild-linux-arm/-/esbuild-linux-arm-0.14.54.tgz#a2c1dff6d0f21dbe8fc6998a122675533ddfcd59" + integrity sha512-qqz/SjemQhVMTnvcLGoLOdFpCYbz4v4fUo+TfsWG+1aOu70/80RV6bgNpR2JCrppV2moUQkww+6bWxXRL9YMGw== + +esbuild-linux-mips64le@0.14.54: + version "0.14.54" + resolved "https://registry.yarnpkg.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.54.tgz#d9918e9e4cb972f8d6dae8e8655bf9ee131eda34" + integrity sha512-qTHGQB8D1etd0u1+sB6p0ikLKRVuCWhYQhAHRPkO+OF3I/iSlTKNNS0Lh2Oc0g0UFGguaFZZiPJdJey3AGpAlw== + +esbuild-linux-ppc64le@0.14.54: + version "0.14.54" + resolved "https://registry.yarnpkg.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.54.tgz#3f9a0f6d41073fb1a640680845c7de52995f137e" + integrity sha512-j3OMlzHiqwZBDPRCDFKcx595XVfOfOnv68Ax3U4UKZ3MTYQB5Yz3X1mn5GnodEVYzhtZgxEBidLWeIs8FDSfrQ== + +esbuild-linux-riscv64@0.14.54: + version "0.14.54" + resolved "https://registry.yarnpkg.com/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.54.tgz#618853c028178a61837bc799d2013d4695e451c8" + integrity sha512-y7Vt7Wl9dkOGZjxQZnDAqqn+XOqFD7IMWiewY5SPlNlzMX39ocPQlOaoxvT4FllA5viyV26/QzHtvTjVNOxHZg== + +esbuild-linux-s390x@0.14.54: + version "0.14.54" + resolved "https://registry.yarnpkg.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.54.tgz#d1885c4c5a76bbb5a0fe182e2c8c60eb9e29f2a6" + integrity sha512-zaHpW9dziAsi7lRcyV4r8dhfG1qBidQWUXweUjnw+lliChJqQr+6XD71K41oEIC3Mx1KStovEmlzm+MkGZHnHA== + +esbuild-netbsd-64@0.14.54: + version "0.14.54" + resolved "https://registry.yarnpkg.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.54.tgz#69ae917a2ff241b7df1dbf22baf04bd330349e81" + integrity sha512-PR01lmIMnfJTgeU9VJTDY9ZerDWVFIUzAtJuDHwwceppW7cQWjBBqP48NdeRtoP04/AtO9a7w3viI+PIDr6d+w== + +esbuild-openbsd-64@0.14.54: + version "0.14.54" + resolved "https://registry.yarnpkg.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.54.tgz#db4c8495287a350a6790de22edea247a57c5d47b" + integrity sha512-Qyk7ikT2o7Wu76UsvvDS5q0amJvmRzDyVlL0qf5VLsLchjCa1+IAvd8kTBgUxD7VBUUVgItLkk609ZHUc1oCaw== + +esbuild-sunos-64@0.14.54: + version "0.14.54" + resolved "https://registry.yarnpkg.com/esbuild-sunos-64/-/esbuild-sunos-64-0.14.54.tgz#54287ee3da73d3844b721c21bc80c1dc7e1bf7da" + integrity sha512-28GZ24KmMSeKi5ueWzMcco6EBHStL3B6ubM7M51RmPwXQGLe0teBGJocmWhgwccA1GeFXqxzILIxXpHbl9Q/Kw== + +esbuild-windows-32@0.14.54: + version "0.14.54" + resolved "https://registry.yarnpkg.com/esbuild-windows-32/-/esbuild-windows-32-0.14.54.tgz#f8aaf9a5667630b40f0fb3aa37bf01bbd340ce31" + integrity sha512-T+rdZW19ql9MjS7pixmZYVObd9G7kcaZo+sETqNH4RCkuuYSuv9AGHUVnPoP9hhuE1WM1ZimHz1CIBHBboLU7w== + +esbuild-windows-64@0.14.54: + version "0.14.54" + resolved "https://registry.yarnpkg.com/esbuild-windows-64/-/esbuild-windows-64-0.14.54.tgz#bf54b51bd3e9b0f1886ffdb224a4176031ea0af4" + integrity sha512-AoHTRBUuYwXtZhjXZbA1pGfTo8cJo3vZIcWGLiUcTNgHpJJMC1rVA44ZereBHMJtotyN71S8Qw0npiCIkW96cQ== + +esbuild-windows-arm64@0.14.54: + version "0.14.54" + resolved "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.54.tgz#937d15675a15e4b0e4fafdbaa3a01a776a2be982" + integrity sha512-M0kuUvXhot1zOISQGXwWn6YtS+Y/1RT9WrVIOywZnJHo3jCDyewAc79aKNQWFCQm+xNHVTq9h8dZKvygoXQQRg== esbuild@^0.14.27: - version "0.14.39" - resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.14.39.tgz#c926b2259fe6f6d3a94f528fb42e103c5a6d909a" - integrity sha512-2kKujuzvRWYtwvNjYDY444LQIA3TyJhJIX3Yo4+qkFlDDtGlSicWgeHVJqMUP/2sSfH10PGwfsj+O2ro1m10xQ== + version "0.14.54" + resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.14.54.tgz#8b44dcf2b0f1a66fc22459943dccf477535e9aa2" + integrity sha512-Cy9llcy8DvET5uznocPyqL3BFRrFXSVqbgpMJ9Wz8oVjZlh/zUSNbPRbov0VX7VxN2JH1Oa0uNxZ7eLRb62pJA== optionalDependencies: - esbuild-android-64 "0.14.39" - esbuild-android-arm64 "0.14.39" - esbuild-darwin-64 "0.14.39" - esbuild-darwin-arm64 "0.14.39" - esbuild-freebsd-64 "0.14.39" - esbuild-freebsd-arm64 "0.14.39" - esbuild-linux-32 "0.14.39" - esbuild-linux-64 "0.14.39" - esbuild-linux-arm "0.14.39" - esbuild-linux-arm64 "0.14.39" - esbuild-linux-mips64le "0.14.39" - esbuild-linux-ppc64le "0.14.39" - esbuild-linux-riscv64 "0.14.39" - esbuild-linux-s390x "0.14.39" - esbuild-netbsd-64 "0.14.39" - esbuild-openbsd-64 "0.14.39" - esbuild-sunos-64 "0.14.39" - esbuild-windows-32 "0.14.39" - esbuild-windows-64 "0.14.39" - esbuild-windows-arm64 "0.14.39" + "@esbuild/linux-loong64" "0.14.54" + esbuild-android-64 "0.14.54" + esbuild-android-arm64 "0.14.54" + esbuild-darwin-64 "0.14.54" + esbuild-darwin-arm64 "0.14.54" + esbuild-freebsd-64 "0.14.54" + esbuild-freebsd-arm64 "0.14.54" + esbuild-linux-32 "0.14.54" + esbuild-linux-64 "0.14.54" + esbuild-linux-arm "0.14.54" + esbuild-linux-arm64 "0.14.54" + esbuild-linux-mips64le "0.14.54" + esbuild-linux-ppc64le "0.14.54" + esbuild-linux-riscv64 "0.14.54" + esbuild-linux-s390x "0.14.54" + esbuild-netbsd-64 "0.14.54" + esbuild-openbsd-64 "0.14.54" + esbuild-sunos-64 "0.14.54" + esbuild-windows-32 "0.14.54" + esbuild-windows-64 "0.14.54" + esbuild-windows-arm64 "0.14.54" fsevents@~2.3.2: - version "2.3.2" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a" - integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA== - -function-bind@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" - integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== - -has@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" - integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw== + version "2.3.3" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6" + integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw== + +function-bind@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c" + integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA== + +hasown@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.0.tgz#f4c513d454a57b7c7e1650778de226b11700546c" + integrity sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA== dependencies: - function-bind "^1.1.1" + function-bind "^1.1.2" -is-core-module@^2.8.1: - version "2.9.0" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.9.0.tgz#e1c34429cd51c6dd9e09e0799e396e27b19a9c69" - integrity sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A== +is-core-module@^2.13.0: + version "2.13.1" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.13.1.tgz#ad0d7532c6fea9da1ebdc82742d74525c6273384" + integrity sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw== dependencies: - has "^1.0.3" + hasown "^2.0.0" -nanoid@^3.3.4: - version "3.3.4" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.4.tgz#730b67e3cd09e2deacf03c027c81c9d9dbc5e8ab" - integrity sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw== +nanoid@^3.3.7: + version "3.3.7" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.7.tgz#d0c301a691bc8d54efa0a2226ccf3fe2fd656bd8" + integrity sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g== path-parse@^1.0.7: version "1.0.7" @@ -168,27 +174,27 @@ picocolors@^1.0.0: integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ== postcss@^8.4.13: - version "8.4.14" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.14.tgz#ee9274d5622b4858c1007a74d76e42e56fd21caf" - integrity sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig== + version "8.4.33" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.33.tgz#1378e859c9f69bf6f638b990a0212f43e2aaa742" + integrity sha512-Kkpbhhdjw2qQs2O2DGX+8m5OVqEcbB9HRBvuYM9pgrjEFUg30A9LmXNlTAUj4S9kgtGyrMbTzVjH7E+s5Re2yg== dependencies: - nanoid "^3.3.4" + nanoid "^3.3.7" picocolors "^1.0.0" source-map-js "^1.0.2" resolve@^1.22.0: - version "1.22.0" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz#5e0b8c67c15df57a89bdbabe603a002f21731198" - integrity sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw== + version "1.22.8" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d" + integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw== dependencies: - is-core-module "^2.8.1" + is-core-module "^2.13.0" path-parse "^1.0.7" supports-preserve-symlinks-flag "^1.0.0" -rollup@^2.59.0: - version "2.74.1" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.74.1.tgz#4fba0ff1c312cc4ee82691b154eee69a0d01929f" - integrity sha512-K2zW7kV8Voua5eGkbnBtWYfMIhYhT9Pel2uhBk2WO5eMee161nPze/XRfvEQPFYz7KgrCCnmh2Wy0AMFLGGmMA== +"rollup@>=2.59.0 <2.78.0": + version "2.77.3" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.77.3.tgz#8f00418d3a2740036e15deb653bed1a90ee0cc12" + integrity sha512-/qxNTG7FbmefJWoeeYJFbHehJ2HNWnjkAFRKzWN/45eNBBF/r8lo992CwcJXEzyVxs5FmfId+vTSTQDb+bxA+g== optionalDependencies: fsevents "~2.3.2" @@ -208,13 +214,13 @@ typescript@4.7.3: integrity sha512-WOkT3XYvrpXx4vMMqlD+8R8R37fZkjyLGlxavMc4iB8lrl8L0DeTcHbYgw/v0N/z9wAFsgBhcsF0ruoySS22mA== vite@^2.9.13: - version "2.9.13" - resolved "https://registry.yarnpkg.com/vite/-/vite-2.9.13.tgz#859cb5d4c316c0d8c6ec9866045c0f7858ca6abc" - integrity sha512-AsOBAaT0AD7Mhe8DuK+/kE4aWYFMx/i0ZNi98hJclxb4e0OhQcZYUrvLjIaQ8e59Ui7txcvKMiJC1yftqpQoDw== + version "2.9.17" + resolved "https://registry.yarnpkg.com/vite/-/vite-2.9.17.tgz#6b770525e12fa2a2e3a0fa0d028d304f4f7dc7d4" + integrity sha512-XxcRzra6d7xrKXH66jZUgb+srThoPu+TLJc06GifUyKq9JmjHkc1Numc8ra0h56rju2jfVWw3B3fs5l3OFMvUw== dependencies: esbuild "^0.14.27" postcss "^8.4.13" resolve "^1.22.0" - rollup "^2.59.0" + rollup ">=2.59.0 <2.78.0" optionalDependencies: fsevents "~2.3.2" diff --git a/yarn.lock b/yarn.lock index c534c09e0c66..7a2b76e40e73 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3263,230 +3263,120 @@ ts-node "^9" tslib "^2" -"@esbuild/android-arm64@0.16.17": - version "0.16.17" - resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.16.17.tgz#cf91e86df127aa3d141744edafcba0abdc577d23" - integrity sha512-MIGl6p5sc3RDTLLkYL1MyL8BMRN4tLMRCn+yRJJmEDvYZ2M7tmAf80hx1kbNEUX2KJ50RRtxZ4JHLvCfuB6kBg== - -"@esbuild/android-arm64@0.17.15": - version "0.17.15" - resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.17.15.tgz#893ad71f3920ccb919e1757c387756a9bca2ef42" - integrity sha512-0kOB6Y7Br3KDVgHeg8PRcvfLkq+AccreK///B4Z6fNZGr/tNHX0z2VywCc7PTeWp+bPvjA5WMvNXltHw5QjAIA== - -"@esbuild/android-arm@0.16.17": - version "0.16.17" - resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.16.17.tgz#025b6246d3f68b7bbaa97069144fb5fb70f2fff2" - integrity sha512-N9x1CMXVhtWEAMS7pNNONyA14f71VPQN9Cnavj1XQh6T7bskqiLLrSca4O0Vr8Wdcga943eThxnVp3JLnBMYtw== - -"@esbuild/android-arm@0.17.15": - version "0.17.15" - resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.17.15.tgz#143e0d4e4c08c786ea410b9a7739779a9a1315d8" - integrity sha512-sRSOVlLawAktpMvDyJIkdLI/c/kdRTOqo8t6ImVxg8yT7LQDUYV5Rp2FKeEosLr6ZCja9UjYAzyRSxGteSJPYg== - -"@esbuild/android-x64@0.16.17": - version "0.16.17" - resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.16.17.tgz#c820e0fef982f99a85c4b8bfdd582835f04cd96e" - integrity sha512-a3kTv3m0Ghh4z1DaFEuEDfz3OLONKuFvI4Xqczqx4BqLyuFaFkuaG4j2MtA6fuWEFeC5x9IvqnX7drmRq/fyAQ== - -"@esbuild/android-x64@0.17.15": - version "0.17.15" - resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.17.15.tgz#d2d12a7676b2589864281b2274355200916540bc" - integrity sha512-MzDqnNajQZ63YkaUWVl9uuhcWyEyh69HGpMIrf+acR4otMkfLJ4sUCxqwbCyPGicE9dVlrysI3lMcDBjGiBBcQ== - -"@esbuild/darwin-arm64@0.16.17": - version "0.16.17" - resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.16.17.tgz#edef4487af6b21afabba7be5132c26d22379b220" - integrity sha512-/2agbUEfmxWHi9ARTX6OQ/KgXnOWfsNlTeLcoV7HSuSTv63E4DqtAc+2XqGw1KHxKMHGZgbVCZge7HXWX9Vn+w== - -"@esbuild/darwin-arm64@0.17.15": - version "0.17.15" - resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.17.15.tgz#2e88e79f1d327a2a7d9d06397e5232eb0a473d61" - integrity sha512-7siLjBc88Z4+6qkMDxPT2juf2e8SJxmsbNVKFY2ifWCDT72v5YJz9arlvBw5oB4W/e61H1+HDB/jnu8nNg0rLA== - -"@esbuild/darwin-x64@0.16.17": - version "0.16.17" - resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.16.17.tgz#42829168730071c41ef0d028d8319eea0e2904b4" - integrity sha512-2By45OBHulkd9Svy5IOCZt376Aa2oOkiE9QWUK9fe6Tb+WDr8hXL3dpqi+DeLiMed8tVXspzsTAvd0jUl96wmg== - -"@esbuild/darwin-x64@0.17.15": - version "0.17.15" - resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.17.15.tgz#9384e64c0be91388c57be6d3a5eaf1c32a99c91d" - integrity sha512-NbImBas2rXwYI52BOKTW342Tm3LTeVlaOQ4QPZ7XuWNKiO226DisFk/RyPk3T0CKZkKMuU69yOvlapJEmax7cg== - -"@esbuild/freebsd-arm64@0.16.17": - version "0.16.17" - resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.16.17.tgz#1f4af488bfc7e9ced04207034d398e793b570a27" - integrity sha512-mt+cxZe1tVx489VTb4mBAOo2aKSnJ33L9fr25JXpqQqzbUIw/yzIzi+NHwAXK2qYV1lEFp4OoVeThGjUbmWmdw== - -"@esbuild/freebsd-arm64@0.17.15": - version "0.17.15" - resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.15.tgz#2ad5a35bc52ebd9ca6b845dbc59ba39647a93c1a" - integrity sha512-Xk9xMDjBVG6CfgoqlVczHAdJnCs0/oeFOspFap5NkYAmRCT2qTn1vJWA2f419iMtsHSLm+O8B6SLV/HlY5cYKg== - -"@esbuild/freebsd-x64@0.16.17": - version "0.16.17" - resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.16.17.tgz#636306f19e9bc981e06aa1d777302dad8fddaf72" - integrity sha512-8ScTdNJl5idAKjH8zGAsN7RuWcyHG3BAvMNpKOBaqqR7EbUhhVHOqXRdL7oZvz8WNHL2pr5+eIT5c65kA6NHug== - -"@esbuild/freebsd-x64@0.17.15": - version "0.17.15" - resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.17.15.tgz#b513a48446f96c75fda5bef470e64d342d4379cd" - integrity sha512-3TWAnnEOdclvb2pnfsTWtdwthPfOz7qAfcwDLcfZyGJwm1SRZIMOeB5FODVhnM93mFSPsHB9b/PmxNNbSnd0RQ== - -"@esbuild/linux-arm64@0.16.17": - version "0.16.17" - resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.16.17.tgz#a003f7ff237c501e095d4f3a09e58fc7b25a4aca" - integrity sha512-7S8gJnSlqKGVJunnMCrXHU9Q8Q/tQIxk/xL8BqAP64wchPCTzuM6W3Ra8cIa1HIflAvDnNOt2jaL17vaW+1V0g== - -"@esbuild/linux-arm64@0.17.15": - version "0.17.15" - resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.17.15.tgz#9697b168175bfd41fa9cc4a72dd0d48f24715f31" - integrity sha512-T0MVnYw9KT6b83/SqyznTs/3Jg2ODWrZfNccg11XjDehIved2oQfrX/wVuev9N936BpMRaTR9I1J0tdGgUgpJA== - -"@esbuild/linux-arm@0.16.17": - version "0.16.17" - resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.16.17.tgz#b591e6a59d9c4fe0eeadd4874b157ab78cf5f196" - integrity sha512-iihzrWbD4gIT7j3caMzKb/RsFFHCwqqbrbH9SqUSRrdXkXaygSZCZg1FybsZz57Ju7N/SHEgPyaR0LZ8Zbe9gQ== - -"@esbuild/linux-arm@0.17.15": - version "0.17.15" - resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.17.15.tgz#5b22062c54f48cd92fab9ffd993732a52db70cd3" - integrity sha512-MLTgiXWEMAMr8nmS9Gigx43zPRmEfeBfGCwxFQEMgJ5MC53QKajaclW6XDPjwJvhbebv+RzK05TQjvH3/aM4Xw== - -"@esbuild/linux-ia32@0.16.17": - version "0.16.17" - resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.16.17.tgz#24333a11027ef46a18f57019450a5188918e2a54" - integrity sha512-kiX69+wcPAdgl3Lonh1VI7MBr16nktEvOfViszBSxygRQqSpzv7BffMKRPMFwzeJGPxcio0pdD3kYQGpqQ2SSg== - -"@esbuild/linux-ia32@0.17.15": - version "0.17.15" - resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.17.15.tgz#eb28a13f9b60b5189fcc9e98e1024f6b657ba54c" - integrity sha512-wp02sHs015T23zsQtU4Cj57WiteiuASHlD7rXjKUyAGYzlOKDAjqK6bk5dMi2QEl/KVOcsjwL36kD+WW7vJt8Q== +"@esbuild/android-arm64@0.18.20": + version "0.18.20" + resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.18.20.tgz#984b4f9c8d0377443cc2dfcef266d02244593622" + integrity sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ== + +"@esbuild/android-arm@0.18.20": + version "0.18.20" + resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.18.20.tgz#fedb265bc3a589c84cc11f810804f234947c3682" + integrity sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw== + +"@esbuild/android-x64@0.18.20": + version "0.18.20" + resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.18.20.tgz#35cf419c4cfc8babe8893d296cd990e9e9f756f2" + integrity sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg== + +"@esbuild/darwin-arm64@0.18.20": + version "0.18.20" + resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.18.20.tgz#08172cbeccf95fbc383399a7f39cfbddaeb0d7c1" + integrity sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA== + +"@esbuild/darwin-x64@0.18.20": + version "0.18.20" + resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.18.20.tgz#d70d5790d8bf475556b67d0f8b7c5bdff053d85d" + integrity sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ== + +"@esbuild/freebsd-arm64@0.18.20": + version "0.18.20" + resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.20.tgz#98755cd12707f93f210e2494d6a4b51b96977f54" + integrity sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw== + +"@esbuild/freebsd-x64@0.18.20": + version "0.18.20" + resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.18.20.tgz#c1eb2bff03915f87c29cece4c1a7fa1f423b066e" + integrity sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ== + +"@esbuild/linux-arm64@0.18.20": + version "0.18.20" + resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.18.20.tgz#bad4238bd8f4fc25b5a021280c770ab5fc3a02a0" + integrity sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA== + +"@esbuild/linux-arm@0.18.20": + version "0.18.20" + resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.18.20.tgz#3e617c61f33508a27150ee417543c8ab5acc73b0" + integrity sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg== + +"@esbuild/linux-ia32@0.18.20": + version "0.18.20" + resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.18.20.tgz#699391cccba9aee6019b7f9892eb99219f1570a7" + integrity sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA== "@esbuild/linux-loong64@0.15.7": version "0.15.7" resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.15.7.tgz#1ec4af4a16c554cbd402cc557ccdd874e3f7be53" integrity sha512-IKznSJOsVUuyt7cDzzSZyqBEcZe+7WlBqTVXiF1OXP/4Nm387ToaXZ0fyLwI1iBlI/bzpxVq411QE2/Bt2XWWw== -"@esbuild/linux-loong64@0.16.17": - version "0.16.17" - resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.16.17.tgz#d5ad459d41ed42bbd4d005256b31882ec52227d8" - integrity sha512-dTzNnQwembNDhd654cA4QhbS9uDdXC3TKqMJjgOWsC0yNCbpzfWoXdZvp0mY7HU6nzk5E0zpRGGx3qoQg8T2DQ== - -"@esbuild/linux-loong64@0.17.15": - version "0.17.15" - resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.17.15.tgz#32454bdfe144cf74b77895a8ad21a15cb81cfbe5" - integrity sha512-k7FsUJjGGSxwnBmMh8d7IbObWu+sF/qbwc+xKZkBe/lTAF16RqxRCnNHA7QTd3oS2AfGBAnHlXL67shV5bBThQ== - -"@esbuild/linux-mips64el@0.16.17": - version "0.16.17" - resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.16.17.tgz#4e5967a665c38360b0a8205594377d4dcf9c3726" - integrity sha512-ezbDkp2nDl0PfIUn0CsQ30kxfcLTlcx4Foz2kYv8qdC6ia2oX5Q3E/8m6lq84Dj/6b0FrkgD582fJMIfHhJfSw== - -"@esbuild/linux-mips64el@0.17.15": - version "0.17.15" - resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.17.15.tgz#af12bde0d775a318fad90eb13a0455229a63987c" - integrity sha512-ZLWk6czDdog+Q9kE/Jfbilu24vEe/iW/Sj2d8EVsmiixQ1rM2RKH2n36qfxK4e8tVcaXkvuV3mU5zTZviE+NVQ== - -"@esbuild/linux-ppc64@0.16.17": - version "0.16.17" - resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.16.17.tgz#206443a02eb568f9fdf0b438fbd47d26e735afc8" - integrity sha512-dzS678gYD1lJsW73zrFhDApLVdM3cUF2MvAa1D8K8KtcSKdLBPP4zZSLy6LFZ0jYqQdQ29bjAHJDgz0rVbLB3g== - -"@esbuild/linux-ppc64@0.17.15": - version "0.17.15" - resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.17.15.tgz#34c5ed145b2dfc493d3e652abac8bd3baa3865a5" - integrity sha512-mY6dPkIRAiFHRsGfOYZC8Q9rmr8vOBZBme0/j15zFUKM99d4ILY4WpOC7i/LqoY+RE7KaMaSfvY8CqjJtuO4xg== - -"@esbuild/linux-riscv64@0.16.17": - version "0.16.17" - resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.16.17.tgz#c351e433d009bf256e798ad048152c8d76da2fc9" - integrity sha512-ylNlVsxuFjZK8DQtNUwiMskh6nT0vI7kYl/4fZgV1llP5d6+HIeL/vmmm3jpuoo8+NuXjQVZxmKuhDApK0/cKw== - -"@esbuild/linux-riscv64@0.17.15": - version "0.17.15" - resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.17.15.tgz#87bd515e837f2eb004b45f9e6a94dc5b93f22b92" - integrity sha512-EcyUtxffdDtWjjwIH8sKzpDRLcVtqANooMNASO59y+xmqqRYBBM7xVLQhqF7nksIbm2yHABptoioS9RAbVMWVA== - -"@esbuild/linux-s390x@0.16.17": - version "0.16.17" - resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.16.17.tgz#661f271e5d59615b84b6801d1c2123ad13d9bd87" - integrity sha512-gzy7nUTO4UA4oZ2wAMXPNBGTzZFP7mss3aKR2hH+/4UUkCOyqmjXiKpzGrY2TlEUhbbejzXVKKGazYcQTZWA/w== - -"@esbuild/linux-s390x@0.17.15": - version "0.17.15" - resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.17.15.tgz#20bf7947197f199ddac2ec412029a414ceae3aa3" - integrity sha512-BuS6Jx/ezxFuHxgsfvz7T4g4YlVrmCmg7UAwboeyNNg0OzNzKsIZXpr3Sb/ZREDXWgt48RO4UQRDBxJN3B9Rbg== - -"@esbuild/linux-x64@0.16.17": - version "0.16.17" - resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.16.17.tgz#e4ba18e8b149a89c982351443a377c723762b85f" - integrity sha512-mdPjPxfnmoqhgpiEArqi4egmBAMYvaObgn4poorpUaqmvzzbvqbowRllQ+ZgzGVMGKaPkqUmPDOOFQRUFDmeUw== - -"@esbuild/linux-x64@0.17.15": - version "0.17.15" - resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.17.15.tgz#31b93f9c94c195e852c20cd3d1914a68aa619124" - integrity sha512-JsdS0EgEViwuKsw5tiJQo9UdQdUJYuB+Mf6HxtJSPN35vez1hlrNb1KajvKWF5Sa35j17+rW1ECEO9iNrIXbNg== - -"@esbuild/netbsd-x64@0.16.17": - version "0.16.17" - resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.16.17.tgz#7d4f4041e30c5c07dd24ffa295c73f06038ec775" - integrity sha512-/PzmzD/zyAeTUsduZa32bn0ORug+Jd1EGGAUJvqfeixoEISYpGnAezN6lnJoskauoai0Jrs+XSyvDhppCPoKOA== - -"@esbuild/netbsd-x64@0.17.15": - version "0.17.15" - resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.17.15.tgz#8da299b3ac6875836ca8cdc1925826498069ac65" - integrity sha512-R6fKjtUysYGym6uXf6qyNephVUQAGtf3n2RCsOST/neIwPqRWcnc3ogcielOd6pT+J0RDR1RGcy0ZY7d3uHVLA== - -"@esbuild/openbsd-x64@0.16.17": - version "0.16.17" - resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.16.17.tgz#970fa7f8470681f3e6b1db0cc421a4af8060ec35" - integrity sha512-2yaWJhvxGEz2RiftSk0UObqJa/b+rIAjnODJgv2GbGGpRwAfpgzyrg1WLK8rqA24mfZa9GvpjLcBBg8JHkoodg== - -"@esbuild/openbsd-x64@0.17.15": - version "0.17.15" - resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.17.15.tgz#04a1ec3d4e919714dba68dcf09eeb1228ad0d20c" - integrity sha512-mVD4PGc26b8PI60QaPUltYKeSX0wxuy0AltC+WCTFwvKCq2+OgLP4+fFd+hZXzO2xW1HPKcytZBdjqL6FQFa7w== - -"@esbuild/sunos-x64@0.16.17": - version "0.16.17" - resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.16.17.tgz#abc60e7c4abf8b89fb7a4fe69a1484132238022c" - integrity sha512-xtVUiev38tN0R3g8VhRfN7Zl42YCJvyBhRKw1RJjwE1d2emWTVToPLNEQj/5Qxc6lVFATDiy6LjVHYhIPrLxzw== - -"@esbuild/sunos-x64@0.17.15": - version "0.17.15" - resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.17.15.tgz#6694ebe4e16e5cd7dab6505ff7c28f9c1c695ce5" - integrity sha512-U6tYPovOkw3459t2CBwGcFYfFRjivcJJc1WC8Q3funIwX8x4fP+R6xL/QuTPNGOblbq/EUDxj9GU+dWKX0oWlQ== - -"@esbuild/win32-arm64@0.16.17": - version "0.16.17" - resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.16.17.tgz#7b0ff9e8c3265537a7a7b1fd9a24e7bd39fcd87a" - integrity sha512-ga8+JqBDHY4b6fQAmOgtJJue36scANy4l/rL97W+0wYmijhxKetzZdKOJI7olaBaMhWt8Pac2McJdZLxXWUEQw== - -"@esbuild/win32-arm64@0.17.15": - version "0.17.15" - resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.17.15.tgz#1f95b2564193c8d1fee8f8129a0609728171d500" - integrity sha512-W+Z5F++wgKAleDABemiyXVnzXgvRFs+GVKThSI+mGgleLWluv0D7Diz4oQpgdpNzh4i2nNDzQtWbjJiqutRp6Q== - -"@esbuild/win32-ia32@0.16.17": - version "0.16.17" - resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.16.17.tgz#e90fe5267d71a7b7567afdc403dfd198c292eb09" - integrity sha512-WnsKaf46uSSF/sZhwnqE4L/F89AYNMiD4YtEcYekBt9Q7nj0DiId2XH2Ng2PHM54qi5oPrQ8luuzGszqi/veig== - -"@esbuild/win32-ia32@0.17.15": - version "0.17.15" - resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.17.15.tgz#c362b88b3df21916ed7bcf75c6d09c6bf3ae354a" - integrity sha512-Muz/+uGgheShKGqSVS1KsHtCyEzcdOn/W/Xbh6H91Etm+wiIfwZaBn1W58MeGtfI8WA961YMHFYTthBdQs4t+w== - -"@esbuild/win32-x64@0.16.17": - version "0.16.17" - resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.16.17.tgz#c5a1a4bfe1b57f0c3e61b29883525c6da3e5c091" - integrity sha512-y+EHuSchhL7FjHgvQL/0fnnFmO4T1bhvWANX6gcnqTjtnKWbTvUMCpGnv2+t+31d7RzyEAYAd4u2fnIhHL6N/Q== - -"@esbuild/win32-x64@0.17.15": - version "0.17.15" - resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.17.15.tgz#c2e737f3a201ebff8e2ac2b8e9f246b397ad19b8" - integrity sha512-DjDa9ywLUUmjhV2Y9wUTIF+1XsmuFGvZoCmOWkli1XcNAh5t25cc7fgsCx4Zi/Uurep3TTLyDiKATgGEg61pkA== +"@esbuild/linux-loong64@0.18.20": + version "0.18.20" + resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.18.20.tgz#e6fccb7aac178dd2ffb9860465ac89d7f23b977d" + integrity sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg== + +"@esbuild/linux-mips64el@0.18.20": + version "0.18.20" + resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.18.20.tgz#eeff3a937de9c2310de30622a957ad1bd9183231" + integrity sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ== + +"@esbuild/linux-ppc64@0.18.20": + version "0.18.20" + resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.18.20.tgz#2f7156bde20b01527993e6881435ad79ba9599fb" + integrity sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA== + +"@esbuild/linux-riscv64@0.18.20": + version "0.18.20" + resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.18.20.tgz#6628389f210123d8b4743045af8caa7d4ddfc7a6" + integrity sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A== + +"@esbuild/linux-s390x@0.18.20": + version "0.18.20" + resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.18.20.tgz#255e81fb289b101026131858ab99fba63dcf0071" + integrity sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ== + +"@esbuild/linux-x64@0.18.20": + version "0.18.20" + resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.18.20.tgz#c7690b3417af318a9b6f96df3031a8865176d338" + integrity sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w== + +"@esbuild/netbsd-x64@0.18.20": + version "0.18.20" + resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.18.20.tgz#30e8cd8a3dded63975e2df2438ca109601ebe0d1" + integrity sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A== + +"@esbuild/openbsd-x64@0.18.20": + version "0.18.20" + resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.18.20.tgz#7812af31b205055874c8082ea9cf9ab0da6217ae" + integrity sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg== + +"@esbuild/sunos-x64@0.18.20": + version "0.18.20" + resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.18.20.tgz#d5c275c3b4e73c9b0ecd38d1ca62c020f887ab9d" + integrity sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ== + +"@esbuild/win32-arm64@0.18.20": + version "0.18.20" + resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.18.20.tgz#73bc7f5a9f8a77805f357fab97f290d0e4820ac9" + integrity sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg== + +"@esbuild/win32-ia32@0.18.20": + version "0.18.20" + resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.18.20.tgz#ec93cbf0ef1085cc12e71e0d661d20569ff42102" + integrity sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g== + +"@esbuild/win32-x64@0.18.20": + version "0.18.20" + resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.18.20.tgz#786c5f41f043b07afb1af37683d7c33668858f6d" + integrity sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ== "@eslint/eslintrc@^0.4.0": version "0.4.0" @@ -14877,61 +14767,33 @@ esbuild@^0.15.3: esbuild-windows-64 "0.15.7" esbuild-windows-arm64 "0.15.7" -esbuild@^0.16.14: - version "0.16.17" - resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.16.17.tgz#fc2c3914c57ee750635fee71b89f615f25065259" - integrity sha512-G8LEkV0XzDMNwXKgM0Jwu3nY3lSTwSGY6XbxM9cr9+s0T/qSV1q1JVPBGzm3dcjhCic9+emZDmMffkwgPeOeLg== +esbuild@^0.18.10: + version "0.18.20" + resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.18.20.tgz#4709f5a34801b43b799ab7d6d82f7284a9b7a7a6" + integrity sha512-ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA== optionalDependencies: - "@esbuild/android-arm" "0.16.17" - "@esbuild/android-arm64" "0.16.17" - "@esbuild/android-x64" "0.16.17" - "@esbuild/darwin-arm64" "0.16.17" - "@esbuild/darwin-x64" "0.16.17" - "@esbuild/freebsd-arm64" "0.16.17" - "@esbuild/freebsd-x64" "0.16.17" - "@esbuild/linux-arm" "0.16.17" - "@esbuild/linux-arm64" "0.16.17" - "@esbuild/linux-ia32" "0.16.17" - "@esbuild/linux-loong64" "0.16.17" - "@esbuild/linux-mips64el" "0.16.17" - "@esbuild/linux-ppc64" "0.16.17" - "@esbuild/linux-riscv64" "0.16.17" - "@esbuild/linux-s390x" "0.16.17" - "@esbuild/linux-x64" "0.16.17" - "@esbuild/netbsd-x64" "0.16.17" - "@esbuild/openbsd-x64" "0.16.17" - "@esbuild/sunos-x64" "0.16.17" - "@esbuild/win32-arm64" "0.16.17" - "@esbuild/win32-ia32" "0.16.17" - "@esbuild/win32-x64" "0.16.17" - -esbuild@^0.17.5: - version "0.17.15" - resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.17.15.tgz#209ebc87cb671ffb79574db93494b10ffaf43cbc" - integrity sha512-LBUV2VsUIc/iD9ME75qhT4aJj0r75abCVS0jakhFzOtR7TQsqQA5w0tZ+KTKnwl3kXE0MhskNdHDh/I5aCR1Zw== - optionalDependencies: - "@esbuild/android-arm" "0.17.15" - "@esbuild/android-arm64" "0.17.15" - "@esbuild/android-x64" "0.17.15" - "@esbuild/darwin-arm64" "0.17.15" - "@esbuild/darwin-x64" "0.17.15" - "@esbuild/freebsd-arm64" "0.17.15" - "@esbuild/freebsd-x64" "0.17.15" - "@esbuild/linux-arm" "0.17.15" - "@esbuild/linux-arm64" "0.17.15" - "@esbuild/linux-ia32" "0.17.15" - "@esbuild/linux-loong64" "0.17.15" - "@esbuild/linux-mips64el" "0.17.15" - "@esbuild/linux-ppc64" "0.17.15" - "@esbuild/linux-riscv64" "0.17.15" - "@esbuild/linux-s390x" "0.17.15" - "@esbuild/linux-x64" "0.17.15" - "@esbuild/netbsd-x64" "0.17.15" - "@esbuild/openbsd-x64" "0.17.15" - "@esbuild/sunos-x64" "0.17.15" - "@esbuild/win32-arm64" "0.17.15" - "@esbuild/win32-ia32" "0.17.15" - "@esbuild/win32-x64" "0.17.15" + "@esbuild/android-arm" "0.18.20" + "@esbuild/android-arm64" "0.18.20" + "@esbuild/android-x64" "0.18.20" + "@esbuild/darwin-arm64" "0.18.20" + "@esbuild/darwin-x64" "0.18.20" + "@esbuild/freebsd-arm64" "0.18.20" + "@esbuild/freebsd-x64" "0.18.20" + "@esbuild/linux-arm" "0.18.20" + "@esbuild/linux-arm64" "0.18.20" + "@esbuild/linux-ia32" "0.18.20" + "@esbuild/linux-loong64" "0.18.20" + "@esbuild/linux-mips64el" "0.18.20" + "@esbuild/linux-ppc64" "0.18.20" + "@esbuild/linux-riscv64" "0.18.20" + "@esbuild/linux-s390x" "0.18.20" + "@esbuild/linux-x64" "0.18.20" + "@esbuild/netbsd-x64" "0.18.20" + "@esbuild/openbsd-x64" "0.18.20" + "@esbuild/sunos-x64" "0.18.20" + "@esbuild/win32-arm64" "0.18.20" + "@esbuild/win32-ia32" "0.18.20" + "@esbuild/win32-x64" "0.18.20" escalade@^3.1.1: version "3.1.1" @@ -26798,10 +26660,10 @@ rollup@3.7.3: optionalDependencies: fsevents "~2.3.2" -rollup@^3.10.0, rollup@^3.21.0: - version "3.21.0" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-3.21.0.tgz#0a71517db56e150222670f88e5e7acfa4fede7c8" - integrity sha512-ANPhVcyeHvYdQMUyCbczy33nbLzI7RzrBje4uvNiTDJGIMtlKoOStmympwr9OtS1LZxiDmE2wvxHyVhoLtf1KQ== +rollup@^3.27.1: + version "3.29.4" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-3.29.4.tgz#4d70c0f9834146df8705bfb69a9a19c9e1109981" + integrity sha512-oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw== optionalDependencies: fsevents "~2.3.2" @@ -30820,26 +30682,14 @@ vite-svg-loader@4.0.0: "@vue/compiler-sfc" "^3.2.20" svgo "^3.0.2" -vite@4.1.4: - version "4.1.4" - resolved "https://registry.yarnpkg.com/vite/-/vite-4.1.4.tgz#170d93bcff97e0ebc09764c053eebe130bfe6ca0" - integrity sha512-3knk/HsbSTKEin43zHu7jTwYWv81f8kgAL99G5NWBcA1LKvtvcVAC4JjBH1arBunO9kQka+1oGbrMKOjk4ZrBg== - dependencies: - esbuild "^0.16.14" - postcss "^8.4.21" - resolve "^1.22.1" - rollup "^3.10.0" - optionalDependencies: - fsevents "~2.3.2" - -vite@4.3.2: - version "4.3.2" - resolved "https://registry.yarnpkg.com/vite/-/vite-4.3.2.tgz#95a5e0ebee80ae218849312019318aa9e3a05c26" - integrity sha512-9R53Mf+TBoXCYejcL+qFbZde+eZveQLDYd9XgULILLC1a5ZwPaqgmdVpL8/uvw2BM/1TzetWjglwm+3RO+xTyw== +vite@4.5.2: + version "4.5.2" + resolved "https://registry.yarnpkg.com/vite/-/vite-4.5.2.tgz#d6ea8610e099851dad8c7371599969e0f8b97e82" + integrity sha512-tBCZBNSBbHQkaGyhGCDUGqeo2ph8Fstyp6FMSvTtsXeZSPpSMGlviAOav2hxVTqFcx8Hj/twtWKsMJXNY0xI8w== dependencies: - esbuild "^0.17.5" - postcss "^8.4.21" - rollup "^3.21.0" + esbuild "^0.18.10" + postcss "^8.4.27" + rollup "^3.27.1" optionalDependencies: fsevents "~2.3.2" From 21977f8c5be3f8e3f15afe7dcfe6d8232a210cf6 Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Tue, 23 Jan 2024 12:22:02 -0600 Subject: [PATCH 65/67] fix: issue with service workers in test replay when they're initiated from a support file (#28748) * fix: issue with service workers in test replay when they're initiated from a support file * add changelog * Update cli/CHANGELOG.md Co-authored-by: Bill Glesias * PR comment * get prerelease * PR comments * Update .circleci/workflows.yml * Update .circleci/workflows.yml Co-authored-by: Matt Schile --------- Co-authored-by: Bill Glesias Co-authored-by: Matt Schile --- .circleci/workflows.yml | 8 +++-- cli/CHANGELOG.md | 4 +++ packages/proxy/lib/http/index.ts | 4 +-- .../lib/http/util/service-worker-manager.ts | 24 ++++++++------ packages/proxy/lib/network-proxy.ts | 2 +- packages/proxy/test/unit/http/index.spec.ts | 2 +- .../http/util/service-worker-manager.spec.ts | 10 +++--- packages/server/lib/browsers/utils.ts | 2 +- packages/server/lib/project-base.ts | 2 +- packages/server/lib/server-base.ts | 2 +- packages/types/src/server.ts | 2 +- ...ss-with-service-worker-preloaded.config.ts | 9 ++++++ .../e2e/service-worker-preloaded.cy.js | 31 +++++++++++++++++++ .../protocol/cypress/e2e/service-worker.cy.js | 11 ++++++- .../load-with-service-worker-preloaded.js | 15 +++++++++ .../service-worker-assets/scope/load.js | 15 +++++++-- .../scope/service_worker_preloaded.html | 11 +++++++ .../support/e2e-preload-service-worker.ts | 9 ++++++ .../test/service_worker_protocol_spec.js | 28 +++++++++++++++++ 19 files changed, 163 insertions(+), 28 deletions(-) create mode 100644 system-tests/projects/protocol/cypress-with-service-worker-preloaded.config.ts create mode 100644 system-tests/projects/protocol/cypress/e2e/service-worker-preloaded.cy.js create mode 100644 system-tests/projects/protocol/cypress/fixtures/service-worker-assets/scope/load-with-service-worker-preloaded.js create mode 100644 system-tests/projects/protocol/cypress/fixtures/service-worker-assets/scope/service_worker_preloaded.html create mode 100644 system-tests/projects/protocol/cypress/support/e2e-preload-service-worker.ts diff --git a/.circleci/workflows.yml b/.circleci/workflows.yml index e804b9add573..27a9f6c81162 100644 --- a/.circleci/workflows.yml +++ b/.circleci/workflows.yml @@ -30,7 +30,8 @@ mainBuildFilters: &mainBuildFilters - /^release\/\d+\.\d+\.\d+$/ # use the following branch as well to ensure that v8 snapshot cache updates are fully tested - 'cacie/chore/upgrade-electron-27' - + - 'update-v8-snapshot-cache-on-develop' + - 'ryanm/fix/issue-with-service-workers-loaded-in-support-file' # usually we don't build Mac app - it takes a long time # but sometimes we want to really confirm we are doing the right thing @@ -42,6 +43,7 @@ macWorkflowFilters: &darwin-workflow-filters # use the following branch as well to ensure that v8 snapshot cache updates are fully tested - equal: [ 'update-v8-snapshot-cache-on-develop', << pipeline.git.branch >> ] - equal: [ 'cacie/chore/upgrade-electron-27', << pipeline.git.branch >> ] + - equal: [ 'ryanm/fix/issue-with-service-workers-loaded-in-support-file', << pipeline.git.branch >> ] - matches: pattern: /^release\/\d+\.\d+\.\d+$/ value: << pipeline.git.branch >> @@ -53,6 +55,7 @@ linuxArm64WorkflowFilters: &linux-arm64-workflow-filters # use the following branch as well to ensure that v8 snapshot cache updates are fully tested - equal: [ 'update-v8-snapshot-cache-on-develop', << pipeline.git.branch >> ] - equal: [ 'cacie/chore/upgrade-electron-27', << pipeline.git.branch >> ] + - equal: [ 'ryanm/fix/issue-with-service-workers-loaded-in-support-file', << pipeline.git.branch >> ] - matches: pattern: /^release\/\d+\.\d+\.\d+$/ value: << pipeline.git.branch >> @@ -76,6 +79,7 @@ windowsWorkflowFilters: &windows-workflow-filters # use the following branch as well to ensure that v8 snapshot cache updates are fully tested - equal: [ 'update-v8-snapshot-cache-on-develop', << pipeline.git.branch >> ] - equal: [ 'cacie/chore/upgrade-electron-27', << pipeline.git.branch >> ] + - equal: [ 'ryanm/fix/issue-with-service-workers-loaded-in-support-file', << pipeline.git.branch >> ] - matches: pattern: /^release\/\d+\.\d+\.\d+$/ value: << pipeline.git.branch >> @@ -145,7 +149,7 @@ commands: name: Set environment variable to determine whether or not to persist artifacts command: | echo "Setting SHOULD_PERSIST_ARTIFACTS variable" - echo 'if ! [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "release/"* && "$CIRCLE_BRANCH" != "mschile/protocol/proxy_correlation" ]]; then + echo 'if ! [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "release/"* && "$CIRCLE_BRANCH" != "ryanm/fix/issue-with-service-workers-loaded-in-support-file" ]]; then export SHOULD_PERSIST_ARTIFACTS=true fi' >> "$BASH_ENV" # You must run `setup_should_persist_artifacts` command and be using bash before running this command diff --git a/cli/CHANGELOG.md b/cli/CHANGELOG.md index df16df44e357..0f1a8841fd72 100644 --- a/cli/CHANGELOG.md +++ b/cli/CHANGELOG.md @@ -10,6 +10,10 @@ _Released 1/30/2024 (PENDING)_ - Upgraded bundled Node.js version from `18.15.0` to `18.17.0` - Upgraded bundled Chromium version from `114.0.5735.289` to `118.0.5993.117` +**Bugfixes:** + +- Fixed an issue with capturing assets for Test Replay when service workers are registered in Cypress support files. This issue would cause styles to not render properly in Test Replay. Fixes [#28747](https://github.com/cypress-io/cypress/issues/28747). + **Performance:** - Fixed a performance regression from [`13.3.2`](https://docs.cypress.io/guides/references/changelog#13.3.2) where aborted requests may not correlate correctly. Fixes [#28734](https://github.com/cypress-io/cypress/issues/28734). diff --git a/packages/proxy/lib/http/index.ts b/packages/proxy/lib/http/index.ts index 54161495c79b..da75e598bce6 100644 --- a/packages/proxy/lib/http/index.ts +++ b/packages/proxy/lib/http/index.ts @@ -494,8 +494,8 @@ export class Http { this.serviceWorkerManager.updateServiceWorkerVersions(data) } - updateServiceWorkerClientSideRegistrations (data: { scriptURL: string, initiatorURL: string }) { - this.serviceWorkerManager.addInitiatorToServiceWorker({ scriptURL: data.scriptURL, initiatorURL: data.initiatorURL }) + updateServiceWorkerClientSideRegistrations (data: { scriptURL: string, initiatorOrigin: string }) { + this.serviceWorkerManager.addInitiatorToServiceWorker({ scriptURL: data.scriptURL, initiatorOrigin: data.initiatorOrigin }) } setProtocolManager (protocolManager: ProtocolManagerShape) { diff --git a/packages/proxy/lib/http/util/service-worker-manager.ts b/packages/proxy/lib/http/util/service-worker-manager.ts index 17d833f98b32..f97e6bd76bd5 100644 --- a/packages/proxy/lib/http/util/service-worker-manager.ts +++ b/packages/proxy/lib/http/util/service-worker-manager.ts @@ -13,7 +13,7 @@ type ServiceWorkerRegistration = { type ServiceWorker = { registrationId: string scriptURL: string - initiatorURL?: string + initiatorOrigin?: string controlledURLs: Set } @@ -33,7 +33,7 @@ type AddActivatedServiceWorkerOptions = { type AddInitiatorToServiceWorkerOptions = { scriptURL: string - initiatorURL: string + initiatorOrigin: string } /** @@ -51,7 +51,7 @@ type AddInitiatorToServiceWorkerOptions = { * At this point, when the manager tries to process a browser pre-request, it will check if the request is controlled by a service worker. * It determines it is controlled by a service worker if: * - * 1. The document URL for the browser pre-request matches the initiator URL for the service worker. + * 1. The document URL for the browser pre-request matches the initiator origin for the service worker. * 2. The request URL is within the scope of the service worker or the request URL's initiator is controlled by the service worker. */ export class ServiceWorkerManager { @@ -86,12 +86,12 @@ export class ServiceWorkerManager { * Adds an initiator URL to a service worker. If the service worker has not yet been activated, the initiator URL is added to a pending list and will * be added to the service worker when it is activated. */ - addInitiatorToServiceWorker ({ scriptURL, initiatorURL }: AddInitiatorToServiceWorkerOptions) { + addInitiatorToServiceWorker ({ scriptURL, initiatorOrigin }: AddInitiatorToServiceWorkerOptions) { let initiatorAdded = false for (const registration of this.serviceWorkerRegistrations.values()) { if (registration.activatedServiceWorker?.scriptURL === scriptURL) { - registration.activatedServiceWorker.initiatorURL = initiatorURL + registration.activatedServiceWorker.initiatorOrigin = initiatorOrigin initiatorAdded = true break @@ -99,7 +99,7 @@ export class ServiceWorkerManager { } if (!initiatorAdded) { - this.pendingInitiators.set(scriptURL, initiatorURL) + this.pendingInitiators.set(scriptURL, initiatorOrigin) } } @@ -120,7 +120,13 @@ export class ServiceWorkerManager { const activatedServiceWorker = registration.activatedServiceWorker const paramlessDocumentURL = browserPreRequest.documentURL.split('?')[0] - if (!activatedServiceWorker || activatedServiceWorker.initiatorURL !== paramlessDocumentURL) { + // We are determining here if a request is controlled by a service worker. A request is controlled by a service worker if + // we have an activated service worker, the request URL does not come from the service worker, and the request + // originates from the same origin as the service worker or from a script that is also controlled by the service worker. + if (!activatedServiceWorker || + activatedServiceWorker.scriptURL === paramlessDocumentURL || + !activatedServiceWorker.initiatorOrigin || + !paramlessDocumentURL.startsWith(activatedServiceWorker.initiatorOrigin)) { return } @@ -169,13 +175,13 @@ export class ServiceWorkerManager { const registration = this.serviceWorkerRegistrations.get(registrationId) if (registration) { - const initiatorURL = this.pendingInitiators.get(scriptURL) + const initiatorOrigin = this.pendingInitiators.get(scriptURL) registration.activatedServiceWorker = { registrationId, scriptURL, controlledURLs: new Set(), - initiatorURL: initiatorURL || registration.activatedServiceWorker?.initiatorURL, + initiatorOrigin: initiatorOrigin || registration.activatedServiceWorker?.initiatorOrigin, } this.pendingInitiators.delete(scriptURL) diff --git a/packages/proxy/lib/network-proxy.ts b/packages/proxy/lib/network-proxy.ts index 2498d2efa1b4..e54172ba55fe 100644 --- a/packages/proxy/lib/network-proxy.ts +++ b/packages/proxy/lib/network-proxy.ts @@ -34,7 +34,7 @@ export class NetworkProxy { this.http.updateServiceWorkerVersions(data) } - updateServiceWorkerClientSideRegistrations (data: { scriptURL: string, initiatorURL: string }) { + updateServiceWorkerClientSideRegistrations (data: { scriptURL: string, initiatorOrigin: string }) { this.http.updateServiceWorkerClientSideRegistrations(data) } diff --git a/packages/proxy/test/unit/http/index.spec.ts b/packages/proxy/test/unit/http/index.spec.ts index f5b6edc9bf21..b0f7051f8cfd 100644 --- a/packages/proxy/test/unit/http/index.spec.ts +++ b/packages/proxy/test/unit/http/index.spec.ts @@ -406,7 +406,7 @@ describe('http', function () { const addInitiatorToServiceWorkerStub = sinon.stub(http.serviceWorkerManager, 'addInitiatorToServiceWorker') const registration = { scriptURL: 'foo', - initiatorURL: 'bar', + initiatorOrigin: 'bar', } http.updateServiceWorkerClientSideRegistrations(registration) diff --git a/packages/proxy/test/unit/http/util/service-worker-manager.spec.ts b/packages/proxy/test/unit/http/util/service-worker-manager.spec.ts index 0f483473cd23..e1167988b8ee 100644 --- a/packages/proxy/test/unit/http/util/service-worker-manager.spec.ts +++ b/packages/proxy/test/unit/http/util/service-worker-manager.spec.ts @@ -25,7 +25,7 @@ describe('lib/http/util/service-worker-manager', () => { manager.addInitiatorToServiceWorker({ scriptURL: 'http://localhost:8080/sw.js', - initiatorURL: 'http://localhost:8080/index.html', + initiatorOrigin: 'http://localhost:8080/', }) // A script request emanated from the service worker's initiator is controlled @@ -182,7 +182,7 @@ describe('lib/http/util/service-worker-manager', () => { manager.addInitiatorToServiceWorker({ scriptURL: 'http://localhost:8080/sw.js', - initiatorURL: 'http://localhost:8080/index.html', + initiatorOrigin: 'http://localhost:8080/', }) // A script request emanated from the service worker's initiator is controlled @@ -339,7 +339,7 @@ describe('lib/http/util/service-worker-manager', () => { manager.addInitiatorToServiceWorker({ scriptURL: 'http://localhost:8080/sw.js', - initiatorURL: 'http://localhost:8080/index.html', + initiatorOrigin: 'http://localhost:8080/', }) // A script request emanated from the service worker's initiator is controlled @@ -496,7 +496,7 @@ describe('lib/http/util/service-worker-manager', () => { manager.addInitiatorToServiceWorker({ scriptURL: 'http://localhost:8080/sw.js', - initiatorURL: 'http://localhost:8080/index.html', + initiatorOrigin: 'http://localhost:8080/', }) // A script request emanated from the service worker's initiator is controlled @@ -569,7 +569,7 @@ describe('lib/http/util/service-worker-manager', () => { manager.addInitiatorToServiceWorker({ scriptURL: 'http://localhost:8080/sw.js', - initiatorURL: 'http://localhost:8080/index.html', + initiatorOrigin: 'http://localhost:8080/', }) // A script request emanated from the service worker's initiator is controlled diff --git a/packages/server/lib/browsers/utils.ts b/packages/server/lib/browsers/utils.ts index 120630a7fe27..9cc77cf98dc1 100644 --- a/packages/server/lib/browsers/utils.ts +++ b/packages/server/lib/browsers/utils.ts @@ -457,7 +457,7 @@ const overrideServiceWorkerRegistration = (binding) => { const serviceWorkerRegistrationEvent = { type: 'service-worker-registration', scriptURL: resolvedUrl, - initiatorURL: window.location.href, + initiatorOrigin: window.location.origin, } binding(JSON.stringify(serviceWorkerRegistrationEvent)) diff --git a/packages/server/lib/project-base.ts b/packages/server/lib/project-base.ts index 38042a032bf5..f3fe8fa11189 100644 --- a/packages/server/lib/project-base.ts +++ b/packages/server/lib/project-base.ts @@ -352,7 +352,7 @@ export class ProjectBase extends EE { this.server.updateServiceWorkerVersions(data) } - const onServiceWorkerClientSideRegistrationUpdated = (data: { scriptURL: string, initiatorURL: string }) => { + const onServiceWorkerClientSideRegistrationUpdated = (data: { scriptURL: string, initiatorOrigin: string }) => { this.server.updateServiceWorkerClientSideRegistrations(data) } diff --git a/packages/server/lib/server-base.ts b/packages/server/lib/server-base.ts index 494847ac5e84..1137a8135e92 100644 --- a/packages/server/lib/server-base.ts +++ b/packages/server/lib/server-base.ts @@ -520,7 +520,7 @@ export class ServerBase { this.networkProxy.updateServiceWorkerVersions(data) } - updateServiceWorkerClientSideRegistrations (data: { scriptURL: string, initiatorURL: string }) { + updateServiceWorkerClientSideRegistrations (data: { scriptURL: string, initiatorOrigin: string }) { this.networkProxy.updateServiceWorkerClientSideRegistrations(data) } diff --git a/packages/types/src/server.ts b/packages/types/src/server.ts index f8ee092f9656..cacbb5d42a02 100644 --- a/packages/types/src/server.ts +++ b/packages/types/src/server.ts @@ -64,7 +64,7 @@ export type OnServiceWorkerRegistrationUpdated = (data: Protocol.ServiceWorker.W export type OnServiceWorkerVersionUpdated = (data: Protocol.ServiceWorker.WorkerVersionUpdatedEvent) => void -export type OnServiceWorkerClientSideRegistrationUpdated = (data: { scriptURL: string, initiatorURL: string }) => void +export type OnServiceWorkerClientSideRegistrationUpdated = (data: { scriptURL: string, initiatorOrigin: string }) => void export interface AutomationMiddleware { onPush?: NullableMiddlewareHook diff --git a/system-tests/projects/protocol/cypress-with-service-worker-preloaded.config.ts b/system-tests/projects/protocol/cypress-with-service-worker-preloaded.config.ts new file mode 100644 index 000000000000..6304541e62ea --- /dev/null +++ b/system-tests/projects/protocol/cypress-with-service-worker-preloaded.config.ts @@ -0,0 +1,9 @@ +import { defineConfig } from 'cypress' + +export default defineConfig({ + projectId: 'pid123', + e2e: { + supportFile: 'cypress/support/e2e-preload-service-worker.ts', + setupNodeEvents: (on, config) => {}, + }, +}) diff --git a/system-tests/projects/protocol/cypress/e2e/service-worker-preloaded.cy.js b/system-tests/projects/protocol/cypress/e2e/service-worker-preloaded.cy.js new file mode 100644 index 000000000000..bfacc26f16d6 --- /dev/null +++ b/system-tests/projects/protocol/cypress/e2e/service-worker-preloaded.cy.js @@ -0,0 +1,31 @@ +const swReq = (win) => { + return new Promise((resolve) => { + win.addEventListener('service-worker:ready', (event) => { + expect(event.detail).to.deep.equal({ + example: { + foo: 'bar', + }, + cached: { + foo: 'baz', + }, + }) + + resolve(win) + }) + }) +} + +// Timeout of 1500 will ensure that the proxy correlation timeout is not hit +it('loads service worker', { defaultCommandTimeout: 1500 }, () => { + cy.visit('cypress/fixtures/service-worker-assets/scope/service_worker_preloaded.html') + .then(swReq) +}) + +// Load the service worker again to ensure that the service worker cache +// can be loaded properly. There are requests that are made with the +// cache that have different headers that need to be tested in the proxy. +// Timeout of 1500 will ensure that the proxy correlation timeout is not hit +it('loads service worker', { defaultCommandTimeout: 1500 }, () => { + cy.visit('cypress/fixtures/service-worker-assets/scope/service_worker_preloaded.html') + .then(swReq) +}) diff --git a/system-tests/projects/protocol/cypress/e2e/service-worker.cy.js b/system-tests/projects/protocol/cypress/e2e/service-worker.cy.js index 044f87eb316f..3843bb8c64e1 100644 --- a/system-tests/projects/protocol/cypress/e2e/service-worker.cy.js +++ b/system-tests/projects/protocol/cypress/e2e/service-worker.cy.js @@ -1,6 +1,15 @@ const swReq = (win) => { return new Promise((resolve) => { - win.addEventListener('service-worker:ready', () => { + win.addEventListener('service-worker:ready', (event) => { + expect(event.detail).to.deep.equal({ + example: { + foo: 'bar', + }, + cached: { + foo: 'baz', + }, + }) + resolve(win) }) }) diff --git a/system-tests/projects/protocol/cypress/fixtures/service-worker-assets/scope/load-with-service-worker-preloaded.js b/system-tests/projects/protocol/cypress/fixtures/service-worker-assets/scope/load-with-service-worker-preloaded.js new file mode 100644 index 000000000000..acb47d7356c0 --- /dev/null +++ b/system-tests/projects/protocol/cypress/fixtures/service-worker-assets/scope/load-with-service-worker-preloaded.js @@ -0,0 +1,15 @@ +navigator.serviceWorker?.ready.then(async () => { + // Wait for the service worker to be ready and deterministically ensure these requests are handled by the service worker + await new Promise((resolve) => setTimeout(resolve, 500)) + const exampleResponse = await fetch('/cypress/fixtures/service-worker-assets/example.json') + const example = await exampleResponse.json() + const cachedResponse = await fetch('/cypress/fixtures/service-worker-assets/scope/cached-service-worker.json') + const cached = await cachedResponse.json() + + window.dispatchEvent(new CustomEvent('service-worker:ready', { + detail: { + example, + cached, + }, + })) +}) diff --git a/system-tests/projects/protocol/cypress/fixtures/service-worker-assets/scope/load.js b/system-tests/projects/protocol/cypress/fixtures/service-worker-assets/scope/load.js index e436969c5b4c..06521481ef46 100644 --- a/system-tests/projects/protocol/cypress/fixtures/service-worker-assets/scope/load.js +++ b/system-tests/projects/protocol/cypress/fixtures/service-worker-assets/scope/load.js @@ -1,8 +1,17 @@ navigator.serviceWorker?.register(new URL('http://localhost:2121/cypress/fixtures/service-worker-assets/scope/service-worker.js')) navigator.serviceWorker?.ready.then(async () => { - await fetch('/cypress/fixtures/service-worker-assets/example.json') - await fetch('/cypress/fixtures/service-worker-assets/scope/cached-service-worker.json') + // Wait for the service worker to be ready and deterministically ensure these requests are handled by the service worker + await new Promise((resolve) => setTimeout(resolve, 500)) + const exampleResponse = await fetch('/cypress/fixtures/service-worker-assets/example.json') + const example = await exampleResponse.json() + const cachedResponse = await fetch('/cypress/fixtures/service-worker-assets/scope/cached-service-worker.json') + const cached = await cachedResponse.json() - window.dispatchEvent(new Event('service-worker:ready')) + window.dispatchEvent(new CustomEvent('service-worker:ready', { + detail: { + example, + cached, + }, + })) }) diff --git a/system-tests/projects/protocol/cypress/fixtures/service-worker-assets/scope/service_worker_preloaded.html b/system-tests/projects/protocol/cypress/fixtures/service-worker-assets/scope/service_worker_preloaded.html new file mode 100644 index 000000000000..a3b2b0f242eb --- /dev/null +++ b/system-tests/projects/protocol/cypress/fixtures/service-worker-assets/scope/service_worker_preloaded.html @@ -0,0 +1,11 @@ + + + + + + + + +

Preloaded Service worker loaded

+ + diff --git a/system-tests/projects/protocol/cypress/support/e2e-preload-service-worker.ts b/system-tests/projects/protocol/cypress/support/e2e-preload-service-worker.ts new file mode 100644 index 000000000000..15fd48fd716e --- /dev/null +++ b/system-tests/projects/protocol/cypress/support/e2e-preload-service-worker.ts @@ -0,0 +1,9 @@ +const setupServiceWorker = async () => { + try { + await window.navigator.serviceWorker?.register(new URL('http://localhost:2121/cypress/fixtures/service-worker-assets/scope/service-worker.js')) + } catch (e) { + // This errors the first time through before top is reloaded + } +} + +Cypress.on('test:before:run:async', setupServiceWorker) diff --git a/system-tests/test/service_worker_protocol_spec.js b/system-tests/test/service_worker_protocol_spec.js index 7ac93e3ae84f..4c3aaebb1ff0 100644 --- a/system-tests/test/service_worker_protocol_spec.js +++ b/system-tests/test/service_worker_protocol_spec.js @@ -56,6 +56,34 @@ describe('capture-protocol', () => { expect(parsedProtocolEvents.exceptionThrown).to.be.false }) }) + + it(`verifies the types of requests match for a preloaded service worker - ${browser}`, function () { + return systemTests.exec(this, { + key: 'f858a2bc-b469-4e48-be67-0876339ee7e1', + project: 'protocol', + configFile: 'cypress-with-service-worker-preloaded.config.ts', + // Here we are testing that when a service worker is preloaded it can properly be captured + spec: 'service-worker-preloaded.cy.js', + record: true, + expectedExitCode: 0, + port: 2121, + browser, + }).then(() => { + const protocolEvents = fs.readFileSync(getFilePath('e9e81b5e-cc58-4026-b2ff-8ae3161435a6.db'), 'utf8') + + const parsedProtocolEvents = JSON.parse(protocolEvents) + + expect(parsedProtocolEvents.multipleNetworkRequestEventsForSameRequestId).to.be.false + expect(parsedProtocolEvents.correlatedUrls).to.eql({ + 'http://localhost:2121/cypress/fixtures/service-worker-assets/example.json': ['no frame id'], + 'http://localhost:2121/cypress/fixtures/service-worker-assets/scope/cached-service-worker.json': ['no frame id'], + 'http://localhost:2121/cypress/fixtures/service-worker-assets/scope/load-with-service-worker-preloaded.js': ['no frame id'], + 'http://localhost:2121/cypress/fixtures/service-worker-assets/scope/service_worker_preloaded.html': ['no frame id', 'no frame id', 'no frame id', 'no frame id'], + }) + + expect(parsedProtocolEvents.exceptionThrown).to.be.false + }) + }) }) }) }) From 7c6646fbd5e82b2f13bfb31277359badec350ab5 Mon Sep 17 00:00:00 2001 From: Bill Glesias Date: Wed, 24 Jan 2024 09:23:46 -0500 Subject: [PATCH 66/67] chore: update octokit and arm64 image to newest focal (#28754) * chore: update octokit packages to latest. removals/deprecations do not impact us and most breaking changes are dropped support for Node <18 * test binary comment task [run ci] * chore: update arm64 image is it is deprecated * run ci --- .circleci/workflows.yml | 4 +- package.json | 4 +- yarn.lock | 221 +++++++++++++++++++++++++++------------- 3 files changed, 156 insertions(+), 73 deletions(-) diff --git a/.circleci/workflows.yml b/.circleci/workflows.yml index 27a9f6c81162..940b364b05bd 100644 --- a/.circleci/workflows.yml +++ b/.circleci/workflows.yml @@ -133,7 +133,7 @@ executors: linux-arm64: &linux-arm64-executor machine: - image: ubuntu-2004:2022.04.1 + image: ubuntu-2004:2023.07.1 resource_class: arm.medium environment: PLATFORM: linux @@ -149,7 +149,7 @@ commands: name: Set environment variable to determine whether or not to persist artifacts command: | echo "Setting SHOULD_PERSIST_ARTIFACTS variable" - echo 'if ! [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "release/"* && "$CIRCLE_BRANCH" != "ryanm/fix/issue-with-service-workers-loaded-in-support-file" ]]; then + echo 'if ! [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "release/"* && "$CIRCLE_BRANCH" != "publish-binary" && "$CIRCLE_BRANCH" != "chore/update_octokit" ]]; then export SHOULD_PERSIST_ARTIFACTS=true fi' >> "$BASH_ENV" # You must run `setup_should_persist_artifacts` command and be using bash before running this command diff --git a/package.json b/package.json index a010f3305f76..32cd091c1a6c 100644 --- a/package.json +++ b/package.json @@ -91,8 +91,8 @@ "@graphql-tools/utils": "8.2.3", "@graphql-tools/wrap": "8.1.1", "@nrwl/nx-cloud": "16.0.5", - "@octokit/auth-app": "3.6.1", - "@octokit/core": "3.6.0", + "@octokit/auth-app": "6.0.3", + "@octokit/core": "5.0.2", "@percy/cli": "1.27.4", "@semantic-release/changelog": "5.0.1", "@semantic-release/git": "9.0.0", diff --git a/yarn.lock b/yarn.lock index 7a2b76e40e73..a1a88f6d8983 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5356,54 +5356,53 @@ dependencies: nx "15.9.4" -"@octokit/auth-app@3.6.1": - version "3.6.1" - resolved "https://registry.npmjs.org/@octokit/auth-app/-/auth-app-3.6.1.tgz#aa5b02cc211175cbc28ce6c03c73373c1206d632" - integrity sha512-6oa6CFphIYI7NxxHrdVOzhG7hkcKyGyYocg7lNDSJVauVOLtylg8hNJzoUyPAYKKK0yUeoZamE/lMs2tG+S+JA== - dependencies: - "@octokit/auth-oauth-app" "^4.3.0" - "@octokit/auth-oauth-user" "^1.2.3" - "@octokit/request" "^5.6.0" - "@octokit/request-error" "^2.1.0" - "@octokit/types" "^6.0.3" - "@types/lru-cache" "^5.1.0" +"@octokit/auth-app@6.0.3": + version "6.0.3" + resolved "https://registry.yarnpkg.com/@octokit/auth-app/-/auth-app-6.0.3.tgz#4c0ba68e8d3b1a55c34d1e68ea0ca92ef018bb7a" + integrity sha512-9N7IlBAKEJR3tJgPSubCxIDYGXSdc+2xbkjYpk9nCyqREnH8qEMoMhiEB1WgoA9yTFp91El92XNXAi+AjuKnfw== + dependencies: + "@octokit/auth-oauth-app" "^7.0.0" + "@octokit/auth-oauth-user" "^4.0.0" + "@octokit/request" "^8.0.2" + "@octokit/request-error" "^5.0.0" + "@octokit/types" "^12.0.0" deprecation "^2.3.1" - lru-cache "^6.0.0" - universal-github-app-jwt "^1.0.1" + lru-cache "^10.0.0" + universal-github-app-jwt "^1.1.2" universal-user-agent "^6.0.0" -"@octokit/auth-oauth-app@^4.3.0": - version "4.3.1" - resolved "https://registry.npmjs.org/@octokit/auth-oauth-app/-/auth-oauth-app-4.3.1.tgz#c5c423f17519eb7e039a7d60936dfb869c7bdf36" - integrity sha512-FXkKcGtTXS2987rp11mSuhMOXDw8Iy/ED9aXs83T29VeMEWjv40q4ytC0voUDxkBC/of1QYOPQUAdI2tv/dwNg== +"@octokit/auth-oauth-app@^7.0.0": + version "7.0.1" + resolved "https://registry.yarnpkg.com/@octokit/auth-oauth-app/-/auth-oauth-app-7.0.1.tgz#30fd8fcb4608ca52c29c265a3fc7032897796c8e" + integrity sha512-RE0KK0DCjCHXHlQBoubwlLijXEKfhMhKm9gO56xYvFmP1QTMb+vvwRPmQLLx0V+5AvV9N9I3lr1WyTzwL3rMDg== dependencies: - "@octokit/auth-oauth-device" "^3.1.1" - "@octokit/auth-oauth-user" "^1.2.1" - "@octokit/request" "^5.6.3" - "@octokit/types" "^6.0.3" + "@octokit/auth-oauth-device" "^6.0.0" + "@octokit/auth-oauth-user" "^4.0.0" + "@octokit/request" "^8.0.2" + "@octokit/types" "^12.0.0" "@types/btoa-lite" "^1.0.0" btoa-lite "^1.0.0" universal-user-agent "^6.0.0" -"@octokit/auth-oauth-device@^3.1.1": - version "3.1.2" - resolved "https://registry.npmjs.org/@octokit/auth-oauth-device/-/auth-oauth-device-3.1.2.tgz#d299f51f491669f37fe7af8738f5ac921e63973c" - integrity sha512-w7Po4Ck6N2aAn2VQyKLuojruiyKROTBv4qs6IwE5rbwF7HhBXXp4A/NKmkpoFIZkiXQtM+N8QtkSck4ApYWdGg== +"@octokit/auth-oauth-device@^6.0.0": + version "6.0.1" + resolved "https://registry.yarnpkg.com/@octokit/auth-oauth-device/-/auth-oauth-device-6.0.1.tgz#38e5f7f8997c5e8b774f283463ecf4a7e42d7cee" + integrity sha512-yxU0rkL65QkjbqQedgVx3gmW7YM5fF+r5uaSj9tM/cQGVqloXcqP2xK90eTyYvl29arFVCW8Vz4H/t47mL0ELw== dependencies: - "@octokit/oauth-methods" "^1.1.0" - "@octokit/request" "^5.4.14" - "@octokit/types" "^6.10.0" + "@octokit/oauth-methods" "^4.0.0" + "@octokit/request" "^8.0.0" + "@octokit/types" "^12.0.0" universal-user-agent "^6.0.0" -"@octokit/auth-oauth-user@^1.2.1", "@octokit/auth-oauth-user@^1.2.3": - version "1.3.0" - resolved "https://registry.npmjs.org/@octokit/auth-oauth-user/-/auth-oauth-user-1.3.0.tgz#da4e4529145181a6aa717ae858afb76ebd6e3360" - integrity sha512-3QC/TAdk7onnxfyZ24BnJRfZv8TRzQK7SEFUS9vLng4Vv6Hv6I64ujdk/CUkREec8lhrwU764SZ/d+yrjjqhaQ== +"@octokit/auth-oauth-user@^4.0.0": + version "4.0.1" + resolved "https://registry.yarnpkg.com/@octokit/auth-oauth-user/-/auth-oauth-user-4.0.1.tgz#c8267883935c83f78318c726ff91d7e98de05517" + integrity sha512-N94wWW09d0hleCnrO5wt5MxekatqEJ4zf+1vSe8MKMrhZ7gAXKFOKrDEZW2INltvBWJCyDUELgGRv8gfErH1Iw== dependencies: - "@octokit/auth-oauth-device" "^3.1.1" - "@octokit/oauth-methods" "^1.1.0" - "@octokit/request" "^5.4.14" - "@octokit/types" "^6.12.2" + "@octokit/auth-oauth-device" "^6.0.0" + "@octokit/oauth-methods" "^4.0.0" + "@octokit/request" "^8.0.2" + "@octokit/types" "^12.0.0" btoa-lite "^1.0.0" universal-user-agent "^6.0.0" @@ -5421,7 +5420,25 @@ dependencies: "@octokit/types" "^9.0.0" -"@octokit/core@3.6.0", "@octokit/core@^3.5.1": +"@octokit/auth-token@^4.0.0": + version "4.0.0" + resolved "https://registry.yarnpkg.com/@octokit/auth-token/-/auth-token-4.0.0.tgz#40d203ea827b9f17f42a29c6afb93b7745ef80c7" + integrity sha512-tY/msAuJo6ARbK6SPIxZrPBms3xPbfwBrulZe0Wtr/DIY9lje2HeV1uoebShn6mx7SjCHif6EjMvoREj+gZ+SA== + +"@octokit/core@5.0.2": + version "5.0.2" + resolved "https://registry.yarnpkg.com/@octokit/core/-/core-5.0.2.tgz#ae7c5d61fdd98ba348a27c3cc510879a130b1234" + integrity sha512-cZUy1gUvd4vttMic7C0lwPed8IYXWYp8kHIMatyhY8t8n3Cpw2ILczkV5pGMPqef7v0bLo0pOHrEHarsau2Ydg== + dependencies: + "@octokit/auth-token" "^4.0.0" + "@octokit/graphql" "^7.0.0" + "@octokit/request" "^8.0.2" + "@octokit/request-error" "^5.0.0" + "@octokit/types" "^12.0.0" + before-after-hook "^2.2.0" + universal-user-agent "^6.0.0" + +"@octokit/core@^3.5.1": version "3.6.0" resolved "https://registry.npmjs.org/@octokit/core/-/core-3.6.0.tgz#3376cb9f3008d9b3d110370d90e0a1fcd5fe6085" integrity sha512-7RKRKuA4xTjMhY+eG3jthb3hlZCsOwg3rztWh75Xc+ShDWOfDDATWbeZpAHBNRpm4Tv9WgBMOy1zEJYXG6NJ7Q== @@ -5465,6 +5482,14 @@ is-plain-object "^5.0.0" universal-user-agent "^6.0.0" +"@octokit/endpoint@^9.0.0": + version "9.0.4" + resolved "https://registry.yarnpkg.com/@octokit/endpoint/-/endpoint-9.0.4.tgz#8afda5ad1ffc3073d08f2b450964c610b821d1ea" + integrity sha512-DWPLtr1Kz3tv8L0UvXTDP1fNwM0S+z6EJpRcvH66orY6Eld4XBMCSYsaWp4xIm61jTWxK68BrR7ibO+vSDnZqw== + dependencies: + "@octokit/types" "^12.0.0" + universal-user-agent "^6.0.0" + "@octokit/graphql@^4.5.8": version "4.6.0" resolved "https://registry.yarnpkg.com/@octokit/graphql/-/graphql-4.6.0.tgz#f9abca55f82183964a33439d5264674c701c3327" @@ -5483,20 +5508,29 @@ "@octokit/types" "^9.0.0" universal-user-agent "^6.0.0" -"@octokit/oauth-authorization-url@^4.3.1": - version "4.3.3" - resolved "https://registry.npmjs.org/@octokit/oauth-authorization-url/-/oauth-authorization-url-4.3.3.tgz#6a6ef38f243086fec882b62744f39b517528dfb9" - integrity sha512-lhP/t0i8EwTmayHG4dqLXgU+uPVys4WD/qUNvC+HfB1S1dyqULm5Yx9uKc1x79aP66U1Cb4OZeW8QU/RA9A4XA== +"@octokit/graphql@^7.0.0": + version "7.0.2" + resolved "https://registry.yarnpkg.com/@octokit/graphql/-/graphql-7.0.2.tgz#3df14b9968192f9060d94ed9e3aa9780a76e7f99" + integrity sha512-OJ2iGMtj5Tg3s6RaXH22cJcxXRi7Y3EBqbHTBRq+PQAqfaS8f/236fUrWhfSn8P4jovyzqucxme7/vWSSZBX2Q== + dependencies: + "@octokit/request" "^8.0.1" + "@octokit/types" "^12.0.0" + universal-user-agent "^6.0.0" -"@octokit/oauth-methods@^1.1.0": - version "1.2.6" - resolved "https://registry.npmjs.org/@octokit/oauth-methods/-/oauth-methods-1.2.6.tgz#b9ac65e374b2cc55ee9dd8dcdd16558550438ea7" - integrity sha512-nImHQoOtKnSNn05uk2o76om1tJWiAo4lOu2xMAHYsNr0fwopP+Dv+2MlGvaMMlFjoqVd3fF3X5ZDTKCsqgmUaQ== +"@octokit/oauth-authorization-url@^6.0.2": + version "6.0.2" + resolved "https://registry.yarnpkg.com/@octokit/oauth-authorization-url/-/oauth-authorization-url-6.0.2.tgz#cc82ca29cc5e339c9921672f39f2b3f5c8eb6ef2" + integrity sha512-CdoJukjXXxqLNK4y/VOiVzQVjibqoj/xHgInekviUJV73y/BSIcwvJ/4aNHPBPKcPWFnd4/lO9uqRV65jXhcLA== + +"@octokit/oauth-methods@^4.0.0": + version "4.0.1" + resolved "https://registry.yarnpkg.com/@octokit/oauth-methods/-/oauth-methods-4.0.1.tgz#90d22c662387056307778d7e5c4763ff559636c4" + integrity sha512-1NdTGCoBHyD6J0n2WGXg9+yDLZrRNZ0moTEex/LSPr49m530WNKcCfXDghofYptr3st3eTii+EHoG5k/o+vbtw== dependencies: - "@octokit/oauth-authorization-url" "^4.3.1" - "@octokit/request" "^5.4.14" - "@octokit/request-error" "^2.0.5" - "@octokit/types" "^6.12.2" + "@octokit/oauth-authorization-url" "^6.0.2" + "@octokit/request" "^8.0.2" + "@octokit/request-error" "^5.0.0" + "@octokit/types" "^12.0.0" btoa-lite "^1.0.0" "@octokit/openapi-types@^12.11.0": @@ -5514,6 +5548,11 @@ resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-17.1.0.tgz#9a712b5bb9d644940d8a1f24115c798c317a64a5" integrity sha512-rnI26BAITDZTo5vqFOmA7oX4xRd18rO+gcK4MiTpJmsRMxAw0JmevNjPsjpry1bb9SVNo56P/0kbiyXXa4QluA== +"@octokit/openapi-types@^19.1.0": + version "19.1.0" + resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-19.1.0.tgz#75ec7e64743870fc73e1ab4bc6ec252ecdd624dc" + integrity sha512-6G+ywGClliGQwRsjvqVYpklIfa7oRPA0vyhPQG/1Feh+B+wU0vGH1JiJ5T25d3g1JZYBHzR2qefLi9x8Gt+cpw== + "@octokit/plugin-enterprise-rest@6.0.1": version "6.0.1" resolved "https://registry.yarnpkg.com/@octokit/plugin-enterprise-rest/-/plugin-enterprise-rest-6.0.1.tgz#e07896739618dab8da7d4077c658003775f95437" @@ -5572,7 +5611,16 @@ deprecation "^2.0.0" once "^1.4.0" -"@octokit/request@^5.3.0", "@octokit/request@^5.4.14", "@octokit/request@^5.6.0", "@octokit/request@^5.6.3": +"@octokit/request-error@^5.0.0": + version "5.0.1" + resolved "https://registry.yarnpkg.com/@octokit/request-error/-/request-error-5.0.1.tgz#277e3ce3b540b41525e07ba24c5ef5e868a72db9" + integrity sha512-X7pnyTMV7MgtGmiXBwmO6M5kIPrntOXdyKZLigNfQWSEQzVxR4a4vo49vJjTWX70mPndj8KhfT4Dx+2Ng3vnBQ== + dependencies: + "@octokit/types" "^12.0.0" + deprecation "^2.0.0" + once "^1.4.0" + +"@octokit/request@^5.3.0", "@octokit/request@^5.6.3": version "5.6.3" resolved "https://registry.npmjs.org/@octokit/request/-/request-5.6.3.tgz#19a022515a5bba965ac06c9d1334514eb50c48b0" integrity sha512-bFJl0I1KVc9jYTe9tdGGpAMPy32dLBXXo1dS/YwSCTL/2nd9XeHsY616RE3HPXDVk+a+dBuzyz5YdlXwcDTr2A== @@ -5596,6 +5644,16 @@ node-fetch "^2.6.7" universal-user-agent "^6.0.0" +"@octokit/request@^8.0.0", "@octokit/request@^8.0.1", "@octokit/request@^8.0.2": + version "8.1.6" + resolved "https://registry.yarnpkg.com/@octokit/request/-/request-8.1.6.tgz#a76a859c30421737a3918b40973c2ff369009571" + integrity sha512-YhPaGml3ncZC1NfXpP3WZ7iliL1ap6tLkAp6MvbK2fTTPytzVUyUesBBogcdMm86uRYO5rHaM1xIWxigWZ17MQ== + dependencies: + "@octokit/endpoint" "^9.0.0" + "@octokit/request-error" "^5.0.0" + "@octokit/types" "^12.0.0" + universal-user-agent "^6.0.0" + "@octokit/rest@19.0.3": version "19.0.3" resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-19.0.3.tgz#b9a4e8dc8d53e030d611c053153ee6045f080f02" @@ -5616,7 +5674,14 @@ "@octokit/plugin-request-log" "^1.0.4" "@octokit/plugin-rest-endpoint-methods" "^5.9.0" -"@octokit/types@^6.0.3", "@octokit/types@^6.10.0", "@octokit/types@^6.12.2", "@octokit/types@^6.16.1", "@octokit/types@^6.27.1", "@octokit/types@^6.41.0": +"@octokit/types@^12.0.0": + version "12.4.0" + resolved "https://registry.yarnpkg.com/@octokit/types/-/types-12.4.0.tgz#8f97b601e91ce6b9776ed8152217e77a71be7aac" + integrity sha512-FLWs/AvZllw/AGVs+nJ+ELCDZZJk+kY0zMen118xhL2zD0s1etIUHm1odgjP7epxYU1ln7SZxEUWYop5bhsdgQ== + dependencies: + "@octokit/openapi-types" "^19.1.0" + +"@octokit/types@^6.0.3", "@octokit/types@^6.16.1", "@octokit/types@^6.27.1", "@octokit/types@^6.41.0": version "6.41.0" resolved "https://registry.yarnpkg.com/@octokit/types/-/types-6.41.0.tgz#e58ef78d78596d2fb7df9c6259802464b5f84a04" integrity sha512-eJ2jbzjdijiL3B4PrSQaSjuF2sPEQPVCPzBvTHJD9Nz+9dw2SGH4K4xeQJ77YfTq5bRQ+bD8wT11JbeDPmxmGg== @@ -7567,13 +7632,20 @@ resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee" integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4= -"@types/jsonwebtoken@^8.3.3", "@types/jsonwebtoken@^8.5.0": +"@types/jsonwebtoken@^8.5.0": version "8.5.8" resolved "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-8.5.8.tgz#01b39711eb844777b7af1d1f2b4cf22fda1c0c44" integrity sha512-zm6xBQpFDIDM6o9r6HSgDeIcLy82TKWctCXEPbJJcXb5AKmi5BNNdLXneixK4lplX3PqIVcwLBCGE/kAGnlD4A== dependencies: "@types/node" "*" +"@types/jsonwebtoken@^9.0.0": + version "9.0.5" + resolved "https://registry.yarnpkg.com/@types/jsonwebtoken/-/jsonwebtoken-9.0.5.tgz#0bd9b841c9e6c5a937c17656e2368f65da025588" + integrity sha512-VRLSGzik+Unrup6BsouBeHsf4d1hOEgYWTm/7Nmw1sXoN1+tRly/Gy/po3yeahnP4jfnQWWAhQAqcNfH7ngOkA== + dependencies: + "@types/node" "*" + "@types/keyv@*": version "3.1.1" resolved "https://registry.yarnpkg.com/@types/keyv/-/keyv-3.1.1.tgz#e45a45324fca9dab716ab1230ee249c9fb52cfa7" @@ -7591,11 +7663,6 @@ resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.168.tgz#fe24632e79b7ade3f132891afff86caa5e5ce008" integrity sha512-oVfRvqHV/V6D1yifJbVRU3TMp8OT6o6BG+U9MkwuJ3U8/CsDHvalRpsxBqivn71ztOFZBTfJMvETbqHiaNSj7Q== -"@types/lru-cache@^5.1.0": - version "5.1.0" - resolved "https://registry.yarnpkg.com/@types/lru-cache/-/lru-cache-5.1.0.tgz#57f228f2b80c046b4a1bd5cac031f81f207f4f03" - integrity sha512-RaE0B+14ToE4l6UqdarKPnXwVDuigfFv+5j9Dze/Nqr23yyuqdNvzcZi3xB+3Agvi5R4EOgAksfv3lXX4vBt9w== - "@types/markdown-it@12.2.3": version "12.2.3" resolved "https://registry.yarnpkg.com/@types/markdown-it/-/markdown-it-12.2.3.tgz#0d6f6e5e413f8daaa26522904597be3d6cd93b51" @@ -19675,6 +19742,22 @@ jsonwebtoken@^8.5.1: ms "^2.1.1" semver "^5.6.0" +jsonwebtoken@^9.0.2: + version "9.0.2" + resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-9.0.2.tgz#65ff91f4abef1784697d40952bb1998c504caaf3" + integrity sha512-PRp66vJ865SSqOlgqS8hujT5U4AOgMfhrwYIuIhfKaoSCZcirrmASQr8CX7cUg+RMih+hgznrjp99o+W4pJLHQ== + dependencies: + jws "^3.2.2" + lodash.includes "^4.3.0" + lodash.isboolean "^3.0.3" + lodash.isinteger "^4.0.4" + lodash.isnumber "^3.0.3" + lodash.isplainobject "^4.0.6" + lodash.isstring "^4.0.1" + lodash.once "^4.0.0" + ms "^2.1.1" + semver "^7.5.4" + jsprim@^1.2.2: version "1.4.1" resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2" @@ -20847,6 +20930,11 @@ lru-cache@2: resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.7.3.tgz#6d4524e8b955f95d4f5b58851ce21dd72fb4e952" integrity sha1-bUUk6LlV+V1PW1iFHOId1y+06VI= +lru-cache@^10.0.0, "lru-cache@^9.1.1 || ^10.0.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.1.0.tgz#2098d41c2dc56500e6c88584aa656c84de7d0484" + integrity sha512-/1clY/ui8CzjKFyjdvwPWJUYKiFVXG2I2cY0ssG7h4+hwk+XOIX7ZSG9Q7TW8TW3Kp3BUSqgFWBLgL4PJ+Blag== + lru-cache@^4.0.0, lru-cache@^4.0.1, lru-cache@^4.1.5: version "4.1.5" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd" @@ -20874,11 +20962,6 @@ lru-cache@^7.14.1, lru-cache@^7.4.4, lru-cache@^7.5.1, lru-cache@^7.7.1: resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.18.3.tgz#f793896e0fd0e954a59dfdd82f0773808df6aa89" integrity sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA== -"lru-cache@^9.1.1 || ^10.0.0": - version "10.0.0" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.0.0.tgz#b9e2a6a72a129d81ab317202d93c7691df727e61" - integrity sha512-svTf/fzsKHffP42sujkO/Rjs37BCIsQVRCeNYIm9WN8rgT7ffoUnRtZCqU+6BqcSBdv8gwJeTz8knJpgACeQMw== - ltgt@^2.1.2: version "2.2.1" resolved "https://registry.yarnpkg.com/ltgt/-/ltgt-2.2.1.tgz#f35ca91c493f7b73da0e07495304f17b31f87ee5" @@ -26996,7 +27079,7 @@ semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0, semve resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4" integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== -semver@^7.0.0, semver@^7.1.1, semver@^7.1.2, semver@^7.1.3, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.3: +semver@^7.0.0, semver@^7.1.1, semver@^7.1.2, semver@^7.1.3, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.3, semver@^7.5.4: version "7.5.4" resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e" integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA== @@ -30051,13 +30134,13 @@ unique-string@^2.0.0: dependencies: crypto-random-string "^2.0.0" -universal-github-app-jwt@^1.0.1: - version "1.1.0" - resolved "https://registry.npmjs.org/universal-github-app-jwt/-/universal-github-app-jwt-1.1.0.tgz#0abaa876101cdf1d3e4c546be2768841c0c1b514" - integrity sha512-3b+ocAjjz4JTyqaOT+NNBd5BtTuvJTxWElIoeHSVelUV9J3Jp7avmQTdLKCaoqi/5Ox2o/q+VK19TJ233rVXVQ== +universal-github-app-jwt@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/universal-github-app-jwt/-/universal-github-app-jwt-1.1.2.tgz#8c1867a394d7d9d42cda34f11d1bcb023797d8df" + integrity sha512-t1iB2FmLFE+yyJY9+3wMx0ejB+MQpEVkH0gQv7dR6FZyltyq+ZZO0uDpbopxhrZ3SLEO4dCEkIujOMldEQ2iOA== dependencies: - "@types/jsonwebtoken" "^8.3.3" - jsonwebtoken "^8.5.1" + "@types/jsonwebtoken" "^9.0.0" + jsonwebtoken "^9.0.2" universal-user-agent@^6.0.0: version "6.0.0" From 1f8bce9036cd42069307ca7549e5e112cb610688 Mon Sep 17 00:00:00 2001 From: Cacie Prins Date: Wed, 24 Jan 2024 11:05:27 -0500 Subject: [PATCH 67/67] use node 18.17.1 internal images --- .circleci/workflows.yml | 6 +++--- docker-compose.yml | 2 +- system-tests/test-binary/module_api_spec.ts | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/workflows.yml b/.circleci/workflows.yml index 940b364b05bd..380347604a38 100644 --- a/.circleci/workflows.yml +++ b/.circleci/workflows.yml @@ -88,7 +88,7 @@ executors: # the Docker image with Cypress dependencies and Chrome browser cy-doc: docker: - - image: cypress/browsers-internal:node18.17.0-chrome118-ff115 + - image: cypress/browsers-internal:node18.17.1-chrome118-ff115 # by default, we use "medium" to balance performance + CI costs. bump or reduce on a per-job basis if needed. resource_class: medium environment: @@ -98,7 +98,7 @@ executors: # Docker image with non-root "node" user non-root-docker-user: docker: - - image: cypress/browsers-internal:node18.17.0-chrome118-ff115 + - image: cypress/browsers-internal:node18.17.1-chrome118-ff115 user: node environment: PLATFORM: linux @@ -2330,7 +2330,7 @@ jobs: <<: *defaults resource_class: small docker: - - image: cypress/base-internal:18.17.0 + - image: cypress/base-internal:18.17.1 steps: - maybe_skip_binary_jobs - restore_workspace_binaries diff --git a/docker-compose.yml b/docker-compose.yml index d1b2517853be..849089685dfd 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -33,7 +33,7 @@ services: - .:/opt/cypress ci: # This should mirror the image used in workflows.yml - image: cypress/browsers-internal:node18.17.0-chrome118-ff115 + image: cypress/browsers-internal:node18.17.1-chrome118-ff115 ports: - 5566:5566 - 5567:5567 diff --git a/system-tests/test-binary/module_api_spec.ts b/system-tests/test-binary/module_api_spec.ts index 2366f599cdd6..186b8e8b6e21 100644 --- a/system-tests/test-binary/module_api_spec.ts +++ b/system-tests/test-binary/module_api_spec.ts @@ -3,7 +3,7 @@ import systemTests from '../lib/system-tests' describe('module API', () => { systemTests.it('can run module API Mocha spec', { timeout: 240000, - dockerImage: 'cypress/base-internal:18.17.0', + dockerImage: 'cypress/base-internal:18.17.1', withBinary: true, project: 'module-api', browser: 'electron',