Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: resolve merge conflicts with develop #26921

Merged
merged 25 commits into from
Jun 2, 2023
Merged

chore: resolve merge conflicts with develop #26921

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
6a56c39
chore: add Nx Cloud (#26712)
jordanpowell88 May 18, 2023
a0efc77
feat: update git related messages for runs and debug (#26758)
jordanpowell88 May 19, 2023
eef8cd2
chore: rename video processing events to capture/compress (#26800)
AtofStryker May 19, 2023
f524670
chore: rename upload results to upload screenshots & videos (#26811)
AtofStryker May 22, 2023
6df7a70
chore: capture versions of relevant dependencies with `x-dependencies…
astone123 May 22, 2023
80985c8
chore: update changlelog script to handle revert pr ref (#26801)
emilyrohrbough May 22, 2023
e821f85
fix: Correct typescript scaffold dependency (#26815)
dkasper-was-taken May 22, 2023
32796de
chore: 12.13.0 prep (#26833)
chrisbreiding May 23, 2023
b71788d
chore: 12.13.0 release (#26834)
chrisbreiding May 23, 2023
3df65f7
chore: release @cypress/vite-plugin-cypress-esm-v1.0.1
semantic-release-bot May 23, 2023
58b9ccc
chore: Implement runSpec mutation (#26782)
mike-plummer May 24, 2023
7d06057
chore: replace gitter badge with discord on readme (#26771)
elylucas May 24, 2023
b1f699a
chore: add GraphQL mutation for sending system notifications via Elec…
astone123 May 24, 2023
d91177a
fix: upgrade typescript from 4.7.4 to 4.9.5 (#26826)
snyk-bot May 24, 2023
850973e
test: fix 2 broken tests for Windows (#26854)
warrensplayer May 25, 2023
0cf11fe
Update stale_issues_and_pr_cleanup.yml
May 26, 2023
d34a148
chore(dep): [Snyk] Upgrade vite from 2.9.13 to 2.9.15 (#26830)
snyk-bot May 26, 2023
acc4d5f
Update triage_add_to_project.yml
May 30, 2023
bafabf9
chore: fix minor background color styling in debug results component …
astone123 May 31, 2023
0af6936
Update stale_issues_and_pr_cleanup.yml
Jun 1, 2023
7ef4300
chore: Deprecate @cypress/xpath package (#26893)
jennifer-shehane Jun 1, 2023
3d1ec09
chore: add telemetry realworld app (#26896)
mjhenkes Jun 1, 2023
f3f8f8c
chore(deps): update dependency find-process to v1.4.7 🌟 (#26906)
renovate[bot] Jun 1, 2023
770d262
chore(deps): update dependency firefox-profile to v4.3.2 🌟 (#26912)
renovate[bot] Jun 1, 2023
f02def6
Merge branch 'develop' into matth/chore/resolve-merge-conflicts-with-…
mjhenkes Jun 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions cli/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,25 @@
<!-- See the ../guides/writing-the-cypress-changelog.md for details on writing the changelog. -->
## 12.13.0
## 12.13.1

_Released 05/23/2023_
_Released 06/06/2023 (PENDING)_

**Features:**
**Dependency Updates:**

- Adds Git-related messages for the [Runs page](https://docs.cypress.io/guides/core-concepts/cypress-app#Runs) and [Debug page](https://docs.cypress.io/guides/cloud/runs#Debug) when users aren't using Git or there are no recorded runs for the current branch. Fixes [#26680](https://github.com/cypress-io/cypress/issues/26680).
- Upgraded [`find-process`](https://www.npmjs.com/package/find-process) from `1.4.1` to `1.4.7` to address this [Synk](https://security.snyk.io/vuln/SNYK-JS-FINDPROCESS-1090284) security vulnerability. Addressed in [#26631](https://github.com/cypress-io/cypress/pull/26906).
- Upgraded [`firefox-profile`](https://www.npmjs.com/package/firefox-profile) from `4.0.0` to `4.3.2` to address security vulnerabilities within sub-dependencies. Addressed in [#26631](https://github.com/cypress-io/cypress/pull/26912).

**Features:**

- Adds a new cloud api that confirms the uploads of artifacts. Addressed in [#26421](https://github.com/cypress-io/cypress/pull/26421).

## 12.13.0

_Released 05/23/2023_

**Features:**

- Adds Git-related messages for the [Runs page](https://docs.cypress.io/guides/core-concepts/cypress-app#Runs) and [Debug page](https://docs.cypress.io/guides/cloud/runs#Debug) when users aren't using Git or there are no recorded runs for the current branch. Fixes [#26680](https://github.com/cypress-io/cypress/issues/26680).

**Bugfixes:**

- Reverted [#26452](https://github.com/cypress-io/cypress/pull/26452) which introduced a bug that prevents users from using End to End with Yarn 3. Fixed in [#26735](https://github.com/cypress-io/cypress/pull/26735). Fixes [#26676](https://github.com/cypress-io/cypress/issues/26676).
Expand Down
4 changes: 2 additions & 2 deletions packages/server/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@
"evil-dns": "0.2.0",
"execa": "1.0.0",
"express": "4.17.3",
"find-process": "1.4.1",
"firefox-profile": "4.0.0",
"find-process": "1.4.7",
"firefox-profile": "4.3.2",
"fluent-ffmpeg": "2.1.2",
"fs-extra": "9.1.0",
"get-port": "5.1.1",
Expand Down
Loading