From cb3688309b698978e604d6c8fb6dc33a5dce212e Mon Sep 17 00:00:00 2001 From: "cypress-bot[bot]" <+cypress-bot[bot]@users.noreply.github.com> Date: Wed, 15 Feb 2023 15:45:23 +0000 Subject: [PATCH 1/8] 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 19adb10ec361..7b7bab29e8bf 100644 --- a/tooling/v8-snapshot/cache/linux/snapshot-meta.json +++ b/tooling/v8-snapshot/cache/linux/snapshot-meta.json @@ -5390,5 +5390,5 @@ "./tooling/v8-snapshot/cache/linux/snapshot-entry.js" ], "deferredHashFile": "yarn.lock", - "deferredHash": "63e7e3dfb5632f43e6903eac97d2a1d346cea3ded8c76c6ab2c9e82cfbb07f78" + "deferredHash": "60751e39c1207cf75568cf30743a3d02d95221333bf0dbb966e8bfdd8b99495c" } \ No newline at end of file From 4ca42ff2d5b73da65b28ad8358812a060c5ae1a4 Mon Sep 17 00:00:00 2001 From: "cypress-bot[bot]" <+cypress-bot[bot]@users.noreply.github.com> Date: Wed, 15 Feb 2023 16:13:07 +0000 Subject: [PATCH 2/8] chore: updating v8 snapshot cache --- tooling/v8-snapshot/cache/win32/snapshot-meta.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tooling/v8-snapshot/cache/win32/snapshot-meta.json b/tooling/v8-snapshot/cache/win32/snapshot-meta.json index f1fa7fbfa2f6..08d83dcfe369 100644 --- a/tooling/v8-snapshot/cache/win32/snapshot-meta.json +++ b/tooling/v8-snapshot/cache/win32/snapshot-meta.json @@ -151,6 +151,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", @@ -5388,5 +5390,5 @@ "./tooling/v8-snapshot/cache/win32/snapshot-entry.js" ], "deferredHashFile": "yarn.lock", - "deferredHash": "27ff67d366fb28259e10e64727b179d765d0e5bc3f501bf446f8198689a7e584" -} + "deferredHash": "018b95e4f71b0935013f5e51ddf2438f18e65fb8b45b928b34fff3a72cb071a2" +} \ No newline at end of file From 768f21f97a3be0a081d21bc24b1e1be82fe891e9 Mon Sep 17 00:00:00 2001 From: "cypress-bot[bot]" <+cypress-bot[bot]@users.noreply.github.com> Date: Wed, 15 Feb 2023 16:54:06 +0000 Subject: [PATCH 3/8] chore: updating v8 snapshot cache --- .../CHANGELOG.md | 7 + npm/webpack-preprocessor/CHANGELOG.md | 7 + .../cache/darwin/snapshot-meta.json | 165 +++++++++++++----- 3 files changed, 137 insertions(+), 42 deletions(-) diff --git a/npm/webpack-batteries-included-preprocessor/CHANGELOG.md b/npm/webpack-batteries-included-preprocessor/CHANGELOG.md index b5df0a53bb14..b9e2d153cf63 100644 --- a/npm/webpack-batteries-included-preprocessor/CHANGELOG.md +++ b/npm/webpack-batteries-included-preprocessor/CHANGELOG.md @@ -1,3 +1,10 @@ +# [@cypress/webpack-batteries-included-preprocessor-v2.4.0](https://github.com/cypress-io/cypress/compare/@cypress/webpack-batteries-included-preprocessor-v2.3.0...@cypress/webpack-batteries-included-preprocessor-v2.4.0) (2023-02-15) + + +### Features + +* Bundle cy.origin() dependencies at runtime ([#25626](https://github.com/cypress-io/cypress/issues/25626)) ([41512c4](https://github.com/cypress-io/cypress/commit/41512c416a80e5158752fef9ffbe722402a5ada4)) + # [@cypress/webpack-batteries-included-preprocessor-v2.3.0](https://github.com/cypress-io/cypress/compare/@cypress/webpack-batteries-included-preprocessor-v2.2.4...@cypress/webpack-batteries-included-preprocessor-v2.3.0) (2022-12-02) diff --git a/npm/webpack-preprocessor/CHANGELOG.md b/npm/webpack-preprocessor/CHANGELOG.md index ea3f01d1b8eb..02be04fbf2ae 100644 --- a/npm/webpack-preprocessor/CHANGELOG.md +++ b/npm/webpack-preprocessor/CHANGELOG.md @@ -1,3 +1,10 @@ +# [@cypress/webpack-preprocessor-v5.17.0](https://github.com/cypress-io/cypress/compare/@cypress/webpack-preprocessor-v5.16.3...@cypress/webpack-preprocessor-v5.17.0) (2023-02-15) + + +### Features + +* Bundle cy.origin() dependencies at runtime ([#25626](https://github.com/cypress-io/cypress/issues/25626)) ([41512c4](https://github.com/cypress-io/cypress/commit/41512c416a80e5158752fef9ffbe722402a5ada4)) + # [@cypress/webpack-preprocessor-v5.16.3](https://github.com/cypress-io/cypress/compare/@cypress/webpack-preprocessor-v5.16.2...@cypress/webpack-preprocessor-v5.16.3) (2023-02-06) # [@cypress/webpack-preprocessor-v5.16.2](https://github.com/cypress-io/cypress/compare/@cypress/webpack-preprocessor-v5.16.1...@cypress/webpack-preprocessor-v5.16.2) (2023-02-02) diff --git a/tooling/v8-snapshot/cache/darwin/snapshot-meta.json b/tooling/v8-snapshot/cache/darwin/snapshot-meta.json index 4208d6c8f5e5..dff6e2cd7448 100644 --- a/tooling/v8-snapshot/cache/darwin/snapshot-meta.json +++ b/tooling/v8-snapshot/cache/darwin/snapshot-meta.json @@ -1500,6 +1500,8 @@ "./node_modules/@urql/exchange-graphcache/dist/7832a774.js", "./node_modules/@urql/exchange-graphcache/dist/urql-exchange-graphcache-extras.js", "./node_modules/@urql/exchange-graphcache/dist/urql-exchange-graphcache.js", + "./node_modules/@webassemblyjs/helper-code-frame/lib/index.js", + "./node_modules/@webassemblyjs/helper-fsm/lib/index.js", "./node_modules/@webassemblyjs/helper-module-context/lib/index.js", "./node_modules/@webassemblyjs/helper-module-context/node_modules/@webassemblyjs/ast/lib/clone.js", "./node_modules/@webassemblyjs/helper-module-context/node_modules/@webassemblyjs/ast/lib/index.js", @@ -1509,18 +1511,128 @@ "./node_modules/@webassemblyjs/helper-module-context/node_modules/@webassemblyjs/ast/lib/signatures.js", "./node_modules/@webassemblyjs/helper-module-context/node_modules/@webassemblyjs/ast/lib/traverse.js", "./node_modules/@webassemblyjs/helper-module-context/node_modules/@webassemblyjs/ast/lib/utils.js", - "./node_modules/@webassemblyjs/helper-module-context/node_modules/@webassemblyjs/floating-point-hex-parser/lib/index.js", - "./node_modules/@webassemblyjs/helper-module-context/node_modules/@webassemblyjs/helper-api-error/lib/index.js", - "./node_modules/@webassemblyjs/helper-module-context/node_modules/@webassemblyjs/helper-code-frame/lib/index.js", - "./node_modules/@webassemblyjs/helper-module-context/node_modules/@webassemblyjs/helper-fsm/lib/index.js", "./node_modules/@webassemblyjs/helper-module-context/node_modules/@webassemblyjs/helper-wasm-bytecode/lib/index.js", "./node_modules/@webassemblyjs/helper-module-context/node_modules/@webassemblyjs/helper-wasm-bytecode/lib/section.js", - "./node_modules/@webassemblyjs/helper-module-context/node_modules/@webassemblyjs/wast-parser/lib/grammar.js", - "./node_modules/@webassemblyjs/helper-module-context/node_modules/@webassemblyjs/wast-parser/lib/index.js", - "./node_modules/@webassemblyjs/helper-module-context/node_modules/@webassemblyjs/wast-parser/lib/number-literals.js", - "./node_modules/@webassemblyjs/helper-module-context/node_modules/@webassemblyjs/wast-parser/lib/string-literals.js", - "./node_modules/@webassemblyjs/helper-module-context/node_modules/@webassemblyjs/wast-parser/lib/tokenizer.js", - "./node_modules/@webassemblyjs/helper-module-context/node_modules/@webassemblyjs/wast-printer/lib/index.js", + "./node_modules/@webassemblyjs/helper-wasm-section/lib/create.js", + "./node_modules/@webassemblyjs/helper-wasm-section/lib/index.js", + "./node_modules/@webassemblyjs/helper-wasm-section/lib/remove.js", + "./node_modules/@webassemblyjs/helper-wasm-section/lib/resize.js", + "./node_modules/@webassemblyjs/helper-wasm-section/node_modules/@webassemblyjs/ast/lib/clone.js", + "./node_modules/@webassemblyjs/helper-wasm-section/node_modules/@webassemblyjs/ast/lib/index.js", + "./node_modules/@webassemblyjs/helper-wasm-section/node_modules/@webassemblyjs/ast/lib/node-helpers.js", + "./node_modules/@webassemblyjs/helper-wasm-section/node_modules/@webassemblyjs/ast/lib/node-path.js", + "./node_modules/@webassemblyjs/helper-wasm-section/node_modules/@webassemblyjs/ast/lib/nodes.js", + "./node_modules/@webassemblyjs/helper-wasm-section/node_modules/@webassemblyjs/ast/lib/signatures.js", + "./node_modules/@webassemblyjs/helper-wasm-section/node_modules/@webassemblyjs/ast/lib/traverse.js", + "./node_modules/@webassemblyjs/helper-wasm-section/node_modules/@webassemblyjs/ast/lib/utils.js", + "./node_modules/@webassemblyjs/helper-wasm-section/node_modules/@webassemblyjs/helper-buffer/lib/index.js", + "./node_modules/@webassemblyjs/helper-wasm-section/node_modules/@webassemblyjs/helper-wasm-bytecode/lib/index.js", + "./node_modules/@webassemblyjs/helper-wasm-section/node_modules/@webassemblyjs/helper-wasm-bytecode/lib/section.js", + "./node_modules/@webassemblyjs/helper-wasm-section/node_modules/@webassemblyjs/ieee754/lib/index.js", + "./node_modules/@webassemblyjs/helper-wasm-section/node_modules/@webassemblyjs/leb128/lib/bits.js", + "./node_modules/@webassemblyjs/helper-wasm-section/node_modules/@webassemblyjs/leb128/lib/bufs.js", + "./node_modules/@webassemblyjs/helper-wasm-section/node_modules/@webassemblyjs/leb128/lib/index.js", + "./node_modules/@webassemblyjs/helper-wasm-section/node_modules/@webassemblyjs/leb128/lib/leb.js", + "./node_modules/@webassemblyjs/helper-wasm-section/node_modules/@webassemblyjs/utf8/lib/decoder.js", + "./node_modules/@webassemblyjs/helper-wasm-section/node_modules/@webassemblyjs/utf8/lib/encoder.js", + "./node_modules/@webassemblyjs/helper-wasm-section/node_modules/@webassemblyjs/utf8/lib/index.js", + "./node_modules/@webassemblyjs/helper-wasm-section/node_modules/@webassemblyjs/wasm-gen/lib/encoder/index.js", + "./node_modules/@webassemblyjs/helper-wasm-section/node_modules/@webassemblyjs/wasm-gen/lib/index.js", + "./node_modules/@webassemblyjs/wasm-edit/lib/apply.js", + "./node_modules/@webassemblyjs/wasm-edit/lib/index.js", + "./node_modules/@webassemblyjs/wasm-edit/node_modules/@webassemblyjs/ast/lib/clone.js", + "./node_modules/@webassemblyjs/wasm-edit/node_modules/@webassemblyjs/ast/lib/index.js", + "./node_modules/@webassemblyjs/wasm-edit/node_modules/@webassemblyjs/ast/lib/node-helpers.js", + "./node_modules/@webassemblyjs/wasm-edit/node_modules/@webassemblyjs/ast/lib/node-path.js", + "./node_modules/@webassemblyjs/wasm-edit/node_modules/@webassemblyjs/ast/lib/nodes.js", + "./node_modules/@webassemblyjs/wasm-edit/node_modules/@webassemblyjs/ast/lib/signatures.js", + "./node_modules/@webassemblyjs/wasm-edit/node_modules/@webassemblyjs/ast/lib/traverse.js", + "./node_modules/@webassemblyjs/wasm-edit/node_modules/@webassemblyjs/ast/lib/utils.js", + "./node_modules/@webassemblyjs/wasm-edit/node_modules/@webassemblyjs/helper-buffer/lib/index.js", + "./node_modules/@webassemblyjs/wasm-edit/node_modules/@webassemblyjs/helper-wasm-bytecode/lib/index.js", + "./node_modules/@webassemblyjs/wasm-edit/node_modules/@webassemblyjs/helper-wasm-bytecode/lib/section.js", + "./node_modules/@webassemblyjs/wasm-edit/node_modules/@webassemblyjs/ieee754/lib/index.js", + "./node_modules/@webassemblyjs/wasm-edit/node_modules/@webassemblyjs/leb128/lib/bits.js", + "./node_modules/@webassemblyjs/wasm-edit/node_modules/@webassemblyjs/leb128/lib/bufs.js", + "./node_modules/@webassemblyjs/wasm-edit/node_modules/@webassemblyjs/leb128/lib/index.js", + "./node_modules/@webassemblyjs/wasm-edit/node_modules/@webassemblyjs/leb128/lib/leb.js", + "./node_modules/@webassemblyjs/wasm-edit/node_modules/@webassemblyjs/utf8/lib/decoder.js", + "./node_modules/@webassemblyjs/wasm-edit/node_modules/@webassemblyjs/utf8/lib/encoder.js", + "./node_modules/@webassemblyjs/wasm-edit/node_modules/@webassemblyjs/utf8/lib/index.js", + "./node_modules/@webassemblyjs/wasm-edit/node_modules/@webassemblyjs/wasm-gen/lib/encoder/index.js", + "./node_modules/@webassemblyjs/wasm-edit/node_modules/@webassemblyjs/wasm-gen/lib/index.js", + "./node_modules/@webassemblyjs/wasm-opt/lib/index.js", + "./node_modules/@webassemblyjs/wasm-opt/lib/leb128.js", + "./node_modules/@webassemblyjs/wasm-opt/node_modules/@webassemblyjs/ast/lib/clone.js", + "./node_modules/@webassemblyjs/wasm-opt/node_modules/@webassemblyjs/ast/lib/index.js", + "./node_modules/@webassemblyjs/wasm-opt/node_modules/@webassemblyjs/ast/lib/node-helpers.js", + "./node_modules/@webassemblyjs/wasm-opt/node_modules/@webassemblyjs/ast/lib/node-path.js", + "./node_modules/@webassemblyjs/wasm-opt/node_modules/@webassemblyjs/ast/lib/nodes.js", + "./node_modules/@webassemblyjs/wasm-opt/node_modules/@webassemblyjs/ast/lib/signatures.js", + "./node_modules/@webassemblyjs/wasm-opt/node_modules/@webassemblyjs/ast/lib/traverse.js", + "./node_modules/@webassemblyjs/wasm-opt/node_modules/@webassemblyjs/ast/lib/utils.js", + "./node_modules/@webassemblyjs/wasm-opt/node_modules/@webassemblyjs/helper-buffer/lib/index.js", + "./node_modules/@webassemblyjs/wasm-opt/node_modules/@webassemblyjs/helper-wasm-bytecode/lib/index.js", + "./node_modules/@webassemblyjs/wasm-opt/node_modules/@webassemblyjs/helper-wasm-bytecode/lib/section.js", + "./node_modules/@webassemblyjs/wasm-opt/node_modules/@webassemblyjs/ieee754/lib/index.js", + "./node_modules/@webassemblyjs/wasm-opt/node_modules/@webassemblyjs/leb128/lib/bits.js", + "./node_modules/@webassemblyjs/wasm-opt/node_modules/@webassemblyjs/leb128/lib/bufs.js", + "./node_modules/@webassemblyjs/wasm-opt/node_modules/@webassemblyjs/leb128/lib/index.js", + "./node_modules/@webassemblyjs/wasm-opt/node_modules/@webassemblyjs/leb128/lib/leb.js", + "./node_modules/@webassemblyjs/wasm-opt/node_modules/@webassemblyjs/utf8/lib/decoder.js", + "./node_modules/@webassemblyjs/wasm-opt/node_modules/@webassemblyjs/utf8/lib/encoder.js", + "./node_modules/@webassemblyjs/wasm-opt/node_modules/@webassemblyjs/utf8/lib/index.js", + "./node_modules/@webassemblyjs/wasm-opt/node_modules/@webassemblyjs/wasm-gen/lib/encoder/index.js", + "./node_modules/@webassemblyjs/wasm-opt/node_modules/@webassemblyjs/wasm-gen/lib/index.js", + "./node_modules/@webassemblyjs/wasm-parser/lib/decoder.js", + "./node_modules/@webassemblyjs/wasm-parser/lib/index.js", + "./node_modules/@webassemblyjs/wasm-parser/node_modules/@webassemblyjs/ast/lib/clone.js", + "./node_modules/@webassemblyjs/wasm-parser/node_modules/@webassemblyjs/ast/lib/index.js", + "./node_modules/@webassemblyjs/wasm-parser/node_modules/@webassemblyjs/ast/lib/node-helpers.js", + "./node_modules/@webassemblyjs/wasm-parser/node_modules/@webassemblyjs/ast/lib/node-path.js", + "./node_modules/@webassemblyjs/wasm-parser/node_modules/@webassemblyjs/ast/lib/nodes.js", + "./node_modules/@webassemblyjs/wasm-parser/node_modules/@webassemblyjs/ast/lib/signatures.js", + "./node_modules/@webassemblyjs/wasm-parser/node_modules/@webassemblyjs/ast/lib/traverse.js", + "./node_modules/@webassemblyjs/wasm-parser/node_modules/@webassemblyjs/ast/lib/utils.js", + "./node_modules/@webassemblyjs/wasm-parser/node_modules/@webassemblyjs/helper-api-error/lib/index.js", + "./node_modules/@webassemblyjs/wasm-parser/node_modules/@webassemblyjs/helper-wasm-bytecode/lib/index.js", + "./node_modules/@webassemblyjs/wasm-parser/node_modules/@webassemblyjs/helper-wasm-bytecode/lib/section.js", + "./node_modules/@webassemblyjs/wasm-parser/node_modules/@webassemblyjs/ieee754/lib/index.js", + "./node_modules/@webassemblyjs/wasm-parser/node_modules/@webassemblyjs/leb128/lib/bits.js", + "./node_modules/@webassemblyjs/wasm-parser/node_modules/@webassemblyjs/leb128/lib/bufs.js", + "./node_modules/@webassemblyjs/wasm-parser/node_modules/@webassemblyjs/leb128/lib/index.js", + "./node_modules/@webassemblyjs/wasm-parser/node_modules/@webassemblyjs/leb128/lib/leb.js", + "./node_modules/@webassemblyjs/wasm-parser/node_modules/@webassemblyjs/utf8/lib/decoder.js", + "./node_modules/@webassemblyjs/wasm-parser/node_modules/@webassemblyjs/utf8/lib/encoder.js", + "./node_modules/@webassemblyjs/wasm-parser/node_modules/@webassemblyjs/utf8/lib/index.js", + "./node_modules/@webassemblyjs/wast-parser/lib/grammar.js", + "./node_modules/@webassemblyjs/wast-parser/lib/index.js", + "./node_modules/@webassemblyjs/wast-parser/lib/number-literals.js", + "./node_modules/@webassemblyjs/wast-parser/lib/string-literals.js", + "./node_modules/@webassemblyjs/wast-parser/lib/tokenizer.js", + "./node_modules/@webassemblyjs/wast-parser/node_modules/@webassemblyjs/ast/lib/clone.js", + "./node_modules/@webassemblyjs/wast-parser/node_modules/@webassemblyjs/ast/lib/index.js", + "./node_modules/@webassemblyjs/wast-parser/node_modules/@webassemblyjs/ast/lib/node-helpers.js", + "./node_modules/@webassemblyjs/wast-parser/node_modules/@webassemblyjs/ast/lib/node-path.js", + "./node_modules/@webassemblyjs/wast-parser/node_modules/@webassemblyjs/ast/lib/nodes.js", + "./node_modules/@webassemblyjs/wast-parser/node_modules/@webassemblyjs/ast/lib/signatures.js", + "./node_modules/@webassemblyjs/wast-parser/node_modules/@webassemblyjs/ast/lib/traverse.js", + "./node_modules/@webassemblyjs/wast-parser/node_modules/@webassemblyjs/ast/lib/utils.js", + "./node_modules/@webassemblyjs/wast-parser/node_modules/@webassemblyjs/floating-point-hex-parser/lib/index.js", + "./node_modules/@webassemblyjs/wast-parser/node_modules/@webassemblyjs/helper-api-error/lib/index.js", + "./node_modules/@webassemblyjs/wast-parser/node_modules/@webassemblyjs/helper-wasm-bytecode/lib/index.js", + "./node_modules/@webassemblyjs/wast-parser/node_modules/@webassemblyjs/helper-wasm-bytecode/lib/section.js", + "./node_modules/@webassemblyjs/wast-printer/lib/index.js", + "./node_modules/@webassemblyjs/wast-printer/node_modules/@webassemblyjs/ast/lib/clone.js", + "./node_modules/@webassemblyjs/wast-printer/node_modules/@webassemblyjs/ast/lib/index.js", + "./node_modules/@webassemblyjs/wast-printer/node_modules/@webassemblyjs/ast/lib/node-helpers.js", + "./node_modules/@webassemblyjs/wast-printer/node_modules/@webassemblyjs/ast/lib/node-path.js", + "./node_modules/@webassemblyjs/wast-printer/node_modules/@webassemblyjs/ast/lib/nodes.js", + "./node_modules/@webassemblyjs/wast-printer/node_modules/@webassemblyjs/ast/lib/signatures.js", + "./node_modules/@webassemblyjs/wast-printer/node_modules/@webassemblyjs/ast/lib/traverse.js", + "./node_modules/@webassemblyjs/wast-printer/node_modules/@webassemblyjs/ast/lib/utils.js", + "./node_modules/@webassemblyjs/wast-printer/node_modules/@webassemblyjs/helper-wasm-bytecode/lib/index.js", + "./node_modules/@webassemblyjs/wast-printer/node_modules/@webassemblyjs/helper-wasm-bytecode/lib/section.js", "./node_modules/@xtuc/ieee754/dist/index.cjs.js", "./node_modules/@xtuc/long/src/long.js", "./node_modules/accepts/index.js", @@ -4446,39 +4558,8 @@ "./node_modules/webpack/node_modules/@webassemblyjs/ast/lib/signatures.js", "./node_modules/webpack/node_modules/@webassemblyjs/ast/lib/traverse.js", "./node_modules/webpack/node_modules/@webassemblyjs/ast/lib/utils.js", - "./node_modules/webpack/node_modules/@webassemblyjs/floating-point-hex-parser/lib/index.js", - "./node_modules/webpack/node_modules/@webassemblyjs/helper-api-error/lib/index.js", - "./node_modules/webpack/node_modules/@webassemblyjs/helper-buffer/lib/index.js", - "./node_modules/webpack/node_modules/@webassemblyjs/helper-code-frame/lib/index.js", - "./node_modules/webpack/node_modules/@webassemblyjs/helper-fsm/lib/index.js", "./node_modules/webpack/node_modules/@webassemblyjs/helper-wasm-bytecode/lib/index.js", "./node_modules/webpack/node_modules/@webassemblyjs/helper-wasm-bytecode/lib/section.js", - "./node_modules/webpack/node_modules/@webassemblyjs/helper-wasm-section/lib/create.js", - "./node_modules/webpack/node_modules/@webassemblyjs/helper-wasm-section/lib/index.js", - "./node_modules/webpack/node_modules/@webassemblyjs/helper-wasm-section/lib/remove.js", - "./node_modules/webpack/node_modules/@webassemblyjs/helper-wasm-section/lib/resize.js", - "./node_modules/webpack/node_modules/@webassemblyjs/ieee754/lib/index.js", - "./node_modules/webpack/node_modules/@webassemblyjs/leb128/lib/bits.js", - "./node_modules/webpack/node_modules/@webassemblyjs/leb128/lib/bufs.js", - "./node_modules/webpack/node_modules/@webassemblyjs/leb128/lib/index.js", - "./node_modules/webpack/node_modules/@webassemblyjs/leb128/lib/leb.js", - "./node_modules/webpack/node_modules/@webassemblyjs/utf8/lib/decoder.js", - "./node_modules/webpack/node_modules/@webassemblyjs/utf8/lib/encoder.js", - "./node_modules/webpack/node_modules/@webassemblyjs/utf8/lib/index.js", - "./node_modules/webpack/node_modules/@webassemblyjs/wasm-edit/lib/apply.js", - "./node_modules/webpack/node_modules/@webassemblyjs/wasm-edit/lib/index.js", - "./node_modules/webpack/node_modules/@webassemblyjs/wasm-gen/lib/encoder/index.js", - "./node_modules/webpack/node_modules/@webassemblyjs/wasm-gen/lib/index.js", - "./node_modules/webpack/node_modules/@webassemblyjs/wasm-opt/lib/index.js", - "./node_modules/webpack/node_modules/@webassemblyjs/wasm-opt/lib/leb128.js", - "./node_modules/webpack/node_modules/@webassemblyjs/wasm-parser/lib/decoder.js", - "./node_modules/webpack/node_modules/@webassemblyjs/wasm-parser/lib/index.js", - "./node_modules/webpack/node_modules/@webassemblyjs/wast-parser/lib/grammar.js", - "./node_modules/webpack/node_modules/@webassemblyjs/wast-parser/lib/index.js", - "./node_modules/webpack/node_modules/@webassemblyjs/wast-parser/lib/number-literals.js", - "./node_modules/webpack/node_modules/@webassemblyjs/wast-parser/lib/string-literals.js", - "./node_modules/webpack/node_modules/@webassemblyjs/wast-parser/lib/tokenizer.js", - "./node_modules/webpack/node_modules/@webassemblyjs/wast-printer/lib/index.js", "./node_modules/webpack/node_modules/braces/index.js", "./node_modules/webpack/node_modules/braces/lib/braces.js", "./node_modules/webpack/node_modules/braces/lib/compilers.js", @@ -5313,5 +5394,5 @@ "./tooling/v8-snapshot/cache/darwin/snapshot-entry.js" ], "deferredHashFile": "yarn.lock", - "deferredHash": "c655e53f40f5538c142d8871cbd730041b4327f276887a40d4fb62447a982a3b" + "deferredHash": "60751e39c1207cf75568cf30743a3d02d95221333bf0dbb966e8bfdd8b99495c" } \ No newline at end of file From 11a0a864fe3beedf864ed953f8b2e17a6901530b Mon Sep 17 00:00:00 2001 From: "cypress-bot[bot]" <+cypress-bot[bot]@users.noreply.github.com> Date: Thu, 16 Feb 2023 00:35:45 +0000 Subject: [PATCH 4/8] chore: updating v8 snapshot cache --- packages/example/README.md | 2 +- packages/example/package.json | 5 ++- .../cache/linux/snapshot-meta.json | 6 +-- yarn.lock | 37 ++++++++++++++----- 4 files changed, 34 insertions(+), 16 deletions(-) diff --git a/packages/example/README.md b/packages/example/README.md index cffce50884e8..8d57d43339f8 100644 --- a/packages/example/README.md +++ b/packages/example/README.md @@ -23,7 +23,7 @@ When a commit is merged into `master`, a new version of the [`cypress-example-ki 1. Bump the `cypress-example-kitchensink` `devDependency` within this package's [`package.json`](https://github.com/cypress-io/cypress/blob/develop/packages/example/package.json). -2. Run `yarn` and `yarn workspace @packages/example` to build the app and spec files. +2. Run `yarn` and `yarn workspace @packages/example build` to build the app and spec files. 3. Create a new pull-request following this repo's [pull request instructions](CONTRIBUTING.md#pull-requests). diff --git a/packages/example/package.json b/packages/example/package.json index 849071906a8f..3db74c65acf9 100644 --- a/packages/example/package.json +++ b/packages/example/package.json @@ -12,11 +12,12 @@ "build": "node ./bin/build.js && gulp build", "build-prod": "yarn build", "predeploy": "yarn build", - "deploy": "echo 'gh-pages -d build -b gh-pages'" + "deploy": "gh-pages -d build -b gh-pages" }, "devDependencies": { "cross-env": "6.0.3", - "cypress-example-kitchensink": "https://github.com/cypress-io/cypress-example-kitchensink.git#d7150632ac15268f2c7a50110cadf039a248ac4e", + "cypress-example-kitchensink": "1.16.0", + "gh-pages": "5.0.0", "gulp": "4.0.2", "gulp-clean": "0.4.0", "gulp-rev-all": "2.0.2", diff --git a/tooling/v8-snapshot/cache/linux/snapshot-meta.json b/tooling/v8-snapshot/cache/linux/snapshot-meta.json index 7b7bab29e8bf..6b159ec80a95 100644 --- a/tooling/v8-snapshot/cache/linux/snapshot-meta.json +++ b/tooling/v8-snapshot/cache/linux/snapshot-meta.json @@ -206,7 +206,6 @@ "./node_modules/archiver/lib/core.js", "./node_modules/archiver/lib/error.js", "./node_modules/archiver/lib/plugins/json.js", - "./node_modules/archiver/node_modules/async/dist/async.js", "./node_modules/archiver/node_modules/readable-stream/errors.js", "./node_modules/archiver/node_modules/readable-stream/lib/_stream_duplex.js", "./node_modules/archiver/node_modules/readable-stream/lib/_stream_passthrough.js", @@ -218,6 +217,7 @@ "./node_modules/archiver/node_modules/readable-stream/readable.js", "./node_modules/array-uniq/index.js", "./node_modules/assert-plus/assert.js", + "./node_modules/async/dist/async.js", "./node_modules/base/index.js", "./node_modules/basic-auth/node_modules/safe-buffer/index.js", "./node_modules/bl/bl.js", @@ -350,7 +350,6 @@ "./node_modules/fluent-ffmpeg/index.js", "./node_modules/fluent-ffmpeg/lib/fluent-ffmpeg.js", "./node_modules/fluent-ffmpeg/lib/utils.js", - "./node_modules/fluent-ffmpeg/node_modules/async/dist/async.js", "./node_modules/flush-write-stream/index.js", "./node_modules/follow-redirects/index.js", "./node_modules/forever-agent/index.js", @@ -376,7 +375,6 @@ "./node_modules/get-package-info/node_modules/debug/src/index.js", "./node_modules/get-stream/buffer-stream.js", "./node_modules/getenv/index.js", - "./node_modules/getos/node_modules/async/dist/async.js", "./node_modules/gifwrap/src/gifcodec.js", "./node_modules/gifwrap/src/gifutil.js", "./node_modules/gifwrap/src/index.js", @@ -5390,5 +5388,5 @@ "./tooling/v8-snapshot/cache/linux/snapshot-entry.js" ], "deferredHashFile": "yarn.lock", - "deferredHash": "60751e39c1207cf75568cf30743a3d02d95221333bf0dbb966e8bfdd8b99495c" + "deferredHash": "01abd62478db6a96641c734d3f71ca773474daf953a15922c4ee5a2cb1496fa9" } \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index 95e617319b56..a2b43ecd3287 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8873,10 +8873,10 @@ async@0.9.x, async@^0.9.0: resolved "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d" integrity sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0= -async@>=0.2.9, async@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/async/-/async-3.2.0.tgz#b3a2685c5ebb641d3de02d161002c60fc9f85720" - integrity sha512-TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw== +async@>=0.2.9, async@^3.2.0, async@^3.2.4: + version "3.2.4" + resolved "https://registry.yarnpkg.com/async/-/async-3.2.4.tgz#2d22e00f8cddeb5fde5dd33522b56d1cf569a81c" + integrity sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ== async@^2.1.4, async@^2.4.1, async@^2.6.2: version "2.6.4" @@ -11130,7 +11130,7 @@ commander@2.9.0: dependencies: graceful-readlink ">= 1.0.0" -commander@2.x.x, commander@^2.11.0, commander@^2.12.1, commander@^2.19.0, commander@^2.20.0: +commander@2.x.x, commander@^2.11.0, commander@^2.12.1, commander@^2.18.0, commander@^2.19.0, commander@^2.20.0: version "2.20.3" resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== @@ -12135,9 +12135,10 @@ cypress-each@^1.11.0: resolved "https://registry.yarnpkg.com/cypress-each/-/cypress-each-1.11.0.tgz#013c9b43a950f157bcf082d4bd0bb424fb370441" integrity sha512-zeqeQkppPL6BKLIJdfR5IUoZRrxRudApJapnFzWCkkrmefQSqdlBma2fzhmniSJ3TRhxe5xpK3W3/l8aCrHvwQ== -"cypress-example-kitchensink@https://github.com/cypress-io/cypress-example-kitchensink.git#d7150632ac15268f2c7a50110cadf039a248ac4e": - version "0.0.0-development" - resolved "https://github.com/cypress-io/cypress-example-kitchensink.git#d7150632ac15268f2c7a50110cadf039a248ac4e" +cypress-example-kitchensink@1.16.0: + version "1.16.0" + resolved "https://registry.yarnpkg.com/cypress-example-kitchensink/-/cypress-example-kitchensink-1.16.0.tgz#b2f7759c2414eb032c82a32ca498b1b6a22b7257" + integrity sha512-JXbNyOMTi1IXqmiEpZRzFEHL03LG09V+b5abxrB39pil+QmAyLKhfdmWspFRu+GWsALdEsdFrcTmexIW6Y15tA== dependencies: npm-run-all "^4.1.2" serve "11.3.0" @@ -13346,6 +13347,11 @@ elliptic@^6.5.3: minimalistic-assert "^1.0.1" minimalistic-crypto-utils "^1.0.1" +email-addresses@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/email-addresses/-/email-addresses-5.0.0.tgz#7ae9e7f58eef7d5e3e2c2c2d3ea49b78dc854fa6" + integrity sha512-4OIPYlA6JXqtVn8zpHpGiI7vE6EQOAg16aGnDMIAlZVinnoZ8208tW1hAbjWydgN/4PLTT9q+O1K6AH/vALJGw== + email-validator@^2.0.3: version "2.0.4" resolved "https://registry.yarnpkg.com/email-validator/-/email-validator-2.0.4.tgz#b8dfaa5d0dae28f1b03c95881d904d4e40bfe7ed" @@ -14976,7 +14982,7 @@ filename-reserved-regex@^2.0.0: resolved "https://registry.yarnpkg.com/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz#abf73dfab735d045440abfea2d91f389ebbfa229" integrity sha1-q/c9+rc10EVECr/qLZHzieu/oik= -filenamify@^4.1.0: +filenamify@^4.1.0, filenamify@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/filenamify/-/filenamify-4.3.0.tgz#62391cb58f02b09971c9d4f9d63b3cf9aba03106" integrity sha512-hcFKyUG57yWGAzu1CMt/dPzYZuv+jAJUT85bL8mrXvNe6hWj6yEHEc4EdcgiA6Z3oi1/9wXJdZPXF2dZNgwgOg== @@ -15838,6 +15844,19 @@ getpass@^0.1.1: dependencies: assert-plus "^1.0.0" +gh-pages@5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/gh-pages/-/gh-pages-5.0.0.tgz#e0893272a0e33f0453e53a3c017c33b91ddd6394" + integrity sha512-Nqp1SjkPIB94Xw/3yYNTUL+G2dxlhjvv1zeN/4kMC1jfViTEqhtVz/Ba1zSXHuvXCN9ADNS1dN4r5/J/nZWEQQ== + dependencies: + async "^3.2.4" + commander "^2.18.0" + email-addresses "^5.0.0" + filenamify "^4.3.0" + find-cache-dir "^3.3.1" + fs-extra "^8.1.0" + globby "^6.1.0" + gift@0.10.2: version "0.10.2" resolved "https://registry.yarnpkg.com/gift/-/gift-0.10.2.tgz#4600efe8f284b51fcb01c3527b321e22b494e156" From bd81abcbefda3210160019ad536c15df92f52ce4 Mon Sep 17 00:00:00 2001 From: "cypress-bot[bot]" <+cypress-bot[bot]@users.noreply.github.com> Date: Thu, 16 Feb 2023 01:01:09 +0000 Subject: [PATCH 5/8] chore: updating v8 snapshot cache --- tooling/v8-snapshot/cache/win32/snapshot-meta.json | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tooling/v8-snapshot/cache/win32/snapshot-meta.json b/tooling/v8-snapshot/cache/win32/snapshot-meta.json index 08d83dcfe369..28bfb3862444 100644 --- a/tooling/v8-snapshot/cache/win32/snapshot-meta.json +++ b/tooling/v8-snapshot/cache/win32/snapshot-meta.json @@ -208,7 +208,6 @@ "./node_modules/archiver/lib/core.js", "./node_modules/archiver/lib/error.js", "./node_modules/archiver/lib/plugins/json.js", - "./node_modules/archiver/node_modules/async/dist/async.js", "./node_modules/archiver/node_modules/readable-stream/errors.js", "./node_modules/archiver/node_modules/readable-stream/lib/_stream_duplex.js", "./node_modules/archiver/node_modules/readable-stream/lib/_stream_passthrough.js", @@ -220,6 +219,7 @@ "./node_modules/archiver/node_modules/readable-stream/readable.js", "./node_modules/array-uniq/index.js", "./node_modules/assert-plus/assert.js", + "./node_modules/async/dist/async.js", "./node_modules/base/index.js", "./node_modules/basic-auth/node_modules/safe-buffer/index.js", "./node_modules/bl/bl.js", @@ -352,7 +352,6 @@ "./node_modules/fluent-ffmpeg/index.js", "./node_modules/fluent-ffmpeg/lib/fluent-ffmpeg.js", "./node_modules/fluent-ffmpeg/lib/utils.js", - "./node_modules/fluent-ffmpeg/node_modules/async/dist/async.js", "./node_modules/flush-write-stream/index.js", "./node_modules/follow-redirects/index.js", "./node_modules/forever-agent/index.js", @@ -378,7 +377,6 @@ "./node_modules/get-package-info/node_modules/debug/src/index.js", "./node_modules/get-stream/buffer-stream.js", "./node_modules/getenv/index.js", - "./node_modules/getos/node_modules/async/dist/async.js", "./node_modules/gifwrap/src/gifcodec.js", "./node_modules/gifwrap/src/gifutil.js", "./node_modules/gifwrap/src/index.js", @@ -5390,5 +5388,5 @@ "./tooling/v8-snapshot/cache/win32/snapshot-entry.js" ], "deferredHashFile": "yarn.lock", - "deferredHash": "018b95e4f71b0935013f5e51ddf2438f18e65fb8b45b928b34fff3a72cb071a2" + "deferredHash": "b9ae1eca19566c39d1730431a6ca70d8c3a3218d1b0772fe7a3299249e3ccd46" } \ No newline at end of file From 50e1f194bc123986ed922affb093c989fb2db956 Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Thu, 16 Feb 2023 11:02:46 -0600 Subject: [PATCH 6/8] Update workflows.yml --- .circleci/workflows.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.circleci/workflows.yml b/.circleci/workflows.yml index 939160e8b4e8..35491048b5d1 100644 --- a/.circleci/workflows.yml +++ b/.circleci/workflows.yml @@ -28,7 +28,8 @@ mainBuildFilters: &mainBuildFilters only: - develop - /^release\/\d+\.\d+\.\d+$/ - - 'tgriesser/spike/spike' + # use the following branch as well to ensure that v8 snapshot cache updates are fully tested + - 'update-v8-snapshot-cache-on-develop' # 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 @@ -37,7 +38,8 @@ macWorkflowFilters: &darwin-workflow-filters when: or: - equal: [ develop, << pipeline.git.branch >> ] - - equal: [ 'tgriesser/spike/spike', << 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 >> ] - matches: pattern: /^release\/\d+\.\d+\.\d+$/ value: << pipeline.git.branch >> @@ -46,7 +48,8 @@ linuxArm64WorkflowFilters: &linux-arm64-workflow-filters when: or: - equal: [ develop, << pipeline.git.branch >> ] - - equal: [ 'tgriesser/spike/spike', << 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 >> ] - matches: pattern: /^release\/\d+\.\d+\.\d+$/ value: << pipeline.git.branch >> From aeb87b5ec5dd722dca25446a35239ed9f9dfea99 Mon Sep 17 00:00:00 2001 From: "cypress-bot[bot]" <+cypress-bot[bot]@users.noreply.github.com> Date: Fri, 17 Feb 2023 00:37:05 +0000 Subject: [PATCH 7/8] chore: updating v8 snapshot cache --- cli/CHANGELOG.md | 5 ++++ cli/types/cypress.d.ts | 26 ++++++++++++++++++- packages/app/cypress/e2e/debug.cy.ts | 4 +-- .../fixtures/debug-Failing/gql-Debug.json | 1 + .../fixtures/debug-Passing/gql-Debug.json | 3 ++- packages/app/src/debug/DebugPageHeader.cy.tsx | 21 ++++++++++++++- packages/app/src/debug/DebugPageHeader.vue | 17 +++++++++--- .../get-binary-release-data.js | 11 +++++--- 8 files changed, 75 insertions(+), 13 deletions(-) diff --git a/cli/CHANGELOG.md b/cli/CHANGELOG.md index 974f0ad1ab56..81d87119a487 100644 --- a/cli/CHANGELOG.md +++ b/cli/CHANGELOG.md @@ -6,6 +6,11 @@ _Released 03/1/2023 (PENDING)_ **Bugfixes:** - Fixed an issue where cookies were being duplicated with the same hostname, but a prepended dot. Fixed an issue where cookies may not be expiring correctly. Fixes [#25174](https://github.com/cypress-io/cypress/issues/25174), [#25205](https://github.com/cypress-io/cypress/issues/25205) and [#25495](https://github.com/cypress-io/cypress/issues/25495). +- Added missing TypeScript type definitions for the [`cy.reload()`](https://docs.cypress.io/api/commands/reload) command. Addressed in [#25779](https://github.com/cypress-io/cypress/pull/25779). + +**Misc:** + + - Made updates to the way that the Debug Page header displays information. Addresses [#25796](https://github.com/cypress-io/cypress/issues/25796) and [#25798](https://github.com/cypress-io/cypress/issues/25798). ## 12.6.0 diff --git a/cli/types/cypress.d.ts b/cli/types/cypress.d.ts index 60ad410061e2..17a27f2b3eda 100644 --- a/cli/types/cypress.d.ts +++ b/cli/types/cypress.d.ts @@ -1816,9 +1816,21 @@ declare namespace Cypress { * * @see https://on.cypress.io/reload * @example + * cy.visit('http://localhost:3000/admin') * cy.reload() */ - reload(options?: Partial): Chainable + reload(): Chainable + /** + * Reload the page. + * + * @see https://on.cypress.io/reload + * @param {Partial} options Pass in an options object to modify the default behavior of cy.reload() + * @example + * // Reload the page, do not log it in the command log and timeout after 15s + * cy.visit('http://localhost:3000/admin') + * cy.reload({log: false, timeout: 15000}) + */ + reload(options: Partial): Chainable /** * Reload the page without cache * @@ -1830,6 +1842,18 @@ declare namespace Cypress { * cy.reload(true) */ reload(forceReload: boolean): Chainable + /** + * Reload the page without cache and with log and timeout options + * + * @see https://on.cypress.io/reload + * @param {Boolean} forceReload Whether to reload the current page without using the cache. true forces the reload without cache. + * @param {Partial} options Pass in an options object to modify the default behavior of cy.reload() + * @example + * // Reload the page without using the cache, do not log it in the command log and timeout after 15s + * cy.visit('http://localhost:3000/admin') + * cy.reload(true, {log: false, timeout: 15000}) + */ + reload(forceReload: boolean, options: Partial): Chainable /** * Make an HTTP GET request. diff --git a/packages/app/cypress/e2e/debug.cy.ts b/packages/app/cypress/e2e/debug.cy.ts index b39c4ca19ddd..76fce07b3ac0 100644 --- a/packages/app/cypress/e2e/debug.cy.ts +++ b/packages/app/cypress/e2e/debug.cy.ts @@ -77,7 +77,7 @@ describe('App - Debug Page', () => { cy.findByTestId('debug-header-branch').contains('main') cy.findByTestId('debug-header-commitHash').contains('e9d176f') cy.findByTestId('debug-header-author').contains('Lachlan Miller') - cy.findByTestId('debug-header-createdAt').contains('01:18') + cy.findByTestId('debug-header-createdAt').contains('02h 00m 10s') }) cy.findByTestId('debug-passed').contains('Well Done!') @@ -148,7 +148,7 @@ describe('App - Debug Page', () => { cy.findByTestId('debug-header-branch').contains('main') cy.findByTestId('debug-header-commitHash').contains('commit1') cy.findByTestId('debug-header-author').contains('Lachlan Miller') - cy.findByTestId('debug-header-createdAt').contains('00:19') + cy.findByTestId('debug-header-createdAt').contains('00m 19s') }) cy.findByTestId('spec-contents').within(() => { diff --git a/packages/app/cypress/fixtures/debug-Failing/gql-Debug.json b/packages/app/cypress/fixtures/debug-Failing/gql-Debug.json index b3af1afc3f90..c522ac0f0f98 100644 --- a/packages/app/cypress/fixtures/debug-Failing/gql-Debug.json +++ b/packages/app/cypress/fixtures/debug-Failing/gql-Debug.json @@ -14,6 +14,7 @@ "commitInfo": { "sha": "commit1", "authorName": "Lachlan Miller", + "authorEmail": "hello@cypress.io", "summary": "chore: testing cypress", "branch": "main", "__typename": "CloudRunCommitInfo" diff --git a/packages/app/cypress/fixtures/debug-Passing/gql-Debug.json b/packages/app/cypress/fixtures/debug-Passing/gql-Debug.json index 770ddfb7f052..82ce76f8c171 100644 --- a/packages/app/cypress/fixtures/debug-Passing/gql-Debug.json +++ b/packages/app/cypress/fixtures/debug-Passing/gql-Debug.json @@ -10,10 +10,11 @@ "runNumber": 2, "createdAt": "2023-01-30T08:10:59.720Z", "status": "PASSED", - "totalDuration": 78898, + "totalDuration": 7210000, "commitInfo": { "sha": "e9d176f0c00c0428c9945577aec37cb6d48c5a26", "authorName": "Lachlan Miller", + "authorEmail": "asdf", "summary": "update projectId", "branch": "main", "__typename": "CloudRunCommitInfo" diff --git a/packages/app/src/debug/DebugPageHeader.cy.tsx b/packages/app/src/debug/DebugPageHeader.cy.tsx index fea3d08ea611..9ac73bbf5838 100644 --- a/packages/app/src/debug/DebugPageHeader.cy.tsx +++ b/packages/app/src/debug/DebugPageHeader.cy.tsx @@ -6,7 +6,7 @@ const defaults = [ { attr: 'debug-header-branch', text: 'Branch Name: feature/DESIGN-183' }, { attr: 'debug-header-commitHash', text: 'Commit Hash: b5e6fde' }, { attr: 'debug-header-author', text: 'Commit Author: cypressDTest' }, - { attr: 'debug-header-createdAt', text: 'Run Total Duration: 01:00 (an hour ago) ' }, + { attr: 'debug-header-createdAt', text: 'Run Total Duration: 01m 00s (an hour ago) ' }, ] describe('', { @@ -22,6 +22,7 @@ describe('', { result.commitInfo.summary = 'Adding a hover state to the button component' result.commitInfo.branch = 'feature/DESIGN-183' result.commitInfo.authorName = 'cypressDTest' + result.commitInfo.authorEmail = 'adams@cypress.io' result.commitInfo.sha = 'b5e6fde' } } @@ -144,4 +145,22 @@ describe('', { cy.findByTestId('debug-commitsAhead').should('not.exist') }) + + it('renders duration over 1 hour', () => { + cy.mountFragment(DebugPageHeaderFragmentDoc, { + onResult (result) { + if (result) { + result.totalDuration = 3602000000 + } + }, + render: (gqlVal) => { + return ( + + ) + }, + }) + + cy.findByTestId('debug-header-createdAt') + .should('have.text', 'Run Total Duration: 16h 33m 20s (an hour ago) ') + }) }) diff --git a/packages/app/src/debug/DebugPageHeader.vue b/packages/app/src/debug/DebugPageHeader.vue index 498f4e011044..8d9155884ce0 100644 --- a/packages/app/src/debug/DebugPageHeader.vue +++ b/packages/app/src/debug/DebugPageHeader.vue @@ -81,8 +81,9 @@ v-if="debug?.commitInfo?.authorName" data-cy="debug-header-author" > - Commit Author: {{ debug.commitInfo.authorName }} @@ -113,8 +114,8 @@ import CommitIcon from '~icons/cy/commit_x14' import { gql } from '@urql/core' import { dayjs } from '../runs/utils/day.js' import { useI18n } from 'vue-i18n' -import { useDurationFormat } from '../composables/useDurationFormat' import DebugRunNumber from './DebugRunNumber.vue' +import UserAvatar from '@cy/gql-components/topnav/UserAvatar.vue' const { t } = useI18n() @@ -132,6 +133,7 @@ fragment DebugPageHeader on CloudRun { ...RunResults commitInfo { authorName + authorEmail summary branch } @@ -147,7 +149,14 @@ const debug = computed(() => props.gql) const relativeCreatedAt = computed(() => dayjs(new Date(debug.value.createdAt!)).fromNow()) -const totalDuration = useDurationFormat(debug.value.totalDuration ?? 0) +/* + Format duration to in HH[h] mm[m] ss[s] format. The `totalDuration` field is milliseconds. Remove the leading "00h" if the value is less + than an hour. Currently, there is no expectation that a run duration will be greater 24 hours or greater, so it is okay that + this format would "roll-over" in that scenario. + Ex: 1 second which is 1000ms = 00m 01s + Ex: 1 hour and 1 second which is 3601000ms = 01h 00m 01s +*/ +const totalDuration = computed(() => dayjs.duration(debug.value.totalDuration ?? 0).format('HH[h] mm[m] ss[s]').replace(/^0+h /, ''))