Merge branch 'develop' into remove-json-lint

cypress-io · Jul 12, 2024 · b5dcc52 · b5dcc52 · cypress-bot · Jul 12, 2024
2 parents 92f3175 + 807b03d
commit b5dcc52
Show file tree

Hide file tree

Showing 13 changed files with 58 additions and 127 deletions.
diff --git 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.
 
-07-02-24
+07-11-24
diff --git a/.circleci/workflows.yml b/.circleci/workflows.yml
@@ -32,7 +32,7 @@ mainBuildFilters: &mainBuildFilters
         - 'update-v8-snapshot-cache-on-develop'
         - 'remove-json-lint'
         - 'publish-binary'
-        - 'angular-signals-ct-harness'
+        - 'fix/element_highlighting_origin_test_replay'
 
 # 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
@@ -77,7 +77,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: [ 'angular-signals-ct-harness', << pipeline.git.branch >> ]
+    - equal: [ 'fix/element_highlighting_origin_test_replay', << pipeline.git.branch >> ]
     - matches:
         pattern: /^release\/\d+\.\d+\.\d+$/
         value: << pipeline.git.branch >>
@@ -2634,9 +2634,7 @@ jobs:
 linux-x64-workflow: &linux-x64-workflow
   jobs:
     - node_modules_install:
-        # NOTE: Centos reached EOL on July 1st, 2024. The centos7-builder.Dockerfile no longer works in the manner in which we are using to rebuild better-sqlite3, so for now to unblock
-        # develop we will not be rebuilding better-sqlite3. However, a solution to this is likely needed as it can be considered a breaking change due to centos 7 extended support.
-        build-better-sqlite3: false
+        build-better-sqlite3: true
     - build:
         context: test-runner:env-canary
         requires:

diff --git a/browser-versions.json b/browser-versions.json
@@ -1,5 +1,5 @@
 {
-  "chrome:beta": "127.0.6533.26",
+  "chrome:beta": "127.0.6533.43",
   "chrome:stable": "126.0.6478.126",
   "chrome:minimum": "64.0.3282.0"
 }
diff --git a/centos7-builder.Dockerfile b/centos7-builder.Dockerfile
@@ -1,9 +1,28 @@
 FROM centos:7
-# 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++
+
+# Update repo URLs to point to vault.centos.org
+RUN     for repo in /etc/yum.repos.d/*.repo; do \
+            sed -i 's|mirrorlist=|#mirrorlist=|g' $repo; \
+            sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' $repo; \
+            sed -i 's|http://mirror.centos.org|http://vault.centos.org|g' $repo; \
+        done && yum clean all
+
+# Install centos-release-scl to get the SCL repositories
+RUN     yum -y install centos-release-scl
+
+# Update repo URLs to point to vault.centos.org again
+RUN     for repo in /etc/yum.repos.d/CentOS-SCLo-scl*.repo; do \
+            sed -i 's|mirrorlist=|#mirrorlist=|g' $repo; \
+            sed -i 's|# baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' $repo; \
+            sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' $repo; \
+            sed -i 's|http://mirror.centos.org|http://vault.centos.org|g' $repo; \
+        done && yum clean all
+
+# Install dependencies for building the addon and setting devtoolset-8 as the default compiler
+RUN yum -y install curl python3 make atk-devel atk java-atk-wrapper at-spi2-atk gtk3 libXt libdrm mesa-libgbm Xvfb 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
 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.
+# Node 16 is the most recent version that supports CentOS 7. We only need it to call the
+# build script for lib/addon, so there should be minimal risk of security issues.
 RUN source ~/.nvm/nvm.sh && nvm install 16.20.2 && npm install -g yarn
diff --git a/cli/CHANGELOG.md b/cli/CHANGELOG.md
@@ -6,6 +6,7 @@ _Released 7/16/2024 (PENDING)_
 **Bugfixes:**
 
 - Fixed an issue where the ReadStream used to upload a Test Replay recording could erroneously be re-used when retrying in cases of retryable upload failures. Fixes [#29227](https://github.com/cypress-io/cypress/issues/29227).
+- Fixed an issue where command snapshots were not being captured within the `cy.origin()` command within Test Replay. Addressed in [#29828](https://github.com/cypress-io/cypress/pull/29828).
 
 **Dependency Updates:**
 

diff --git a/packages/driver/src/util/serialization/log.ts b/packages/driver/src/util/serialization/log.ts
@@ -415,7 +415,10 @@ export const preprocessLogForSerialization = (logAttrs) => {
 export const reifyLogFromSerialization = (logAttrs) => {
   let { snapshots, ... logAttrsRest } = logAttrs
 
-  if (snapshots) {
+  // if the protocol is enabled, we don't need to reify the snapshot since the snapshot was serializable coming into the primary instance of Cypress.
+  // also make sure numTestsKeptInMemory is 0, otherwise we will want to preprocess the snapshot
+  // (the driver test's set numTestsKeptInMemory to 1 in run mode to verify the snapshots)
+  if (snapshots && !(Cypress.config('protocolEnabled') && Cypress.config('numTestsKeptInMemory') === 0)) {
     snapshots = snapshots.filter((snapshot) => !!snapshot).map((snapshot) => reifySnapshotFromSerialization(snapshot))
   }
 

diff --git a/packages/example/bin/convert.js b/packages/example/bin/convert.js
@@ -24,11 +24,6 @@ function replaceStringsIn (file) {
     replace(eslintRe, "")
     replace("imgSrcToDataURL('/assets", "imgSrcToDataURL('https://example.cypress.io/assets")
 
-    // temporary for 5.0.0
-    // TODO: remove this
-    replace("whitelist: 'session_id'", "preserve: 'session_id'")
-    replace("server.whitelist", "server.ignore")
-
     fs.writeFile(file, str, function (err) {
       if (err) throw err
 

diff --git a/packages/example/package.json b/packages/example/package.json
@@ -20,7 +20,6 @@
     "gulp": "4.0.2",
     "gulp-clean": "0.4.0",
     "gulp-rev-all": "2.0.2",
-    "mocha": "2.5.3",
     "resolve-pkg": "2.0.0"
   },
   "files": [

diff --git a/packages/ts/tsconfig.json b/packages/ts/tsconfig.json
@@ -3,7 +3,7 @@
     /* Basic Options */
     "target": "ES2018",                          /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', or 'ESNEXT'. */
     "module": "commonjs",                     /* Specify module code generation: 'commonjs', 'amd', 'system', 'umd' or 'es2015'. */
-    "lib": ["es2018", "ES2020.Promise", "ES2021.String"],                             /* Specify library files to be included in the compilation:  */
+    "lib": ["es2021"],                             /* Specify library files to be included in the compilation:  */
     // "allowJs": true,                       /* Allow javascript files to be compiled. */
     // "checkJs": true,                       /* Report errors in .js files. */
     "jsx": "react",                     /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */

diff --git a/tooling/v8-snapshot/cache/darwin/snapshot-meta.json b/tooling/v8-snapshot/cache/darwin/snapshot-meta.json
@@ -1874,7 +1874,6 @@
     "./node_modules/fast-glob/out/utils/stream.js",
     "./node_modules/fast-glob/out/utils/string.js",
     "./node_modules/fastq/queue.js",
-    "./node_modules/fetch-retry-ts/dist/index.js",
     "./node_modules/fill-range/index.js",
     "./node_modules/finalhandler/index.js",
     "./node_modules/finalhandler/node_modules/debug/src/debug.js",
@@ -4088,18 +4087,20 @@
     "./packages/server/lib/browsers/protocol.ts",
     "./packages/server/lib/browsers/webkit-automation.ts",
     "./packages/server/lib/browsers/webkit.ts",
-    "./packages/server/lib/cloud/api/http_error.ts",
-    "./packages/server/lib/cloud/api/network_error.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/upload_artifacts.ts",
     "./packages/server/lib/cloud/encryption.ts",
     "./packages/server/lib/cloud/environment.ts",
     "./packages/server/lib/cloud/machine_id.js",
+    "./packages/server/lib/cloud/network/http_error.ts",
+    "./packages/server/lib/cloud/network/is_retryable_error.ts",
+    "./packages/server/lib/cloud/network/network_error.ts",
+    "./packages/server/lib/cloud/network/parse_error.ts",
+    "./packages/server/lib/cloud/network/put_fetch.ts",
     "./packages/server/lib/cloud/protocol.ts",
     "./packages/server/lib/cloud/upload/stream_activity_monitor.ts",
-    "./packages/server/lib/cloud/upload/upload_stream.ts",
     "./packages/server/lib/cohorts.ts",
     "./packages/server/lib/config.ts",
     "./packages/server/lib/controllers/client.js",
@@ -4139,6 +4140,7 @@
     "./packages/server/lib/task.js",
     "./packages/server/lib/unhandled_exceptions.ts",
     "./packages/server/lib/util/args.js",
+    "./packages/server/lib/util/async_retry.ts",
     "./packages/server/lib/util/cache_buster.js",
     "./packages/server/lib/util/chromium_flags.ts",
     "./packages/server/lib/util/ci_provider.js",
@@ -4346,5 +4348,5 @@
     "./tooling/v8-snapshot/cache/darwin/snapshot-entry.js"
   ],
   "deferredHashFile": "yarn.lock",
-  "deferredHash": "9838f32b0cfc5736d1c0e056eaf337912e63df476421ad019ab25d51fc7d0b56"
+  "deferredHash": "8327ad15454db8b5cbaf0dfa8484e418279a74d64e434c0d8a3c210276b37141"
 }
diff --git a/tooling/v8-snapshot/cache/linux/snapshot-meta.json b/tooling/v8-snapshot/cache/linux/snapshot-meta.json
@@ -1875,7 +1875,6 @@
     "./node_modules/fast-glob/out/utils/stream.js",
     "./node_modules/fast-glob/out/utils/string.js",
     "./node_modules/fastq/queue.js",
-    "./node_modules/fetch-retry-ts/dist/index.js",
     "./node_modules/fill-range/index.js",
     "./node_modules/finalhandler/index.js",
     "./node_modules/finalhandler/node_modules/debug/src/debug.js",
@@ -4091,18 +4090,20 @@
     "./packages/server/lib/browsers/protocol.ts",
     "./packages/server/lib/browsers/webkit-automation.ts",
     "./packages/server/lib/browsers/webkit.ts",
-    "./packages/server/lib/cloud/api/http_error.ts",
-    "./packages/server/lib/cloud/api/network_error.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/upload_artifacts.ts",
     "./packages/server/lib/cloud/encryption.ts",
     "./packages/server/lib/cloud/environment.ts",
     "./packages/server/lib/cloud/machine_id.js",
+    "./packages/server/lib/cloud/network/http_error.ts",
+    "./packages/server/lib/cloud/network/is_retryable_error.ts",
+    "./packages/server/lib/cloud/network/network_error.ts",
+    "./packages/server/lib/cloud/network/parse_error.ts",
+    "./packages/server/lib/cloud/network/put_fetch.ts",
     "./packages/server/lib/cloud/protocol.ts",
     "./packages/server/lib/cloud/upload/stream_activity_monitor.ts",
-    "./packages/server/lib/cloud/upload/upload_stream.ts",
     "./packages/server/lib/cohorts.ts",
     "./packages/server/lib/config.ts",
     "./packages/server/lib/controllers/client.js",
@@ -4142,6 +4143,7 @@
     "./packages/server/lib/task.js",
     "./packages/server/lib/unhandled_exceptions.ts",
     "./packages/server/lib/util/args.js",
+    "./packages/server/lib/util/async_retry.ts",
     "./packages/server/lib/util/cache_buster.js",
     "./packages/server/lib/util/chromium_flags.ts",
     "./packages/server/lib/util/ci_provider.js",
@@ -4349,5 +4351,5 @@
     "./tooling/v8-snapshot/cache/linux/snapshot-entry.js"
   ],
   "deferredHashFile": "yarn.lock",
-  "deferredHash": "9838f32b0cfc5736d1c0e056eaf337912e63df476421ad019ab25d51fc7d0b56"
+  "deferredHash": "8327ad15454db8b5cbaf0dfa8484e418279a74d64e434c0d8a3c210276b37141"
 }
diff --git a/tooling/v8-snapshot/cache/win32/snapshot-meta.json b/tooling/v8-snapshot/cache/win32/snapshot-meta.json
@@ -165,6 +165,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",
@@ -1875,7 +1877,6 @@
     "./node_modules/fast-glob/out/utils/stream.js",
     "./node_modules/fast-glob/out/utils/string.js",
     "./node_modules/fastq/queue.js",
-    "./node_modules/fetch-retry-ts/dist/index.js",
     "./node_modules/fill-range/index.js",
     "./node_modules/finalhandler/index.js",
     "./node_modules/finalhandler/node_modules/debug/src/debug.js",
@@ -4089,18 +4090,20 @@
     "./packages/server/lib/browsers/protocol.ts",
     "./packages/server/lib/browsers/webkit-automation.ts",
     "./packages/server/lib/browsers/webkit.ts",
-    "./packages/server/lib/cloud/api/http_error.ts",
-    "./packages/server/lib/cloud/api/network_error.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/upload_artifacts.ts",
     "./packages/server/lib/cloud/encryption.ts",
     "./packages/server/lib/cloud/environment.ts",
     "./packages/server/lib/cloud/machine_id.js",
+    "./packages/server/lib/cloud/network/http_error.ts",
+    "./packages/server/lib/cloud/network/is_retryable_error.ts",
+    "./packages/server/lib/cloud/network/network_error.ts",
+    "./packages/server/lib/cloud/network/parse_error.ts",
+    "./packages/server/lib/cloud/network/put_fetch.ts",
     "./packages/server/lib/cloud/protocol.ts",
     "./packages/server/lib/cloud/upload/stream_activity_monitor.ts",
-    "./packages/server/lib/cloud/upload/upload_stream.ts",
     "./packages/server/lib/cohorts.ts",
     "./packages/server/lib/config.ts",
     "./packages/server/lib/controllers/client.js",
@@ -4140,6 +4143,7 @@
     "./packages/server/lib/task.js",
     "./packages/server/lib/unhandled_exceptions.ts",
     "./packages/server/lib/util/args.js",
+    "./packages/server/lib/util/async_retry.ts",
     "./packages/server/lib/util/cache_buster.js",
     "./packages/server/lib/util/chromium_flags.ts",
     "./packages/server/lib/util/ci_provider.js",
@@ -4347,5 +4351,5 @@
     "./tooling/v8-snapshot/cache/win32/snapshot-entry.js"
   ],
   "deferredHashFile": "yarn.lock",
-  "deferredHash": "3a427381aba55312fbdabd0ee70fd0e0a50b69eb223800d42d958bbd29dcccff"
+  "deferredHash": "47e8635a1fbdb4a39faf507c74761fe8d5f9cfb45023843c0572f1be9027c88b"
 }