honeymoose
/
angular-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: ensure integration projects use root `webdriver-manager` (#40756) 

Ensure that all integration projects use `webdriver-manager` from the
root `node_modules/`. See acfd0edd38 for
more details.

PR Close #40756
This commit is contained in:
George Kalpakas 2021-02-17 16:15:44 +02:00 committed by Joey Perrott
parent 12f7101d92
commit 7d931d3e04
8 changed files with 30 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
integration/bazel/package.json
View File

@ -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"

10
integration/bazel/yarn.lock
View File

@ -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"

4
integration/injectable-def/package.json
View File

@ -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"
}

14
integration/injectable-def/yarn.lock
View File

@ -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"

4
integration/ng_update_migrations/package.json
View File

@ -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"
}
}

6
integration/ng_update_migrations/yarn.lock
View File

@ -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"

4
integration/ngcc/package.json
View File

@ -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"
}

4
integration/ngcc/yarn.lock
View File

@ -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"