From 04c1e8c90bc74ce4f736191ee73ac09c5a014867 Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Thu, 10 Oct 2024 09:15:40 -0500 Subject: [PATCH 1/3] fix: ensure that find-process does not error out due to a bad regex (#30380) * fix: ensure that find-process does not error out due to a bad regex * add changelog * fix patch * add a test * add comment * update comment * blank * blank --- .circleci/workflows.yml | 10 +-- cli/CHANGELOG.md | 4 + .../test/unit/util/find_process_spec.ts | 83 +++++++++++++++++++ patches/find-process+1.4.7.patch | 13 +++ 4 files changed, 105 insertions(+), 5 deletions(-) create mode 100644 packages/server/test/unit/util/find_process_spec.ts create mode 100644 patches/find-process+1.4.7.patch diff --git a/.circleci/workflows.yml b/.circleci/workflows.yml index 22aff4a1c159..d8e7037137c5 100644 --- a/.circleci/workflows.yml +++ b/.circleci/workflows.yml @@ -30,7 +30,7 @@ mainBuildFilters: &mainBuildFilters - /^release\/\d+\.\d+\.\d+$/ # use the following branch as well to ensure that v8 snapshot cache updates are fully tested - 'update-v8-snapshot-cache-on-develop' - - 'misc/remove_marionette_for_geckodriver' + - 'ryanm/fix/find-process' - 'publish-binary' # usually we don't build Mac app - it takes a long time @@ -42,7 +42,7 @@ macWorkflowFilters: &darwin-workflow-filters - equal: [ develop, << pipeline.git.branch >> ] # 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: [ 'misc/remove_marionette_for_geckodriver', << pipeline.git.branch >> ] + - equal: [ 'ryanm/fix/find-process', << pipeline.git.branch >> ] - matches: pattern: /^release\/\d+\.\d+\.\d+$/ value: << pipeline.git.branch >> @@ -53,7 +53,7 @@ linuxArm64WorkflowFilters: &linux-arm64-workflow-filters - equal: [ develop, << pipeline.git.branch >> ] # 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: [ 'misc/remove_marionette_for_geckodriver', << pipeline.git.branch >> ] + - equal: [ 'ryanm/fix/find-process', << pipeline.git.branch >> ] - matches: pattern: /^release\/\d+\.\d+\.\d+$/ value: << pipeline.git.branch >> @@ -76,7 +76,7 @@ windowsWorkflowFilters: &windows-workflow-filters - equal: [ develop, << pipeline.git.branch >> ] # 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: [ 'chore/patch_windows_build', << pipeline.git.branch >> ] + - equal: [ 'ryanm/fix/find-process', << pipeline.git.branch >> ] - matches: pattern: /^release\/\d+\.\d+\.\d+$/ value: << pipeline.git.branch >> @@ -152,7 +152,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" != "misc/remove_marionette_for_geckodriver" ]]; then + echo 'if ! [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "release/"* && "$CIRCLE_BRANCH" != "ryanm/fix/find-process" ]]; 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 8dccb1e48bb6..50b468dd75ca 100644 --- a/cli/CHANGELOG.md +++ b/cli/CHANGELOG.md @@ -3,6 +3,10 @@ _Released 10/1/2024 (PENDING)_ +**Bugfixes:** + +- Patched [find-process](https://github.com/yibn2008/find-process) to fix an issue where trying to clean up browser profiles can throw an error on Windows. Addresses [#30378](https://github.com/cypress-io/cypress/issues/30378). + **Misc:** - Cypress now consumes [geckodriver](https://firefox-source-docs.mozilla.org/testing/geckodriver/index.html) to help automate the Firefox browser instead of [marionette-client](https://github.com/cypress-io/marionette-client). Addresses [#30217](https://github.com/cypress-io/cypress/issues/30217). diff --git a/packages/server/test/unit/util/find_process_spec.ts b/packages/server/test/unit/util/find_process_spec.ts new file mode 100644 index 000000000000..b87aa55f6a0b --- /dev/null +++ b/packages/server/test/unit/util/find_process_spec.ts @@ -0,0 +1,83 @@ +import utils from 'find-process/lib/utils' +import { sinon } from '../../spec_helper' +import { byPid } from '../../../lib/util/find_process' + +describe('lib/util/find_process', function () { + // This is testing the patch for find-process to handle windows processes that have a mixture of carriage returns + it('does not crash in windows with processes that deal with a mixture of carriage returns', async () => { + sinon.stub(process, 'platform').value('win32') + // Create a table that matches what 'Get-CimInstance -className win32_process | select Name,ProcessId,ParentProcessId,CommandLine,ExecutablePath' does in powershell + const process1 = 'Name : abc\r\nProcessId : 123\r\nParentProcessId : 456\r\nCommandLine : "c:\\path\\to\\abc.exe"\r\nExecutablePath : c:\\path\\to\\abc.exe' + const process2 = 'Name : xyz\r\nProcessId : 789\r\nParentProcessId : 1011\r\nCommandLine : "c:\\path\\to\\xyz.exe"\r\nExecutablePath : c:\\path\\to\\xyz.exe' + const process3 = 'Name : def\r\nProcessId : 1213\r\nParentProcessId : 1415\r\nCommandLine : "c:\\path\\to\\def.exe"\r\nExecutablePath : c:\\path\\to\\def.exe' + const process4 = 'Name : ghi\r\nProcessId : 1617\r\nParentProcessId : 1819\r\nCommandLine : "c:\\path\\to\\ghi.exe"\r\nExecutablePath : c:\\path\\to\\ghi.exe' + const process5 = 'Name : jkl\r\nProcessId : 2021\r\nParentProcessId : 2223\r\nCommandLine : "c:\\path\\to\\jkl.exe"\r\nExecutablePath : c:\\path\\to\\jkl.exe' + // Include all of this regex: (\r\n\r\n|\r\n\n|\n\r\n|\n\n) + const returnString = `${process1}\r\n\r\n${process2}\r\n\n${process3}\n\r\n${process4}\n\n${process5}` + + sinon.stub(utils, 'spawn').returns({ + stdout: { + on: (event: string, callback: (data: string) => void) => { + if (event === 'data') { + callback(returnString) + } + }, + }, + on: (event: string, callback: (code: number) => void) => { + if (event === 'close') { + callback(0) + } + }, + }) + + const result1 = await byPid(123) + + expect(result1).to.eql([{ + pid: 123, + ppid: 456, + name: 'abc', + cmd: '"c:\\path\\to\\abc.exe"', + bin: 'c:\\path\\to\\abc.exe', + }]) + + const result2 = await byPid(789) + + expect(result2).to.eql([{ + pid: 789, + ppid: 1011, + name: 'xyz', + cmd: '"c:\\path\\to\\xyz.exe"', + bin: 'c:\\path\\to\\xyz.exe', + }]) + + const result3 = await byPid(1213) + + expect(result3).to.eql([{ + pid: 1213, + ppid: 1415, + name: 'def', + cmd: '"c:\\path\\to\\def.exe"', + bin: 'c:\\path\\to\\def.exe', + }]) + + const result4 = await byPid(1617) + + expect(result4).to.eql([{ + pid: 1617, + ppid: 1819, + name: 'ghi', + cmd: '"c:\\path\\to\\ghi.exe"', + bin: 'c:\\path\\to\\ghi.exe', + }]) + + const result5 = await byPid(2021) + + expect(result5).to.eql([{ + pid: 2021, + ppid: 2223, + name: 'jkl', + cmd: '"c:\\path\\to\\jkl.exe"', + bin: 'c:\\path\\to\\jkl.exe', + }]) + }) +}) diff --git a/patches/find-process+1.4.7.patch b/patches/find-process+1.4.7.patch new file mode 100644 index 000000000000..74a0f4161282 --- /dev/null +++ b/patches/find-process+1.4.7.patch @@ -0,0 +1,13 @@ +diff --git a/node_modules/find-process/lib/utils.js b/node_modules/find-process/lib/utils.js +index fb7592b..a192426 100644 +--- a/node_modules/find-process/lib/utils.js ++++ b/node_modules/find-process/lib/utils.js +@@ -134,7 +134,7 @@ const utils = { + * @return {Array} + */ + parseTable (data) { +- const lines = data.split(/(\r\n\r\n|\r\n\n|\n\r\n)|\n\n/).filter(line => { ++ const lines = data.split(/(\r\n\r\n|\r\n\n|\n\r\n|\n\n)/).filter(line => { + return line.trim().length > 0 + }).map((e) => e.split(/(\r\n|\n|\r)/).filter(line => line.trim().length > 0)) + From 0916ab7eb7877f59992a3506c8b65b2b002502ee Mon Sep 17 00:00:00 2001 From: "cypress-bot[bot]" <+cypress-bot[bot]@users.noreply.github.com> Date: Thu, 10 Oct 2024 15:19:20 +0000 Subject: [PATCH 2/3] chore: updating v8 snapshot cache --- .../cache/linux/snapshot-meta.json | 103 +++++++----------- 1 file changed, 42 insertions(+), 61 deletions(-) diff --git a/tooling/v8-snapshot/cache/linux/snapshot-meta.json b/tooling/v8-snapshot/cache/linux/snapshot-meta.json index 3de9bf87eb70..047e46b46cb4 100644 --- a/tooling/v8-snapshot/cache/linux/snapshot-meta.json +++ b/tooling/v8-snapshot/cache/linux/snapshot-meta.json @@ -225,9 +225,6 @@ "./node_modules/async/dist/async.js", "./node_modules/basic-auth/node_modules/safe-buffer/index.js", "./node_modules/black-hole-stream/index.js", - "./node_modules/body-parser/index.js", - "./node_modules/body-parser/node_modules/debug/src/browser.js", - "./node_modules/body-parser/node_modules/debug/src/index.js", "./node_modules/buffer-from/index.js", "./node_modules/chalk/index.js", "./node_modules/chrome-remote-interface/index.js", @@ -270,19 +267,9 @@ "./node_modules/express-graphql/node_modules/depd/index.js", "./node_modules/express-graphql/node_modules/http-errors/index.js", "./node_modules/express-graphql/parseBody.js", - "./node_modules/express/lib/application.js", - "./node_modules/express/lib/request.js", - "./node_modules/express/lib/response.js", - "./node_modules/express/lib/router/index.js", - "./node_modules/express/lib/router/route.js", - "./node_modules/express/node_modules/debug/src/browser.js", - "./node_modules/express/node_modules/debug/src/index.js", - "./node_modules/express/node_modules/send/index.js", "./node_modules/fast-glob/out/settings.js", "./node_modules/fast-glob/out/utils/path.js", "./node_modules/file-uri-to-path/index.js", - "./node_modules/finalhandler/node_modules/debug/src/browser.js", - "./node_modules/finalhandler/node_modules/debug/src/index.js", "./node_modules/firefox-profile/node_modules/fs-extra/lib/fs/index.js", "./node_modules/firefox-profile/node_modules/fs-extra/lib/index.js", "./node_modules/firefox-profile/node_modules/fs-extra/lib/json/index.js", @@ -343,8 +330,6 @@ "./node_modules/lodash/isBuffer.js", "./node_modules/lodash/lodash.js", "./node_modules/make-dir/node_modules/semver/semver.js", - "./node_modules/marionette-client/lib/marionette/index.js", - "./node_modules/marionette-client/lib/marionette/marionette.js", "./node_modules/methods/index.js", "./node_modules/mime/mime.js", "./node_modules/mocha-7.0.1/index.js", @@ -521,10 +506,6 @@ "./node_modules/send/index.js", "./node_modules/send/node_modules/debug/src/browser.js", "./node_modules/send/node_modules/debug/src/index.js", - "./node_modules/serve-static/node_modules/debug/src/browser.js", - "./node_modules/serve-static/node_modules/debug/src/index.js", - "./node_modules/serve-static/node_modules/debug/src/node.js", - "./node_modules/serve-static/node_modules/send/index.js", "./node_modules/shell-env/node_modules/execa/lib/errname.js", "./node_modules/shell-env/node_modules/get-stream/buffer-stream.js", "./node_modules/shell-env/node_modules/semver/semver.js", @@ -601,6 +582,7 @@ "./node_modules/uuid/dist/v4.js", "./node_modules/uuid/dist/v5.js", "./node_modules/verror/lib/verror.js", + "./node_modules/wait-port/node_modules/chalk/source/index.js", "./node_modules/ws/index.js", "./node_modules/ws/lib/buffer-util.js", "./node_modules/ws/lib/constants.js", @@ -666,11 +648,16 @@ "./packages/errors/index.js", "./packages/errors/src/errTemplate.ts", "./packages/graphql/index.js", + "./packages/graphql/node_modules/body-parser/index.js", "./packages/graphql/node_modules/chalk/node_modules/supports-color/index.js", "./packages/graphql/node_modules/chalk/source/index.js", "./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/express/lib/application.js", + "./packages/graphql/node_modules/express/lib/request.js", + "./packages/graphql/node_modules/express/lib/response.js", + "./packages/graphql/node_modules/express/lib/router/index.js", + "./packages/graphql/node_modules/express/lib/router/route.js", "./packages/graphql/src/makeGraphQLServer.ts", "./packages/graphql/src/plugins/index.ts", "./packages/graphql/src/plugins/nexusDebugFieldPlugin.ts", @@ -1590,18 +1577,6 @@ "./node_modules/binary-extensions/index.js", "./node_modules/binaryextensions/edition-es5/index.js", "./node_modules/bindings/bindings.js", - "./node_modules/body-parser/lib/read.js", - "./node_modules/body-parser/lib/types/json.js", - "./node_modules/body-parser/lib/types/raw.js", - "./node_modules/body-parser/lib/types/text.js", - "./node_modules/body-parser/lib/types/urlencoded.js", - "./node_modules/body-parser/node_modules/debug/src/debug.js", - "./node_modules/body-parser/node_modules/ms/index.js", - "./node_modules/body-parser/node_modules/qs/lib/formats.js", - "./node_modules/body-parser/node_modules/qs/lib/index.js", - "./node_modules/body-parser/node_modules/qs/lib/parse.js", - "./node_modules/body-parser/node_modules/qs/lib/stringify.js", - "./node_modules/body-parser/node_modules/qs/lib/utils.js", "./node_modules/braces/index.js", "./node_modules/braces/lib/compile.js", "./node_modules/braces/lib/constants.js", @@ -1860,24 +1835,6 @@ "./node_modules/express-graphql/node_modules/statuses/index.js", "./node_modules/express-graphql/node_modules/toidentifier/index.js", "./node_modules/express-graphql/renderGraphiQL.js", - "./node_modules/express/index.js", - "./node_modules/express/lib/express.js", - "./node_modules/express/lib/middleware/init.js", - "./node_modules/express/lib/middleware/query.js", - "./node_modules/express/lib/router/layer.js", - "./node_modules/express/lib/utils.js", - "./node_modules/express/lib/view.js", - "./node_modules/express/node_modules/cookie/index.js", - "./node_modules/express/node_modules/debug/src/debug.js", - "./node_modules/express/node_modules/merge-descriptors/index.js", - "./node_modules/express/node_modules/ms/index.js", - "./node_modules/express/node_modules/path-to-regexp/index.js", - "./node_modules/express/node_modules/qs/lib/formats.js", - "./node_modules/express/node_modules/qs/lib/index.js", - "./node_modules/express/node_modules/qs/lib/parse.js", - "./node_modules/express/node_modules/qs/lib/stringify.js", - "./node_modules/express/node_modules/qs/lib/utils.js", - "./node_modules/express/node_modules/send/node_modules/ms/index.js", "./node_modules/ext-list/index.js", "./node_modules/ext-name/index.js", "./node_modules/extend/index.js", @@ -1907,9 +1864,6 @@ "./node_modules/fast-glob/out/utils/string.js", "./node_modules/fastq/queue.js", "./node_modules/fill-range/index.js", - "./node_modules/finalhandler/index.js", - "./node_modules/finalhandler/node_modules/debug/src/debug.js", - "./node_modules/finalhandler/node_modules/ms/index.js", "./node_modules/find-process/index.js", "./node_modules/find-process/lib/find.js", "./node_modules/find-process/lib/find_pid.js", @@ -2493,7 +2447,6 @@ "./node_modules/lodash/toString.js", "./node_modules/make-dir/node_modules/pify/index.js", "./node_modules/make-error/index.js", - "./node_modules/marionette-client/lib/marionette/message.js", "./node_modules/md5/md5.js", "./node_modules/media-typer/index.js", "./node_modules/merge-descriptors/index.js", @@ -2772,6 +2725,7 @@ "./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", @@ -3310,9 +3264,6 @@ "./node_modules/semver/ranges/valid.js", "./node_modules/send/node_modules/debug/node_modules/ms/index.js", "./node_modules/send/node_modules/debug/src/debug.js", - "./node_modules/serve-static/index.js", - "./node_modules/serve-static/node_modules/debug/node_modules/ms/index.js", - "./node_modules/serve-static/node_modules/debug/src/debug.js", "./node_modules/server-destroy/index.js", "./node_modules/set-function-length/index.js", "./node_modules/setprototypeof/index.js", @@ -3443,7 +3394,6 @@ "./node_modules/trash/node_modules/uuid/lib/rng.js", "./node_modules/trash/node_modules/uuid/v1.js", "./node_modules/trash/node_modules/uuid/v4.js", - "./node_modules/tree-kill/index.js", "./node_modules/truncate-utf8-bytes/lib/truncate.js", "./node_modules/ts-node/dist-raw/node-internal-constants.js", "./node_modules/ts-node/dist-raw/node-internal-errors.js", @@ -3568,6 +3518,15 @@ "./node_modules/value-or-promise/build/main/ValueOrPromise.js", "./node_modules/value-or-promise/build/main/index.js", "./node_modules/vary/index.js", + "./node_modules/wait-port/lib/errors/connection-error.js", + "./node_modules/wait-port/lib/errors/validation-error.js", + "./node_modules/wait-port/lib/output-functions/dots.js", + "./node_modules/wait-port/lib/output-functions/index.js", + "./node_modules/wait-port/lib/output-functions/silent.js", + "./node_modules/wait-port/lib/validate-parameters.js", + "./node_modules/wait-port/lib/wait-port.js", + "./node_modules/wait-port/node_modules/chalk/source/templates.js", + "./node_modules/wait-port/node_modules/chalk/source/util.js", "./node_modules/webidl-conversions/lib/index.js", "./node_modules/whatwg-url/lib/URL-impl.js", "./node_modules/whatwg-url/lib/URL.js", @@ -3848,10 +3807,28 @@ "./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/body-parser/lib/read.js", + "./packages/graphql/node_modules/body-parser/lib/types/json.js", + "./packages/graphql/node_modules/body-parser/lib/types/raw.js", + "./packages/graphql/node_modules/body-parser/lib/types/text.js", + "./packages/graphql/node_modules/body-parser/lib/types/urlencoded.js", "./packages/graphql/node_modules/chalk/source/templates.js", "./packages/graphql/node_modules/chalk/source/util.js", - "./packages/graphql/node_modules/debug/src/common.js", + "./packages/graphql/node_modules/cookie/index.js", + "./packages/graphql/node_modules/debug/node_modules/ms/index.js", + "./packages/graphql/node_modules/debug/src/debug.js", + "./packages/graphql/node_modules/encodeurl/index.js", + "./packages/graphql/node_modules/express/index.js", + "./packages/graphql/node_modules/express/lib/express.js", + "./packages/graphql/node_modules/express/lib/middleware/init.js", + "./packages/graphql/node_modules/express/lib/middleware/query.js", + "./packages/graphql/node_modules/express/lib/router/layer.js", + "./packages/graphql/node_modules/express/lib/utils.js", + "./packages/graphql/node_modules/express/lib/view.js", + "./packages/graphql/node_modules/finalhandler/index.js", "./packages/graphql/node_modules/has-flag/index.js", + "./packages/graphql/node_modules/path-to-regexp/index.js", + "./packages/graphql/node_modules/serve-static/index.js", "./packages/graphql/src/index.ts", "./packages/https-proxy/lib/proxy.js", "./packages/https-proxy/lib/server.js", @@ -3894,7 +3871,6 @@ "./packages/network/lib/cors.ts", "./packages/network/lib/http-utils.ts", "./packages/network/lib/index.ts", - "./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", @@ -3978,14 +3954,17 @@ "./packages/server/lib/browsers/debug-cdp-connection.ts", "./packages/server/lib/browsers/electron.ts", "./packages/server/lib/browsers/firefox-util.ts", + "./packages/server/lib/browsers/geckodriver/index.ts", "./packages/server/lib/browsers/memory/cgroup-v1.ts", "./packages/server/lib/browsers/memory/default.ts", "./packages/server/lib/browsers/protocol.ts", + "./packages/server/lib/browsers/webdriver-classic/index.ts", "./packages/server/lib/browsers/webkit-automation.ts", "./packages/server/lib/browsers/webkit.ts", "./packages/server/lib/cloud/api/scrub_url.ts", "./packages/server/lib/cloud/artifacts/artifact.ts", "./packages/server/lib/cloud/artifacts/file_upload_strategy.ts", + "./packages/server/lib/cloud/artifacts/print_protocol_upload_error.ts", "./packages/server/lib/cloud/artifacts/upload_artifacts.ts", "./packages/server/lib/cloud/encryption.ts", "./packages/server/lib/cloud/environment.ts", @@ -3998,6 +3977,7 @@ "./packages/server/lib/cloud/protocol.ts", "./packages/server/lib/cloud/upload/send_file.ts", "./packages/server/lib/cloud/upload/stream_activity_monitor.ts", + "./packages/server/lib/cloud/upload/stream_stalled_error.ts", "./packages/server/lib/cohorts.ts", "./packages/server/lib/controllers/client.js", "./packages/server/lib/controllers/files.js", @@ -4208,6 +4188,7 @@ "./packages/server/node_modules/p-queue/dist/priority-queue.js", "./packages/server/node_modules/path-key/index.js", "./packages/server/node_modules/path-to-regexp/index.js", + "./packages/server/node_modules/pump/index.js", "./packages/server/node_modules/readable-stream/lib/internal/streams/async_iterator.js", "./packages/server/node_modules/readable-stream/lib/internal/streams/destroy.js", "./packages/server/node_modules/readable-stream/lib/internal/streams/end-of-stream.js", @@ -4270,5 +4251,5 @@ "./tooling/v8-snapshot/cache/linux/snapshot-entry.js" ], "deferredHashFile": "yarn.lock", - "deferredHash": "9ab51832162435dec2de359d222b063dfdce4b3d555581562e6f2c4255bc1e9b" + "deferredHash": "8cc388cf0c44b3e7b4275f670bce531da43f7982abb82af2b28ea765e0c16ab8" } \ No newline at end of file From 18cf93de00b8ac1327c61d66fa6ad7ce49837b2d Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Thu, 10 Oct 2024 10:50:41 -0500 Subject: [PATCH 3/3] Revert "chore: updating v8 snapshot cache" (#30391) This reverts commit 0916ab7eb7877f59992a3506c8b65b2b002502ee. --- .../cache/linux/snapshot-meta.json | 103 +++++++++++------- 1 file changed, 61 insertions(+), 42 deletions(-) diff --git a/tooling/v8-snapshot/cache/linux/snapshot-meta.json b/tooling/v8-snapshot/cache/linux/snapshot-meta.json index 047e46b46cb4..3de9bf87eb70 100644 --- a/tooling/v8-snapshot/cache/linux/snapshot-meta.json +++ b/tooling/v8-snapshot/cache/linux/snapshot-meta.json @@ -225,6 +225,9 @@ "./node_modules/async/dist/async.js", "./node_modules/basic-auth/node_modules/safe-buffer/index.js", "./node_modules/black-hole-stream/index.js", + "./node_modules/body-parser/index.js", + "./node_modules/body-parser/node_modules/debug/src/browser.js", + "./node_modules/body-parser/node_modules/debug/src/index.js", "./node_modules/buffer-from/index.js", "./node_modules/chalk/index.js", "./node_modules/chrome-remote-interface/index.js", @@ -267,9 +270,19 @@ "./node_modules/express-graphql/node_modules/depd/index.js", "./node_modules/express-graphql/node_modules/http-errors/index.js", "./node_modules/express-graphql/parseBody.js", + "./node_modules/express/lib/application.js", + "./node_modules/express/lib/request.js", + "./node_modules/express/lib/response.js", + "./node_modules/express/lib/router/index.js", + "./node_modules/express/lib/router/route.js", + "./node_modules/express/node_modules/debug/src/browser.js", + "./node_modules/express/node_modules/debug/src/index.js", + "./node_modules/express/node_modules/send/index.js", "./node_modules/fast-glob/out/settings.js", "./node_modules/fast-glob/out/utils/path.js", "./node_modules/file-uri-to-path/index.js", + "./node_modules/finalhandler/node_modules/debug/src/browser.js", + "./node_modules/finalhandler/node_modules/debug/src/index.js", "./node_modules/firefox-profile/node_modules/fs-extra/lib/fs/index.js", "./node_modules/firefox-profile/node_modules/fs-extra/lib/index.js", "./node_modules/firefox-profile/node_modules/fs-extra/lib/json/index.js", @@ -330,6 +343,8 @@ "./node_modules/lodash/isBuffer.js", "./node_modules/lodash/lodash.js", "./node_modules/make-dir/node_modules/semver/semver.js", + "./node_modules/marionette-client/lib/marionette/index.js", + "./node_modules/marionette-client/lib/marionette/marionette.js", "./node_modules/methods/index.js", "./node_modules/mime/mime.js", "./node_modules/mocha-7.0.1/index.js", @@ -506,6 +521,10 @@ "./node_modules/send/index.js", "./node_modules/send/node_modules/debug/src/browser.js", "./node_modules/send/node_modules/debug/src/index.js", + "./node_modules/serve-static/node_modules/debug/src/browser.js", + "./node_modules/serve-static/node_modules/debug/src/index.js", + "./node_modules/serve-static/node_modules/debug/src/node.js", + "./node_modules/serve-static/node_modules/send/index.js", "./node_modules/shell-env/node_modules/execa/lib/errname.js", "./node_modules/shell-env/node_modules/get-stream/buffer-stream.js", "./node_modules/shell-env/node_modules/semver/semver.js", @@ -582,7 +601,6 @@ "./node_modules/uuid/dist/v4.js", "./node_modules/uuid/dist/v5.js", "./node_modules/verror/lib/verror.js", - "./node_modules/wait-port/node_modules/chalk/source/index.js", "./node_modules/ws/index.js", "./node_modules/ws/lib/buffer-util.js", "./node_modules/ws/lib/constants.js", @@ -648,16 +666,11 @@ "./packages/errors/index.js", "./packages/errors/src/errTemplate.ts", "./packages/graphql/index.js", - "./packages/graphql/node_modules/body-parser/index.js", "./packages/graphql/node_modules/chalk/node_modules/supports-color/index.js", "./packages/graphql/node_modules/chalk/source/index.js", "./packages/graphql/node_modules/debug/src/browser.js", "./packages/graphql/node_modules/debug/src/index.js", - "./packages/graphql/node_modules/express/lib/application.js", - "./packages/graphql/node_modules/express/lib/request.js", - "./packages/graphql/node_modules/express/lib/response.js", - "./packages/graphql/node_modules/express/lib/router/index.js", - "./packages/graphql/node_modules/express/lib/router/route.js", + "./packages/graphql/node_modules/supports-color/index.js", "./packages/graphql/src/makeGraphQLServer.ts", "./packages/graphql/src/plugins/index.ts", "./packages/graphql/src/plugins/nexusDebugFieldPlugin.ts", @@ -1577,6 +1590,18 @@ "./node_modules/binary-extensions/index.js", "./node_modules/binaryextensions/edition-es5/index.js", "./node_modules/bindings/bindings.js", + "./node_modules/body-parser/lib/read.js", + "./node_modules/body-parser/lib/types/json.js", + "./node_modules/body-parser/lib/types/raw.js", + "./node_modules/body-parser/lib/types/text.js", + "./node_modules/body-parser/lib/types/urlencoded.js", + "./node_modules/body-parser/node_modules/debug/src/debug.js", + "./node_modules/body-parser/node_modules/ms/index.js", + "./node_modules/body-parser/node_modules/qs/lib/formats.js", + "./node_modules/body-parser/node_modules/qs/lib/index.js", + "./node_modules/body-parser/node_modules/qs/lib/parse.js", + "./node_modules/body-parser/node_modules/qs/lib/stringify.js", + "./node_modules/body-parser/node_modules/qs/lib/utils.js", "./node_modules/braces/index.js", "./node_modules/braces/lib/compile.js", "./node_modules/braces/lib/constants.js", @@ -1835,6 +1860,24 @@ "./node_modules/express-graphql/node_modules/statuses/index.js", "./node_modules/express-graphql/node_modules/toidentifier/index.js", "./node_modules/express-graphql/renderGraphiQL.js", + "./node_modules/express/index.js", + "./node_modules/express/lib/express.js", + "./node_modules/express/lib/middleware/init.js", + "./node_modules/express/lib/middleware/query.js", + "./node_modules/express/lib/router/layer.js", + "./node_modules/express/lib/utils.js", + "./node_modules/express/lib/view.js", + "./node_modules/express/node_modules/cookie/index.js", + "./node_modules/express/node_modules/debug/src/debug.js", + "./node_modules/express/node_modules/merge-descriptors/index.js", + "./node_modules/express/node_modules/ms/index.js", + "./node_modules/express/node_modules/path-to-regexp/index.js", + "./node_modules/express/node_modules/qs/lib/formats.js", + "./node_modules/express/node_modules/qs/lib/index.js", + "./node_modules/express/node_modules/qs/lib/parse.js", + "./node_modules/express/node_modules/qs/lib/stringify.js", + "./node_modules/express/node_modules/qs/lib/utils.js", + "./node_modules/express/node_modules/send/node_modules/ms/index.js", "./node_modules/ext-list/index.js", "./node_modules/ext-name/index.js", "./node_modules/extend/index.js", @@ -1864,6 +1907,9 @@ "./node_modules/fast-glob/out/utils/string.js", "./node_modules/fastq/queue.js", "./node_modules/fill-range/index.js", + "./node_modules/finalhandler/index.js", + "./node_modules/finalhandler/node_modules/debug/src/debug.js", + "./node_modules/finalhandler/node_modules/ms/index.js", "./node_modules/find-process/index.js", "./node_modules/find-process/lib/find.js", "./node_modules/find-process/lib/find_pid.js", @@ -2447,6 +2493,7 @@ "./node_modules/lodash/toString.js", "./node_modules/make-dir/node_modules/pify/index.js", "./node_modules/make-error/index.js", + "./node_modules/marionette-client/lib/marionette/message.js", "./node_modules/md5/md5.js", "./node_modules/media-typer/index.js", "./node_modules/merge-descriptors/index.js", @@ -2725,7 +2772,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", @@ -3264,6 +3310,9 @@ "./node_modules/semver/ranges/valid.js", "./node_modules/send/node_modules/debug/node_modules/ms/index.js", "./node_modules/send/node_modules/debug/src/debug.js", + "./node_modules/serve-static/index.js", + "./node_modules/serve-static/node_modules/debug/node_modules/ms/index.js", + "./node_modules/serve-static/node_modules/debug/src/debug.js", "./node_modules/server-destroy/index.js", "./node_modules/set-function-length/index.js", "./node_modules/setprototypeof/index.js", @@ -3394,6 +3443,7 @@ "./node_modules/trash/node_modules/uuid/lib/rng.js", "./node_modules/trash/node_modules/uuid/v1.js", "./node_modules/trash/node_modules/uuid/v4.js", + "./node_modules/tree-kill/index.js", "./node_modules/truncate-utf8-bytes/lib/truncate.js", "./node_modules/ts-node/dist-raw/node-internal-constants.js", "./node_modules/ts-node/dist-raw/node-internal-errors.js", @@ -3518,15 +3568,6 @@ "./node_modules/value-or-promise/build/main/ValueOrPromise.js", "./node_modules/value-or-promise/build/main/index.js", "./node_modules/vary/index.js", - "./node_modules/wait-port/lib/errors/connection-error.js", - "./node_modules/wait-port/lib/errors/validation-error.js", - "./node_modules/wait-port/lib/output-functions/dots.js", - "./node_modules/wait-port/lib/output-functions/index.js", - "./node_modules/wait-port/lib/output-functions/silent.js", - "./node_modules/wait-port/lib/validate-parameters.js", - "./node_modules/wait-port/lib/wait-port.js", - "./node_modules/wait-port/node_modules/chalk/source/templates.js", - "./node_modules/wait-port/node_modules/chalk/source/util.js", "./node_modules/webidl-conversions/lib/index.js", "./node_modules/whatwg-url/lib/URL-impl.js", "./node_modules/whatwg-url/lib/URL.js", @@ -3807,28 +3848,10 @@ "./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/body-parser/lib/read.js", - "./packages/graphql/node_modules/body-parser/lib/types/json.js", - "./packages/graphql/node_modules/body-parser/lib/types/raw.js", - "./packages/graphql/node_modules/body-parser/lib/types/text.js", - "./packages/graphql/node_modules/body-parser/lib/types/urlencoded.js", "./packages/graphql/node_modules/chalk/source/templates.js", "./packages/graphql/node_modules/chalk/source/util.js", - "./packages/graphql/node_modules/cookie/index.js", - "./packages/graphql/node_modules/debug/node_modules/ms/index.js", - "./packages/graphql/node_modules/debug/src/debug.js", - "./packages/graphql/node_modules/encodeurl/index.js", - "./packages/graphql/node_modules/express/index.js", - "./packages/graphql/node_modules/express/lib/express.js", - "./packages/graphql/node_modules/express/lib/middleware/init.js", - "./packages/graphql/node_modules/express/lib/middleware/query.js", - "./packages/graphql/node_modules/express/lib/router/layer.js", - "./packages/graphql/node_modules/express/lib/utils.js", - "./packages/graphql/node_modules/express/lib/view.js", - "./packages/graphql/node_modules/finalhandler/index.js", + "./packages/graphql/node_modules/debug/src/common.js", "./packages/graphql/node_modules/has-flag/index.js", - "./packages/graphql/node_modules/path-to-regexp/index.js", - "./packages/graphql/node_modules/serve-static/index.js", "./packages/graphql/src/index.ts", "./packages/https-proxy/lib/proxy.js", "./packages/https-proxy/lib/server.js", @@ -3871,6 +3894,7 @@ "./packages/network/lib/cors.ts", "./packages/network/lib/http-utils.ts", "./packages/network/lib/index.ts", + "./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", @@ -3954,17 +3978,14 @@ "./packages/server/lib/browsers/debug-cdp-connection.ts", "./packages/server/lib/browsers/electron.ts", "./packages/server/lib/browsers/firefox-util.ts", - "./packages/server/lib/browsers/geckodriver/index.ts", "./packages/server/lib/browsers/memory/cgroup-v1.ts", "./packages/server/lib/browsers/memory/default.ts", "./packages/server/lib/browsers/protocol.ts", - "./packages/server/lib/browsers/webdriver-classic/index.ts", "./packages/server/lib/browsers/webkit-automation.ts", "./packages/server/lib/browsers/webkit.ts", "./packages/server/lib/cloud/api/scrub_url.ts", "./packages/server/lib/cloud/artifacts/artifact.ts", "./packages/server/lib/cloud/artifacts/file_upload_strategy.ts", - "./packages/server/lib/cloud/artifacts/print_protocol_upload_error.ts", "./packages/server/lib/cloud/artifacts/upload_artifacts.ts", "./packages/server/lib/cloud/encryption.ts", "./packages/server/lib/cloud/environment.ts", @@ -3977,7 +3998,6 @@ "./packages/server/lib/cloud/protocol.ts", "./packages/server/lib/cloud/upload/send_file.ts", "./packages/server/lib/cloud/upload/stream_activity_monitor.ts", - "./packages/server/lib/cloud/upload/stream_stalled_error.ts", "./packages/server/lib/cohorts.ts", "./packages/server/lib/controllers/client.js", "./packages/server/lib/controllers/files.js", @@ -4188,7 +4208,6 @@ "./packages/server/node_modules/p-queue/dist/priority-queue.js", "./packages/server/node_modules/path-key/index.js", "./packages/server/node_modules/path-to-regexp/index.js", - "./packages/server/node_modules/pump/index.js", "./packages/server/node_modules/readable-stream/lib/internal/streams/async_iterator.js", "./packages/server/node_modules/readable-stream/lib/internal/streams/destroy.js", "./packages/server/node_modules/readable-stream/lib/internal/streams/end-of-stream.js", @@ -4251,5 +4270,5 @@ "./tooling/v8-snapshot/cache/linux/snapshot-entry.js" ], "deferredHashFile": "yarn.lock", - "deferredHash": "8cc388cf0c44b3e7b4275f670bce531da43f7982abb82af2b28ea765e0c16ab8" + "deferredHash": "9ab51832162435dec2de359d222b063dfdce4b3d555581562e6f2c4255bc1e9b" } \ No newline at end of file