Mwalker has submitted this change and it was merged.
Change subject: Tweak jshint configuration; use strict.
......................................................................
Tweak jshint configuration; use strict.
Allow ES6 `Map`/`Set`; tweak settings to match Parsoid, including the
use of strict mode.
Change-Id: Ibeaf906cee3a8caf57d2d92b9a705420fb5f4481
---
M .jshintrc
M lib/api.js
M lib/db.js
M lib/html.js
M lib/image.js
M lib/index.js
M lib/metabook.js
M lib/p.js
M lib/parsoid.js
M lib/revisions.js
M lib/siteinfo.js
M lib/status.js
M samples/featured.js
M test/samples.js
14 files changed, 30 insertions(+), 7 deletions(-)
Approvals:
Mwalker: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.jshintrc b/.jshintrc
index fde1d96..88e79fd 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -4,7 +4,10 @@
"setImmediate",
- "QUnit"
+ "QUnit",
+
+ "Map",
+ "Set"
],
"bitwise": true,
@@ -18,9 +21,8 @@
"nonew": true,
"regexp": false,
"undef": true,
- "strict": false,
+ "strict": true,
"trailing": true,
- "unused":true,
"smarttabs": true,
"multistr": true,
diff --git a/lib/api.js b/lib/api.js
index 4ebe808..301d290 100644
--- a/lib/api.js
+++ b/lib/api.js
@@ -1,4 +1,5 @@
// helpers for making mediawiki api requests
+"use strict";
var nodefn = require('when/node/function');
var querystring = require('querystring');
diff --git a/lib/db.js b/lib/db.js
index 56b41aa..1b228e2 100644
--- a/lib/db.js
+++ b/lib/db.js
@@ -1,4 +1,5 @@
// Helpers to create/read key/value mappings in sqlite db
+"use strict";
var sqlite3 = require('sqlite3');
var when = require('when');
diff --git a/lib/html.js b/lib/html.js
index 7e51cb6..4878deb 100644
--- a/lib/html.js
+++ b/lib/html.js
@@ -1,4 +1,5 @@
// Generate contents of html.db
+"use strict";
var guard = require('when/guard');
var util = require('util');
diff --git a/lib/image.js b/lib/image.js
index f992e8e..bf2b86b 100644
--- a/lib/image.js
+++ b/lib/image.js
@@ -1,3 +1,6 @@
+// Fetch images and metadata about them.
+"use strict";
+
var fs = require('fs');
var guard = require('when/guard');
var path = require('path');
diff --git a/lib/index.js b/lib/index.js
index 95e115d..5df431f 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1,3 +1,4 @@
+"use strict";
require('es6-shim'); // Map/Set support
var json = require('../package.json');
@@ -53,7 +54,7 @@
var mkOutputDir = function() {
// fail if output location is not writable
- return P.call(fs.mkdir, fs, options.output,
0700).then(function() {
+ return P.call(fs.mkdir, fs, options.output, parseInt('700',
8)).then(function() {
// don't clean up output dir unless this mkdir succeeded
cleanUpOutput = true;
});
@@ -146,7 +147,7 @@
var imagedir = path.join(options.output, 'images');
var mkImageDir = function() {
- return P.call(fs.mkdir, fs, imagedir, 0777);
+ return P.call(fs.mkdir, fs, imagedir, parseInt('777', 8));
};
// returns a promise which is resolved when all images from the imageMap
@@ -251,7 +252,7 @@
status.createStage(0, 'Creating bundle');
if (options.nozip) {
// make the directory readable, then we're done.
- return P.call(fs.chmod, fs, options.output, 0755);
+ return P.call(fs.chmod, fs, options.output,
parseInt('755', 8));
}
// create zip archive
diff --git a/lib/metabook.js b/lib/metabook.js
index 62d5ab6..9a556e6 100644
--- a/lib/metabook.js
+++ b/lib/metabook.js
@@ -1,4 +1,6 @@
/** Create a new metabook structure, or fixup a broken/incomplete one. */
+"use strict";
+
var when = require('when');
var Api = require('../lib/api');
diff --git a/lib/p.js b/lib/p.js
index 1f2a0dc..c40a272 100644
--- a/lib/p.js
+++ b/lib/p.js
@@ -1,4 +1,6 @@
// Helpers for promises.
+"use strict";
+
var nodefn = require('when/node/function');
var spawn = require('child_process').spawn;
var when = require('when');
diff --git a/lib/parsoid.js b/lib/parsoid.js
index c457737..57918ae 100644
--- a/lib/parsoid.js
+++ b/lib/parsoid.js
@@ -1,4 +1,6 @@
// Make concurrency-limited parsoid API requests.
+"use strict";
+
var domino = require('domino');
var fs = require('fs');
var guard = require('when/guard');
diff --git a/lib/revisions.js b/lib/revisions.js
index fbe5ebd..2de077c 100644
--- a/lib/revisions.js
+++ b/lib/revisions.js
@@ -1,6 +1,8 @@
// Generate content of revisions-1.txt
// this is a particularly grody file, so we also store this in a more
// sane manner as revisions.db. hopefully we can deprecate the ugliness.
+"use strict";
+
var fs = require('fs');
var guard = require('when/guard');
var path = require('path');
diff --git a/lib/siteinfo.js b/lib/siteinfo.js
index bf31182..6ab8a51 100644
--- a/lib/siteinfo.js
+++ b/lib/siteinfo.js
@@ -1,4 +1,6 @@
// Generate content of siteinfo.json
+"use strict";
+
var fs = require('fs');
var path = require('path');
var when = require('when');
diff --git a/lib/status.js b/lib/status.js
index c3b0a54..3832366 100644
--- a/lib/status.js
+++ b/lib/status.js
@@ -1,4 +1,5 @@
/* Progress reporting using the node IPC mechanism. */
+"use strict";
var StatusReporter = module.exports = function(numStages, extraLog) {
this.extraLog = extraLog;
diff --git a/samples/featured.js b/samples/featured.js
index daef692..75c499d 100755
--- a/samples/featured.js
+++ b/samples/featured.js
@@ -1,6 +1,7 @@
#!/usr/bin/env node
-require('es6-shim');
/** Generate bundles from the featured articles list. */
+"use strict";
+require('es6-shim');
var program = require('commander');
diff --git a/test/samples.js b/test/samples.js
index 4d67e12..ff86147 100644
--- a/test/samples.js
+++ b/test/samples.js
@@ -1,4 +1,6 @@
/* global describe, it */
+"use strict";
+
var assert = require("assert");
var fs = require('fs');
var path = require('path');
--
To view, visit https://gerrit.wikimedia.org/r/134539
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibeaf906cee3a8caf57d2d92b9a705420fb5f4481
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Collection/OfflineContentGenerator/bundler
Gerrit-Branch: master
Gerrit-Owner: Cscott <canan...@wikimedia.org>
Gerrit-Reviewer: Mwalker <mwal...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
