Skip to content

Commit e83512f

Browse files
tgriessertgriesser
committed
Merge branch '10.0-release' into tgriesser/chore/e2e-data-clean
* 10.0-release: (56 commits) chore: post-merge cleanup feat: use hoisted yarn install in binary build (#17285) fix: fix spec list header, "Create specs" prompt, add workspace recommended apollo extension (#18993) feat(unify): reporter settings (#18946) feat: add devServer to config file (#18962) fix: compile npm packages for node 12 (#18989) fix: show call count even if `cy.stub().log(false)`. (#18907) chore: Update TypeScript to 4.4.4 (#18930) fix: wrap playground selectors in double quotes if not included (#18442) fix: flaky settings_spec test (#18979) chore: Update Chrome (stable) to 96.0.4664.45 (#18931) fix: Loading of specs with % in the filename (#18877) chore: refactor `create` into class `$Cy` (#18715) chore: Update Chrome (beta) to 96.0.4664.45 (#18891) fix: flaky `system-tests-firefox` job (#18848) chore: release @cypress/webpack-preprocessor-v5.10.0 chore: release @cypress/vue-v3.0.5 chore: release @cypress/schematic-v1.6.0 chore: release create-cypress-tests-v1.2.0 release 9.0.0 ...
2 parents 55e6401 + 92aa22a commit e83512f

File tree

310 files changed

+10183
-5436
lines changed

Some content is hidden

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

310 files changed

+10183
-5436
lines changed

‎.eslintignore

+1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ system-tests/projects/e2e/cypress/integration/typescript_syntax_error_spec.ts
3434

3535
# cli/types is linted by tslint/dtslint
3636
cli/types
37+
3738
# packages/example is not linted (think about changing this)
3839
packages/example
3940

‎.gitignore

+3-1
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,16 @@ cypress.zip
1313
Cached Theme.pak
1414
Cached Theme Material Design.pak
1515

16+
# from config, compiled .js files
17+
packages/config/lib/*.js
18+
1619
# from data-context, compiled .js files
1720
packages/data-context/src/**/*.js
1821

1922
# from desktop-gui
2023
packages/desktop-gui/cypress/videos
2124
packages/desktop-gui/src/jsconfig.json
2225

23-
2426
# from driver
2527
packages/driver/cypress/videos
2628
packages/driver/cypress/screenshots

‎.node-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
14.17.0
1+
16.5.0

‎.vscode/extensions.json

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
11
{
22
// To see these extensions in VS Code:
3-
// 1. Open the Command Palette (Ctrl+Shift+P)
3+
// 1. Open the Command Palette:
4+
// - Non-Mac Users: (Ctrl+Shift+P)
5+
// - Mac Users: (Cmd+Shift+P)
46
// 2. Select "Extensions: Show Recommended Extensions"
57

68
// See https://go.microsoft.com/fwlink/?LinkId=827846 to learn about workspace recommendations.
79

810
// List of extensions which are recommended for Cypress contributors using VS Code:
911
"recommendations": [
12+
// Name: Apollo GraphQL
13+
// Description: Rich editor support for GraphQL client and server development that seamlessly integrates with the Apollo platform
14+
"apollographql.vscode-apollo",
1015
// Name: ESLint
1116
// Description: Integrates ESLint JavaScript into VS Code.
1217
"dbaeumer.vscode-eslint",

‎CONTRIBUTING.md

-4
Original file line numberDiff line numberDiff line change
@@ -327,10 +327,6 @@ The project utilizes [yarn workspaces](https://yarnpkg.com/lang/en/docs/workspac
327327
> **⚠ Running on Windows?**
328328
>
329329
> Many of the NPM scripts used during development use commands designed for a Linux-like shell.If you are running a Windows operating system, you may encounter many commands that are not working. To fix this behavior, you have to set a Linux-like shell as the default `npm` script shell. If you have Git for Windows installed, you can set Git Bash as the default script shell by using the following command:
330-
> ```bash
331-
> yarn config set script-shell "C:\\Program Files (x86)\\git\\bin\\bash.exe"
332-
> ```
333-
> Git Bash may be installed in `Program Files`, if so, use the following command:
334330
>```bash
335331
> yarn config set script-shell "C:\\Program Files\\git\\bin\\bash.exe"
336332
>```

‎__snapshots__/packages-spec.js

+5-4
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,19 @@ exports['packages can copy files from package.json 1'] = {
1515
"tmp": {
1616
"packages": {
1717
"coffee": {
18-
"package.json": "{\"main\":\"src/main.js\", \"name\": \"foo\", \"files\": [\"lib\"]}",
18+
"lib": {
19+
"foo.js": "{}"
20+
},
1921
"src": {
2022
"main.js": "console.log()"
2123
},
22-
"lib": {
23-
"foo.js": "{}"
24-
}
24+
"package.json": "{\n \"main\": \"src/main.js\",\n \"name\": \"foo\",\n \"files\": [\n \"lib\"\n ]\n}\n"
2525
}
2626
}
2727
}
2828
}
2929

30+
3031
exports['transformRequires can find and replace symlink requires 1'] = {
3132
"[cwd]": {
3233
"build": {

‎__snapshots__/upload-spec.js

-9
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,12 @@ exports['test runner manifest'] = {
55
"mac": {
66
"url": "https://cdn.cypress.io/desktop/3.3.0/darwin-x64/cypress.zip"
77
},
8-
"win": {
9-
"url": "https://cdn.cypress.io/desktop/3.3.0/win32-ia32/cypress.zip"
10-
},
118
"linux64": {
129
"url": "https://cdn.cypress.io/desktop/3.3.0/linux-x64/cypress.zip"
1310
},
1411
"darwin": {
1512
"url": "https://cdn.cypress.io/desktop/3.3.0/darwin-x64/cypress.zip"
1613
},
17-
"win32": {
18-
"url": "https://cdn.cypress.io/desktop/3.3.0/win32-ia32/cypress.zip"
19-
},
2014
"linux": {
2115
"url": "https://cdn.cypress.io/desktop/3.3.0/linux-x64/cypress.zip"
2216
},
@@ -26,9 +20,6 @@ exports['test runner manifest'] = {
2620
"linux-x64": {
2721
"url": "https://cdn.cypress.io/desktop/3.3.0/linux-x64/cypress.zip"
2822
},
29-
"win32-ia32": {
30-
"url": "https://cdn.cypress.io/desktop/3.3.0/win32-ia32/cypress.zip"
31-
},
3223
"win32-x64": {
3324
"url": "https://cdn.cypress.io/desktop/3.3.0/win32-x64/cypress.zip"
3425
}

‎__snapshots__/util-upload-spec.js

-4
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@ exports['upload util isValidPlatformArch checks given strings second 1'] = {
99
"given": "linux-x64",
1010
"expect": true
1111
},
12-
{
13-
"given": "win32-ia32",
14-
"expect": true
15-
},
1612
{
1713
"given": "win32-x64",
1814
"expect": true

‎appveyor.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@ branches:
22
only:
33
- master
44
- develop
5-
- fix-test-other-projects
5+
- windows-code-signing
6+
- 9.0-release
67
- /win*/
78

89
# https://www.appveyor.com/docs/lang/nodejs-iojs/
910
environment:
1011
# use matching version of Node.js
11-
nodejs_version: "14.17.0"
12+
nodejs_version: "16.5.0"
1213
# encode secure variables which will NOT be used
1314
# in pull requests
1415
# https://www.appveyor.com/docs/build-configuration/#secure-variables
@@ -38,7 +39,6 @@ environment:
3839

3940
platform:
4041
- x64
41-
- x86
4242

4343
# https://www.appveyor.com/docs/build-cache/
4444
# hmm, seems there is NPM on windows problem

‎browser-versions.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
2-
"chrome:beta": "96.0.4664.27",
3-
"chrome:stable": "95.0.4638.69"
2+
"chrome:beta": "96.0.4664.45",
3+
"chrome:stable": "96.0.4664.45"
44
}

0 commit comments

Comments
 (0)