From 7d931d3e04b45e3ad19fae6c3700bfff8d5c1e5d Mon Sep 17 00:00:00 2001 From: George Kalpakas Date: Wed, 17 Feb 2021 16:15:44 +0200 Subject: [PATCH] build: ensure integration projects use root `webdriver-manager` (#40756) Ensure that all integration projects use `webdriver-manager` from the root `node_modules/`. See acfd0edd38d955a8559aeec3d97c0f9a23525079 for more details. PR Close #40756 --- integration/bazel/package.json | 6 +++++- integration/bazel/yarn.lock | 10 +++------- integration/injectable-def/package.json | 4 ++++ integration/injectable-def/yarn.lock | 14 +++++++------- integration/ng_update_migrations/package.json | 4 ++++ integration/ng_update_migrations/yarn.lock | 6 ++---- integration/ngcc/package.json | 4 ++++ integration/ngcc/yarn.lock | 4 +--- 8 files changed, 30 insertions(+), 22 deletions(-) diff --git a/integration/bazel/package.json b/integration/bazel/package.json index 8d63d0ff9d..cf284bf52c 100644 --- a/integration/bazel/package.json +++ b/integration/bazel/package.json @@ -38,7 +38,7 @@ "karma-jasmine": "2.0.1", "karma-requirejs": "1.1.0", "karma-sourcemap-loader": "0.3.7", - "protractor": "5.4.2", + "protractor": "file:../../node_modules/protractor", "requirejs": "2.3.6", "rollup": "1.27.5", "rollup-plugin-commonjs": "10.1.0", @@ -47,6 +47,10 @@ "terser": "4.4.0", "typescript": "file:../../node_modules/typescript" }, + "//resolutions-comment": "Ensure a single version of webdriver-manager which comes from root node_modules that has already run webdriver-manager update", + "resolutions": { + "**/webdriver-manager": "file:../../node_modules/webdriver-manager" + }, "scripts": { "test": "bazelisk build ... --noshow_progress && bazelisk test ...", "postinstall": "ngcc" diff --git a/integration/bazel/yarn.lock b/integration/bazel/yarn.lock index 79201b5a1d..370740fdc2 100644 --- a/integration/bazel/yarn.lock +++ b/integration/bazel/yarn.lock @@ -2071,10 +2071,8 @@ protobufjs@6.8.8: "@types/node" "^10.1.0" long "^4.0.0" -protractor@5.4.2: - version "5.4.2" - resolved "https://registry.yarnpkg.com/protractor/-/protractor-5.4.2.tgz#329efe37f48b2141ab9467799be2d4d12eb48c13" - integrity sha512-zlIj64Cr6IOWP7RwxVeD8O4UskLYPoyIcg0HboWJL9T79F1F0VWtKkGTr/9GN6BKL+/Q/GmM7C9kFVCfDbP5sA== +"protractor@file:../../node_modules/protractor": + version "5.4.3" dependencies: "@types/q" "^0.0.32" "@types/selenium-webdriver" "^3.0.0" @@ -2805,10 +2803,8 @@ webdriver-js-extender@2.1.0: "@types/selenium-webdriver" "^3.0.0" selenium-webdriver "^3.0.1" -webdriver-manager@^12.0.6: +webdriver-manager@^12.0.6, "webdriver-manager@file:../../node_modules/webdriver-manager": version "12.1.7" - resolved "https://registry.yarnpkg.com/webdriver-manager/-/webdriver-manager-12.1.7.tgz#ed4eaee8f906b33c146e869b55e850553a1b1162" - integrity sha512-XINj6b8CYuUYC93SG3xPkxlyUc3IJbD6Vvo75CVGuG9uzsefDzWQrhz0Lq8vbPxtb4d63CZdYophF8k8Or/YiA== dependencies: adm-zip "^0.4.9" chalk "^1.1.1" diff --git a/integration/injectable-def/package.json b/integration/injectable-def/package.json index 054b482fab..66fdde6ffe 100644 --- a/integration/injectable-def/package.json +++ b/integration/injectable-def/package.json @@ -22,6 +22,10 @@ "lite-server": "2.2.2", "protractor": "file:../../node_modules/protractor" }, + "//resolutions-comment": "Ensure a single version of webdriver-manager which comes from root node_modules that has already run webdriver-manager update", + "resolutions": { + "**/webdriver-manager": "file:../../node_modules/webdriver-manager" + }, "scripts": { "test": "./test.sh" } diff --git a/integration/injectable-def/yarn.lock b/integration/injectable-def/yarn.lock index 54910874fc..19ba263961 100644 --- a/integration/injectable-def/yarn.lock +++ b/integration/injectable-def/yarn.lock @@ -68,9 +68,10 @@ accepts@~1.3.3, accepts@~1.3.4: mime-types "~2.1.18" negotiator "0.6.1" -adm-zip@^0.4.7: - version "0.4.7" - resolved "https://registry.yarnpkg.com/adm-zip/-/adm-zip-0.4.7.tgz#8606c2cbf1c426ce8c8ec00174447fd49b6eafc1" +adm-zip@^0.4.9: + version "0.4.13" + resolved "https://registry.yarnpkg.com/adm-zip/-/adm-zip-0.4.13.tgz#597e2f8cc3672151e1307d3e95cddbc75672314a" + integrity sha512-fERNJX8sOXfel6qCBCMPvZLzENBEhZTzKqg6vrOW5pvoEaQuJhRU4ndTAh6lHOxn1I6jnz2NHra56ZODM751uw== after@0.8.2: version "0.8.2" @@ -2697,11 +2698,10 @@ webdriver-js-extender@2.1.0: "@types/selenium-webdriver" "^3.0.0" selenium-webdriver "^3.0.1" -webdriver-manager@^12.0.6: - version "12.0.6" - resolved "https://registry.yarnpkg.com/webdriver-manager/-/webdriver-manager-12.0.6.tgz#3df1a481977010b4cbf8c9d85c7a577828c0e70b" +webdriver-manager@^12.0.6, "webdriver-manager@file:../../node_modules/webdriver-manager": + version "12.1.7" dependencies: - adm-zip "^0.4.7" + adm-zip "^0.4.9" chalk "^1.1.1" del "^2.2.0" glob "^7.0.3" diff --git a/integration/ng_update_migrations/package.json b/integration/ng_update_migrations/package.json index b9190e3993..34f7778ae5 100644 --- a/integration/ng_update_migrations/package.json +++ b/integration/ng_update_migrations/package.json @@ -42,5 +42,9 @@ "karma-jasmine-html-reporter": "1.4.2", "protractor": "file:../../node_modules/protractor", "typescript": "file:../../node_modules/typescript" + }, + "//resolutions-comment": "Ensure a single version of webdriver-manager which comes from root node_modules that has already run webdriver-manager update", + "resolutions": { + "**/webdriver-manager": "file:../../node_modules/webdriver-manager" } } diff --git a/integration/ng_update_migrations/yarn.lock b/integration/ng_update_migrations/yarn.lock index 8892b66479..df1549741c 100644 --- a/integration/ng_update_migrations/yarn.lock +++ b/integration/ng_update_migrations/yarn.lock @@ -8349,10 +8349,8 @@ webdriver-js-extender@2.1.0: "@types/selenium-webdriver" "^3.0.0" selenium-webdriver "^3.0.1" -webdriver-manager@^12.0.6: - version "12.1.6" - resolved "https://registry.yarnpkg.com/webdriver-manager/-/webdriver-manager-12.1.6.tgz#9e5410c506d1a7e0a7aa6af91ba3d5bb37f362b6" - integrity sha512-B1mOycNCrbk7xODw7Jgq/mdD3qzPxMaTsnKIQDy2nXlQoyjTrJTTD0vRpEZI9b8RibPEyQvh9zIZ0M1mpOxS3w== +webdriver-manager@^12.0.6, "webdriver-manager@file:../../node_modules/webdriver-manager": + version "12.1.7" dependencies: adm-zip "^0.4.9" chalk "^1.1.1" diff --git a/integration/ngcc/package.json b/integration/ngcc/package.json index 75a47d83cc..a8981aad5a 100644 --- a/integration/ngcc/package.json +++ b/integration/ngcc/package.json @@ -26,6 +26,10 @@ "lite-server": "2.2.2", "protractor": "file:../../node_modules/protractor" }, + "//resolutions-comment": "Ensure a single version of webdriver-manager which comes from root node_modules that has already run webdriver-manager update", + "resolutions": { + "**/webdriver-manager": "file:../../node_modules/webdriver-manager" + }, "scripts": { "test": "./test.sh" } diff --git a/integration/ngcc/yarn.lock b/integration/ngcc/yarn.lock index ada8bff446..d5152da7a9 100644 --- a/integration/ngcc/yarn.lock +++ b/integration/ngcc/yarn.lock @@ -3188,10 +3188,8 @@ webdriver-js-extender@2.1.0: "@types/selenium-webdriver" "^3.0.0" selenium-webdriver "^3.0.1" -webdriver-manager@^12.0.6: +webdriver-manager@^12.0.6, "webdriver-manager@file:../../node_modules/webdriver-manager": version "12.1.7" - resolved "https://registry.yarnpkg.com/webdriver-manager/-/webdriver-manager-12.1.7.tgz#ed4eaee8f906b33c146e869b55e850553a1b1162" - integrity sha512-XINj6b8CYuUYC93SG3xPkxlyUc3IJbD6Vvo75CVGuG9uzsefDzWQrhz0Lq8vbPxtb4d63CZdYophF8k8Or/YiA== dependencies: adm-zip "^0.4.9" chalk "^1.1.1"