diff --git a/package.json b/package.json index 79017daef3..39d2d630ab 100644 --- a/package.json +++ b/package.json @@ -69,7 +69,7 @@ "conventional-changelog-cli": "^1.3.21", "copy-webpack-plugin": "5.0.3", "cosmiconfig": "^4.0.0", - "cypress": "~3.3.1", + "cypress": "3.4.0", "cz-conventional-changelog": "^2.1.0", "document-register-element": "^1.13.1", "dotenv": "6.2.0", diff --git a/packages/cypress/src/utils/versions.ts b/packages/cypress/src/utils/versions.ts index 0cd1a32ea1..8b96d548d9 100644 --- a/packages/cypress/src/utils/versions.ts +++ b/packages/cypress/src/utils/versions.ts @@ -1,2 +1,2 @@ export const nxVersion = '*'; -export const cypressVersion = '~3.3.1'; +export const cypressVersion = '3.4.0'; diff --git a/packages/workspace/migrations.json b/packages/workspace/migrations.json index 95cf4c4e24..05a285fd44 100644 --- a/packages/workspace/migrations.json +++ b/packages/workspace/migrations.json @@ -14,6 +14,11 @@ "version": "8.3.0-beta.1", "description": "Update Angular CLI to 8.1.1", "factory": "./src/migrations/update-8-3-0/update-ng-cli-8-1" + }, + "update-cypress-to-34": { + "version": "8.3.0-beta.1", + "description": "Update Cypress to 3.4", + "factory": "./src/migrations/update-8-3-0/update-cypress-to-34" } } } diff --git a/packages/workspace/src/migrations/update-8-3-0/update-cypress-to-34.ts b/packages/workspace/src/migrations/update-8-3-0/update-cypress-to-34.ts new file mode 100644 index 0000000000..077684a4a3 --- /dev/null +++ b/packages/workspace/src/migrations/update-8-3-0/update-cypress-to-34.ts @@ -0,0 +1,20 @@ +import { updateJsonInTree } from '@nrwl/workspace'; +import { chain, SchematicContext } from '@angular-devkit/schematics'; +import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks'; + +const updateCypress = updateJsonInTree('package.json', json => { + json.devDependencies = json.devDependencies || {}; + if (json.devDependencies['cypress']) { + json.devDependencies['cypress'] = '3.4.0'; + } + + return json; +}); + +const addInstall = (_: any, context: SchematicContext) => { + context.addTask(new NodePackageInstallTask()); +}; + +export default function() { + return chain([updateCypress, addInstall]); +} diff --git a/yarn.lock b/yarn.lock index 5d70691450..e0a96ebfdb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4534,10 +4534,10 @@ cyclist@~0.2.2: resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-0.2.2.tgz#1b33792e11e914a2fd6d6ed6447464444e5fa640" integrity sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA= -cypress@~3.3.1: - version "3.3.1" - resolved "https://registry.yarnpkg.com/cypress/-/cypress-3.3.1.tgz#8a127b1d9fa74bff21f111705abfef58d595fdef" - integrity sha512-JIo47ZD9P3jAw7oaK7YKUoODzszJbNw41JmBrlMMiupHOlhmXvZz75htuo7mfRFPC9/1MDQktO4lX/V2+a6lGQ== +cypress@3.4.0: + version "3.4.0" + resolved "https://registry.yarnpkg.com/cypress/-/cypress-3.4.0.tgz#8053ee107eb6309f26abd57e882d05578bdc3391" + integrity sha512-vUE+sK3l23fhs5qTN3dKpveyP0fGr37VmK3FSYaTEjbqC/qh4DbA1Ych/3bLStUpHP4rpE5KAx7i1s/tpdD9vQ== dependencies: "@cypress/listr-verbose-renderer" "0.4.1" "@cypress/xvfb" "1.2.4" @@ -4552,7 +4552,7 @@ cypress@~3.3.1: execa "0.10.0" executable "4.1.1" extract-zip "1.6.7" - fs-extra "4.0.1" + fs-extra "5.0.0" getos "3.1.1" glob "7.1.3" is-ci "1.2.1" @@ -4565,7 +4565,7 @@ cypress@~3.3.1: moment "2.24.0" ramda "0.24.1" request "2.88.0" - request-progress "0.4.0" + request-progress "3.0.0" supports-color "5.5.0" tmp "0.1.0" url "0.11.0" @@ -6133,13 +6133,13 @@ fs-exists-sync@^0.1.0: resolved "https://registry.yarnpkg.com/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz#982d6893af918e72d08dec9e8673ff2b5a8d6add" integrity sha1-mC1ok6+RjnLQjeyehnP/K1qNat0= -fs-extra@4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.1.tgz#7fc0c6c8957f983f57f306a24e5b9ddd8d0dd880" - integrity sha1-f8DGyJV/mD9X8waiTlud3Y0N2IA= +fs-extra@5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-5.0.0.tgz#414d0110cdd06705734d055652c5411260c31abd" + integrity sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ== dependencies: graceful-fs "^4.1.2" - jsonfile "^3.0.0" + jsonfile "^4.0.0" universalify "^0.1.0" fs-extra@7.0.1, fs-extra@^7.0.0: @@ -8356,13 +8356,6 @@ jsonfile@^2.1.0: optionalDependencies: graceful-fs "^4.1.6" -jsonfile@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-3.0.1.tgz#a5ecc6f65f53f662c4415c7675a0331d0992ec66" - integrity sha1-pezG9l9T9mLEQVx2daAzHQmS7GY= - optionalDependencies: - graceful-fs "^4.1.6" - jsonfile@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb" @@ -9536,11 +9529,6 @@ no-case@^2.2.0: dependencies: lower-case "^1.1.1" -node-eta@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/node-eta/-/node-eta-0.1.1.tgz#4066109b39371c761c72b7ebda9a9ea0a5de121f" - integrity sha1-QGYQmzk3HHYccrfr2pqeoKXeEh8= - node-fetch-npm@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/node-fetch-npm/-/node-fetch-npm-2.0.2.tgz#7258c9046182dca345b4208eda918daf33697ff7" @@ -11373,13 +11361,12 @@ repeating@^2.0.0: dependencies: is-finite "^1.0.0" -request-progress@0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/request-progress/-/request-progress-0.4.0.tgz#c1954e39086aa85269c5660bcee0142a6a70d7e7" - integrity sha1-wZVOOQhqqFJpxWYLzuAUKmpw1+c= +request-progress@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/request-progress/-/request-progress-3.0.0.tgz#4ca754081c7fec63f505e4faa825aa06cd669dbe" + integrity sha1-TKdUCBx/7GP1BeT6qCWqBs1mnb4= dependencies: - node-eta "^0.1.1" - throttleit "^0.0.2" + throttleit "^1.0.0" request-promise-core@1.1.2: version "1.1.2" @@ -12769,10 +12756,10 @@ throat@^4.0.0: resolved "https://registry.yarnpkg.com/throat/-/throat-4.1.0.tgz#89037cbc92c56ab18926e6ba4cbb200e15672a6a" integrity sha1-iQN8vJLFarGJJua6TLsgDhVnKmo= -throttleit@^0.0.2: - version "0.0.2" - resolved "https://registry.yarnpkg.com/throttleit/-/throttleit-0.0.2.tgz#cfedf88e60c00dd9697b61fdd2a8343a9b680eaf" - integrity sha1-z+34jmDADdlpe2H90qg0OptoDq8= +throttleit@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/throttleit/-/throttleit-1.0.0.tgz#9e785836daf46743145a5984b6268d828528ac6c" + integrity sha1-nnhYNtr0Z0MUWlmEtiaNgoUorGw= through2@^2.0.0, through2@^2.0.2: version "2.0.5"