Skip to content

Commit

Permalink
Merge branch '10.0-release' into tgriesser/chore/e2e-data-clean
Browse files Browse the repository at this point in the history
* 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
  ...
  • Loading branch information
tgriesser committed Nov 21, 2021
2 parents 55e6401 + 92aa22a commit e83512f
Show file tree
Hide file tree
Showing 310 changed files with 10,183 additions and 5,436 deletions.
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ system-tests/projects/e2e/cypress/integration/typescript_syntax_error_spec.ts

# cli/types is linted by tslint/dtslint
cli/types

# packages/example is not linted (think about changing this)
packages/example

Expand Down
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,16 @@ cypress.zip
Cached Theme.pak
Cached Theme Material Design.pak

# from config, compiled .js files
packages/config/lib/*.js

# from data-context, compiled .js files
packages/data-context/src/**/*.js

# from desktop-gui
packages/desktop-gui/cypress/videos
packages/desktop-gui/src/jsconfig.json


# from driver
packages/driver/cypress/videos
packages/driver/cypress/screenshots
Expand Down
2 changes: 1 addition & 1 deletion .node-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
14.17.0
16.5.0
7 changes: 6 additions & 1 deletion .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
{
// To see these extensions in VS Code:
// 1. Open the Command Palette (Ctrl+Shift+P)
// 1. Open the Command Palette:
// - Non-Mac Users: (Ctrl+Shift+P)
// - Mac Users: (Cmd+Shift+P)
// 2. Select "Extensions: Show Recommended Extensions"

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

// List of extensions which are recommended for Cypress contributors using VS Code:
"recommendations": [
// Name: Apollo GraphQL
// Description: Rich editor support for GraphQL client and server development that seamlessly integrates with the Apollo platform
"apollographql.vscode-apollo",
// Name: ESLint
// Description: Integrates ESLint JavaScript into VS Code.
"dbaeumer.vscode-eslint",
Expand Down
4 changes: 0 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -327,10 +327,6 @@ The project utilizes [yarn workspaces](https://yarnpkg.com/lang/en/docs/workspac
> **⚠ Running on Windows?**
>
> 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:
> ```bash
> yarn config set script-shell "C:\\Program Files (x86)\\git\\bin\\bash.exe"
> ```
> Git Bash may be installed in `Program Files`, if so, use the following command:
>```bash
> yarn config set script-shell "C:\\Program Files\\git\\bin\\bash.exe"
>```
Expand Down
9 changes: 5 additions & 4 deletions __snapshots__/packages-spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,19 @@ exports['packages can copy files from package.json 1'] = {
"tmp": {
"packages": {
"coffee": {
"package.json": "{\"main\":\"src/main.js\", \"name\": \"foo\", \"files\": [\"lib\"]}",
"lib": {
"foo.js": "{}"
},
"src": {
"main.js": "console.log()"
},
"lib": {
"foo.js": "{}"
}
"package.json": "{\n \"main\": \"src/main.js\",\n \"name\": \"foo\",\n \"files\": [\n \"lib\"\n ]\n}\n"
}
}
}
}


exports['transformRequires can find and replace symlink requires 1'] = {
"[cwd]": {
"build": {
Expand Down
9 changes: 0 additions & 9 deletions __snapshots__/upload-spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,12 @@ exports['test runner manifest'] = {
"mac": {
"url": "https://cdn.cypress.io/desktop/3.3.0/darwin-x64/cypress.zip"
},
"win": {
"url": "https://cdn.cypress.io/desktop/3.3.0/win32-ia32/cypress.zip"
},
"linux64": {
"url": "https://cdn.cypress.io/desktop/3.3.0/linux-x64/cypress.zip"
},
"darwin": {
"url": "https://cdn.cypress.io/desktop/3.3.0/darwin-x64/cypress.zip"
},
"win32": {
"url": "https://cdn.cypress.io/desktop/3.3.0/win32-ia32/cypress.zip"
},
"linux": {
"url": "https://cdn.cypress.io/desktop/3.3.0/linux-x64/cypress.zip"
},
Expand All @@ -26,9 +20,6 @@ exports['test runner manifest'] = {
"linux-x64": {
"url": "https://cdn.cypress.io/desktop/3.3.0/linux-x64/cypress.zip"
},
"win32-ia32": {
"url": "https://cdn.cypress.io/desktop/3.3.0/win32-ia32/cypress.zip"
},
"win32-x64": {
"url": "https://cdn.cypress.io/desktop/3.3.0/win32-x64/cypress.zip"
}
Expand Down
4 changes: 0 additions & 4 deletions __snapshots__/util-upload-spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,6 @@ exports['upload util isValidPlatformArch checks given strings second 1'] = {
"given": "linux-x64",
"expect": true
},
{
"given": "win32-ia32",
"expect": true
},
{
"given": "win32-x64",
"expect": true
Expand Down
6 changes: 3 additions & 3 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,14 @@ branches:
only:
- master
- develop
- fix-test-other-projects
- windows-code-signing
- 9.0-release
- /win*/

# https://www.appveyor.com/docs/lang/nodejs-iojs/
environment:
# use matching version of Node.js
nodejs_version: "14.17.0"
nodejs_version: "16.5.0"
# encode secure variables which will NOT be used
# in pull requests
# https://www.appveyor.com/docs/build-configuration/#secure-variables
Expand Down Expand Up @@ -38,7 +39,6 @@ environment:

platform:
- x64
- x86

# https://www.appveyor.com/docs/build-cache/
# hmm, seems there is NPM on windows problem
Expand Down
4 changes: 2 additions & 2 deletions browser-versions.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"chrome:beta": "96.0.4664.27",
"chrome:stable": "95.0.4638.69"
"chrome:beta": "96.0.4664.45",
"chrome:stable": "96.0.4664.45"
}
Loading

0 comments on commit e83512f

Please sign in to comment.