jenkins-bot has submitted this change and it was merged.
Change subject: Switch from es6-shim to core-js; update prfun and jshint.
......................................................................
Switch from es6-shim to core-js; update prfun and jshint.
We now use a subclass of the native Promise instead of polluting the
global Promise.
Change-Id: I554cc194a7dad4bb6ba931dc9acf228d6567a8ee
---
M .jshintrc
M lib/RedisWrapper.js
M lib/threads/backend.js
M lib/threads/frontend.js
M lib/threads/gc.js
M package.json
M scripts/clear-host-cache.js
M scripts/clear-queue.js
M scripts/clear-time-range.js
M scripts/loadtest.js
M scripts/run-garbage-collect.js
11 files changed, 22 insertions(+), 23 deletions(-)
Approvals:
Arlolra: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.jshintrc b/.jshintrc
index 70c0201..586ecd6 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -5,7 +5,6 @@
"setImmediate",
"Map",
- "Promise",
"Set"
],
diff --git a/lib/RedisWrapper.js b/lib/RedisWrapper.js
index 34215f9..f9d5131 100644
--- a/lib/RedisWrapper.js
+++ b/lib/RedisWrapper.js
@@ -1,7 +1,7 @@
"use strict";
-require( 'es6-shim' );
-require( 'prfun' );
+require( 'core-js/shim' );
+var Promise = require( 'prfun' );
var util = require( 'util' );
var events = require( 'events' );
diff --git a/lib/threads/backend.js b/lib/threads/backend.js
index 0492a8f..d3c2b6a 100644
--- a/lib/threads/backend.js
+++ b/lib/threads/backend.js
@@ -22,8 +22,8 @@
* @file
*/
-require( 'es6-shim' );
-require( 'prfun' );
+require( 'core-js/shim' );
+var Promise = require( 'prfun' );
var child_process = require( 'child_process' );
var eh = require( '../errorhelper.js' );
@@ -506,7 +506,7 @@
* @param jobDetails
* @param metabookPath
* @param bundleFile
- * @returns {promise|Deferred.promise|o.A.n.promise|PromiseCapability.promise}
+ * @returns {Promise}
*/
function runBundler( jobDetails, metabookPath, bundleFile ) {
var startTime = Date.now();
diff --git a/lib/threads/frontend.js b/lib/threads/frontend.js
index 8699ef7..f923a58 100644
--- a/lib/threads/frontend.js
+++ b/lib/threads/frontend.js
@@ -22,8 +22,8 @@
* @file
*/
-require( 'es6-shim' );
-require( 'prfun' );
+require( 'core-js/shim' );
+var Promise = require( 'prfun' );
var Busboy = require( 'busboy' );
var child_process = require( 'child_process' );
diff --git a/lib/threads/gc.js b/lib/threads/gc.js
index 201c7f8..2193a7b 100644
--- a/lib/threads/gc.js
+++ b/lib/threads/gc.js
@@ -30,8 +30,8 @@
* @file
*/
-require( 'es6-shim' );
-require( 'prfun' );
+require( 'core-js/shim' );
+var Promise = require( 'prfun' );
var fs = require( 'fs' );
var path = require( 'path' );
diff --git a/package.json b/package.json
index 18499a0..97307c3 100644
--- a/package.json
+++ b/package.json
@@ -22,11 +22,11 @@
"bunyan": "~1.1.3",
"busboy": "0.0.12",
"commander": "~2.5.0",
- "es6-shim": "~0.20.2",
+ "core-js": "~0.9.1",
"mime": "~1.2.11",
"mkdirp": "~0.5.0",
"mv": "~2.0.1",
- "prfun": "~1.0.1",
+ "prfun": "~2.1.1",
"redis": "~0.9.0",
"rimraf": "~2.2.2",
"sprintf-js": "0.0.7"
@@ -38,7 +38,7 @@
"gelf-stream": "~0.2.4"
},
"devDependencies": {
- "jshint": "~2.5.0",
+ "jshint": "~2.6.3",
"request": "~2.47.0",
"mw-ocg-bundler":
"wikimedia/mediawiki-extensions-Collection-OfflineContentGenerator-bundler#master"
}
diff --git a/scripts/clear-host-cache.js b/scripts/clear-host-cache.js
index a41942d..2d5e610 100755
--- a/scripts/clear-host-cache.js
+++ b/scripts/clear-host-cache.js
@@ -43,8 +43,8 @@
* @file
*/
-require( 'es6-shim' );
-require( 'prfun' );
+require( 'core-js/shim' );
+var Promise = require( 'prfun' );
var cli = require( '../lib/cli.js' );
var commander = require( 'commander' );
diff --git a/scripts/clear-queue.js b/scripts/clear-queue.js
index 8592b78..37c2f3e 100755
--- a/scripts/clear-queue.js
+++ b/scripts/clear-queue.js
@@ -27,8 +27,8 @@
* @file
*/
-require( 'es6-shim' );
-require( 'prfun' );
+require( 'core-js/shim' );
+var Promise = require( 'prfun' );
var commander = require( 'commander' );
var cli = require( '../lib/cli.js' );
diff --git a/scripts/clear-time-range.js b/scripts/clear-time-range.js
index 8d310c9..ace8d92 100755
--- a/scripts/clear-time-range.js
+++ b/scripts/clear-time-range.js
@@ -38,8 +38,8 @@
* @file
*/
-require( 'es6-shim' );
-require( 'prfun' );
+require( 'core-js/shim' );
+var Promise = require( 'prfun' );
var cli = require( '../lib/cli.js' );
var commander = require( 'commander' );
diff --git a/scripts/loadtest.js b/scripts/loadtest.js
index cb4047f..8d85866 100755
--- a/scripts/loadtest.js
+++ b/scripts/loadtest.js
@@ -1,7 +1,7 @@
#!/usr/bin/env node
"use strict";
-require('es6-shim');
-require('prfun');
+require('core-js/shim');
+var Promise = require('prfun');
var program = require('commander');
var bundler = require('mw-ocg-bundler');
diff --git a/scripts/run-garbage-collect.js b/scripts/run-garbage-collect.js
index 7a4d672..81655c2 100755
--- a/scripts/run-garbage-collect.js
+++ b/scripts/run-garbage-collect.js
@@ -27,8 +27,8 @@
* @file
*/
-require( 'es6-shim' );
-require( 'prfun' );
+require( 'core-js/shim' );
+var Promise = require( 'prfun' );
var cli = require( '../lib/cli.js' );
var commander = require( 'commander' );
--
To view, visit https://gerrit.wikimedia.org/r/209747
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I554cc194a7dad4bb6ba931dc9acf228d6567a8ee
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Collection/OfflineContentGenerator
Gerrit-Branch: master
Gerrit-Owner: Cscott <[email protected]>
Gerrit-Reviewer: Arlolra <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
