Mobrovac has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/358776 )
Change subject: Update restbase to 5a29491
......................................................................
Update restbase to 5a29491
List of changes:
3de5e1d Update dependencies
f212775 User 0.5 version of swagger-test and change the ontisday schema test
date
5a29491 Add Citoid and MobileApps paths; release v0.16.7
xxxxxxx Update node module dependencies
Change-Id: I23e4d08659c5e370b7058a485512210ce75c1ee1
---
M node_modules/balanced-match/index.js
M node_modules/balanced-match/package.json
M node_modules/brace-expansion/package.json
M node_modules/content-type/package.json
M node_modules/dtrace-provider/package.json
M node_modules/dtrace-provider/scripts/install.js
M node_modules/json-stable-stringify/package.json
M node_modules/jsonwebtoken/package.json
M node_modules/kad/package.json
M node_modules/service-runner/package.json
M node_modules/swagger-ui/package.json
M restbase
12 files changed, 76 insertions(+), 84 deletions(-)
Approvals:
Mobrovac: Verified; Looks good to me, approved
diff --git a/node_modules/balanced-match/index.js
b/node_modules/balanced-match/index.js
index e8d8587..1685a76 100644
--- a/node_modules/balanced-match/index.js
+++ b/node_modules/balanced-match/index.js
@@ -1,3 +1,4 @@
+'use strict';
module.exports = balanced;
function balanced(a, b, str) {
if (a instanceof RegExp) a = maybeMatch(a, str);
diff --git a/node_modules/balanced-match/package.json
b/node_modules/balanced-match/package.json
index 567edf8..44ed568 100644
--- a/node_modules/balanced-match/package.json
+++ b/node_modules/balanced-match/package.json
@@ -2,48 +2,48 @@
"_args": [
[
{
- "raw": "balanced-match@^0.4.1",
+ "raw": "balanced-match@^1.0.0",
"scope": null,
"escapedName": "balanced-match",
"name": "balanced-match",
- "rawSpec": "^0.4.1",
- "spec": ">=0.4.1 <0.5.0",
+ "rawSpec": "^1.0.0",
+ "spec": ">=1.0.0 <2.0.0",
"type": "range"
},
"/opt/service/node_modules/brace-expansion"
]
],
- "_from": "balanced-match@>=0.4.1 <0.5.0",
- "_id": "balanced-match@0.4.2",
+ "_from": "balanced-match@>=1.0.0 <2.0.0",
+ "_id": "balanced-match@1.0.0",
"_inCache": true,
"_location": "/balanced-match",
- "_nodeVersion": "4.4.7",
+ "_nodeVersion": "7.8.0",
"_npmOperationalInternal": {
- "host": "packages-16-east.internal.npmjs.com",
- "tmp": "tmp/balanced-match-0.4.2.tgz_1468834991581_0.6590619895141572"
+ "host": "s3://npm-registry-packages",
+ "tmp": "tmp/balanced-match-1.0.0.tgz_1497251909645_0.8755026108119637"
},
"_npmUser": {
"name": "juliangruber",
"email": "jul...@juliangruber.com"
},
- "_npmVersion": "2.15.8",
+ "_npmVersion": "4.2.0",
"_phantomChildren": {},
"_requested": {
- "raw": "balanced-match@^0.4.1",
+ "raw": "balanced-match@^1.0.0",
"scope": null,
"escapedName": "balanced-match",
"name": "balanced-match",
- "rawSpec": "^0.4.1",
- "spec": ">=0.4.1 <0.5.0",
+ "rawSpec": "^1.0.0",
+ "spec": ">=1.0.0 <2.0.0",
"type": "range"
},
"_requiredBy": [
"/brace-expansion"
],
- "_resolved":
"https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz";,
- "_shasum": "cb3f3e3c732dc0f01ee70b403f302e61d7709838",
+ "_resolved":
"https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz";,
+ "_shasum": "89b4d199ab2bee49de164ea02b89ce462d71b767",
"_shrinkwrap": null,
- "_spec": "balanced-match@^0.4.1",
+ "_spec": "balanced-match@^1.0.0",
"_where": "/opt/service/node_modules/brace-expansion",
"author": {
"name": "Julian Gruber",
@@ -56,14 +56,15 @@
"dependencies": {},
"description": "Match balanced character pairs, like \"{\" and \"}\"",
"devDependencies": {
+ "matcha": "^0.7.0",
"tape": "^4.6.0"
},
"directories": {},
"dist": {
- "shasum": "cb3f3e3c732dc0f01ee70b403f302e61d7709838",
- "tarball":
"https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz";
+ "shasum": "89b4d199ab2bee49de164ea02b89ce462d71b767",
+ "tarball":
"https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz";
},
- "gitHead": "57c2ea29d89a2844ae3bdcc637c6e2cbb73725e2",
+ "gitHead": "d701a549a7653a874eebce7eca25d3577dc868ac",
"homepage": "https://github.com/juliangruber/balanced-match";,
"keywords": [
"match",
@@ -88,6 +89,7 @@
"url": "git://github.com/juliangruber/balanced-match.git"
},
"scripts": {
+ "bench": "make bench",
"test": "make test"
},
"testling": {
@@ -106,5 +108,5 @@
"android-browser/4.2..latest"
]
},
- "version": "0.4.2"
+ "version": "1.0.0"
}
diff --git a/node_modules/brace-expansion/package.json
b/node_modules/brace-expansion/package.json
index 58c702c..ac69767 100644
--- a/node_modules/brace-expansion/package.json
+++ b/node_modules/brace-expansion/package.json
@@ -14,13 +14,13 @@
]
],
"_from": "brace-expansion@>=1.1.7 <2.0.0",
- "_id": "brace-expansion@1.1.7",
+ "_id": "brace-expansion@1.1.8",
"_inCache": true,
"_location": "/brace-expansion",
"_nodeVersion": "7.8.0",
"_npmOperationalInternal": {
- "host": "packages-12-west.internal.npmjs.com",
- "tmp": "tmp/brace-expansion-1.1.7.tgz_1491552830231_0.7213963181711733"
+ "host": "s3://npm-registry-packages",
+ "tmp": "tmp/brace-expansion-1.1.8.tgz_1497251980593_0.6575565172825009"
},
"_npmUser": {
"name": "juliangruber",
@@ -40,8 +40,8 @@
"_requiredBy": [
"/minimatch"
],
- "_resolved":
"https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.7.tgz";,
- "_shasum": "3effc3c50e000531fb720eaff80f0ae8ef23cf59",
+ "_resolved":
"https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz";,
+ "_shasum": "c07b211c7c952ec1f8efd51a77ef0d1d3990a292",
"_shrinkwrap": null,
"_spec": "brace-expansion@^1.1.7",
"_where": "/opt/service/node_modules/minimatch",
@@ -54,7 +54,7 @@
"url": "https://github.com/juliangruber/brace-expansion/issues";
},
"dependencies": {
- "balanced-match": "^0.4.1",
+ "balanced-match": "^1.0.0",
"concat-map": "0.0.1"
},
"description": "Brace expansion as known from sh/bash",
@@ -64,10 +64,10 @@
},
"directories": {},
"dist": {
- "shasum": "3effc3c50e000531fb720eaff80f0ae8ef23cf59",
- "tarball":
"https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.7.tgz";
+ "shasum": "c07b211c7c952ec1f8efd51a77ef0d1d3990a292",
+ "tarball":
"https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz";
},
- "gitHead": "892512024872ca7680554be90f6e8ce065053372",
+ "gitHead": "8f59e68bd5c915a0d624e8e39354e1ccf672edf6",
"homepage": "https://github.com/juliangruber/brace-expansion";,
"keywords": [],
"license": "MIT",
@@ -110,5 +110,5 @@
"android-browser/4.2..latest"
]
},
- "version": "1.1.7"
+ "version": "1.1.8"
}
diff --git a/node_modules/content-type/package.json
b/node_modules/content-type/package.json
index 0146b1b..7296d91 100644
--- a/node_modules/content-type/package.json
+++ b/node_modules/content-type/package.json
@@ -49,7 +49,7 @@
"/"
],
"_resolved":
"git+https://github.com/wikimedia/content-type.git#47b2632d0a2ee79a7d67268e2f6621becd95d05b";,
- "_shasum": "a0755316cbe6a62e77a6d7d5f01d0d0f2fd52aee",
+ "_shasum": "5e2ca46adb860cd9447a4173a4763a40d63397b5",
"_shrinkwrap": null,
"_spec":
"content-type@git+https://github.com/wikimedia/content-type.git#master";,
"_where": "/opt/service",
diff --git a/node_modules/dtrace-provider/package.json
b/node_modules/dtrace-provider/package.json
index e7461d8..2fe9c80 100644
--- a/node_modules/dtrace-provider/package.json
+++ b/node_modules/dtrace-provider/package.json
@@ -14,19 +14,19 @@
]
],
"_from": "dtrace-provider@>=0.8.0 <0.9.0",
- "_id": "dtrace-provider@0.8.2",
+ "_id": "dtrace-provider@0.8.3",
"_inCache": true,
"_location": "/dtrace-provider",
- "_nodeVersion": "4.8.1",
+ "_nodeVersion": "0.10.46",
"_npmOperationalInternal": {
"host": "s3://npm-registry-packages",
- "tmp": "tmp/dtrace-provider-0.8.2.tgz_1495850413417_0.22524780873209238"
+ "tmp": "tmp/dtrace-provider-0.8.3.tgz_1497313943792_0.2225570201408118"
},
"_npmUser": {
"name": "melloc",
"email": "cody.me...@joyent.com"
},
- "_npmVersion": "2.15.11",
+ "_npmVersion": "2.15.1",
"_phantomChildren": {},
"_requested": {
"raw": "dtrace-provider@~0.8",
@@ -40,8 +40,8 @@
"_requiredBy": [
"/bunyan"
],
- "_resolved":
"https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.2.tgz";,
- "_shasum": "f067c2773f15da1b61eb20dbc96aa1cabb3330bc",
+ "_resolved":
"https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.3.tgz";,
+ "_shasum": "ba1bfc6493285ccfcfc6ab69cd5c61d74c2a43bf",
"_shrinkwrap": null,
"_spec": "dtrace-provider@~0.8",
"_where": "/opt/service/node_modules/bunyan",
@@ -61,13 +61,13 @@
},
"directories": {},
"dist": {
- "shasum": "f067c2773f15da1b61eb20dbc96aa1cabb3330bc",
- "tarball":
"https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.2.tgz";
+ "shasum": "ba1bfc6493285ccfcfc6ab69cd5c61d74c2a43bf",
+ "tarball":
"https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.3.tgz";
},
"engines": {
"node": ">=0.10"
},
- "gitHead": "dbc47c80c538940982a1553da82c785be17d59cc",
+ "gitHead": "7ab84e1aa29966a65f924242eb57a318d79981ca",
"homepage": "https://github.com/chrisa/node-dtrace-provider#readme";,
"keywords": [
"dtrace",
@@ -104,5 +104,5 @@
"install": "node scripts/install.js",
"test": "tap test/*test.js"
},
- "version": "0.8.2"
+ "version": "0.8.3"
}
diff --git a/node_modules/dtrace-provider/scripts/install.js
b/node_modules/dtrace-provider/scripts/install.js
index c11f5e5..50ce5eb 100755
--- a/node_modules/dtrace-provider/scripts/install.js
+++ b/node_modules/dtrace-provider/scripts/install.js
@@ -15,41 +15,30 @@
movedFile = true;
-//npm_execpath: '/usr/local/lib/node_modules/npm/bin/npm-cli.js',
-var nodegyp = path.join(process.env.npm_execpath,
- '..',
- 'node-gyp-bin',
- 'node-gyp');
-
-if (!fs.existsSync(nodegyp))
- nodegyp = path.join(process.execPath,
- '..',
- '..',
- 'lib',
- 'node_modules',
- 'npm',
- 'bin',
- 'node-gyp-bin',
- 'node-gyp');
-
-if (!fs.existsSync(nodegyp)) {
- console.error('cannot locate npm install');
- return;
-}
-
var spawn = require('child_process').spawn;
var stdio = 'ignore';
-if (process.env.V)
+if (process.env.V) {
stdio = 'inherit';
+}
var options = {
cwd: path.join(__dirname, '..'),
stdio: stdio
};
-var child = spawn(nodegyp, ['rebuild'], options);
+var child = spawn('node-gyp', [ 'rebuild' ], options);
+
+child.on('error', function (err) {
+ if (err.code === 'ENOENT') {
+ console.error('cannot locate node-gyp');
+ } else {
+ console.error(err);
+ }
+
+ process.exit(0);
+});
child.on('close', function(code, signal) {
if ((code || signal) && process.env.V === undefined) {
diff --git a/node_modules/json-stable-stringify/package.json
b/node_modules/json-stable-stringify/package.json
index c594d8a..bc9ff6d 100644
--- a/node_modules/json-stable-stringify/package.json
+++ b/node_modules/json-stable-stringify/package.json
@@ -50,7 +50,7 @@
"/restbase-mod-table-cassandra"
],
"_resolved":
"git+https://github.com/wikimedia/json-stable-stringify.git#c05178e4dfc3834017f017732934c1c52ba3dd8f";,
- "_shasum": "7e4f1f449658e91ec9e4469ec841677eab7448b9",
+ "_shasum": "4775124ec759d64edbdae2d93a69b1b8d0b493d1",
"_shrinkwrap": null,
"_spec":
"json-stable-stringify@git+https://github.com/wikimedia/json-stable-stringify.git#master";,
"_where": "/opt/service",
diff --git a/node_modules/jsonwebtoken/package.json
b/node_modules/jsonwebtoken/package.json
index b90ea4a..61124a7 100644
--- a/node_modules/jsonwebtoken/package.json
+++ b/node_modules/jsonwebtoken/package.json
@@ -2,18 +2,18 @@
"_args": [
[
{
- "raw": "jsonwebtoken@^7.3.0",
+ "raw": "jsonwebtoken@^7.4.1",
"scope": null,
"escapedName": "jsonwebtoken",
"name": "jsonwebtoken",
- "rawSpec": "^7.3.0",
- "spec": ">=7.3.0 <8.0.0",
+ "rawSpec": "^7.4.1",
+ "spec": ">=7.4.1 <8.0.0",
"type": "range"
},
"/opt/service"
]
],
- "_from": "jsonwebtoken@>=7.3.0 <8.0.0",
+ "_from": "jsonwebtoken@>=7.4.1 <8.0.0",
"_id": "jsonwebtoken@7.4.1",
"_inCache": true,
"_location": "/jsonwebtoken",
@@ -29,12 +29,12 @@
"_npmVersion": "2.15.1",
"_phantomChildren": {},
"_requested": {
- "raw": "jsonwebtoken@^7.3.0",
+ "raw": "jsonwebtoken@^7.4.1",
"scope": null,
"escapedName": "jsonwebtoken",
"name": "jsonwebtoken",
- "rawSpec": "^7.3.0",
- "spec": ">=7.3.0 <8.0.0",
+ "rawSpec": "^7.4.1",
+ "spec": ">=7.4.1 <8.0.0",
"type": "range"
},
"_requiredBy": [
@@ -43,7 +43,7 @@
"_resolved":
"https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-7.4.1.tgz";,
"_shasum": "7ca324f5215f8be039cd35a6c45bb8cb74a448fb",
"_shrinkwrap": null,
- "_spec": "jsonwebtoken@^7.3.0",
+ "_spec": "jsonwebtoken@^7.4.1",
"_where": "/opt/service",
"author": {
"name": "auth0"
diff --git a/node_modules/kad/package.json b/node_modules/kad/package.json
index 9597340..63a0388 100644
--- a/node_modules/kad/package.json
+++ b/node_modules/kad/package.json
@@ -49,7 +49,7 @@
"/limitation"
],
"_resolved":
"git+https://github.com/gwicke/kad.git#936c91652d757ea6f9dd30e44698afb0daaa1d17";,
- "_shasum": "d2147cbcc769fcfb1fa7b74a957b2329646832b5",
+ "_shasum": "e09ea6c43c544e4ad3191ef0efd0c80c0bad1620",
"_shrinkwrap": null,
"_spec": "kad@git+https://github.com/gwicke/kad.git#master";,
"_where": "/opt/service/node_modules/limitation",
diff --git a/node_modules/service-runner/package.json
b/node_modules/service-runner/package.json
index 982dbcc..49b6864 100644
--- a/node_modules/service-runner/package.json
+++ b/node_modules/service-runner/package.json
@@ -2,18 +2,18 @@
"_args": [
[
{
- "raw": "service-runner@^2.2.5",
+ "raw": "service-runner@^2.3.0",
"scope": null,
"escapedName": "service-runner",
"name": "service-runner",
- "rawSpec": "^2.2.5",
- "spec": ">=2.2.5 <3.0.0",
+ "rawSpec": "^2.3.0",
+ "spec": ">=2.3.0 <3.0.0",
"type": "range"
},
"/opt/service"
]
],
- "_from": "service-runner@>=2.2.5 <3.0.0",
+ "_from": "service-runner@>=2.3.0 <3.0.0",
"_id": "service-runner@2.3.0",
"_inCache": true,
"_location": "/service-runner",
@@ -29,12 +29,12 @@
"_npmVersion": "3.10.8",
"_phantomChildren": {},
"_requested": {
- "raw": "service-runner@^2.2.5",
+ "raw": "service-runner@^2.3.0",
"scope": null,
"escapedName": "service-runner",
"name": "service-runner",
- "rawSpec": "^2.2.5",
- "spec": ">=2.2.5 <3.0.0",
+ "rawSpec": "^2.3.0",
+ "spec": ">=2.3.0 <3.0.0",
"type": "range"
},
"_requiredBy": [
@@ -43,7 +43,7 @@
"_resolved":
"https://registry.npmjs.org/service-runner/-/service-runner-2.3.0.tgz";,
"_shasum": "09039dfdcc40cdbd0259dd3f982916675838cb59",
"_shrinkwrap": null,
- "_spec": "service-runner@^2.2.5",
+ "_spec": "service-runner@^2.3.0",
"_where": "/opt/service",
"author": {
"name": "Wikimedia service team",
diff --git a/node_modules/swagger-ui/package.json
b/node_modules/swagger-ui/package.json
index 72e6a81..ed40a8d 100644
--- a/node_modules/swagger-ui/package.json
+++ b/node_modules/swagger-ui/package.json
@@ -49,7 +49,7 @@
"/hyperswitch"
],
"_resolved":
"git+https://github.com/wikimedia/swagger-ui.git#b9b40dc8e00caeb24c19fe636b93250a7e335541";,
- "_shasum": "27193eeab80e9f54684738d07c7e309956c738d5",
+ "_shasum": "12a0416a3a9b798a55bcb4c87df81ca10b6ac059",
"_shrinkwrap": null,
"_spec": "swagger-ui@git+https://github.com/wikimedia/swagger-ui.git#master";,
"_where": "/opt/service/node_modules/hyperswitch",
diff --git a/restbase b/restbase
index 148c226..5a29491 160000
--- a/restbase
+++ b/restbase
@@ -1 +1 @@
-Subproject commit 148c226af3bf34543ad0665f1af1df05cb8d2765
+Subproject commit 5a29491f94f0603924b7712a714c0a7c5c1b7b23
--
To view, visit https://gerrit.wikimedia.org/r/358776
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I23e4d08659c5e370b7058a485512210ce75c1ee1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/restbase/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac <mobro...@wikimedia.org>
Gerrit-Reviewer: Mobrovac <mobro...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
