From 2da6a3479e56c44ea5eabc953f3fccd8dd3b6169 Mon Sep 17 00:00:00 2001 From: Vladislav Tasev Date: Wed, 27 May 2020 13:37:24 +0300 Subject: [PATCH] feat(ui5-tools): libraries can now control chromedriver version (#1684) --- packages/base/package.json | 1 + packages/fiori/package.json | 3 ++- packages/icons/package.json | 3 ++- packages/localization/package.json | 1 + packages/main/package.json | 3 ++- packages/theme-base/package.json | 1 + packages/tools/lib/init-package/index.js | 3 +++ packages/tools/package.json | 4 +++- yarn.lock | 2 +- 9 files changed, 16 insertions(+), 5 deletions(-) diff --git a/packages/base/package.json b/packages/base/package.json index 2cb7c320ff7b..e17527d80b9b 100644 --- a/packages/base/package.json +++ b/packages/base/package.json @@ -31,6 +31,7 @@ }, "devDependencies": { "@ui5/webcomponents-tools": "1.0.0-rc.7", + "chromedriver": "latest", "array-uniq": "^2.0.0", "copy-and-watch": "^0.1.4", "eslint": "^5.13.0", diff --git a/packages/fiori/package.json b/packages/fiori/package.json index fcd33da45640..7644f98ecf42 100644 --- a/packages/fiori/package.json +++ b/packages/fiori/package.json @@ -31,6 +31,7 @@ "@ui5/webcomponents-theme-base": "1.0.0-rc.7" }, "devDependencies": { - "@ui5/webcomponents-tools": "1.0.0-rc.7" + "@ui5/webcomponents-tools": "1.0.0-rc.7", + "chromedriver": "latest" } } diff --git a/packages/icons/package.json b/packages/icons/package.json index 60216bc0cf90..3f76663b7fd5 100644 --- a/packages/icons/package.json +++ b/packages/icons/package.json @@ -24,6 +24,7 @@ "@ui5/webcomponents-base": "0.20.0" }, "devDependencies": { - "@ui5/webcomponents-tools": "1.0.0-rc.7" + "@ui5/webcomponents-tools": "1.0.0-rc.7", + "chromedriver": "latest" } } diff --git a/packages/localization/package.json b/packages/localization/package.json index 71a59a6f0f54..8ae97cc56199 100644 --- a/packages/localization/package.json +++ b/packages/localization/package.json @@ -25,6 +25,7 @@ "@buxlabs/amd-to-es6": "^0.15.0", "@openui5/sap.ui.core": "1.76.0", "@ui5/webcomponents-tools": "1.0.0-rc.7", + "chromedriver": "latest", "copy-and-watch": "^0.1.4", "escodegen": "^1.11.0", "esprima": "^4.0.1", diff --git a/packages/main/package.json b/packages/main/package.json index a393d9893442..1503cf201131 100644 --- a/packages/main/package.json +++ b/packages/main/package.json @@ -31,6 +31,7 @@ "@ui5/webcomponents-theme-base": "1.0.0-rc.7" }, "devDependencies": { - "@ui5/webcomponents-tools": "1.0.0-rc.7" + "@ui5/webcomponents-tools": "1.0.0-rc.7", + "chromedriver": "latest" } } diff --git a/packages/theme-base/package.json b/packages/theme-base/package.json index b2a47bc6504a..16d4ac27b132 100644 --- a/packages/theme-base/package.json +++ b/packages/theme-base/package.json @@ -28,6 +28,7 @@ }, "devDependencies": { "@ui5/webcomponents-tools": "1.0.0-rc.7", + "chromedriver": "latest", "chokidar-cli": "^2.0.0", "copy-and-watch": "^0.1.4", "cssnano": "^4.1.10", diff --git a/packages/tools/lib/init-package/index.js b/packages/tools/lib/init-package/index.js index 149ba156c543..39f9acf6313d 100644 --- a/packages/tools/lib/init-package/index.js +++ b/packages/tools/lib/init-package/index.js @@ -100,6 +100,9 @@ const updatePackageFile = () => { "prepublishOnly": "npm run build" }; + packageContent.devDependencies = packageContent.devDependencies || {}; + packageContent.devDependencies["chromedriver"] = "latest"; + fs.writeFileSync("package.json", beautify(packageContent, null, 2, 100)); }; diff --git a/packages/tools/package.json b/packages/tools/package.json index 8deb480b9aa5..bd448b825267 100644 --- a/packages/tools/package.json +++ b/packages/tools/package.json @@ -35,7 +35,6 @@ "@webcomponents/webcomponentsjs": "^2.4.0", "chai": "^4.2.0", "chokidar-cli": "^2.0.0", - "chromedriver": "^83.0.0", "clean-css": "^4.2.1", "command-line-args": "^5.1.1", "concurrently": "^5.0.0", @@ -74,6 +73,9 @@ "serve": "^10.1.1", "wdio-chromedriver-service": "^6.0.2" }, + "peerDependencies": { + "chromedriver": "*" + }, "resolutions": { "rollup-plugin-livereload/livereload/chokidar": "^3.x" } diff --git a/yarn.lock b/yarn.lock index 315cc4feeedc..f0beb44a3504 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1996,7 +1996,7 @@ chrome-launcher@^0.13.1: mkdirp "^0.5.3" rimraf "^3.0.2" -chromedriver@^83.0.0: +chromedriver@latest: version "83.0.0" resolved "https://registry.yarnpkg.com/chromedriver/-/chromedriver-83.0.0.tgz#75d7d838e58014658c3990089464166fef951926" integrity sha512-AePp9ykma+z4aKPRqlbzvVlc22VsQ6+rgF+0aL3B5onHOncK18dWSkLrSSJMczP/mXILN9ohGsvpuTwoRSj6OQ==