Skip to content

Commit 075f4c8

Browse files
committed
Merge branch 'develop' into mikep/22825-next-middleware
2 parents cc15163 + 1a9bc2c commit 075f4c8

File tree

31 files changed

+54
-35
lines changed

31 files changed

+54
-35
lines changed

cli/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ _Released 02/14/2023 (PENDING)_
1616
- Improved the layout of the Debug Page on smaller viewports when there is a pending run. Addresses [#25664](https://github.com/cypress-io/cypress/issues/25664).
1717
- Icons in Debug page will no longer shrink at small viewports. Addresses [#25665](https://github.com/cypress-io/cypress/issues/25665).
1818

19+
**Dependency Updates:**
20+
21+
- Upgrade [`debug`][(https://www.npmjs.com/package/debug) to `4.3.4`. Addressed in [#25699](https://github.com/cypress-io/cypress/pull/25699).
22+
1923
## 12.5.1
2024

2125
_Released 02/10/2023_

cli/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"commander": "^5.1.0",
3838
"common-tags": "^1.8.0",
3939
"dayjs": "^1.10.4",
40-
"debug": "^4.3.2",
40+
"debug": "^4.3.4",
4141
"enquirer": "^2.3.6",
4242
"eventemitter2": "6.4.7",
4343
"execa": "4.1.0",

npm/grep/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# [@cypress/grep-v3.1.4](https://github.com/cypress-io/cypress/compare/@cypress/grep-v3.1.3...@cypress/grep-v3.1.4) (2023-02-06)
2+
13
# [@cypress/grep-v3.1.3](https://github.com/cypress-io/cypress/compare/@cypress/grep-v3.1.2...@cypress/grep-v3.1.3) (2022-12-14)
24

35

npm/grep/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"lint": "eslint . --ext .js,.ts"
1010
},
1111
"dependencies": {
12-
"debug": "^4.3.2",
12+
"debug": "^4.3.4",
1313
"find-test-names": "^1.19.0",
1414
"globby": "^11.0.4"
1515
},

npm/react18/src/index.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import {
88
} from '@cypress/react'
99
import type {
1010
MountOptions,
11+
MountReturn,
1112
InternalMountOptions,
1213
UnmountArgs,
1314
} from '@cypress/react'
@@ -83,3 +84,8 @@ export function unmount (options: UnmountArgs = { log: true }) {
8384
export {
8485
getContainerEl,
8586
}
87+
88+
export type {
89+
MountOptions,
90+
MountReturn,
91+
}

npm/vue/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# [@cypress/vue-v5.0.4](https://github.com/cypress-io/cypress/compare/@cypress/vue-v5.0.3...@cypress/vue-v5.0.4) (2023-02-06)
2+
13
# [@cypress/vue-v5.0.3](https://github.com/cypress-io/cypress/compare/@cypress/vue-v5.0.2...@cypress/vue-v5.0.3) (2022-12-02)
24

35

npm/vue/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"@vue/test-utils": "2.0.2",
2424
"axios": "0.21.2",
2525
"cypress": "0.0.0-development",
26-
"debug": "^4.3.2",
26+
"debug": "^4.3.4",
2727
"globby": "^11.0.1",
2828
"tailwindcss": "1.1.4",
2929
"typescript": "^4.7.4",

npm/webpack-preprocessor/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# [@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)
2+
13
# [@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)
24

35

npm/webpack-preprocessor/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"@babel/parser": "^7.13.0",
2727
"@babel/traverse": "^7.17.9",
2828
"bluebird": "3.7.1",
29-
"debug": "^4.3.2",
29+
"debug": "^4.3.4",
3030
"fs-extra": "^10.1.0",
3131
"loader-utils": "^2.0.0",
3232
"lodash": "^4.17.20",

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
"@types/bluebird": "3.5.29",
9494
"@types/chai-enzyme": "0.6.7",
9595
"@types/classnames": "2.2.9",
96-
"@types/debug": "4.1.5",
96+
"@types/debug": "4.1.7",
9797
"@types/detect-port": "^1.3.1",
9898
"@types/enzyme-adapter-react-16": "1.0.5",
9999
"@types/execa": "0.9.0",
@@ -137,7 +137,7 @@
137137
"common-tags": "1.8.0",
138138
"conventional-recommended-bump": "6.1.0",
139139
"cross-env": "7.0.3",
140-
"debug": "^4.3.2",
140+
"debug": "^4.3.4",
141141
"dedent": "^0.7.0",
142142
"del": "3.0.0",
143143
"detect-port": "^1.3.0",

packages/app/src/debug/GroupedDebugFailedTest.cy.tsx

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,17 +67,18 @@ describe('<GroupedDebugFailedTest/>', () => {
6767
]
6868

6969
it('mounts correctly and shows artifacts on hover', () => {
70+
// On retries in CI, the realHover() event can be persistant, causing the component to
71+
// be hovered at the start of the test. We therefore hover the mouse somewhere else on the screen
72+
// to reduce flake.
73+
// This sort of weirdness is exactly why Cypress doesn't support a 'hover' command natively.
74+
cy.get('body').realHover({ position: 'topLeft' })
75+
7076
cy.mount(() => (
7177
<div class='p-24px'>
7278
<GroupedDebugFailedTest groups={groups} failedTests={testResult} />
7379
</div>
7480
))
7581

76-
cy.get('body').click('topLeft')
77-
// 👆 this click is to address some flake in CI where this component renders already in the hover state
78-
// example: https://cloud.cypress.io/projects/ypt4pf/runs/43417/overview/18107774-3213-47f0-902e-79502a832c34/video?reviewViewBy=FAILED&utm_source=Dashboard&utm_medium=Share+URL&utm_campaign=Video
79-
// this should avoid whatever situation leads to the appearance of being hovered right after mount.
80-
8182
cy.findAllByTestId(`grouped-row`).should('have.length', 2).each((el) => cy.wrap(el).within(() => {
8283
cy.findByTestId('debug-artifacts').should('not.be.visible')
8384
cy.findByTestId('test-failed-metadata').realHover()

packages/config/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"@babel/types": "^7",
2626
"check-more-types": "2.24.0",
2727
"common-tags": "1.8.0",
28-
"debug": "^4.3.2",
28+
"debug": "^4.3.4",
2929
"fs-extra": "^9.1.0",
3030
"lodash": "^4.17.21",
3131
"recast": "0.20.4",

packages/driver/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
"crypto-js": "4.1.1",
4949
"cypress-multi-reporters": "1.4.0",
5050
"dayjs": "^1.10.3",
51-
"debug": "^4.3.2",
51+
"debug": "^4.3.4",
5252
"error-stack-parser": "2.0.6",
5353
"errorhandler": "1.5.1",
5454
"eventemitter2": "6.4.7",

packages/electron/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"dependencies": {
1919
"@packages/icons": "0.0.0-development",
2020
"bluebird": "3.5.3",
21-
"debug": "^4.3.2",
21+
"debug": "^4.3.4",
2222
"fs-extra": "9.1.0",
2323
"lodash": "^4.17.21",
2424
"minimist": "1.2.6"

packages/https-proxy/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
},
1717
"dependencies": {
1818
"bluebird": "3.5.3",
19-
"debug": "^4.3.2",
19+
"debug": "^4.3.4",
2020
"fs-extra": "9.1.0",
2121
"lodash": "^4.17.21",
2222
"node-forge": "1.3.0",

packages/launcher/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
},
1515
"dependencies": {
1616
"bluebird": "3.5.3",
17-
"debug": "^4.3.2",
17+
"debug": "^4.3.4",
1818
"execa": "4.0.0",
1919
"fs-extra": "9.1.0",
2020
"lodash": "^4.17.21",

packages/network/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"@cypress/parse-domain": "2.4.0",
1818
"bluebird": "3.5.3",
1919
"concat-stream": "1.6.2",
20-
"debug": "^4.3.2",
20+
"debug": "^4.3.4",
2121
"fs-extra": "9.1.0",
2222
"lodash": "^4.17.21",
2323
"minimatch": "3.0.5",

packages/packherd-require/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
},
1818
"dependencies": {
1919
"convert-source-map": "^1.7.0",
20-
"debug": "^4.3.1",
20+
"debug": "^4.3.4",
2121
"source-map-js": "^0.6.2"
2222
},
2323
"devDependencies": {

packages/proxy/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"chalk": "2.4.2",
1919
"charset": "1.0.1",
2020
"common-tags": "1.8.0",
21-
"debug": "^4.3.2",
21+
"debug": "^4.3.4",
2222
"grapheme-splitter": "1.0.4",
2323
"iconv-lite": "0.6.2",
2424
"lodash": "^4.17.19",

packages/rewriter/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"bluebird": "3.7.2",
1717
"chai": "4.2.0",
1818
"chai-as-promised": "7.1.1",
19-
"debug": "^4.3.2",
19+
"debug": "^4.3.4",
2020
"lodash": "^4.17.19",
2121
"parse5-html-rewriting-stream": "5.1.1",
2222
"recast": "0.20.4"

packages/scaffold-config/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
},
1616
"dependencies": {
1717
"compare-versions": "4.1.3",
18-
"debug": "^4.3.2",
18+
"debug": "^4.3.4",
1919
"fs-extra": "^9.1.0",
2020
"globby": "^11.0.1"
2121
},

packages/server/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
"cors": "2.8.5",
5555
"data-uri-to-buffer": "2.0.1",
5656
"dayjs": "^1.9.3",
57-
"debug": "^4.3.2",
57+
"debug": "^4.3.4",
5858
"dirt-simple-file-cache": "^0.4.0",
5959
"duplexify": "4.1.1",
6060
"electron-context-menu": "3.1.1",

packages/ts/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"lint": "eslint --ext .js,.jsx,.ts,.tsx,.json, ."
1313
},
1414
"dependencies": {
15-
"debug": "^4.3.2",
15+
"debug": "^4.3.4",
1616
"ts-node": "^10.9.1",
1717
"tslib": "2.3.1",
1818
"typescript-cached-transpile": "^0.0.6"

packages/v8-snapshot-require/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
},
1818
"dependencies": {
1919
"@packages/packherd-require": "0.0.0-development",
20-
"debug": "^4.1.1",
20+
"debug": "^4.3.4",
2121
"source-map-js": "^0.6.2"
2222
},
2323
"devDependencies": {

system-tests/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
"cookie-parser": "1.4.5",
5050
"cors": "2.8.5",
5151
"dayjs": "^1.9.3",
52-
"debug": "^4.3.2",
52+
"debug": "^4.3.4",
5353
"dockerode": "3.3.1",
5454
"execa": "4",
5555
"express": "4.17.3",

system-tests/projects/module-api/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"@bahmutov/all-paths": "1.0.2",
1212
"chdir-promise": "0.6.2",
1313
"check-more-types": "2.24.0",
14-
"debug": "4.3.3",
14+
"debug": "4.3.4",
1515
"lazy-ass": "1.6.0",
1616
"mocha": "9.2.0",
1717
"mocha-banner": "1.1.2",

system-tests/projects/module-api/yarn.lock

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,13 @@ [email protected]:
207207
dependencies:
208208
ms "2.1.2"
209209

210+
211+
version "4.3.4"
212+
resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
213+
integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
214+
dependencies:
215+
ms "2.1.2"
216+
210217
decamelize@^4.0.0:
211218
version "4.0.0"
212219
resolved "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz#aa472d7bf660eb15f3494efd531cab7f2a709837"

tooling/electron-mksnapshot/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
},
1919
"dependencies": {
2020
"@electron/get": "^1.12.4",
21-
"debug": "^4.3.1",
21+
"debug": "^4.3.4",
2222
"extract-zip": "^2.0.1",
2323
"fs-extra": "^10.0.0",
2424
"temp-dir": "^2.0.0"

tooling/packherd/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"watch": "tsc --watch"
1717
},
1818
"dependencies": {
19-
"debug": "^4.3.1",
19+
"debug": "^4.3.4",
2020
"esbuild": "^0.15.3"
2121
},
2222
"devDependencies": {

tooling/v8-snapshot/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"@tooling/packherd": "0.0.0-development",
2222
"ansi-colors": "^4.1.1",
2323
"convert-source-map": "^1.8.0",
24-
"debug": "^4.1.1",
24+
"debug": "^4.3.4",
2525
"resolve-from": "^5.0.0",
2626
"source-map-js": "^0.6.2",
2727
"temp-dir": "^2.0.0",

yarn.lock

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6166,12 +6166,7 @@
61666166
resolved "https://registry.yarnpkg.com/@types/crypto-js/-/crypto-js-4.1.1.tgz#602859584cecc91894eb23a4892f38cfa927890d"
61676167
integrity sha512-BG7fQKZ689HIoc5h+6D2Dgq1fABRa0RbBWKBd9SP/MVRVXROflpm5fhwyATX5duFmbStzyzyycPB8qUYKDH3NA==
61686168

6169-
6170-
version "4.1.5"
6171-
resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.5.tgz#b14efa8852b7768d898906613c23f688713e02cd"
6172-
integrity sha512-Q1y515GcOdTHgagaVFhHnIFQ38ygs/kmxdNpvpou+raI9UO3YZcHDngBSYKQklcKlvA7iuQlmIKbzvmxcOE9CQ==
6173-
6174-
"@types/debug@^4.1.6":
6169+
"@types/[email protected]", "@types/debug@^4.1.6":
61756170
version "4.1.7"
61766171
resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.7.tgz#7cc0ea761509124709b8b2d1090d8f6c17aadb82"
61776172
integrity sha512-9AonUzyTjXXhEOa0DnqpzZi6VHlqKMswga9EXjpXnnqxwLtdvPPtlO8evrI5D9S6asFRCQ6v+wpiUKbw+vKqyg==

0 commit comments

Comments
 (0)