mirror/cypress
1
0
Fork 0
mirror of https://github.com/cypress-io/cypress.git synced 2026-05-08 07:50:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into release/13.0.0

Browse Source
This commit is contained in:
Matt Henkes
2023-08-18 10:39:40 -05:00
committed by GitHub
parent ea238360c2 24f1460692
commit e06334d289
32 changed files with 1112 additions and 1313 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.circleci/workflows.yml
+13 -9
View File
@@ -1186,6 +1186,10 @@ commands:
command: |
source ./scripts/ensure-node.sh
yarn build --scope cypress
- run:
name: Copy Re-exported NPM Packages
command: node ./scripts/post-build.js
working_directory: cli
- run:
command: ls -la types
working_directory: cli/build
@@ -1520,7 +1524,6 @@ jobs:
- run: yarn test-scripts
# make sure packages with TypeScript can be transpiled to JS
- run: yarn lerna run build-prod --stream --concurrency 4
- run: yarn build --concurrency 4
# run unit tests from each individual package
- run: yarn test
# run type checking for each individual package
@@ -1903,7 +1906,7 @@ jobs:
- restore_cached_workspace
- run:
name: Build
command: yarn build --scope @cypress/webpack-preprocessor
command: yarn workspace @cypress/webpack-preprocessor build
- run:
name: Run tests
command: yarn workspace @cypress/webpack-preprocessor test
@@ -1948,7 +1951,7 @@ jobs:
- restore_cached_workspace
- run:
name: Build
command: yarn build --scope @cypress/vue
command: yarn lerna run build --scope @cypress/vue
- store_test_results:
path: npm/vue/test_results
- store_artifacts:
@@ -1961,7 +1964,7 @@ jobs:
- restore_cached_workspace
- run:
name: Build
command: yarn build --scope @cypress/angular
command: yarn workspace @cypress/angular build
- store-npm-logs
npm-react:
@@ -1970,7 +1973,7 @@ jobs:
- restore_cached_workspace
- run:
name: Build
command: yarn build --scope @cypress/react
command: yarn workspace @cypress/react build
- run:
name: Run tests
command: yarn test
@@ -1987,7 +1990,7 @@ jobs:
- restore_cached_workspace
- run:
name: Build
command: yarn build --scope @cypress/vite-plugin-cypress-esm
command: yarn workspace @cypress/vite-plugin-cypress-esm build
- run:
name: Run tests
command: yarn test
@@ -2004,7 +2007,7 @@ jobs:
- restore_cached_workspace
- run:
name: Build
command: yarn build --scope @cypress/mount-utils
command: yarn workspace @cypress/mount-utils build
- store-npm-logs
npm-grep:
@@ -2026,7 +2029,7 @@ jobs:
resource_class: small
steps:
- restore_cached_workspace
- run: yarn build --scope create-cypress-tests
- run: yarn workspace create-cypress-tests build
npm-eslint-plugin-dev:
<<: *defaults
@@ -2043,7 +2046,8 @@ jobs:
- run:
name: Build + Install
command: |
yarn build --scope @cypress/schematic
yarn workspace @cypress/schematic build
working_directory: npm/cypress-schematic
- run:
name: Run unit tests
command: |
README.md
+5
View File
@@ -20,6 +20,11 @@
<p align="center">
Fast, easy and reliable testing for anything that runs in a browser.
</p>
<p align="center">
<a href="https://bit.ly/3P7ufFf">
<img alt="Cypress Conf Link" src="https://github-production-user-asset-6210df.s3.amazonaws.com/1087311/261085338-e2915eb2-13da-4ca6-b909-f835c6b6074d.jpeg" width="40%" height="40%" />
</a>
</p>
<p align="center">
Join us, we're <a href="https://cypress.io/jobs">hiring</a>.
</p>
cli/package.json
-14
View File
@@ -7,7 +7,6 @@
"clean": "node ./scripts/clean.js",
"prebuild": "yarn postinstall && node ./scripts/start-build.js",
"build": "node ./scripts/build.js",
"postbuild": "node ./scripts/post-build.js",
"dtslint": "dtslint types",
"postinstall": "patch-package && node ./scripts/post-install.js",
"size": "t=\"cypress-v0.0.0.tgz\"; yarn pack --filename \"${t}\"; wc -c \"${t}\"; tar tvf \"${t}\"; rm \"${t}\";",
@@ -177,18 +176,5 @@
"nohoist": [
"@types/*"
]
},
"nx": {
"targets": {
"build": {
"outputs": [
"{projectRoot}/types",
"{projectRoot}/build"
]
}
},
"implicitDependencies": [
"@cypress/*"
]
}
}
guides/release-process.md
+5 -4
View File
@@ -17,12 +17,13 @@ The `@cypress/`-namespaced NPM packages that live inside the [`/npm`](../npm) di
- [Set up](https://cypress-io.atlassian.net/wiki/spaces/INFRA/pages/1534853121/AWS+SSO+Cypress) an AWS SSO profile with the [Team-CypressApp-Prod](https://cypress-io.atlassian.net/wiki/spaces/INFRA/pages/1534853121/AWS+SSO+Cypress#Team-CypressApp-Prod) role. The release scripts assumes the name of your profile is `prod`. Make sure to open the "App Developer" expando for some necessary config values. Your AWS config file should end up looking like the following:
```
[prod]
[profile prod]
sso_start_url = <start_url>
sso_region = <region>
aws_access_key_id = <access_key_id>
aws_secret_access_key = <secret_access_key>
aws_session_token = <session_token>
sso_account_id = <account_id>
sso_role_name = <role_name>
region = <region>
cli_pager = <pager>
```
- Set up the following environment variables:
npm/angular/package.json
+1 -12
View File
@@ -7,6 +7,7 @@
"prebuild": "rimraf dist",
"build": "rollup -c rollup.config.mjs",
"postbuild": "node ../../scripts/sync-exported-npm-with-cli.js",
"build-prod": "yarn build",
"check-ts": "tsc --noEmit",
"lint": "eslint --ext .js,.ts,.json, ."
},
@@ -58,18 +59,6 @@
"publishConfig": {
"access": "public"
},
"nx": {
"targets": {
"build": {
"inputs": [
"{workspaceRoot}/scripts"
],
"outputs": [
"{workspaceRoot}/cli/angular"
]
}
}
},
"standard": {
"globals": [
"Cypress",
npm/create-cypress-tests/package.json
+3 -3
View File
@@ -5,6 +5,7 @@
"main": "dist/src/main.js",
"scripts": {
"build": "yarn prepare-example && tsc -p ./tsconfig.json && node scripts/example copy-to ./dist/initial-template && yarn prepare-copy-templates",
"build-prod": "yarn build",
"prepare-example": "node scripts/example copy-to ./initial-template",
"prepare-copy-templates": "node scripts/copy-templates copy-to ./dist/src",
"test": "cross-env TS_NODE_PROJECT=./tsconfig.test.json mocha --config .mocharc.json './src/**/*.test.ts'",
@@ -22,15 +23,14 @@
"commander": "6.2.1",
"find-up": "5.0.0",
"fs-extra": "^9.1.0",
"glob": "^7.1.6",
"inquirer": "8.2.4",
"inquirer": "7.3.3",
"ora": "^5.1.0",
"recast": "0.20.4",
"semver": "7.3.7"
},
"devDependencies": {
"@types/babel__core": "^7.1.2",
"@types/inquirer": "8.2.4",
"@types/inquirer": "7.3.1",
"@types/mock-fs": "4.10.0",
"@types/node": "16.18.39",
"@types/ora": "^3.2.0",
npm/cypress-schematic/package.json
-11
View File
@@ -54,16 +54,5 @@
"ng-add": {
"save": "devDependencies"
},
"nx": {
"targets": {
"build": {
"outputs": [
"{projectRoot}/src/**/*.js",
"{projectRoot}/src/**/*.d.ts",
"{projectRoot}/src/**/*.js.map"
]
}
}
},
"schematics": "./src/schematics/collection.json"
}
npm/mount-utils/package.json
+1 -13
View File
@@ -6,6 +6,7 @@
"scripts": {
"build": "tsc || echo 'built, with type errors'",
"postbuild": "node ../../scripts/sync-exported-npm-with-cli.js",
"build-prod": "yarn build",
"check-ts": "tsc --noEmit",
"watch": "tsc -w",
"lint": "eslint --ext .js,.ts,.json, ."
@@ -32,18 +33,5 @@
"bugs": "https://github.com/cypress-io/cypress/issues/new?template=1-bug-report.md",
"publishConfig": {
"access": "public"
},
"nx": {
"targets": {
"build": {
"inputs": [
"{workspaceRoot}/scripts"
],
"outputs": [
"{workspaceRoot}/cli/mount-utils",
"{projectRoot}/dist"
]
}
}
}
}
npm/react/package.json
-13
View File
@@ -88,19 +88,6 @@
"publishConfig": {
"access": "public"
},
"nx": {
"targets": {
"build": {
"inputs": [
"{workspaceRoot}/scripts"
],
"outputs": [
"{workspaceRoot}/cli/react",
"{projectRoot}/dist"
]
}
}
},
"standard": {
"globals": [
"Cypress",
npm/react18/package.json
-13
View File
@@ -57,18 +57,5 @@
},
"publishConfig": {
"access": "public"
},
"nx": {
"targets": {
"build": {
"inputs": [
"{workspaceRoot}/scripts"
],
"outputs": [
"{workspaceRoot}/cli/react18",
"{projectRoot}/dist"
]
}
}
}
}
npm/svelte/package.json
+1 -13
View File
@@ -7,6 +7,7 @@
"prebuild": "rimraf dist",
"build": "rollup -c rollup.config.mjs",
"postbuild": "node ../../scripts/sync-exported-npm-with-cli.js",
"build-prod": "yarn build",
"lint": "eslint --ext .js,.jsx,.ts,.tsx,.json, .",
"check-ts": "tsc --noEmit"
},
@@ -39,18 +40,5 @@
"module": "dist/cypress-svelte.esm-bundler.js",
"publishConfig": {
"access": "public"
},
"nx": {
"targets": {
"build": {
"inputs": [
"{workspaceRoot}/scripts"
],
"outputs": [
"{workspaceRoot}/cli/svelte",
"{projectRoot}/dist"
]
}
}
}
}
npm/vite-dev-server/package.json
+1 -9
View File
@@ -5,6 +5,7 @@
"main": "index.js",
"scripts": {
"build": "tsc || echo 'built, with type errors'",
"build-prod": "tsc || echo 'built, with type errors'",
"check-ts": "tsc --noEmit",
"cypress:run": "yarn cypress:run-cypress-in-cypress node ../../scripts/cypress run --project . --browser chrome",
"cypress:run-cypress-in-cypress": "cross-env CYPRESS_INTERNAL_E2E_TESTING_SELF_PARENT_PROJECT=1 HTTP_PROXY_TARGET_FOR_ORIGIN_REQUESTS=http://localhost:4455 CYPRESS_REMOTE_DEBUGGING_PORT=6666 TZ=America/New_York",
@@ -45,14 +46,5 @@
"module": "dist/index.js",
"publishConfig": {
"access": "public"
},
"nx": {
"targets": {
"build": {
"outputs": [
"{projectRoot}/dist"
]
}
}
}
}
npm/vite-plugin-cypress-esm/package.json
+1 -9
View File
@@ -5,6 +5,7 @@
"main": "index.js",
"scripts": {
"build": "tsc || echo 'built, with type errors'",
"build-prod": "tsc || echo 'built, with type errors'",
"check-ts": "tsc --noEmit",
"cypress:open": "node ../../scripts/cypress open --project . --component",
"cypress:run": "node ../../scripts/cypress run --project . --component",
@@ -41,14 +42,5 @@
"module": "dist/index.js",
"publishConfig": {
"access": "public"
},
"nx": {
"targets": {
"build": {
"outputs": [
"{projectRoot}/dist"
]
}
}
}
}
npm/vue/package.json
+1 -13
View File
@@ -4,6 +4,7 @@
"description": "Browser-based Component Testing for Vue.js with Cypress.io ✌️🌲",
"main": "dist/cypress-vue.cjs.js",
"scripts": {
"build-prod": "yarn build",
"cy:open": "node ../../scripts/cypress.js open --component --project ${PWD}",
"cy:run": "node ../../scripts/cypress.js run --component --project ${PWD}",
"build": "rimraf dist && rollup -c rollup.config.mjs",
@@ -79,18 +80,5 @@
},
"publishConfig": {
"access": "public"
},
"nx": {
"targets": {
"build": {
"inputs": [
"{workspaceRoot}/scripts"
],
"outputs": [
"{workspaceRoot}/cli/vue",
"{projectRoot}/dist"
]
}
}
}
}
npm/vue2/package.json
+1 -13
View File
@@ -7,6 +7,7 @@
"check-ts": "tsc --noEmit",
"build": "rimraf dist && yarn rollup -c rollup.config.mjs",
"postbuild": "node ../../scripts/sync-exported-npm-with-cli.js",
"build-prod": "yarn build",
"test": "echo \"Tests for @cypress/vue2 are run from system-tests\"",
"watch": "yarn build --watch --watch.exclude ./dist/**/*",
"lint": "eslint --ext .js,.jsx,.ts,.tsx,.json,.vue .",
@@ -48,18 +49,5 @@
"module": "dist/cypress-vue2.esm-bundler.js",
"publishConfig": {
"access": "public"
},
"nx": {
"targets": {
"build": {
"inputs": [
"{workspaceRoot}/scripts"
],
"outputs": [
"{workspaceRoot}/cli/vue2",
"{projectRoot}/dist"
]
}
}
}
}
npm/webpack-dev-server/package.json
+1 -9
View File
@@ -6,6 +6,7 @@
"scripts": {
"prebuild": "rimraf dist",
"build": "tsc || echo 'built, with type errors'",
"build-prod": "yarn build",
"check-ts": "tsc --noEmit",
"dev": "tsc --watch",
"clean": "rimraf dist",
@@ -56,14 +57,5 @@
"bugs": "https://github.com/cypress-io/cypress/issues/new?template=1-bug-report.md",
"publishConfig": {
"access": "public"
},
"nx": {
"targets": {
"build": {
"outputs": [
"{projectRoot}/dist"
]
}
}
}
}
npm/webpack-preprocessor/package.json
+2 -10
View File
@@ -6,6 +6,7 @@
"main": "dist",
"scripts": {
"build": "rimraf dist && tsc || echo 'built, with errors'",
"build-prod": "yarn build",
"deps": "deps-ok && dependency-check --no-dev .",
"secure": "nsp check",
"semantic-release": "semantic-release",
@@ -71,14 +72,5 @@
"cypress-plugin",
"cypress-preprocessor",
"webpack"
],
"nx": {
"targets": {
"build": {
"outputs": [
"{projectRoot}/dist"
]
}
}
}
]
}
nx.json
+1 -4
View File
@@ -5,7 +5,6 @@
"options": {
"cacheableOperations": [
"lint",
"build",
"check-ts"
],
"accessToken": "ZmNlNjA0YzAtNTM1NS00MDIwLWFlMWItNWYxYzNiMjQ4N2VkfHJlYWQtb25seQ=="
@@ -37,9 +36,7 @@
}
},
"namedInputs": {
"sharedGlobals": [
"{workspaceRoot}/scripts"
],
"sharedGlobals": [],
"default": [
"{projectRoot}/**/*",
"sharedGlobals"
package.json
+5 -5
View File
@@ -14,7 +14,8 @@
"binary-zip": "node ./scripts/binary.js zip",
"binary-package": "cross-env NODE_OPTIONS=--max_old_space_size=8192 node ./scripts/binary.js package",
"check-binary-on-cdn": "node ./scripts/binary.js checkIfBinaryExistsOnCdn",
"build": "lerna run build --stream",
"build": "yarn build-npm-modules && lerna run build --stream --no-bail --ignore create-cypress-tests --ignore cypress --ignore \"'@packages/{runner}'\" --ignore \"'@cypress/{angular,react,react18,vue,vue2,mount-utils,svelte}'\" && node ./cli/scripts/post-build.js && lerna run build --stream --scope create-cypress-tests",
"build-npm-modules": "lerna run build --scope cypress --scope @cypress/mount-utils --scope @cypress/react && lerna run build --scope \"'@cypress/{angular,react18,vue,vue2,svelte}'\"",
"build-prod": "lerna run build-prod-ui --stream && lerna run build-prod --stream --ignore create-cypress-tests && node ./cli/scripts/post-build.js && lerna run build-prod --stream --scope create-cypress-tests --scope",
"build-v8-snapshot-dev": "node --max-old-space-size=8192 tooling/v8-snapshot/scripts/setup-v8-snapshot-in-cypress.js --env=dev",
"build-v8-snapshot-prod": "node --max-old-space-size=8192 tooling/v8-snapshot/scripts/setup-v8-snapshot-in-cypress.js",
@@ -172,10 +173,10 @@
"http-server": "0.12.3",
"human-interval": "1.0.0",
"husky": "7.0.2",
"inquirer": "8.2.4",
"inquirer": "3.3.0",
"inquirer-confirm": "2.0.3",
"lazy-ass": "1.6.0",
"lerna": "6.6.2",
"lerna": "5.4.3",
"lint-staged": "11.1.2",
"listr2": "3.8.3",
"lodash": "^4.17.21",
@@ -207,7 +208,7 @@
"through2": "^4.0.2",
"tree-kill": "1.2.2",
"ts-node": "^10.9.1",
"typescript": "4.7.4",
"typescript": "^4.7.4",
"yarn-deduplicate": "3.1.0"
},
"engines": {
@@ -274,7 +275,6 @@
"**/ua-parser-js": "0.7.33",
"@typescript-eslint/eslint-plugin": "4.18.0",
"sharp": "0.29.3",
"typescript": "4.7.4",
"vue-template-compiler": "2.6.12"
}
}
packages/config/.gitignore
-1
View File
@@ -1 +0,0 @@
src/**/*.js
packages/electron/package.json
+1
View File
@@ -5,6 +5,7 @@
"main": "index.js",
"scripts": {
"build": "node ./bin/cypress-electron --install",
"build-prod": "yarn build",
"clean-deps": "rimraf node_modules",
"postinstall": "echo '@packages/electron needs: yarn build'",
"start": "./bin/cypress-electron",
packages/example/package.json
+2 -12
View File
@@ -10,6 +10,7 @@
"test-e2e": "cypress run",
"test-unit": "echo 'no unit tests'",
"build": "node ./bin/build.js && gulp build",
"build-prod": "yarn build",
"predeploy": "yarn build",
"deploy": "gh-pages -d build -b gh-pages"
},
@@ -27,16 +28,5 @@
"cypress",
"lib"
],
"types": "index.d.ts",
"nx": {
"targets": {
"build": {
"outputs": [
"{projectRoot}/cypress",
"{projectRoot}/app",
"{projectRoot}/build"
]
}
}
}
"types": "index.d.ts"
}
packages/extension/package.json
+1
View File
@@ -5,6 +5,7 @@
"main": "index.js",
"scripts": {
"build": "gulp build",
"build-prod": "yarn build",
"clean": "gulp clean",
"clean-deps": "rimraf node_modules",
"postinstall": "echo '@packages/extension needs: yarn build'",
packages/packherd-require/package.json
+1
View File
@@ -6,6 +6,7 @@
"main": "dist/require.js",
"scripts": {
"build": "tsc",
"build-prod": "yarn build",
"check-ts": "tsc --noEmit && yarn -s tslint",
"clean-deps": "rimraf node_modules",
"clean": "rimraf dist",
packages/resolve-dist/.gitignore
-1
View File
@@ -1 +0,0 @@
lib/**/*.js
packages/rewriter/.gitignore
-1
View File
@@ -1 +0,0 @@
lib/**/*.js
packages/scaffold-config/.gitignore
-1
View File
@@ -1 +0,0 @@
src/**/*.js
packages/server/.gitignore
-1
View File
@@ -1 +0,0 @@
lib/**/*.js
packages/telemetry/package.json
+1
View File
@@ -7,6 +7,7 @@
"browser": "src/browser.ts",
"scripts": {
"build": "tsc",
"build-prod": "yarn build",
"check-ts": "tsc --noEmit && yarn -s tslint",
"clean": "rimraf dist",
"test": "yarn test-unit",
packages/v8-snapshot-require/package.json
+1
View File
@@ -6,6 +6,7 @@
"main": "dist/snapshot-require.js",
"scripts": {
"build": "tsc",
"build-prod": "yarn build",
"check-ts": "tsc --noEmit && yarn -s tslint",
"clean-deps": "rimraf node_modules",
"clean": "rimraf dist",
scripts/binary/build.ts
-5
View File
@@ -102,11 +102,6 @@ export async function buildCypressApp (options: BuildCypressAppOpts) {
if (!keepBuild) {
log('#buildPackages')
await execa('yarn', ['lerna', 'run', 'build', '--ignore', 'cli', '--concurrency', '4'], {
stdio: 'inherit',
cwd: CY_ROOT_DIR,
})
await execa('yarn', ['lerna', 'run', 'build-prod', '--ignore', 'cli', '--concurrency', '4'], {
stdio: 'inherit',
cwd: CY_ROOT_DIR,
yarn.lock
+1063 -1114
View File
File diff suppressed because it is too large Load Diff