jenkins-bot has submitted this change and it was merged.
Change subject: build: Bump various devDeps to latest and make pass
......................................................................
build: Bump various devDeps to latest and make pass
* grunt-contrib-jshint: 0.11.3 -> 0.12.0
This version of the linter cleans up a number of options. 'es5' is now
assumed to be
true by default, and replaced as 'esversion'; 'latedef' is extended to also
cover
functions' definitions, disabled for us for now; 'futurehostile' is
introduced to aid
future-incompatible names for ES6+ support.
Two files adjusted based on this: ve.test.utils.js has a technically cyclical
set of
definitions, so warnings are suppressed. ve.track.js is used downstream in
MediaWiki
in an ES3 context, so now we're asserting this via jshint.
* grunt-jscs: 2.6.0 -> 2.7.0
Trivial version bump that doesn't affect us.
* karma-qunit: 0.1.8 -> 0.1.9
Trivial version bump that doesn't affect us.
Also add the licence to the package.json file, and (at least for now) mark this
repo
as not intended to be published as an npm package.
Change-Id: Ieb7b6748b0cecf275cfc284fc66617189372461f
---
M .jshintrc
M package.json
M src/ve.track.js
M tests/ve.test.utils.js
4 files changed, 12 insertions(+), 6 deletions(-)
Approvals:
Alex Monk: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.jshintrc b/.jshintrc
index d1244dc..7849936 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -3,15 +3,16 @@
"bitwise": true,
"eqeqeq": true,
"freeze": true,
- "latedef": true,
+ "latedef": "nofunc",
+ "futurehostile": true,
"noarg": true,
"nonew": true,
"undef": true,
"unused": true,
+
"strict": false,
// Relaxing
- "es5": false,
// Environment
"browser": true,
diff --git a/package.json b/package.json
index 4d0be61..100605d 100644
--- a/package.json
+++ b/package.json
@@ -2,6 +2,8 @@
"name": "visualeditor",
"version": "0.0.0",
"description": "Stand-alone contentEditable-based rich Web editor.",
+ "license": "MIT",
+ "private": true,
"scripts": {
"test": "grunt test",
"prepublish": "grunt build",
@@ -26,19 +28,19 @@
"grunt-contrib-concat": "0.5.1",
"grunt-contrib-copy": "0.8.2",
"grunt-contrib-csslint": "0.5.0",
- "grunt-contrib-jshint": "0.11.3",
+ "grunt-contrib-jshint": "0.12.0",
"grunt-jsonlint": "1.0.7",
"grunt-contrib-watch": "0.6.1",
"grunt-css-url-embed": "1.6.1",
"grunt-tyops": "0.1.0",
"grunt-cssjanus": "0.2.4",
- "grunt-jscs": "2.6.0",
+ "grunt-jscs": "2.7.0",
"grunt-karma": "0.12.1",
"karma": "0.13.19",
"karma-chrome-launcher": "0.2.2",
"karma-coverage": "0.5.3",
"karma-firefox-launcher": "0.1.7",
- "karma-qunit": "0.1.8",
+ "karma-qunit": "0.1.9",
"qunitjs": "1.20.0"
}
}
diff --git a/src/ve.track.js b/src/ve.track.js
index add8fbc..feb783b 100644
--- a/src/ve.track.js
+++ b/src/ve.track.js
@@ -4,6 +4,8 @@
* @copyright 2011-2016 VisualEditor Team and others; see
http://ve.mit-license.org
*/
+/* jshint esversion: 3 */
+
( function () {
var callbacks = $.Callbacks( 'memory' ),
queue = [];
diff --git a/tests/ve.test.utils.js b/tests/ve.test.utils.js
index 5e56124..ab4ddc2 100644
--- a/tests/ve.test.utils.js
+++ b/tests/ve.test.utils.js
@@ -247,8 +247,9 @@
return view;
}
},
+ /* jshint -W003 */
model = new ve.dm.Surface( doc ),
- view = new ve.ce.Surface( model, mockSurface );
+ view = new ve.ce.Surface( model, mockSurface ); /*
jshint +W003 */
view.surface = mockSurface;
mockSurface.$element.append( view.$element );
--
To view, visit https://gerrit.wikimedia.org/r/269080
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ieb7b6748b0cecf275cfc284fc66617189372461f
Gerrit-PatchSet: 2
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester <[email protected]>
Gerrit-Reviewer: Alex Monk <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
