CB-12017 : updated dependencies rewire and request
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/744f4432 Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/744f4432 Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/744f4432 Branch: refs/heads/common-2.0.x Commit: 744f44329016a90c580337e7c6d9e186392729b4 Parents: 3f0db62 Author: Audrey So <[email protected]> Authored: Mon Feb 6 11:03:13 2017 -0800 Committer: Steve Gill <[email protected]> Committed: Thu Mar 23 22:13:03 2017 -0700 ---------------------------------------------------------------------- cordova-lib/package.json | 20 ++++++++++---------- cordova-lib/spec-cordova/HooksRunner.spec.js | 6 ++++-- cordova-lib/src/cordova/lazy_load.js | 2 +- .../src/cordova/metadata/blackberry10_parser.js | 2 +- 4 files changed, 16 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/744f4432/cordova-lib/package.json ---------------------------------------------------------------------- diff --git a/cordova-lib/package.json b/cordova-lib/package.json index 03cb219..16ee192 100644 --- a/cordova-lib/package.json +++ b/cordova-lib/package.json @@ -27,16 +27,16 @@ "cordova-serve": "^1.0.0", "dep-graph": "1.1.0", "elementtree": "0.1.6", - "glob": "^5.0.3", + "glob": "7.1.1", "init-package-json": "^1.2.0", - "nopt": "^3.0.6", - "npm": "^2.10.x", - "opener": "1.4.1", - "plist": "^1.2.0", - "properties-parser": "0.2.3", + "nopt": "4.0.1", + "npm": "4.1.2", + "opener": "1.4.2", + "plist": "2.0.1", + "properties-parser": "0.3.1", "q": "1.0.1", - "request": "2.47.0", - "semver": "^4.3.x", + "request": "2.79.0", + "semver": "5.3.0", "shelljs": "0.3.0", "tar": "2.2.1", "underscore": "1.8.3", @@ -49,7 +49,7 @@ "istanbul": "^0.4.5", "jasmine": "^2.5.2", "jshint": "2.5.8", - "rewire": "2.1.3" + "rewire": "2.5.2" }, "scripts": { "test": "npm run jshint && npm run jasmine", @@ -170,4 +170,4 @@ "name": "Shazron Abdullah" } ] -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/744f4432/cordova-lib/spec-cordova/HooksRunner.spec.js ---------------------------------------------------------------------- diff --git a/cordova-lib/spec-cordova/HooksRunner.spec.js b/cordova-lib/spec-cordova/HooksRunner.spec.js index 859822d..28d7d5f 100644 --- a/cordova-lib/spec-cordova/HooksRunner.spec.js +++ b/cordova-lib/spec-cordova/HooksRunner.spec.js @@ -562,6 +562,7 @@ describe('HooksRunner', function() { it('Test 019 : should execute event listeners serially', function(done) { var h1_fired = false; + var h2_fired; var h1 = function() { expect(h2_fired).toBe(false); // Delay 100 ms here to check that h2 is not executed until after @@ -571,7 +572,7 @@ describe('HooksRunner', function() { }); return q; }; - var h2_fired = false; + h2_fired = false; var h2 = function() { h2_fired = true; expect(h1_fired).toBe(true); @@ -594,12 +595,13 @@ describe('HooksRunner', function() { it('Test 020 : should allow for hook to opt into asynchronous execution and block further hooks from firing using the done callback', function(done) { var h1_fired = false; + var h2_fired; var h1 = function () { h1_fired = true; expect(h2_fired).toBe(false); return Q(); }; - var h2_fired = false; + h2_fired = false; var h2 = function () { h2_fired = true; expect(h1_fired).toBe(true); http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/744f4432/cordova-lib/src/cordova/lazy_load.js ---------------------------------------------------------------------- diff --git a/cordova-lib/src/cordova/lazy_load.js b/cordova-lib/src/cordova/lazy_load.js index 379f447..db55b68 100644 --- a/cordova-lib/src/cordova/lazy_load.js +++ b/cordova-lib/src/cordova/lazy_load.js @@ -18,7 +18,7 @@ */ // The URL:true below prevents jshint error "Redefinition or 'URL'." -/* globals URL:true */ +// globals URL:true var path = require('path'), _ = require('underscore'), http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/744f4432/cordova-lib/src/cordova/metadata/blackberry10_parser.js ---------------------------------------------------------------------- diff --git a/cordova-lib/src/cordova/metadata/blackberry10_parser.js b/cordova-lib/src/cordova/metadata/blackberry10_parser.js index 136a317..af42afe 100644 --- a/cordova-lib/src/cordova/metadata/blackberry10_parser.js +++ b/cordova-lib/src/cordova/metadata/blackberry10_parser.js @@ -65,7 +65,7 @@ blackberry_parser.prototype.update_from_config = function(config) { } }; - if (!config instanceof ConfigParser) { + if (!(config instanceof ConfigParser)) { throw new Error('update_from_config requires a ConfigParser object'); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
