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: develop
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: eslint-stylistic-import
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.

Commits on Jan 14, 2025

  1. remove eslint-plugin-dev

    cacieprins committed Jan 14, 2025

    Verified

    This commit was signed with the committer’s verified signature.
    cacieprins Cacie Prins
    Copy the full SHA
    228246c View commit details
  2. Verified

    This commit was signed with the committer’s verified signature.
    cacieprins Cacie Prins
    Copy the full SHA
    7f3c67e View commit details
  3. Verified

    This commit was signed with the committer’s verified signature.
    cacieprins Cacie Prins
    Copy the full SHA
    920e1c7 View commit details
  4. use new eslint for cli

    cacieprins committed Jan 14, 2025

    Verified

    This commit was signed with the committer’s verified signature.
    cacieprins Cacie Prins
    Copy the full SHA
    00f1243 View commit details
  5. npm/angular linting

    cacieprins committed Jan 14, 2025

    Verified

    This commit was signed with the committer’s verified signature.
    cacieprins Cacie Prins
    Copy the full SHA
    7c30ac8 View commit details
  6. cypress-schematic eslint

    cacieprins committed Jan 14, 2025

    Verified

    This commit was signed with the committer’s verified signature.
    cacieprins Cacie Prins
    Copy the full SHA
    0a7039b View commit details
  7. eslint for npm/grep

    cacieprins committed Jan 14, 2025

    Verified

    This commit was signed with the committer’s verified signature.
    cacieprins Cacie Prins
    Copy the full SHA
    3f44b01 View commit details
  8. npm/mount-utils

    cacieprins committed Jan 14, 2025

    Verified

    This commit was signed with the committer’s verified signature.
    cacieprins Cacie Prins
    Copy the full SHA
    6d821ab View commit details
  9. npm/puppeteer

    cacieprins committed Jan 14, 2025

    Verified

    This commit was signed with the committer’s verified signature.
    cacieprins Cacie Prins
    Copy the full SHA
    57a038d View commit details
  10. some global cfg

    cacieprins committed Jan 14, 2025

    Verified

    This commit was signed with the committer’s verified signature.
    cacieprins Cacie Prins
    Copy the full SHA
    32ebb37 View commit details
  11. npm/react

    cacieprins committed Jan 14, 2025

    Verified

    This commit was signed with the committer’s verified signature.
    cacieprins Cacie Prins
    Copy the full SHA
    ed49878 View commit details
  12. npm/svelte

    cacieprins committed Jan 14, 2025

    Verified

    This commit was signed with the committer’s verified signature.
    cacieprins Cacie Prins
    Copy the full SHA
    0749dbe View commit details
  13. npm/vite-dev-server

    cacieprins committed Jan 14, 2025

    Verified

    This commit was signed with the committer’s verified signature.
    cacieprins Cacie Prins
    Copy the full SHA
    4c15d08 View commit details
  14. Verified

    This commit was signed with the committer’s verified signature.
    cacieprins Cacie Prins
    Copy the full SHA
    9433e5d View commit details
  15. Verified

    This commit was signed with the committer’s verified signature.
    cacieprins Cacie Prins
    Copy the full SHA
    fe99b9f View commit details
  16. npm/vue

    cacieprins committed Jan 14, 2025

    Verified

    This commit was signed with the committer’s verified signature.
    cacieprins Cacie Prins
    Copy the full SHA
    d9c2439 View commit details
  17. Verified

    This commit was signed with the committer’s verified signature.
    cacieprins Cacie Prins
    Copy the full SHA
    5205963 View commit details
  18. npm/webpack-dev-server

    cacieprins committed Jan 14, 2025

    Verified

    This commit was signed with the committer’s verified signature.
    cacieprins Cacie Prins
    Copy the full SHA
    5be93e7 View commit details
  19. npm/webpack-preprocessor

    cacieprins committed Jan 14, 2025

    Verified

    This commit was signed with the committer’s verified signature.
    cacieprins Cacie Prins
    Copy the full SHA
    1b1862a View commit details
  20. Verified

    This commit was signed with the committer’s verified signature.
    cacieprins Cacie Prins
    Copy the full SHA
    7ce76db View commit details
  21. npm/angular with styles

    cacieprins committed Jan 14, 2025

    Verified

    This commit was signed with the committer’s verified signature.
    cacieprins Cacie Prins
    Copy the full SHA
    2ac9889 View commit details
  22. Verified

    This commit was signed with the committer’s verified signature.
    cacieprins Cacie Prins
    Copy the full SHA
    53d7cab View commit details
  23. npm/grep stylistic

    cacieprins committed Jan 14, 2025

    Verified

    This commit was signed with the committer’s verified signature.
    cacieprins Cacie Prins
    Copy the full SHA
    8c866c1 View commit details
  24. npm/mount-utils stylistic

    cacieprins committed Jan 14, 2025

    Verified

    This commit was signed with the committer’s verified signature.
    cacieprins Cacie Prins
    Copy the full SHA
    d4d0637 View commit details
  25. npm/puppeteer stylistic

    cacieprins committed Jan 14, 2025

    Verified

    This commit was signed with the committer’s verified signature.
    cacieprins Cacie Prins
    Copy the full SHA
    77f38fc View commit details
  26. npm/react stylistic

    cacieprins committed Jan 14, 2025

    Verified

    This commit was signed with the committer’s verified signature.
    cacieprins Cacie Prins
    Copy the full SHA
    c62768e View commit details
  27. npm/svelte stylistic

    cacieprins committed Jan 14, 2025

    Verified

    This commit was signed with the committer’s verified signature.
    cacieprins Cacie Prins
    Copy the full SHA
    fb74c93 View commit details
  28. Verified

    This commit was signed with the committer’s verified signature.
    cacieprins Cacie Prins
    Copy the full SHA
    a0ea82b View commit details
  29. Verified

    This commit was signed with the committer’s verified signature.
    cacieprins Cacie Prins
    Copy the full SHA
    c34babc View commit details
  30. Verified

    This commit was signed with the committer’s verified signature.
    cacieprins Cacie Prins
    Copy the full SHA
    58a38ac View commit details
  31. npm/vue stylistic

    cacieprins committed Jan 14, 2025

    Verified

    This commit was signed with the committer’s verified signature.
    cacieprins Cacie Prins
    Copy the full SHA
    816ba0d View commit details
  32. Verified

    This commit was signed with the committer’s verified signature.
    cacieprins Cacie Prins
    Copy the full SHA
    124ad49 View commit details
  33. Verified

    This commit was signed with the committer’s verified signature.
    cacieprins Cacie Prins
    Copy the full SHA
    3cb0c44 View commit details
  34. Verified

    This commit was signed with the committer’s verified signature.
    cacieprins Cacie Prins
    Copy the full SHA
    9d84f3d View commit details
  35. cli stylistic

    cacieprins committed Jan 14, 2025

    Verified

    This commit was signed with the committer’s verified signature.
    cacieprins Cacie Prins
    Copy the full SHA
    27797d0 View commit details
  36. new linting for packages/app

    cacieprins committed Jan 14, 2025

    Verified

    This commit was signed with the committer’s verified signature.
    cacieprins Cacie Prins
    Copy the full SHA
    d7bac78 View commit details

Commits on Jan 15, 2025

  1. Verified

    This commit was signed with the committer’s verified signature.
    cacieprins Cacie Prins
    Copy the full SHA
    6434772 View commit details
  2. Verified

    This commit was signed with the committer’s verified signature.
    cacieprins Cacie Prins
    Copy the full SHA
    eed56c0 View commit details
  3. Verified

    This commit was signed with the committer’s verified signature.
    cacieprins Cacie Prins
    Copy the full SHA
    d035fa9 View commit details
  4. Verified

    This commit was signed with the committer’s verified signature.
    cacieprins Cacie Prins
    Copy the full SHA
    8ba5ccb View commit details
  5. eslint for packages/driver

    cacieprins committed Jan 15, 2025

    Verified

    This commit was signed with the committer’s verified signature.
    cacieprins Cacie Prins
    Copy the full SHA
    b664d1b View commit details
  6. eslint cleanup general

    cacieprins committed Jan 15, 2025

    Verified

    This commit was signed with the committer’s verified signature.
    cacieprins Cacie Prins
    Copy the full SHA
    007aae2 View commit details
  7. packages/electron

    cacieprins committed Jan 15, 2025

    Verified

    This commit was signed with the committer’s verified signature.
    cacieprins Cacie Prins
    Copy the full SHA
    85be136 View commit details
  8. packages/errors

    cacieprins committed Jan 15, 2025

    Verified

    This commit was signed with the committer’s verified signature.
    cacieprins Cacie Prins
    Copy the full SHA
    e2ed779 View commit details
  9. packages/example

    cacieprins committed Jan 15, 2025

    Verified

    This commit was signed with the committer’s verified signature.
    cacieprins Cacie Prins
    Copy the full SHA
    abf276f View commit details
  10. rm

    cacieprins committed Jan 15, 2025

    Verified

    This commit was signed with the committer’s verified signature.
    cacieprins Cacie Prins
    Copy the full SHA
    45184c0 View commit details
  11. packages/extension

    cacieprins committed Jan 15, 2025

    Verified

    This commit was signed with the committer’s verified signature.
    cacieprins Cacie Prins
    Copy the full SHA
    93fb014 View commit details
  12. Verified

    This commit was signed with the committer’s verified signature.
    cacieprins Cacie Prins
    Copy the full SHA
    2869f9a View commit details
  13. Verified

    This commit was signed with the committer’s verified signature.
    cacieprins Cacie Prins
    Copy the full SHA
    df20017 View commit details
  14. Verified

    This commit was signed with the committer’s verified signature.
    cacieprins Cacie Prins
    Copy the full SHA
    77b113e View commit details
Showing 569 changed files with 4,299 additions and 5,119 deletions.
16 changes: 0 additions & 16 deletions .circleci/workflows.yml
Original file line number Diff line number Diff line change
@@ -2452,14 +2452,6 @@ jobs:
path: npm/grep/test_results
- store-npm-logs

npm-eslint-plugin-dev:
<<: *defaults
steps:
- restore_cached_workspace
- run:
name: Run tests
command: yarn workspace @cypress/eslint-plugin-dev test

npm-cypress-schematic:
<<: *defaults
steps:
@@ -3176,9 +3168,6 @@ linux-x64-workflow: &linux-x64-workflow
- npm-mount-utils:
requires:
- build
- npm-eslint-plugin-dev:
requires:
- build
- npm-cypress-schematic:
requires:
- build
@@ -3191,7 +3180,6 @@ linux-x64-workflow: &linux-x64-workflow
requires:
- check-ts
- npm-angular
- npm-eslint-plugin-dev
- npm-puppeteer-unit-tests
- npm-puppeteer-cypress-tests
- npm-react
@@ -3572,9 +3560,6 @@ linux-x64-contributor-workflow: &linux-x64-contributor-workflow
- npm-mount-utils:
requires:
- build
- npm-eslint-plugin-dev:
requires:
- build
- npm-cypress-schematic:
requires:
- build
@@ -3586,7 +3571,6 @@ linux-x64-contributor-workflow: &linux-x64-contributor-workflow
requires:
- check-ts
- npm-angular
- npm-eslint-plugin-dev
- npm-puppeteer-unit-tests
- npm-puppeteer-cypress-tests
- npm-react
109 changes: 0 additions & 109 deletions .eslintrc.js

This file was deleted.

6 changes: 5 additions & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
**/*

/.nx/cache
/.nx/workspace-data
/.nx/workspace-data

!**/*.json
**/package.json
**/package-lock.json
10 changes: 1 addition & 9 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -8,16 +8,8 @@
"json"
],
"eslint.enable": true,
// this project does not use Prettier
// thus set all settings to disable accidentally running Prettier
// this project only uses Prettier for json files
"prettier.requireConfig": true,
"prettier.disableLanguages": [
"javascript",
"javascriptreact",
"typescript",
"typescriptreact",
"json"
],
"editor.codeActionsOnSave": {
"source.fixAll.eslint": "explicit"
},
9 changes: 6 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -182,7 +182,6 @@ Here is a list of the npm packages in this repository:
| Folder Name | Package Name | Purpose |
| :----------------------------------------------------- | :--------------------------------- | :--------------------------------------------------------------------------- |
| [angular](./npm/angular) | `@cypress/angular` | Cypress component testing for Angular. |
| [eslint-plugin-dev](./npm/eslint-plugin-dev) | `@cypress/eslint-plugin-dev` | Eslint plugin for internal development. |
| [grep](./npm/grep) | `@cypress/grep` | Filter tests using substring |
| [mount-utils](./npm/mount-utils) | `@cypress/mount-utils` | Common functionality for Vue/React/Angular adapters. |
| [react](./npm/react) | `@cypress/react` | Cypress component testing for React. |
@@ -341,8 +340,12 @@ Many Cypress packages print out debugging information to console via the `debug`

### Coding Style

We use [eslint](https://eslint.org/) to lint all JavaScript code and follow rules specified in
[@cypress/eslint-plugin-dev](./npm/eslint-plugin-dev) plugin.
Cypress uses [eslint](https://eslint.org/) to lint all JavaScript code. All packages should import the `baseConfig` from the root `eslint.config.ts`. The only overrides in package-specific `eslint.config.ts` files should be regarding:
- Which files get processed
- Which globals are expected for selections of files
- Downgrading inherited rules from `error` to `warn`, if they cannot be `--fix`ed.

Package-specific `eslint.config.ts` configurations should *never* turn inherited rules off. This is to ensure repository-wide linting standards. If a rule is inappropriately applied to a package or its files, there is likely a better solution than turning the rule off.

This project uses a Git pre-commit hook to lint staged files before committing. See the [`lint-staged` project](https://github.com/okonet/lint-staged) for details.
`lint-staged` will try to auto-fix any lint errors with `eslint --fix`, so if it fails, you must manually fix the lint errors before committing.
7 changes: 2 additions & 5 deletions autobarrel.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
{
"prefix": "/* eslint-disable padding-line-between-statements */",
"paths": [
"packages/graphql/src/**/*",
"packages/data-context/src/**/*"
],
"paths": ["packages/graphql/src/**/*", "packages/data-context/src/**/*"],
"ignore": [
"packages/data-context/src/gen",
"packages/graphql/src/stitching",
"packages/graphql/src/testing",
"packages/graphql/src/gen"
]
}
}
16 changes: 0 additions & 16 deletions cli/.eslintignore

This file was deleted.

19 changes: 0 additions & 19 deletions cli/.eslintrc.json

This file was deleted.

40 changes: 40 additions & 0 deletions cli/eslint.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
import path from 'path'
import { defaultConfig, globals } from '../eslint.config'

export default [
...defaultConfig,
{
files: ['**/*.{ts,js}'],
languageOptions: {
parserOptions: {
projectService: true,
tsconfigRootDir: path.join(__dirname, '../packages/ts/tsconfig.json'),
},
globals: {
...globals.node,
},
},
},
{
ignores: [
'__snapshots__/**/*',
'angular/**/*',
'build/**/*',
'mount-utils/**/*',
'node_modules/**/*',
'react/**/*',
'svelte/**/*',
'vue/**/*',
'types/**/*',
],
},
{
files: ['test/**/*.{ts,js}'],
languageOptions: {
globals: {
sinon: 'readonly',
lib: 'readonly',
},
},
},
]
3 changes: 1 addition & 2 deletions cli/lib/util.js
Original file line number Diff line number Diff line change
@@ -467,7 +467,7 @@ const util = {

async function _getRealArch () {
const osPlatform = os.platform()
// eslint-disable-next-line no-restricted-syntax

const osArch = os.arch()

debug('detecting arch %o', { osPlatform, osArch })
@@ -492,7 +492,6 @@ const util = {
if (['aarch64_be', 'aarch64', 'armv8b', 'armv8l'].includes(stdout)) return 'arm64'
}

// eslint-disable-next-line no-restricted-syntax
const pkgArch = arch()

if (pkgArch === 'x86') return 'ia32'
Loading