jenkins-bot has submitted this change and it was merged.
Change subject: Fix batch retries and upgrade to request 2.63
......................................................................
Fix batch retries and upgrade to request 2.63
Upgrading request allows multipart form encoding to be done with
this.requestOptions, which fixes the broken retry handling.
Bug: T113206
Change-Id: Ib667349866ce20b52cdc7688375cb6807dd329f7
---
M lib/mediawiki.ApiRequest.js
M npm-shrinkwrap.json
M package.json
3 files changed, 377 insertions(+), 94 deletions(-)
Approvals:
Arlolra: Looks good to me, but someone else must approve
Subramanya Sastry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/mediawiki.ApiRequest.js b/lib/mediawiki.ApiRequest.js
index 7ce4a49..4476ec9 100644
--- a/lib/mediawiki.ApiRequest.js
+++ b/lib/mediawiki.ApiRequest.js
@@ -715,20 +715,15 @@
uri: env.conf.wiki.apiURI,
timeout: env.conf.parsoid.timeouts.mwApi.batch,
};
- var req = this.request(this.requestOptions, this._requestCB.bind(this));
-
// Use multipart form encoding to get more efficient transfer if the
gain
- // will be larger than the typical overhead. In later versions of the
request
- // library, this can easily be done with the formData option, but
coveralls
- // depends on request 2.40.0.
+ // will be larger than the typical overhead.
if (encodeURIComponent(apiargs.batch).length - apiargs.batch.length >
600) {
- var form = req.form();
- for (var optName in apiargs) {
- form.append(optName, apiargs[optName]);
- }
+ this.requestOptions.formData = apiargs;
} else {
- req.form(apiargs);
+ this.requestOptions.form = apiargs;
}
+
+ this.request(this.requestOptions, this._requestCB.bind(this));
}
util.inherits(BatchRequest, ApiRequest);
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 9f3c9cb..444ade7 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
{
"name": "parsoid",
- "version": "0.4.0-git",
+ "version": "0.4.1-git",
"dependencies": {
"alea": {
"version": "0.0.9",
@@ -362,6 +362,131 @@
"version": "1.2.4",
"from":
"https://registry.npmjs.org/log-driver/-/log-driver-1.2.4.tgz";,
"resolved":
"https://registry.npmjs.org/log-driver/-/log-driver-1.2.4.tgz";
+ },
+ "request": {
+ "version": "2.40.0",
+ "from": "https://registry.npmjs.org/request/-/request-2.40.0.tgz";,
+ "resolved":
"https://registry.npmjs.org/request/-/request-2.40.0.tgz";,
+ "dependencies": {
+ "qs": {
+ "version": "1.0.2",
+ "from": "https://registry.npmjs.org/qs/-/qs-1.0.2.tgz";,
+ "resolved": "https://registry.npmjs.org/qs/-/qs-1.0.2.tgz";
+ },
+ "json-stringify-safe": {
+ "version": "5.0.1",
+ "from":
"https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz";,
+ "resolved":
"https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz";
+ },
+ "mime-types": {
+ "version": "1.0.2",
+ "from":
"https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz";,
+ "resolved":
"https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz";
+ },
+ "forever-agent": {
+ "version": "0.5.2",
+ "from":
"https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz";,
+ "resolved":
"https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz";
+ },
+ "tough-cookie": {
+ "version": "2.0.0",
+ "from":
"https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.0.0.tgz";,
+ "resolved":
"https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.0.0.tgz";
+ },
+ "form-data": {
+ "version": "0.1.4",
+ "from":
"https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz";,
+ "resolved":
"https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz";,
+ "dependencies": {
+ "combined-stream": {
+ "version": "0.0.7",
+ "from":
"https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz";,
+ "resolved":
"https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz";,
+ "dependencies": {
+ "delayed-stream": {
+ "version": "0.0.5",
+ "from":
"https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz";,
+ "resolved":
"https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz";
+ }
+ }
+ },
+ "mime": {
+ "version": "1.2.11",
+ "from": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz";,
+ "resolved":
"https://registry.npmjs.org/mime/-/mime-1.2.11.tgz";
+ }
+ }
+ },
+ "tunnel-agent": {
+ "version": "0.4.1",
+ "from":
"https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.1.tgz";,
+ "resolved":
"https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.1.tgz";
+ },
+ "http-signature": {
+ "version": "0.10.1",
+ "from":
"https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz";,
+ "resolved":
"https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz";,
+ "dependencies": {
+ "assert-plus": {
+ "version": "0.1.5",
+ "from":
"https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz";,
+ "resolved":
"https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz";
+ },
+ "asn1": {
+ "version": "0.1.11",
+ "from": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz";,
+ "resolved":
"https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz";
+ },
+ "ctype": {
+ "version": "0.5.3",
+ "from": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz";,
+ "resolved":
"https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz";
+ }
+ }
+ },
+ "oauth-sign": {
+ "version": "0.3.0",
+ "from":
"https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz";,
+ "resolved":
"https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz";
+ },
+ "hawk": {
+ "version": "1.1.1",
+ "from": "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz";,
+ "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz";,
+ "dependencies": {
+ "hoek": {
+ "version": "0.9.1",
+ "from": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz";,
+ "resolved":
"https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz";
+ },
+ "boom": {
+ "version": "0.4.2",
+ "from": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz";,
+ "resolved":
"https://registry.npmjs.org/boom/-/boom-0.4.2.tgz";
+ },
+ "cryptiles": {
+ "version": "0.2.2",
+ "from":
"https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz";,
+ "resolved":
"https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz";
+ },
+ "sntp": {
+ "version": "0.2.4",
+ "from": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz";,
+ "resolved":
"https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz";
+ }
+ }
+ },
+ "aws-sign2": {
+ "version": "0.5.0",
+ "from":
"https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz";,
+ "resolved":
"https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz";
+ },
+ "stringstream": {
+ "version": "0.0.4",
+ "from":
"https://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz";,
+ "resolved":
"https://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz";
+ }
+ }
}
}
},
@@ -2586,80 +2711,122 @@
}
},
"request": {
- "version": "2.40.0",
- "from": "https://registry.npmjs.org/request/-/request-2.40.0.tgz";,
- "resolved": "https://registry.npmjs.org/request/-/request-2.40.0.tgz";,
+ "version": "2.63.0",
+ "from": "https://registry.npmjs.org/request/-/request-2.63.0.tgz";,
+ "resolved": "https://registry.npmjs.org/request/-/request-2.63.0.tgz";,
"dependencies": {
- "qs": {
- "version": "1.0.2",
- "from": "https://registry.npmjs.org/qs/-/qs-1.0.2.tgz";,
- "resolved": "https://registry.npmjs.org/qs/-/qs-1.0.2.tgz";
- },
- "json-stringify-safe": {
- "version": "5.0.0",
- "from":
"https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz";,
- "resolved":
"https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz";
- },
- "mime-types": {
- "version": "1.0.2",
- "from":
"https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz";,
- "resolved":
"https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz";
- },
- "forever-agent": {
- "version": "0.5.2",
- "from":
"https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz";,
- "resolved":
"https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz";
- },
- "tough-cookie": {
- "version": "0.12.1",
- "from":
"https://registry.npmjs.org/tough-cookie/-/tough-cookie-0.12.1.tgz";,
- "resolved":
"https://registry.npmjs.org/tough-cookie/-/tough-cookie-0.12.1.tgz";,
+ "bl": {
+ "version": "1.0.0",
+ "from": "https://registry.npmjs.org/bl/-/bl-1.0.0.tgz";,
+ "resolved": "https://registry.npmjs.org/bl/-/bl-1.0.0.tgz";,
"dependencies": {
- "punycode": {
- "version": "1.3.1",
- "from":
"https://registry.npmjs.org/punycode/-/punycode-1.3.1.tgz";,
- "resolved":
"https://registry.npmjs.org/punycode/-/punycode-1.3.1.tgz";
- }
- }
- },
- "form-data": {
- "version": "0.1.4",
- "from": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz";,
- "resolved":
"https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz";,
- "dependencies": {
- "combined-stream": {
- "version": "0.0.5",
- "from":
"https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.5.tgz";,
- "resolved":
"https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.5.tgz";,
+ "readable-stream": {
+ "version": "2.0.2",
+ "from":
"https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.2.tgz";,
+ "resolved":
"https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.2.tgz";,
"dependencies": {
- "delayed-stream": {
- "version": "0.0.5",
- "from":
"https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz";,
- "resolved":
"https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz";
+ "core-util-is": {
+ "version": "1.0.1",
+ "from":
"https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz";,
+ "resolved":
"https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz";
+ },
+ "inherits": {
+ "version": "2.0.1",
+ "from":
"https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz";,
+ "resolved":
"https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz";
+ },
+ "isarray": {
+ "version": "0.0.1",
+ "from":
"https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz";,
+ "resolved":
"https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz";
+ },
+ "process-nextick-args": {
+ "version": "1.0.3",
+ "from":
"https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.3.tgz";,
+ "resolved":
"https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.3.tgz";
+ },
+ "string_decoder": {
+ "version": "0.10.31",
+ "from":
"https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz";,
+ "resolved":
"https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz";
+ },
+ "util-deprecate": {
+ "version": "1.0.1",
+ "from":
"https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.1.tgz";,
+ "resolved":
"https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.1.tgz";
}
}
- },
- "mime": {
- "version": "1.2.11",
- "from": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz";,
- "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz";
}
}
},
+ "caseless": {
+ "version": "0.11.0",
+ "from": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz";,
+ "resolved":
"https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz";
+ },
+ "extend": {
+ "version": "3.0.0",
+ "from": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz";,
+ "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz";
+ },
+ "forever-agent": {
+ "version": "0.6.1",
+ "from":
"https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz";,
+ "resolved":
"https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz";
+ },
+ "form-data": {
+ "version": "1.0.0-rc3",
+ "from":
"https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc3.tgz";,
+ "resolved":
"https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc3.tgz";,
+ "dependencies": {
+ "async": {
+ "version": "1.4.2",
+ "from": "https://registry.npmjs.org/async/-/async-1.4.2.tgz";,
+ "resolved": "https://registry.npmjs.org/async/-/async-1.4.2.tgz";
+ }
+ }
+ },
+ "json-stringify-safe": {
+ "version": "5.0.1",
+ "from":
"https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz";,
+ "resolved":
"https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz";
+ },
+ "mime-types": {
+ "version": "2.1.7",
+ "from":
"https://registry.npmjs.org/mime-types/-/mime-types-2.1.7.tgz";,
+ "resolved":
"https://registry.npmjs.org/mime-types/-/mime-types-2.1.7.tgz";,
+ "dependencies": {
+ "mime-db": {
+ "version": "1.19.0",
+ "from":
"https://registry.npmjs.org/mime-db/-/mime-db-1.19.0.tgz";,
+ "resolved":
"https://registry.npmjs.org/mime-db/-/mime-db-1.19.0.tgz";
+ }
+ }
+ },
+ "qs": {
+ "version": "5.1.0",
+ "from": "https://registry.npmjs.org/qs/-/qs-5.1.0.tgz";,
+ "resolved": "https://registry.npmjs.org/qs/-/qs-5.1.0.tgz";
+ },
"tunnel-agent": {
- "version": "0.4.0",
- "from":
"https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz";,
- "resolved":
"https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz";
+ "version": "0.4.1",
+ "from":
"https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.1.tgz";,
+ "resolved":
"https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.1.tgz";
+ },
+ "tough-cookie": {
+ "version": "2.0.0",
+ "from":
"https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.0.0.tgz";,
+ "resolved":
"https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.0.0.tgz";
},
"http-signature": {
- "version": "0.10.0",
- "from":
"https://registry.npmjs.org/http-signature/-/http-signature-0.10.0.tgz";,
- "resolved":
"https://registry.npmjs.org/http-signature/-/http-signature-0.10.0.tgz";,
+ "version": "0.11.0",
+ "from":
"https://registry.npmjs.org/http-signature/-/http-signature-0.11.0.tgz";,
+ "resolved":
"https://registry.npmjs.org/http-signature/-/http-signature-0.11.0.tgz";,
"dependencies": {
"assert-plus": {
- "version": "0.1.2",
- "from":
"https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.2.tgz";,
- "resolved":
"https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.2.tgz";
+ "version": "0.1.5",
+ "from":
"https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz";,
+ "resolved":
"https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz";
},
"asn1": {
"version": "0.1.11",
@@ -2667,41 +2834,41 @@
"resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz";
},
"ctype": {
- "version": "0.5.2",
- "from": "https://registry.npmjs.org/ctype/-/ctype-0.5.2.tgz";,
- "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.2.tgz";
+ "version": "0.5.3",
+ "from": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz";,
+ "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz";
}
}
},
"oauth-sign": {
- "version": "0.3.0",
- "from":
"https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz";,
- "resolved":
"https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz";
+ "version": "0.8.0",
+ "from":
"https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.0.tgz";,
+ "resolved":
"https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.0.tgz";
},
"hawk": {
- "version": "1.1.1",
- "from": "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz";,
- "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz";,
+ "version": "3.1.0",
+ "from": "https://registry.npmjs.org/hawk/-/hawk-3.1.0.tgz";,
+ "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.0.tgz";,
"dependencies": {
"hoek": {
- "version": "0.9.1",
- "from": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz";,
- "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz";
+ "version": "2.16.3",
+ "from": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz";,
+ "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz";
},
"boom": {
- "version": "0.4.2",
- "from": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz";,
- "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz";
+ "version": "2.9.0",
+ "from": "https://registry.npmjs.org/boom/-/boom-2.9.0.tgz";,
+ "resolved": "https://registry.npmjs.org/boom/-/boom-2.9.0.tgz";
},
"cryptiles": {
- "version": "0.2.2",
- "from":
"https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz";,
- "resolved":
"https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz";
+ "version": "2.0.5",
+ "from":
"https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz";,
+ "resolved":
"https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz";
},
"sntp": {
- "version": "0.2.4",
- "from": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz";,
- "resolved": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz";
+ "version": "1.0.9",
+ "from": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz";,
+ "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz";
}
}
},
@@ -2714,6 +2881,127 @@
"version": "0.0.4",
"from":
"https://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz";,
"resolved":
"https://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz";
+ },
+ "combined-stream": {
+ "version": "1.0.5",
+ "from":
"https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz";,
+ "resolved":
"https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz";,
+ "dependencies": {
+ "delayed-stream": {
+ "version": "1.0.0",
+ "from":
"https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz";,
+ "resolved":
"https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz";
+ }
+ }
+ },
+ "isstream": {
+ "version": "0.1.2",
+ "from": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz";,
+ "resolved":
"https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz";
+ },
+ "har-validator": {
+ "version": "1.8.0",
+ "from":
"https://registry.npmjs.org/har-validator/-/har-validator-1.8.0.tgz";,
+ "resolved":
"https://registry.npmjs.org/har-validator/-/har-validator-1.8.0.tgz";,
+ "dependencies": {
+ "bluebird": {
+ "version": "2.10.1",
+ "from":
"https://registry.npmjs.org/bluebird/-/bluebird-2.10.1.tgz";,
+ "resolved":
"https://registry.npmjs.org/bluebird/-/bluebird-2.10.1.tgz";
+ },
+ "chalk": {
+ "version": "1.1.1",
+ "from": "https://registry.npmjs.org/chalk/-/chalk-1.1.1.tgz";,
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.1.tgz";,
+ "dependencies": {
+ "ansi-styles": {
+ "version": "2.1.0",
+ "from":
"https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.1.0.tgz";,
+ "resolved":
"https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.1.0.tgz";
+ },
+ "escape-string-regexp": {
+ "version": "1.0.3",
+ "from":
"https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz";,
+ "resolved":
"https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz";
+ },
+ "has-ansi": {
+ "version": "2.0.0",
+ "from":
"https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz";,
+ "resolved":
"https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz";,
+ "dependencies": {
+ "ansi-regex": {
+ "version": "2.0.0",
+ "from":
"https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz";,
+ "resolved":
"https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz";
+ }
+ }
+ },
+ "strip-ansi": {
+ "version": "3.0.0",
+ "from":
"https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz";,
+ "resolved":
"https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz";,
+ "dependencies": {
+ "ansi-regex": {
+ "version": "2.0.0",
+ "from":
"https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz";,
+ "resolved":
"https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz";
+ }
+ }
+ },
+ "supports-color": {
+ "version": "2.0.0",
+ "from":
"https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz";,
+ "resolved":
"https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz";
+ }
+ }
+ },
+ "commander": {
+ "version": "2.8.1",
+ "from":
"https://registry.npmjs.org/commander/-/commander-2.8.1.tgz";,
+ "resolved":
"https://registry.npmjs.org/commander/-/commander-2.8.1.tgz";,
+ "dependencies": {
+ "graceful-readlink": {
+ "version": "1.0.1",
+ "from":
"https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz";,
+ "resolved":
"https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz";
+ }
+ }
+ },
+ "is-my-json-valid": {
+ "version": "2.12.2",
+ "from":
"https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.2.tgz";,
+ "resolved":
"https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.2.tgz";,
+ "dependencies": {
+ "generate-function": {
+ "version": "2.0.0",
+ "from":
"https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz";,
+ "resolved":
"https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz";
+ },
+ "generate-object-property": {
+ "version": "1.2.0",
+ "from":
"https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz";,
+ "resolved":
"https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz";,
+ "dependencies": {
+ "is-property": {
+ "version": "1.0.2",
+ "from":
"https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz";,
+ "resolved":
"https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz";
+ }
+ }
+ },
+ "jsonpointer": {
+ "version": "2.0.0",
+ "from":
"https://registry.npmjs.org/jsonpointer/-/jsonpointer-2.0.0.tgz";,
+ "resolved":
"https://registry.npmjs.org/jsonpointer/-/jsonpointer-2.0.0.tgz";
+ },
+ "xtend": {
+ "version": "4.0.0",
+ "from": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz";,
+ "resolved":
"https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz";
+ }
+ }
+ }
+ }
}
}
},
diff --git a/package.json b/package.json
index d886d62..6dd3c2b 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
"node-uuid": "~1.4.1",
"pegjs": "git+https://github.com/tstarling/pegjs#fork";,
"prfun": "~2.0.0",
- "request": "~2.40.0",
+ "request": "~2.63.0",
"serve-favicon": "~2.3.0",
"simplediff": "~0.1.1",
"yargs": "~1.3.1"
--
To view, visit https://gerrit.wikimedia.org/r/240296
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib667349866ce20b52cdc7688375cb6807dd329f7
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Tim Starling <[email protected]>
Gerrit-Reviewer: Arlolra <[email protected]>
Gerrit-Reviewer: Cscott <[email protected]>
Gerrit-Reviewer: Subramanya Sastry <[email protected]>
Gerrit-Reviewer: Tim Starling <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
