Yurik has submitted this change and it was merged. Change subject: Update graphoid to 1518e07 ......................................................................
Update graphoid to 1518e07 List of changes: 1518e07 updated to not use protocol colon xxxxxxx Update node module dependencies Change-Id: I338d582645d8ecc4abe6f70e903c315c34522a90 --- M node_modules/compression/node_modules/accepts/node_modules/mime-types/package.json M node_modules/express/node_modules/accepts/node_modules/mime-types/package.json M node_modules/graph-shared/package.json M node_modules/graph-shared/src/VegaWrapper.js M node_modules/vega-1x/package.json M node_modules/vega/node_modules/yargs/node_modules/cliui/node_modules/strip-ansi/node_modules/ansi-regex/package.json M node_modules/vega/node_modules/yargs/node_modules/cliui/node_modules/wrap-ansi/package.json M node_modules/vega/node_modules/yargs/node_modules/decamelize/node_modules/escape-string-regexp/package.json M node_modules/vega/node_modules/yargs/node_modules/os-locale/node_modules/lcid/node_modules/invert-kv/package.json M node_modules/vega/node_modules/yargs/node_modules/os-locale/node_modules/lcid/package.json M node_modules/vega/node_modules/yargs/node_modules/string-width/node_modules/code-point-at/node_modules/number-is-nan/package.json M node_modules/vega/node_modules/yargs/node_modules/string-width/node_modules/code-point-at/package.json M node_modules/vega/node_modules/yargs/node_modules/string-width/node_modules/is-fullwidth-code-point/node_modules/number-is-nan/package.json M node_modules/vega/node_modules/yargs/node_modules/string-width/node_modules/is-fullwidth-code-point/package.json M node_modules/vega/node_modules/yargs/node_modules/string-width/node_modules/strip-ansi/node_modules/ansi-regex/package.json M node_modules/vega/node_modules/yargs/node_modules/string-width/node_modules/strip-ansi/package.json M src 17 files changed, 45 insertions(+), 35 deletions(-) Approvals: Yurik: Verified; Looks good to me, approved diff --git a/node_modules/compression/node_modules/accepts/node_modules/mime-types/package.json b/node_modules/compression/node_modules/accepts/node_modules/mime-types/package.json index f7ee92e..c85c08f 100644 --- a/node_modules/compression/node_modules/accepts/node_modules/mime-types/package.json +++ b/node_modules/compression/node_modules/accepts/node_modules/mime-types/package.json @@ -54,7 +54,7 @@ "homepage": "https://github.com/jshttp/mime-types";, "_id": "mime-types@2.1.9", "_shasum": "dfb396764b5fdf75be34b1f4104bc3687fb635f8", - "_from": "mime-types@>=2.1.7 <2.2.0", + "_from": "mime-types@>=2.1.6 <2.2.0", "_npmVersion": "1.4.28", "_npmUser": { "name": "dougwilson", diff --git a/node_modules/express/node_modules/accepts/node_modules/mime-types/package.json b/node_modules/express/node_modules/accepts/node_modules/mime-types/package.json index d1a5ffa..c85c08f 100644 --- a/node_modules/express/node_modules/accepts/node_modules/mime-types/package.json +++ b/node_modules/express/node_modules/accepts/node_modules/mime-types/package.json @@ -25,7 +25,7 @@ ], "repository": { "type": "git", - "url": "git+https://github.com/jshttp/mime-types.git"; + "url": "https://github.com/jshttp/mime-types"; }, "dependencies": { "mime-db": "~1.21.0" @@ -79,6 +79,5 @@ "tarball": "http://registry.npmjs.org/mime-types/-/mime-types-2.1.9.tgz"; }, "directories": {}, - "_resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.9.tgz";, - "readme": "ERROR: No README data found!" + "_resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.9.tgz"; } diff --git a/node_modules/graph-shared/package.json b/node_modules/graph-shared/package.json index 6993b8c..57e294b 100644 --- a/node_modules/graph-shared/package.json +++ b/node_modules/graph-shared/package.json @@ -23,12 +23,12 @@ "bugs": { "url": "https://github.com/nyurik/graph-shared/issues"; }, - "gitHead": "90010e6a2c39969379d014c81519ebec85ae9c73", + "gitHead": "b09453c29f8ee59fff41f41700b997b9ebadb116", "readme": "# graph-shared\nShared code for Wikipedia's Graph extension and Graphoid Service\n", "readmeFilename": "README.md", "homepage": "https://github.com/nyurik/graph-shared#readme";, "_id": "graph-shared@0.0.0", - "_shasum": "9cf5c29184d74443bad7879faec048cca456a7a7", + "_shasum": "4fd0176aa693e1d87b3c7be3c32790a00835e796", "_from": "git+http://g...@github.com/nyurik/graph-shared";, - "_resolved": "git+ssh://g...@github.com/nyurik/graph-shared.git#90010e6a2c39969379d014c81519ebec85ae9c73" + "_resolved": "git+ssh://g...@github.com/nyurik/graph-shared.git#b09453c29f8ee59fff41f41700b997b9ebadb116" } diff --git a/node_modules/graph-shared/src/VegaWrapper.js b/node_modules/graph-shared/src/VegaWrapper.js index 91b5ea4..3174ca4 100644 --- a/node_modules/graph-shared/src/VegaWrapper.js +++ b/node_modules/graph-shared/src/VegaWrapper.js @@ -82,9 +82,9 @@ }; if (this.httpsHostsRe.test(host)) { - result.protocol = 'https:'; + result.protocol = 'https'; } else if (this.httpHostsRe.test(host)) { - result.protocol = 'http:'; + result.protocol = 'http'; } else { result = undefined; } @@ -111,15 +111,15 @@ } switch (urlParts.protocol) { - case 'http:': - case 'https:': + case 'http': + case 'https': if (!this.isTrusted) { throw new Error('HTTP and HTTPS protocols not supported for untrusted graphs'); } // keep the original URL break; - case 'wikiapi:': + case 'wikiapi': // wikiapi:///?action=query&list=allpages // Call to api.php - ignores the path parameter, and only uses the query urlParts.query = this.objExtender(urlParts.query, {format: 'json', formatversion: '2'}); @@ -128,7 +128,7 @@ opt.isApiCall = true; break; - case 'wikirest:': + case 'wikirest': // wikirest:///api/rest_v1/page/... // Call to RESTbase api - requires the path to start with "/api/" // The /api/... path is safe for GET requests @@ -140,7 +140,7 @@ urlParts.protocol = sanitizedHost.protocol; break; - case 'wikiraw:': + case 'wikiraw': // wikiraw:///MyPage/data // Get raw content of a wiki page, where the path is the title // of the page with an additional leading '/' which gets removed. @@ -164,7 +164,7 @@ opt.extractApiContent = true; break; - case 'wikirawupload:': + case 'wikirawupload': // wikirawupload://upload.wikimedia.org/wikipedia/commons/3/3e/Einstein_1921.jpg // Get an image for the graph, e.g. from commons // This tag specifies any content from the uploads.* domain, without query params diff --git a/node_modules/vega-1x/package.json b/node_modules/vega-1x/package.json index 6217fb0..c480fa8 100644 --- a/node_modules/vega-1x/package.json +++ b/node_modules/vega-1x/package.json @@ -59,7 +59,7 @@ "url": "https://github.com/trifacta/vega/issues"; }, "_id": "vega-1x@1.5.3", - "_shasum": "a7c562fbd5a0489395de657e2dcef247e5781897", + "_shasum": "f7a1d1940c4913cf13798113e895b65c35fffe70", "_from": "git+http://g...@github.com/nyurik/vega-1x";, "_resolved": "git+ssh://g...@github.com/nyurik/vega-1x.git#79140356950c061ae4abebc3c4cb1f08a4993810" } diff --git a/node_modules/vega/node_modules/yargs/node_modules/cliui/node_modules/strip-ansi/node_modules/ansi-regex/package.json b/node_modules/vega/node_modules/yargs/node_modules/cliui/node_modules/strip-ansi/node_modules/ansi-regex/package.json index d039d1d..7fc0767 100644 --- a/node_modules/vega/node_modules/yargs/node_modules/cliui/node_modules/strip-ansi/node_modules/ansi-regex/package.json +++ b/node_modules/vega/node_modules/yargs/node_modules/cliui/node_modules/strip-ansi/node_modules/ansi-regex/package.json @@ -5,7 +5,7 @@ "license": "MIT", "repository": { "type": "git", - "url": "https://github.com/sindresorhus/ansi-regex"; + "url": "git+https://github.com/sindresorhus/ansi-regex.git"; }, "author": { "name": "Sindre Sorhus", @@ -81,5 +81,6 @@ "tarball": "http://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"; }, "directories": {}, - "_resolved": "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";, + "readme": "ERROR: No README data found!" } diff --git a/node_modules/vega/node_modules/yargs/node_modules/cliui/node_modules/wrap-ansi/package.json b/node_modules/vega/node_modules/yargs/node_modules/cliui/node_modules/wrap-ansi/package.json index 22ec860..f4f0015 100644 --- a/node_modules/vega/node_modules/yargs/node_modules/cliui/node_modules/wrap-ansi/package.json +++ b/node_modules/vega/node_modules/yargs/node_modules/cliui/node_modules/wrap-ansi/package.json @@ -94,5 +94,6 @@ "tarball": "http://registry.npmjs.org/wrap-ansi/-/wrap-ansi-1.0.0.tgz"; }, "directories": {}, - "_resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-1.0.0.tgz"; + "_resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-1.0.0.tgz";, + "readme": "ERROR: No README data found!" } diff --git a/node_modules/vega/node_modules/yargs/node_modules/decamelize/node_modules/escape-string-regexp/package.json b/node_modules/vega/node_modules/yargs/node_modules/decamelize/node_modules/escape-string-regexp/package.json index 7a1f44d..5a4c8f5 100644 --- a/node_modules/vega/node_modules/yargs/node_modules/decamelize/node_modules/escape-string-regexp/package.json +++ b/node_modules/vega/node_modules/yargs/node_modules/decamelize/node_modules/escape-string-regexp/package.json @@ -5,7 +5,7 @@ "license": "MIT", "repository": { "type": "git", - "url": "https://github.com/sindresorhus/escape-string-regexp"; + "url": "git+https://github.com/sindresorhus/escape-string-regexp.git"; }, "author": { "name": "Sindre Sorhus", @@ -66,5 +66,6 @@ "tarball": "http://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.4.tgz"; }, "directories": {}, - "_resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.4.tgz"; + "_resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.4.tgz";, + "readme": "ERROR: No README data found!" } diff --git a/node_modules/vega/node_modules/yargs/node_modules/os-locale/node_modules/lcid/node_modules/invert-kv/package.json b/node_modules/vega/node_modules/yargs/node_modules/os-locale/node_modules/lcid/node_modules/invert-kv/package.json index 794100c..3736323 100644 --- a/node_modules/vega/node_modules/yargs/node_modules/os-locale/node_modules/lcid/node_modules/invert-kv/package.json +++ b/node_modules/vega/node_modules/yargs/node_modules/os-locale/node_modules/lcid/node_modules/invert-kv/package.json @@ -5,7 +5,7 @@ "license": "MIT", "repository": { "type": "git", - "url": "https://github.com/sindresorhus/invert-kv"; + "url": "git+https://github.com/sindresorhus/invert-kv.git"; }, "author": { "name": "Sindre Sorhus", @@ -57,5 +57,6 @@ "tarball": "http://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz"; }, "directories": {}, - "_resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz"; + "_resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz";, + "readme": "ERROR: No README data found!" } diff --git a/node_modules/vega/node_modules/yargs/node_modules/os-locale/node_modules/lcid/package.json b/node_modules/vega/node_modules/yargs/node_modules/os-locale/node_modules/lcid/package.json index a499cb4..114ced9 100644 --- a/node_modules/vega/node_modules/yargs/node_modules/os-locale/node_modules/lcid/package.json +++ b/node_modules/vega/node_modules/yargs/node_modules/os-locale/node_modules/lcid/package.json @@ -5,7 +5,7 @@ "license": "MIT", "repository": { "type": "git", - "url": "https://github.com/sindresorhus/lcid"; + "url": "git+https://github.com/sindresorhus/lcid.git"; }, "author": { "name": "Sindre Sorhus", @@ -71,5 +71,6 @@ "tarball": "http://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz"; }, "directories": {}, - "_resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz"; + "_resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz";, + "readme": "ERROR: No README data found!" } diff --git a/node_modules/vega/node_modules/yargs/node_modules/string-width/node_modules/code-point-at/node_modules/number-is-nan/package.json b/node_modules/vega/node_modules/yargs/node_modules/string-width/node_modules/code-point-at/node_modules/number-is-nan/package.json index 829edeb..05df0e0 100644 --- a/node_modules/vega/node_modules/yargs/node_modules/string-width/node_modules/code-point-at/node_modules/number-is-nan/package.json +++ b/node_modules/vega/node_modules/yargs/node_modules/string-width/node_modules/code-point-at/node_modules/number-is-nan/package.json @@ -62,5 +62,6 @@ } ], "directories": {}, - "_resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz"; + "_resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz";, + "readme": "ERROR: No README data found!" } diff --git a/node_modules/vega/node_modules/yargs/node_modules/string-width/node_modules/code-point-at/package.json b/node_modules/vega/node_modules/yargs/node_modules/string-width/node_modules/code-point-at/package.json index bb930d7..7df3c55 100644 --- a/node_modules/vega/node_modules/yargs/node_modules/string-width/node_modules/code-point-at/package.json +++ b/node_modules/vega/node_modules/yargs/node_modules/string-width/node_modules/code-point-at/package.json @@ -5,7 +5,7 @@ "license": "MIT", "repository": { "type": "git", - "url": "https://github.com/sindresorhus/code-point-at"; + "url": "git+https://github.com/sindresorhus/code-point-at.git"; }, "author": { "name": "Sindre Sorhus", @@ -66,5 +66,6 @@ } ], "directories": {}, - "_resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.0.0.tgz"; + "_resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.0.0.tgz";, + "readme": "ERROR: No README data found!" } diff --git a/node_modules/vega/node_modules/yargs/node_modules/string-width/node_modules/is-fullwidth-code-point/node_modules/number-is-nan/package.json b/node_modules/vega/node_modules/yargs/node_modules/string-width/node_modules/is-fullwidth-code-point/node_modules/number-is-nan/package.json index 829edeb..05df0e0 100644 --- a/node_modules/vega/node_modules/yargs/node_modules/string-width/node_modules/is-fullwidth-code-point/node_modules/number-is-nan/package.json +++ b/node_modules/vega/node_modules/yargs/node_modules/string-width/node_modules/is-fullwidth-code-point/node_modules/number-is-nan/package.json @@ -62,5 +62,6 @@ } ], "directories": {}, - "_resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz"; + "_resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz";, + "readme": "ERROR: No README data found!" } diff --git a/node_modules/vega/node_modules/yargs/node_modules/string-width/node_modules/is-fullwidth-code-point/package.json b/node_modules/vega/node_modules/yargs/node_modules/string-width/node_modules/is-fullwidth-code-point/package.json index 99f6fd5..6ada832 100644 --- a/node_modules/vega/node_modules/yargs/node_modules/string-width/node_modules/is-fullwidth-code-point/package.json +++ b/node_modules/vega/node_modules/yargs/node_modules/string-width/node_modules/is-fullwidth-code-point/package.json @@ -5,7 +5,7 @@ "license": "MIT", "repository": { "type": "git", - "url": "https://github.com/sindresorhus/is-fullwidth-code-point"; + "url": "git+https://github.com/sindresorhus/is-fullwidth-code-point.git"; }, "author": { "name": "Sindre Sorhus", @@ -70,5 +70,6 @@ } ], "directories": {}, - "_resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"; + "_resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz";, + "readme": "ERROR: No README data found!" } diff --git a/node_modules/vega/node_modules/yargs/node_modules/string-width/node_modules/strip-ansi/node_modules/ansi-regex/package.json b/node_modules/vega/node_modules/yargs/node_modules/string-width/node_modules/strip-ansi/node_modules/ansi-regex/package.json index d039d1d..7fc0767 100644 --- a/node_modules/vega/node_modules/yargs/node_modules/string-width/node_modules/strip-ansi/node_modules/ansi-regex/package.json +++ b/node_modules/vega/node_modules/yargs/node_modules/string-width/node_modules/strip-ansi/node_modules/ansi-regex/package.json @@ -5,7 +5,7 @@ "license": "MIT", "repository": { "type": "git", - "url": "https://github.com/sindresorhus/ansi-regex"; + "url": "git+https://github.com/sindresorhus/ansi-regex.git"; }, "author": { "name": "Sindre Sorhus", @@ -81,5 +81,6 @@ "tarball": "http://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"; }, "directories": {}, - "_resolved": "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";, + "readme": "ERROR: No README data found!" } diff --git a/node_modules/vega/node_modules/yargs/node_modules/string-width/node_modules/strip-ansi/package.json b/node_modules/vega/node_modules/yargs/node_modules/string-width/node_modules/strip-ansi/package.json index 9331056..2871d03 100644 --- a/node_modules/vega/node_modules/yargs/node_modules/string-width/node_modules/strip-ansi/package.json +++ b/node_modules/vega/node_modules/yargs/node_modules/string-width/node_modules/strip-ansi/package.json @@ -5,7 +5,7 @@ "license": "MIT", "repository": { "type": "git", - "url": "https://github.com/sindresorhus/strip-ansi"; + "url": "git+https://github.com/sindresorhus/strip-ansi.git"; }, "author": { "name": "Sindre Sorhus", @@ -80,5 +80,6 @@ "tarball": "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz"; }, "directories": {}, - "_resolved": "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";, + "readme": "ERROR: No README data found!" } diff --git a/src b/src index 543ef02..1518e07 160000 --- a/src +++ b/src -Subproject commit 543ef027b45255bed1fb9945c5dd2c7232a5d3d6 +Subproject commit 1518e077a74efaac9aba5a52bcbc4c8ae77021ab -- To view, visit https://gerrit.wikimedia.org/r/267057 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I338d582645d8ecc4abe6f70e903c315c34522a90 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/graphoid/deploy Gerrit-Branch: master Gerrit-Owner: Yurik <yu...@wikimedia.org> Gerrit-Reviewer: Yurik <yu...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
