Merge branch 'develop' into mschile/service_worker_uncontrolled

browser-versions.json

@@ -1,5 +1,5 @@
 {
-  "chrome:beta": "124.0.6367.18",
-  "chrome:stable": "123.0.6312.86",
+  "chrome:beta": "125.0.6422.4",
+  "chrome:stable": "124.0.6367.60",
   "chrome:minimum": "64.0.3282.0"
 }

cli/CHANGELOG.md

@@ -1,19 +1,27 @@
 <!-- See the ../guides/writing-the-cypress-changelog.md for details on writing the changelog. -->
-## 13.8.0
+## 13.8.1
 
 _Released 4/23/2024 (PENDING)_
 
+**Performance:**
+
+- Fixed a performance issue with activated service workers that aren't controlling clients which could lead to correlation timeouts. Fixes [#29333](https://github.com/cypress-io/cypress/issues/29333) and [#29126](https://github.com/cypress-io/cypress/issues/29126).
+
+## 13.8.0
+
+_Released 4/18/2024_
+
 **Features:**
 
 - Added support for `webpack-dev-server` `v5` to `@cypress/webpack-dev-server`. Addresses [#29305](https://github.com/cypress-io/cypress/issues/29305).
 
-**Performance:**
+**Bugfixes:**
 
-- Fixed a performance issue with activated service workers that aren't controlling clients which could lead to correlation timeouts. Fixes [#29333](https://github.com/cypress-io/cypress/issues/29333) and [#29126](https://github.com/cypress-io/cypress/issues/29126).
+- Fixed a regression introduced in [`13.7.3`](https://docs.cypress.io/guides/references/changelog#13-7-3) where Cypress could hang handling long assertion messages. Fixes [#29350](https://github.com/cypress-io/cypress/issues/29350).
 
 **Misc:**
 
-- We now capture the [Semaphore](https://semaphoreci.com/) CI provider's environment variable [`SEMAPHORE_GIT_PR_NUMBER`](https://docs.semaphoreci.com/ci-cd-environment/environment-variables/#semaphore_git_pr_number) to display the linked PR number in the Cloud. Addressed in [#29314](https://github.com/cypress-io/cypress/pull/29314).
+- The [`SEMAPHORE_GIT_PR_NUMBER`](https://docs.semaphoreci.com/ci-cd-environment/environment-variables/#semaphore_git_pr_number) environment variable from [Semaphore](https://semaphoreci.com/) CI is now captured to display the linked PR number in the Cloud. Addressed in [#29314](https://github.com/cypress-io/cypress/pull/29314).
 
 ## 13.7.3
 

npm/webpack-dev-server/CHANGELOG.md

@@ -1,3 +1,10 @@
+# [@cypress/webpack-dev-server-v3.8.0](https://github.com/cypress-io/cypress/compare/@cypress/webpack-dev-server-v3.7.4...@cypress/webpack-dev-server-v3.8.0) (2024-04-18)
+
+
+### Features
+
+* support webpack-dev-server v5 in @cypress/webpack-dev-server ([#29306](https://github.com/cypress-io/cypress/issues/29306)) ([d7e9d60](https://github.com/cypress-io/cypress/commit/d7e9d6068c6ab01ab58f9959ea7ad6a361087764))
+
 # [@cypress/webpack-dev-server-v3.7.4](https://github.com/cypress-io/cypress/compare/@cypress/webpack-dev-server-v3.7.3...@cypress/webpack-dev-server-v3.7.4) (2024-01-30)
 
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cypress",
-  "version": "13.7.3",
+  "version": "13.8.0",
   "description": "Cypress is a next generation front end testing tool built for the modern web",
   "private": true,
   "scripts": {

packages/reporter/src/commands/command.tsx

@@ -35,44 +35,44 @@ const asterisksRegex = /^\*\*(.+?)\*\*$/gs
 // 'expected **<span>** to exist in the DOM'
 // `expected **glob*glob** to contain *****`
 // `expected **<span>** to have CSS property **background-color** with the value **rgb(0, 0, 0)**, but the value was **rgba(0, 0, 0, 0)**`
-const assertionRegex = /.*expected | to[^\*]+| not[^\*]+| with[^\*]+|, but[^\*]+/g
+// `Custom message expected **<span>** to exist in the DOM`
+const assertionRegex = /^.*?expected | to[^\*]+| not[^\*]+| with[^\*]+|, but[^\*]+/g
 
 // used to format the display of command messages and error messages
 // we use markdown syntax within our error messages (code ticks, urls, etc)
 // and cy.log and Cypress.log supports markdown formatting
 export const formattedMessage = (message: string, name?: string) => {
   if (!message) return ''
 
+  // if the command has url args, don't format those chars like __ and ~~
+  if (name === 'visit' || name === 'request' || name === 'origin') {
+    return message
+  }
+
   // the command message is formatted as '(Optional Custom Msg:) expected <actual> to {assertion} <expected>'
   const assertionArray = message.match(assertionRegex)
 
-  const expectedActualArray = () => {
+  if (name === 'assert' && assertionArray) {
+    const expectedActualArray = () => {
     // get the expected and actual values of assertions
-    const splitTrim = message.split(assertionRegex).filter(Boolean).map((s) => s.trim())
+      const splitTrim = message.split(assertionRegex).filter(Boolean).map((s) => s.trim())
 
-    // replace outside double asterisks with strong tags
-    return splitTrim.map((s) => {
+      // replace outside double asterisks with strong tags
+      return splitTrim.map((s) => {
       // we want to escape HTML chars so that they display
       // correctly in the command log: <p> -> &lt;p&gt;
-      const HTMLEscapedString = mdOnlyHTML.renderInline(s)
-
-      return HTMLEscapedString.replace(asterisksRegex, `<strong>$1</strong>`)
-    })
-  }
+        const HTMLEscapedString = mdOnlyHTML.renderInline(s)
 
-  if (name === 'assert' && assertionArray) {
+        return HTMLEscapedString.replace(asterisksRegex, `<strong>$1</strong>`)
+      })
+    }
     // for assertions print the exact text so that characters like _ and *
     // are not escaped in the assertion display when comparing values
     const result = assertionArray.flatMap((s, index) => [s, expectedActualArray()[index]])
 
     return result.join('')
   }
 
-  // if the command has url args, don't format those chars like __ and ~~
-  if (name === 'visit' || name === 'request' || name === 'origin') {
-    return message
-  }
-
   // format markdown for everything else
   return md.renderInline(message)
 }

tooling/v8-snapshot/cache/darwin/snapshot-meta.json

@@ -1482,6 +1482,7 @@
     "./node_modules/any-base/src/converter.js",
     "./node_modules/anymatch/index.js",
     "./node_modules/arg/index.js",
+    "./node_modules/array-flatten/array-flatten.js",
     "./node_modules/array-union/index.js",
     "./node_modules/asn1/lib/ber/errors.js",
     "./node_modules/asn1/lib/ber/index.js",
@@ -1828,7 +1829,6 @@
     "./node_modules/express/lib/router/layer.js",
     "./node_modules/express/lib/utils.js",
     "./node_modules/express/lib/view.js",
-    "./node_modules/express/node_modules/array-flatten/array-flatten.js",
     "./node_modules/express/node_modules/body-parser/lib/read.js",
     "./node_modules/express/node_modules/body-parser/lib/types/json.js",
     "./node_modules/express/node_modules/body-parser/lib/types/raw.js",
@@ -2317,12 +2317,6 @@
     "./node_modules/json5/lib/util.js",
     "./node_modules/jsonlint/lib/jsonlint.js",
     "./node_modules/jsprim/lib/jsprim.js",
-    "./node_modules/launch-editor/editor-info/linux.js",
-    "./node_modules/launch-editor/editor-info/osx.js",
-    "./node_modules/launch-editor/editor-info/windows.js",
-    "./node_modules/launch-editor/get-args.js",
-    "./node_modules/launch-editor/guess.js",
-    "./node_modules/launch-editor/index.js",
     "./node_modules/lazy-ass/index.js",
     "./node_modules/load-bmfont/index.js",
     "./node_modules/load-bmfont/lib/is-binary.js",
@@ -3739,6 +3733,12 @@
     "./packages/data-context/node_modules/fs-extra/lib/util/stat.js",
     "./packages/data-context/node_modules/fs-extra/lib/util/utimes.js",
     "./packages/data-context/node_modules/get-stream/index.js",
+    "./packages/data-context/node_modules/launch-editor/editor-info/linux.js",
+    "./packages/data-context/node_modules/launch-editor/editor-info/osx.js",
+    "./packages/data-context/node_modules/launch-editor/editor-info/windows.js",
+    "./packages/data-context/node_modules/launch-editor/get-args.js",
+    "./packages/data-context/node_modules/launch-editor/guess.js",
+    "./packages/data-context/node_modules/launch-editor/index.js",
     "./packages/data-context/node_modules/micromatch/index.js",
     "./packages/data-context/node_modules/path-key/index.js",
     "./packages/data-context/node_modules/prettier/doc.js",
@@ -4346,5 +4346,5 @@
     "./tooling/v8-snapshot/cache/darwin/snapshot-entry.js"
   ],
   "deferredHashFile": "yarn.lock",
-  "deferredHash": "ce87acfb4746797260125a1a730fce2f773b95daaad4ed37bd765aaf4974de18"
+  "deferredHash": "5fadac7ce0b5d51a531e13c3ecb4083f1e0bac1f95e58caa21717eb285102252"
 }

tooling/v8-snapshot/cache/linux/snapshot-meta.json

@@ -1481,6 +1481,7 @@
     "./node_modules/any-base/src/converter.js",
     "./node_modules/anymatch/index.js",
     "./node_modules/arg/index.js",
+    "./node_modules/array-flatten/array-flatten.js",
     "./node_modules/array-union/index.js",
     "./node_modules/asn1/lib/ber/errors.js",
     "./node_modules/asn1/lib/ber/index.js",
@@ -1827,7 +1828,6 @@
     "./node_modules/express/lib/router/layer.js",
     "./node_modules/express/lib/utils.js",
     "./node_modules/express/lib/view.js",
-    "./node_modules/express/node_modules/array-flatten/array-flatten.js",
     "./node_modules/express/node_modules/body-parser/lib/read.js",
     "./node_modules/express/node_modules/body-parser/lib/types/json.js",
     "./node_modules/express/node_modules/body-parser/lib/types/raw.js",
@@ -2316,12 +2316,6 @@
     "./node_modules/json5/lib/util.js",
     "./node_modules/jsonlint/lib/jsonlint.js",
     "./node_modules/jsprim/lib/jsprim.js",
-    "./node_modules/launch-editor/editor-info/linux.js",
-    "./node_modules/launch-editor/editor-info/osx.js",
-    "./node_modules/launch-editor/editor-info/windows.js",
-    "./node_modules/launch-editor/get-args.js",
-    "./node_modules/launch-editor/guess.js",
-    "./node_modules/launch-editor/index.js",
     "./node_modules/lazy-ass/index.js",
     "./node_modules/load-bmfont/index.js",
     "./node_modules/load-bmfont/lib/is-binary.js",
@@ -3738,6 +3732,12 @@
     "./packages/data-context/node_modules/fs-extra/lib/util/stat.js",
     "./packages/data-context/node_modules/fs-extra/lib/util/utimes.js",
     "./packages/data-context/node_modules/get-stream/index.js",
+    "./packages/data-context/node_modules/launch-editor/editor-info/linux.js",
+    "./packages/data-context/node_modules/launch-editor/editor-info/osx.js",
+    "./packages/data-context/node_modules/launch-editor/editor-info/windows.js",
+    "./packages/data-context/node_modules/launch-editor/get-args.js",
+    "./packages/data-context/node_modules/launch-editor/guess.js",
+    "./packages/data-context/node_modules/launch-editor/index.js",
     "./packages/data-context/node_modules/micromatch/index.js",
     "./packages/data-context/node_modules/path-key/index.js",
     "./packages/data-context/node_modules/prettier/doc.js",
@@ -4345,5 +4345,5 @@
     "./tooling/v8-snapshot/cache/linux/snapshot-entry.js"
   ],
   "deferredHashFile": "yarn.lock",
-  "deferredHash": "ce87acfb4746797260125a1a730fce2f773b95daaad4ed37bd765aaf4974de18"
+  "deferredHash": "5fadac7ce0b5d51a531e13c3ecb4083f1e0bac1f95e58caa21717eb285102252"
 }