Repository: cordova-lib Updated Branches: refs/heads/master 8408e7090 -> 7bcfcf068
CB-12663: Install latest version of plugin in case of using dev cordova version This closes #542 Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/7bcfcf06 Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/7bcfcf06 Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/7bcfcf06 Branch: refs/heads/master Commit: 7bcfcf068253aaa1ed363608d8836043ea344a44 Parents: 8408e70 Author: Nikita Matrosov <[email protected]> Authored: Mon Apr 17 18:28:17 2017 +0300 Committer: Steve Gill <[email protected]> Committed: Mon Apr 24 23:14:56 2017 -0700 ---------------------------------------------------------------------- cordova-lib/src/cordova/plugin.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/7bcfcf06/cordova-lib/src/cordova/plugin.js ---------------------------------------------------------------------- diff --git a/cordova-lib/src/cordova/plugin.js b/cordova-lib/src/cordova/plugin.js index 5580ab5..6c59818 100644 --- a/cordova-lib/src/cordova/plugin.js +++ b/cordova-lib/src/cordova/plugin.js @@ -863,6 +863,11 @@ function determinePluginVersionToFetch(pluginInfo, pluginMap, platformMap, cordo function getFailedRequirements(reqs, pluginMap, platformMap, cordovaVersion) { var failed = []; + var version = cordovaVersion; + if (semver.prerelease(version)) { + // semver.inc with 'patch' type removes prereleased tag from version + version = semver.inc(version, 'patch'); + } for (var req in reqs) { if(reqs.hasOwnProperty(req) && typeof req === 'string' && semver.validRange(reqs[req])) { @@ -871,7 +876,7 @@ function getFailedRequirements(reqs, pluginMap, platformMap, cordovaVersion) { if(pluginMap[trimmedReq] && !semver.satisfies(pluginMap[trimmedReq], reqs[req])) { badInstalledVersion = pluginMap[req]; - } else if(trimmedReq === 'cordova' && !semver.satisfies(cordovaVersion, reqs[req])) { + } else if(trimmedReq === 'cordova' && !semver.satisfies(version, reqs[req])) { badInstalledVersion = cordovaVersion; } else if(trimmedReq.indexOf('cordova-') === 0) { // Might be a platform constraint --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
