jenkins-bot has submitted this change and it was merged.
Change subject: Use `core-upgrade` instead of require('es6-shim').
......................................................................
Use `core-upgrade` instead of require('es6-shim').
The `lib/core-upgrade.js` was introduced as a unified place to
document the exact variant of JavaScript we are targetting -- eg, ES6
plus some helpers like `Array#last` and `prfun` which aren't actually
part of ES6 but we like to use.
Be disciplined to ensure we don't inadvertently have strange bugs:
every entry point (ie, starts with `#!`, is invoked with
`child_process.fork`, or is a module exported as part of the public
API) should immediately `require('core-upgrade.js')` at the top of the
file. Files which are not entry points should never need to do this.
No file should ever need to `require('es6-shim')` directly.
Change-Id: I71e84e0c7fc8448c19035ef798e2c1c95fa241b8
---
M api/routes.js
M api/server.js
M lib/Logger.bunyan.js
M lib/core-upgrade.js
M tests/apiServer.js
M tests/client/client.js
M tests/client/rtclient-cluster.js
M tests/domdiff.test.js
M tests/dumpGrepper.js
M tests/fetch-parserTests.txt.js
M tests/fetch-wt.js
M tests/mocha/lintertest.js
M tests/mocha/parse.js
M tests/mockAPI.js
M tests/parse.js
M tests/parserTests.js
M tests/roundtrip-test.js
M tests/server/importJson.js
M tests/server/server.js
M tests/sync-parserTests.js
20 files changed, 26 insertions(+), 26 deletions(-)
Approvals:
Arlolra: Looks good to me, approved
jenkins-bot: Verified
diff --git a/api/routes.js b/api/routes.js
index 213db5b..3581a62 100644
--- a/api/routes.js
+++ b/api/routes.js
@@ -1,7 +1,5 @@
"use strict";
-
-require('es6-shim');
-require('prfun');
+require( '../lib/core-upgrade.js' );
var path = require('path'),
fs = require('fs'),
diff --git a/api/server.js b/api/server.js
index fe2a00a..963f2ee 100755
--- a/api/server.js
+++ b/api/server.js
@@ -18,8 +18,7 @@
* See https://www.mediawiki.org/wiki/Parsoid/Setup for more instructions.
*/
"use strict";
-
-require('es6-shim');
+require('../lib/core-upgrade.js');
var cluster = require('cluster'),
path = require('path'),
diff --git a/lib/Logger.bunyan.js b/lib/Logger.bunyan.js
index 331c0c8..f40b3f6 100644
--- a/lib/Logger.bunyan.js
+++ b/lib/Logger.bunyan.js
@@ -26,8 +26,7 @@
*
*/
"use strict";
-
-require('es6-shim');
+require( './core-upgrade.js' );
var bunyan = require('bunyan');
diff --git a/lib/core-upgrade.js b/lib/core-upgrade.js
index fa5f316..5238230 100644
--- a/lib/core-upgrade.js
+++ b/lib/core-upgrade.js
@@ -1,5 +1,6 @@
"use strict";
require('es6-shim');
+require('prfun');
if (!Array.prototype.last) {
Object.defineProperty(Array.prototype, 'last', {
value: function() { return this[this.length - 1]; }
diff --git a/tests/apiServer.js b/tests/apiServer.js
index 84a50c5..4b1b2c8 100644
--- a/tests/apiServer.js
+++ b/tests/apiServer.js
@@ -1,12 +1,10 @@
-#!/usr/bin/env node
"use strict";
+require('../lib/core-upgrade.js');
/**
* Manages different servers for testing.
* Uses port randomization to make sure we can use multiple servers
concurrently.
*/
-
-require('es6-shim');
var child_process = require( 'child_process' ),
Util = require('../lib/mediawiki.Util.js').Util,
diff --git a/tests/client/client.js b/tests/client/client.js
index da11e34..9ffe493 100755
--- a/tests/client/client.js
+++ b/tests/client/client.js
@@ -1,5 +1,7 @@
#!/usr/bin/env node
"use strict";
+require( '../../lib/core-upgrade.js' );
+
/**
* A client for testing round-tripping of articles.
*/
diff --git a/tests/client/rtclient-cluster.js b/tests/client/rtclient-cluster.js
index c349f53..6219d6b 100755
--- a/tests/client/rtclient-cluster.js
+++ b/tests/client/rtclient-cluster.js
@@ -1,5 +1,6 @@
#!/usr/bin/env node
"use strict";
+require( '../../lib/core-upgrade.js' );
var cluster = require( 'cluster' ),
path = require( 'path' );
diff --git a/tests/domdiff.test.js b/tests/domdiff.test.js
index 8550c37..66462e6 100755
--- a/tests/domdiff.test.js
+++ b/tests/domdiff.test.js
@@ -1,5 +1,6 @@
#!/usr/bin/env node
"use strict";
+require( '../lib/core-upgrade.js' );
var DOMDiff = require('../lib/mediawiki.DOMDiff.js').DOMDiff,
Util = require('../lib/mediawiki.Util.js').Util,
DU = require('../lib/mediawiki.DOMUtils.js').DOMUtils,
diff --git a/tests/dumpGrepper.js b/tests/dumpGrepper.js
index 50ca496..546087b 100755
--- a/tests/dumpGrepper.js
+++ b/tests/dumpGrepper.js
@@ -3,6 +3,7 @@
* A simple dump grepper based on the DumpReader module.
*/
"use strict";
+require( '../lib/core-upgrade.js' );
var dumpReader = require('./dumpReader.js'),
events = require('events'),
diff --git a/tests/fetch-parserTests.txt.js b/tests/fetch-parserTests.txt.js
index 9491ae3..86268e0 100755
--- a/tests/fetch-parserTests.txt.js
+++ b/tests/fetch-parserTests.txt.js
@@ -3,6 +3,7 @@
* Fetch new parserTests.txt from upstream mediawiki/core.
*/
"use strict";
+require( '../lib/core-upgrade.js' );
// UPDATE THESE when upstream mediawiki/core includes new parsoid-relevant
tests
// This ensures that our whitelist/blacklist is in sync.
diff --git a/tests/fetch-wt.js b/tests/fetch-wt.js
index 80f155d..e612fba 100755
--- a/tests/fetch-wt.js
+++ b/tests/fetch-wt.js
@@ -1,5 +1,6 @@
#!/usr/bin/env node
"use strict";
+require( '../lib/core-upgrade.js' );
/** Fetch the wikitext for a page, given title or revision id.
*
diff --git a/tests/mocha/lintertest.js b/tests/mocha/lintertest.js
index 197bd49..c6f5f87 100644
--- a/tests/mocha/lintertest.js
+++ b/tests/mocha/lintertest.js
@@ -1,8 +1,7 @@
-'use strict';
+/** Test cases for the linter */
+"use strict";
+require( '../../lib/core-upgrade.js' );
/*global describe, it, Promise*/
-
-require("es6-shim");
-require("prfun");
var should = require("chai").should();
diff --git a/tests/mocha/parse.js b/tests/mocha/parse.js
index cb2dca1..c0bc0f9 100644
--- a/tests/mocha/parse.js
+++ b/tests/mocha/parse.js
@@ -1,9 +1,7 @@
/** Test cases for lib/mediawiki.Util.js */
-'use strict';
+"use strict";
+require( '../../lib/core-upgrade.js' );
/*global describe, it, Promise*/
-
-require("es6-shim");
-require("prfun");
var should = require("chai").should();
diff --git a/tests/mockAPI.js b/tests/mockAPI.js
index 59e08de..0d4ed00 100644
--- a/tests/mockAPI.js
+++ b/tests/mockAPI.js
@@ -1,6 +1,8 @@
+#!/usr/bin/env node
// This file is used to run a stub API that mimicks the MediaWiki interface
// for the purposes of testing extension expansion.
"use strict";
+require( '../lib/core-upgrade.js' );
var express = require('express');
var crypto = require('crypto');
diff --git a/tests/parse.js b/tests/parse.js
index b7491cc..6eecf02 100755
--- a/tests/parse.js
+++ b/tests/parse.js
@@ -4,9 +4,7 @@
* Read from STDIN, write to STDOUT.
*/
"use strict";
-
-require("es6-shim");
-require("prfun");
+require( '../lib/core-upgrade.js' );
var ParserEnv =
require('../lib/mediawiki.parser.environment.js').MWParserEnvironment,
ParsoidConfig = require( '../lib/mediawiki.ParsoidConfig.js'
).ParsoidConfig,
diff --git a/tests/parserTests.js b/tests/parserTests.js
index 41d8942..ba5d461 100755
--- a/tests/parserTests.js
+++ b/tests/parserTests.js
@@ -5,14 +5,13 @@
* This pulls all the parserTests.txt items and runs them through Parsoid.
*/
"use strict";
+require( '../lib/core-upgrade.js' );
/**
* @class ParserTestModule
* @private
* @singleton
*/
-
-require('../lib/core-upgrade.js');
var apiServer = require( './apiServer.js' ),
async = require( 'async' ),
diff --git a/tests/roundtrip-test.js b/tests/roundtrip-test.js
index f3b80ca..d3770e1 100755
--- a/tests/roundtrip-test.js
+++ b/tests/roundtrip-test.js
@@ -1,5 +1,6 @@
#!/usr/bin/env node
"use strict";
+require( '../lib/core-upgrade.js' );
var request = require( 'request' ),
yargs = require( 'yargs' ),
diff --git a/tests/server/importJson.js b/tests/server/importJson.js
index 6f446f7..99c09a4 100755
--- a/tests/server/importJson.js
+++ b/tests/server/importJson.js
@@ -1,5 +1,7 @@
#!/usr/bin/env node
"use strict";
+require('../../lib/core-upgrade.js');
+
/**
* A utility for reading in a JSON-y list of articles to the database.
*/
diff --git a/tests/server/server.js b/tests/server/server.js
index 3fa95fc..461543d 100755
--- a/tests/server/server.js
+++ b/tests/server/server.js
@@ -1,6 +1,6 @@
#!/usr/bin/env node
-( function () {
"use strict";
+require( '../../lib/core-upgrade.js' );
var express = require( 'express' ),
yargs = require( 'yargs' ),
@@ -1265,5 +1265,3 @@
// Start the app
app.listen( settings.webappPort || 8001 );
coordApp.listen( settings.coordPort || 8002 );
-
-}() );
diff --git a/tests/sync-parserTests.js b/tests/sync-parserTests.js
index 57f0634..6436017 100755
--- a/tests/sync-parserTests.js
+++ b/tests/sync-parserTests.js
@@ -1,5 +1,6 @@
#!/usr/bin/env node
"use strict";
+require('../lib/core-upgrade.js');
/**
== USAGE ==
--
To view, visit https://gerrit.wikimedia.org/r/174150
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I71e84e0c7fc8448c19035ef798e2c1c95fa241b8
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/services/parsoid
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
