Krinkle has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/337138 )
Change subject: build: Replace jscs/jshint with eslint
......................................................................
build: Replace jscs/jshint with eslint
Change-Id: Iff79501de8d80a860eebb4a6e31dc8fca3285505
---
A .eslintrc.json
D .jscsrc
D .jshintrc
M Gruntfile.js
M modules/ext.navigationTiming.js
M package.json
6 files changed, 26 insertions(+), 53 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/NavigationTiming
refs/changes/38/337138/1
diff --git a/.eslintrc.json b/.eslintrc.json
new file mode 100644
index 0000000..f4afcc2
--- /dev/null
+++ b/.eslintrc.json
@@ -0,0 +1,9 @@
+{
+ "extends": "wikimedia",
+ "env": {
+ "browser": true
+ },
+ "rules": {
+ "valid-jsdoc": 0
+ }
+}
diff --git a/.jscsrc b/.jscsrc
deleted file mode 100644
index fcf4a3e..0000000
--- a/.jscsrc
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "preset": "wikimedia",
-
- "excludeFiles": [
- "{node_modules}/**"
- ]
-}
diff --git a/.jshintrc b/.jshintrc
deleted file mode 100644
index 94545ab..0000000
--- a/.jshintrc
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "predef": [
- "Geo",
- "jQuery",
- "mediaWiki",
- "mediaWikiLoadStart",
- "performance",
- "chrome"
- ],
-
- // Enforcing
- "bitwise": true,
- "eqeqeq": true,
- "es3": true,
- "freeze": true,
- "latedef": true,
- "noarg": true,
- "nonew": true,
- "undef": true,
- "unused": true,
-
- // Environment
- "browser": true
-}
diff --git a/Gruntfile.js b/Gruntfile.js
index 5784898..8d16173 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,31 +1,24 @@
-/*jshint node:true */
+/* eslint-env node */
module.exports = function ( grunt ) {
grunt.loadNpmTasks( 'grunt-banana-checker' );
- grunt.loadNpmTasks( 'grunt-contrib-jshint' );
- grunt.loadNpmTasks( 'grunt-jscs' );
+ grunt.loadNpmTasks( 'grunt-eslint' );
grunt.loadNpmTasks( 'grunt-jsonlint' );
grunt.initConfig( {
- jshint: {
- options: {
- jshintrc: true
- },
- all: [ '*.js', 'modules/**/*.js' ]
- },
- jscs: {
- all: [ '*.js', 'modules/**/*.js' ]
- },
- banana: {
- all: 'i18n/'
- },
jsonlint: {
all: [
'**/*.json',
'!node_modules/**'
]
+ },
+ banana: {
+ all: 'i18n/'
+ },
+ eslint: {
+ all: [ '*.js', 'modules/**/*.js' ]
}
} );
- grunt.registerTask( 'test', [ 'jshint', 'jscs', 'jsonlint', 'banana' ]
);
+ grunt.registerTask( 'test', [ 'jsonlint', 'banana', 'eslint' ] );
grunt.registerTask( 'default', 'test' );
};
diff --git a/modules/ext.navigationTiming.js b/modules/ext.navigationTiming.js
index 3baf459..b31a758 100644
--- a/modules/ext.navigationTiming.js
+++ b/modules/ext.navigationTiming.js
@@ -167,6 +167,7 @@
if ( timing.msFirstPaint > navStart ) {
timingData.firstPaint = timing.msFirstPaint - navStart;
+ /* global chrome */
} else if ( window.chrome && $.isFunction( chrome.loadTimes ) )
{
chromeLoadTimes = chrome.loadTimes();
if ( chromeLoadTimes.firstPaintTime >
chromeLoadTimes.startLoadTime ) {
@@ -199,10 +200,12 @@
}
if ( window.mediaWikiLoadStart ) {
+ /* global mediaWikiLoadStart */
event.mediaWikiLoadComplete = Math.round(
mediaWikiLoadEnd - mediaWikiLoadStart );
}
if ( window.Geo ) {
+ /* global Geo */
if ( typeof Geo.country === 'string' ) {
event.originCountry = Geo.country;
}
diff --git a/package.json b/package.json
index eca8152..e178319 100644
--- a/package.json
+++ b/package.json
@@ -4,11 +4,10 @@
"test": "grunt test"
},
"devDependencies": {
- "grunt": "0.4.5",
- "grunt-banana-checker": "0.4.0",
- "grunt-cli": "0.1.13",
- "grunt-contrib-jshint": "0.11.3",
- "grunt-jscs": "2.1.0",
- "grunt-jsonlint": "1.0.7"
+ "eslint-config-wikimedia": "0.3.0",
+ "grunt": "1.0.1",
+ "grunt-banana-checker": "0.5.0",
+ "grunt-eslint": "19.0.0",
+ "grunt-jsonlint": "1.1.0"
}
}
--
To view, visit https://gerrit.wikimedia.org/r/337138
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iff79501de8d80a860eebb4a6e31dc8fca3285505
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/NavigationTiming
Gerrit-Branch: master
Gerrit-Owner: Krinkle <krinklem...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
