Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into use-m1-runners
Browse files Browse the repository at this point in the history
  • Loading branch information
flotwig committed Jun 7, 2022
2 parents 6d42218 + e5c1f91 commit ee18309
Show file tree
Hide file tree
Showing 5,262 changed files with 504,040 additions and 264,141 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
Expand Up @@ -6,7 +6,7 @@
**/build
**/cypress/fixtures
**/dist
**/dist-test
**/dist-*
**/node_modules
**/support/fixtures/*
!**/support/fixtures/projects
Expand All @@ -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
Expand All @@ -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

Expand All @@ -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.

34 changes: 30 additions & 4 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,30 +1,56 @@
# Each line is a file pattern followed by one or more owners.

# End-to-end team are owners of code within root packages concerning e2e, cli, and other utils
# End-to-end team are owners of code within root packages concerning e2e testing, cli, and other utils
# Component-testing team are owners of code within packages concerning component testing

/.github/ @cypress-io/end-to-end
/browser-versions.json @cypress-io/end-to-end
/browser-versions.json @cypress-io/end-to-end @cypress-io/component-testing

/cli/ @cypress-io/end-to-end
/packages/coffee/ @cypress-io/end-to-end
/packages/datetime-utils/ @cypress-io/end-to-end

/guides/ @cypress-io/end-to-end

/npm/angular @cypress-io/component-testing
/npm/create-cypress-tests @cypress-io/component-testing
/npm/cypress-schematic @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
/npm/vue @cypress-io/component-testing
/npm/webpack-batteries-included-preprocessor @cypress-io/end-to-end @cypress-io/component-testing
/npm/webpack-dev-server @cypress-io/component-testing
/npm/webpack-preprocessor @cypress-io/end-to-end @cypress-io/component-testing

/packages/config/ @cypress-io/end-to-end
/packages/desktop-gui/ @cypress-io/end-to-end
/packages/driver/ @cypress-io/end-to-end
/packages/electron/ @cypress-io/end-to-end
/packages/errors/ @cypress-io/end-to-end @cypress-io/component-testing
/packages/example/ @cypress-io/end-to-end
/packages/extension/ @cypress-io/end-to-end
/packages/https-proxy/ @cypress-io/end-to-end
/packages/launcher/ @cypress-io/end-to-end
/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
/packages/root/ @cypress-io/end-to-end
/packages/runner/ @cypress-io/end-to-end
/packages/runner-ct/ @cypress-io/component-testing
/packages/runner-shared/ @cypress-io/end-to-end
/packages/server/ @cypress-io/end-to-end
/packages/socket/ @cypress-io/end-to-end
/packages/static/ @cypress-io/end-to-end
/packages/ts/ @cypress-io/end-to-end
/packages/ui-components/ @cypress-io/end-to-end
/packages/web-config/ @cypress-io/end-to-end

/patches/ @cypress-io/end-to-end

/scripts/ @cypress-io/end-to-end

/system-tests/ @cypress-io/end-to-end @cypress-io/component-testing
7 changes: 6 additions & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -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. -->
Expand All @@ -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)?
21 changes: 8 additions & 13 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -94,18 +89,18 @@ 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
/npm/create-cypress-tests/src/test-output

# Building app binary
scripts/support
package-lock.json
binary-url.json

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

# Created by https://www.gitignore.io/api/osx,git,node,windows,intellij,linux
Expand Down
2 changes: 1 addition & 1 deletion .node-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16.5.0
16.13.2
1 change: 1 addition & 0 deletions .releaserc.base.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,6 @@ module.exports = {
],
extends: 'semantic-release-monorepo',
branches: [
'master',
],
}
18 changes: 17 additions & 1 deletion .vscode/cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,33 @@
"dictionaryDefinitions": [],
"dictionaries": [],
"words": [
"Chainable",
"composables",
"ERRORED",
"execa",
"forcedefault",
"Iconify",
"Lachlan",
"msapplication",
"NOTESTS",
"OVERLIMIT",
"Pinia",
"pnpm",
"pseudoclass",
"revparse",
"Screenshotting",
"shiki",
"testid",
"TIMEDOUT",
"unconfigured",
"unplugin",
"unrunnable",
"unstaged",
"urql",
"vite",
"vitejs",
"vueuse"
"vueuse",
"Windi"
],
"ignoreWords": [],
"import": []
Expand Down
Loading

3 comments on commit ee18309

@cypress-bot
Copy link
Contributor

@cypress-bot cypress-bot bot commented on ee18309 Jun 7, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Circle has built the linux x64 version of the Test Runner.

Learn more about this pre-release platform-specific build at https://on.cypress.io/installing-cypress#Install-pre-release-version.

Run this command to install the pre-release locally:

npm install https://cdn.cypress.io/beta/npm/10.1.0/linux-x64/use-m1-runners-ee18309214d94daeab16909b6d4ea0833c947dae/cypress.tgz

@cypress-bot
Copy link
Contributor

@cypress-bot cypress-bot bot commented on ee18309 Jun 7, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Circle has built the darwin x64 version of the Test Runner.

Learn more about this pre-release platform-specific build at https://on.cypress.io/installing-cypress#Install-pre-release-version.

Run this command to install the pre-release locally:

npm install https://cdn.cypress.io/beta/npm/10.1.0/darwin-x64/use-m1-runners-ee18309214d94daeab16909b6d4ea0833c947dae/cypress.tgz

@cypress-bot
Copy link
Contributor

@cypress-bot cypress-bot bot commented on ee18309 Jun 7, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Circle has built the win32 x64 version of the Test Runner.

Learn more about this pre-release platform-specific build at https://on.cypress.io/installing-cypress#Install-pre-release-version.

Run this command to install the pre-release locally:

npm install https://cdn.cypress.io/beta/npm/10.1.0/win32-x64/use-m1-runners-ee18309214d94daeab16909b6d4ea0833c947dae/cypress.tgz

Please sign in to comment.