Skip to content

Commit fab3f25

Browse files
committed
Merge branch '10.0-release' into tgriesser/refactor/fix-makeLegacyContext
* 10.0-release: (45 commits) fix: various Nav Bar fixes (#19283) build: add patch package as a dev dependency for fe-shared chore: hoist is - fun with cached dependencies build: hoist is hard build: better hoisting strategy fix: remove windows and mac workflow from branch revert: remove change about node version 17 build: remove testing of desktop-gui assets build: run window & mac CI in this branch build: more fixes build: remove toycode mdi from launchpad rename patch because of dev dep build: fix merge issue in packages generation chore: update sass for windows compatibility fix: Do not crash when a ill formed URL request is proxied (#19274) fix: remove desktop-gui from circle.yml change whitepace in patch fix: adding timeout option to writeFile command (#19015) release 9.1.1 fix: patch-package is not applied in dist'ed build (#19239) ...
2 parents 5705320 + aa7b05d commit fab3f25

File tree

94 files changed

+1412
-1557
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+1412
-1557
lines changed

.gitattributes

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
* text=auto
2+
3+
*.json text eol=lf

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -649,7 +649,7 @@ Below are some guidelines Cypress uses when reviewing dependency updates.
649649

650650
## Deployment
651651

652-
We will try to review and merge pull requests quickly. If you want to know our build process or build your own Cypress binary, read [DEPLOY.md](./DEPLOY.md).
652+
We will try to review and merge pull requests quickly. If you want to know our build process or build your own Cypress binary, read [the "Release Process" guide](./guides/release-process.md).
653653

654654
Independent packages are deployed immediately upon being merged into master. You can read more [above](#independent-packages-ci-workflow).
655655

__snapshots__/bump-spec.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
exports['list of all projects'] = [
22
{
33
"repo": "cypress-io/cypress-test-tiny",
4-
"provider": "appVeyor",
4+
"provider": "circle",
55
"platform": "win32"
66
},
77
{
88
"repo": "cypress-io/cypress-test-example-repos",
9-
"provider": "appVeyor",
9+
"provider": "circle",
1010
"platform": "win32"
1111
},
1212
{

__snapshots__/packages-spec.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ exports['packages can copy files from package.json 1'] = {
2727
}
2828
}
2929

30-
3130
exports['transformRequires can find and replace symlink requires 1'] = {
3231
"[cwd]": {
3332
"build": {

appveyor.yml

Lines changed: 0 additions & 105 deletions
This file was deleted.

0 commit comments

Comments
 (0)