Cscott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/287142
Change subject: Update npm dependencies; switch to `babybird` Promise
implementation.
......................................................................
Update npm dependencies; switch to `babybird` Promise implementation.
Change-Id: I7c0d6fcdd15f534a5654bf0c73a34fd575228859
---
M .jscsrc
M CHANGELOG.md
M bin/mw-ocg-bundler
M lib/api.js
M lib/attribution.js
M lib/authors.js
M lib/db.js
M lib/html.js
M lib/image.js
M lib/index.js
M lib/metabook.js
M lib/modules.js
M lib/p.js
M lib/parsoid.js
A lib/promise.js
M lib/retry-request.js
M lib/revisions.js
M lib/siteinfo.js
M package.json
M test/samples.js
20 files changed, 30 insertions(+), 26 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Collection/OfflineContentGenerator/bundler
refs/changes/42/287142/1
diff --git a/.jscsrc b/.jscsrc
index 19f37d9..e1fa233 100644
--- a/.jscsrc
+++ b/.jscsrc
@@ -3,6 +3,7 @@
// allow some slop to account for legacy code
"validateQuoteMarks": { "mark": "'", "escape": true },
"requireCapitalizedComments": { "allExcept": ["jshint", "global"] },
+ "requireEarlyReturn": false,
"validateIndentation": "\t",
"maximumLineLength": null,
"disallowMultipleVarDecl": null,
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e530216..c3e4df7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
# mw-ocg-bundler x.x.x (not yet released)
+* Update npm dependencies; switch to `babybird` Promise implementation.
# mw-ocg-bundler 1.3.1 (2016-03-31)
* Use underscores in titles sent to the REST v1/Parsoid v3 API.
diff --git a/bin/mw-ocg-bundler b/bin/mw-ocg-bundler
index 0e91017..dc84661 100755
--- a/bin/mw-ocg-bundler
+++ b/bin/mw-ocg-bundler
@@ -1,7 +1,7 @@
#!/usr/bin/env node
'use strict';
require('core-js/shim'); // For Map, endsWith, etc.
-var Promise = require('prfun');
+var Promise = require('../lib/promise.js');
var program = require('commander');
var bundler = require('../');
diff --git a/lib/api.js b/lib/api.js
index 2fe2f43..b984927 100644
--- a/lib/api.js
+++ b/lib/api.js
@@ -1,7 +1,7 @@
// Helpers for making mediawiki api requests.
'use strict';
require('core-js/shim');
-var Promise = require('prfun');
+var Promise = require('./promise.js');
var headers = require('./headers');
var querystring = require('querystring');
diff --git a/lib/attribution.js b/lib/attribution.js
index 4c13dc2..7ded566 100644
--- a/lib/attribution.js
+++ b/lib/attribution.js
@@ -1,6 +1,6 @@
'use strict';
require('core-js/shim'); // Map/Set/Promise support
-var Promise = require('prfun');
+var Promise = require('./promise.js');
var util = require('util');
diff --git a/lib/authors.js b/lib/authors.js
index 4d6ea7f..296ee9b 100644
--- a/lib/authors.js
+++ b/lib/authors.js
@@ -1,7 +1,7 @@
// Obtain authorship information for wiki articles.
'use strict';
require('core-js/shim');
-var Promise = require('prfun');
+var Promise = require('./promise.js');
var util = require('util');
diff --git a/lib/db.js b/lib/db.js
index a2570c0..11f27de 100644
--- a/lib/db.js
+++ b/lib/db.js
@@ -1,7 +1,7 @@
// Helpers to create/read key/value mappings in sqlite db.
'use strict';
require('core-js/shim');
-var Promise = require('prfun');
+var Promise = require('./promise.js');
var sqlite3 = require('sqlite3');
diff --git a/lib/html.js b/lib/html.js
index 4433321..a8120cc 100644
--- a/lib/html.js
+++ b/lib/html.js
@@ -1,7 +1,7 @@
// Generate contents of html.db
'use strict';
require('core-js/shim');
-var Promise = require('prfun');
+var Promise = require('./promise.js');
var util = require('util');
diff --git a/lib/image.js b/lib/image.js
index ef0884d..6457cfb 100644
--- a/lib/image.js
+++ b/lib/image.js
@@ -1,7 +1,7 @@
// Fetch images and metadata about them.
'use strict';
require('core-js/shim');
-var Promise = require('prfun');
+var Promise = require('./promise.js');
var fs = require('fs');
var headers = require('./headers');
diff --git a/lib/index.js b/lib/index.js
index 5b661fd..b3907b5 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1,6 +1,6 @@
'use strict';
require('core-js/shim'); // Map/Set/Promise support
-var Promise = require('prfun');
+var Promise = require('./promise.js');
var json = require('../package.json');
diff --git a/lib/metabook.js b/lib/metabook.js
index ba3f64a..d70b0f1 100644
--- a/lib/metabook.js
+++ b/lib/metabook.js
@@ -1,7 +1,7 @@
/** Create a new metabook structure, or fixup a broken/incomplete one. */
'use strict';
require('core-js/shim');
-var Promise = require('prfun');
+var Promise = require('./promise.js');
var url = require('url');
diff --git a/lib/modules.js b/lib/modules.js
index 4d6ab7f..4e6836b 100644
--- a/lib/modules.js
+++ b/lib/modules.js
@@ -1,7 +1,7 @@
// Fetch css and js modules for the articles
'use strict';
require('core-js/shim');
-var Promise = require('prfun');
+var Promise = require('./promise.js');
var Api = require('./api');
diff --git a/lib/p.js b/lib/p.js
index 17f0841..ee4e703 100644
--- a/lib/p.js
+++ b/lib/p.js
@@ -1,7 +1,7 @@
// Helpers for promises.
'use strict';
require('core-js/shim');
-var Promise = require('prfun');
+var Promise = require('./promise.js');
var spawn = require('child_process').spawn;
diff --git a/lib/parsoid.js b/lib/parsoid.js
index 79c8fda..764ddeb 100644
--- a/lib/parsoid.js
+++ b/lib/parsoid.js
@@ -1,7 +1,7 @@
// Make concurrency-limited parsoid API requests.
'use strict';
require('core-js/shim');
-var Promise = require('prfun');
+var Promise = require('./promise.js');
var domino = require('domino');
var fs = require('fs');
diff --git a/lib/promise.js b/lib/promise.js
new file mode 100644
index 0000000..2733cf7
--- /dev/null
+++ b/lib/promise.js
@@ -0,0 +1 @@
+module.exports = require('prfun/wrap')(require('babybird'));
diff --git a/lib/retry-request.js b/lib/retry-request.js
index 12a16f0..f313a71 100644
--- a/lib/retry-request.js
+++ b/lib/retry-request.js
@@ -2,7 +2,7 @@
// requests.
'use strict';
require('core-js/shim');
-var Promise = require('prfun');
+var Promise = require('./promise.js');
var request = require('request');
diff --git a/lib/revisions.js b/lib/revisions.js
index bcd1263..1dc4bd4 100644
--- a/lib/revisions.js
+++ b/lib/revisions.js
@@ -3,7 +3,7 @@
// sane manner as revisions.db. Hopefully we can deprecate the ugliness.
'use strict';
require('core-js/shim');
-var Promise = require('prfun');
+var Promise = require('./promise.js');
var fs = require('fs');
var path = require('path');
diff --git a/lib/siteinfo.js b/lib/siteinfo.js
index 71100b7..cbfea81 100644
--- a/lib/siteinfo.js
+++ b/lib/siteinfo.js
@@ -1,7 +1,7 @@
// Generate content of siteinfo.json.
'use strict';
require('core-js/shim');
-var Promise = require('prfun');
+var Promise = require('./promise.js');
var fs = require('fs');
var path = require('path');
diff --git a/package.json b/package.json
index e8d4840..9b29824 100644
--- a/package.json
+++ b/package.json
@@ -12,21 +12,22 @@
],
"license": "GPL-2.0",
"dependencies": {
- "commander": "~2.8.1",
- "core-js": "~0.9.18",
- "domino": "~1.0.19",
- "prfun": "~2.1.1",
+ "babybird": "~0.0.1",
+ "commander": "~2.9.0",
+ "core-js": "~2.3.0",
+ "domino": "~1.0.24",
+ "prfun": "~2.1.4",
"readable-stream": "~1.0.33",
- "request": "~2.64.0",
+ "request": "~2.72.0",
"rimraf": "~2.4.3",
"sqlite3": "~3.1.0",
- "tmp": "~0.0.27"
+ "tmp": "~0.0.28"
},
"devDependencies": {
- "jscs": "~2.5.0",
- "jshint": "~2.8.0",
- "mocha": "~2.3.3",
- "npm-travis": "~1.0.0"
+ "jscs": "~2.11.0",
+ "jshint": "~2.9.2",
+ "mocha": "~2.4.5",
+ "npm-travis": "~1.0.2"
},
"scripts": {
"test": "npm run lint-no-0.8 && npm run mocha",
diff --git a/test/samples.js b/test/samples.js
index f2d140f..2a121fc 100644
--- a/test/samples.js
+++ b/test/samples.js
@@ -1,7 +1,7 @@
/* global describe, it */
'use strict';
require('core-js/shim');
-var Promise = require('prfun');
+var Promise = require('../lib/promise.js');
var assert = require('assert');
var fs = require('fs');
--
To view, visit https://gerrit.wikimedia.org/r/287142
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7c0d6fcdd15f534a5654bf0c73a34fd575228859
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Collection/OfflineContentGenerator/bundler
Gerrit-Branch: master
Gerrit-Owner: Cscott <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
