Mobrovac has submitted this change and it was merged. Change subject: Update change-propagation to d75a478 ......................................................................
Update change-propagation to d75a478 List of changes: e1c6e7b Ban wikidata updates 99c6d5e Increased eslint timeout to pass the test d75a478 Minor config tweaks and fixes xxxxxxx Update node module dependencies Change-Id: I6b669f6487311a04e12c6638acbbb73b1704deed --- M node_modules/hyperswitch/node_modules/json-stable-stringify/package.json M node_modules/hyperswitch/node_modules/preq/node_modules/request/.travis.yml M node_modules/hyperswitch/node_modules/preq/node_modules/request/lib/redirect.js M node_modules/hyperswitch/node_modules/preq/node_modules/request/package.json M node_modules/hyperswitch/node_modules/preq/node_modules/request/request.js M node_modules/hyperswitch/node_modules/swagger-ui/package.json M node_modules/service-runner/node_modules/limitation/node_modules/kad/package.json M node_modules/service-runner/node_modules/limitation/node_modules/readable-stream/node_modules/inherits/package.json M node_modules/service-runner/node_modules/yargs/node_modules/read-pkg-up/node_modules/read-pkg/node_modules/graceful-fs/package.json M node_modules/service-runner/node_modules/yargs/node_modules/read-pkg-up/node_modules/read-pkg/node_modules/graceful-fs/polyfills.js M node_modules/service-runner/node_modules/yargs/node_modules/string-width/node_modules/code-point-at/index.js M node_modules/service-runner/node_modules/yargs/node_modules/string-width/node_modules/code-point-at/package.json R node_modules/service-runner/node_modules/yargs/node_modules/string-width/node_modules/is-fullwidth-code-point/node_modules/number-is-nan/index.js R node_modules/service-runner/node_modules/yargs/node_modules/string-width/node_modules/is-fullwidth-code-point/node_modules/number-is-nan/license R node_modules/service-runner/node_modules/yargs/node_modules/string-width/node_modules/is-fullwidth-code-point/node_modules/number-is-nan/package.json M src 16 files changed, 80 insertions(+), 56 deletions(-) Approvals: Mobrovac: Verified; Looks good to me, approved diff --git a/node_modules/hyperswitch/node_modules/json-stable-stringify/package.json b/node_modules/hyperswitch/node_modules/json-stable-stringify/package.json index 6fa6874..2f1d2cd 100644 --- a/node_modules/hyperswitch/node_modules/json-stable-stringify/package.json +++ b/node_modules/hyperswitch/node_modules/json-stable-stringify/package.json @@ -50,7 +50,7 @@ "url": "https://github.com/substack/json-stable-stringify/issues" }, "_id": "json-stable-stringify@1.0.0", - "_shasum": "83166fcb4cb9d0b4acfdab73288cfde088e28dda", + "_shasum": "5c4d1b827489895a559ba7a78df8d933a3bf5d50", "_from": "git+https://github.com/wikimedia/json-stable-stringify.git#master", "_resolved": "git+https://github.com/wikimedia/json-stable-stringify.git#c05178e4dfc3834017f017732934c1c52ba3dd8f" } diff --git a/node_modules/hyperswitch/node_modules/preq/node_modules/request/.travis.yml b/node_modules/hyperswitch/node_modules/preq/node_modules/request/.travis.yml index 9be8247..643e655 100644 --- a/node_modules/hyperswitch/node_modules/preq/node_modules/request/.travis.yml +++ b/node_modules/hyperswitch/node_modules/preq/node_modules/request/.travis.yml @@ -5,7 +5,6 @@ - node - 6 - 4 - - 0.12 after_script: - npm run test-cov diff --git a/node_modules/hyperswitch/node_modules/preq/node_modules/request/lib/redirect.js b/node_modules/hyperswitch/node_modules/preq/node_modules/request/lib/redirect.js index 040dfe0..f860449 100644 --- a/node_modules/hyperswitch/node_modules/preq/node_modules/request/lib/redirect.js +++ b/node_modules/hyperswitch/node_modules/preq/node_modules/request/lib/redirect.js @@ -8,6 +8,7 @@ this.followRedirect = true this.followRedirects = true this.followAllRedirects = false + this.followOriginalHttpMethod = false this.allowRedirect = function () {return true} this.maxRedirects = 10 this.redirects = [] @@ -35,6 +36,9 @@ } if (options.removeRefererHeader !== undefined) { self.removeRefererHeader = options.removeRefererHeader + } + if (options.followOriginalHttpMethod !== undefined) { + self.followOriginalHttpMethod = options.followOriginalHttpMethod } } @@ -115,7 +119,7 @@ ) if (self.followAllRedirects && request.method !== 'HEAD' && response.statusCode !== 401 && response.statusCode !== 307) { - request.method = 'GET' + request.method = self.followOriginalHttpMethod ? request.method : 'GET' } // request.method = 'GET' // Force all redirects to use GET || commented out fixes #215 delete request.src diff --git a/node_modules/hyperswitch/node_modules/preq/node_modules/request/package.json b/node_modules/hyperswitch/node_modules/preq/node_modules/request/package.json index 2b79f56..144efe9 100644 --- a/node_modules/hyperswitch/node_modules/preq/node_modules/request/package.json +++ b/node_modules/hyperswitch/node_modules/preq/node_modules/request/package.json @@ -7,7 +7,7 @@ "util", "utility" ], - "version": "2.76.0", + "version": "2.77.0", "author": { "name": "Mikeal Rogers", "email": "mikeal.rog...@gmail.com" @@ -21,7 +21,7 @@ }, "license": "Apache-2.0", "engines": { - "node": ">=0.8.0" + "node": ">= 4" }, "main": "index.js", "dependencies": { @@ -82,10 +82,10 @@ "har-validator" ] }, - "gitHead": "7e873863803817d321dbc994d3eff943cde42ac7", + "gitHead": "8d534217a9411053e40885120696515c1bee0673", "homepage": "https://github.com/request/request#readme", - "_id": "request@2.76.0", - "_shasum": "be44505afef70360a0436955106be3945d95560e", + "_id": "request@2.77.0", + "_shasum": "2b00d82030ededcc97089ffa5d8810a9c2aa314b", "_from": "request@>=2.67.0 <3.0.0", "_npmVersion": "2.15.9", "_nodeVersion": "6.5.0", @@ -94,8 +94,8 @@ "email": "simeonvelich...@gmail.com" }, "dist": { - "shasum": "be44505afef70360a0436955106be3945d95560e", - "tarball": "https://registry.npmjs.org/request/-/request-2.76.0.tgz" + "shasum": "2b00d82030ededcc97089ffa5d8810a9c2aa314b", + "tarball": "https://registry.npmjs.org/request/-/request-2.77.0.tgz" }, "maintainers": [ { @@ -116,9 +116,9 @@ } ], "_npmOperationalInternal": { - "host": "packages-12-west.internal.npmjs.com", - "tmp": "tmp/request-2.76.0.tgz_1477385874691_0.41635931469500065" + "host": "packages-18-east.internal.npmjs.com", + "tmp": "tmp/request-2.77.0.tgz_1478171877374_0.7896335965488106" }, "directories": {}, - "_resolved": "https://registry.npmjs.org/request/-/request-2.76.0.tgz" + "_resolved": "https://registry.npmjs.org/request/-/request-2.77.0.tgz" } diff --git a/node_modules/hyperswitch/node_modules/preq/node_modules/request/request.js b/node_modules/hyperswitch/node_modules/preq/node_modules/request/request.js index 8ed57b7..035385d 100644 --- a/node_modules/hyperswitch/node_modules/preq/node_modules/request/request.js +++ b/node_modules/hyperswitch/node_modules/preq/node_modules/request/request.js @@ -766,8 +766,15 @@ self.emit('drain') }) self.req.on('socket', function(socket) { - if (timeout !== undefined) { - socket.once('connect', function() { + // `._connecting` was the old property which was made public in node v6.1.0 + var isConnecting = socket._connecting || socket.connecting + // Only start the connection timer if we're actually connecting a new + // socket, otherwise if we're already connected (because this is a + // keep-alive connection) do not bother. This is important since we won't + // get a 'connect' event for an already connected socket. + if (timeout !== undefined && isConnecting) { + var onReqSockConnect = function() { + socket.removeListener('connect', onReqSockConnect) clearTimeout(self.timeoutTimer) self.timeoutTimer = null // Set an additional timeout on the socket, via the `setsockopt` syscall. @@ -785,6 +792,12 @@ self.emit('error', e) } }) + } + + socket.on('connect', onReqSockConnect) + + self.req.on('error', function(err) { + socket.removeListener('connect', onReqSockConnect) }) // Set a timeout in memory - this block will throw if the server takes more @@ -792,6 +805,7 @@ // the on('response') event on the client). NB: this measures wall-clock // time, not the time between bytes sent by the server. self.timeoutTimer = setTimeout(function () { + socket.removeListener('connect', onReqSockConnect) self.abort() var e = new Error('ETIMEDOUT') e.code = 'ETIMEDOUT' diff --git a/node_modules/hyperswitch/node_modules/swagger-ui/package.json b/node_modules/hyperswitch/node_modules/swagger-ui/package.json index 7f2787a..1c2f354 100644 --- a/node_modules/hyperswitch/node_modules/swagger-ui/package.json +++ b/node_modules/hyperswitch/node_modules/swagger-ui/package.json @@ -70,7 +70,7 @@ "url": "https://github.com/swagger-api/swagger-ui/issues" }, "_id": "swagger-ui@2.2.5", - "_shasum": "995e6f1ce6c96d5b9dd27c6fd732adf4326d9f7a", + "_shasum": "b829cdabaa7db2534a3171b0dffdee344a4378ec", "_from": "git+https://github.com/wikimedia/swagger-ui.git#master", "_resolved": "git+https://github.com/wikimedia/swagger-ui.git#c3a313727ad641d71142768bf05cdd6da22ba84a" } diff --git a/node_modules/service-runner/node_modules/limitation/node_modules/kad/package.json b/node_modules/service-runner/node_modules/limitation/node_modules/kad/package.json index 1a7c298..2a11da5 100644 --- a/node_modules/service-runner/node_modules/limitation/node_modules/kad/package.json +++ b/node_modules/service-runner/node_modules/limitation/node_modules/kad/package.json @@ -75,7 +75,7 @@ }, "homepage": "https://github.com/kadtools/kad#readme", "_id": "kad@1.3.6", - "_shasum": "d9acb25082a5638f2fc7e282939023464cc4ecc8", + "_shasum": "e260b059cd7c68e6ee62e44bd0a97c4667dac17e", "_from": "git+https://github.com/gwicke/kad.git#master", "_resolved": "git+https://github.com/gwicke/kad.git#f35971036f43814043245da82b12d035b7bbfd16" } diff --git a/node_modules/service-runner/node_modules/limitation/node_modules/readable-stream/node_modules/inherits/package.json b/node_modules/service-runner/node_modules/limitation/node_modules/readable-stream/node_modules/inherits/package.json index 9146e75..f0e62d3 100644 --- a/node_modules/service-runner/node_modules/limitation/node_modules/readable-stream/node_modules/inherits/package.json +++ b/node_modules/service-runner/node_modules/limitation/node_modules/readable-stream/node_modules/inherits/package.json @@ -58,6 +58,5 @@ "tmp": "tmp/inherits-2.0.3.tgz_1473295776489_0.08142363070510328" }, "directories": {}, - "_resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "readme": "ERROR: No README data found!" + "_resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz" } diff --git a/node_modules/service-runner/node_modules/yargs/node_modules/read-pkg-up/node_modules/read-pkg/node_modules/graceful-fs/package.json b/node_modules/service-runner/node_modules/yargs/node_modules/read-pkg-up/node_modules/read-pkg/node_modules/graceful-fs/package.json index 26c2cc6..f17f98b 100644 --- a/node_modules/service-runner/node_modules/yargs/node_modules/read-pkg-up/node_modules/read-pkg/node_modules/graceful-fs/package.json +++ b/node_modules/service-runner/node_modules/yargs/node_modules/read-pkg-up/node_modules/read-pkg/node_modules/graceful-fs/package.json @@ -1,7 +1,7 @@ { "name": "graceful-fs", "description": "A drop-in replacement for fs, making various improvements.", - "version": "4.1.9", + "version": "4.1.10", "repository": { "type": "git", "url": "git+https://github.com/isaacs/node-graceful-fs.git" @@ -44,14 +44,14 @@ "legacy-streams.js", "polyfills.js" ], - "gitHead": "0798db3711e33de92de5a93979278bb89d629143", + "gitHead": "db8df443122686696293d47f11c227d53cab90f0", "bugs": { "url": "https://github.com/isaacs/node-graceful-fs/issues" }, "homepage": "https://github.com/isaacs/node-graceful-fs#readme", - "_id": "graceful-fs@4.1.9", - "_shasum": "baacba37d19d11f9d146d3578bc99958c3787e29", - "_from": "graceful-fs@4.1.9", + "_id": "graceful-fs@4.1.10", + "_shasum": "f2d720c22092f743228775c75e3612632501f131", + "_from": "graceful-fs@4.1.10", "_npmVersion": "3.10.7", "_nodeVersion": "6.5.0", "_npmUser": { @@ -59,8 +59,8 @@ "email": "i...@izs.me" }, "dist": { - "shasum": "baacba37d19d11f9d146d3578bc99958c3787e29", - "tarball": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.9.tgz" + "shasum": "f2d720c22092f743228775c75e3612632501f131", + "tarball": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.10.tgz" }, "maintainers": [ { @@ -69,9 +69,9 @@ } ], "_npmOperationalInternal": { - "host": "packages-12-west.internal.npmjs.com", - "tmp": "tmp/graceful-fs-4.1.9.tgz_1475103672016_0.7011275647673756" + "host": "packages-18-east.internal.npmjs.com", + "tmp": "tmp/graceful-fs-4.1.10.tgz_1478127353765_0.5264726441819221" }, - "_resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.9.tgz", + "_resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.10.tgz", "readme": "ERROR: No README data found!" } diff --git a/node_modules/service-runner/node_modules/yargs/node_modules/read-pkg-up/node_modules/read-pkg/node_modules/graceful-fs/polyfills.js b/node_modules/service-runner/node_modules/yargs/node_modules/read-pkg-up/node_modules/read-pkg/node_modules/graceful-fs/polyfills.js index cf474df..ab6b32b 100644 --- a/node_modules/service-runner/node_modules/yargs/node_modules/read-pkg-up/node_modules/read-pkg/node_modules/graceful-fs/polyfills.js +++ b/node_modules/service-runner/node_modules/yargs/node_modules/read-pkg-up/node_modules/read-pkg/node_modules/graceful-fs/polyfills.js @@ -80,15 +80,27 @@ // on Windows, A/V software can lock the directory, causing this // to fail with an EACCES or EPERM if the directory contains newly - // created files. Try again on failure, for up to 1 second. + // created files. Try again on failure, for up to 60 seconds. + + // Set the timeout this long because some Windows Anti-Virus, such as Parity + // bit9, may lock files for up to a minute, causing npm package install + // failures. Also, take care to yield the scheduler. Windows scheduling gives + // CPU to a busy looping process, which can cause the program causing the lock + // contention to be starved of CPU by node, so the contention doesn't resolve. if (process.platform === "win32") { fs.rename = (function (fs$rename) { return function (from, to, cb) { var start = Date.now() + var backoff = 0; fs$rename(from, to, function CB (er) { if (er && (er.code === "EACCES" || er.code === "EPERM") - && Date.now() - start < 1000) { - return fs$rename(from, to, CB) + && Date.now() - start < 60000) { + setTimeout(function() { + fs$rename(from, to, CB); + }, backoff) + if (backoff < 100) + backoff += 10; + return; } if (cb) cb(er) }) diff --git a/node_modules/service-runner/node_modules/yargs/node_modules/string-width/node_modules/code-point-at/index.js b/node_modules/service-runner/node_modules/yargs/node_modules/string-width/node_modules/code-point-at/index.js index 0335117..0432fe6 100644 --- a/node_modules/service-runner/node_modules/yargs/node_modules/string-width/node_modules/code-point-at/index.js +++ b/node_modules/service-runner/node_modules/yargs/node_modules/string-width/node_modules/code-point-at/index.js @@ -1,6 +1,5 @@ +/* eslint-disable babel/new-cap, xo/throw-new-error */ 'use strict'; -var numberIsNan = require('number-is-nan'); - module.exports = function (str, pos) { if (str === null || str === undefined) { throw TypeError(); @@ -11,7 +10,7 @@ var size = str.length; var i = pos ? Number(pos) : 0; - if (numberIsNan(i)) { + if (Number.isNaN(i)) { i = 0; } @@ -25,7 +24,7 @@ var second = str.charCodeAt(i + 1); if (second >= 0xDC00 && second <= 0xDFFF) { - return (first - 0xD800) * 0x400 + second - 0xDC00 + 0x10000; + return ((first - 0xD800) * 0x400) + second - 0xDC00 + 0x10000; } } diff --git a/node_modules/service-runner/node_modules/yargs/node_modules/string-width/node_modules/code-point-at/package.json b/node_modules/service-runner/node_modules/yargs/node_modules/string-width/node_modules/code-point-at/package.json index 00cd453..019085d 100644 --- a/node_modules/service-runner/node_modules/yargs/node_modules/string-width/node_modules/code-point-at/package.json +++ b/node_modules/service-runner/node_modules/yargs/node_modules/string-width/node_modules/code-point-at/package.json @@ -1,7 +1,7 @@ { "name": "code-point-at", - "version": "1.0.1", - "description": "ES2015 String#codePointAt() ponyfill", + "version": "1.1.0", + "description": "ES2015 `String#codePointAt()` ponyfill", "license": "MIT", "repository": { "type": "git", @@ -16,7 +16,7 @@ "node": ">=0.10.0" }, "scripts": { - "test": "ava" + "test": "xo && ava" }, "files": [ "index.js" @@ -34,29 +34,27 @@ "codepoint", "unicode" ], - "dependencies": { - "number-is-nan": "^1.0.0" - }, "devDependencies": { - "ava": "*" + "ava": "*", + "xo": "^0.16.0" }, - "gitHead": "502d72c5a959275e5d90f9c6641589756af44085", + "gitHead": "f8f21c8df2d40248fef1b36ca9076e59c0c34791", "bugs": { "url": "https://github.com/sindresorhus/code-point-at/issues" }, "homepage": "https://github.com/sindresorhus/code-point-at#readme", - "_id": "code-point-at@1.0.1", - "_shasum": "1104cd34f9b5b45d3eba88f1babc1924e1ce35fb", + "_id": "code-point-at@1.1.0", + "_shasum": "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77", "_from": "code-point-at@>=1.0.0 <2.0.0", "_npmVersion": "2.15.9", - "_nodeVersion": "4.5.0", + "_nodeVersion": "4.6.1", "_npmUser": { "name": "sindresorhus", "email": "sindresor...@gmail.com" }, "dist": { - "shasum": "1104cd34f9b5b45d3eba88f1babc1924e1ce35fb", - "tarball": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.0.1.tgz" + "shasum": "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77", + "tarball": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz" }, "maintainers": [ { @@ -65,9 +63,9 @@ } ], "_npmOperationalInternal": { - "host": "packages-16-east.internal.npmjs.com", - "tmp": "tmp/code-point-at-1.0.1.tgz_1475223183649_0.724906453397125" + "host": "packages-12-west.internal.npmjs.com", + "tmp": "tmp/code-point-at-1.1.0.tgz_1478169780337_0.8445875702891499" }, "directories": {}, - "_resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.0.1.tgz" + "_resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz" } diff --git a/node_modules/service-runner/node_modules/yargs/node_modules/string-width/node_modules/number-is-nan/index.js b/node_modules/service-runner/node_modules/yargs/node_modules/string-width/node_modules/is-fullwidth-code-point/node_modules/number-is-nan/index.js similarity index 100% rename from node_modules/service-runner/node_modules/yargs/node_modules/string-width/node_modules/number-is-nan/index.js rename to node_modules/service-runner/node_modules/yargs/node_modules/string-width/node_modules/is-fullwidth-code-point/node_modules/number-is-nan/index.js diff --git a/node_modules/service-runner/node_modules/yargs/node_modules/string-width/node_modules/number-is-nan/license b/node_modules/service-runner/node_modules/yargs/node_modules/string-width/node_modules/is-fullwidth-code-point/node_modules/number-is-nan/license similarity index 100% rename from node_modules/service-runner/node_modules/yargs/node_modules/string-width/node_modules/number-is-nan/license rename to node_modules/service-runner/node_modules/yargs/node_modules/string-width/node_modules/is-fullwidth-code-point/node_modules/number-is-nan/license diff --git a/node_modules/service-runner/node_modules/yargs/node_modules/string-width/node_modules/number-is-nan/package.json b/node_modules/service-runner/node_modules/yargs/node_modules/string-width/node_modules/is-fullwidth-code-point/node_modules/number-is-nan/package.json similarity index 93% rename from node_modules/service-runner/node_modules/yargs/node_modules/string-width/node_modules/number-is-nan/package.json rename to node_modules/service-runner/node_modules/yargs/node_modules/string-width/node_modules/is-fullwidth-code-point/node_modules/number-is-nan/package.json index 13c8183..314cc1c 100644 --- a/node_modules/service-runner/node_modules/yargs/node_modules/string-width/node_modules/number-is-nan/package.json +++ b/node_modules/service-runner/node_modules/yargs/node_modules/string-width/node_modules/is-fullwidth-code-point/node_modules/number-is-nan/package.json @@ -42,7 +42,7 @@ "homepage": "https://github.com/sindresorhus/number-is-nan#readme", "_id": "number-is-nan@1.0.1", "_shasum": "097b602b53422a522c1afb8790318336941a011d", - "_from": "number-is-nan@1.0.1", + "_from": "number-is-nan@>=1.0.0 <2.0.0", "_npmVersion": "2.15.9", "_nodeVersion": "4.5.0", "_npmUser": { @@ -64,6 +64,5 @@ "tmp": "tmp/number-is-nan-1.0.1.tgz_1475212313367_0.9480371843092144" }, "directories": {}, - "_resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", - "readme": "ERROR: No README data found!" + "_resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz" } diff --git a/src b/src index b559d4c..d75a478 160000 --- a/src +++ b/src @@ -1 +1 @@ -Subproject commit b559d4c6635b9fdc9d370bfcc499ee442988bb11 +Subproject commit d75a478bfc6914b38e060ec55828f94f17ab7336 -- To view, visit https://gerrit.wikimedia.org/r/319550 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6b669f6487311a04e12c6638acbbb73b1704deed Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/change-propagation/deploy Gerrit-Branch: master Gerrit-Owner: Mobrovac <mobro...@wikimedia.org> Gerrit-Reviewer: Mobrovac <mobro...@wikimedia.org> Gerrit-Reviewer: Ppchelko <ppche...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits