jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/332639 )
Change subject: Move from jshint and jscs to eslint
......................................................................
Move from jshint and jscs to eslint
jscs is no longer supported.
Change-Id: I95e336dea53acf118f282ab27dd2502e246ccb54
---
A .eslintrc.json
D .jscsrc
D .jshintignore
D .jshintrc
M Gruntfile.js
M modules/ext.boilerPlate.foo.js
M modules/ext.boilerPlate.js
M package.json
8 files changed, 22 insertions(+), 44 deletions(-)
Approvals:
Esanders: Looks good to me, approved
Hashar: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/.eslintrc.json b/.eslintrc.json
new file mode 100644
index 0000000..4843240
--- /dev/null
+++ b/.eslintrc.json
@@ -0,0 +1,10 @@
+{
+ "extends": "wikimedia",
+ "env": {
+ "browser": true,
+ "jquery": true
+ },
+ "globals": {
+ "mediaWiki": false
+ }
+}
diff --git a/.jscsrc b/.jscsrc
deleted file mode 100644
index 04baa68..0000000
--- a/.jscsrc
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "preset": "wikimedia",
- "excludeFiles": [ "node_modules/**", "vendor/**" ]
-}
diff --git a/.jshintignore b/.jshintignore
deleted file mode 100644
index 82eaa05..0000000
--- a/.jshintignore
+++ /dev/null
@@ -1,2 +0,0 @@
-node_modules/**
-vendor/**
diff --git a/.jshintrc b/.jshintrc
deleted file mode 100644
index d43c482..0000000
--- a/.jshintrc
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- // Enforcing
- "bitwise": true,
- "eqeqeq": true,
- "es3": true,
- "latedef": true,
- "noarg": true,
- "nonew": true,
- "undef": true,
- "unused": true,
- "strict": false,
-
- // Environment
- "browser": true,
-
- "globals": {
- "mw": false,
- "$": false
- }
-}
diff --git a/Gruntfile.js b/Gruntfile.js
index 36b41e8..c30a729 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,22 +1,16 @@
-/*jshint node:true */
+/* eslint-env node */
module.exports = function ( grunt ) {
- grunt.loadNpmTasks( 'grunt-contrib-jshint' );
+ grunt.loadNpmTasks( 'grunt-eslint' );
grunt.loadNpmTasks( 'grunt-jsonlint' );
grunt.loadNpmTasks( 'grunt-banana-checker' );
- grunt.loadNpmTasks( 'grunt-jscs' );
grunt.initConfig( {
- jshint: {
- options: {
- jshintrc: true
- },
+ eslint: {
all: [
'*.js',
- 'modules/**/*.js'
+ '**/*.js',
+ '!node_modules/**'
]
- },
- jscs: {
- src: '<%= jshint.all %>'
},
banana: {
all: 'i18n/'
@@ -30,6 +24,6 @@
}
} );
- grunt.registerTask( 'test', [ 'jshint', 'jscs', 'jsonlint', 'banana' ]
);
+ grunt.registerTask( 'test', [ 'eslint', 'jsonlint', 'banana' ] );
grunt.registerTask( 'default', 'test' );
};
diff --git a/modules/ext.boilerPlate.foo.js b/modules/ext.boilerPlate.foo.js
index 8081346..5434d62 100644
--- a/modules/ext.boilerPlate.foo.js
+++ b/modules/ext.boilerPlate.foo.js
@@ -1,4 +1,4 @@
-( function () {
+( function ( mw ) {
var x;
function iffify( y ) {
@@ -34,4 +34,4 @@
mw.boilerPlate.Foo = Foo;
-}() );
+}( mediaWiki ) );
diff --git a/modules/ext.boilerPlate.js b/modules/ext.boilerPlate.js
index 40bc4a0..0cc5ee0 100644
--- a/modules/ext.boilerPlate.js
+++ b/modules/ext.boilerPlate.js
@@ -1,4 +1,4 @@
-( function () {
+( function ( mw ) {
/**
* @class mw.boilerPlate
@@ -7,4 +7,4 @@
mw.boilerPlate = {
};
-}() );
+}( mediaWiki ) );
diff --git a/package.json b/package.json
index 2d4f37a..e7a5f92 100644
--- a/package.json
+++ b/package.json
@@ -5,9 +5,9 @@
},
"devDependencies": {
"grunt": "1.0.1",
- "grunt-contrib-jshint": "1.1.0",
"grunt-banana-checker": "0.5.0",
- "grunt-jscs": "3.0.1",
+ "grunt-eslint": "19.0.0",
+ "eslint-config-wikimedia": "0.3.0",
"grunt-jsonlint": "1.1.0"
}
}
--
To view, visit https://gerrit.wikimedia.org/r/332639
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I95e336dea53acf118f282ab27dd2502e246ccb54
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/BoilerPlate
Gerrit-Branch: master
Gerrit-Owner: Paladox <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: Chad <[email protected]>
Gerrit-Reviewer: Esanders <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: Paladox <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
