Skip to content

Commit

Permalink
Merge branch 'develop' into TR-357-release-notes-modal
Browse files Browse the repository at this point in the history
  • Loading branch information
chrisbreiding authored Oct 30, 2020
2 parents bbec0a1 + 09617b2 commit ec9e8d3
Show file tree
Hide file tree
Showing 8 changed files with 28 additions and 4 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ cli/visual-snapshots
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839

# User-specific stuff
.idea
.idea/**/workspace.xml
.idea/**/tasks.xml
.idea/**/usage.statistics.xml
Expand Down
7 changes: 7 additions & 0 deletions npm/react/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
# [@cypress/react-v4.15.14](https://github.com/cypress-io/cypress/compare/@cypress/react-v4.15.13...@cypress/react-v4.15.14) (2020-10-30)


### Bug Fixes

* adding build-prod tasks to all of the npm dependencies that need artifacts ([#9046](https://github.com/cypress-io/cypress/issues/9046)) ([462829b](https://github.com/cypress-io/cypress/commit/462829bea1d903b0f1666d4ef2dd85e56636b725))

# [@cypress/react-v4.15.13](https://github.com/cypress-io/cypress/compare/@cypress/react-v4.15.12...@cypress/react-v4.15.13) (2020-10-29)


Expand Down
3 changes: 2 additions & 1 deletion npm/react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"main": "dist",
"scripts": {
"build": "rimraf dist && yarn transpile && yarn transpile:bin && yarn build:dist-package",
"build-prod": "yarn build",
"build:dist-package": "node scripts/prepareDistPackage.js && ncp ./plugins ./dist/plugins",
"check:links": "find . -type f -name 'README.md' ! -path './node_modules/*' | xargs -L1 npx markdown-link-check --quiet",
"cy:open": "node ../../scripts/cypress open",
Expand Down Expand Up @@ -131,7 +132,7 @@
},
"homepage": "https://on.cypress.io/component-testing",
"author": "Gleb Bahmutov <gleb.bahmutov@gmail.com>",
"bugs": "https://github.com/cypress-io/cypress/issues/new?assignees=JessicaSachs&labels=experiment%3A+component+testing,npm%3A%20%40cypress%2Freact&template=bug-report.md",
"bugs": "https://github.com/cypress-io/cypress/issues/new?assignees=&labels=npm%3A%20%40cypress%2Freact&template=1-bug-report.md&title=",
"keywords": [
"react",
"cypress",
Expand Down
7 changes: 7 additions & 0 deletions npm/vue/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
# [@cypress/vue-v1.0.1-alpha.6](https://github.com/cypress-io/cypress/compare/@cypress/vue-v1.0.1-alpha.5...@cypress/vue-v1.0.1-alpha.6) (2020-10-30)


### Bug Fixes

* adding build-prod tasks to all of the npm dependencies that need artifacts ([#9046](https://github.com/cypress-io/cypress/issues/9046)) ([462829b](https://github.com/cypress-io/cypress/commit/462829bea1d903b0f1666d4ef2dd85e56636b725))

# [@cypress/vue-v1.0.1-alpha.5](https://github.com/cypress-io/cypress/compare/@cypress/vue-v1.0.1-alpha.4...@cypress/vue-v1.0.1-alpha.5) (2020-10-29)


Expand Down
3 changes: 2 additions & 1 deletion npm/vue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"main": "dist/index.js",
"scripts": {
"build": "tsc",
"build-prod": "yarn build",
"build:watch": "tsc --watch",
"cy:open": "node ../../scripts/cypress open",
"cy:run": "node ../../scripts/cypress run",
Expand Down Expand Up @@ -66,7 +67,7 @@
},
"homepage": "https://on.cypress.io/component-testing",
"author": "Gleb Bahmutov <gleb.bahmutov@gmail.com>",
"bugs": "https://github.com/cypress-io/cypress/issues/new?assignees=JessicaSachs&labels=experiment%3A+component+testing,npm%3A%20%40cypress%2Fvue&template=bug-report.md",
"bugs": "https://github.com/cypress-io/cypress/issues/new?assignees=&labels=npm%3A%20%40cypress%2Fvue&template=1-bug-report.md&title=",
"keywords": [
"cypress",
"vue"
Expand Down
7 changes: 7 additions & 0 deletions npm/webpack-preprocessor/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
# [@cypress/webpack-preprocessor-v5.4.10](https://github.com/cypress-io/cypress/compare/@cypress/webpack-preprocessor-v5.4.9...@cypress/webpack-preprocessor-v5.4.10) (2020-10-30)


### Bug Fixes

* adding build-prod tasks to all of the npm dependencies that need artifacts ([#9046](https://github.com/cypress-io/cypress/issues/9046)) ([462829b](https://github.com/cypress-io/cypress/commit/462829bea1d903b0f1666d4ef2dd85e56636b725))

# [@cypress/webpack-preprocessor-v5.4.9](https://github.com/cypress-io/cypress/compare/@cypress/webpack-preprocessor-v5.4.8...@cypress/webpack-preprocessor-v5.4.9) (2020-10-29)


Expand Down
2 changes: 1 addition & 1 deletion npm/webpack-preprocessor/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
},
"homepage": "https://github.com/cypress-io/cypress/tree/master/npm/webpack-preprocessor#readme",
"author": "Chris Breiding <chris@cypress.io>",
"bugs": "https://github.com/cypress-io/cypress/issues/new?assignees=&labels=npm%3A %40cypress%2Fwebpack-preprocessor&template=bug-report.md",
"bugs": "https://github.com/cypress-io/cypress/issues/new?assignees=&labels=npm%3A%20%40cypress%2Fwebpack-preprocessor&template=1-bug-report.md&title=",
"keywords": [
"cypress",
"cypress-plugin",
Expand Down
2 changes: 1 addition & 1 deletion scripts/npm-release.js
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ const waitOnTests = async (names, packageInfo) => {
console.log(`\nWaiting on the following CI jobs: ${jobs.join(', ')}`)

return Promise.all(jobs.map((job) => {
waitForJobToPass(job)
return waitForJobToPass(job)
.timeout(minutes(60))
.then(() => {
console.log(`${job} passed`)
Expand Down

0 comments on commit ec9e8d3

Please sign in to comment.