Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: cypress-io/cypress
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v9.7.0
Choose a base ref
...
head repository: cypress-io/cypress
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v10.0.0
Choose a head ref
Loading
Showing 4,988 changed files with 458,438 additions and 235,403 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
61 changes: 55 additions & 6 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@
**/build
**/cypress/fixtures
**/dist
**/dist-test
**/dist-*
**/node_modules
**/support/fixtures/*
!**/support/fixtures/projects
@@ -22,11 +22,14 @@ system-tests/projects/**/static/*
system-tests/projects/**/*.jsx
system-tests/projects/**/fail.js
system-tests/lib/scaffold/plugins/index.js
system-tests/lib/scaffold/support/index.js
system-tests/lib/scaffold/support/e2e.js
system-tests/lib/scaffold/support/component.js
system-tests/lib/scaffold/support/commands.js
system-tests/test/support/projects/e2e/cypress/
system-tests/projects/e2e/cypress/integration/stdout_exit_early_failing_spec.js
system-tests/projects/e2e/cypress/integration/typescript_syntax_error_spec.ts
system-tests/projects/e2e/cypress/e2e/stdout_exit_early_failing.cy.js
system-tests/projects/e2e/cypress/e2e/typescript_syntax_error.cy.ts
system-tests/projects/config-with-ts-syntax-error/**
system-tests/projects/config-with-ts-module-error/**


**/test/fixtures
@@ -35,14 +38,20 @@ system-tests/projects/e2e/cypress/integration/typescript_syntax_error_spec.ts
# cli/types is linted by tslint/dtslint
cli/types

# cli/react, cli/vue, and cli/mount-utils are all copied from dist'd builds
cli/react
cli/vue
cli/vue2
cli/mount-utils

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

packages/extension/test/helpers/background.js
integration/stdout_exit_early_failing_spec.js
e2e/stdout_exit_early_failing_spec.js

npm/webpack-preprocessor/cypress/tests/e2e/compile-error.js
npm/webpack-preprocessor/examples/use-babelrc/cypress/integration/spec.js
npm/webpack-preprocessor/examples/use-babelrc/cypress/e2e/spec.cy.js

npm/cypress-schematic/src/**/*.js

@@ -60,3 +69,43 @@ npm/cypress-schematic/src/**/*.js
**/.next/**
/npm/create-cypress-tests/initial-template
/npm/create-cypress-tests/**/*.template.*

# The global eslint configuration is not set up to parse vue@2 files
/npm/vue2/**/*.vue

packages/data-context/test/unit/codegen/files
packages/config/test/__fixtures__/**/*
packages/config/test/__babel_fixtures__/**/*

# community templates we test against, no need to lint
system-tests/projects/cra-4/**/*
system-tests/projects/cra-5/**/*
system-tests/projects/cra-ejected/**/*
system-tests/projects/create-react-app-configured/**/*
system-tests/projects/create-react-app-unconfigured/**/*
system-tests/projects/create-react-app-custom-index-html

system-tests/projects/vueclivue2-unconfigured/**/*
system-tests/projects/vueclivue2-configured/**/*

system-tests/projects/vueclivue3-unconfigured/**/*
system-tests/projects/vueclivue3-configured/**/*
system-tests/projects/vueclivue3-custom-index-html

system-tests/projects/vuecli5vue3-unconfigured/**/*
system-tests/projects/vuecli5vue3-configured/**/*

system-tests/projects/vue3-vite-ts-unconfigured/**/*
system-tests/projects/vue3-vite-ts-configured/**/*
system-tests/projects/vue3-vite-ts-custom-index-html

system-tests/projects/nextjs-unconfigured/**/*
system-tests/projects/nextjs-configured/**/*

system-tests/projects/nuxtjs-vue2-unconfigured/**/*
system-tests/projects/nuxtjs-vue2-configured/**/*

system-tests/projects/react-app-webpack-5-unconfigured/**/*

system-tests/project-fixtures/**
system-tests/projects/**/*/expected-cypress*/**/*
71 changes: 71 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
const fs = require('fs')
const path = require('path')
const { specifiedRules } = require('graphql')

const graphqlOpts = {
env: 'literal',
tagName: 'gql',
schemaString: fs.readFileSync(
path.join(__dirname, 'packages/graphql/schemas/schema.graphql'),
'utf8',
),
}

const validators = specifiedRules
.map((rule) => rule.name)
.filter(
(ruleName) => {
return [
'NoUnusedFragmentsRule',
'KnownFragmentNamesRule',
'NoUnusedVariablesRule',
].findIndex((x) => x === ruleName) === -1
},
)

module.exports = {
plugins: [
'@cypress/dev',
'graphql',
],
extends: [
'plugin:@cypress/dev/general',
'plugin:@cypress/dev/tests',
],
parser: '@typescript-eslint/parser',
rules: {
'no-duplicate-imports': 'off',
'import/no-duplicates': 'off',
'@typescript-eslint/no-duplicate-imports': [
'error',
],
'prefer-spread': 'off',
'prefer-rest-params': 'off',
'no-useless-constructor': 'off',
'no-restricted-properties': [
'error',
{
object: 'process',
property: 'geteuid',
message: 'process.geteuid() will throw on Windows. Do not use it unless you catch any potential errors.',
},
{
object: 'os',
property: 'userInfo',
message: 'os.userInfo() will throw when there is not an `/etc/passwd` entry for the current user (like when running with --user 12345 in Docker). Do not use it unless you catch any potential errors.',
},
],
'graphql/capitalized-type-name': ['warn', graphqlOpts],
'graphql/no-deprecated-fields': ['error', graphqlOpts],
'graphql/template-strings': ['error', { ...graphqlOpts, validators }],
'graphql/required-fields': [
'error',
{ ...graphqlOpts, requiredFields: ['id'] },
],
},
settings: {
react: {
version: '16.8',
},
},
}
32 changes: 0 additions & 32 deletions .eslintrc.json

This file was deleted.

3 changes: 2 additions & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -13,7 +13,6 @@
/npm/angular @cypress-io/component-testing
/npm/create-cypress-tests @cypress-io/component-testing
/npm/cypress-schematic @cypress-io/component-testing
/npm/design-system @cypress-io/component-testing
/npm/eslint-plugin-dev @cypress-io/end-to-end @cypress-io/component-testing
/npm/mount-utils @cypress-io/component-testing
/npm/react @cypress-io/component-testing
@@ -34,6 +33,8 @@
/packages/net-stubbing/ @cypress-io/end-to-end
/packages/network/ @cypress-io/end-to-end
/packages/proxy/ @cypress-io/end-to-end
/packages/data-context/ @tgriesser
/packages/graphql/ @tgriesser
/packages/reporter/ @cypress-io/end-to-end
/packages/resolve-dist/ @cypress-io/end-to-end
/packages/rewriter/ @cypress-io/end-to-end
7 changes: 6 additions & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -20,6 +20,12 @@ If the change is not user-facing, write "n/a".
- Any implementation details to explain?
-->

### Steps to test
<!--
For non-trivial behavior changes, list the steps that a reviewer should follow to validate the new behavior.
This is not meant to be the only testing performed by a reviewer, just the "happy path" that leads to the new behavior.
-->

### How has the user experience changed?
<!-- Provide before and after examples of the change.
Screenshots or GIFs are preferred. -->
@@ -35,4 +41,3 @@ DO NOT DELETE the PR checklist.
- [ ] Has the original issue (or this PR, if no issue exists) been tagged with a release in ZenHub? (user-facing changes only)
- [ ] Has a PR for user-facing changes been opened in [`cypress-documentation`](https://github.com/cypress-io/cypress-documentation)? <!-- Link to PR here -->
- [ ] Have API changes been updated in the [`type definitions`](https://github.com/cypress-io/cypress/blob/develop/cli/types/cypress.d.ts)?
- [ ] Have new configuration options been added to the [`cypress.schema.json`](https://github.com/cypress-io/cypress/blob/develop/cli/schema/cypress.schema.json)?
20 changes: 9 additions & 11 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -9,22 +9,18 @@ _test-output
cypress.zip
.babel-cache

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

# from extension
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
packages/errors/src/**/*.js
packages/errors/test/**/*.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
@@ -72,16 +68,15 @@ packages/socket/lib/*.js
system-tests/.projects
system-tests/.http-mitm-proxy
system-tests/fixtures/large-img
system-tests/lib/fixtureDirs.ts

# from npm/react
/npm/react/bin/*
/npm/react/cypress/videos
/npm/react/.babel-cache

# from npm/design-system
/npm/design-system/bin/*
/npm/design-system/cypress/videos
/npm/design-system/.babel-cache
# from npm/webpack-dev-server
/npm/webpack-dev-server/cypress/videos

# from runner-ct
/packages/runner-ct/cypress/screenshots
@@ -94,6 +89,8 @@ system-tests/fixtures/large-img
# graphql, auto-generated
/packages/launchpad/src/generated
/packages/app/src/generated
/packages/frontend-shared/src/generated
/packages/frontend-shared/cypress/e2e/support/e2eProjectDirs.ts

# from npm/create-cypress-tests
/npm/create-cypress-tests/initial-template
@@ -103,6 +100,7 @@ system-tests/fixtures/large-img
scripts/support
binary-url.json

# Allows us to dynamically create eslint rules that override the default for Decaffeinate scripts
cli/visual-snapshots

# Created by https://www.gitignore.io/api/osx,git,node,windows,intellij,linux
1 change: 1 addition & 0 deletions .releaserc.base.js
Original file line number Diff line number Diff line change
@@ -15,5 +15,6 @@ module.exports = {
],
extends: 'semantic-release-monorepo',
branches: [
'master',
],
}
7 changes: 6 additions & 1 deletion .vscode/cspell.json
Original file line number Diff line number Diff line change
@@ -7,6 +7,7 @@
"Chainable",
"composables",
"ERRORED",
"execa",
"forcedefault",
"Iconify",
"Lachlan",
@@ -15,17 +16,21 @@
"OVERLIMIT",
"Pinia",
"pnpm",
"pseudoclass",
"revparse",
"Screenshotting",
"shiki",
"testid",
"TIMEDOUT",
"unconfigured",
"unplugin",
"unrunnable",
"unstaged",
"urql",
"vite",
"vitejs",
"vueuse"
"vueuse",
"Windi"
],
"ignoreWords": [],
"import": []
35 changes: 21 additions & 14 deletions .vscode/terminals.json
Original file line number Diff line number Diff line change
@@ -39,6 +39,27 @@
"cwd": "[cwd]/system-tests",
"command": "yarn test [fileBasename]"
},
{
"name": "packages/app cypress open",
"focus": true,
"onlySingle": true,
"cwd": "[cwd]/packages/app",
"command": "yarn cypress:open"
},
{
"name": "packages/app dev",
"focus": true,
"onlySingle": true,
"cwd": "[cwd]/packages/app",
"command": "yarn dev"
},
{
"name": "packages/app watch",
"focus": true,
"onlySingle": true,
"cwd": "[cwd]",
"command": "yarn watch"
},
{
"name": "packages/server test-watch",
"focus": true,
@@ -75,20 +96,6 @@
"onlySingle": true,
"cwd": "[cwd]/packages/driver",
"command": "yarn cypress:open"
},
{
"name": "packages/desktop-gui cypress open",
"focus": true,
"onlySingle": true,
"cwd": "[cwd]/packages/desktop-gui",
"command": "yarn cypress:open"
},
{
"name": "packages/desktop-gui watch",
"focus": true,
"onlySingle": true,
"cwd": "[cwd]/packages/desktop-gui",
"command": "yarn watch"
}
]
}
Loading