mirror of
https://github.com/cypress-io/cypress.git
synced 2026-03-13 21:00:48 -05:00
chore: merging in from develop into 10.0-release (#19148)
This commit is contained in:
Jessica Sachs
21
.vscode/cspell.json
vendored
Normal file
21
.vscode/cspell.json
vendored
Normal file
@@ -0,0 +1,21 @@
|
||||
{
|
||||
"version": "0.2",
|
||||
"ignorePaths": [],
|
||||
"dictionaryDefinitions": [],
|
||||
"dictionaries": [],
|
||||
"words": [
|
||||
"Iconify",
|
||||
"Lachlan",
|
||||
"msapplication",
|
||||
"Pinia",
|
||||
"Screenshotting",
|
||||
"shiki",
|
||||
"testid",
|
||||
"unplugin",
|
||||
"vite",
|
||||
"vitejs",
|
||||
"vueuse"
|
||||
],
|
||||
"ignoreWords": [],
|
||||
"import": []
|
||||
}
|
||||
95
.vscode/extensions.json
vendored
95
.vscode/extensions.json
vendored
@@ -1,43 +1,88 @@
|
||||
{
|
||||
// To see these extensions in VS Code:
|
||||
// 1. Open the Command Palette:
|
||||
// - Non-Mac Users: (Ctrl+Shift+P)
|
||||
// - Mac Users: (Cmd+Shift+P)
|
||||
// - 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
|
||||
// -----------------------------
|
||||
// Critical Extensions
|
||||
// -----------------------------
|
||||
// If you do not have these, you will experience a significantly degraded DX.
|
||||
// You may also be committing incorrectly formatted code.
|
||||
|
||||
// Name: ESLint
|
||||
// Description: Integrates ESLint JavaScript into VS Code.
|
||||
"dbaeumer.vscode-eslint",
|
||||
// Name: GitHub linker
|
||||
// Description: Create links to fragments of code in GitHub
|
||||
"gimenete.github-linker",
|
||||
// Name: GitLens — Git supercharged
|
||||
// Description: Supercharge the Git capabilities built into Visual Studio Code — Visualize code authorship at a glance via Git blame annotations and code lens, seamlessly navigate and explore Git repositories, gain valuable insights via powerful comparison commands, and so much more
|
||||
"eamodio.gitlens",
|
||||
// Name: Terminals Manager
|
||||
"dbaeumer.vscode-eslint",
|
||||
|
||||
// Name: Apollo GraphQL
|
||||
// Description: Adds syntax highlighting for all gql tags.
|
||||
"apollographql.vscode-apollo",
|
||||
|
||||
// Name: WindiCSS Intellisense
|
||||
// Description: Automatically sorts your WindiCSS classes.
|
||||
"voorjaar.windicss-intellisense",
|
||||
|
||||
// Name: Volar
|
||||
// Description: Language server for Vue. Required for any syntax highlighting in Vue files.
|
||||
"johnsoncodehk.volar",
|
||||
|
||||
// Name: Code Spell Checker
|
||||
// Description: Add spell-checking help to your code.
|
||||
"streetsidesoftware.code-spell-checker",
|
||||
|
||||
// -----------------------------
|
||||
// Recommended Extensions
|
||||
// -----------------------------
|
||||
|
||||
// Name: i18n-ally
|
||||
// Description: Preview and edit any hardcoded strings directly in your source code.
|
||||
"lokalise.i18n-ally",
|
||||
|
||||
// Name: Iconify Intellisense
|
||||
// Description: Preview shortcodes as SVG Icons for common libraries like Font Awesome.
|
||||
"antfu.iconify",
|
||||
|
||||
// Name: Excalidraw Schema Editor
|
||||
// Description: Read and write *.excalidraw files.
|
||||
"pomdtr.excalidraw-editor",
|
||||
|
||||
// Name: Test Utils
|
||||
// Description: Add, remove, and move .only in tests
|
||||
"chrisbreiding.test-utils",
|
||||
|
||||
// Name: Terminals Manager
|
||||
// Description: An extension for setting-up multiple terminals at once, or just running some commands
|
||||
// There are several Terminals defined in `.vscode/terminals.json` that can be used via this plugin.
|
||||
"fabiospampinato.vscode-terminals",
|
||||
// Name: Test Utils
|
||||
// Description: Add, remove, and move .only in tests
|
||||
"chrisbreiding.test-utils",
|
||||
// Name: Toggle Quotes
|
||||
"fabiospampinato.vscode-terminals",
|
||||
|
||||
// Name: GitHub linker
|
||||
// Description: Create links to fragments of code in GitHub
|
||||
"gimenete.github-linker",
|
||||
|
||||
// Name: GitLens — Git supercharged
|
||||
// Description: Supercharge the Git capabilities built into Visual Studio Code — Visualize code authorship at a glance via Git blame annotations and code lens, seamlessly navigate and explore Git repositories, gain valuable insights via powerful comparison commands, and so much more
|
||||
"eamodio.gitlens",
|
||||
|
||||
// Name: Toggle Quotes
|
||||
// Description: Toggle cycle " -> ' -> `
|
||||
"britesnow.vscode-toggle-quotes",
|
||||
// Name: Volar
|
||||
// Description: Adds proper typescript support for Vue
|
||||
"johnsoncodehk.volar"
|
||||
],
|
||||
|
||||
// Name: Gremlins tracker for Visual Studio Code
|
||||
// Description: When you paste from Slack, Figma, or Google Docs, you'll get stylized quotes.
|
||||
// This extension reveals some characters that can be harmful because they are invisible or otherwise non-obvious.
|
||||
"nhoizey.gremlins"
|
||||
],
|
||||
|
||||
// List of extensions recommended by VS Code that should not be recommended for Cypress contributors using VS Code:
|
||||
"unwantedRecommendations": [
|
||||
|
||||
// Name: Vetur
|
||||
// Description: Vue syntax highlighting and language support.
|
||||
// Vetur used to be recommended but has now been replaced by Volar.
|
||||
// Volar and Vetur conflict, so Vetur should be turned off.
|
||||
"octref.vetur"
|
||||
]
|
||||
}
|
||||
|
||||
20
.vscode/settings.json
vendored
20
.vscode/settings.json
vendored
@@ -21,5 +21,21 @@
|
||||
"editor.codeActionsOnSave": {
|
||||
"source.fixAll.eslint": true
|
||||
},
|
||||
"typescript.tsdk": "node_modules/typescript/lib"
|
||||
}
|
||||
"typescript.tsdk": "node_modules/typescript/lib",
|
||||
|
||||
// A flag that controls whether or not Windi CSS classes will be sorted on save on save.
|
||||
"windicss.sortOnSave": true,
|
||||
|
||||
// Support autocompletion and preview of strings.
|
||||
// Additionally, support extraction of hardcoded strings into key-values.
|
||||
"i18n-ally.localesPaths": "packages/frontend-shared/src/locales",
|
||||
"i18n-ally.displayLanguage": "en-US",
|
||||
"i18n-ally.enabledFrameworks": ["vue"],
|
||||
"i18n-ally.extract.keyPrefix": "{fileNameWithoutExt}.",
|
||||
"i18n-ally.extract.keyMaxLength": 40,
|
||||
"i18n-ally.keystyle": "nested",
|
||||
|
||||
// Volar is the main extension that powers Vue's language features.
|
||||
"volar.autoCompleteRefs": false,
|
||||
"volar.takeOverMode.enabled": true
|
||||
}
|
||||
|
||||
@@ -135,8 +135,8 @@ When an issue is opened in [cypress](https://github.com/cypress-io/cypress), we
|
||||
Some opened issues are questions, not bug reports or feature requests. Issues are reserved for potential bugs or feature requests *only*. If this is the case, you should:
|
||||
|
||||
- Explain that issues in our GitHub repo are reserved for potential bugs or feature requests and that the issue will be closed since it appears to be neither a bug nor a feature request.
|
||||
- Guide them to existing resources where their questions can be asked like our [Discussions](https://github.com/cypress-io/cypress/discussions), [community chat](https://on.cypress.io/chat), [Discord](https://on.cypress.io/discord),, or [Stack Overflow](https://stackoverflow.com/questions/tagged/cypress).
|
||||
- Cypress offers support via email when signing up for any of our our [paid plans](https://www.cypress.io/pricing/), so remind them that this is an option if they already have a paid account.
|
||||
- Guide them to existing resources where their questions can be asked like our [Discussions](https://github.com/cypress-io/cypress/discussions), [community chat](https://on.cypress.io/chat), [Discord](https://on.cypress.io/discord), or [Stack Overflow](https://stackoverflow.com/questions/tagged/cypress).
|
||||
- Cypress offers support via email when signing up for any of our [paid plans](https://www.cypress.io/pricing/), so remind them that this is an option if they already have a paid account.
|
||||
- Move the issue to [Discussions](https://github.com/cypress-io/cypress/discussions).
|
||||
|
||||
### Does this issue belong in this repository?
|
||||
@@ -219,7 +219,7 @@ The best way to determine the validity of a bug is to recreate it yourself. Foll
|
||||
If you can recreate the bug you should:
|
||||
|
||||
- Thank them for their contribution.
|
||||
- Explain that you're' able to recreate the bug. Provide the exact test code ran and the versions of Cypress, OS, and browser you used to recreate it.
|
||||
- Explain that you're able to recreate the bug. Provide the exact test code ran and the versions of Cypress, OS, and browser you used to recreate it.
|
||||
- If you know where the code is that could possibly fix this issue - link to the file or line of code from the [cypress](https://github.com/cypress-io/cypress) repo and remind the user that we are open source and that we gladly accept PRs, even if they are a work in progress.
|
||||
- Add the `stage: ready for work` label to the issue.
|
||||
|
||||
|
||||
@@ -10,6 +10,7 @@ macBuildFilters: &macBuildFilters
|
||||
- develop
|
||||
- 10.0-release
|
||||
- tgriesser/chore/fix-release
|
||||
- renovate/cypress-request-2.x
|
||||
|
||||
defaults: &defaults
|
||||
parallelism: 1
|
||||
@@ -1640,7 +1641,7 @@ jobs:
|
||||
- run:
|
||||
name: Check current branch to persist artifacts
|
||||
command: |
|
||||
if [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "10.0-release" ]]; then
|
||||
if [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "10.0-release" && "$CIRCLE_BRANCH" != "renovate/cypress-request-2.x" ]]; then
|
||||
echo "Not uploading artifacts or posting install comment for this branch."
|
||||
circleci-agent step halt
|
||||
fi
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
"unit": "cross-env BLUEBIRD_DEBUG=1 NODE_ENV=test mocha --reporter mocha-multi-reporters --reporter-options configFile=../mocha-reporter-config.json"
|
||||
},
|
||||
"dependencies": {
|
||||
"@cypress/request": "^2.88.7",
|
||||
"@cypress/request": "^2.88.10",
|
||||
"@cypress/xvfb": "^1.2.4",
|
||||
"@types/node": "^14.14.31",
|
||||
"@types/sinonjs__fake-timers": "^6.0.2",
|
||||
|
||||
@@ -78,7 +78,7 @@
|
||||
"@cypress/env-or-json-file": "2.0.0",
|
||||
"@cypress/github-commit-status-check": "1.5.0",
|
||||
"@cypress/questions-remain": "1.0.1",
|
||||
"@cypress/request": "2.88.7",
|
||||
"@cypress/request": "2.88.10",
|
||||
"@cypress/request-promise": "4.2.6",
|
||||
"@fellow/eslint-plugin-coffee": "0.4.13",
|
||||
"@graphql-codegen/add": "3.1.0",
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
},
|
||||
"devDependencies": {
|
||||
"@cypress/debugging-proxy": "2.0.1",
|
||||
"@cypress/request": "2.88.7",
|
||||
"@cypress/request": "2.88.10",
|
||||
"@cypress/request-promise": "4.2.6",
|
||||
"@packages/network": "0.0.0-development",
|
||||
"@packages/ts": "0.0.0-development",
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
},
|
||||
"devDependencies": {
|
||||
"@cypress/debugging-proxy": "2.0.1",
|
||||
"@cypress/request": "2.88.7",
|
||||
"@cypress/request": "2.88.10",
|
||||
"@cypress/request-promise": "4.2.6",
|
||||
"@packages/https-proxy": "0.0.0-development",
|
||||
"@packages/socket": "0.0.0-development",
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
"utf8-stream": "0.0.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@cypress/request": "2.88.7",
|
||||
"@cypress/request": "2.88.10",
|
||||
"@cypress/request-promise": "4.2.6",
|
||||
"@cypress/sinon-chai": "2.9.1",
|
||||
"@packages/resolve-dist": "0.0.0-development",
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
"@cypress/get-windows-proxy": "1.6.2",
|
||||
"@cypress/icons": "0.7.0",
|
||||
"@cypress/mocha-teamcity-reporter": "1.0.0",
|
||||
"@cypress/request": "2.88.7",
|
||||
"@cypress/request": "2.88.10",
|
||||
"@cypress/request-promise": "4.2.6",
|
||||
"@cypress/webpack-batteries-included-preprocessor": "0.0.0-development",
|
||||
"@cypress/webpack-preprocessor": "0.0.0-development",
|
||||
|
||||
@@ -690,7 +690,6 @@ const systemTests = {
|
||||
} else {
|
||||
this.servers = null
|
||||
}
|
||||
|
||||
// const s = options.settings
|
||||
|
||||
// if (s) {
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
"@cypress/commit-info": "2.2.0",
|
||||
"@cypress/debugging-proxy": "2.0.1",
|
||||
"@cypress/json-schemas": "5.39.0",
|
||||
"@cypress/request": "2.88.7",
|
||||
"@cypress/request": "2.88.10",
|
||||
"@cypress/request-promise": "4.2.6",
|
||||
"@cypress/sinon-chai": "2.9.1",
|
||||
"@cypress/webpack-preprocessor": "0.0.0-development",
|
||||
|
||||
37
yarn.lock
37
yarn.lock
@@ -2457,10 +2457,10 @@
|
||||
stealthy-require "^1.1.1"
|
||||
tough-cookie "^2.3.3"
|
||||
|
||||
"@cypress/request@2.88.7", "@cypress/request@^2.88.7":
|
||||
version "2.88.7"
|
||||
resolved "https://registry.npmjs.org/@cypress/request/-/request-2.88.7.tgz#386d960ab845a96953723348088525d5a75aaac4"
|
||||
integrity sha512-FTULIP2rnDJvZDT9t6B4nSfYR40ue19tVmv3wUcY05R9/FPCoMl1nAPJkzWzBCo7ltVn5ThQTbxiMoGBN7k0ig==
|
||||
"@cypress/request@2.88.10", "@cypress/request@^2.88.10":
|
||||
version "2.88.10"
|
||||
resolved "https://registry.npmjs.org/@cypress/request/-/request-2.88.10.tgz#b66d76b07f860d3a4b8d7a0604d020c662752cce"
|
||||
integrity sha512-Zp7F+R93N0yZyG34GutyTNr+okam7s/Fzc1+i3kcqOP8vk6OuajuE9qZJ6Rs+10/1JFtXFYMdyarnU1rZuJesg==
|
||||
dependencies:
|
||||
aws-sign2 "~0.7.0"
|
||||
aws4 "^1.8.0"
|
||||
@@ -2469,8 +2469,7 @@
|
||||
extend "~3.0.2"
|
||||
forever-agent "~0.6.1"
|
||||
form-data "~2.3.2"
|
||||
har-validator "~5.1.3"
|
||||
http-signature "~1.2.0"
|
||||
http-signature "~1.3.6"
|
||||
is-typedarray "~1.0.0"
|
||||
isstream "~0.1.2"
|
||||
json-stringify-safe "~5.0.1"
|
||||
@@ -23568,6 +23567,15 @@ http-signature@~1.2.0:
|
||||
jsprim "^1.2.2"
|
||||
sshpk "^1.7.0"
|
||||
|
||||
http-signature@~1.3.6:
|
||||
version "1.3.6"
|
||||
resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.3.6.tgz#cb6fbfdf86d1c974f343be94e87f7fc128662cf9"
|
||||
integrity sha512-3adrsD6zqo4GsTqtO7FyrejHNv+NgiIfAfv68+jVlFmSr9OGy7zrxONceFRLKvnnZA5jbxQBX1u9PpB6Wi32Gw==
|
||||
dependencies:
|
||||
assert-plus "^1.0.0"
|
||||
jsprim "^2.0.2"
|
||||
sshpk "^1.14.1"
|
||||
|
||||
http2-wrapper@^1.0.0-beta.4.4, http2-wrapper@^1.0.0-beta.5.0:
|
||||
version "1.0.3"
|
||||
resolved "https://registry.yarnpkg.com/http2-wrapper/-/http2-wrapper-1.0.3.tgz#b8f55e0c1f25d4ebd08b3b0c2c079f9590800b3d"
|
||||
@@ -26328,6 +26336,11 @@ json-schema@0.2.3:
|
||||
resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
|
||||
integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=
|
||||
|
||||
json-schema@0.4.0:
|
||||
version "0.4.0"
|
||||
resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.4.0.tgz#f7de4cf6efab838ebaeb3236474cbba5a1930ab5"
|
||||
integrity sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==
|
||||
|
||||
json-stable-stringify-without-jsonify@^1.0.1:
|
||||
version "1.0.1"
|
||||
resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
|
||||
@@ -26513,6 +26526,16 @@ jsprim@^1.2.2:
|
||||
json-schema "0.2.3"
|
||||
verror "1.10.0"
|
||||
|
||||
jsprim@^2.0.2:
|
||||
version "2.0.2"
|
||||
resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-2.0.2.tgz#77ca23dbcd4135cd364800d22ff82c2185803d4d"
|
||||
integrity sha512-gqXddjPqQ6G40VdnI6T6yObEC+pDNvyP95wdQhkWkg7crHH3km5qP1FsOXEkzEQwnz6gz5qGTn1c2Y52wP3OyQ==
|
||||
dependencies:
|
||||
assert-plus "1.0.0"
|
||||
extsprintf "1.3.0"
|
||||
json-schema "0.4.0"
|
||||
verror "1.10.0"
|
||||
|
||||
jss-plugin-camel-case@^10.5.1:
|
||||
version "10.5.1"
|
||||
resolved "https://registry.yarnpkg.com/jss-plugin-camel-case/-/jss-plugin-camel-case-10.5.1.tgz#427b24a9951b4c2eaa7e3d5267acd2e00b0934f9"
|
||||
@@ -38118,7 +38141,7 @@ ssestream@1.0.1:
|
||||
resolved "https://registry.yarnpkg.com/ssestream/-/ssestream-1.0.1.tgz#351551b12c00e91e7550f38d558323f3f47b54c2"
|
||||
integrity sha1-NRVRsSwA6R51UPONVYMj8/R7VMI=
|
||||
|
||||
sshpk@^1.7.0:
|
||||
sshpk@^1.14.1, sshpk@^1.7.0:
|
||||
version "1.16.1"
|
||||
resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877"
|
||||
integrity sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==
|
||||
|
||||
Reference in New Issue
Block a user