Skip to content

Commit a29eae9

Browse files
authored
perf: fix performance issue for service workers that don't handle requests (#28900)
1 parent 19fe349 commit a29eae9

25 files changed

+1948
-668
lines changed

.circleci/workflows.yml

+5-15
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,7 @@ mainBuildFilters: &mainBuildFilters
2929
- develop
3030
- /^release\/\d+\.\d+\.\d+$/
3131
# use the following branch as well to ensure that v8 snapshot cache updates are fully tested
32-
- 'cacie/dep/electron-27'
33-
- 'fix/force_colors_on_verify'
34-
- 'publish-binary'
35-
- 'em/circle2'
32+
- 'update-v8-snapshot-cache-on-develop'
3633

3734
# usually we don't build Mac app - it takes a long time
3835
# but sometimes we want to really confirm we are doing the right thing
@@ -43,9 +40,7 @@ macWorkflowFilters: &darwin-workflow-filters
4340
- equal: [ develop, << pipeline.git.branch >> ]
4441
# use the following branch as well to ensure that v8 snapshot cache updates are fully tested
4542
- equal: [ 'update-v8-snapshot-cache-on-develop', << pipeline.git.branch >> ]
46-
- equal: [ 'cacie/dep/electron-27', << pipeline.git.branch >> ]
47-
- equal: [ 'fix/force_colors_on_verify', << pipeline.git.branch >> ]
48-
- equal: [ 'ryanm/fix/service-worker-capture', << pipeline.git.branch >> ]
43+
- equal: [ 'mschile/service_worker', << pipeline.git.branch >> ]
4944
- matches:
5045
pattern: /^release\/\d+\.\d+\.\d+$/
5146
value: << pipeline.git.branch >>
@@ -56,9 +51,7 @@ linuxArm64WorkflowFilters: &linux-arm64-workflow-filters
5651
- equal: [ develop, << pipeline.git.branch >> ]
5752
# use the following branch as well to ensure that v8 snapshot cache updates are fully tested
5853
- equal: [ 'update-v8-snapshot-cache-on-develop', << pipeline.git.branch >> ]
59-
- equal: [ 'cacie/dep/electron-27', << pipeline.git.branch >> ]
60-
- equal: [ 'fix/force_colors_on_verify', << pipeline.git.branch >> ]
61-
- equal: [ 'em/circle2', << pipeline.git.branch >> ]
54+
- equal: [ 'mschile/service_worker', << pipeline.git.branch >> ]
6255
- matches:
6356
pattern: /^release\/\d+\.\d+\.\d+$/
6457
value: << pipeline.git.branch >>
@@ -81,10 +74,7 @@ windowsWorkflowFilters: &windows-workflow-filters
8174
- equal: [ develop, << pipeline.git.branch >> ]
8275
# use the following branch as well to ensure that v8 snapshot cache updates are fully tested
8376
- equal: [ 'update-v8-snapshot-cache-on-develop', << pipeline.git.branch >> ]
84-
- equal: [ 'cacie/dep/electron-27', << pipeline.git.branch >> ]
85-
- equal: [ 'fix/force_colors_on_verify', << pipeline.git.branch >> ]
86-
- equal: [ 'lerna-optimize-tasks', << pipeline.git.branch >> ]
87-
- equal: [ 'mschile/mochaEvents_win_sep', << pipeline.git.branch >> ]
77+
- equal: [ 'mschile/service_worker', << pipeline.git.branch >> ]
8878
- matches:
8979
pattern: /^release\/\d+\.\d+\.\d+$/
9080
value: << pipeline.git.branch >>
@@ -154,7 +144,7 @@ commands:
154144
name: Set environment variable to determine whether or not to persist artifacts
155145
command: |
156146
echo "Setting SHOULD_PERSIST_ARTIFACTS variable"
157-
echo 'if ! [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "release/"* && "$CIRCLE_BRANCH" != "publish-binary" && "$CIRCLE_BRANCH" != "fix/force_colors_on_verify" && "$CIRCLE_BRANCH" != "cacie/dep/electron-27" ]]; then
147+
echo 'if ! [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "release/"* && "$CIRCLE_BRANCH" != "mschile/service_worker" ]]; then
158148
export SHOULD_PERSIST_ARTIFACTS=true
159149
fi' >> "$BASH_ENV"
160150
# You must run `setup_should_persist_artifacts` command and be using bash before running this command

cli/CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33

44
_Released 2/27/2024 (PENDING)_
55

6+
**Performance:**
7+
8+
- Fixed a performance regression from [`13.6.4`](https://docs.cypress.io/guides/references/changelog#13-6-4) where unhandled service worker requests may not correlate correctly. Fixes [#28868](https://github.com/cypress-io/cypress/issues/28868).
9+
610
**Bugfixes:**
711

812
- Fixed an issue where `.click()` commands on children of disabled elements would still produce "click" events -- even without `{ force: true }`. Fixes [#28788](https://github.com/cypress-io/cypress/issues/28788).

0 commit comments

Comments
 (0)